Ensure save handler gracefully handles undefined layout data (#121)

holoviz · Mar 21, 2024 · ec9873f · ec9873f
1 parent 6d87fff
commit ec9873f
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 129 deletions.
diff --git a/package.json b/package.json
@@ -1,127 +1,127 @@
 {
-    "name": "@pyviz/jupyterlab_pyviz",
-    "version": "3.0.1",
-    "description": "A JupyterLab extension for rendering HoloViz content.",
-    "keywords": [
-        "jupyter",
-        "jupyterlab",
-        "jupyterlab-extension"
-    ],
-    "homepage": "https://github.com/holoviz/pyviz_comms",
-    "bugs": {
-        "url": "https://github.com/holoviz/pyviz_comms/issues"
-    },
-    "license": "BSD-3-Clause",
-    "author": {
-        "name": "Philipp Rudiger"
-    },
-    "files": [
-        "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
-        "style/**/*.{css,.js,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
-        "schema/*.json",
-        "style/index.js"
-    ],
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
-    "style": "style/index.css",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/holoviz/pyviz_comms.git"
-    },
-    "scripts": {
-        "build": "jlpm build:lib && jlpm build:labextension:dev",
-        "build:labextension": "jupyter labextension build .",
-        "build:labextension:dev": "jupyter labextension build --development True .",
-        "build:lib": "tsc --sourceMap",
-        "build:lib:prod": "tsc",
-        "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension",
-        "clean": "jlpm clean:lib",
-        "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
-        "clean:labextension": "rimraf pyviz_comms/labextension pyviz_comms/_version.py",
-        "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
-        "clean:lintcache": "rimraf .eslintcache .stylelintcache",
-        "eslint": "jlpm eslint:check --fix",
-        "eslint:check": "eslint . --cache --ext .ts,.tsx",
-        "install:extension": "jlpm build",
-        "lint": "jlpm prettier && jlpm eslint",
-        "lint:check": "jlpm prettier:check && jlpm eslint:check",
-        "prettier": "jlpm prettier:base --write --list-different",
-        "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
-        "prettier:check": "jlpm prettier:base --check",
-        "stylelint": "jlpm stylelint:check --fix",
-        "stylelint:check": "stylelint --cache \"style/**/*.css\"",
-        "watch": "run-p watch:src watch:labextension",
-        "watch:labextension": "jupyter labextension watch .",
-        "watch:src": "tsc -w --sourceMap"
-    },
-    "dependencies": {
-        "@jupyterlab/application": "^4.0.3",
-        "@jupyterlab/apputils": "^4.1.3",
-        "@jupyterlab/coreutils": "^6.0.3",
-        "@jupyterlab/docregistry": "^4.0.3",
-        "@jupyterlab/fileeditor": "^4.0.3",
-        "@jupyterlab/mainmenu": "^4.0.3",
-        "@jupyterlab/notebook": "^4.0.3",
-        "@jupyterlab/settingregistry": "^4.0.3",
-        "@jupyterlab/ui-components": "^4.0.3",
-        "@lumino/coreutils": "^2.1.1",
-        "@lumino/signaling": "^2.1.1",
-        "tippy.js": "^6"
-    },
-    "resolutions": {
-        "@lumino/widgets": "^2.1.1",
-        "react": "^17.0.1",
-        "react-dom": "^17.0.1"
-    },
-    "peerDependencies": {
-        "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6",
-        "@jupyter-widgets/jupyterlab-manager": "^5.0.4"
-    },
-    "devDependencies": {
-        "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6",
-        "@jupyter-widgets/jupyterlab-manager": "^5.0.7",
-        "@jupyterlab/builder": "^4.0.0",
-        "@jupyterlab/testutils": "^3.0.0",
-        "@types/json-schema": "^7.0.11",
-        "@types/node": "^14.14.16",
-        "@types/react": "^18.0.26",
-        "@types/react-dom": "^17.0.0",
-        "@typescript-eslint/eslint-plugin": "^5.55.0",
-        "@typescript-eslint/parser": "^5.55.0",
-        "css-loader": "^6.7.1",
-        "eslint": "^8.36.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-prettier": "^5.0.0",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^3.0.0",
-        "rimraf": "^4.4.1",
-        "source-map-loader": "^1.0.2",
-        "style-loader": "^3.3.1",
-        "stylelint": "^15.10.1",
-        "stylelint-config-recommended": "^13.0.0",
-        "stylelint-config-standard": "^34.0.0",
-        "stylelint-prettier": "^4.0.0",
-        "typescript": "~5.0.2",
-        "yjs": "^13.5.40"
-    },
-    "sideEffects": [
-        "style/*.css",
-        "style/index.js"
-    ],
-    "styleModule": "style/index.js",
-    "jupyterlab": {
-        "extension": true,
-        "outputDir": "pyviz_comms/labextension",
-        "schemaDir": "schema",
-        "sharedPackages": {
-            "@jupyter-widgets/jupyterlab-manager": {
-                "bundled": false,
-                "singleton": true
-            },
-            "@jupyter-widgets/base": {
-                "bundled": false,
-                "singleton": true
-            }
-        }
+  "name": "@pyviz/jupyterlab_pyviz",
+  "version": "3.0.1",
+  "description": "A JupyterLab extension for rendering HoloViz content.",
+  "keywords": [
+    "jupyter",
+    "jupyterlab",
+    "jupyterlab-extension"
+  ],
+  "homepage": "https://github.com/holoviz/pyviz_comms",
+  "bugs": {
+    "url": "https://github.com/holoviz/pyviz_comms/issues"
+  },
+  "license": "BSD-3-Clause",
+  "author": {
+    "name": "Philipp Rudiger"
+  },
+  "files": [
+    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
+    "style/**/*.{css,.js,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
+    "schema/*.json",
+    "style/index.js"
+  ],
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "style": "style/index.css",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/holoviz/pyviz_comms.git"
+  },
+  "scripts": {
+    "build": "jlpm build:lib && jlpm build:labextension:dev",
+    "build:labextension": "jupyter labextension build .",
+    "build:labextension:dev": "jupyter labextension build --development True .",
+    "build:lib": "tsc --sourceMap",
+    "build:lib:prod": "tsc",
+    "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension",
+    "clean": "jlpm clean:lib",
+    "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
+    "clean:labextension": "rimraf pyviz_comms/labextension pyviz_comms/_version.py",
+    "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
+    "clean:lintcache": "rimraf .eslintcache .stylelintcache",
+    "eslint": "jlpm eslint:check --fix",
+    "eslint:check": "eslint . --cache --ext .ts,.tsx",
+    "install:extension": "jlpm build",
+    "lint": "jlpm prettier && jlpm eslint",
+    "lint:check": "jlpm prettier:check && jlpm eslint:check",
+    "prettier": "jlpm prettier:base --write --list-different",
+    "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
+    "prettier:check": "jlpm prettier:base --check",
+    "stylelint": "jlpm stylelint:check --fix",
+    "stylelint:check": "stylelint --cache \"style/**/*.css\"",
+    "watch": "run-p watch:src watch:labextension",
+    "watch:labextension": "jupyter labextension watch .",
+    "watch:src": "tsc -w --sourceMap"
+  },
+  "dependencies": {
+    "@jupyterlab/application": "^4.0.3",
+    "@jupyterlab/apputils": "^4.1.3",
+    "@jupyterlab/coreutils": "^6.0.3",
+    "@jupyterlab/docregistry": "^4.0.3",
+    "@jupyterlab/fileeditor": "^4.0.3",
+    "@jupyterlab/mainmenu": "^4.0.3",
+    "@jupyterlab/notebook": "^4.0.3",
+    "@jupyterlab/settingregistry": "^4.0.3",
+    "@jupyterlab/ui-components": "^4.0.3",
+    "@lumino/coreutils": "^2.1.1",
+    "@lumino/signaling": "^2.1.1",
+    "tippy.js": "^6"
+  },
+  "resolutions": {
+    "@lumino/widgets": "^2.1.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
+  },
+  "peerDependencies": {
+    "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6",
+    "@jupyter-widgets/jupyterlab-manager": "^5.0.4"
+  },
+  "devDependencies": {
+    "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6",
+    "@jupyter-widgets/jupyterlab-manager": "^5.0.7",
+    "@jupyterlab/builder": "^4.0.0",
+    "@jupyterlab/testutils": "^3.0.0",
+    "@types/json-schema": "^7.0.11",
+    "@types/node": "^14.14.16",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^17.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
+    "css-loader": "^6.7.1",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^3.0.0",
+    "rimraf": "^4.4.1",
+    "source-map-loader": "^1.0.2",
+    "style-loader": "^3.3.1",
+    "stylelint": "^15.10.1",
+    "stylelint-config-recommended": "^13.0.0",
+    "stylelint-config-standard": "^34.0.0",
+    "stylelint-prettier": "^4.0.0",
+    "typescript": "~5.0.2",
+    "yjs": "^13.5.40"
+  },
+  "sideEffects": [
+    "style/*.css",
+    "style/index.js"
+  ],
+  "styleModule": "style/index.js",
+  "jupyterlab": {
+    "extension": true,
+    "outputDir": "pyviz_comms/labextension",
+    "schemaDir": "schema",
+    "sharedPackages": {
+      "@jupyter-widgets/jupyterlab-manager": {
+        "bundled": false,
+        "singleton": true
+      },
+      "@jupyter-widgets/base": {
+        "bundled": false,
+        "singleton": true
+      }
     }
+  }
 }
