🐛 [Frontend] Fix: Do not list deprecated service versions (#7504)

Author: odeimaiz

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

@@ -666,20 +666,13 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
       // Block card
       const cantReadServices = osparc.study.Utils.getCantExecuteServices(services);
-      let inaccessibleServices = [];
-      if (this.isResourceType("study") || this.isResourceType("template")) {
-        inaccessibleServices = osparc.store.Services.getInaccessibleServices(this.getResourceData()["workbench"]);
-      }
-      if (cantReadServices.length || inaccessibleServices.length) {
+      if (cantReadServices.length) {
         this.setBlocked("UNKNOWN_SERVICES");
         const image = "@FontAwesome5Solid/ban/";
         let toolTipText = this.tr("Inaccessible service(s):");
         cantReadServices.forEach(unSrv => {
           toolTipText += "<br>" + unSrv.key + ":" + osparc.service.Utils.extractVersionDisplay(unSrv.release);
         });
-        inaccessibleServices.forEach(unSrv => {
-          toolTipText += "<br>" + unSrv.key + ":" + unSrv.version;
-        });
         this.__showBlockedCard(image, toolTipText);
       }
 

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

@@ -24,6 +24,7 @@ qx.Class.define("osparc.desktop.wallets.WalletListItem", {
     const creditsCol = 7;
     const layout = this._getLayout();
     layout.setSpacingX(10);
+    layout.setColumnAlign(0, "left", "middle");
     layout.setColumnWidth(creditsCol, 110);
     layout.setColumnAlign(creditsCol, "right", "middle");
 

services/static-webserver/client/source/class/osparc/share/NewCollaboratorsManager.js

@@ -35,12 +35,7 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
 
     this.__shareWithEmailEnabled = false;
     if (this.__resourceData["resourceType"] === "study") {
-      osparc.utils.DisabledPlugins.isShareWithEmailEnabled()
-        .then(isEnabled => {
-          if (isEnabled) {
-            this.__shareWithEmailEnabled = true;
-          }
-        });
+      this.__shareWithEmailEnabled = osparc.utils.DisabledPlugins.isShareWithEmailEnabled();
     }
 
     this.center();

services/static-webserver/client/source/class/osparc/store/Services.js

@@ -204,7 +204,10 @@ qx.Class.define("osparc.store.Services", {
                 continue;
               }
               if (excludeDeprecated) {
-                if (osparc.service.Utils.isDeprecated(serviceLatest)) {
+                if (
+                  osparc.service.Utils.isRetired(serviceLatest) ||
+                  osparc.service.Utils.isDeprecated(serviceLatest)
+                ) {
                   // first check if a previous version of this service isn't deprecated
                   // getService to get its history
                   await this.getService(serviceLatest["key"], serviceLatest["version"]);
@@ -213,15 +216,21 @@ qx.Class.define("osparc.store.Services", {
                     const historyEntry = serviceMetadata["history"][j];
                     if (!historyEntry["retired"]) {
                       // one older non retired version found
-                      const olderNonRetired = await this.getService(key, historyEntry["version"]);
+                      let olderNonRetired = await this.getService(key, historyEntry["version"]);
+                      if (!olderNonRetired) {
+                        olderNonRetired = await this.getService(key, historyEntry["version"]);
+                      }
                       serviceLatest = osparc.utils.Utils.deepCloneObject(olderNonRetired);
                       // make service metadata latest model like
                       serviceLatest["release"] = osparc.service.Utils.extractVersionFromHistory(olderNonRetired);
                       break;
                     }
                   }
                 }
-                if (osparc.service.Utils.isDeprecated(serviceLatest)) {
+                if (
+                  osparc.service.Utils.isRetired(serviceLatest) ||
+                  osparc.service.Utils.isDeprecated(serviceLatest)
+                ) {
                   // do not add retired services
                   continue;
                 }
@@ -361,6 +370,7 @@ qx.Class.define("osparc.store.Services", {
 
     __isInCache: function(key, version) {
       return (
+        this.__servicesCached &&
         key in this.__servicesCached &&
         version in this.__servicesCached[key]
       );