Skip to content

Commit 6790040

Browse files
martinRenouhbcarlosjtpioafshinfcollonval
authored
RTC left panel (jupyterlab#12095)
* Add left panel for RTC Co-authored-by: martinRenou <[email protected]> Co-authored-by: Jeremy Tuloup <[email protected]> Co-authored-by: "Afshin T. Darian" <[email protected]> * Remove sidepanel * Remove uneeded token * Remove custom rtc panel CSS Co-authored-by: Frédéric Collonval <[email protected]> * Add translation * Regenerate yarn.lock and run prettier * Re-generate yarn.lock Co-authored-by: Carlos Herrero <[email protected]> Co-authored-by: Jeremy Tuloup <[email protected]> Co-authored-by: "Afshin T. Darian" <[email protected]> Co-authored-by: Frédéric Collonval <[email protected]> Co-authored-by: foo <[email protected]>
1 parent 8fb10e4 commit 6790040

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3219
-2464
lines changed

‎.github/labeler.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ pkg:codeeditor:
6666
- packages/codeeditor/**/*
6767
- packages/codeeditor/*
6868

69+
pkg:collaboration:
70+
- packages/collaboration/**/*
71+
- packages/collaboration/*
72+
- packages/collaboration-extension/**/*
73+
- packages/collaboration-extension/*
74+
6975
pkg:codemirror:
7076
- packages/codemirror/**/*
7177
- packages/codemirror/*
@@ -314,12 +320,6 @@ pkg:ui-components:
314320
- packages/ui-components-extension/**/*
315321
- packages/ui-components-extension/*
316322

317-
pkg:user:
318-
- packages/user/**/*
319-
- packages/user/*
320-
- packages/user-extension/**/*
321-
- packages/user-extension/*
322-
323323
pkg:vdom:
324324
- packages/vdom/**/*
325325
- packages/vdom/*

‎.github/workflows/linuxjs-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
js-cells,
2222
js-codeeditor,
2323
js-codemirror,
24+
js-collaboration,
2425
js-completer,
2526
js-console,
2627
js-coreutils,
@@ -49,7 +50,6 @@ jobs:
4950
js-toc,
5051
js-translation,
5152
js-ui-components,
52-
js-user,
5353
js-testutils,
5454
]
5555
fail-fast: false

‎buildutils/src/ensure-repo.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ const SKIP_CSS: Dict<string[]> = {
238238
'@jupyterlab/tooltip-extension',
239239
'@jupyterlab/translation-extension',
240240
'@jupyterlab/ui-components-extension',
241-
'@jupyterlab/user',
242-
'@jupyterlab/user-extension',
241+
'@jupyterlab/collaboration',
242+
'@jupyterlab/collaboration-extension',
243243
'@jupyterlab/vdom',
244244
'@jupyterlab/vdom-extension',
245245
'@jupyterlab/vega5-extension'

‎dev_mode/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
"@jupyterlab/codeeditor": "~4.0.0-alpha.11",
3030
"@jupyterlab/codemirror": "~4.0.0-alpha.11",
3131
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.11",
32+
"@jupyterlab/collaboration": "~4.0.0-alpha.11",
33+
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.11",
3234
"@jupyterlab/completer": "~4.0.0-alpha.11",
3335
"@jupyterlab/completer-extension": "~4.0.0-alpha.11",
3436
"@jupyterlab/console": "~4.0.0-alpha.11",
@@ -109,8 +111,6 @@
109111
"@jupyterlab/translation-extension": "~4.0.0-alpha.11",
110112
"@jupyterlab/ui-components": "~4.0.0-alpha.26",
111113
"@jupyterlab/ui-components-extension": "~4.0.0-alpha.11",
112-
"@jupyterlab/user": "~4.0.0-alpha.11",
113-
"@jupyterlab/user-extension": "~4.0.0-alpha.11",
114114
"@jupyterlab/vdom": "~4.0.0-alpha.11",
115115
"@jupyterlab/vdom-extension": "~4.0.0-alpha.11",
116116
"@jupyterlab/vega5-extension": "~4.0.0-alpha.11",
@@ -137,6 +137,7 @@
137137
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.11",
138138
"@jupyterlab/celltags-extension": "~4.0.0-alpha.11",
139139
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.11",
140+
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.11",
140141
"@jupyterlab/completer-extension": "~4.0.0-alpha.11",
141142
"@jupyterlab/console-extension": "~4.0.0-alpha.11",
142143
"@jupyterlab/coreutils": "~6.0.0-alpha.11",
@@ -176,7 +177,6 @@
176177
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.11",
177178
"@jupyterlab/translation-extension": "~4.0.0-alpha.11",
178179
"@jupyterlab/ui-components-extension": "~4.0.0-alpha.11",
179-
"@jupyterlab/user-extension": "~4.0.0-alpha.11",
180180
"@jupyterlab/vdom-extension": "~4.0.0-alpha.11",
181181
"@jupyterlab/vega5-extension": "~4.0.0-alpha.11"
182182
},
@@ -219,6 +219,7 @@
219219
"@jupyterlab/cell-toolbar-extension": "",
220220
"@jupyterlab/celltags-extension": "",
221221
"@jupyterlab/codemirror-extension": "",
222+
"@jupyterlab/collaboration-extension": "",
222223
"@jupyterlab/completer-extension": "",
223224
"@jupyterlab/console-extension": "",
224225
"@jupyterlab/csvviewer-extension": "",
@@ -254,7 +255,6 @@
254255
"@jupyterlab/tooltip-extension": "",
255256
"@jupyterlab/translation-extension": "",
256257
"@jupyterlab/ui-components-extension": "",
257-
"@jupyterlab/user-extension": "",
258258
"@jupyterlab/vdom-extension": ""
259259
},
260260
"mimeExtensions": {
@@ -271,6 +271,7 @@
271271
"@jupyterlab/cell-toolbar",
272272
"@jupyterlab/codeeditor",
273273
"@jupyterlab/codemirror",
274+
"@jupyterlab/collaboration",
274275
"@jupyterlab/completer",
275276
"@jupyterlab/console",
276277
"@jupyterlab/coreutils",
@@ -302,7 +303,6 @@
302303
"@jupyterlab/tooltip",
303304
"@jupyterlab/translation",
304305
"@jupyterlab/ui-components",
305-
"@jupyterlab/user",
306306
"@lumino/algorithm",
307307
"@lumino/application",
308308
"@lumino/commands",
@@ -333,6 +333,8 @@
333333
"@jupyterlab/codeeditor": "../packages/codeeditor",
334334
"@jupyterlab/codemirror": "../packages/codemirror",
335335
"@jupyterlab/codemirror-extension": "../packages/codemirror-extension",
336+
"@jupyterlab/collaboration": "../packages/collaboration",
337+
"@jupyterlab/collaboration-extension": "../packages/collaboration-extension",
336338
"@jupyterlab/completer": "../packages/completer",
337339
"@jupyterlab/completer-extension": "../packages/completer-extension",
338340
"@jupyterlab/console": "../packages/console",
@@ -413,8 +415,6 @@
413415
"@jupyterlab/translation-extension": "../packages/translation-extension",
414416
"@jupyterlab/ui-components": "../packages/ui-components",
415417
"@jupyterlab/ui-components-extension": "../packages/ui-components-extension",
416-
"@jupyterlab/user": "../packages/user",
417-
"@jupyterlab/user-extension": "../packages/user-extension",
418418
"@jupyterlab/vdom": "../packages/vdom",
419419
"@jupyterlab/vdom-extension": "../packages/vdom-extension",
420420
"@jupyterlab/vega5-extension": "../packages/vega5-extension",

‎dev_mode/style.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import '@jupyterlab/apputils-extension/style/index.js';
66
import '@jupyterlab/cell-toolbar-extension/style/index.js';
77
import '@jupyterlab/celltags-extension/style/index.js';
88
import '@jupyterlab/codemirror-extension/style/index.js';
9+
import '@jupyterlab/collaboration-extension/style/index.js';
910
import '@jupyterlab/completer-extension/style/index.js';
1011
import '@jupyterlab/console-extension/style/index.js';
1112
import '@jupyterlab/csvviewer-extension/style/index.js';
@@ -42,6 +43,5 @@ import '@jupyterlab/toc-extension/style/index.js';
4243
import '@jupyterlab/tooltip-extension/style/index.js';
4344
import '@jupyterlab/translation-extension/style/index.js';
4445
import '@jupyterlab/ui-components-extension/style/index.js';
45-
import '@jupyterlab/user-extension/style/index.js';
4646
import '@jupyterlab/vdom-extension/style/index.js';
4747
import '@jupyterlab/vega5-extension/style/index.js';

‎docs/source/extension/extension_points.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,10 @@ might want to use the services in your extensions.
129129
created by the application.
130130
- ``@jupyterlab/tooltip:ITooltipManager``: A service for the tooltip manager for the application.
131131
Use this to allow your extension to invoke a tooltip.
132-
- ``@jupyterlab/user:ICurrentUser``: A service for the current user information.
132+
- ``@jupyterlab/collaboration:IGlobalAwareness``: A service for the global awareness, providing information about other collaborators.
133+
- ``@jupyterlab/collaboration:ICurrentUser``: A service for the current user information.
133134
Use this if you want to access to the identity of the current connected user.
134-
- ``@jupyterlab/user:IUserMenu``: A service for the user menu on the application.
135+
- ``@jupyterlab/collaboration:IUserMenu``: A service for the user menu on the application.
135136
Use this if you want to add new items to the user menu.
136137
- ``@jupyterlab/vdom:IVDOMTracker``: A widget tracker for virtual DOM (VDOM) documents.
137138
Use this to iterate over and interact with VDOM document instances created by the application.

‎examples/federated/core_package/package.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"@jupyterlab/celltags-extension": "~4.0.0-alpha.11",
1919
"@jupyterlab/codeeditor": "^4.0.0-alpha.2",
2020
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.11",
21+
"@jupyterlab/collaboration": "^4.0.0-alpha.11",
22+
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.11",
2123
"@jupyterlab/completer": "^4.0.0-alpha.2",
2224
"@jupyterlab/completer-extension": "~4.0.0-alpha.11",
2325
"@jupyterlab/console": "^4.0.0-alpha.2",
@@ -78,8 +80,6 @@
7880
"@jupyterlab/translation-extension": "~4.0.0-alpha.11",
7981
"@jupyterlab/ui-components": "^4.0.0-alpha.17",
8082
"@jupyterlab/ui-components-extension": "~4.0.0-alpha.11",
81-
"@jupyterlab/user": "^4.0.0-alpha.9",
82-
"@jupyterlab/user-extension": "~4.0.0-alpha.11",
8383
"@jupyterlab/vdom-extension": "~4.0.0-alpha.11",
8484
"@jupyterlab/vega5-extension": "~4.0.0-alpha.11",
8585
"@lumino/algorithm": "^1.9.1",
@@ -139,7 +139,6 @@
139139
"@jupyterlab/translation": "^4.0.0-alpha.11",
140140
"@jupyterlab/translation-extension": "^4.0.0-alpha.11",
141141
"@jupyterlab/ui-components-extension": "^4.0.0-alpha.11",
142-
"@jupyterlab/user-extension": "^4.0.0-alpha.11",
143142
"@jupyterlab/vdom-extension": "^4.0.0-alpha.11",
144143
"@jupyterlab/vega5-extension": "^4.0.0-alpha.11"
145144
},
@@ -171,6 +170,7 @@
171170
"@jupyterlab/apputils",
172171
"@jupyterlab/attachments",
173172
"@jupyterlab/codeeditor",
173+
"@jupyterlab/collaboration",
174174
"@jupyterlab/completer",
175175
"@jupyterlab/console",
176176
"@jupyterlab/coreutils",
@@ -198,7 +198,6 @@
198198
"@jupyterlab/tooltip",
199199
"@jupyterlab/translation",
200200
"@jupyterlab/ui-components",
201-
"@jupyterlab/user",
202201
"@lumino/algorithm",
203202
"@lumino/application",
204203
"@lumino/commands",
@@ -253,7 +252,6 @@
253252
"@jupyterlab/tooltip-extension",
254253
"@jupyterlab/translation-extension",
255254
"@jupyterlab/ui-components-extension",
256-
"@jupyterlab/user-extension",
257255
"@jupyterlab/vdom-extension",
258256
"@jupyterlab/vega5-extension"
259257
]

‎jupyterlab/staging/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
"@jupyterlab/codeeditor": "~4.0.0-alpha.11",
3030
"@jupyterlab/codemirror": "~4.0.0-alpha.11",
3131
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.11",
32+
"@jupyterlab/collaboration": "~4.0.0-alpha.11",
33+
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.11",
3234
"@jupyterlab/completer": "~4.0.0-alpha.11",
3335
"@jupyterlab/completer-extension": "~4.0.0-alpha.11",
3436
"@jupyterlab/console": "~4.0.0-alpha.11",
@@ -109,8 +111,6 @@
109111
"@jupyterlab/translation-extension": "~4.0.0-alpha.11",
110112
"@jupyterlab/ui-components": "~4.0.0-alpha.26",
111113
"@jupyterlab/ui-components-extension": "~4.0.0-alpha.11",
112-
"@jupyterlab/user": "~4.0.0-alpha.11",
113-
"@jupyterlab/user-extension": "~4.0.0-alpha.11",
114114
"@jupyterlab/vdom": "~4.0.0-alpha.11",
115115
"@jupyterlab/vdom-extension": "~4.0.0-alpha.11",
116116
"@jupyterlab/vega5-extension": "~4.0.0-alpha.11",
@@ -125,7 +125,7 @@
125125
"@lumino/properties": "^1.8.1",
126126
"@lumino/signaling": "^1.10.1",
127127
"@lumino/virtualdom": "^1.14.1",
128-
"@lumino/widgets": "^1.32.0",
128+
"@lumino/widgets": "^1.33.0",
129129
"react": "^17.0.1",
130130
"react-dom": "^17.0.1",
131131
"yjs": "^13.5.34"
@@ -137,6 +137,7 @@
137137
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.11",
138138
"@jupyterlab/celltags-extension": "~4.0.0-alpha.11",
139139
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.11",
140+
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.11",
140141
"@jupyterlab/completer-extension": "~4.0.0-alpha.11",
141142
"@jupyterlab/console-extension": "~4.0.0-alpha.11",
142143
"@jupyterlab/coreutils": "~6.0.0-alpha.11",
@@ -176,7 +177,6 @@
176177
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.11",
177178
"@jupyterlab/translation-extension": "~4.0.0-alpha.11",
178179
"@jupyterlab/ui-components-extension": "~4.0.0-alpha.11",
179-
"@jupyterlab/user-extension": "~4.0.0-alpha.11",
180180
"@jupyterlab/vdom-extension": "~4.0.0-alpha.11",
181181
"@jupyterlab/vega5-extension": "~4.0.0-alpha.11"
182182
},
@@ -219,6 +219,7 @@
219219
"@jupyterlab/cell-toolbar-extension": "",
220220
"@jupyterlab/celltags-extension": "",
221221
"@jupyterlab/codemirror-extension": "",
222+
"@jupyterlab/collaboration-extension": "",
222223
"@jupyterlab/completer-extension": "",
223224
"@jupyterlab/console-extension": "",
224225
"@jupyterlab/csvviewer-extension": "",
@@ -254,7 +255,6 @@
254255
"@jupyterlab/tooltip-extension": "",
255256
"@jupyterlab/translation-extension": "",
256257
"@jupyterlab/ui-components-extension": "",
257-
"@jupyterlab/user-extension": "",
258258
"@jupyterlab/vdom-extension": ""
259259
},
260260
"mimeExtensions": {
@@ -271,6 +271,7 @@
271271
"@jupyterlab/cell-toolbar",
272272
"@jupyterlab/codeeditor",
273273
"@jupyterlab/codemirror",
274+
"@jupyterlab/collaboration",
274275
"@jupyterlab/completer",
275276
"@jupyterlab/console",
276277
"@jupyterlab/coreutils",
@@ -302,7 +303,6 @@
302303
"@jupyterlab/tooltip",
303304
"@jupyterlab/translation",
304305
"@jupyterlab/ui-components",
305-
"@jupyterlab/user",
306306
"@lumino/algorithm",
307307
"@lumino/application",
308308
"@lumino/commands",

0 commit comments

Comments
 (0)