Fix deleting last cell (#27)

jupyterlab-contrib · Dec 19, 2024 · c93e430 · c93e430
1 parent 05d0b6d
commit c93e430
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/packages/base/src/localSuggestionsManager/localSuggestionsManager.ts b/packages/base/src/localSuggestionsManager/localSuggestionsManager.ts
@@ -58,10 +58,13 @@ export class LocalSuggestionsManager
             const data: IDict<ISuggestionData> = {};
             Object.entries(serializedCellSuggestions).forEach(
               ([id, serializedData]) => {
-                data[id] = this._deserializedSuggestion(
+                const newCellModel = this._deserializedSuggestion(
                   serializedData,
                   cellMap
                 );
+                if (newCellModel) {
+                  data[id] = newCellModel;
+                }
               }
             );
             currentSuggestion.set(cellID, data);
@@ -112,7 +115,7 @@ export class LocalSuggestionsManager
 
         const suggestionContent: ISuggestionData = {
           originalCellId: cellId,
-          cellModel: cloneCellModel(cell.model),
+          cellModel: cloneCellModel(cell.model)!,
           metadata: { author },
           type: options.type
         };
@@ -320,10 +323,13 @@ export class LocalSuggestionsManager
   private _deserializedSuggestion(
     serializedData: ISerializedSuggessionData,
     cellMap: IDict<ICellModel>
-  ): ISuggestionData {
+  ): ISuggestionData | undefined {
     const { originalCellId, newSource, metadata, type } = serializedData;
     const originalCellModel = cellMap[serializedData.originalCellId];
     const newCellModel = cloneCellModel(originalCellModel, newSource);
+    if (!newCellModel) {
+      return;
+    }
     return {
       originalCellId,
       cellModel: newCellModel,

diff --git a/packages/base/src/suggestionsPanel/model.ts b/packages/base/src/suggestionsPanel/model.ts
@@ -271,7 +271,7 @@ export class SuggestionsModel implements ISuggestionsModel {
         if (type === SuggestionType.delete || cellModel === null) {
           // if `cellModel` is null, it's a cell deletion suggestion,
           // we just use the origianl model to render the suggestion widget
-          newCellModel = cloneCellModel(it);
+          newCellModel = cloneCellModel(it)!;
         } else {
           newCellModel = cellModel;
         }
@@ -351,8 +351,11 @@ export class SuggestionsModel implements ISuggestionsModel {
           el => !cellInNotebook.has(el)
         );
         for (const removed of removedElements) {
-          const suggestions = this._allSuggestions?.get(removed) ?? {};
-          for (const suggestionId in suggestions) {
+          const suggestions = Object.keys(
+            this._allSuggestions?.get(removed) ?? {}
+          );
+
+          for (const suggestionId of suggestions) {
             await this.deleteSuggestion({ cellId: removed, suggestionId });
           }
         }

diff --git a/packages/base/src/tools.ts b/packages/base/src/tools.ts
@@ -207,9 +207,12 @@ export async function deleteCellById(options: {
 }
 
 export function cloneCellModel(
-  cellModel: ICellModel,
+  cellModel?: ICellModel,
   newSource?: string
-): ICellModel {
+): ICellModel | undefined {
+  if (!cellModel) {
+    return;
+  }
   let copiedCellModel: CellModel | undefined;
   const mimeType = cellModel.mimeType;
   switch (cellModel.type) {

diff --git a/yarn.lock b/yarn.lock
@@ -10332,7 +10332,7 @@ __metadata:
 
 "typescript@patch:typescript@>=3 < 6#~builtin<compat/typescript>, typescript@patch:typescript@^5#~builtin<compat/typescript>":
   version: 5.7.2
-  resolution: "typescript@patch:typescript@npm%3A5.7.2#~builtin<compat/typescript>::version=5.7.2&hash=e012d7"
+  resolution: "typescript@patch:typescript@npm%3A5.7.2#~builtin<compat/typescript>::version=5.7.2&hash=85af82"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
@@ -10342,11 +10342,11 @@ __metadata:
 
 "typescript@patch:typescript@~5.0.2#~builtin<compat/typescript>":
   version: 5.0.4
-  resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058"
+  resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=85af82"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: d26b6ba97b6d163c55dbdffd9bbb4c211667ebebc743accfeb2c8c0154aace7afd097b51165a72a5bad2cf65a4612259344ff60f8e642362aa1695c760d303ac
+  checksum: bb309d320c59a26565fb3793dba550576ab861018ff3fd1b7fccabbe46ae4a35546bc45f342c0a0b6f265c801ccdf64ffd68f548f117ceb7f0eac4b805cd52a9
   languageName: node
   linkType: hard