diff --git a/src/manager.ts b/src/manager.ts
@@ -46,18 +46,32 @@ export class ContextManager implements IDisposable {
       if (response.status !== 200) {
         return;
       }
-      const layout = await response.json();
+      let layout;
+      try {
+        layout = await response.json();
+      } catch {
+        return;
+      }
+      if (!layout) {
+        return;
+      }
       let changed = false;
       for (const cell of context.model.cells) {
         const cell_layout = layout.cells[cell.id];
         const cell_meta = cell.getMetadata();
-        if (!JSONExt.deepEqual(cell_meta['panel-layout'], cell_layout)) {
+        if (
+          (!('panel-layout' in cell_meta) && cell_layout) ||
+          !JSONExt.deepEqual(cell_meta['panel-layout'], cell_layout)
+        ) {
           cell.setMetadata('panel-layout', cell_layout);
           changed = true;
         }
       }
       const nb_meta = context.model.getMetadata();
-      if (!JSONExt.deepEqual(nb_meta['panel-cell-order'], layout.order)) {
+      if (
+        (!('panel-cell-order' in nb_meta) && layout.order) ||
+        !JSONExt.deepEqual(nb_meta['panel-cell-order'], layout.order)
+      ) {
         context.model.setMetadata('panel-cell-order', layout.order);
         changed = true;
       }

diff --git a/src/preview.tsx b/src/preview.tsx
@@ -66,6 +66,7 @@ const CUSTOM_LOADER = `
 <html>
 <head>
   <title>Jupyter Kernel Starting</title>
+  <link href="https://fonts.googleapis.com/css2?family=Kumbh+Sans:wght@900&display=swap" rel="stylesheet">
   <style>
     body {
       display: flex;
@@ -74,7 +75,11 @@ const CUSTOM_LOADER = `
       flex-direction: column;
       height: 100vh;
       background-color: #f7f7f7;
-      font-family: Futura;
+      font-family: "Kumbh Sans", "Segoe UI", Arial, Helvetica, sans-serif;
+    }
+
+    h1 {
+      font-weight: 900;
     }
 
     .loading-container {

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -294,7 +294,7 @@ export class HVJSExec extends Widget implements IRenderMime.IRenderer {
       this._server_id = null;
     } else if (this._document_id) {
       const id = this._document_id;
-      if (this._manager.comm != null && this._dispose) {
+      if (this._manager.comm && this._dispose) {
         this._manager.comm.send({ event_type: 'delete', id: id });
       }
       if ((window as any).PyViz !== undefined) {