Merge branch 'development' of github.com:MetaCell/NetPyNE-UI into feature/readme-update

Author: aranega

Dockerfile

@@ -1,67 +1,88 @@
-FROM node:14.21.3-bullseye as jsbuild
+FROM node:14 as jsbuild
 
-WORKDIR /app
-
-COPY --chown=1000:1000 webapp/package.json .
-COPY --chown=1000:1000 webapp/yarn.lock .
+ENV FOLDER=netpyne
+RUN echo "no-cache 2023-7-14"
 
+WORKDIR $FOLDER/webapp
+COPY webapp/package.json .
+COPY webapp/yarn.lock .
 
 RUN yarn install  --network-timeout 1000000000
 
-COPY webapp/ .
+COPY webapp .
 RUN yarn build-dev
 
-
 RUN rm -Rf node_modules/*
 
+
+
 ###
 FROM jupyter/base-notebook:hub-1.5.0
 ENV NB_UID=jovyan
 ENV FOLDER=netpyne
-ARG BUILD_ARGS=""
-ARG WORKSPACE_VERSION=master
-# ARG GEPPETTO_VERSION=development
-# ARG NETPYNE_VERSION=master
-
-ENV FOLDER=/home/jovyan/work/NetPyNE-UI
+ENV NP_LFPYKIT_HEAD_FILE=/home/jovyan/nyhead.mat
 
 USER root
 
 RUN rm -rf /var/lib/apt/lists
 RUN apt-get update -qq &&\
-    apt-get install python3-tk vim nano unzip git make libtool g++ -qq pkg-config libfreetype6-dev libpng-dev libopenmpi-dev  openjdk-11-jre-headless -y -y
+    apt-get install python3-tk vim nano unzip git make libtool g++ -qq pkg-config libfreetype6-dev libpng-dev libopenmpi-dev -y
+RUN apt-get install openjdk-11-jre-headless -y
 RUN conda install python=3.7 -y
 
+
 WORKDIR $FOLDER
-COPY --chown=1000:1000 requirements.txt requirements.txt
-RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip && pip install -r requirements.txt --prefer-binary
+COPY  --chown=1000:1000 requirements.txt requirements.txt
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+    pip install -r requirements.txt --prefer-binary
+
+COPY . .
+COPY --from=jsbuild --chown=1000:1000 $FOLDER/webapp/build webapp/build
+
+# ToDo: fixme, for now remove the jupyter hub config json file because it overrides the default
+# and thus removes the frame ancestor cors settings
+RUN rm -f ~/.jupyter/*.json
+RUN chown $NB_UID .
+RUN chown $NB_UID /opt
+RUN rm -Rf workspace
+
+USER $NB_UID
+
+# sym link workspace pvc to $FOLDER
+RUN mkdir -p /opt/workspace
+RUN mkdir -p /opt/user
 
-COPY --chown=jovyan:1000 . .
-COPY --from=jsbuild --chown=jovyan:1000 /app webapp
 
 
+
+ENV NEURON_HOME=/opt/conda
+
+
+USER root
+
 RUN jupyter nbextension install --py --symlink --sys-prefix jupyter_geppetto
 RUN jupyter nbextension enable --py --sys-prefix jupyter_geppetto
 RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
 RUN jupyter serverextension enable --py --sys-prefix jupyter_geppetto
 
-RUN python utilities/install.py ${BUILD_ARGS} --workspace $WORKSPACE_VERSION
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\ 
+  python utilities/install.py --npm-skip --no-test
 
-RUN jupyter labextension disable @jupyterlab/hub-extension
 
-RUN chown  $NB_UID .
-RUN chown -R $NB_UID workspace
+RUN mv workspace /opt/workspace/tutorials
+RUN chown -R $NB_UID /opt/workspace/tutorials
+RUN ln -s /opt/workspace workspace
 
-# Temp fixes for eeg plots
-ENV NEURON_HOME=/opt/conda
-# For lfpykit 0.4
-# RUN wget -P $(pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}') https://www.parralab.org/nyhead/sa_nyhead.mat
-# For lpfykit 0.5
-ENV NP_LFPYKIT_HEAD_FILE=/home/jovyan/nyhead.mat
+RUN jupyter labextension disable @jupyterlab/hub-extension
 RUN wget --no-check-certificate -O $NP_LFPYKIT_HEAD_FILE https://www.parralab.org/nyhead/sa_nyhead.mat
 
 USER $NB_UID
 
+
 EXPOSE 8888
 
+ENTRYPOINT ["tini", "-g", "--"]
+
+
 
+CMD ./NetPyNE-UI

tests/frontend/e2e/tests/RxD.test.js

@@ -230,11 +230,7 @@ describe('RxD testing', () => {
 
         await page.waitForSelector('button[aria-selected="true"][id = "simple-tab-1"]')
 
-        const no_regions_text = await page.$$eval('#simple-tabpanel-1', no_regions_text => {
-            return no_regions_text.map(no_regions_text => no_regions_text.innerText)
-        })
-
-        expect(no_regions_text).toContain('There are no Species yet.')
+        await page.waitForSelector('#ip3')
         console.log('Species tab opened')
         await page.waitForTimeout(PAGE_WAIT)
 

webapp/GeppettoConfiguration.json

@@ -1,8 +1,8 @@
 {
     "_README" : "http://docs.geppetto.org/en/latest/build.html",
     "contextPath": "org.geppetto.frontend",
-    "useSsl": false,
-    "embedded": false,
+    "useSsl": true,
+    "embedded": true,
     "embedderURL": ["/"],
     "rootRedirect":"",
     "noTest": false,

webapp/components/general/NetPyNEField.js

@@ -46,7 +46,11 @@ export default class NetPyNEField extends Component {
         !this.model.split('.')[0].startsWith('simConfig')
         || this.model.split('.')[1].startsWith('analysis')
       ) {
-        Utils.execPythonMessage(`del netpyne_geppetto.${this.model}`);
+        Utils.execPythonMessage(`
+        try:
+          del netpyne_geppetto.${this.model}
+        except KeyError:
+          ...`);
       }
     }
     return value;