more refactoring

Author: odeimaiz

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

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

@@ -411,7 +411,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _addResourceFilter: function() {
-      const resourceFilter = this._resourceFilter = new osparc.dashboard.ResourceFilter(this._resourceType).set({
+      const resourceFilter = this._resourceFilter = new osparc.dashboard.ResourceBrowserFilter(this._resourceType).set({
         marginTop: 20,
         maxWidth: this.self().SIDE_SPACER_WIDTH,
         width: this.self().SIDE_SPACER_WIDTH

services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js renamed to services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js

@@ -16,7 +16,7 @@
 ************************************************************************ */
 
 
-qx.Class.define("osparc.dashboard.ResourceFilter", {
+qx.Class.define("osparc.dashboard.ResourceBrowserFilter", {
   extend: qx.ui.core.Widget,
 
   construct: function(resourceType) {
@@ -57,7 +57,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
         case "study": {
           this._add(this.__createWorkspacesAndFoldersTree());
           this._add(this.__createTrashBin());
-          // this._add(this.__createResourceTypeContextButtons());
           this._add(filtersSpacer);
           const scrollView = new qx.ui.container.Scroll();
           scrollView.add(this.__createTagsFilterLayout());
@@ -67,7 +66,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
           break;
         }
         case "template": {
-          // this._add(this.__createResourceTypeContextButtons());
           this._add(filtersSpacer);
           this._add(this.__createSharedWithFilterLayout());
           const scrollView = new qx.ui.container.Scroll();
@@ -78,7 +76,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
           break;
         }
         case "service":
-          // this._add(this.__createResourceTypeContextButtons());
           this._add(filtersSpacer);
           this._add(this.__createSharedWithFilterLayout());
           this._add(this.__createAppTypeFilterLayout());
@@ -222,91 +219,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
     },
     /* /TRASH BIN */
 
-    /* RESOURCE TYPE CONTEXT */
-    __createResourceTypeContextButtons: function() {
-      const resourceTypeContextButtons = new qx.ui.container.Composite(new qx.ui.layout.VBox(2));
-
-      const studiesButton = this.__createStudiesButton().set({
-        value: this.__resourceType === "study",
-        visibility: this.__resourceType === "study" ? "excluded" : "visible",
-      });
-      resourceTypeContextButtons.add(studiesButton);
-
-      const permissions = osparc.data.Permissions.getInstance();
-      const templatesButton = this.__createTemplatesButton().set({
-        value: this.__resourceType === "template",
-      });
-      if (permissions.canDo("dashboard.templates.read")) {
-        resourceTypeContextButtons.add(templatesButton);
-      }
-
-      const servicesButton = this.__createServicesButton().set({
-        value: this.__resourceType === "service",
-      });
-      if (permissions.canDo("dashboard.services.read")) {
-        resourceTypeContextButtons.add(servicesButton);
-      }
-
-      return resourceTypeContextButtons;
-    },
-
-    __createStudiesButton: function() {
-      const studyAlias = osparc.product.Utils.getStudyAlias({
-        firstUpperCase: true,
-        plural: true
-      });
-      const studiesButton = new qx.ui.toolbar.RadioButton().set({
-        value: false,
-        appearance: "filter-toggle-button",
-        label: studyAlias,
-        icon: "@FontAwesome5Solid/file/16",
-        paddingLeft: 10, // align it with the context
-      });
-      osparc.utils.Utils.setIdToWidget(studiesButton, "studiesTabBtn");
-      studiesButton.addListener("tap", () => {
-        studiesButton.setValue(this.__resourceType === "study");
-        this.fireDataEvent("changeTab", "studiesTab");
-      });
-      return studiesButton;
-    },
-
-    __createTemplatesButton: function() {
-      const templateAlias = osparc.product.Utils.getTemplateAlias({
-        firstUpperCase: true,
-        plural: true
-      });
-      const templatesButton = new qx.ui.toolbar.RadioButton().set({
-        value: false,
-        appearance: "filter-toggle-button",
-        label: templateAlias,
-        icon: "@FontAwesome5Solid/copy/16",
-        paddingLeft: 10, // align it with the context
-      });
-      osparc.utils.Utils.setIdToWidget(templatesButton, "templatesTabBtn");
-      templatesButton.addListener("tap", () => {
-        templatesButton.setValue(this.__resourceType === "template");
-        this.fireDataEvent("changeTab", "templatesTab");
-      });
-      return templatesButton;
-    },
-
-    __createServicesButton: function() {
-      const servicesButton = new qx.ui.toolbar.RadioButton().set({
-        value: false,
-        appearance: "filter-toggle-button",
-        label: this.tr("Services"),
-        icon: "@FontAwesome5Solid/cogs/16",
-        paddingLeft: 10, // align it with the context
-      });
-      osparc.utils.Utils.setIdToWidget(servicesButton, "appsTabBtn");
-      servicesButton.addListener("tap", () => {
-        servicesButton.setValue(this.__resourceType === "service");
-        this.fireDataEvent("changeTab", "appsTab");
-      });
-      return servicesButton;
-    },
-    /* /RESOURCE TYPE CONTEXT */
-
     /* SHARED WITH */
     __createSharedWithFilterLayout: function() {
       const sharedWithLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(2));

services/static-webserver/client/source/class/osparc/ui/list/CollaboratorListItem.js

@@ -76,7 +76,7 @@ qx.Class.define("osparc.ui.list.CollaboratorListItem", {
   members: {
     __getRoleInfo: function(id) {
       const resource = this.getResourceType();
-      if (resource === "study" || resource === "template") {
+      if (["study", "template", "hypertool"].includes(resource)) {
         return osparc.data.Roles.STUDY[id];
       } else if (resource === "service") {
         return osparc.data.Roles.SERVICES[id];