dbg

Author: malcolm-sparkfun

kernel/src/components/Dialog.ts

@@ -2,12 +2,12 @@ import { ConnectCard } from './ConnectCard';
 import { ServiceContainer } from '../services/ServiceContainer';
 import { Card } from './Card';
 import { NotebookPanel } from '@jupyterlab/notebook';
-import type { JupyterLiteServer } from '@jupyterlite/server';
+import { INotebookTracker} from '@jupyterlab/notebook';
 
 export interface DialogProps {
   closeDialog: () => void;
   serviceContainer: ServiceContainer;
-  app: JupyterLiteServer;
+  nTracker: INotebookTracker;
 }
 
 export class Dialog {
@@ -48,8 +48,10 @@ export class Dialog {
     // create an arrow function that calls the save method on the serviceContainer but first iterates over all cells and gathers their code content if they are code cells
     async () => {
       // TODO: current widget might not be correct at this level, need to check and possibly change how we're getting this
-      console.log("[Dialog] saveCard: props.app =", props.app);
-      const notebook = (props.app.shell as any).currentWidget as NotebookPanel | null;
+      // console.log("[Dialog] saveCard: props.app =", props.app);
+      // const notebook = (props.app.shell as any).currentWidget as NotebookPanel | null;
+      // console.log("[Dialog] saveCard: notebook =", notebook);
+      const notebook = props.nTracker.currentWidget as NotebookPanel | null;
       var allCellContent : string = '';
 
       console.log("[Dialog] saveCard: Saving notebook content...");

kernel/src/index.ts

@@ -1,7 +1,7 @@
 // Removed Widget import as we're no longer using @lumino/widgets
 import { JupyterLiteServer, JupyterLiteServerPlugin } from '@jupyterlite/server';
 import { IKernel, IKernelSpecs } from '@jupyterlite/kernel';
-// import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
+import { INotebookTracker} from '@jupyterlab/notebook';
 import { EmbeddedKernel } from './kernel';
 import WelcomePanel from './panel';
 import { ServiceContainer } from './services/ServiceContainer';
@@ -14,8 +14,8 @@ var devService: DeviceService | null = null;
 const kernelPlugin: JupyterLiteServerPlugin<void> = {
   id: 'jupyterlite-embedded-kernel:kernel',
   autoStart: true,
-  requires: [IKernelSpecs],
-  activate: (app: JupyterLiteServer, kernelspecs: IKernelSpecs) => {
+  requires: [IKernelSpecs, INotebookTracker],
+  activate: (app: JupyterLiteServer, kernelspecs: IKernelSpecs, notebookTracker: INotebookTracker) => {
     const activeKernels = new Map<string, EmbeddedKernel>();
 
     app.router.post('/api/kernels/(.*)/interrupt', async (req, kernelId: string) => {
@@ -54,7 +54,7 @@ const kernelPlugin: JupyterLiteServerPlugin<void> = {
 
         const welcomePanel = new WelcomePanel(
           serviceContainer,
-          app
+          notebookTracker
         );
         document.body.appendChild(welcomePanel.getElement());
         const kernel = new EmbeddedKernel(options, serviceContainer);
@@ -73,18 +73,6 @@ const kernelPlugin: JupyterLiteServerPlugin<void> = {
         return kernel;
       }
     });
-
-    // notebookTracker.currentChanged.connect((tracker, panel: NotebookPanel | null) => {
-    //   if (panel) {
-    //     console.log("Notebook changed to: ", panel.context.path);
-    //     const currentNotebookPanel = notebookTracker.currentWidget;
-        
-
-    //   }
-    //   else{
-    //     console.log("No notebook currently active on currentChanged event.")
-    //   }
-    // });
   }
 };
 

kernel/src/panel.ts

@@ -2,7 +2,7 @@ import { globalStyles, animations, overlayStyles, dialogStyles, minimizedStyles,
 import { MinimizedButton } from './components/MinimizedButton';
 import { Dialog } from './components/Dialog';
 import { ServiceContainer } from './services/ServiceContainer';
-import type { JupyterLiteServer } from '@jupyterlite/server';
+import { INotebookTracker} from '@jupyterlab/notebook';
 
 class DialogPanel {
   private element: HTMLDivElement;
@@ -94,7 +94,7 @@ export default class WelcomePanel {
 
   constructor(
     private serviceContainer: ServiceContainer,
-    private app: JupyterLiteServer
+    private nTracker: INotebookTracker
   ) {
 
     this.element = document.createElement('div');
@@ -119,7 +119,7 @@ export default class WelcomePanel {
     const dialog = new Dialog({
       closeDialog: () => this.hide(),
       serviceContainer: this.serviceContainer,
-      app: this.app,
+      nTracker: this.nTracker,
     });
     this.dialogPanel = new DialogPanel(dialog);