Merge pull request #313 from GordonSmith/ECLNB_WU

fix(notebooks): Initial load fails to display
hpcc-systems · Aug 16, 2022 · 3bbb5bc · 3bbb5bc
2 parents 0d4f818 + 3d5ed26
commit 3bbb5bc
Show file tree

Hide file tree

Showing 21 changed files with 2,540 additions and 2,663 deletions.
diff --git a/ecl-sample/notebooks/wuResult.eclnb b/ecl-sample/notebooks/wuResult.eclnb
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "@vscode/debugprotocol": "1.57.0",
     "@vscode/extension-telemetry": "0.6.2",
     "adm-zip": "0.5.9",
-    "antlr4": "~4.10.1",
+    "antlr4": "4.10.1",
     "assert": "2.0.0",
     "browserify-zlib": "0.2.0",
     "buffer": "6.0.3",
@@ -115,6 +115,8 @@
   "activationEvents": [
     "onLanguage:ecl",
     "onNotebook:ecl-notebook",
+    "onRenderer:ecl-notebook-wurenderer",
+    "onRenderer:ecl-notebook-ojsrenderer",
     "onLanguage:kel",
     "workspaceContains:*.ecl",
     "workspaceContains:*.ecllib",
@@ -537,6 +539,22 @@
           "dark": "./resources/dark/dashy-edit.svg",
           "light": "./resources/light/dashy-edit.svg"
         }
+      },
+      {
+        "command": "notebook.cell.public",
+        "title": "%Public%",
+        "icon": {
+          "dark": "./resources/dark/eye.svg",
+          "light": "./resources/light/eye.svg"
+        }
+      },
+      {
+        "command": "notebook.cell.private",
+        "title": "%Private%",
+        "icon": {
+          "dark": "./resources/dark/eye-closed.svg",
+          "light": "./resources/light/eye-closed.svg"
+        }
       }
     ],
     "menus": {
@@ -746,6 +764,18 @@
           "when": "view == hpccPlatform && viewItem == ECLResultNode",
           "group": "inline"
         }
+      ],
+      "notebook/cell/title": [
+        {
+          "command": "notebook.cell.public",
+          "when": "notebookType == ecl-notebook && notebookCellType == code && isPublic",
+          "group": "inline@3"
+        },
+        {
+          "command": "notebook.cell.private",
+          "when": "notebookType == ecl-notebook && notebookCellType == code && isPrivate",
+          "group": "inline@3"
+        }
       ]
     },
     "keybindings": [
@@ -1049,12 +1079,22 @@
     ],
     "notebookRenderer": [
       {
-        "id": "ojs-notebook-renderer",
+        "id": "ecl-notebook-wurenderer",
+        "displayName": "Workunit Renderer",
+        "entrypoint": "./dist/wuRenderer.js",
+        "mimeTypes": [
+          "application/hpcc.wu+json"
+        ],
+        "requiresMessaging": "always"
+      },
+      {
+        "id": "ecl-notebook-ojsrenderer",
         "displayName": "ObservableJS Renderer",
-        "entrypoint": "./dist/renderer.js",
+        "entrypoint": "./dist/ojsRenderer.js",
         "mimeTypes": [
           "application/hpcc.ojs+json"
-        ]
+        ],
+        "requiresMessaging": "always"
       }
     ],
     "debuggers": [

diff --git a/scripts/grammar-generate.sh b/scripts/grammar-generate.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 cd ./grammar/kel
-java -jar ../antlr-4.9.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/kel -visitor -Xexact-output-dir ./*.g4
+java -jar ../antlr-4.10.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/kel -visitor -Xexact-output-dir ./*.g4
 cd ../..
 
 cd ./grammar/salt
-java -jar ../antlr-4.9.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/salt -visitor -Xexact-output-dir ./*.g4
+java -jar ../antlr-4.10.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/salt -visitor -Xexact-output-dir ./*.g4
 cd ../..
 
-cd ./grammar/dude
-java -jar ../antlr-4.9.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/dude -visitor -Xexact-output-dir ./*.g4
-cd ../..
+# cd ./grammar/dude
+# java -jar ../antlr-4.10.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/dude -visitor -Xexact-output-dir ./*.g4
+# cd ../..
 
-cd ./grammar/trixe
-java -jar ../antlr-4.9.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/trixe -visitor -Xexact-output-dir ./*.g4
-cd ../..
+# cd ./grammar/trixe
+# java -jar ../antlr-4.10.1-complete.jar -Dlanguage=JavaScript -o ../../src/grammar/trixe -visitor -Xexact-output-dir ./*.g4
+# cd ../..
diff --git a/src/eclwatch/WUResult.tsx b/src/eclwatch/WUResult.tsx
@@ -5,7 +5,7 @@ import { IOptions, Result, XSDXMLNode } from "@hpcc-js/comms";
 import { WUInfo } from "@hpcc-js/comms";
 import { Common, Table } from "@hpcc-js/dgrid";
 import { hashSum } from "@hpcc-js/util";
-import { Stack, Checkbox, ContextualMenu, ContextualMenuItemType, DefaultButton, Dialog, DialogFooter, DialogType, IContextualMenuItem, Label, PrimaryButton, ProgressIndicator, SpinButton, Spinner } from "@fluentui/react";
+import { Stack, Checkbox, ContextualMenu, ContextualMenuItemType, DefaultButton, Dialog, DialogFooter, DialogType, IContextualMenuItem, PrimaryButton, ProgressIndicator, SpinButton } from "@fluentui/react";
 import * as copy from "copy-to-clipboard";
 import { VisualizationComponent } from "./hpccVizAdapter";
 import { Store } from "./WUResultStore";

diff --git a/src/extension.ts b/src/extension.ts
@@ -1,15 +1,16 @@
 import * as vscode from "vscode";
 import { initialize } from "./util/localize";
 import { activate as telemetryActivate, deactivate as telemetryDeactivate, reporter } from "./telemetry";
+import { activate as notebookActivate } from "./notebook/main";
 
 export function activate(context: vscode.ExtensionContext): void {
     performance.mark("extension-start");
     telemetryActivate(context);
+    notebookActivate(context);
 
     initialize().then(() => {
         return Promise.all([
             import("./ecl/main").then(({ activate }) => activate(context)),
-            import("./notebook/main").then(({ activate }) => activate(context)),
             import("./kel/main").then(({ activate }) => activate(context)),
             import("./dashy/main").then(({ activate }) => activate(context))
         ]);