Merge branch 'master' into 2024/change/traefikV3

ITISFoundation · Aug 13, 2024 · b3dd139 · b3dd139
2 parents f3ae779 + 85eaba0
commit b3dd139
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 24 deletions.
diff --git a/packages/pytest-simcore/src/pytest_simcore/__init__.py b/packages/pytest-simcore/src/pytest_simcore/__init__.py
@@ -3,6 +3,9 @@
 
 import pytest
 
+# NOTE: this ensures that assertion printouts are nicely formated and complete see https://lorepirri.com/pytest-register-assert-rewrite.html
+pytest.register_assert_rewrite("pytest_simcore.helpers")
+
 __version__: str = version("pytest-simcore")
 
 

diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/__init__.py b/packages/pytest-simcore/src/pytest_simcore/helpers/__init__.py
@@ -1,8 +1,4 @@
 # pytest_simcore.docker_compose fixture module config variables
-import pytest
 
 FIXTURE_CONFIG_CORE_SERVICES_SELECTION = "pytest_simcore_core_services_selection"
 FIXTURE_CONFIG_OPS_SERVICES_SELECTION = "pytest_simcore_ops_services_selection"
-
-# NOTE: this ensures that assertion printouts are nicely formated and complete see https://lorepirri.com/pytest-register-assert-rewrite.html
-pytest.register_assert_rewrite("pytest_simcore.helpers")
diff --git a/services/static-webserver/client/source/class/osparc/data/model/Node.js b/services/static-webserver/client/source/class/osparc/data/model/Node.js
@@ -712,7 +712,7 @@ qx.Class.define("osparc.data.model.Node", {
       if (outputs) {
         let hasOutputs = false;
         Object.keys(this.getOutputs()).forEach(outputKey => {
-          if (Object.hasOwn(outputs, outputKey)) {
+          if (outputKey in outputs) {
             this.setOutputs({
               ...this.getOutputs(),
               [outputKey]: {
@@ -1094,7 +1094,11 @@ qx.Class.define("osparc.data.model.Node", {
         };
         this.fireDataEvent("showInLogger", msgData);
 
-        this.getIframeHandler().startPolling();
+        if (this.getIframeHandler()) {
+          this.getIframeHandler().startPolling();
+        } else {
+          console.error(this.getLabel() + " iframe handler not ready");
+        }
       }
     },
 

diff --git a/services/static-webserver/client/source/class/osparc/desktop/MainPage.js b/services/static-webserver/client/source/class/osparc/desktop/MainPage.js
@@ -364,23 +364,6 @@ qx.Class.define("osparc.desktop.MainPage", {
         });
     },
 
-    closeStudy: function(studyId) {
-      if (studyId === undefined) {
-        if (this.__studyEditor && this.__studyEditor.getStudy()) {
-          studyId = this.__studyEditor.getStudy().getUuid();
-        } else {
-          return;
-        }
-      }
-      const params = {
-        url: {
-          "studyId": studyId
-        },
-        data: osparc.utils.Utils.getClientSessionID()
-      };
-      osparc.data.Resources.fetch("studies", "close", params);
-    },
-
     __getStudyEditor: function() {
       if (this.__studyEditor) {
         return this.__studyEditor;

diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
@@ -797,7 +797,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         },
         data: osparc.utils.Utils.getClientSessionID()
       };
-      osparc.data.Resources.fetch("studies", "close", params);
+      osparc.data.Resources.fetch("studies", "close", params)
+        .catch(err => console.error(err));
     },
 
     closeEditor: function() {

diff --git a/services/static-webserver/client/source/class/osparc/viewer/NodeViewer.js b/services/static-webserver/client/source/class/osparc/viewer/NodeViewer.js
@@ -60,6 +60,8 @@ qx.Class.define("osparc.viewer.NodeViewer", {
           this.__iFrameChanged();
 
           this.__attachSocketEventHandlers();
+        } else {
+          console.error(node.getLabel() + " iframe handler not ready");
         }
       })
       .catch(err => console.error(err));