Skip to content

Commit 7a607f3

Browse files
committed
Include the users item widget to the collaborative chat toolbar
1 parent 1a3d918 commit 7a607f3

File tree

5 files changed

+66
-8
lines changed

5 files changed

+66
-8
lines changed

packages/jupyterlab-chat-extension/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@jupyter-notebook/application": "^7.2.0",
51+
"@jupyter/collaboration": "^3.1.1",
5152
"@jupyter/collaborative-drive": "^3.0.0",
5253
"@jupyter/ydoc": "^2.0.0 || ^3.0.0",
5354
"@jupyterlab/application": "^4.2.0",

packages/jupyterlab-chat-extension/schema/chat-panel.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
{
1212
"name": "markAsRead",
1313
"command": "jupyterlab-chat:markAsRead"
14-
}
14+
},
15+
{ "name": "spacer", "type": "spacer", "rank": 100 },
16+
{ "name": "usersItem", "rank": 150 }
1517
]
1618
},
1719
"properties": {},

packages/jupyterlab-chat-extension/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
chatIcon,
2121
readIcon
2222
} from '@jupyter/chat';
23+
import { UsersItem } from '@jupyter/collaboration';
2324
import {
2425
ICollaborativeDrive,
2526
SharedDocumentFactory
@@ -240,6 +241,9 @@ const docFactories: JupyterFrontEndPlugin<IChatFactory> = {
240241
pluginIds.docFactories,
241242
translator
242243
);
244+
toolbarRegistry.addFactory<LabChatPanel>(FACTORY, 'usersItem', panel =>
245+
UsersItem.createWidget({ model: panel.model })
246+
);
243247
}
244248

245249
// Wait for the application to be restored and

packages/jupyterlab-chat-extension/style/base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
*/
1111

1212
@import url('~jupyterlab-chat/style/index.css');
13+
@import url('@jupyter/collaboration/style/index.css');

yarn.lock

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,6 +1820,15 @@ __metadata:
18201820
languageName: node
18211821
linkType: hard
18221822

1823+
"@codemirror/state@npm:^6.2.0, @codemirror/state@npm:^6.5.0":
1824+
version: 6.5.2
1825+
resolution: "@codemirror/state@npm:6.5.2"
1826+
dependencies:
1827+
"@marijn/find-cluster-break": ^1.0.0
1828+
checksum: 4473a79475070d73f2e72f2eaaee5b69d2833b5020faa9714609d95dd03f0e5ad02cad8031a541dcd748436842a300332a2925317b39ffa09e3b4831145d98bc
1829+
languageName: node
1830+
linkType: hard
1831+
18231832
"@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0, @codemirror/view@npm:^6.26.0, @codemirror/view@npm:^6.27.0":
18241833
version: 6.28.4
18251834
resolution: "@codemirror/view@npm:6.28.4"
@@ -1831,6 +1840,17 @@ __metadata:
18311840
languageName: node
18321841
linkType: hard
18331842

1843+
"@codemirror/view@npm:^6.7.0":
1844+
version: 6.36.8
1845+
resolution: "@codemirror/view@npm:6.36.8"
1846+
dependencies:
1847+
"@codemirror/state": ^6.5.0
1848+
style-mod: ^4.1.0
1849+
w3c-keyname: ^2.2.4
1850+
checksum: 6b5bbbd6f73bf2486170e3ee6b13660b8919ec544dc527dbe6357034a534dbd7deea3e660fbcd67c5e53ea808d6411ddd355eb9cf3dc4dded2a7c3f95a7fb0ac
1851+
languageName: node
1852+
linkType: hard
1853+
18341854
"@csstools/css-parser-algorithms@npm:^2.3.1":
18351855
version: 2.7.1
18361856
resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
@@ -2534,6 +2554,28 @@ __metadata:
25342554
languageName: unknown
25352555
linkType: soft
25362556

2557+
"@jupyter/collaboration@npm:^3.1.1":
2558+
version: 3.1.2
2559+
resolution: "@jupyter/collaboration@npm:3.1.2"
2560+
dependencies:
2561+
"@codemirror/state": ^6.2.0
2562+
"@codemirror/view": ^6.7.0
2563+
"@jupyterlab/apputils": ^4.0.5
2564+
"@jupyterlab/coreutils": ^6.0.5
2565+
"@jupyterlab/docregistry": ^4.0.5
2566+
"@jupyterlab/services": ^7.0.5
2567+
"@jupyterlab/ui-components": ^4.0.5
2568+
"@lumino/coreutils": ^2.1.0
2569+
"@lumino/signaling": ^2.0.0
2570+
"@lumino/virtualdom": ^2.0.0
2571+
"@lumino/widgets": ^2.1.0
2572+
react: ^18.2.0
2573+
y-protocols: ^1.0.5
2574+
yjs: ^13.5.40
2575+
checksum: fc79ac496959b6dd5fdabd79ca5fba10c95ea2793e353966c08b2989df359451567beaf5c4eba2044d9e180519e9aca0f6c378d6faf4782ffd83243dafe8664b
2576+
languageName: node
2577+
linkType: hard
2578+
25372579
"@jupyter/collaborative-drive@npm:^3.0.0":
25382580
version: 3.0.1
25392581
resolution: "@jupyter/collaborative-drive@npm:3.0.1"
@@ -2625,7 +2667,7 @@ __metadata:
26252667
languageName: node
26262668
linkType: hard
26272669

