Fix for testing drive

Author: fcollonval

packages/collaboration-extension/package.json

@@ -71,7 +71,7 @@
   },
   "devDependencies": {
     "@jupyterlab/builder": "^4.0.5",
-    "@types/react": "~18.0.26",
+    "@types/react": "~18.3.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^4.1.2",
     "typescript": "~5.0.4"

packages/collaboration/package.json

@@ -54,7 +54,7 @@
     "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@types/react": "^18.0.27",
+    "@types/react": "~18.3.1",
     "rimraf": "^4.1.2",
     "typescript": "~5.0.4"
   },

packages/docprovider-extension/package.json

@@ -71,7 +71,7 @@
   },
   "devDependencies": {
     "@jupyterlab/builder": "^4.0.0",
-    "@types/react": "~18.0.26",
+    "@types/react": "~18.3.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^4.1.2",
     "typescript": "~5.0.4"

packages/docprovider/src/notebookCellExecutor.ts

@@ -95,9 +95,16 @@ export class NotebookCellServerExecutor implements INotebookCellExecutor {
           let documentId = `json:notebook:${fileId}`;
           if (!fileId) {
             if (
-              this._contents.driveName(sessionContext.path) === this._drive.name
+              // FIXME sessionContext.path seems to be local - should we by-pass this test?
+              ['', this._drive.name].includes(
+                this._contents.driveName(
+                  sessionContext.session?.path ?? sessionContext.path
+                )
+              )
             ) {
-              const localPath = this._contents.localPath(sessionContext.path);
+              const localPath = this._contents.localPath(
+                sessionContext.session?.path ?? sessionContext.path
+              );
               documentId =
                 this._drive.getRoomName({
                   localPath: localPath,

yarn.lock

@@ -2100,7 +2100,7 @@ __metadata:
     "@jupyterlab/translation": ^4.2.0
     "@jupyterlab/ui-components": ^4.2.0
     "@lumino/widgets": ^2.1.0
-    "@types/react": ~18.0.26
+    "@types/react": ~18.3.1
     npm-run-all: ^4.1.5
     rimraf: ^4.1.2
     typescript: ~5.0.4
@@ -2124,7 +2124,7 @@ __metadata:
     "@lumino/coreutils": ^2.1.0
     "@lumino/virtualdom": ^2.0.0
     "@lumino/widgets": ^2.1.0
-    "@types/react": ^18.0.27
+    "@types/react": ~18.3.1
     react: ^18.2.0
     rimraf: ^4.1.2
     typescript: ~5.0.4
@@ -2141,7 +2141,7 @@ __metadata:
     "@jupyter/ydoc": ^2.0.0
     "@jupyterlab/application": ^4.2.0
     "@jupyterlab/apputils": ^4.2.0
-    "@jupyterlab/builder": ^4.0.5
+    "@jupyterlab/builder": ^4.0.0
     "@jupyterlab/docregistry": ^4.2.0
     "@jupyterlab/filebrowser": ^4.2.0
     "@jupyterlab/fileeditor": ^4.2.0
@@ -2150,7 +2150,7 @@ __metadata:
     "@jupyterlab/settingregistry": ^4.2.0
     "@jupyterlab/translation": ^4.2.0
     "@lumino/commands": ^2.1.0
-    "@types/react": ~18.0.26
+    "@types/react": ~18.3.1
     npm-run-all: ^4.1.5
     rimraf: ^4.1.2
     typescript: ~5.0.4
@@ -2165,9 +2165,13 @@ __metadata:
   resolution: "@jupyter/docprovider@workspace:packages/docprovider"
   dependencies:
     "@jupyter/ydoc": ^2.0.0
-    "@jupyterlab/coreutils": ^6.0.5
-    "@jupyterlab/services": ^7.0.5
-    "@jupyterlab/testing": ^4.0.5
+    "@jupyterlab/apputils": ^4.2.0
+    "@jupyterlab/cells": ^4.2.0
+    "@jupyterlab/coreutils": ^6.2.0
+    "@jupyterlab/notebook": ^4.2.0
+    "@jupyterlab/services": ^7.2.0
+    "@jupyterlab/testing": ^4.0.0
+    "@jupyterlab/translation": ^4.2.0
     "@lumino/coreutils": ^2.1.0
     "@lumino/disposable": ^2.1.0
     "@lumino/signaling": ^2.1.0
@@ -2312,7 +2316,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jupyterlab/builder@npm:^4.0.5":
+"@jupyterlab/builder@npm:^4.0.0, @jupyterlab/builder@npm:^4.0.5":
   version: 4.2.0
   resolution: "@jupyterlab/builder@npm:4.2.0"
   dependencies:
@@ -2814,7 +2818,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jupyterlab/testing@npm:^4.0.5":
+"@jupyterlab/testing@npm:^4.0.0":
   version: 4.2.0
   resolution: "@jupyterlab/testing@npm:4.2.0"
   dependencies:
@@ -4184,7 +4188,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^18.0.26, @types/react@npm:^18.0.27":
+"@types/react@npm:^18.0.26, @types/react@npm:~18.3.1":
   version: 18.3.1
   resolution: "@types/react@npm:18.3.1"
   dependencies:
@@ -4194,24 +4198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:~18.0.26":
-  version: 18.0.38
-  resolution: "@types/react@npm:18.0.38"
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: 34481c79f4f7ea2aefbaa45281319dc183200230d932d968463eba1643bd3635073d0a17c5c613150a69e36ca18b811ecffafea6384fa3dff3b5203866339d69
-  languageName: node
-  linkType: hard
-
-"@types/scheduler@npm:*":
-  version: 0.23.0
-  resolution: "@types/scheduler@npm:0.23.0"
-  checksum: 874d753aa65c17760dfc460a91e6df24009bde37bfd427a031577b30262f7770c1b8f71a21366c7dbc76111967384cf4090a31d65315155180ef14bd7acccb32
-  languageName: node
-  linkType: hard
-
 "@types/semver@npm:^7.3.12":
   version: 7.5.8
   resolution: "@types/semver@npm:7.5.8"
@@ -12355,14 +12341,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:^5.1.0":
-  version: 5.2.1
-  resolution: "safe-buffer@npm:5.2.1"
-  checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
-  languageName: node
-  linkType: hard
-
-"safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
+"safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
   checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c