sendMessageToIframe and sendCloseMessage

ITISFoundation · Dec 12, 2024 · 0881037 · 0881037
1 parent 49e850e
commit 0881037
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/data/model/Study.js b/services/static-webserver/client/source/class/osparc/data/model/Study.js
@@ -635,6 +635,17 @@ qx.Class.define("osparc.data.model.Study", {
       return !this.getUi().getSlideshow().isEmpty();
     },
 
+    sendMessageToIframe: function(nodeId, msg) {
+      if (nodeId) {
+        const node = this.getWorkbench().getNode(nodeId);
+        if (node && node.getIFrame()) {
+          node.getIFrame().sendMessageToIframe(msg);
+          return true;
+        }
+      }
+      return false;
+    },
+
     patchStudy: function(studyChanges) {
       const matches = this.self().OwnPatch.filter(el => Object.keys(studyChanges).indexOf(el) !== -1);
       if (matches.length) {

diff --git a/services/static-webserver/client/source/class/osparc/vipMarket/Market.js b/services/static-webserver/client/source/class/osparc/vipMarket/Market.js
@@ -92,5 +92,17 @@ qx.Class.define("osparc.vipMarket.Market", {
       }
       return false;
     },
+
+    sendCloseMessage: function() {
+      const store = osparc.store.Store.getInstance();
+      const currentStudy = store.getCurrentStudy();
+      const nodeId = this.getOpenBy();
+      if (currentStudy && nodeId) {
+        const msg = {
+          "type": "closeMarket",
+        };
+        currentStudy.sendMessageToIframe(nodeId, msg);
+      }
+    },
   }
 });
diff --git a/services/static-webserver/client/source/class/osparc/vipMarket/MarketWindow.js b/services/static-webserver/client/source/class/osparc/vipMarket/MarketWindow.js
@@ -41,6 +41,11 @@ qx.Class.define("osparc.vipMarket.MarketWindow", {
       if (osparc.product.Utils.showS4LStore()) {
         const storeWindow = new osparc.vipMarket.MarketWindow(nodeId, category);
         storeWindow.getVipMarket().addListener("importMessageSent", () => storeWindow.close());
+        storeWindow.addListenerOnce("close", () => {
+          if (storeWindow.getVipMarket()) {
+            storeWindow.getVipMarket().sendCloseMessage();
+          }
+        });
         storeWindow.center();
         storeWindow.open();
         return storeWindow;

diff --git a/services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js b/services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js
@@ -361,22 +361,17 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
     },
 
     __sendImportModelMessage: function(modelId) {
+      const store = osparc.store.Store.getInstance();
+      const currentStudy = store.getCurrentStudy();
       const nodeId = this.getOpenBy();
-      if (nodeId) {
-        const store = osparc.store.Store.getInstance();
-        const currentStudy = store.getCurrentStudy();
-        if (!currentStudy) {
-          return;
-        }
-        const node = currentStudy.getWorkbench().getNode(nodeId);
-        if (node && node.getIFrame()) {
-          const msg = {
-            "type": "importModel",
-            "message": {
-              "modelId": modelId,
-            },
-          };
-          node.getIFrame().sendMessageToIframe(msg);
+      if (currentStudy && nodeId) {
+        const msg = {
+          "type": "importModel",
+          "message": {
+            "modelId": modelId,
+          },
+        };
+        if (currentStudy.sendMessageToIframe(nodeId, msg)) {
           this.fireEvent("importMessageSent");
         }
       }