Skip to content

Commit 694f1e4

Browse files
committed
Fix for testing drive
1 parent 901ace2 commit 694f1e4

File tree

5 files changed

+20
-28
lines changed

5 files changed

+20
-28
lines changed

packages/collaboration-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
"devDependencies": {
7373
"@jupyterlab/builder": "^4.0.5",
74-
"@types/react": "~18.0.26",
74+
"@types/react": "^18.3.1",
7575
"npm-run-all": "^4.1.5",
7676
"rimraf": "^4.1.2",
7777
"typescript": "~5.0.4"

packages/collaboration/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"yjs": "^13.5.40"
5555
},
5656
"devDependencies": {
57-
"@types/react": "^18.0.27",
57+
"@types/react": "^18.3.1",
5858
"rimraf": "^4.1.2",
5959
"typescript": "~5.0.4"
6060
},

packages/docprovider-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
"devDependencies": {
7373
"@jupyterlab/builder": "^4.0.0",
74-
"@types/react": "~18.0.26",
74+
"@types/react": "^18.3.1",
7575
"npm-run-all": "^4.1.5",
7676
"rimraf": "^4.1.2",
7777
"typescript": "~5.0.4"

packages/docprovider/src/notebookCellExecutor.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,16 @@ export class NotebookCellServerExecutor implements INotebookCellExecutor {
9595
let documentId = `json:notebook:${fileId}`;
9696
if (!fileId) {
9797
if (
98-
this._contents.driveName(sessionContext.path) === this._drive.name
98+
// FIXME sessionContext.path seems to be local - should we by-pass this test?
99+
['', this._drive.name].includes(
100+
this._contents.driveName(
101+
sessionContext.session?.path ?? sessionContext.path
102+
)
103+
)
99104
) {
100-
const localPath = this._contents.localPath(sessionContext.path);
105+
const localPath = this._contents.localPath(
106+
sessionContext.session?.path ?? sessionContext.path
107+
);
101108
documentId =
102109
this._drive.getRoomName({
103110
localPath: localPath,

yarn.lock

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,7 @@ __metadata:
21072107
"@jupyterlab/translation": ^4.2.0-beta.0
21082108
"@jupyterlab/ui-components": ^4.2.0-beta.0
21092109
"@lumino/widgets": ^2.1.0
2110-
"@types/react": ~18.0.26
2110+
"@types/react": ^18.3.1
21112111
npm-run-all: ^4.1.5
21122112
rimraf: ^4.1.2
21132113
typescript: ~5.0.4
@@ -2131,7 +2131,7 @@ __metadata:
21312131
"@lumino/coreutils": ^2.1.0
21322132
"@lumino/virtualdom": ^2.0.0
21332133
"@lumino/widgets": ^2.1.0
2134-
"@types/react": ^18.0.27
2134+
"@types/react": ^18.3.1
21352135
react: ^18.2.0
21362136
rimraf: ^4.1.2
21372137
typescript: ~5.0.4
@@ -2157,7 +2157,7 @@ __metadata:
21572157
"@jupyterlab/settingregistry": ^4.2.0
21582158
"@jupyterlab/translation": ^4.2.0
21592159
"@lumino/commands": ^2.1.0
2160-
"@types/react": ~18.0.26
2160+
"@types/react": ^18.3.1
21612161
npm-run-all: ^4.1.5
21622162
rimraf: ^4.1.2
21632163
typescript: ~5.0.4
@@ -4209,21 +4209,13 @@ __metadata:
42094209
languageName: node
42104210
linkType: hard
42114211

4212-
"@types/react@npm:^18.0.26, @types/react@npm:^18.0.27, @types/react@npm:~18.0.26":
4213-
version: 18.0.38
4214-
resolution: "@types/react@npm:18.0.38"
4212+
"@types/react@npm:^18.0.26, @types/react@npm:^18.3.1":
4213+
version: 18.3.1
4214+
resolution: "@types/react@npm:18.3.1"
42154215
dependencies:
42164216
"@types/prop-types": "*"
4217-
"@types/scheduler": "*"
42184217
csstype: ^3.0.2
4219-
checksum: 34481c79f4f7ea2aefbaa45281319dc183200230d932d968463eba1643bd3635073d0a17c5c613150a69e36ca18b811ecffafea6384fa3dff3b5203866339d69
4220-
languageName: node
4221-
linkType: hard
4222-
4223-
"@types/scheduler@npm:*":
4224-
version: 0.23.0
4225-
resolution: "@types/scheduler@npm:0.23.0"
4226-
checksum: 874d753aa65c17760dfc460a91e6df24009bde37bfd427a031577b30262f7770c1b8f71a21366c7dbc76111967384cf4090a31d65315155180ef14bd7acccb32
4218+
checksum: 9224ef319a0c2b7f66e7e7f06012aa5eb638a6c76c9742843eab1a5d243f2bed5ff829ddbb41efd60d33a266420528adfcb84cb93f238b00e905f98c3a355768
42274219
languageName: node
42284220
linkType: hard
42294221

@@ -12361,14 +12353,7 @@ __metadata:
1236112353
languageName: node
1236212354
linkType: hard
1236312355

12364-
"safe-buffer@npm:^5.1.0":
12365-
version: 5.2.1
12366-
resolution: "safe-buffer@npm:5.2.1"
12367-
checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
12368-
languageName: node
12369-
linkType: hard
12370-
12371-
"safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
12356+
"safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
1237212357
version: 5.1.2
1237312358
resolution: "safe-buffer@npm:5.1.2"
1237412359
checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c

0 commit comments

Comments
 (0)