fix(notebook): Disable public/private button

Won't be able to implement feature until NotebookEdit is finalised

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

package.json

@@ -548,15 +548,17 @@
         "icon": {
           "dark": "./resources/dark/eye.svg",
           "light": "./resources/light/eye.svg"
-        }
+        },
+        "enablement": "false"
       },
       {
         "command": "notebook.cell.private",
         "title": "%Private%",
         "icon": {
           "dark": "./resources/dark/eye-closed.svg",
           "light": "./resources/light/eye-closed.svg"
-        }
+        },
+        "enablement": "false"
       }
     ],
     "menus": {
@@ -1258,4 +1260,4 @@
       }
     ]
   }
-}
+}

package.nls.json

@@ -63,6 +63,8 @@
     "Pin launch configuration": "Pin launch configuration",
     "Pin launch configuration to current document": "Pin launch configuration to current document",
     "Pinned launch configurations": "Pinned launch configurations",
+    "Private": "Private",
+    "Public": "Public",
     "Refresh": "Refresh",
     "Refresh Tree": "Refresh Tree",
     "Reject unauthorized calls e.g. SSL certificate errors": "Reject unauthorized calls e.g. SSL certificate errors",

src/notebook-renderers/WUOutputTable.tsx

@@ -84,4 +84,3 @@ export const WUOutputTables: React.FunctionComponent<WUOutput> = (output: WUOutp
         }
     </Pivot>;
 };
-

src/notebook/controller.ts

@@ -28,7 +28,7 @@ export class Controller {
     readonly label = "ECL Notebook";
     readonly supportedLanguages = ["ecl", "ojs"];
 
-    private readonly _controller: vscode.NotebookController;
+    readonly _controller: vscode.NotebookController;
     private _executionOrder = 0;
 
     constructor() {

src/notebook/main.ts

@@ -3,7 +3,8 @@ import { Controller } from "./controller";
 import { Serializer } from "./serializer";
 
 export function activate(ctx: vscode.ExtensionContext) {
-    ctx.subscriptions.push(new Controller());
+    const controller = new Controller();
+    ctx.subscriptions.push(controller);
     ctx.subscriptions.push(vscode.workspace.registerNotebookSerializer("ecl-notebook", new Serializer()));
 
     let publicCell: boolean = true;
@@ -12,14 +13,14 @@ export function activate(ctx: vscode.ExtensionContext) {
     vscode.commands.executeCommand("setContext", "isPrivate", !publicCell);
 
     vscode.commands.registerCommand("notebook.cell.public", (cell: vscode.NotebookCell) => {
-        // cell.metadata["private"] = true;
+        cell.metadata["custom"]["public"] = false;
         publicCell = false;
         vscode.commands.executeCommand("setContext", "isPublic", publicCell);
         vscode.commands.executeCommand("setContext", "isPrivate", !publicCell);
     });
 
     vscode.commands.registerCommand("notebook.cell.private", (cell: vscode.NotebookCell) => {
-        // cell.metadata["private"] = false;
+        cell.metadata["custom"]["public"] = true;
         publicCell = true;
         vscode.commands.executeCommand("setContext", "isPublic", publicCell);
         vscode.commands.executeCommand("setContext", "isPrivate", !publicCell);
@@ -31,4 +32,27 @@ export function activate(ctx: vscode.ExtensionContext) {
             console.log(JSON.stringify(cell.metadata));
         }
     });
+
+    vscode.workspace.onDidChangeNotebookDocument(onDidChangeNotebookCells, undefined, ctx.subscriptions);
+}
+
+function onDidChangeNotebookCells(e: vscode.NotebookDocumentChangeEvent) {
+    e.contentChanges.forEach(change => {
+        change.addedCells.forEach(cell => {
+            // const cellMetadata = getCellMetadata(cell);
+            // const edit = new vscode.WorkspaceEdit();
+            // // Don't edit the metadata directly, always get a clone (prevents accidental singletons and directly editing the objects).
+            // const updatedMetadata: CellMetadata = { ...JSON.parse(JSON.stringify(cellMetadata || {})) };
+            // edit.set(cell.notebook.uri, [vscode.NotebookEdit.updateCellMetadata(cell.index, { ...(cell.metadata), custom: updatedMetadata })]);
+            // vscode.workspace.applyEdit(edit);
+        });
+    });
 }
+
+export interface CellMetadata {
+    public: boolean;
+}
+
+function getCellMetadata(cell: vscode.NotebookCell | vscode.NotebookCellData) {
+    return cell.metadata?.custom as CellMetadata | undefined;
+}

src/notebook/serializer.ts

@@ -10,6 +10,7 @@ interface RawNotebookCell {
     kind: vscode.NotebookCellKind;
     language: string;
     value: string;
+    metadata: { [key: string]: any };
     outputs: RawNotebookOutput[];
 }
 
@@ -27,6 +28,8 @@ export class Serializer implements vscode.NotebookSerializer {
 
         const cells = raw.map(item => {
             const retVal = new vscode.NotebookCellData(item.kind, item.value, item.language);
+            retVal.metadata = retVal.metadata || {};
+            retVal.metadata.custom = retVal.metadata.custom || {};
             if (item.outputs) {
                 const cellOutput = new vscode.NotebookCellOutput(item.outputs.map(item => new vscode.NotebookCellOutputItem(Uint8Array.from(item.data), item.mime)));
                 retVal.outputs = [cellOutput];
@@ -38,6 +41,7 @@ export class Serializer implements vscode.NotebookSerializer {
     }
 
     serializeNotebook(data: vscode.NotebookData, _token: vscode.CancellationToken): Uint8Array {
+
         const contents: RawNotebookCell[] = [];
 
         for (const cell of data.cells) {
@@ -49,12 +53,15 @@ export class Serializer implements vscode.NotebookSerializer {
 
             });
 
-            contents.push({
+            const sCell = {
                 kind: cell.kind,
                 language: cell.languageId,
                 value: cell.value,
+                metadata: cell.metadata || {},
                 outputs
-            });
+            };
+            sCell.metadata.custom = sCell.metadata.custom || {};
+            contents.push(sCell);
         }
 
         return new TextEncoder().encode(JSON.stringify(contents));