Merge branch 'master' into enh/model-organizations

Author: odeimaiz

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py

@@ -239,7 +239,7 @@ def expected_dynamic_sidecar_spec(
                     "DY_SIDECAR_PATH_OUTPUTS": "/tmp/outputs",  # noqa: S108
                     "DY_SIDECAR_PROJECT_ID": "dd1d04d9-d704-4f7e-8f0f-1ca60cc771fe",
                     "DY_SIDECAR_STATE_EXCLUDE": json_dumps(
-                        {"*.py", "/tmp/strip_me/*"}  # noqa: S108
+                        ["*.py", "/tmp/strip_me/*"]  # noqa: S108
                     ),
                     "DY_SIDECAR_STATE_PATHS": json_dumps(
                         ["/tmp/save_1", "/tmp_save_2"]  # noqa: S108

services/static-webserver/client/source/class/osparc/dashboard/WorkspacesAndFoldersTree.js

@@ -228,6 +228,9 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTree", {
 
       const sharedWorkspaceModel = this.__getModel(-1, null);
       sharedWorkspaceModel.getChildren().append(workspaceModel);
+      sharedWorkspaceModel.getChildren().sort(((a, b) => {
+        return a.getLabel().localeCompare(b.getLabel());
+      }));
 
       // load next level too
       this.__populateFolder(workspaceModel, workspace.getWorkspaceId(), null);
@@ -262,7 +265,10 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTree", {
       const folderModel = qx.data.marshal.Json.createModel(folderData, true);
       this.__models.push(folderModel);
       folder.bind("name", folderModel, "label");
-      parentModel.getChildren().push(folderModel);
+      parentModel.getChildren().append(folderModel);
+      parentModel.getChildren().sort(((a, b) => {
+        return a.getLabel().localeCompare(b.getLabel());
+      }));
       return folderModel;
     },
 

services/static-webserver/client/source/class/osparc/study/StudyOptions.js

@@ -232,7 +232,6 @@ qx.Class.define("osparc.study.StudyOptions", {
             center: true,
             enabled: false,
           });
-          osparc.utils.Utils.setIdToWidget(control, "openWithResources");
           this.getChildControl("buttons-layout").addAt(control, 1);
           break;
       }
@@ -284,7 +283,13 @@ qx.Class.define("osparc.study.StudyOptions", {
     __evaluateOpenButton: function() {
       const hasTitle = Boolean(this.getChildControl("title-field").getValue());
       const walletSelected = Boolean(this.getChildControl("wallet-selector").getSelection().length);
-      this.getChildControl("open-button").setEnabled(hasTitle && walletSelected);
+      const openButton = this.getChildControl("open-button");
+      openButton.setEnabled(hasTitle && walletSelected);
+      if (hasTitle && walletSelected) {
+        osparc.utils.Utils.setIdToWidget(openButton, "openWithResources");
+      } else {
+        osparc.utils.Utils.removeIdAttribute(openButton);
+      }
     },
 
     __buildLayout: function() {

services/static-webserver/client/source/class/osparc/utils/Utils.js

@@ -1034,6 +1034,13 @@ qx.Class.define("osparc.utils.Utils", {
       return null;
     },
 
+    removeIdAttribute: qWidget => {
+      if (qWidget.getContentElement && qWidget.getContentElement()) {
+        return qWidget.getContentElement().removeAttribute("osparc-test-id");
+      }
+      return null;
+    },
+
     setKeyToWidget: (qWidget, id) => {
       if (qWidget.getContentElement && qWidget.getContentElement()) {
         qWidget.getContentElement().setAttribute("osparc-test-key", id);