more tutorials

Author: odeimaiz

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

@@ -40,6 +40,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
   events: {
     "updateStudy": "qx.event.type.Data",
     "updateTemplate": "qx.event.type.Data",
+    "updateTutorial": "qx.event.type.Data",
     "updateService": "qx.event.type.Data",
     "updateHypertool": "qx.event.type.Data",
     "publishTemplate": "qx.event.type.Data",

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

@@ -287,6 +287,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       }
       resourcesContainer.addListener("updateStudy", e => this._updateStudyData(e.getData()));
       resourcesContainer.addListener("updateTemplate", e => this._updateTemplateData(e.getData()));
+      resourcesContainer.addListener("updateTutorial", e => this._updateTutorialData(e.getData()));
       resourcesContainer.addListener("updateService", e => this._updateServiceData(e.getData()));
       resourcesContainer.addListener("updateHypertool", e => this._updateHypertoolData(e.getData()));
       resourcesContainer.addListener("publishTemplate", e => this.fireDataEvent("publishTemplate", e.getData()));
@@ -693,6 +694,10 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       }
     },
 
+    updateTutorialData: function(tutorialData) {
+      throw new Error("Abstract method called!");
+    },
+
     _updateServiceData: function(serviceData) {
       throw new Error("Abstract method called!");
     },
@@ -933,6 +938,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
       resourceDetails.addListener("updateStudy", e => this._updateStudyData(e.getData()));
       resourceDetails.addListener("updateTemplate", e => this._updateTemplateData(e.getData()));
