#7611 fix CodeCells not working in Lab (#7622)

* #7611 fix CodeCells not working in Lab * #7611 yarn.lock
twosigma · Jul 2, 2018 · f134f00 · f134f00
1 parent f3c1697
commit f134f00
Show file tree

Hide file tree

Showing 4 changed files with 519 additions and 551 deletions.
diff --git a/js/lab/package.json b/js/lab/package.json
@@ -32,7 +32,7 @@
     "@jupyterlab/outputarea": "^0.15.2",
     "@jupyterlab/rendermime": "^0.15.2",
     "@jupyterlab/rendermime-interfaces": "^1.0.4",
-    "@jupyterlab/services": "^1.1.2",
+    "@jupyterlab/services": "^1.1.4",
     "@phosphor/datagrid": "^0.1.6",
     "@types/node": "^8.0.56",
     "rimraf": "^2.6.2",

diff --git a/js/lab/src/plugin/codeCells.ts b/js/lab/src/plugin/codeCells.ts
@@ -25,17 +25,18 @@ export function sendJupyterCodeCells(
   notebook: Notebook,
   filter: string
 ): void {
-  const comm = kernelInstance.connectToComm(BEAKER_GETCODECELLS);
-  const codeCells = <JSONArray>getCodeCellsByTag(notebook, filter)
-    .map((cell: CodeCell): object => ({
-        cell_type: cell.model.type,
-        ...cell.model.toJSON()
-      })
-    );
+  kernelInstance.connectToComm(BEAKER_GETCODECELLS)['then'](comm => {
+    const codeCells = <JSONArray>getCodeCellsByTag(notebook, filter)
+      .map((cell: CodeCell): object => ({
+          cell_type: cell.model.type,
+          ...cell.model.toJSON()
+        })
+      );
 
-  comm.open();
-  comm.send({ code_cells: codeCells });
-  comm.dispose();
+    comm.open();
+    comm.send({ code_cells: codeCells });
+    comm.dispose();
+  });
 }
 
 export function getCodeCellsByTag(notebook: Notebook, tag: string): Cell[] {

diff --git a/js/lab/src/plugin/comm.ts b/js/lab/src/plugin/comm.ts
@@ -103,9 +103,9 @@ const assignMsgHandlersToExistingComms = (
   msgHandlers: Object
 ): void => {
   for (let commId in comms) {
-    let comm = kernelInstance.connectToComm(comms[commId].target_name, commId);
-
-    assignMsgHandlerToComm(comm, msgHandlers[comm.targetName]);
+    kernelInstance.connectToComm(comms[commId].target_name, commId)['then'](comm => {
+      assignMsgHandlerToComm(comm, msgHandlers[comm.targetName]);
+    });
   }
 };