abortStreamTasks

Author: odeimaiz

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

@@ -430,14 +430,15 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       this._loadingResourcesBtn.setVisibility("visible");
       const filterData = this._searchBarFilter.getFilterData();
       const text = filterData.text ? encodeURIComponent(filterData.text) : "";
-      const existingStream = osparc.store.StreamTasks.getInstance().getStreamTask("files_search", text);
+      const streamTasks = osparc.store.StreamTasks.getInstance();
+      const existingStream = streamTasks.getStreamTask("files_search", text);
       if (existingStream) {
         this.__fetchFilesFromStream(existingStream);
       } else {
-        // TODO: abort last stream if it changed
+        streamTasks.abortStreamTasks();
         const streamPromise = osparc.store.Data.getInstance().searchFiles(text);
         const pollingInterval = 2000;
-        osparc.store.StreamTasks.getInstance().createStreamTask("files_search", text, streamPromise, pollingInterval)
+        streamTasks.createStreamTask("files_search", text, streamPromise, pollingInterval)
           .then(newStream => this.__fetchFilesFromStream(newStream));
       }
     },

services/static-webserver/client/source/class/osparc/store/StreamTasks.js

@@ -52,10 +52,20 @@ qx.Class.define("osparc.store.StreamTasks", {
       return tasks[internalId] || null;
     },
 
+    abortStreamTasks: function() {
+      const tasks = this.getTasks();
+      Object.values(tasks).forEach(stream => {
+        if (stream.isEnd() === false) {
+          stream.abortRequested();
+        }
+        // and remove
+        this.__removeStreamTask(stream);
+      });
+    },
+
     __addStreamTask: function(action, params, streamData, interval) {
       const internalId = osparc.store.StreamTasks.actionToInternalId(action, params);
       const stream = new osparc.data.StreamTask(streamData, interval);
-      // stream.addListener("resultReceived", () => this.__removeStreamTask(stream), this);
       stream.addListener("taskAborted", () => this.__removeStreamTask(stream), this);
       const tasks = this.getTasks();
       tasks[internalId] = stream;
@@ -64,9 +74,9 @@ qx.Class.define("osparc.store.StreamTasks", {
 
     __removeStreamTask: function(stream) {
       const tasks = this.getTasks();
-      const index = tasks.findIndex(t => t.getTaskId() === stream.getTaskId());
-      if (index > -1) {
-        tasks.splice(index, 1);
+      const internalId = Object.keys(tasks).find(key => tasks[key] === stream);
+      if (internalId) {
+        delete tasks[internalId];
       }
     },
   }