2628-
"@jupyterlab/apputils@npm:^4.3.0, @jupyterlab/apputils@npm:^4.3.3":
2670+
"@jupyterlab/apputils@npm:^4.0.5, @jupyterlab/apputils@npm:^4.3.0, @jupyterlab/apputils@npm:^4.3.3":
26292671
version: 4.3.3
26302672
resolution: "@jupyterlab/apputils@npm:4.3.3"
26312673
dependencies:
@@ -2811,7 +2853,7 @@ __metadata:
28112853
languageName: node
28122854
linkType: hard
28132855

2814-
"@jupyterlab/coreutils@npm:^6.2.0, @jupyterlab/coreutils@npm:^6.2.3":
2856+
"@jupyterlab/coreutils@npm:^6.0.5, @jupyterlab/coreutils@npm:^6.2.0, @jupyterlab/coreutils@npm:^6.2.3":
28152857
version: 6.2.3
28162858
resolution: "@jupyterlab/coreutils@npm:6.2.3"
28172859
dependencies:
@@ -2878,7 +2920,7 @@ __metadata:
28782920
languageName: node
28792921
linkType: hard
28802922

2881-
"@jupyterlab/docregistry@npm:^4.2.0, @jupyterlab/docregistry@npm:^4.2.3, @jupyterlab/docregistry@npm:~4.2.0":
2923+
"@jupyterlab/docregistry@npm:^4.0.5, @jupyterlab/docregistry@npm:^4.2.0, @jupyterlab/docregistry@npm:^4.2.3, @jupyterlab/docregistry@npm:~4.2.0":
28822924
version: 4.2.3
28832925
resolution: "@jupyterlab/docregistry@npm:4.2.3"
28842926
dependencies:
@@ -3140,7 +3182,7 @@ __metadata:
31403182
languageName: node
31413183
linkType: hard
31423184

3143-
"@jupyterlab/services@npm:^7.2.0, @jupyterlab/services@npm:^7.2.3":
3185+
"@jupyterlab/services@npm:^7.0.5, @jupyterlab/services@npm:^7.2.0, @jupyterlab/services@npm:^7.2.3":
31443186
version: 7.2.3
31453187
resolution: "@jupyterlab/services@npm:7.2.3"
31463188
dependencies:
@@ -3265,7 +3307,7 @@ __metadata:
32653307
languageName: node
32663308
linkType: hard
32673309

3268-
"@jupyterlab/ui-components@npm:^4.2.0, @jupyterlab/ui-components@npm:^4.2.3, @jupyterlab/ui-components@npm:~4.2.0":
3310+
"@jupyterlab/ui-components@npm:^4.0.5, @jupyterlab/ui-components@npm:^4.2.0, @jupyterlab/ui-components@npm:^4.2.3, @jupyterlab/ui-components@npm:~4.2.0":
32693311
version: 4.2.3
32703312
resolution: "@jupyterlab/ui-components@npm:4.2.3"
32713313
dependencies:
@@ -3677,7 +3719,7 @@ __metadata:
36773719
languageName: node
36783720
linkType: hard
36793721

3680-
"@lumino/virtualdom@npm:^2.0.1, @lumino/virtualdom@npm:^2.0.2":
3722+
"@lumino/virtualdom@npm:^2.0.0, @lumino/virtualdom@npm:^2.0.1, @lumino/virtualdom@npm:^2.0.2":
36813723
version: 2.0.2
36823724
resolution: "@lumino/virtualdom@npm:2.0.2"
36833725
dependencies:
@@ -3686,7 +3728,7 @@ __metadata:
36863728
languageName: node
36873729
linkType: hard
36883730

3689-
"@lumino/widgets@npm:^1.37.2 || ^2.3.2, @lumino/widgets@npm:^2.0.0, @lumino/widgets@npm:^2.3.2, @lumino/widgets@npm:^2.4.0":
3731+
"@lumino/widgets@npm:^1.37.2 || ^2.3.2, @lumino/widgets@npm:^2.0.0, @lumino/widgets@npm:^2.1.0, @lumino/widgets@npm:^2.3.2, @lumino/widgets@npm:^2.4.0":
36903732
version: 2.4.0
36913733
resolution: "@lumino/widgets@npm:2.4.0"
36923734
dependencies:
@@ -3705,6 +3747,13 @@ __metadata:
37053747
languageName: node
37063748
linkType: hard
37073749

3750+
"@marijn/find-cluster-break@npm:^1.0.0":
3751+
version: 1.0.2
3752+
resolution: "@marijn/find-cluster-break@npm:1.0.2"
3753+
checksum: 0d836de25e04d58325813401ef3c2d34caf040da985a5935fcbc9d84e7b47a21bdb15f57d70c2bf0960bd29ed3dbbb1afd00cdd0fc4fafbee7fd0ffe7d508ae1
3754+
languageName: node
3755+
linkType: hard
3756+
37083757
"@microsoft/fast-colors@npm:^5.3.1":
37093758
version: 5.3.1
37103759
resolution: "@microsoft/fast-colors@npm:5.3.1"
@@ -10105,6 +10154,7 @@ __metadata:
1010510154
resolution: "jupyterlab-chat-extension@workspace:packages/jupyterlab-chat-extension"
1010610155
dependencies:
1010710156
"@jupyter-notebook/application": ^7.2.0
10157+
"@jupyter/collaboration": ^3.1.1
1010810158
"@jupyter/collaborative-drive": ^3.0.0
1010910159
"@jupyter/ydoc": ^2.0.0 || ^3.0.0
1011010160
"@jupyterlab/application": ^4.2.0

0 commit comments

Comments
 (0)