dbg

Author: malcolm-sparkfun

kernel/src/components/Dialog.ts

@@ -1,12 +1,14 @@
 import { ConnectCard } from './ConnectCard';
 import { ServiceContainer } from '../services/ServiceContainer';
 import { Card } from './Card';
+import { JupyterLiteServer } from '@jupyterlite/server';
 // import { NotebookPanel } from '@jupyterlab/notebook';
 // import { INotebookTracker} from '@jupyterlab/notebook';
 
 export interface DialogProps {
   closeDialog: () => void;
   serviceContainer: ServiceContainer;
+  app: JupyterLiteServer;
 }
 
 export class Dialog {
@@ -47,7 +49,14 @@ 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);
+      console.log("[Dialog] saveCard: props.app =", props.app);
+
+      // Wait for the app to not be null
+      if (!props.app) {
+        console.error("[Dialog] saveCard: props.app is null, cannot save notebook.");
+        return;
+      }
+
       // 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;

kernel/src/index.ts

@@ -17,13 +17,6 @@ const kernelPlugin: JupyterLiteServerPlugin<void> = {
   activate: (app: JupyterLiteServer, kernelspecs: IKernelSpecs) => {
     const activeKernels = new Map<string, EmbeddedKernel>();
 
-    // print the app to console
-    console.log("JupyterLite Embedded Kernel Plugin Activated. App:", app);
-    // Get the current NotebookPanel instance if available
-    // @ts-ignore: JupyterLite may expose notebook panel via global or app context
-    const notebookPanel = (window as any).notebookPanel || app.notebookPanel || null;
-    console.log("Notebook Panel:", notebookPanel);
-
     app.router.post('/api/kernels/(.*)/interrupt', async (req, kernelId: string) => {
       const kernel = activeKernels.get(kernelId);
       if (kernel) {
@@ -59,7 +52,8 @@ const kernelPlugin: JupyterLiteServerPlugin<void> = {
         devService = serviceContainer.deviceService;
 
         const welcomePanel = new WelcomePanel(
-          serviceContainer
+          serviceContainer,
+          app
         );
         document.body.appendChild(welcomePanel.getElement());
         const kernel = new EmbeddedKernel(options, serviceContainer);
@@ -76,14 +70,6 @@ const kernelPlugin: JupyterLiteServerPlugin<void> = {
 
         activeKernels.set(kernel.id, kernel);
 
-        // print the app to console
-        console.log("JupyterLite Embedded Kernel Plugin Later app show:", app);
-
-        // Get the current NotebookPanel instance if available
-        // @ts-ignore: JupyterLite may expose notebook panel via global or app context
-        const notebookPanel = (window as any).notebookPanel || app.notebookPanel || null;
-        console.log("Notebook Panel Later:", notebookPanel);
-
         return kernel;
       }
     });

kernel/src/panel.ts

@@ -3,6 +3,7 @@ import { MinimizedButton } from './components/MinimizedButton';
 import { Dialog } from './components/Dialog';
 import { ServiceContainer } from './services/ServiceContainer';
 // import { INotebookTracker} from '@jupyterlab/notebook';
+import { JupyterLiteServer } from '@jupyterlite/server';
 
 class DialogPanel {
   private element: HTMLDivElement;
@@ -94,6 +95,7 @@ export default class WelcomePanel {
 
   constructor(
     private serviceContainer: ServiceContainer,
+    private app: JupyterLiteServer
   ) {
 
     this.element = document.createElement('div');
@@ -118,6 +120,7 @@ export default class WelcomePanel {
     const dialog = new Dialog({
       closeDialog: () => this.hide(),
       serviceContainer: this.serviceContainer,
+      app: this.app
     });
     this.dialogPanel = new DialogPanel(dialog);