New ISAN templates started (#815)

* New ISAN templates started
* make sure pipeline is updated before running it in the backend
* fix #831
* fix #832

Author: odeimaiz

services/web/client/source/class/qxapp/data/Store.js

@@ -89,8 +89,8 @@ qx.Class.define("qxapp.data.Store", {
           }
           return metaData;
         }
-        const moreServices = this.getFakeServices().concat(this.getBuiltInServices());
-        metaData = qxapp.utils.Services.getFromArray(moreServices, key, version);
+        const allServices = this.getFakeServices().concat(this.getBuiltInServices());
+        metaData = qxapp.utils.Services.getFromArray(allServices, key, version);
         if (metaData) {
           return qxapp.utils.Utils.deepCloneObject(metaData);
         }
@@ -1118,8 +1118,9 @@ qx.Class.define("qxapp.data.Store", {
           const {
             data
           } = requ.getResponse();
-          const newServices = data.concat(this.getBuiltInServices());
-          const services = qxapp.utils.Services.convertArrayToObject(newServices);
+          const allServices = data.concat(this.getBuiltInServices());
+          const filteredServices = qxapp.utils.Services.filterOutUnavailableGroups(allServices);
+          const services = qxapp.utils.Services.convertArrayToObject(filteredServices);
           this.__servicesToCache(services, true);
         }, this);
 
@@ -1128,8 +1129,9 @@ qx.Class.define("qxapp.data.Store", {
             error
           } = e.getTarget().getResponse();
           console.error("getServices failed", error);
-          const moreServices = this.getFakeServices().concat(this.getBuiltInServices());
-          const services = qxapp.utils.Services.convertArrayToObject(moreServices);
+          const allServices = this.getFakeServices().concat(this.getBuiltInServices());
+          const filteredServices = qxapp.utils.Services.filterOutUnavailableGroups(allServices);
+          const services = qxapp.utils.Services.convertArrayToObject(filteredServices);
           this.__servicesToCache(services, false);
         }, this);
         req.send();

services/web/client/source/class/qxapp/data/model/Study.js

@@ -116,7 +116,8 @@ qx.Class.define("qxapp.data.model.Study", {
         thumbnail: "",
         prjOwner: "",
         creationDate: new Date(),
-        lastChangeDate: new Date()
+        lastChangeDate: new Date(),
+        workbench: {}
       };
     }
   },

services/web/client/source/class/qxapp/desktop/StudyEditor.js

@@ -148,16 +148,16 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
     },
 
     connectEvents: function() {
-      this.__mainPanel.getControls().addListener("startPipeline", this.startPipeline, this);
-      this.__mainPanel.getControls().addListener("stopPipeline", this.stopPipeline, this);
-      this.__mainPanel.getControls().addListener("retrieveInputs", this.updatePipeline, this);
+      this.__mainPanel.getControls().addListener("startPipeline", this.__startPipeline, this);
+      this.__mainPanel.getControls().addListener("stopPipeline", this.__stopPipeline, this);
+      this.__mainPanel.getControls().addListener("retrieveInputs", this.__updatePipeline, this);
 
       let workbench = this.getStudy().getWorkbench();
       workbench.addListener("workbenchChanged", this.__workbenchChanged, this);
 
       workbench.addListener("updatePipeline", e => {
         let node = e.getData();
-        this.updatePipeline(node);
+        this.__updatePipeline(node);
       }, this);
 
       workbench.addListener("showInLogger", ev => {
@@ -400,7 +400,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       return currentPipeline;
     },
 
-    updatePipeline: function(node) {
+    __updatePipeline: function(node) {
       let currentPipeline = this.__getCurrentPipeline();
       let url = "/computation/pipeline/" + encodeURIComponent(this.getStudy().getUuid());
       let req = new qxapp.io.request.ApiRequest(url, "PUT");
@@ -435,11 +435,15 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       this.getLogger().debug(null, "Updating pipeline");
     },
 
-    startPipeline: function() {
+    __startPipeline: function() {
       if (!qxapp.data.Permissions.getInstance().canDo("study.start", true)) {
         return false;
       }
 
+      return this.updateStudyDocument(null, this.__doStartPipeline);
+    },
+
+    __doStartPipeline: function() {
       this.getStudy().getWorkbench().clearProgressData();
 
       let socket = qxapp.wrapper.WebSocket.getInstance();
@@ -495,7 +499,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       return true;
     },
 
-    stopPipeline: function() {
+    __stopPipeline: function() {
       if (!qxapp.data.Permissions.getInstance().canDo("study.stop", true)) {
         return false;
       }
@@ -567,8 +571,8 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       }
     },
 
-    updateStudyDocument: function(newObj) {
-      if (newObj === undefined) {
+    updateStudyDocument: function(newObj, cb) {
+      if (newObj === null || newObj === undefined) {
         newObj = this.getStudy().serializeStudy();
       }
       const prjUuid = this.getStudy().getUuid();
@@ -577,6 +581,9 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       resource.addListenerOnce("putSuccess", ev => {
         this.fireDataEvent("studySaved", true);
         this.__lastSavedPrj = qxapp.wrapper.JsonDiffPatch.getInstance().clone(newObj);
+        if (cb) {
+          cb.call(this);
+        }
       }, this);
       resource.put({
         "project_id": prjUuid

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

@@ -93,6 +93,35 @@ qx.Class.define("qxapp.utils.Services", {
         return services[key][versions[versions.length - 1]];
       }
       return null;
+    },
+
+    isServiceInList: function(listOfServices, serveiceKey) {
+      for (let i=0; i<listOfServices.length; i++) {
+        if (listOfServices[i].key === serveiceKey) {
+          return true;
+        }
+      }
+      return false;
+    },
+
+    filterOutUnavailableGroups: function(listOfServices) {
+      const filteredServices = [];
+      for (let i=0; i<listOfServices.length; i++) {
+        const service = listOfServices[i];
+        if ("innerNodes" in service) {
+          let allIn = true;
+          const innerServices = service["innerNodes"];
+          for (const innerService in innerServices) {
+            allIn &= qxapp.utils.Services.isServiceInList(listOfServices, innerServices[innerService].key);
+          }
+          if (allIn) {
+            filteredServices.push(service);
+          }
+        } else {
+          filteredServices.push(service);
+        }
+      }
+      return filteredServices;
     }
   }
 });