revert notebookId change

jupyter-book · Jul 14, 2024 · 4fdea73 · 4fdea73
1 parent aefbd35
commit 4fdea73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/core/src/cell.ts b/packages/core/src/cell.ts
@@ -7,31 +7,30 @@ import { CellStatusEvent, ErrorStatusEvent, errorToMessage, EventSubject } from
 import { EventEmitter } from './emitter';
 import type { ICodeCell, IError, IOutput } from '@jupyterlab/nbformat';
 import { ensureString, shortId } from './utils';
-import type ThebeNotebook from './notebook';
 
 class ThebeCodeCell extends PassiveCellRenderer implements IThebeCell {
   kind: CellKind;
+  notebookId: string;
   source: string;
   metadata: JsonObject;
   session?: ThebeSession;
   executionCount: number | null;
-  notebook?: ThebeNotebook;
   protected busy: boolean;
   protected events: EventEmitter;
 
   constructor(
     id: string,
+    notebookId: string,
     source: string,
     outputs: IOutput[],
     config: Config,
     metadata: JsonObject,
     rendermime: IRenderMimeRegistry,
-    notebook?: ThebeNotebook,
   ) {
     super(id, outputs, rendermime);
     this.kind = 'code';
     this.events = new EventEmitter(id, config, EventSubject.cell, this);
-    this.notebook = notebook;
+    this.notebookId = notebookId;
     this.source = source;
     this.metadata = metadata;
     this.busy = false;
@@ -41,18 +40,18 @@ class ThebeCodeCell extends PassiveCellRenderer implements IThebeCell {
 
   static fromICodeCell(
     icc: ICodeCell,
+    notebookId: string,
     config: Config,
     rendermime: IRenderMimeRegistry,
-    notebook?: ThebeNotebook,
   ) {
     const cell = new ThebeCodeCell(
       icc.id ?? shortId(),
+      notebookId,
       ensureString(icc.source),
       icc.outputs ?? [],
       config,
       icc.metadata,
       rendermime,
-      notebook,
     );
     Object.assign(cell.metadata, icc.metadata);
 

diff --git a/packages/core/src/notebook.ts b/packages/core/src/notebook.ts
@@ -52,12 +52,12 @@ class ThebeNotebook {
       const metadata = {};
       const cell = new ThebeCodeCell(
         c.id,
+        notebook.id,
         c.source,
         c.outputs ?? [],
         config,
         metadata,
         notebook.rendermime,
-        notebook,
       );
       console.debug(`thebe:notebook:fromCodeBlocks Initializing cell ${c.id}`);
       return cell;
@@ -73,7 +73,12 @@ class ThebeNotebook {
 
     notebook.cells = ipynb.cells.map((c) => {
       if ((c as ICodeCell).cell_type === 'code')
-        return ThebeCodeCell.fromICodeCell(c as ICodeCell, config, notebook.rendermime, notebook);
+        return ThebeCodeCell.fromICodeCell(
+          c as ICodeCell,
+          notebook.id,
+          config,
+          notebook.rendermime,
+        );
       return ThebeMarkdownCell.fromICell(c, notebook.rendermime, notebook);
     });