[skip ci] more hypertooling

Author: odeimaiz

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

@@ -160,10 +160,10 @@ qx.Class.define("osparc.dashboard.CardBase", {
       return false;
     },
 
-    filterAppType: function(resourceType, metadata, serviceType) {
-      if (serviceType && resourceType === "service") {
+    filterAppType: function(resourceType, metadata, appType) {
+      if (appType && ["service", "hypertool"].includes(resourceType)) {
         if (metadata && metadata.type) {
-          const matches = metadata.type === serviceType;
+          const matches = metadata.type === appType;
           return !matches;
         }
         return false;
@@ -511,11 +511,8 @@ qx.Class.define("osparc.dashboard.CardBase", {
       let icon = null;
       switch (resourceData["resourceType"]) {
         case "study":
-          uuid = resourceData.uuid ? resourceData.uuid : null;
-          owner = resourceData.prjOwner ? resourceData.prjOwner : "";
-          workbench = resourceData.workbench ? resourceData.workbench : {};
-          break;
         case "template":
+        case "hypertool":
           uuid = resourceData.uuid ? resourceData.uuid : null;
           owner = resourceData.prjOwner ? resourceData.prjOwner : "";
           workbench = resourceData.workbench ? resourceData.workbench : {};
@@ -548,7 +545,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
         workbench
       });
 
-      if (resourceData["resourceType"] === "study" || resourceData["resourceType"] === "template") {
+      if (["study", "template", "hypertool"].includes(resourceData["resourceType"])) {
         osparc.store.Services.getStudyServices(resourceData.uuid)
           .then(resp => {
             const services = resp["services"];
@@ -1050,6 +1047,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("hypertool")) {
+        toolTipText += osparc.product.Utils.getAppAlias();
       }
       const control = new qx.ui.basic.Image().set({
         source: "@FontAwesome5Solid/times-circle/14",

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

@@ -185,7 +185,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     // overridden
     _applyLastChangeDate: function(value, old) {
       if (value) {
-        if (this.isResourceType("study") || this.isResourceType("template")) {
+        if (["study", "template"].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.set({
             date: value,
@@ -198,7 +198,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     // overridden
     _applyTrashedAt: function(value) {
       if (value && value.getTime() !== new Date(0).getTime()) {
-        if (this.isResourceType("study") || this.isResourceType("template")) {
+        if (["study", "template"].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.set({
             date: value,
@@ -211,7 +211,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     // overridden
     _applyTrashedBy: function(gid) {
       if (gid) {
-        if (this.isResourceType("study") || this.isResourceType("template")) {
+        if (["study", "template"].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.setGroupId(gid);
         }

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

@@ -186,7 +186,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
     // overridden
     _applyLastChangeDate: function(value, old) {
       if (value) {
-        if (this.isResourceType("study") || this.isResourceType("template")) {
+        if (["study", "template"].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.set({
             date: value,
@@ -199,7 +199,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
     // overridden
     _applyTrashedAt: function(value) {
       if (value && value.getTime() !== new Date(0).getTime()) {
-        if (this.isResourceType("study") || this.isResourceType("template")) {
+        if (["study", "template"].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.set({
             date: value,
@@ -212,7 +212,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
     // overridden
     _applyTrashedBy: function(gid) {
       if (gid) {
-        if (this.isResourceType("study") || this.isResourceType("template")) {
+        if (["study", "template"].includes(this.getResourceType())) {
           const dateBy = this.getChildControl("date-by");
           dateBy.setGroupId(gid);
         }

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

@@ -744,6 +744,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
             break;
           }
           case "template":
+          case "hypertool":
             this._createStudyFromTemplate(resourceData);
             break;
           case "service":
@@ -775,6 +776,11 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
         const templateData = e.getData();
         this._createStudyFromTemplate(templateData);
       });
+      resourceDetails.addListener("openHypertool", e => {
+        win.close();
+        const templateData = e.getData();
+        this._createStudyFromTemplate(templateData);
+      });
       resourceDetails.addListener("openService", e => {
         win.close();
         const openServiceData = e.getData();

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

@@ -26,7 +26,8 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     let latestPromise = null;
     switch (resourceData["resourceType"]) {
       case "study":
-      case "template": {
+      case "template":
+      case "hypertool": {
         const params = {
           url: {
             "studyId": resourceData["uuid"]
@@ -47,7 +48,8 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         this.__resourceData["resourceType"] = resourceData["resourceType"];
         switch (resourceData["resourceType"]) {
           case "study":
-          case "template": {
+          case "template":
+          case "hypertool":
             osparc.store.Services.getStudyServicesMetadata(latestResourceData)
               .finally(() => {
                 this.__resourceModel = new osparc.data.model.Study(latestResourceData);
@@ -56,7 +58,6 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
                 this.__addPages();
               })
             break;
-          }
           case "service": {
             this.__resourceModel = new osparc.data.model.Service(latestResourceData);
             this.__resourceModel["resourceType"] = resourceData["resourceType"];
@@ -71,6 +72,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
   events: {
     "pagesAdded": "qx.event.type.Event",
     "openTemplate": "qx.event.type.Data",
+    "openHypertool": "qx.event.type.Data",
     "openService": "qx.event.type.Data",
     "updateStudy": "qx.event.type.Data",
     "updateTemplate": "qx.event.type.Data",
@@ -240,6 +242,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         case "template":
           this.fireDataEvent("openTemplate", this.__resourceData);
           break;
+        case "hypertool":
+          this.fireDataEvent("openHypertool", this.__resourceData);
+          break;
         case "service":
           this.fireDataEvent("openService", this.__resourceData);
           break;

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

@@ -102,6 +102,21 @@ qx.Class.define("osparc.product.Utils", {
       return alias;
     },
 
+    getHypertoolAlias: function(options = {}) {
+      let alias = qx.locale.Manager.tr("hypertool");
+      if (options.plural) {
+        alias = qx.locale.Manager.tr("hypertools");
+      }
+
+      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) {
@@ -125,6 +140,8 @@ qx.Class.define("osparc.product.Utils", {
           return this.getTemplateAlias(options);
         case "service":
           return this.getServiceAlias(options);
+        case "hypertool":
+          return this.getHypertoolAlias(options);
         case "app":
           return this.getAppAlias(options);
       }

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

@@ -194,6 +194,7 @@ qx.Class.define("osparc.share.Collaborators", {
       switch (this._resourceType) {
         case "study":
         case "template":
+        case "hypertool":
           canIShare = osparc.data.model.Study.canIWrite(this._serializedDataCopy["accessRights"]);
           break;
         case "service":
@@ -218,6 +219,7 @@ qx.Class.define("osparc.share.Collaborators", {
       switch (this._resourceType) {
         case "study":
         case "template":
+        case "hypertool":
           fullOptions = osparc.data.model.Study.canIDelete(this._serializedDataCopy["accessRights"]);
           break;
         case "service":
@@ -238,6 +240,7 @@ qx.Class.define("osparc.share.Collaborators", {
       switch (this._resourceType) {
         case "study":
         case "template":
+        case "hypertool":
           rolesLayout = osparc.data.Roles.createRolesStudyInfo();
           break;
         case "service":

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

@@ -466,7 +466,10 @@ qx.Class.define("osparc.utils.Utils", {
           resourceType = osparc.product.Utils.getTemplateAlias({firstUpperCase: true});
           break;
         case "service":
-          resourceType = qx.locale.Manager.tr("Service");
+          resourceType = osparc.product.Utils.getServiceAlias({firstUpperCase: true});
+          break;
+        case "hypertool":
+          resourceType = osparc.product.Utils.getHypertoolAlias({firstUpperCase: true});
           break;
       }
       return resourceType;