implement custom trigger for rerendering, use it in attach and dettac…

…h literals
XpressAI · Nov 19, 2024 · 350257b · 350257b
1 parent 2f391ca
commit 350257b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 7 deletions.
diff --git a/src/XircuitsFactory.ts b/src/XircuitsFactory.ts
@@ -49,6 +49,7 @@ export class XircuitsFactory extends ABCWidgetFactory<DocumentWidget> {
   runXircuitSignal: Signal<this, any>;
   runTypeXircuitSignal: Signal<this, any>;
   lockNodeSignal: Signal<this, any>;
+  triggerCanvasUpdateSignal: Signal<this, any>;
   triggerLoadingAnimationSignal: Signal<this, any>;
   reloadAllNodesSignal: Signal<this, any>;
   toggleAllLinkAnimationSignal: Signal<this, any>;
@@ -68,6 +69,7 @@ export class XircuitsFactory extends ABCWidgetFactory<DocumentWidget> {
     this.runXircuitSignal = new Signal<this, any>(this);
     this.runTypeXircuitSignal = new Signal<this, any>(this);
     this.lockNodeSignal = new Signal<this, any>(this);
+    this.triggerCanvasUpdateSignal = new Signal<this, any>(this);
     this.triggerLoadingAnimationSignal = new Signal<this, any>(this);
     this.reloadAllNodesSignal = new Signal<this, any>(this);
     this.toggleAllLinkAnimationSignal = new Signal<this, any>(this);
@@ -90,6 +92,7 @@ export class XircuitsFactory extends ABCWidgetFactory<DocumentWidget> {
       runXircuitSignal: this.runXircuitSignal,
       runTypeXircuitSignal: this.runTypeXircuitSignal,
       lockNodeSignal: this.lockNodeSignal,
+      triggerCanvasUpdateSignal: this.triggerCanvasUpdateSignal,
       triggerLoadingAnimationSignal: this.triggerLoadingAnimationSignal,
       reloadAllNodesSignal: this.reloadAllNodesSignal,
       toggleAllLinkAnimationSignal: this.toggleAllLinkAnimationSignal,

diff --git a/src/XircuitsWidget.tsx b/src/XircuitsWidget.tsx
@@ -24,6 +24,7 @@ export class XircuitsPanel extends ReactWidget {
   runXircuitSignal: Signal<this, any>;
   runTypeXircuitSignal: Signal<this, any>;
   lockNodeSignal: Signal<this, any>;
+  triggerCanvasUpdateSignal: Signal<this, any>;
   triggerLoadingAnimationSignal: Signal<this, any>;
   reloadAllNodesSignal: Signal<this, any>;
   toggleAllLinkAnimationSignal: Signal<this, any>;
@@ -45,6 +46,7 @@ export class XircuitsPanel extends ReactWidget {
     this.runXircuitSignal = options.runXircuitSignal;
     this.runTypeXircuitSignal = options.runTypeXircuitSignal;
     this.lockNodeSignal = options.lockNodeSignal;
+    this.triggerCanvasUpdateSignal = options.triggerCanvasUpdateSignal;
     this.triggerLoadingAnimationSignal = options.triggerLoadingAnimationSignal;
     this.reloadAllNodesSignal = options.reloadAllNodesSignal;
     this.toggleAllLinkAnimationSignal = options.toggleAllLinkAnimationSignal;
@@ -97,6 +99,7 @@ export class XircuitsPanel extends ReactWidget {
         runXircuitSignal={this.runXircuitSignal}
         runTypeXircuitSignal={this.runTypeXircuitSignal}
         lockNodeSignal={this.lockNodeSignal}
+        triggerCanvasUpdateSignal={this.triggerCanvasUpdateSignal}
         triggerLoadingAnimationSignal={this.triggerLoadingAnimationSignal}
         reloadAllNodesSignal={this.reloadAllNodesSignal}
         toggleAllLinkAnimationSignal={this.toggleAllLinkAnimationSignal}

diff --git a/src/commands/CommandIDs.tsx b/src/commands/CommandIDs.tsx
@@ -19,6 +19,7 @@ export const commandIDs = {
   attachNode: "Xircuit-editor:attach-node",
   attachAllNodes: "Xircuit-editor:attach-all-nodes",
   detachAllNodes: "Xircuit-editor:detach-all-nodes",
+  triggerCanvasUpdate: "Xircuit-editor:trigger-canvas-update",
   triggerLoadingAnimation: "Xircuit-editor:trigger-loading-animation",
   reloadNode: "Xircuit-editor:reload-node",
   reloadAllNodes: "Xircuit-editor:reload-all-nodes",

diff --git a/src/commands/NodeActionCommands.tsx b/src/commands/NodeActionCommands.tsx
@@ -1011,9 +1011,11 @@ export function addNodeActionCommands(
                 node.getOptions().extras.attached = true;
                 let parameterOutPort = node.getOutPorts()[0] as CustomPortModel;
                 let connectedNodes = parameterOutPort.getTargetNodes();
-                connectedNodes.forEach((node: CustomNodeModel) => node.setSelected(true))
+                connectedNodes.forEach((node: CustomNodeModel) => node.setSelected(true));
+
             });
             widget.xircuitsApp.getDiagramEngine().repaintCanvas();
+            widget.triggerCanvasUpdateSignal.emit(null);
         },
         label: trans.__('attach node')
     });
@@ -1044,10 +1046,11 @@ export function addNodeActionCommands(
             literal_nodes.forEach(node => {
                 let parameterOutPort = node.getOutPorts()[0] as CustomPortModel;
                 let connectedNodes = parameterOutPort.getTargetNodes();
-                connectedNodes.forEach((node: CustomNodeModel) => node.setSelected(true))
+                connectedNodes.forEach((node: CustomNodeModel) => node.setSelected(true));
             });
 
             widget.xircuitsApp.getDiagramEngine().repaintCanvas();
+            widget.triggerCanvasUpdateSignal.emit(null);
         },
         label: trans.__('attach all nodes')
     });
@@ -1078,10 +1081,11 @@ export function addNodeActionCommands(
             literal_nodes.forEach(node => {
                 let parameterOutPort = node.getOutPorts()[0] as CustomPortModel;
                 let connectedNodes = parameterOutPort.getTargetNodes();
-                connectedNodes.forEach((node: CustomNodeModel) => node.setSelected(true))
+                connectedNodes.forEach((node: CustomNodeModel) => node.setSelected(true));
             });
 
             widget.xircuitsApp.getDiagramEngine().repaintCanvas();
+            widget.triggerCanvasUpdateSignal.emit(null);
         },
         label: trans.__('detach all nodes')
     });

