Merge branch 'master' into fix/guided-tour-w-folders

Author: odeimaiz

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

@@ -837,14 +837,20 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         });
     },
 
+    // Used in S4L products
     __addNewStudyFromServiceButtons: function(key, newButtonInfo) {
-      const versions = osparc.service.Utils.getVersions(key);
+      // Include deprecated versions, they should all be updatable to a non deprecated version
+      const versions = osparc.service.Utils.getVersions(key, false);
       if (versions.length && newButtonInfo) {
         // scale to latest compatible
         const latestVersion = versions[0];
         const latestCompatible = osparc.service.Utils.getLatestCompatible(key, latestVersion);
         osparc.store.Services.getService(latestCompatible["key"], latestCompatible["version"])
           .then(latestMetadata => {
+            // make sure this one is not deprecated
+            if (osparc.service.Utils.isDeprecated(latestMetadata)) {
+              return;
+            }
             const title = newButtonInfo.title + " " + osparc.service.Utils.extractVersionDisplay(latestMetadata);
             const desc = newButtonInfo.description;
             const mode = this._resourcesContainer.getMode();
@@ -1687,8 +1693,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __createConfirmWindow: function(studyNames) {
-      const rUSure = this.tr("Are you sure you want to delete ");
-      const msg = studyNames.length > 1 ? rUSure + studyNames.length + this.tr(" studies?") : rUSure + "<b>" + studyNames[0] + "</b>?";
+      const rUSure = this.tr("Are you sure you want to delete");
+      const studiesText = osparc.product.Utils.getStudyAlias({plural: true});
+      const msg = rUSure + (studyNames.length > 1 ? ` ${studyNames.length} ${studiesText} ?` : ` <b>${studyNames[0]}</b>?`)
       const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
         confirmText: this.tr("Delete"),
         confirmAction: "delete"