Merge branch 'fix/empty-icon' of github.com:odeimaiz/osparc-simcore into enh/tag-handling

Author: odeimaiz

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

@@ -489,7 +489,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
         lastChangeDate: resourceData.lastChangeDate ? new Date(resourceData.lastChangeDate) : null,
         trashedAt: resourceData.trashedAt ? new Date(resourceData.trashedAt) : null,
         trashedBy: resourceData.trashedBy || null,
-        icon: ["study", "template"].includes(resourceData.resourceType) ? osparc.study.Utils.guessIcon(resourceData) : null,
+        icon: ["study", "template"].includes(resourceData.resourceType) ? osparc.study.Utils.guessIcon(resourceData) : osparc.dashboard.CardBase.PRODUCT_ICON,
         thumbnail: resourceData.thumbnail || this.self().PRODUCT_THUMBNAIL,
         state: resourceData.state ? resourceData.state : {},
         classifiers: resourceData.classifiers && resourceData.classifiers ? resourceData.classifiers : [],

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

@@ -44,6 +44,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
     ITEM_WIDTH: 190,
     ITEM_HEIGHT: 220,
     PADDING: 10,
+    TITLE_PADDING: 6,
     SPACING_IN: 5,
     SPACING: 15,
     ICON_SIZE: 32,
@@ -202,8 +203,8 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           control = new qx.ui.basic.Label().set({
             textColor: "contrasted-text-light",
             font: "text-14",
-            padding: this.self().PADDING,
-            maxWidth: this.self().ITEM_WIDTH - 2*this.self().PADDING,
+            padding: this.self().TITLE_PADDING,
+            maxWidth: this.self().ITEM_WIDTH,
             maxHeight: this.self().TITLE_MAX_HEIGHT,
           });
           layout = this.getChildControl("header");
@@ -368,14 +369,6 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
       thumbnailLayout.recheckSize();
     },
 
-    replaceIcon: function(newIcon) {
-      const plusIcon = this.getChildControl("icon");
-      plusIcon.exclude();
-
-      const bodyLayout = this.getChildControl("body");
-      bodyLayout.add(newIcon, {flex: 1});
-    },
-
     /**
      * Event handler for the pointer over event.
      */

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

@@ -93,8 +93,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
           break;
         case "menu-button":
           this.getChildControl("title").set({
-            maxWidth: osparc.dashboard.GridButtonBase.ITEM_WIDTH - osparc.dashboard.GridButtonBase.ICON_SIZE - this.self().MENU_BTN_DIMENSIONS - 6,
-            padding: 4,
+            maxWidth: osparc.dashboard.GridButtonBase.ITEM_WIDTH - osparc.dashboard.GridButtonBase.ICON_SIZE - this.self().MENU_BTN_DIMENSIONS,
           });
           control = new qx.ui.form.MenuButton().set({
             appearance: "form-button-outlined",

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

@@ -39,12 +39,12 @@ qx.Class.define("osparc.dashboard.GridButtonLoadMore", {
 
   members: {
     _applyFetching: function(value) {
-      this.setIcon(osparc.dashboard.CardBase.LOADING_ICON);
+      this.setThumbnail(osparc.dashboard.CardBase.LOADING_ICON);
       if (value) {
-        this.getChildControl("icon").getChildControl("image").getContentElement()
+        this.getChildControl("thumbnail").getChildControl("image").getContentElement()
           .addClass("rotate");
       } else {
-        this.getChildControl("icon").getChildControl("image").getContentElement()
+        this.getChildControl("thumbnail").getChildControl("image").getContentElement()
           .removeClass("rotate");
       }
       this.setEnabled(!value);

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

@@ -105,7 +105,7 @@ qx.Class.define("osparc.dashboard.GridButtonPlaceholder", {
         title.setValue(titleText);
       }
       if (icon) {
-        this.setIcon(icon);
+        this.setThumbnail(icon);
       }
 
       const stateLabel = this.getChildControl("state-label");

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

@@ -66,7 +66,6 @@ qx.Class.define("osparc.desktop.preferences.Preferences", {
     openTags: function() {
       if (this.__tagsPage) {
         this._openPage(this.__tagsPage);
-        return true;
       }
     },
   }

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

@@ -48,7 +48,7 @@ qx.Class.define("osparc.desktop.preferences.PreferencesWindow", {
     __preferences: null,
 
     openTags: function() {
-      return this.__preferences.openTags();
+      this.__preferences.openTags();
     }
   }
 });