refactor

Author: odeimaiz

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

@@ -426,31 +426,36 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       this._loadingResourcesBtn.setVisibility("visible");
       const filterData = this._searchBarFilter.getFilterData();
       const text = filterData.text ? encodeURIComponent(filterData.text) : "";
-      const streamPromise = osparc.store.Data.getInstance().searchFiles(text);
-      let stream = null;
-      const pollingInterval = 2000;
-      osparc.store.StreamTasks.getInstance().getStreamTask("files_search", text, streamPromise, pollingInterval)
-        .then(strm => {
-          stream = strm;
-          console.log("Streaming files search...", stream);
-          return stream.fetchStream()
-        })
+      const existingStream = osparc.store.StreamTasks.getInstance().getStreamTask("files_search", text);
+      if (existingStream) {
+        this.__fetchFilesFromStream(existingStream);
+      } else {
+        const streamPromise = osparc.store.Data.getInstance().searchFiles(text);
+        const pollingInterval = 2000;
+        osparc.store.StreamTasks.getInstance().createStreamTask("files_search", text, streamPromise, pollingInterval)
+          .then(newStream => this.__fetchFilesFromStream(newStream));
+      }
+    },
+
+    __fetchFilesFromStream: function(stream) {
+      stream.fetchStream()
         .then(streamData => {
           const items = streamData["data"]["items"] || [];
           if (items.length) {
             this.__setFilesToList(items);
           }
           const end = streamData["data"]["end"] || false;
-          if (end === false && items.length === 0 && stream) {
+          if (end === false || items.length === 0) {
             // nothing to stream yet, try again later
+            const pollingInterval = 2000;
             setTimeout(() => this.__reloadFiles(), pollingInterval);
           }
         })
         .catch(err => console.log(err))
         .finally(() => {
           this._loadingResourcesBtn.setFetching(false);
           /*
-          if (stream && stream.isEnd() === false) {
+          if (stream.isEnd() === false) {
             setTimeout(() => this.__reloadFiles(), 500);
           }
           */

services/static-webserver/client/source/class/osparc/data/PollTask.js

@@ -131,6 +131,8 @@ qx.Class.define("osparc.data.PollTask", {
 
     __pollTaskState: function() {
       const statusPath = this.self().extractPathname(this.getStatusHref());
+      // OM remove
+      return;
       fetch(statusPath)
         .then(resp => {
           if (this.__aborting || this.getDone()) {

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

@@ -27,45 +27,33 @@ qx.Class.define("osparc.store.StreamTasks", {
     }
   },
 
-  members: {
-    getStreamTask: function(action, params, streamPromise, interval) {
-      const internalId = action + "_" + JSON.stringify(params);
-      const task = this.__getStreamTask(internalId);
-      if (task) {
-        console.log("Reusing existing stream task:", internalId);
-        return Promise.resolve(task);
-      }
-      return this.__createStreamTask(internalId, streamPromise, interval)
-        .then(streamTask => {
-          console.log("Creating new stream task:", internalId);
-          return streamTask;
-        })
-        .catch(err => Promise.reject(err));
+  statics: {
+    actionToInternalId: function(action, params) {
+      return action + "_" + JSON.stringify(params);
     },
+  },
 
-    __createStreamTask: function(internalId, streamPromise, interval) {
+  members: {
+    createStreamTask: function(action, params, streamPromise, interval) {
       return streamPromise
         .then(streamData => {
           console.log("Stream data received:", streamData);
           if (!("stream_href" in streamData)) {
             throw new Error("Stream href missing");
           }
-          return this.__addStreamTask(internalId, streamData, interval);
+          return this.__addStreamTask(action, params, streamData, interval);
         })
         .catch(err => Promise.reject(err));
     },
 
-    __getStreamTask: function(internalId) {
+    getStreamTask: function(action, params) {
+      const internalId = osparc.store.StreamTasks.actionToInternalId(action, params);
       const tasks = this.getTasks();
       return tasks[internalId] || null;
     },
 
-    __addStreamTask: function(internalId, streamData, interval) {
-      const task = this.__getStreamTask(internalId);
-      if (task) {
-        return task;
-      }
-
+    __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);