RRID classifiers UX (#2060)

FORCED EMERGENCY MERGE!

* rename

* fix

* listen to classifiers change

* DO NOT check progress value but if "progress" exists

Author: odeimaiz

services/web/client/source/class/osparc/component/filter/ClassifiersFilter.js

@@ -21,13 +21,13 @@ qx.Class.define("osparc.component.filter.ClassifiersFilter", {
   members: {
     __tree: null,
 
-    reloadTree: function(reload = true) {
+    recreateTree: function() {
       const checkedClassifiers = this.getCheckedClassifierIDs();
-      this.__createClassifiersTree(checkedClassifiers, reload);
+      this.__createClassifiersTree(checkedClassifiers);
     },
 
-    __createClassifiersTree: function(checkedClassifiers, reload) {
-      osparc.utils.Classifiers.getClassifiersAsTree(reload = false)
+    __createClassifiersTree: function(checkedClassifiers, reload = false) {
+      osparc.utils.Classifiers.getClassifiersAsTree(reload)
         .then(classifiers => {
           if (classifiers && classifiers.children.length) {
             this.__tree = new osparc.ui.tree.CheckboxTree(classifiers);

services/web/client/source/class/osparc/dashboard/ClassifiersEditor.js

@@ -66,7 +66,7 @@ qx.Class.define("osparc.dashboard.ClassifiersEditor", {
         flex: 1
       });
 
-      const addRRIDClassfierBtn = new osparc.ui.form.FetchButton(this.tr("Add RRID Classifier"));
+      const addRRIDClassfierBtn = new osparc.ui.form.FetchButton(this.tr("Add Classifier"));
       addRRIDClassfierBtn.addListener("execute", () => {
         this.__addRRIDClassfier(textField.getValue(), addRRIDClassfierBtn);
       }, this);
@@ -79,6 +79,9 @@ qx.Class.define("osparc.dashboard.ClassifiersEditor", {
       const studyData = this.__studyData;
       const classifiers = studyData.classifiers && studyData.classifiers ? studyData.classifiers : [];
       const classifiersTree = this.__classifiersTree = new osparc.component.filter.ClassifiersFilter("classifiersEditor", "sideSearchFilter", classifiers);
+      osparc.store.Store.getInstance().addListener("changeClassifiers", e => {
+        classifiersTree.recreateTree();
+      }, this);
       this._add(classifiersTree, {
         flex: 1
       });
@@ -106,7 +109,7 @@ qx.Class.define("osparc.dashboard.ClassifiersEditor", {
       osparc.data.Resources.fetch("classifiers", "postRRID", params)
         .then(() => {
           osparc.component.message.FlashMessenger.getInstance().logAs(this.tr("RRID classifier successfuly added"), "INFO");
-          this.__classifiersTree.reloadTree();
+          osparc.store.Store.getInstance().getAllClassifiers(true);
         })
         .catch(err => {
           osparc.component.message.FlashMessenger.getInstance().logAs(this.tr("Invalid RRID"), "ERROR");

services/web/client/source/class/osparc/dashboard/SideSearch.js

@@ -59,6 +59,9 @@ qx.Class.define("osparc.dashboard.SideSearch", {
         marginLeft: -12,
         marginTop: -5
       });
+      osparc.store.Store.getInstance().addListener("changeClassifiers", e => {
+        classifier.recreateTree();
+      }, this);
       this._add(classifier, {
         flex: 1
       });

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

@@ -342,7 +342,7 @@ qx.Class.define("osparc.data.model.Node", {
           this.getStatus().setRunningStatus(nodeData.state);
         }
 
-        if (nodeData.progress) {
+        if ("progress" in nodeData) {
           this.getStatus().setProgress(nodeData.progress);
         }
 

services/web/client/source/class/osparc/desktop/WorkbenchView.js

@@ -670,11 +670,11 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
           const node = workbench.getNode(nodeId);
           if (node && nodeData) {
             node.setOutputData(nodeData.outputs);
-            if (nodeData.progress) {
-              const progress = Number.parseInt(nodeData.progress);
-              if ("state" in nodeData && node.isComputational()) {
-                node.getStatus().setRunningStatus(nodeData["state"]);
-              }
+            if ("state" in nodeData && node.isComputational()) {
+              node.getStatus().setRunningStatus(nodeData["state"]);
+            }
+            if ("progress" in nodeData) {
+              const progress = Number.parseInt(nodeData["progress"]);
               node.getStatus().setProgress(progress);
             }
           } else if (osparc.data.Permissions.getInstance().isTester()) {

services/web/client/source/class/osparc/store/Store.js

@@ -117,7 +117,8 @@ qx.Class.define("osparc.store.Store", {
     },
     classifiers: {
       check: "Array",
-      init: []
+      init: [],
+      event: "changeClassifiers"
     }
   },