resourceType tutorial

Author: odeimaiz

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

@@ -166,7 +166,7 @@ qx.Class.define("osparc.dashboard.AppBrowser", {
 
     _populateCardMenu: function(card) {
       const studyData = card.getResourceData();
-      if (studyData["resourceType"] === "template") {
+      if (studyData["resourceType"] === "hypertool") {
         // The App Browser can also list templates (hypertools)
         this._populateTemplateCardMenu(card);
       } else {

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

@@ -325,8 +325,9 @@ qx.Class.define("osparc.dashboard.CardBase", {
       check: [
         "study",
         "template",
-        "service",
+        "tutorial",
         "hypertool",
+        "service",
       ],
       init: true,
       nullable: true,
@@ -519,6 +520,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
       switch (resourceData["resourceType"]) {
         case "study":
         case "template":
+        case "tutorial":
         case "hypertool":
           uuid = resourceData.uuid ? resourceData.uuid : null;
           owner = resourceData.prjOwner ? resourceData.prjOwner : "";
@@ -552,7 +554,12 @@ qx.Class.define("osparc.dashboard.CardBase", {
         workbench
       });
 
-      if (["study", "template", "hypertool"].includes(resourceData["resourceType"])) {
+      if ([
+        "study",
+        "template",
+        "tutorial",
+        "hypertool"
+      ].includes(resourceData["resourceType"])) {
         osparc.store.Services.getStudyServices(resourceData.uuid)
           .then(resp => {
             const services = resp["services"];
@@ -1055,6 +1062,8 @@ qx.Class.define("osparc.dashboard.CardBase", {
         toolTipText += osparc.product.Utils.getStudyAlias();
       } else if (this.isResourceType("template")) {
         toolTipText += osparc.product.Utils.getTemplateAlias();
+      } else if (this.isResourceType("tutorial")) {
+        toolTipText += osparc.product.Utils.getTutorialAlias();
       } else if (this.isResourceType("hypertool")) {
         toolTipText += osparc.product.Utils.getAppAlias();
       }

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

@@ -185,7 +185,12 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     // overridden
     _applyLastChangeDate: function(value, old) {
       if (value) {
-        if (["study", "template", "hypertool"].includes(this.getResourceType())) {
+        if ([
+          "study",
+          "template",
+          "tutorial",
+          "hypertool",
+        ].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.set({
             date: value,

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

@@ -186,7 +186,12 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
     // overridden
     _applyLastChangeDate: function(value, old) {
       if (value) {
-        if (["study", "template", "hypertool"].includes(this.getResourceType())) {
+        if ([
+          "study",
+          "template",
+          "tutorial",
+          "hypertool",
+        ].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.set({
             date: value,

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

@@ -916,6 +916,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
             break;
           }
           case "template":
+          case "tutorial":
           case "hypertool":
             this._createStudyFromTemplate(resourceData);
             break;

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

@@ -27,6 +27,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     switch (resourceData["resourceType"]) {
       case "study":
       case "template":
+      case "tutorial":
       case "hypertool": {
         const params = {
           url: {
@@ -54,6 +55,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         switch (resourceData["resourceType"]) {
           case "study":
           case "template":
+          case "tutorial":
           case "hypertool":
             osparc.store.Services.getStudyServicesMetadata(latestResourceData)
               .finally(() => {

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

@@ -94,7 +94,7 @@ qx.Class.define("osparc.dashboard.TutorialBrowser", {
     },
 
     __setResourcesToList: function(tutorialsList) {
-      tutorialsList.forEach(tutorial => tutorial["resourceType"] = "template");
+      tutorialsList.forEach(tutorial => tutorial["resourceType"] = "tutorial");
       this._resourcesList = tutorialsList;
       this._reloadCards();
     },

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

@@ -81,10 +81,10 @@ qx.Class.define("osparc.product.Utils", {
       return alias;
     },
 
-    getServiceAlias: function(options = {}) {
-      let alias = qx.locale.Manager.tr("service");
+    getTutorialAlias: function(options = {}) {
+      let alias = qx.locale.Manager.tr("tutorial");
       if (options.plural) {
-        alias = qx.locale.Manager.tr("services");
+        alias = qx.locale.Manager.tr("tutorials");
       }
 
       if (options.firstUpperCase) {
@@ -111,6 +111,21 @@ qx.Class.define("osparc.product.Utils", {
       return alias;
     },
 
+    getServiceAlias: function(options = {}) {
+      let alias = qx.locale.Manager.tr("service");
+      if (options.plural) {
+        alias = qx.locale.Manager.tr("services");
+      }
+
+      if (options.firstUpperCase) {
+        alias = osparc.utils.Utils.capitalize(alias);
+      } else if (options.allUpperCase) {
+        alias = alias.toUpperCase();
+      }
+
+      return alias;
+    },
+
     getAppAlias: function(options = {}) {
       let alias = qx.locale.Manager.tr("app");
       if (options.plural) {