Merge pull request #94 from timkpaine/jlab3

comm is a promise now, upping jlab version, upping package version
finos · Apr 19, 2018 · 14f59b2 · 14f59b2
2 parents 0beb7ba + 588e52a
commit 14f59b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/packages/perspective-jupyterlab/package.json b/packages/perspective-jupyterlab/package.json
@@ -27,9 +27,9 @@
     "@jpmorganchase/perspective-viewer": "^0.1.8",
     "@jpmorganchase/perspective-viewer-highcharts": "^0.1.8",
     "@jpmorganchase/perspective-viewer-hypergrid": "^0.1.8",
-    "@jupyterlab/application": "^0.15.0",
+    "@jupyterlab/application": "^0.16.0",
     "@jupyterlab/rendermime-interfaces": "^1.0.0",
-    "@jupyterlab/services": "^1.1.1-0",
+    "@jupyterlab/services": "^2.0.0",
     "@phosphor/messaging": "^1.2.2",
     "@phosphor/widgets": "^1.5.0",
     "@types/socket.io-client": "^1.4.0",

diff --git a/packages/perspective-jupyterlab/src/ts/index.ts b/packages/perspective-jupyterlab/src/ts/index.ts
@@ -93,14 +93,15 @@ export class RenderedPSP extends Widget implements IRenderMime.IRenderer {
                     if (sessionModels[i].kernel.id === kernelId) {
                         Session.connectTo(sessionModels[i]).then(session => {
 
-                            let comm = session.kernel.connectToComm(name + '/' + channel);
-                            comm.open('ack');
-                            comm.onMsg = (msg: any) => {
-                                let dat = msg['content']['data'];
-                                let tmp = JSON.parse(dat);
-                                psp.update(tmp);
-                            };
-                            comm.onClose = (msg: any) => {};
+                            session.kernel.connectToComm(name + '/' + channel).then(comm => {
+                                comm.open('ack');
+                                comm.onMsg = (msg: any) => {
+                                    let dat = msg['content']['data'];
+                                    let tmp = JSON.parse(dat);
+                                    psp.update(tmp);
+                                };
+                                comm.onClose = (msg: any) => {};
+                            });
 
                         });
                     }