Fix Service Catalog tags filter (#2541)

Author: odeimaiz

services/web/client/source/class/osparc/component/service/ServiceButtonSmall.js

@@ -33,6 +33,8 @@ qx.Class.define("osparc.component.service.ServiceButtonSmall", {
     if (serviceModel) {
       this.setServiceModel(serviceModel);
     }
+
+    this.subscribeToFilterGroup("serviceCatalog");
   },
 
   properties: {
@@ -95,8 +97,13 @@ qx.Class.define("osparc.component.service.ServiceButtonSmall", {
     },
 
     _filterTags: function(tags) {
-      const checks = this.getServiceModel().getTags().map(tag => tag.name);
-      return osparc.dashboard.CardBase.filterText(checks, tags);
+      if (tags && tags.length) {
+        const type = this.getServiceModel().getType() || "";
+        if (!tags.includes(osparc.utils.Utils.capitalize(type.trim()))) {
+          return true;
+        }
+      }
+      return false;
     },
 
     _filterClassifiers: function(classifiers) {

services/web/client/source/class/osparc/component/workbench/NodeUI.js

@@ -340,24 +340,36 @@ qx.Class.define("osparc.component.workbench.NodeUI", {
       });
     },
 
-    // implement osparc.component.filter.IFilterable
-    _shouldApplyFilter: function(data) {
-      if (data.text) {
-        const label = this.getNode().getLabel()
-          .trim()
-          .toLowerCase();
-        if (label.indexOf(data.text) === -1) {
-          return true;
-        }
+    __filterText: function(text) {
+      const label = this.getNode().getLabel()
+        .trim()
+        .toLowerCase();
+      if (label.indexOf(text) === -1) {
+        return true;
       }
-      if (data.tags && data.tags.length) {
+      return false;
+    },
+
+    __filterTags: function(tags) {
+      if (tags && tags.length) {
         const category = this.getNode().getMetaData().category || "";
         const type = this.getNode().getMetaData().type || "";
-        if (!data.tags.includes(osparc.utils.Utils.capitalize(category.trim())) && !data.tags.includes(osparc.utils.Utils.capitalize(type.trim()))) {
+        if (!tags.includes(osparc.utils.Utils.capitalize(category.trim())) && !tags.includes(osparc.utils.Utils.capitalize(type.trim()))) {
           return true;
         }
       }
       return false;
+    },
+
+    // implement osparc.component.filter.IFilterable
+    _shouldApplyFilter: function(data) {
+      if (data.text) {
+        return this.__filterText(data.text);
+      }
+      if (data.tags && data.tags.length) {
+        return this.__filterTags(data.tags);
+      }
+      return false;
     }
   }
 });

services/web/client/source/class/osparc/component/workbench/ServiceCatalog.js

@@ -86,7 +86,7 @@ qx.Class.define("osparc.component.workbench.ServiceCatalog", {
   members: {
     __allServicesList: null,
     __filteredServicesObj: null,
-    __textfield: null,
+    __textFilter: null,
     __contextLeftNodeId: null,
     __contextRightNodeId: null,
     __versionsBox: null,
@@ -101,7 +101,7 @@ qx.Class.define("osparc.component.workbench.ServiceCatalog", {
         spacing: 10
       });
       const filters = new osparc.component.filter.group.ServiceFilterGroup("serviceCatalog");
-      this.__textfield = filters.getTextFilter().getChildControl("textfield", true);
+      this.__textFilter = filters.getTextFilter().getChildControl("textfield", true);
       filterPart.add(filters);
       toolbar.add(filterPart);
 
@@ -304,9 +304,9 @@ qx.Class.define("osparc.component.workbench.ServiceCatalog", {
     __attachEventHandlers: function() {
       this.addListener("appear", () => {
         osparc.component.filter.UIFilterController.getInstance().resetGroup("serviceCatalog");
-        this.__textfield.focus();
+        this.__textFilter.focus();
       }, this);
-      this.__textfield.addListener("keypress", e => {
+      this.__textFilter.addListener("keypress", e => {
         if (e.getKeyIdentifier() === "Enter") {
           this.__serviceBrowser.selectFirstVisible();
           const selected = this.__serviceBrowser.getSelected();

services/web/client/source/class/osparc/data/model/Node.js

@@ -379,6 +379,12 @@ qx.Class.define("osparc.data.model.Node", {
       return uniqueNodes;
     },
 
+    getExposedNodeIDs: function() {
+      const exposedInnerNodes = this.getExposedInnerNodes();
+      const exposedNodeIDs = exposedInnerNodes.map(exposedInnerNode => exposedInnerNode.getNodeId());
+      return exposedNodeIDs;
+    },
+
     populateNodeData: function(nodeData) {
       if (nodeData) {
         if (nodeData.label) {

services/web/client/source/class/osparc/utils/Services.js

@@ -40,10 +40,6 @@ qx.Class.define("osparc.utils.Services", {
       dynamic: {
         label: "Interactive",
         icon: "@FontAwesome5Solid/mouse-pointer/"
-      },
-      container: {
-        label: "Group of nodes",
-        icon: "@FontAwesome5Solid/box-open/"
       }
     },