use won store and more modeling

Author: odeimaiz

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

@@ -208,7 +208,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
     },
 
     __createCard: function(resourceData) {
-      const tags = resourceData.tags ? osparc.store.Store.getInstance().getTags().filter(tag => resourceData.tags.includes(tag.getTagId())) : [];
+      const tags = resourceData.tags ? osparc.store.Tags.getInstance().getTags().filter(tag => resourceData.tags.includes(tag.getTagId())) : [];
       const card = this.getMode() === "grid" ? new osparc.dashboard.GridButtonItem() : new osparc.dashboard.ListButtonItem();
       card.set({
         appearance: resourceData.type ? `pb-${resourceData.type}` : `pb-${resourceData.resourceType}`,
@@ -434,7 +434,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
     },
 
     __groupByTags: function(cards, resourceData) {
-      const tags = resourceData.tags ? osparc.store.Store.getInstance().getTags().filter(tag => resourceData.tags.includes(tag.getTagId())) : [];
+      const tags = resourceData.tags ? osparc.store.Tags.getInstance().getTags().filter(tag => resourceData.tags.includes(tag.getTagId())) : [];
       if (tags.length === 0) {
         let noGroupContainer = this.__getGroupContainer("no-group");
         const card = this.__createCard(resourceData);

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

@@ -158,16 +158,15 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
       const maxTags = 5;
       this.__tagButtons = [];
       layout.removeAll();
-      osparc.store.Store.getInstance().getTags().forEach((tag, idx) => {
-        const button = new qx.ui.form.ToggleButton(tag.name, "@FontAwesome5Solid/tag/18");
+      osparc.store.Tags.getInstance().getTags().forEach((tag, idx) => {
+        const button = new qx.ui.form.ToggleButton(null, "@FontAwesome5Solid/tag/18");
+        button.id = tag.getTagId();
+        tag.bind("name", button, "label");
+        tag.bind("color", button.getChildControl("icon"), "textColor");
         osparc.utils.Utils.setIdToWidget(button, this.__resourceType + "-tagFilterItem");
-        button.id = tag.id;
         button.set({
           appearance: "filter-toggle-button",
-          value: selectedTagIds.includes(tag.id)
-        });
-        button.getChildControl("icon").set({
-          textColor: tag.color
+          value: selectedTagIds.includes(tag.getTagId())
         });
 
         layout.add(button);

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

@@ -208,14 +208,14 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
     },
 
     __addTags: function(menuButton) {
-      const tags = osparc.store.Store.getInstance().getTags();
+      const tags = osparc.store.Tags.getInstance().getTags();
       menuButton.setVisibility(tags.length ? "visible" : "excluded");
       if (tags.length) {
         const tagsMenu = new qx.ui.menu.Menu();
         osparc.utils.Utils.setIdToWidget(tagsMenu, "searchBarFilter-tags-menu");
         tags.forEach(tag => {
-          const tagButton = new qx.ui.menu.Button(tag.name, "@FontAwesome5Solid/tag/12");
-          tagButton.getChildControl("icon").setTextColor(tag.color);
+          const tagButton = new qx.ui.menu.Button(tag.getName(), "@FontAwesome5Solid/tag/12");
+          tagButton.getChildControl("icon").setTextColor(tag.getColor());
           tagsMenu.add(tagButton);
           tagButton.addListener("execute", () => this.addTagActiveFilter(tag), this);
         });
@@ -275,12 +275,13 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
     },
 
     setTagsActiveFilter: function(tagIds) {
-      const tags = osparc.store.Store.getInstance().getTags();
+      const tags = osparc.store.Tags.getInstance().getTags();
       tags.forEach(tag => {
-        if (tagIds.includes(tag.id)) {
-          this.__addChip("tag", tag.id, tag.name);
+        const tagId = tag.getTagId();
+        if (tagIds.includes(tagId)) {
+          this.__addChip("tag", tag.id, tag.getName());
         } else {
-          this.__removeChip("tag", tag.id, tag.name);
+          this.__removeChip("tag", tag.id, tag.getName());
         }
       });
     },

services/static-webserver/client/source/class/osparc/filter/UserTagsFilter.js

@@ -18,7 +18,7 @@ qx.Class.define("osparc.filter.UserTagsFilter", {
   },
   members: {
     __buildMenu: function() {
-      osparc.store.Store.getInstance().getTags()
+      osparc.store.Tags.getInstance().getTags()
         .forEach(tag => {
           const menuButton = this._addOption(tag.name);
           menuButton.setIcon("@FontAwesome5Solid/square/12");

services/static-webserver/client/source/class/osparc/form/tag/TagManager.js

@@ -119,7 +119,7 @@ qx.Class.define("osparc.form.tag.TagManager", {
 
     __repopulateTags: function() {
       this.__tagsContainer.removeAll();
-      const tags = osparc.store.Store.getInstance().getTags();
+      const tags = osparc.store.Tags.getInstance().getTags();
       tags.forEach(tag => this.__tagsContainer.add(this.__tagButton(tag)));
     },
 

services/static-webserver/client/source/class/osparc/info/StudyUtils.js

@@ -211,7 +211,7 @@ qx.Class.define("osparc.info.StudyUtils", {
         tagsContainer.removeAll();
         const noTagsLabel = new qx.ui.basic.Label(qx.locale.Manager.tr("Add tags"));
         tagsContainer.add(noTagsLabel);
-        osparc.store.Store.getInstance().getTags().filter(tag => model.getTags().includes(tag.id))
+        osparc.store.Tags.getInstance().getTags().filter(tag => model.getTags().includes(tag.id))
           .forEach(selectedTag => {
             if (tagsContainer.indexOf(noTagsLabel) > -1) {
               tagsContainer.remove(noTagsLabel);