✨ Remove non S4L-Lite relevant features (ITISFoundation#3688)

Author: odeimaiz

services/static-webserver/client/source/class/osparc/component/metadata/ServicesInStudyBootOpts.js

@@ -19,6 +19,19 @@ qx.Class.define("osparc.component.metadata.ServicesInStudyBootOpts", {
     GRID_POS: {
       ...osparc.component.metadata.ServicesInStudy.GRID_POS,
       BOOT_MODE: Object.keys(osparc.component.metadata.ServicesInStudy.GRID_POS).length
+    },
+
+    anyBootOptions: function(studyData) {
+      if ("workbench" in studyData) {
+        for (const nodeId in studyData["workbench"]) {
+          const node = studyData["workbench"][nodeId];
+          const metadata = osparc.utils.Services.getMetaData(node["key"], node["version"]);
+          if (metadata && "boot-options" in metadata) {
+            return true;
+          }
+        }
+      }
+      return false;
     }
   },
 

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

@@ -322,7 +322,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
     },
 
     __applyQuality: function(quality) {
-      if (osparc.component.metadata.Quality.isEnabled(quality)) {
+      if (!osparc.utils.Utils.isProduct("s4llite") && osparc.component.metadata.Quality.isEnabled(quality)) {
         const tsrRating = this.getChildControl("tsr-rating");
         tsrRating.set({
           nStars: 4,

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

@@ -36,10 +36,18 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
 
     this._setLayout(new qx.ui.layout.Canvas());
 
-    const mainLayout = this._mainLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(this.self().V_SPACING)).set({
+    const grid = new qx.ui.layout.Grid();
+    grid.setSpacing(this.self().SPACING_IN);
+    grid.setRowFlex(2, 1);
+    grid.setColumnFlex(0, 1);
+    grid.setRowMaxHeight(0, 34);
+
+    const mainLayout = this._mainLayout = new qx.ui.container.Composite().set({
       maxWidth: this.self().ITEM_WIDTH - 2*this.self().PADDING,
       maxHeight: this.self().ITEM_HEIGHT - 2*this.self().PADDING
     });
+    mainLayout.setLayout(grid);
+
     this._add(mainLayout, {
       top: 0,
       right: 0,
@@ -52,14 +60,47 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
     ITEM_WIDTH: 190,
     ITEM_HEIGHT: 220,
     PADDING: 10,
-    V_SPACING: 6,
+    SPACING_IN: 4,
     SPACING: 15,
     POS: {
-      TITLE: 0,
-      SUBTITLE: 1,
-      THUMBNAIL: 2,
-      TSR_MODE: 3,
-      TAGS: 4
+      TITLE: {
+        row: 0,
+        column: 0,
+        rowSpan: 1,
+        colSpan: 3
+      },
+      SUBTITLE: {
+        row: 1,
+        column: 0,
+        rowSpan: 1,
+        colSpan: 3
+      },
+      THUMBNAIL: {
+        row: 2,
+        column: 0,
+        rowSpan: 1,
+        colSpan: 3
+      },
+      TSR: {
+        row: 3,
+        column: 0
+      },
+      TAGS: {
+        row: 4,
+        column: 0
+      },
+      VIEWER_MODE: {
+        row: 3,
+        column: 1,
+        rowSpan: 2,
+        colSpan: 1
+      },
+      UPDATES: {
+        row: 3,
+        column: 2,
+        rowSpan: 2,
+        colSpan: 1
+      }
     }
   },
 
@@ -77,25 +118,25 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
       switch (id) {
         case "title":
           control = new qx.ui.basic.Label().set({
-            margin: [5, 0],
+            marginTop: 3,
             font: "title-14",
             maxWidth: this.self().ITEM_WIDTH - 2*this.self().PADDING,
             maxHeight: 34, // two lines
             rich: true,
             wrap: true
           });
-          this._mainLayout.addAt(control, this.self().POS.TITLE);
+          this._mainLayout.add(control, this.self().POS.TITLE);
           break;
         case "subtitle":
           control = new qx.ui.container.Composite(new qx.ui.layout.HBox(6)).set({
             anonymous: true
           });
-          this._mainLayout.addAt(control, this.self().POS.SUBTITLE);
+          this._mainLayout.add(control, this.self().POS.SUBTITLE);
           break;
         case "subtitle-icon": {
           control = new qx.ui.basic.Image();
-          const sharedDescriptionLayout = this.getChildControl("subtitle");
-          sharedDescriptionLayout.addAt(control, 0);
+          const subtitleLayout = this.getChildControl("subtitle");
+          subtitleLayout.addAt(control, 0);
           break;
         }
         case "subtitle-text": {
@@ -104,8 +145,8 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
             font: "text-13",
             allowGrowY: false
           });
-          const sharedDescriptionLayout = this.getChildControl("subtitle");
-          sharedDescriptionLayout.addAt(control, 1, {
+          const subtitleLayout = this.getChildControl("subtitle");
+          subtitleLayout.addAt(control, 0, {
             flex: 1
           });
           break;
@@ -116,9 +157,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           control.getChildControl("image").set({
             anonymous: true
           });
-          this._mainLayout.addAt(control, this.self().POS.THUMBNAIL, {
-            flex: 1
-          });
+          this._mainLayout.add(control, this.self().POS.THUMBNAIL);
           break;
         }
       }
@@ -139,9 +178,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
         "appear",
         "loaded"
       ].forEach(eventName => {
-        image.addListener(eventName, () => {
-          this.__fitIconHeight();
-        }, this);
+        image.addListener(eventName, () => this.__fitIconHeight(), this);
       });
     },
 
@@ -167,10 +204,16 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
     __fitIconHeight: function() {
       const iconLayout = this.getChildControl("icon");
       let maxHeight = this.getHeight() - this.getPaddingTop() - this.getPaddingBottom();
+      const checkThis = [
+        "title",
+        "subtitle",
+        "tsr-rating",
+        "tags"
+      ];
       // eslint-disable-next-line no-underscore-dangle
       this._mainLayout._getChildren().forEach(child => {
-        if (child.getSubcontrolId() !== "icon" && child.getBounds()) {
-          maxHeight -= (child.getBounds().height + 6);
+        if (checkThis.includes(child.getSubcontrolId()) && child.getBounds()) {
+          maxHeight -= (child.getBounds().height + this.self().SPACING_IN);
         }
       });
       iconLayout.getChildControl("image").setMaxHeight(maxHeight);

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

@@ -44,55 +44,46 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     _createChildControlImpl: function(id) {
       let control;
       switch (id) {
-        case "tsr-mode-update-layout":
-          control = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
-          this._mainLayout.addAt(control, osparc.dashboard.GridButtonBase.POS.TSR_MODE);
-          break;
         case "tsr-rating": {
-          const layout = this.getChildControl("tsr-mode-update-layout");
           const tsrLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(2)).set({
             toolTipText: this.tr("Ten Simple Rules")
           });
           const tsrLabel = new qx.ui.basic.Label(this.tr("TSR:"));
           tsrLayout.add(tsrLabel);
           control = new osparc.ui.basic.StarsRating();
           tsrLayout.add(control);
-          layout.add(tsrLayout, {
-            flex: 1
-          });
+          this._mainLayout.add(tsrLayout, osparc.dashboard.GridButtonBase.POS.TSR);
           break;
         }
         case "ui-mode": {
-          const layout = this.getChildControl("tsr-mode-update-layout");
-          control = new qx.ui.basic.Image();
-          layout.add(control);
+          control = new qx.ui.basic.Image().set({
+            alignY: "middle"
+          });
+          this._mainLayout.add(control, osparc.dashboard.GridButtonBase.POS.VIEWER_MODE);
           break;
         }
         case "update-study": {
-          const layout = this.getChildControl("tsr-mode-update-layout");
           control = new qx.ui.basic.Image().set({
-            source: "@MaterialIcons/update/18",
-            visibility: "excluded"
+            source: "@MaterialIcons/update/16",
+            visibility: "excluded",
+            alignY: "middle"
           });
-          layout.add(control);
+          this._mainLayout.add(control, osparc.dashboard.GridButtonBase.POS.UPDATES);
           break;
         }
         case "hits-service": {
-          const layout = this.getChildControl("tsr-mode-update-layout");
           control = new qx.ui.basic.Label().set({
-            toolTipText: this.tr("Number of times it was instantiated")
-          });
-          layout.add(new qx.ui.core.Spacer(), {
-            flex: 1
+            toolTipText: this.tr("Number of times it was instantiated"),
+            alignY: "middle"
           });
-          layout.add(control);
+          this._mainLayout.add(control, osparc.dashboard.GridButtonBase.POS.UPDATES);
           break;
         }
         case "tags":
           control = new qx.ui.container.Composite(new qx.ui.layout.Flow(5, 3)).set({
             anonymous: true
           });
-          this._mainLayout.addAt(control, osparc.dashboard.GridButtonBase.POS.TAGS);
+          this._mainLayout.add(control, osparc.dashboard.GridButtonBase.POS.TAGS);
           break;
         case "menu-button": {
           this.getChildControl("title").set({
@@ -299,10 +290,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     _applyTags: function(tags) {
       if (osparc.data.Permissions.getInstance().canDo("study.tag")) {
         const tagsContainer = this.getChildControl("tags");
-        if (tags.length) {
-          const iconContainer = this.getChildControl("icon");
-          iconContainer.setMaxHeight(105);
-        }
+        tagsContainer.setVisibility(tags.length ? "visible" : "excluded");
         tagsContainer.removeAll();
         tags.forEach(tag => {
           const tagUI = new osparc.ui.basic.Tag(tag.name, tag.color, "searchBarFilter");

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

@@ -39,8 +39,18 @@ qx.Class.define("osparc.dashboard.GridButtonPlaceholder", {
 
   statics: {
     POS: {
-      STATE: osparc.dashboard.GridButtonBase.THUMBNAIL + 1,
-      PROGRESS: osparc.dashboard.GridButtonBase.THUMBNAIL + 2
+      STATE: {
+        row: 3,
+        column: 0,
+        rowSpan: 1,
+        colSpan: 3
+      },
+      PROGRESS: {
+        row: 4,
+        column: 0,
+        rowSpan: 1,
+        colSpan: 3
+      }
     }
   },
 
@@ -50,7 +60,7 @@ qx.Class.define("osparc.dashboard.GridButtonPlaceholder", {
       switch (id) {
         case "state-label":
           control = new qx.ui.basic.Label();
-          this._mainLayout.addAt(control, this.self().POS.STATE);
+          this._mainLayout.add(control, this.self().POS.STATE);
           break;
         case "progress-bar":
           control = new qx.ui.indicator.ProgressBar().set({
@@ -59,7 +69,7 @@ qx.Class.define("osparc.dashboard.GridButtonPlaceholder", {
           control.getChildControl("progress").set({
             backgroundColor: "strong-main"
           });
-          this._mainLayout.addAt(control, this.self().POS.PROGRESS);
+          this._mainLayout.add(control, this.self().POS.PROGRESS);
           break;
       }
       return control || this.base(arguments, id);

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

@@ -301,11 +301,11 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
                     let icon = "";
                     if (org.thumbnail) {
                       icon = org.thumbnail;
-                    } else if (org["groupType"] === 0) {
+                    } else if (org["collabType"] === 0) {
                       icon = "@FontAwesome5Solid/globe/24";
-                    } else if (org["groupType"] === 1) {
+                    } else if (org["collabType"] === 1) {
                       icon = "@FontAwesome5Solid/users/24";
-                    } else if (org["groupType"] === 2) {
+                    } else if (org["collabType"] === 2) {
                       icon = "@FontAwesome5Solid/user/24";
                     }
                     groupContainer.set({

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

@@ -141,9 +141,11 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
         this.__getServicesBootOptionsPage,
         this.__getSaveAsTemplatePage
       ].forEach(pageCallee => {
-        const page = pageCallee.call(this);
-        if (page) {
-          this.add(page);
+        if (pageCallee) {
+          const page = pageCallee.call(this);
+          if (page) {
+            this.add(page);
+          }
         }
       });
 
@@ -317,6 +319,9 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
     },
 
     __getQualityPage: function() {
+      if (osparc.utils.Utils.isProduct("s4llite")) {
+        return null;
+      }
       const id = "Quality";
       const resourceData = this.__resourceData;
       if (
@@ -368,6 +373,9 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
       if (osparc.utils.Resources.isService(resourceData)) {
         return null;
       }
+      if (!osparc.component.metadata.ServicesInStudyBootOpts.anyBootOptions(resourceData)) {
+        return null;
+      }
 
       const title = this.tr("Boot Options");
       const icon = "@FontAwesome5Solid/play-circle";

services/static-webserver/client/source/class/osparc/data/model/Study.js

@@ -443,7 +443,7 @@ qx.Class.define("osparc.data.model.Study", {
     },
 
     __applyState: function(value) {
-      if ("state" in value) {
+      if (value && "state" in value) {
         const isRunning = this.self().isRunning(value["state"]["value"]);
         this.setPipelineRunning(isRunning);
       } else {

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

@@ -85,9 +85,17 @@ qx.Class.define("osparc.desktop.MainPage", {
       if (this.__studyEditor) {
         const preferencesSettings = osparc.desktop.preferences.Preferences.getInstance();
         if (preferencesSettings.getConfirmBackToDashboard()) {
-          const msg = this.tr("Do you really want to save and close the study?");
+          let msg = this.tr("Do you really want to save and close the study?");
+          let confirmText = this.tr("Save & Close");
+          if (osparc.utils.Utils.isProduct("s4llite")) {
+            msg = this.tr("Do you really want to close the project?");
+            msg += "<br>";
+            msg += this.tr("Make sure you saved the changes to the current <b>smash file</b> and <b>open notebooks</b>");
+            confirmText = this.tr("Close");
+          }
           const win = new osparc.ui.window.Confirmation(msg).set({
-            confirmText: this.tr("Save & Close")
+            caption: confirmText,
+            confirmText
           });
           const confirmButton = win.getConfirmButton();
           osparc.utils.Utils.setIdToWidget(confirmButton, "confirmDashboardBtn");