Update CAD app to include missing collaboration tokens (#530)

* Update CAD APP to support the new timeline

* Update CAD APP to support the new timeline

* Remove debugs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: martinRenou

.gitignore

@@ -121,7 +121,7 @@ dmypy.json
 **/ui-tests/test-results/
 **/ui-tests/playwright-report/
 
-examples/Untitled*.ipynb
+**/*ntitled*
 # Hatchling
 jupytercad/_version.py
 

python/jupytercad_app/jupytercad_app/utils.py

@@ -29,7 +29,11 @@ def get_page_config(base_url, app_name):
         page_config,
         gpc(labextensions_path),
     )
-    required_extensions = ["@jupyter/collaboration-extension", "yjs-widgets"]
+    required_extensions = [
+        "@jupyter/collaboration-extension",
+        "@jupyter/docprovider-extension",
+        "yjs-widgets",
+    ]
     federated_extensions: Dict[str, Dict] = page_config["federated_extensions"]
     page_config["federated_extensions"] = [
         x

python/jupytercad_app/package.json

@@ -53,6 +53,7 @@
     "@codemirror/view": "^6.9.3",
     "@jupyter/collaboration": "^3.0.0-rc.0",
     "@jupyter/collaborative-drive": "^3.0.0-rc.0",
+    "@jupyter/docprovider": "^3.0.0-rc.0",
     "@jupyter/ydoc": "^3.0.0-b0",
     "@jupytercad/base": "^3.0.0-alpha.4",
     "@jupytercad/schema": "^3.0.0-alpha.4",
@@ -88,6 +89,8 @@
     "@jupyterlab/services": "^7.0.0",
     "@jupyterlab/settingregistry": "^4.0.0",
     "@jupyterlab/statedb": "^4.0.0",
+    "@jupyterlab/statusbar": "^4.0.0",
+    "@jupyterlab/statusbar-extension": "^4.0.0",
     "@jupyterlab/theme-dark-extension": "^4.0.0",
     "@jupyterlab/theme-light-extension": "^4.0.0",
     "@jupyterlab/translation": "^4.0.0",

python/jupytercad_app/src/app/plugins/mainmenu/menuWidget.ts

@@ -1,7 +1,7 @@
 import { RankedMenu, MenuSvg, homeIcon } from '@jupyterlab/ui-components';
 import { CommandRegistry } from '@lumino/commands';
 import { MenuBar } from '@lumino/widgets';
-import { CommandIDs } from '@jupytercad/base/lib/commands';
+import { CommandIDs } from '@jupytercad/base';
 import { IThemeManager } from '@jupyterlab/apputils';
 export class MainMenu extends MenuBar {
   constructor(options: {

python/jupytercad_app/src/main.ts

@@ -136,6 +136,7 @@ async function main(): Promise<void> {
       ].includes(m.id)
     ),
     require('@jupyterlab/rendermime-extension'),
+    require('@jupyterlab/statusbar-extension'),
     require('./app/plugins/paths'),
     require('./app/plugins/mainmenu'),
     require('./app/plugins/browser'),

python/jupytercad_app/src/sharedscope.ts

@@ -11,4 +11,5 @@ import '@jupyterlab/notebook';
 import '@jupyterlab/rendermime';
 import '@jupyterlab/settingregistry';
 import '@jupyterlab/statedb';
+import '@jupyterlab/statusbar';
 import 'yjs-widgets';