Merge branch 'master' into enh/react-to-5xx

ITISFoundation · Oct 2, 2024 · 319b473 · 319b473
2 parents 41bb1b5 + 8118841
commit 319b473
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/workbench/BaseNodeUI.js b/services/static-webserver/client/source/class/osparc/workbench/BaseNodeUI.js
@@ -87,6 +87,12 @@ qx.Class.define("osparc.workbench.BaseNodeUI", {
     appearance: {
       init: "window-small-cap",
       refine: true
+    },
+
+    isMovable: {
+      check: "Boolean",
+      init: true,
+      nullable: false
     }
   },
 
@@ -272,7 +278,7 @@ qx.Class.define("osparc.workbench.BaseNodeUI", {
     // override qx.ui.core.MMovable
     _onMovePointerMove: function(e) {
       // Only react when dragging is active
-      if (!this.hasState("move")) {
+      if (!this.hasState("move") || !this.getIsMovable()) {
         return;
       }
       e.stopPropagation();
@@ -290,7 +296,7 @@ qx.Class.define("osparc.workbench.BaseNodeUI", {
       }
 
       // Only react when dragging is active
-      if (!this.hasState("move")) {
+      if (!this.hasState("move") || !this.getIsMovable()) {
         return;
       }
 

diff --git a/services/static-webserver/client/source/class/osparc/workbench/NodeUI.js b/services/static-webserver/client/source/class/osparc/workbench/NodeUI.js
@@ -619,7 +619,7 @@ qx.Class.define("osparc.workbench.NodeUI", {
     // override qx.ui.core.MMovable
     _onMovePointerMove: function(e) {
       // Only react when dragging is active
-      if (!this.hasState("move")) {
+      if (!this.hasState("move") || !this.getIsMovable()) {
         return;
       }
       const coords = this._setPositionFromEvent(e);

diff --git a/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js b/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js
@@ -496,7 +496,9 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       nodeUI.addListener("requestOpenLogger", () => this.fireDataEvent("requestOpenLogger", nodeUI.getNodeId()), this);
 
       nodeUI.addListener("nodeMovingStart", () => {
-        this.__selectNode(nodeUI);
+        if (!this.getSelectedNodeIDs().includes(nodeUI.getNodeId())) {
+          this.__selectNode(nodeUI);
+        }
         this.__itemStartedMoving();
       }, this);
 

diff --git a/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUIPreview.js b/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUIPreview.js
@@ -60,6 +60,7 @@ qx.Class.define("osparc.workbench.WorkbenchUIPreview", {
         for (const nodeId in nodes) {
           const node = nodes[nodeId];
           const nodeUI = this._createNodeUI(nodeId);
+          nodeUI.setIsMovable(false);
           this._addNodeUIToWorkbench(nodeUI, node.getPosition());
         }
         qx.ui.core.queue.Layout.flush();