diff --git a/src/components/XircuitsBodyWidget.tsx b/src/components/XircuitsBodyWidget.tsx
@@ -50,6 +50,7 @@ export interface BodyWidgetProps {
 	runXircuitSignal: Signal<XircuitsPanel, any>;
 	runTypeXircuitSignal: Signal<XircuitsPanel, any>;
 	lockNodeSignal: Signal<XircuitsPanel, any>;
+	triggerCanvasUpdateSignal: Signal<XircuitsPanel, any>;
 	triggerLoadingAnimationSignal: Signal<XircuitsPanel, any>;
 	reloadAllNodesSignal: Signal<XircuitsPanel, any>;
 	toggleAllLinkAnimationSignal: Signal<XircuitsPanel, any>;
@@ -88,6 +89,7 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
 	runXircuitSignal,
 	runTypeXircuitSignal,
 	lockNodeSignal,
+	triggerCanvasUpdateSignal,
 	triggerLoadingAnimationSignal,
 	reloadAllNodesSignal,
 	toggleAllLinkAnimationSignal,
@@ -660,6 +662,12 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
 			}
 		});
 	}
+	const handleTriggerCanvasUpdate = async () => {
+		if (shell.currentWidget?.id !== widgetId) {
+		  return;
+		}
+		onChange();
+	};
 
 	const handleReloadAll = async () => {
 		if (shell.currentWidget?.id !== widgetId) {
@@ -868,6 +876,7 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
 		[runXircuitSignal, handleRunClick],
 		[fetchRemoteRunConfigSignal, getRemoteRunTypeFromConfig],
 		[lockNodeSignal, handleLockClick],
+		[triggerCanvasUpdateSignal, handleTriggerCanvasUpdate],
 		[triggerLoadingAnimationSignal, triggerLoadingAnimation],
 		[reloadAllNodesSignal, handleReloadAll],
 		[toggleAllLinkAnimationSignal, handleToggleAllLinkAnimation],

diff --git a/src/context-menu/CanvasContextMenu.tsx b/src/context-menu/CanvasContextMenu.tsx
@@ -33,17 +33,14 @@ export class CanvasContextMenu extends React.Component<CanvasContextMenuProps> {
 
         const handleAttachNode = async () => {
             await this.props.app.commands.execute(commandIDs.attachNode);
-            await this.props.app.commands.execute(commandIDs.reloadNode);
         };
 
         const handleAllAttachNodes = async () => {
             await this.props.app.commands.execute(commandIDs.attachAllNodes);
-            await this.props.app.commands.execute(commandIDs.reloadNode);
         };
 
         const handleDetachAllNodes = async () => {
             await this.props.app.commands.execute(commandIDs.detachAllNodes);
-            await this.props.app.commands.execute(commandIDs.reloadNode);
         };
 
         return (

diff --git a/src/index.tsx b/src/index.tsx
@@ -178,8 +178,10 @@ const xircuits: JupyterFrontEndPlugin<void> = {
         {execute: emitSignal(widgetFactory.compileXircuitSignal)}],
       [commandIDs.fetchRemoteRunConfig,
         {execute: emitSignal(widgetFactory.fetchRemoteRunConfigSignal)}],
-        [commandIDs.lockXircuit,
+      [commandIDs.lockXircuit,
         {execute: emitSignal(widgetFactory.lockNodeSignal)}],
+      [commandIDs.triggerCanvasUpdate,
+        {execute: emitSignal(widgetFactory.triggerCanvasUpdateSignal)}],
       [commandIDs.triggerLoadingAnimation,
         {execute: emitSignal(widgetFactory.triggerLoadingAnimationSignal)}],
       [commandIDs.reloadAllNodes,