Merge pull request #779 from MetaCell/feature/iframe-throttling-fix-rebase

ddelpiano · web-flow · commit 178d32fc4af5 · 2024-01-24T11:15:27.000Z
Cherry picked iframe visibility changes after rebase
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,6 @@
 FROM node:14 as jsbuild
 
 ENV FOLDER=netpyne
-RUN echo "no-cache 2023-7-14"
 
 WORKDIR $FOLDER/webapp
 COPY webapp/package.json .
@@ -12,10 +11,6 @@ RUN yarn install  --network-timeout 1000000000
 COPY webapp .
 RUN yarn build-dev
 
-RUN rm -Rf node_modules/*
-
-
-
 ###
 FROM jupyter/base-notebook:hub-1.5.0
 ENV NB_UID=jovyan
diff --git a/k8s/cf_values.yaml b/k8s/cf_values.yaml
@@ -14,7 +14,7 @@ hub:
       c.Spawner.notebook_dir = '/opt/workspace'
       c.Spawner.default_url = '/geppetto'
     spawner: >-
-      c.Spawner.args = ["--library=netpyne_ui"]
+      c.Spawner.args = ["--library=netpyne_ui", "--NotebookApp.default_url=/geppetto"]
 singleuser:
   storage:
     type: none
diff --git a/tests/frontend/e2e/package.json b/tests/frontend/e2e/package.json
@@ -4,7 +4,7 @@
   "description": "NetPyNe UI tests",
   "license": "unlicensed",
   "scripts": {
-    "test": "jest --verbose",
+    "test": "jest --verbose Tut#1_smoke && jest --verbose ExperimentManager_Tut#1",
     "EEG_Dipole_test": "jest --verbose EEG_and_Dipole_Tut#1 ",
     "Experiment_Manager_test": "jest --verbose ExperimentManager_Tut#1 ",
     "Tutorial_1_test":"jest --verbose Tut#1_smoke ",
diff --git a/utilities/install.py b/utilities/install.py
@@ -171,6 +171,7 @@ def main(netpyne_branch, workspace_branch, geppetto_branch=None, skipNpm=False,
             _ = config['NotebookApp']['tornado_settings']
         except KeyError:
             config['NotebookApp']['tornado_settings'] = {}
+        config['NotebookApp']['tornado_settings']['headers'] = { 'Content-Security-Policy': "frame-ancestors 'self' http: https: http://localhost:8081 *" }
         config['NotebookApp']['tornado_settings']['gzip'] = True
         f.seek(0)
         json.dump(config, f, indent=4, sort_keys=True)
diff --git a/webapp/Main.js b/webapp/Main.js
@@ -34,7 +34,7 @@ require('./css/flexlayout.less');
 require('./css/tree.less');
 
 ReactDOM.render(
-  <div>
+  <div id="iframefix">
     <MuiThemeProvider theme={theme}>
       <Provider store={store}>
         <LoadingSpinner />
diff --git a/webapp/components/general/NetPyNEPythonConsole.js b/webapp/components/general/NetPyNEPythonConsole.js
@@ -70,17 +70,19 @@ export class NetPyNEPythonConsole extends Component {
     return currentNotebookValues ;
   }
   
+  componentDidUpdate (prevProps) {
+    document.getElementById('pythonConsoleFrame').parentElement.parentElement.style.display = 'block';
+  }
+  
   shouldComponentUpdate (nextProps) {
-    if (this.props.extensionLoaded !== nextProps.extensionLoaded) {
-      return true;
-    }
+
     if (nextProps.notebookVisible)
     {
       var iframeWindow     = this.container.contentWindow;
       iframeWindow.onblur  = this.handleIframeBlur ;
       iframeWindow.onfocus = this.handleIframeFocus ;
     }
-    return false;
+    return true;
   }
 
   handleIframeBlur = (event) => {
diff --git a/webapp/test-frame/index.html b/webapp/test-frame/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>IFrame NePyNE-UI</title>
+</head>
+<body>
+
+<h2>IFrame NePyNE-UI</h2>
+
+<!-- IFrame element -->
+<iframe src="http://localhost:8081" width="1200" height="1200">
+    <!-- Alternative content for browsers that do not support iframes -->
+    <p>Your browser does not support iframes.</p>
+</iframe>
+
+</body>
+</html>
diff --git a/webapp/webpack.config.dev.js b/webapp/webpack.config.dev.js
@@ -7,7 +7,6 @@ extended.devServer = {
   port: 8081,
   inline: true,
   publicPath: '/geppetto/build',
-
   proxy: [
     {
       path: '/',
diff --git a/webapp/yarn.lock b/webapp/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -70,17 +70,19 @@ export class NetPyNEPythonConsole extends Component {`
`70`	`70`	`return currentNotebookValues ;`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ componentDidUpdate (prevProps) {`
	`74`	`+ document.getElementById('pythonConsoleFrame').parentElement.parentElement.style.display = 'block';`
	`75`	`+ }`
	`76`	`+`
`73`	`77`	`shouldComponentUpdate (nextProps) {`
`74`		`- if (this.props.extensionLoaded !== nextProps.extensionLoaded) {`
`75`		`- return true;`
`76`		`- }`
	`78`	`+`
`77`	`79`	`if (nextProps.notebookVisible)`
`78`	`80`	`{`
`79`	`81`	`var iframeWindow = this.container.contentWindow;`
`80`	`82`	`iframeWindow.onblur = this.handleIframeBlur ;`
`81`	`83`	`iframeWindow.onfocus = this.handleIframeFocus ;`
`82`	`84`	`}`
`83`		`- return false;`
	`85`	`+ return true;`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`handleIframeBlur = (event) => {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ extended.devServer = {`
`7`	`7`	`port: 8081,`
`8`	`8`	`inline: true,`
`9`	`9`	`publicPath: '/geppetto/build',`
`10`		`-`
`11`	`10`	`proxy: [`
`12`	`11`	`{`
`13`	`12`	`path: '/',`