ID retrieval based on focusItem when initializing CSV import component

Author: Rdmkr

gui-js/apps/minsky-electron/src/app/events/electron.events.ts

@@ -219,9 +219,7 @@ ipcMain.handle(events.NEW_SYSTEM, async () => {
 ipcMain.handle(
   events.IMPORT_CSV,
   async (event, payload: MinskyProcessPayload) => {
-    const { mouseX, mouseY } = payload;
-
-    const itemInfo = await CommandsManager.getItemInfo(mouseX, mouseY);
+    const itemInfo = await CommandsManager.getFocusItemInfo();
     if(itemInfo) {
       CommandsManager.importCSV(itemInfo, true);
     } else {

gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts

@@ -72,9 +72,18 @@ export class CommandsManager {
       return null;
     }
 
+    return await this.getCurrentItemInfo();
+  }
+
+  static async getFocusItemInfo(): Promise<CanvasItem> {
+    await minsky.canvas.setItemFromItemFocus();
+    return await this.getCurrentItemInfo();
+  }
+
+  static async getCurrentItemInfo() {
     const classType = (await this.getCurrentItemClassType()) as ClassType;
     const id = await minsky.canvas.item.id();
-
+    
     if(this.isFalseResult(id)) {
       return null;
     }
@@ -85,7 +94,7 @@ export class CommandsManager {
     }
 
     const itemInfo: CanvasItem = { classType, id, displayContents };
-    return itemInfo;
+    return itemInfo;  
   }
 
   static async selectVar(x: number, y: number): Promise<boolean> {

gui-js/libs/shared/src/lib/backend/minsky.ts

@@ -463,6 +463,7 @@ export class Canvas extends CppClass {
   async selectVar(a1: number,a2: number): Promise<boolean> {return this.$callMethod('selectVar',a1,a2);}
   async setDefaultPlotOptions(): Promise<void> {return this.$callMethod('setDefaultPlotOptions');}
   async setItemFocus(a1: Item): Promise<void> {return this.$callMethod('setItemFocus',a1);}
+  async setItemFromItemFocus(): Promise<void> {return this.$callMethod('setItemFromItemFocus');}
   async showDefiningVarsOnCanvas(): Promise<void> {return this.$callMethod('showDefiningVarsOnCanvas');}
   async showPlotsOnTab(): Promise<void> {return this.$callMethod('showPlotsOnTab');}
   async surface(): Promise<ecolab__cairo__Surface> {return this.$callMethod('surface');}

model/canvas.cc

@@ -992,7 +992,10 @@ namespace minsky
       }
     }
 
-
+  void Canvas::setItemFromItemFocus()
+  {
+    item = itemFocus;
+  }
 }
 
 CLASSDESC_ACCESS_EXPLICIT_INSTANTIATION(minsky::EventInterface);

model/canvas.h

@@ -291,6 +291,8 @@ namespace minsky
     }
 
     void applyDefaultPlotOptions();
+
+    void setItemFromItemFocus();
   };
 }