@datalayer/jupyter-react 1.0.7 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/app/JupyterReact.js +2 -2
- package/lib/app/JupyterReact.js.map +1 -1
- package/lib/app/tabs/ComponentsTab.js.map +1 -1
- package/lib/app/tabs/components/FileBrowserComponent.js +1 -3
- package/lib/app/tabs/components/FileBrowserComponent.js.map +1 -1
- package/lib/app/tabs/components/IPyWidgetsComponent.js +1 -1
- package/lib/app/tabs/components/IPyWidgetsComponent.js.map +1 -1
- package/lib/components/cell/Cell.js +2 -2
- package/lib/components/cell/Cell.js.map +1 -1
- package/lib/components/cell/CellAdapter.js +14 -11
- package/lib/components/cell/CellAdapter.js.map +1 -1
- package/lib/components/cell/CellState.js +2 -2
- package/lib/components/cell/CellState.js.map +1 -1
- package/lib/components/codemirror/{CodeMirrorDatalayerEditor.d.ts → CodeMirrorEditor.d.ts} +12 -1
- package/lib/components/codemirror/{CodeMirrorDatalayerEditor.js → CodeMirrorEditor.js} +15 -12
- package/lib/components/codemirror/CodeMirrorEditor.js.map +1 -0
- package/lib/components/codemirror/index.d.ts +2 -1
- package/lib/components/codemirror/index.js +2 -1
- package/lib/components/codemirror/index.js.map +1 -1
- package/lib/components/console/ConsoleAdapter.js.map +1 -1
- package/lib/components/console/ConsoleState.js.map +1 -1
- package/lib/components/filebrowser/FileBrowser.js +1 -1
- package/lib/components/filebrowser/FileBrowser.js.map +1 -1
- package/lib/components/index.d.ts +1 -0
- package/lib/components/index.js +1 -1
- package/lib/components/index.js.map +1 -1
- package/lib/components/jupyterlab/JupyterLabApp.js +5 -4
- package/lib/components/jupyterlab/JupyterLabApp.js.map +1 -1
- package/lib/components/jupyterlab/JupyterLabAppAdapter.js +6 -4
- package/lib/components/jupyterlab/JupyterLabAppAdapter.js.map +1 -1
- package/lib/components/jupyterlab/JupyterLabAppCss.js +2 -2
- package/lib/components/jupyterlab/JupyterLabAppCss.js.map +1 -1
- package/lib/components/jupyterlab/JupyterLabAppPlugins.js.map +1 -1
- package/lib/components/kernel/KernelDetective.d.ts +1 -1
- package/lib/components/kernel/KernelDetective.js +5 -6
- package/lib/components/kernel/KernelDetective.js.map +1 -1
- package/lib/components/kernel/KernelSelector.js +6 -6
- package/lib/components/kernel/KernelSelector.js.map +1 -1
- package/lib/components/kernel/Kernelndicator.js +5 -3
- package/lib/components/kernel/Kernelndicator.js.map +1 -1
- package/lib/components/kernel/Kernels.js +1 -1
- package/lib/components/kernel/Kernels.js.map +1 -1
- package/lib/components/kernel/inspector/widget.js.map +1 -1
- package/lib/components/lumino/Lumino.js +32 -6
- package/lib/components/lumino/Lumino.js.map +1 -1
- package/lib/components/notebook/Notebook.d.ts +3 -3
- package/lib/components/notebook/Notebook.js +86 -111
- package/lib/components/notebook/Notebook.js.map +1 -1
- package/lib/components/notebook/Notebook2.d.ts +5 -5
- package/lib/components/notebook/Notebook2.js +8 -6
- package/lib/components/notebook/Notebook2.js.map +1 -1
- package/lib/components/notebook/Notebook2Base.d.ts +18 -6
- package/lib/components/notebook/Notebook2Base.js +47 -103
- package/lib/components/notebook/Notebook2Base.js.map +1 -1
- package/lib/components/notebook/NotebookAdapter.js +61 -49
- package/lib/components/notebook/NotebookAdapter.js.map +1 -1
- package/lib/components/notebook/NotebookCommands.js +1 -1
- package/lib/components/notebook/NotebookCommands.js.map +1 -1
- package/lib/components/notebook/NotebookExtensions.d.ts +5 -5
- package/lib/components/notebook/NotebookState.js +34 -10
- package/lib/components/notebook/NotebookState.js.map +1 -1
- package/lib/components/notebook/cell/prompt/Countdown.js.map +1 -1
- package/lib/components/notebook/cell/sidebar/CellSidebarButton.js +4 -4
- package/lib/components/notebook/cell/sidebar/CellSidebarButton.js.map +1 -1
- package/lib/components/notebook/cell/sidebar/CellSidebarExtension.d.ts +6 -3
- package/lib/components/notebook/cell/sidebar/CellSidebarExtension.js +10 -3
- package/lib/components/notebook/cell/sidebar/CellSidebarExtension.js.map +1 -1
- package/lib/components/notebook/model/JupyterReactNotebookModelFactory.js +1 -1
- package/lib/components/notebook/model/JupyterReactNotebookModelFactory.js.map +1 -1
- package/lib/components/output/Output.js +9 -9
- package/lib/components/output/Output.js.map +1 -1
- package/lib/components/output/OutputAdapter.js +3 -1
- package/lib/components/output/OutputAdapter.js.map +1 -1
- package/lib/components/output/OutputState.js.map +1 -1
- package/lib/components/terminal/TerminalAdapter.js +24 -3
- package/lib/components/terminal/TerminalAdapter.js.map +1 -1
- package/lib/components/terminal/TerminalState.js.map +1 -1
- package/lib/components/utils/SpinnerCentered.js +2 -2
- package/lib/components/utils/SpinnerCentered.js.map +1 -1
- package/lib/examples/Cell.js +1 -1
- package/lib/examples/Cell.js.map +1 -1
- package/lib/examples/Cells.js.map +1 -1
- package/lib/examples/CellsExecute.js +2 -2
- package/lib/examples/CellsExecute.js.map +1 -1
- package/lib/examples/FileBrowser.js +1 -4
- package/lib/examples/FileBrowser.js.map +1 -1
- package/lib/examples/JupyterLabApp.js +1 -7
- package/lib/examples/JupyterLabApp.js.map +1 -1
- package/lib/examples/JupyterLabAppHeadless.js +3 -8
- package/lib/examples/JupyterLabAppHeadless.js.map +1 -1
- package/lib/examples/JupyterLabAppHeadlessServerless.js +3 -8
- package/lib/examples/JupyterLabAppHeadlessServerless.js.map +1 -1
- package/lib/examples/JupyterLabAppServerless.js +1 -3
- package/lib/examples/JupyterLabAppServerless.js.map +1 -1
- package/lib/examples/JupyterLabAppServiceManager.js +1 -3
- package/lib/examples/JupyterLabAppServiceManager.js.map +1 -1
- package/lib/examples/JupyterLabTheme.js +16 -14
- package/lib/examples/JupyterLabTheme.js.map +1 -1
- package/lib/examples/KernelExecute.js +3 -2
- package/lib/examples/KernelExecute.js.map +1 -1
- package/lib/examples/KernelExecutor.js.map +1 -1
- package/lib/examples/Kernels.js +2 -2
- package/lib/examples/Kernels.js.map +1 -1
- package/lib/examples/Notebook2.js +4 -7
- package/lib/examples/Notebook2.js.map +1 -1
- package/lib/examples/Notebook2Collaborative.js +23 -0
- package/lib/examples/Notebook2Collaborative.js.map +1 -0
- package/lib/examples/NotebookCollaborative.js +4 -1
- package/lib/examples/NotebookCollaborative.js.map +1 -1
- package/lib/examples/NotebookColormode.js.map +1 -1
- package/lib/examples/NotebookExtension.js +1 -1
- package/lib/examples/NotebookExtension.js.map +1 -1
- package/lib/examples/NotebookKernel.js +1 -1
- package/lib/examples/NotebookKernel.js.map +1 -1
- package/lib/examples/NotebookKernelChange.js +2 -3
- package/lib/examples/NotebookKernelChange.js.map +1 -1
- package/lib/examples/NotebookLite.js.map +1 -1
- package/lib/examples/NotebookNbformat.js +3 -6
- package/lib/examples/NotebookNbformat.js.map +1 -1
- package/lib/examples/NotebookNbformatChange.js +6 -1
- package/lib/examples/NotebookNbformatChange.js.map +1 -1
- package/lib/examples/NotebookPathChange.js +6 -1
- package/lib/examples/NotebookPathChange.js.map +1 -1
- package/lib/examples/NotebookThemeColormode.js +9 -9
- package/lib/examples/NotebookThemeColormode.js.map +1 -1
- package/lib/examples/Output.js +11 -7
- package/lib/examples/Output.js.map +1 -1
- package/lib/examples/OutputIPyWidgets.js +3 -2
- package/lib/examples/OutputIPyWidgets.js.map +1 -1
- package/lib/examples/{Outputs.js → OutputsIpynb.js} +4 -4
- package/lib/examples/OutputsIpynb.js.map +1 -0
- package/lib/examples/RunningSessions.js +2 -6
- package/lib/examples/RunningSessions.js.map +1 -1
- package/lib/examples/Viewer.js.map +1 -1
- package/lib/examples/extensions/cellsidebars/CellSidebarSource.js +2 -2
- package/lib/examples/extensions/cellsidebars/CellSidebarSource.js.map +1 -1
- package/lib/examples/extensions/celltoolbar/CellToolbar.d.ts +2 -2
- package/lib/examples/extensions/celltoolbar/CellToolbar.js.map +1 -1
- package/lib/examples/extensions/celltoolbar/CellToolbarComponent.d.ts +2 -2
- package/lib/examples/extensions/celltoolbar/CellToolbarComponent.js.map +1 -1
- package/lib/examples/extensions/celltoolbar/CellToolbarExtension.d.ts +3 -3
- package/lib/examples/extensions/celltoolbar/CellToolbarExtension.js.map +1 -1
- package/lib/examples/extensions/celltoolbar/CellToolbarWidget.d.ts +2 -2
- package/lib/examples/extensions/celltoolbar/CellToolbarWidget.js +1 -2
- package/lib/examples/extensions/celltoolbar/CellToolbarWidget.js.map +1 -1
- package/lib/examples/extensions/exectime/ExecTimeExtension.d.ts +3 -3
- package/lib/examples/extensions/exectime/ExecTimeExtension.js +1 -2
- package/lib/examples/extensions/exectime/ExecTimeExtension.js.map +1 -1
- package/lib/examples/extensions/exectime/ExecTimeWidget.js +1 -1
- package/lib/examples/extensions/exectime/ExecTimeWidget.js.map +1 -1
- package/lib/examples/extensions/exectime/utils.js +6 -1
- package/lib/examples/extensions/exectime/utils.js.map +1 -1
- package/lib/examples/extensions/toc/TocExtension.d.ts +3 -3
- package/lib/examples/extensions/toc/TocExtension.js +2 -2
- package/lib/examples/extensions/toc/TocExtension.js.map +1 -1
- package/lib/examples/notebooks/Lite.ipynb.json +10 -28
- package/lib/examples/notebooks/NotebookExample1.ipynb.json +3 -11
- package/lib/examples/notebooks/NotebookOutputs.ipynb.json +3 -9
- package/lib/examples/notebooks/NotebookToCExample.ipynb.json +7 -22
- package/lib/examples/toolbars/NotebookToolbarAutoSave.js.map +1 -1
- package/lib/index.d.ts +0 -1
- package/lib/index.js +0 -1
- package/lib/index.js.map +1 -1
- package/lib/jupyter/Jupyter.js +3 -2
- package/lib/jupyter/Jupyter.js.map +1 -1
- package/lib/jupyter/JupyterConfig.js +16 -63
- package/lib/jupyter/JupyterConfig.js.map +1 -1
- package/lib/jupyter/JupyterContext.js +4 -3
- package/lib/jupyter/JupyterContext.js.map +1 -1
- package/lib/jupyter/JupyterDefaults.js.map +1 -1
- package/lib/jupyter/collaboration/CollaborationContext.d.ts +70 -0
- package/lib/jupyter/collaboration/CollaborationContext.js +110 -0
- package/lib/jupyter/collaboration/CollaborationContext.js.map +1 -0
- package/lib/jupyter/collaboration/ICollaborationProvider.d.ts +120 -0
- package/lib/jupyter/collaboration/ICollaborationProvider.js +93 -0
- package/lib/jupyter/collaboration/ICollaborationProvider.js.map +1 -0
- package/lib/jupyter/collaboration/JupyterCollaboration.d.ts +1 -1
- package/lib/jupyter/collaboration/JupyterCollaboration.js +1 -1
- package/lib/jupyter/collaboration/JupyterCollaboration.js.map +1 -1
- package/lib/jupyter/collaboration/index.d.ts +3 -2
- package/lib/jupyter/collaboration/index.js +3 -2
- package/lib/jupyter/collaboration/index.js.map +1 -1
- package/lib/jupyter/collaboration/providers/JupyterCollaborationProvider.d.ts +38 -0
- package/lib/jupyter/collaboration/providers/JupyterCollaborationProvider.js +98 -0
- package/lib/jupyter/collaboration/providers/JupyterCollaborationProvider.js.map +1 -0
- package/lib/jupyter/collaboration/providers/NoOpCollaborationProvider.d.ts +23 -0
- package/lib/jupyter/collaboration/providers/NoOpCollaborationProvider.js +39 -0
- package/lib/jupyter/collaboration/providers/NoOpCollaborationProvider.js.map +1 -0
- package/lib/jupyter/collaboration/providers/index.d.ts +2 -0
- package/lib/jupyter/collaboration/providers/index.js +8 -0
- package/lib/jupyter/collaboration/providers/index.js.map +1 -0
- package/lib/jupyter/ipywidgets/classic/htmlmanager.d.ts +1 -1
- package/lib/jupyter/ipywidgets/classic/htmlmanager.js +4 -4
- package/lib/jupyter/ipywidgets/classic/htmlmanager.js.map +1 -1
- package/lib/jupyter/ipywidgets/classic/manager.js +2 -1
- package/lib/jupyter/ipywidgets/classic/manager.js.map +1 -1
- package/lib/jupyter/ipywidgets/lab/manager.js +1 -1
- package/lib/jupyter/ipywidgets/lab/manager.js.map +1 -1
- package/lib/jupyter/ipywidgets/lab/renderer.js +2 -1
- package/lib/jupyter/ipywidgets/lab/renderer.js.map +1 -1
- package/lib/jupyter/ipywidgets/libembed-amd.js +4 -3
- package/lib/jupyter/ipywidgets/libembed-amd.js.map +1 -1
- package/lib/jupyter/ipywidgets/libembed.js +3 -2
- package/lib/jupyter/ipywidgets/libembed.js.map +1 -1
- package/lib/jupyter/ipywidgets/mimetypes.js.map +1 -1
- package/lib/jupyter/ipywidgets/semvercache.js.map +1 -1
- package/lib/jupyter/kernel/Kernel.js.map +1 -1
- package/lib/jupyter/kernel/KernelExecutor.js +6 -3
- package/lib/jupyter/kernel/KernelExecutor.js.map +1 -1
- package/lib/jupyter/kernel/KernelState.js +1 -1
- package/lib/jupyter/kernel/KernelState.js.map +1 -1
- package/lib/jupyter/lite/LiteServer.js +1 -1
- package/lib/jupyter/lite/LiteServer.js.map +1 -1
- package/lib/jupyter/services/ServiceManagerLess.js +15 -14
- package/lib/jupyter/services/ServiceManagerLess.js.map +1 -1
- package/lib/jupyter/services/ServiceManagerLite.js +2 -2
- package/lib/jupyter/services/ServiceManagerLite.js.map +1 -1
- package/lib/state/JupyterReactState.d.ts +0 -3
- package/lib/state/JupyterReactState.js +7 -20
- package/lib/state/JupyterReactState.js.map +1 -1
- package/lib/state/index.d.ts +1 -2
- package/lib/state/index.js +1 -2
- package/lib/state/index.js.map +1 -1
- package/lib/theme/JupyterLabCss.d.ts +0 -9
- package/lib/theme/JupyterLabCss.js +7 -16
- package/lib/theme/JupyterLabCss.js.map +1 -1
- package/lib/theme/JupyterLabCssImports.d.ts +0 -2
- package/lib/theme/JupyterLabCssImports.js +2 -2
- package/lib/theme/JupyterLabCssImports.js.map +1 -1
- package/lib/theme/JupyterReactTheme.d.ts +10 -0
- package/lib/theme/JupyterReactTheme.js +10 -0
- package/lib/theme/JupyterReactTheme.js.map +1 -1
- package/lib/theme/themes/JupyterLabTheme.js.map +1 -1
- package/lib/utils/cursorExtension.js +2 -2
- package/lib/utils/cursorExtension.js.map +1 -1
- package/package.json +4 -3
- package/lib/components/codemirror/CodeMirrorDatalayerEditor.js.map +0 -1
- package/lib/examples/NotebookMutationsKernel.js +0 -119
- package/lib/examples/NotebookMutationsKernel.js.map +0 -1
- package/lib/examples/NotebookMutationsServiceManager.js +0 -124
- package/lib/examples/NotebookMutationsServiceManager.js.map +0 -1
- package/lib/examples/Outputs.d.ts +0 -1
- package/lib/examples/Outputs.js.map +0 -1
- package/lib/jupyter/collaboration/DatalayerCollaboration.d.ts +0 -9
- package/lib/jupyter/collaboration/DatalayerCollaboration.js +0 -30
- package/lib/jupyter/collaboration/DatalayerCollaboration.js.map +0 -1
- package/lib/jupyter/collaboration/ICollaborative.d.ts +0 -36
- package/lib/jupyter/collaboration/ICollaborative.js +0 -7
- package/lib/jupyter/collaboration/ICollaborative.js.map +0 -1
- package/lib/providers/index.d.ts +0 -1
- package/lib/providers/index.js +0 -7
- package/lib/providers/index.js.map +0 -1
- package/lib/providers/kernels/DatalayerKernels.d.ts +0 -25
- package/lib/providers/kernels/DatalayerKernels.js +0 -58
- package/lib/providers/kernels/DatalayerKernels.js.map +0 -1
- package/lib/providers/kernels/index.d.ts +0 -1
- package/lib/providers/kernels/index.js +0 -7
- package/lib/providers/kernels/index.js.map +0 -1
- package/lib/state/IDatalayerConfig.d.ts +0 -22
- package/lib/state/IDatalayerConfig.js +0 -7
- package/lib/state/IDatalayerConfig.js.map +0 -1
- /package/lib/examples/{NotebookMutationsKernel.d.ts → Notebook2Collaborative.d.ts} +0 -0
- /package/lib/examples/{NotebookMutationsServiceManager.d.ts → OutputsIpynb.d.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterLabAppCss.js","sourceRoot":"","sources":["../../../src/components/jupyterlab/JupyterLabAppCss.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlC,OAAO,kDAAkD,CAAC;AAC1D,OAAO,+CAA+C,CAAC;AACvD,OAAO,mDAAmD,CAAC;AAC3D,OAAO,iDAAiD,CAAC;AACzD,OAAO,gDAAgD,CAAC;AACxD,OAAO,8CAA8C,CAAC;AACtD,OAAO,iDAAiD,CAAC;AACzD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,kDAAkD,CAAC;AAC1D,OAAO,iDAAiD,CAAC;AACzD,OAAO,iDAAiD,CAAC;AACzD,OAAO,2CAA2C,CAAC;AACnD,OAAO,+CAA+C,CAAC;AACvD,OAAO,0CAA0C,CAAC;AAClD,OAAO,+CAA+C,CAAC;AACvD,OAAO,+CAA+C,CAAC;AACvD,OAAO,iDAAiD,CAAC;AACzD,OAAO,gDAAgD,CAAC;AACxD,OAAO,gDAAgD,CAAC;AACxD,OAAO,0CAA0C,CAAC;AAClD,OAAO,kDAAkD,CAAC;AAC1D,OAAO,oDAAoD,CAAC;AAM5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,EAAE;IAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACxB,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb
|
|
1
|
+
{"version":3,"file":"JupyterLabAppCss.js","sourceRoot":"","sources":["../../../src/components/jupyterlab/JupyterLabAppCss.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlC,OAAO,kDAAkD,CAAC;AAC1D,OAAO,+CAA+C,CAAC;AACvD,OAAO,mDAAmD,CAAC;AAC3D,OAAO,iDAAiD,CAAC;AACzD,OAAO,gDAAgD,CAAC;AACxD,OAAO,8CAA8C,CAAC;AACtD,OAAO,iDAAiD,CAAC;AACzD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,kDAAkD,CAAC;AAC1D,OAAO,iDAAiD,CAAC;AACzD,OAAO,iDAAiD,CAAC;AACzD,OAAO,2CAA2C,CAAC;AACnD,OAAO,+CAA+C,CAAC;AACvD,OAAO,0CAA0C,CAAC;AAClD,OAAO,+CAA+C,CAAC;AACvD,OAAO,+CAA+C,CAAC;AACvD,OAAO,iDAAiD,CAAC;AACzD,OAAO,gDAAgD,CAAC;AACxD,OAAO,gDAAgD,CAAC;AACxD,OAAO,0CAA0C,CAAC;AAClD,OAAO,kDAAkD,CAAC;AAC1D,OAAO,oDAAoD,CAAC;AAM5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,EAAE;IAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACxB,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,+DAA+D;gBAC/D,MAAM;YACR,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,8DAA8D;gBAC9D,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,OAAO,cAAK,EAAE,EAAC,yBAAyB,GAAO,CAAC;AAClD,CAAC,CAAC;AAEF,gBAAgB,CAAC,YAAY,GAAG;IAC9B,KAAK,EAAE,OAAO;CACG,CAAC;AAEpB,eAAe,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterLabAppPlugins.js","sourceRoot":"","sources":["../../../src/components/jupyterlab/JupyterLabAppPlugins.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,iBAAiB,EAAE;QACjB,MAAM,CAAC,mCAAmC,CAAC;QAC3C,MAAM,CAAC,gCAAgC,CAAC;QACxC,MAAM,CAAC,kCAAkC,CAAC;QAC1C,MAAM,CAAC,oCAAoC,CAAC;QAC5C,MAAM,CAAC,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"JupyterLabAppPlugins.js","sourceRoot":"","sources":["../../../src/components/jupyterlab/JupyterLabAppPlugins.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,iBAAiB,EAAE;QACjB,MAAM,CAAC,mCAAmC,CAAC;QAC3C,MAAM,CAAC,gCAAgC,CAAC;QACxC,MAAM,CAAC,kCAAkC,CAAC;QAC1C,MAAM,CAAC,oCAAoC,CAAC;QAC5C,MAAM,CAAC,iCAAiC,CAAC;QACzC,8CAA8C;QAC9C,MAAM,CAAC,kCAAkC,CAAC;QAC1C,MAAM,CAAC,mCAAmC,CAAC;QAC3C,MAAM,CAAC,gCAAgC,CAAC;QACxC,MAAM,CAAC,sCAAsC,CAAC;QAC9C,MAAM,CAAC,oCAAoC,CAAC;QAC5C,MAAM,CAAC,kCAAkC,CAAC;QAC1C,MAAM,CAAC,gCAAgC,CAAC;QACxC,MAAM,CAAC,gCAAgC,CAAC;QACxC,MAAM,CAAC,kCAAkC,CAAC;QAC1C,MAAM,CAAC,iCAAiC,CAAC;QACzC,MAAM,CAAC,iCAAiC,CAAC;QACzC,MAAM,CAAC,mCAAmC,CAAC;QAC3C,MAAM,CAAC,qCAAqC,CAAC;KACF;IAC7C,qBAAqB,EAAE;QACrB,MAAM,CAAC,kCAAkC,CAAC;QAC1C,MAAM,CAAC,4BAA4B,CAAC;KACW;CAClD,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,OAAO;QACL,iBAAiB,EAAE;YACjB,MAAM,CAAC,mCAAmC,CAAC;YAC3C,MAAM,CAAC,gCAAgC,CAAC;YACxC,MAAM,CAAC,kCAAkC,CAAC;YAC1C,MAAM,CAAC,oCAAoC,CAAC;YAC5C,MAAM,CAAC,iCAAiC,CAAC;YACzC,gDAAgD;YAChD,MAAM,CAAC,kCAAkC,CAAC;YAC1C,MAAM,CAAC,sCAAsC,CAAC;YAC9C,MAAM,CAAC,mCAAmC,CAAC;YAC3C,MAAM,CAAC,gCAAgC,CAAC;YACxC,MAAM,CAAC,sCAAsC,CAAC;YAC9C,MAAM,CAAC,oCAAoC,CAAC;YAC5C,MAAM,CAAC,kCAAkC,CAAC;YAC1C,MAAM,CAAC,gCAAgC,CAAC;YACxC,0CAA0C;YAC1C,MAAM,CAAC,gCAAgC,CAAC;YACxC,MAAM,CAAC,kCAAkC,CAAC;YAC1C,MAAM,CAAC,iCAAiC,CAAC;YACzC,MAAM,CAAC,iCAAiC,CAAC;YACzC,MAAM,CAAC,mCAAmC,CAAC;YAC3C,MAAM,CAAC,2BAA2B,CAAC;YACnC,MAAM,CAAC,qCAAqC,CAAC;SACF;QAC7C,qBAAqB,EAAE;YACrB,gDAAgD;YAChD,MAAM,CAAC,kCAAkC,CAAC;YAC1C,MAAM,CAAC,4BAA4B,CAAC;SACW;KAClD,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -31,12 +31,11 @@ export const KernelDetective = (props) => {
|
|
|
31
31
|
useEffect(() => {
|
|
32
32
|
refresh();
|
|
33
33
|
}, [serviceManager]);
|
|
34
|
-
return (_jsx(_Fragment, { children: serviceManager &&
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
})] })] }) }));
|
|
34
|
+
return (_jsx(_Fragment, { children: serviceManager && (_jsxs(_Fragment, { children: [_jsx(Box, { mb: 3, children: _jsx(Button, { onClick: refresh, children: "Refresh" }) }), _jsxs(Box, { children: [_jsx(Text, { as: "h3", children: "Server Settings" }), _jsx(Label, { children: "Base URL" }), _jsxs(Text, { children: [" ", serverSettings?.baseUrl] })] }), _jsxs(Box, { children: [_jsx(Text, { as: "h3", children: "Kernels" }), kernels.map(kernel => {
|
|
35
|
+
return (_jsxs(Box, { children: [_jsx(Label, { children: "Kernel" }), _jsxs(Text, { children: [' ', kernel.name, " - ", kernel.id, " - ", kernel.connections, ' ', "connections"] })] }, kernel.id));
|
|
36
|
+
})] }), _jsxs(Box, { children: [_jsx(Text, { as: "h3", children: "Sessions" }), sessions.map(session => {
|
|
37
|
+
return (_jsxs(Box, { children: [_jsx(Label, { children: "Kernel" }), _jsxs(Text, { children: [' ', session.kernel?.name, " - ", session.kernel?.id] }), _jsx(Label, { style: { marginLeft: 10 }, children: "Session" }), _jsxs(Text, { children: [' ', session.name, " - ", session.path, " - ", session.type] })] }, session.id));
|
|
38
|
+
})] })] })) }));
|
|
40
39
|
};
|
|
41
40
|
export default KernelDetective;
|
|
42
41
|
//# sourceMappingURL=KernelDetective.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KernelDetective.js","sourceRoot":"","sources":["../../../src/components/kernel/KernelDetective.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"KernelDetective.js","sourceRoot":"","sources":["../../../src/components/kernel/KernelDetective.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,15 +25,15 @@ export const KernelSelector = (props) => {
|
|
|
25
25
|
setKernels(kernels);
|
|
26
26
|
});
|
|
27
27
|
}, [serviceManager]);
|
|
28
|
-
return (_jsx(_Fragment, { children: _jsxs(ActionMenu, { children: [_jsx(ActionMenu.Anchor, { children: _jsx(IconButton, { "aria-labelledby": "", icon: JupyterKernelGalileoIcon, variant: "invisible" }) }), _jsx(ActionMenu.Overlay, { width: "large", children: _jsxs(ActionList, { showDividers: true, children: [kernels && (_jsx(ActionList.Group, { title: "Connect to a running Kernel", children: kernels.map(kernel => {
|
|
29
|
-
return (_jsxs(ActionList.Item, { onSelect:
|
|
28
|
+
return (_jsx(_Fragment, { children: _jsxs(ActionMenu, { children: [_jsx(ActionMenu.Anchor, { children: _jsx(IconButton, { "aria-labelledby": "", icon: JupyterKernelGalileoIcon, variant: "invisible" }) }), _jsx(ActionMenu.Overlay, { width: "large", children: _jsxs(ActionList, { showDividers: true, children: [kernels && (_jsx(ActionList.Group, { title: "Connect to a running Kernel", children: kernels.map((kernel, index) => {
|
|
29
|
+
return (_jsxs(ActionList.Item, { onSelect: _e => {
|
|
30
30
|
selectKernel(kernel);
|
|
31
|
-
}, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(JupyterKernelIcon, {}) }), kernel.name, _jsx(ActionList.Description, { variant: "block", children: kernel.id })] }));
|
|
31
|
+
}, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(JupyterKernelIcon, {}) }), kernel.name, _jsx(ActionList.Description, { variant: "block", children: kernel.id })] }, kernel?.id || index));
|
|
32
32
|
}) })), _jsx(ActionList.Group, { title: "Launch a new Kernel", children: kernelSpecs &&
|
|
33
|
-
Object.values(kernelSpecs).map(specModel => {
|
|
34
|
-
return (_jsxs(ActionList.Item, { onSelect:
|
|
33
|
+
Object.values(kernelSpecs).map((specModel, index) => {
|
|
34
|
+
return (_jsxs(ActionList.Item, { onSelect: _e => {
|
|
35
35
|
selectKernelSpec(specModel);
|
|
36
|
-
}, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(JupyterKernelGalileoIcon, {}) }), specModel?.name, _jsx(ActionList.Description, { variant: "block", children: specModel?.display_name })] }));
|
|
36
|
+
}, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(JupyterKernelGalileoIcon, {}) }), specModel?.name, _jsx(ActionList.Description, { variant: "block", children: specModel?.display_name })] }, specModel?.name || index));
|
|
37
37
|
}) })] }) })] }) }));
|
|
38
38
|
};
|
|
39
39
|
export default KernelSelector;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KernelSelector.js","sourceRoot":"","sources":["../../../src/components/kernel/KernelSelector.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAa1D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,EAAE;IAC7C,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;IACjD,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAY,CAAC;IACnD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAC;IAC9D,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YAC9B,cAAc,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAClD,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC;gBAClE,cAAc,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACjD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7D,UAAU,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IACrB,OAAO,CACL,4BACE,MAAC,UAAU,eACT,KAAC,UAAU,CAAC,MAAM,cAChB,KAAC,UAAU,uBACO,EAAE,EAClB,IAAI,EAAE,wBAAwB,EAC9B,OAAO,EAAC,WAAW,GACnB,GACgB,EACpB,KAAC,UAAU,CAAC,OAAO,IAAC,KAAK,EAAC,OAAO,YAC/B,MAAC,UAAU,IAAC,YAAY,mBACrB,OAAO,IAAI,CACV,KAAC,UAAU,CAAC,KAAK,IAAC,KAAK,EAAC,6BAA6B,YAClD,OAAO,CAAC,GAAG,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"KernelSelector.js","sourceRoot":"","sources":["../../../src/components/kernel/KernelSelector.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
|
6
6
|
*/
|
|
7
7
|
import { useState, useEffect } from 'react';
|
|
8
8
|
import { Button, Tooltip } from '@primer/react';
|
|
9
|
-
import { CircleBlackIcon, CircleBrownIcon, CircleGreenIcon, CircleHollowRedIcon, CircleOrangeIcon, CirclePurpleIcon, CircleRedIcon, CircleWhiteIcon, CircleYellowIcon, CircleCurrentColorIcon, PlusCircleIcon } from '@datalayer/icons-react';
|
|
9
|
+
import { CircleBlackIcon, CircleBrownIcon, CircleGreenIcon, CircleHollowRedIcon, CircleOrangeIcon, CirclePurpleIcon, CircleRedIcon, CircleWhiteIcon, CircleYellowIcon, CircleCurrentColorIcon, PlusCircleIcon, } from '@datalayer/icons-react';
|
|
10
10
|
/**
|
|
11
11
|
* The valid kernel connection states.
|
|
12
12
|
*
|
|
@@ -25,9 +25,10 @@ import { CircleBlackIcon, CircleBrownIcon, CircleGreenIcon, CircleHollowRedIcon,
|
|
|
25
25
|
*
|
|
26
26
|
* Status = 'unknown' | 'starting' | 'idle' | 'busy' | 'terminating' | 'restarting' | 'autorestarting' | 'dead';
|
|
27
27
|
*/
|
|
28
|
+
/* eslint-disable react/jsx-key */
|
|
28
29
|
export const KERNEL_STATES = new Map([
|
|
29
30
|
['connecting', _jsx(PlusCircleIcon, {})],
|
|
30
|
-
['connected-unknown', _jsx(CircleCurrentColorIcon, { color:
|
|
31
|
+
['connected-unknown', _jsx(CircleCurrentColorIcon, { color: "lightgray" })],
|
|
31
32
|
['connected-starting', _jsx(CircleYellowIcon, {})],
|
|
32
33
|
['connected-idle', _jsx(CircleGreenIcon, {})],
|
|
33
34
|
['connected-busy', _jsx(CircleOrangeIcon, {})],
|
|
@@ -38,12 +39,13 @@ export const KERNEL_STATES = new Map([
|
|
|
38
39
|
['disconnecting', _jsx(CircleBrownIcon, {})],
|
|
39
40
|
['undefined', _jsx(CircleBlackIcon, {})],
|
|
40
41
|
]);
|
|
42
|
+
/* eslint-enable react/jsx-key */
|
|
41
43
|
export const toKernelState = (connectionStatus, status) => {
|
|
42
44
|
if (connectionStatus === 'connecting' ||
|
|
43
45
|
connectionStatus === 'disconnected') {
|
|
44
46
|
return connectionStatus;
|
|
45
47
|
}
|
|
46
|
-
return connectionStatus + '-' + status;
|
|
48
|
+
return (connectionStatus + '-' + status);
|
|
47
49
|
};
|
|
48
50
|
export const KernelIndicator = (props) => {
|
|
49
51
|
const { kernel, env } = props;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kernelndicator.js","sourceRoot":"","sources":["../../../src/components/kernel/Kernelndicator.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAgB,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,
|
|
1
|
+
{"version":3,"file":"Kernelndicator.js","sourceRoot":"","sources":["../../../src/components/kernel/Kernelndicator.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
|
|
|
7
7
|
import { useState, useEffect } from 'react';
|
|
8
8
|
import { Table, DataTable, Blankslate } from '@primer/react/experimental';
|
|
9
9
|
import { Box, Text, IconButton, Spinner } from '@primer/react';
|
|
10
|
-
import { CrossMarkIcon, JupyterIcon, NotebookIcon } from '@datalayer/icons-react';
|
|
10
|
+
import { CrossMarkIcon, JupyterIcon, NotebookIcon, } from '@datalayer/icons-react';
|
|
11
11
|
import { JSONExt } from '@lumino/coreutils';
|
|
12
12
|
import { useJupyter } from '../../jupyter/JupyterContext';
|
|
13
13
|
export const Kernels = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kernels.js","sourceRoot":"","sources":["../../../src/components/kernel/Kernels.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"Kernels.js","sourceRoot":"","sources":["../../../src/components/kernel/Kernels.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"widget.js","sourceRoot":"","sources":["../../../../src/components/kernel/inspector/widget.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EACL,aAAa,EACb,cAAc,EACd,SAAS,EACT,QAAQ,GACT,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"widget.js","sourceRoot":"","sources":["../../../../src/components/kernel/inspector/widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,23 +10,49 @@ export const Lumino = (props) => {
|
|
|
10
10
|
const ref = useRef(null);
|
|
11
11
|
const { children, id, height } = props;
|
|
12
12
|
useEffect(() => {
|
|
13
|
-
|
|
13
|
+
console.log('Lumino useEffect - ref.current:', ref.current, 'children:', children, 'children.isAttached:', children?.isAttached);
|
|
14
|
+
if (ref && ref.current && children) {
|
|
14
15
|
try {
|
|
15
|
-
|
|
16
|
+
// Only attach if not already attached
|
|
17
|
+
if (!children.isAttached) {
|
|
18
|
+
console.log('Attaching widget to DOM');
|
|
19
|
+
Widget.attach(children, ref.current);
|
|
20
|
+
console.log('Widget attached successfully');
|
|
21
|
+
console.log('Widget node:', children.node);
|
|
22
|
+
console.log('Widget node parent:', children.node.parentElement);
|
|
23
|
+
console.log('Container children after attach:', ref.current.children.length);
|
|
24
|
+
console.log('Widget is visible:', children.isVisible);
|
|
25
|
+
if (!children.isVisible) {
|
|
26
|
+
console.log('Making widget visible');
|
|
27
|
+
children.show();
|
|
28
|
+
}
|
|
29
|
+
// Force the widget to update
|
|
30
|
+
children.update();
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
console.log('Widget already attached');
|
|
34
|
+
console.log('Widget node:', children.node);
|
|
35
|
+
console.log('Widget node parent:', children.node.parentElement);
|
|
36
|
+
// Ensure widget is in the DOM
|
|
37
|
+
if (!ref.current.contains(children.node)) {
|
|
38
|
+
console.log('Widget node not in container, re-attaching');
|
|
39
|
+
Widget.attach(children, ref.current);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
16
42
|
}
|
|
17
43
|
catch (e) {
|
|
18
44
|
console.warn('Exception while attaching Lumino widget.', e);
|
|
19
45
|
}
|
|
20
46
|
return () => {
|
|
47
|
+
console.log('Lumino cleanup - detaching widget');
|
|
21
48
|
try {
|
|
22
|
-
if (children.isAttached || children.node.isConnected) {
|
|
23
|
-
|
|
49
|
+
if (children && (children.isAttached || children.node.isConnected)) {
|
|
50
|
+
console.log('Detaching widget from DOM');
|
|
24
51
|
Widget.detach(children);
|
|
25
52
|
}
|
|
26
53
|
}
|
|
27
54
|
catch (e) {
|
|
28
|
-
|
|
29
|
-
// console.debug('Exception while detaching Lumino widget.', e);
|
|
55
|
+
console.warn('Exception while detaching Lumino widget.', e);
|
|
30
56
|
}
|
|
31
57
|
};
|
|
32
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lumino.js","sourceRoot":"","sources":["../../../src/components/lumino/Lumino.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAQzC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAkB,EAAE,EAAE;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACvC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Lumino.js","sourceRoot":"","sources":["../../../src/components/lumino/Lumino.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { KernelTransfer, OnSessionConnection } from '../../state';
|
|
|
5
5
|
import { ICollaborationProvider, Kernel, Lite } from './../../jupyter';
|
|
6
6
|
import { INotebookToolbarProps } from './toolbar';
|
|
7
7
|
import './Notebook.css';
|
|
8
|
-
import {
|
|
8
|
+
import { NotebookExtension } from './NotebookExtensions';
|
|
9
9
|
export type ExternalIPyWidgets = {
|
|
10
10
|
name: string;
|
|
11
11
|
version: string;
|
|
@@ -17,8 +17,8 @@ export type INotebookProps = {
|
|
|
17
17
|
Toolbar?: (props: INotebookToolbarProps) => JSX.Element;
|
|
18
18
|
cellMetadataPanel?: boolean;
|
|
19
19
|
cellSidebarMargin?: number;
|
|
20
|
-
|
|
21
|
-
extensions?:
|
|
20
|
+
collaborationProvider?: ICollaborationProvider;
|
|
21
|
+
extensions?: NotebookExtension[];
|
|
22
22
|
height?: string;
|
|
23
23
|
id: string;
|
|
24
24
|
kernel?: Kernel;
|
|
@@ -5,18 +5,14 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
|
|
|
5
5
|
* MIT License
|
|
6
6
|
*/
|
|
7
7
|
import { YNotebook } from '@jupyter/ydoc';
|
|
8
|
-
import { URLExt } from '@jupyterlab/coreutils';
|
|
9
8
|
import { createGlobalStyle } from 'styled-components';
|
|
10
9
|
import { NotebookModel } from '@jupyterlab/notebook';
|
|
11
|
-
import { PromiseDelegate } from '@lumino/coreutils';
|
|
12
10
|
import { Box } from '@primer/react';
|
|
13
11
|
import { useEffect, useState } from 'react';
|
|
14
12
|
import { createPortal } from 'react-dom';
|
|
15
|
-
import {
|
|
16
|
-
import { jupyterReactStore, } from '../../state';
|
|
17
|
-
import { newUuid, sleep } from '../../utils';
|
|
13
|
+
import { newUuid } from '../../utils';
|
|
18
14
|
import { asObservable, Lumino } from '../lumino';
|
|
19
|
-
import {
|
|
15
|
+
import { CollaborationStatus, useJupyter, } from './../../jupyter';
|
|
20
16
|
import { CellMetadataEditor } from './cell/metadata';
|
|
21
17
|
import { NotebookAdapter } from './NotebookAdapter';
|
|
22
18
|
import { useNotebookStore } from './NotebookState';
|
|
@@ -46,18 +42,20 @@ export const Notebook = (props) => {
|
|
|
46
42
|
useRunningKernelId: props.useRunningKernelId,
|
|
47
43
|
useRunningKernelIndex: props.useRunningKernelIndex,
|
|
48
44
|
});
|
|
49
|
-
const { Toolbar,
|
|
45
|
+
const { Toolbar, collaborationProvider: collaborationProviderProp, extensions, height, maxHeight, nbformat, path, readonly, serverless, url, } = props;
|
|
50
46
|
const [id, _] = useState(props.id || newUuid());
|
|
51
47
|
const [adapter, setAdapter] = useState();
|
|
48
|
+
const [isLoading, setIsLoading] = useState(false);
|
|
52
49
|
const [extensionComponents, setExtensionComponents] = useState(new Array());
|
|
53
50
|
const kernel = props.kernel ?? defaultKernel;
|
|
54
51
|
const notebookStore = useNotebookStore();
|
|
55
52
|
const portals = notebookStore.selectNotebookPortals(id);
|
|
56
|
-
|
|
53
|
+
console.log('Notebook render - adapter:', adapter, 'isLoading:', isLoading, 'adapter.panel:', adapter?.panel);
|
|
57
54
|
// Bootstrap the Notebook Adapter.
|
|
58
55
|
const bootstrapAdapter = async (
|
|
59
56
|
// collaborative: ICollaborative,
|
|
60
57
|
serviceManager, kernel) => {
|
|
58
|
+
console.log('bootstrapAdapter called with kernel:', kernel);
|
|
61
59
|
const adapter = new NotebookAdapter({
|
|
62
60
|
...props,
|
|
63
61
|
id,
|
|
@@ -65,6 +63,7 @@ export const Notebook = (props) => {
|
|
|
65
63
|
kernel,
|
|
66
64
|
serviceManager,
|
|
67
65
|
});
|
|
66
|
+
console.log('Created adapter:', adapter);
|
|
68
67
|
// Update the local state.
|
|
69
68
|
setAdapter(adapter);
|
|
70
69
|
extensions.forEach(extension => {
|
|
@@ -149,124 +148,103 @@ export const Notebook = (props) => {
|
|
|
149
148
|
}
|
|
150
149
|
}, [serviceManager, kernel]);
|
|
151
150
|
useEffect(() => {
|
|
152
|
-
//
|
|
153
|
-
|
|
154
|
-
// to connect to the server. More over we should ensure,
|
|
155
|
-
// the connection is disposed in case the server document is
|
|
156
|
-
// reset for any reason while the client is still alive.
|
|
157
|
-
let provider = null;
|
|
158
|
-
let ready = new PromiseDelegate();
|
|
151
|
+
// Set up collaboration using the new provider system
|
|
152
|
+
let collaborationProvider = null;
|
|
159
153
|
let isMounted = true;
|
|
160
154
|
let sharedModel = null;
|
|
161
|
-
const
|
|
162
|
-
if (
|
|
163
|
-
|
|
164
|
-
provider?.disconnect();
|
|
165
|
-
// If sessionId has expired - reset the client model
|
|
166
|
-
if (event.code === 4002) {
|
|
167
|
-
provider?.destroy();
|
|
168
|
-
ready.reject('Connection closed.');
|
|
169
|
-
ready = new PromiseDelegate();
|
|
170
|
-
if (isMounted) {
|
|
171
|
-
setIsLoading(true);
|
|
172
|
-
Promise.all([connect(), ready.promise, sleep(500)])
|
|
173
|
-
.catch(error => {
|
|
174
|
-
console.error('Failed to setup collaboration connection.', error);
|
|
175
|
-
})
|
|
176
|
-
.finally(() => {
|
|
177
|
-
if (isMounted) {
|
|
178
|
-
setIsLoading(false);
|
|
179
|
-
}
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
// FIXME inform the user.
|
|
155
|
+
const connect = async () => {
|
|
156
|
+
if (!adapter?.notebookPanel || !isMounted) {
|
|
157
|
+
return;
|
|
184
158
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
provider?.off('sync', onSync);
|
|
189
|
-
ready.resolve(void 0);
|
|
159
|
+
// Use the provided collaboration provider
|
|
160
|
+
if (collaborationProviderProp) {
|
|
161
|
+
collaborationProvider = collaborationProviderProp;
|
|
190
162
|
}
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
163
|
+
if (!collaborationProvider) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
try {
|
|
194
167
|
sharedModel = new YNotebook();
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
console.
|
|
232
|
-
//
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
168
|
+
// Set up event handlers
|
|
169
|
+
const handleStatusChange = (_, status) => {
|
|
170
|
+
if (status === CollaborationStatus.Connected &&
|
|
171
|
+
adapter?.notebookPanel) {
|
|
172
|
+
// Create a new model using the synchronized shared model
|
|
173
|
+
const model = new NotebookModel({
|
|
174
|
+
collaborationEnabled: true,
|
|
175
|
+
disableDocumentWideUndoRedo: true,
|
|
176
|
+
sharedModel: sharedModel,
|
|
177
|
+
});
|
|
178
|
+
// Store the old model for disposal
|
|
179
|
+
const oldModel = adapter.notebookPanel.content.model;
|
|
180
|
+
// Safely update the model
|
|
181
|
+
try {
|
|
182
|
+
// Update the model without triggering widget reattachment
|
|
183
|
+
adapter.notebookPanel.content.model = model;
|
|
184
|
+
// Update the notebook store with the new model
|
|
185
|
+
notebookStore.changeModel({ id, notebookModel: model });
|
|
186
|
+
// Force the notebook panel to update its content
|
|
187
|
+
adapter.notebookPanel.update();
|
|
188
|
+
// Dispose the old model after successful update
|
|
189
|
+
if (oldModel && oldModel !== model) {
|
|
190
|
+
oldModel.dispose();
|
|
191
|
+
}
|
|
192
|
+
console.log('Notebook model updated with collaboration. Cell count:', model.cells?.length);
|
|
193
|
+
}
|
|
194
|
+
catch (error) {
|
|
195
|
+
console.error('Error updating notebook model:', error);
|
|
196
|
+
// Restore the old model if update fails
|
|
197
|
+
if (oldModel && !oldModel.isDisposed) {
|
|
198
|
+
adapter.notebookPanel.content.model = oldModel;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
};
|
|
203
|
+
const handleError = (_, error) => {
|
|
204
|
+
console.error('Collaboration error:', error);
|
|
205
|
+
// Handle collaboration errors
|
|
206
|
+
if (error.message.includes('session expired')) {
|
|
207
|
+
// Attempt to reconnect
|
|
208
|
+
if (isMounted && collaborationProvider && sharedModel) {
|
|
209
|
+
collaborationProvider
|
|
210
|
+
.connect(sharedModel, id)
|
|
211
|
+
.catch(console.error);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
};
|
|
215
|
+
collaborationProvider.events.statusChanged.connect(handleStatusChange);
|
|
216
|
+
collaborationProvider.events.errorOccurred.connect(handleError);
|
|
217
|
+
// Connect to collaboration service
|
|
218
|
+
await collaborationProvider.connect(sharedModel, id, {
|
|
219
|
+
serviceManager,
|
|
220
|
+
path: props.path, // Pass the notebook's path to the collaboration provider
|
|
221
|
+
});
|
|
222
|
+
console.log('Collaboration is setup with provider:', collaborationProvider.type);
|
|
223
|
+
}
|
|
224
|
+
catch (error) {
|
|
225
|
+
console.error('Failed to setup collaboration:', error);
|
|
226
|
+
setIsLoading(false);
|
|
243
227
|
}
|
|
244
228
|
};
|
|
245
|
-
if (
|
|
246
|
-
|
|
247
|
-
|
|
229
|
+
if (collaborationProviderProp) {
|
|
230
|
+
// Don't set isLoading to true here as it causes the Lumino widget to unmount
|
|
231
|
+
// setIsLoading(true);
|
|
232
|
+
connect()
|
|
248
233
|
.catch(error => {
|
|
249
234
|
console.error('Failed to setup collaboration connection.', error);
|
|
250
235
|
})
|
|
251
236
|
.finally(() => {
|
|
252
237
|
if (isMounted) {
|
|
253
|
-
setIsLoading(false);
|
|
238
|
+
// setIsLoading(false);
|
|
254
239
|
}
|
|
255
240
|
});
|
|
256
241
|
}
|
|
257
242
|
return () => {
|
|
258
243
|
isMounted = false;
|
|
259
|
-
|
|
260
|
-
(provider.synced ? Promise.resolve() : ready.promise).finally(() => {
|
|
261
|
-
provider?.off('sync', onSync);
|
|
262
|
-
provider?.off('connection-close', onConnectionClose);
|
|
263
|
-
provider?.disconnect();
|
|
264
|
-
provider?.destroy();
|
|
265
|
-
});
|
|
266
|
-
}
|
|
244
|
+
collaborationProvider?.dispose();
|
|
267
245
|
sharedModel?.dispose();
|
|
268
246
|
};
|
|
269
|
-
}, [adapter?.notebookPanel,
|
|
247
|
+
}, [adapter?.notebookPanel, collaborationProviderProp]);
|
|
270
248
|
useEffect(() => {
|
|
271
249
|
if (adapter && adapter.kernel !== kernel) {
|
|
272
250
|
adapter.setKernel(kernel);
|
|
@@ -352,10 +330,7 @@ export const Notebook = (props) => {
|
|
|
352
330
|
},
|
|
353
331
|
}, children: [_jsx(_Fragment, { children: portals?.map((portal) => portal) }), _jsx(GlobalStyle, {}), _jsx(Box, { children: extensionComponents.map((extensionComponent, index) => {
|
|
354
332
|
return (_jsx(Box, { children: extensionComponent }, `${extensionComponent}-${index}`));
|
|
355
|
-
}) }), isLoading ?
|
|
356
|
-
_jsx(Loader, {})
|
|
357
|
-
:
|
|
358
|
-
_jsx(Box, { children: adapter && _jsx(Lumino, { id: id, children: adapter.panel }) })] })] }));
|
|
333
|
+
}) }), isLoading ? (_jsx(Loader, {})) : (_jsx(Box, { children: adapter ? (_jsx(Lumino, { id: id, children: adapter.panel })) : (_jsx("div", { children: "No adapter available" })) }))] })] }));
|
|
359
334
|
};
|
|
360
335
|
Notebook.defaultProps = {
|
|
361
336
|
cellMetadataPanel: false,
|