+      resourceDetails.addListener("updateTutorial", e => this._updateTutorialData(e.getData()));
       resourceDetails.addListener("updateService", e => this._updateServiceData(e.getData()));
       resourceDetails.addListener("updateHypertool", e => this._updateHypertoolData(e.getData()));
       resourceDetails.addListener("publishTemplate", e => {

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

@@ -390,6 +390,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         case "template":
           this.fireDataEvent("updateTemplate", updatedData);
           break;
+        case "tutorial":
+          this.fireDataEvent("updateTutorial", updatedData);
+          break;
         case "hypertool":
           this.fireDataEvent("updateHypertool", updatedData);
           break;

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

@@ -88,7 +88,7 @@ qx.Class.define("osparc.dashboard.TutorialBrowser", {
           .catch(() => this.__setResourcesToList([]));
     },
 
-    _updateTemplateData: function(templateData) {
+    _updateTutorialData: function(templateData) {
       templateData["resourceType"] = "tutorial";
       this.base(arguments, templateData);
     },
@@ -221,7 +221,7 @@ qx.Class.define("osparc.dashboard.TutorialBrowser", {
           }
         }
         Promise.all(templatePromises)
-          .then(() => this._updateTemplateData(uniqueTemplateData))
+          .then(() => this._updateTutorialData(uniqueTemplateData))
           .catch(err => {
             osparc.FlashMessenger.logError(err);
           });

services/static-webserver/client/source/class/osparc/desktop/organizations/TutorialsList.js

@@ -89,7 +89,7 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {
             osparc.store.Templates.getTutorial(templateId)
               .then(templateData => {
                 if (templateData) {
-                  templateData["resourceType"] = "template";
+                  templateData["resourceType"] = "tutorial";
                   const resourceDetails = new osparc.dashboard.ResourceDetails(templateData).set({
                     showOpenButton: false
                   });

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

@@ -147,6 +147,8 @@ qx.Class.define("osparc.product.Utils", {
           return this.getStudyAlias(options);
         case "template":
           return this.getTemplateAlias(options);
+        case "tutorial":
+          return this.getTutorialAlias(options);
         case "service":
           // return this.getServiceAlias(options);
           // Do not use this alias anymore, use "app" instead

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 "tutorial":
         case "hypertool":
           canIShare = osparc.data.model.Study.canIWrite(this._serializedDataCopy["accessRights"]);
           break;
@@ -219,6 +220,7 @@ qx.Class.define("osparc.share.Collaborators", {
       switch (this._resourceType) {
         case "study":
         case "template":
+        case "tutorial":
         case "hypertool":
           fullOptions = osparc.data.model.Study.canIDelete(this._serializedDataCopy["accessRights"]);
           break;
@@ -240,6 +242,7 @@ qx.Class.define("osparc.share.Collaborators", {
       switch (this._resourceType) {
         case "study":
         case "template":
+        case "tutorial":
         case "hypertool":
           rolesLayout = osparc.data.Roles.createRolesStudyInfo();
           break;
@@ -345,7 +348,7 @@ qx.Class.define("osparc.share.Collaborators", {
           item.addListener("removeMember", e => {
             const orgMember = e.getData();
             if (
-              ["study", "template", "hypertool"].includes(this._resourceType) &&
+              ["study", "template", "tutorial", "hypertool"].includes(this._resourceType) &&
               !osparc.share.CollaboratorsStudy.canCollaboratorBeRemoved(this._serializedDataCopy, orgMember["gid"])
             ) {
               let msg = this.tr("Collaborator can't be removed:");
@@ -373,7 +376,7 @@ qx.Class.define("osparc.share.Collaborators", {
     __getLeaveStudyButton: function() {
       const myGid = osparc.auth.Data.getInstance().getGroupId();
       if (
-        ["study", "template", "hypertool"].includes(this._resourceType) &&
+        ["study", "template", "tutorial", "hypertool"].includes(this._resourceType) &&
         osparc.share.CollaboratorsStudy.canCollaboratorBeRemoved(this._serializedDataCopy, myGid)
       ) {
         const leaveText = this.tr("Leave") + " " + osparc.product.Utils.getStudyAlias({

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

@@ -88,9 +88,7 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
       if (!newAccessRights) {
         newAccessRights = this._resourceType === "study" ? writeAccessRole.accessRights : readAccessRole.accessRights;
       }
-      const resourceAlias = this._resourceType === "template" ?
-        osparc.product.Utils.getTemplateAlias({firstUpperCase: true}) :
-        osparc.product.Utils.getStudyAlias({firstUpperCase: true});
+      const resourceAlias = osparc.product.Utils.resourceTypeToAlias(this._resourceType, {firstUpperCase: true});
       const newCollaborators = {};
       gids.forEach(gid => {
         newCollaborators[gid] = newAccessRights;

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

@@ -244,18 +244,26 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
       let showProductEveryone = false;
       if (this.__showOrganizations === false) {
         showProductEveryone = false;
-      } else if (this.__resourceData && this.__resourceData["resourceType"] === "study") {
-        // studies can't be shared with ProductEveryone
-        showProductEveryone = false;
-      } else if (this.__resourceData && this.__resourceData["resourceType"] === "template") {
-        // only users with permissions can share templates with ProductEveryone
-        showProductEveryone = osparc.data.Permissions.getInstance().canDo("study.everyone.share");
-      } else if (this.__resourceData && this.__resourceData["resourceType"] === "service") {
-        // all users can share services with ProductEveryone
-        showProductEveryone = true;
-      } else if (this.__resourceData && this.__resourceData["resourceType"] === "hypertool") {
-        // all users can share hypertool with ProductEveryone
-        showProductEveryone = true;
+      } else if (this.__resourceData) {
+        switch (this.__resourceData["resourceType"]) {
+          case "study":
+            // studies can't be shared with ProductEveryone
+            showProductEveryone = false;
+            break;
+          case "template":
+          case "tutorial":
+            // only users with permissions can share templates with ProductEveryone
+            showProductEveryone = osparc.data.Permissions.getInstance().canDo("study.everyone.share");
+            break;
+          case "service":
+            // all users can share services with ProductEveryone
+            showProductEveryone = true;
+            break;
+          case "hypertool":
+            // all users can share hypertool with ProductEveryone
+            showProductEveryone = true;
+            break;
+        }
       }
       return showProductEveryone;
     },