__reloadFiles

Author: odeimaiz

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

@@ -427,22 +427,33 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       const filterData = this._searchBarFilter.getFilterData();
       const text = filterData.text ? encodeURIComponent(filterData.text) : "";
       const streamPromise = osparc.store.Data.getInstance().searchFiles(text);
-      osparc.store.StreamTasks.getInstance().getStreamTask("files_search", text, streamPromise, 500)
-        .then(stream => {
-          // const stream = new osparc.data.StreamTask(streamData);
-          stream.addListener("streamReceived", e => {
-            const data = e.getData();
-            if ("items" in data) {
-              this.__setFilesToList(data["items"]);
-            }
-          }, this);
+      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()
+        })
+        .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) {
+            // nothing to stream yet, try again later
+            setTimeout(() => this.__reloadFiles(), pollingInterval);
+          }
         })
         .catch(err => console.log(err))
         .finally(() => {
           this._loadingResourcesBtn.setFetching(false);
-          if (stream.isEnd() === false) {
+          /*
+          if (stream && stream.isEnd() === false) {
             setTimeout(() => this.__reloadFiles(), 500);
           }
+          */
         });
     },
 

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

@@ -61,44 +61,39 @@ qx.Class.define("osparc.data.StreamTask", {
     },
 
     fetchStream: function() {
-      if (!this.isEnd()) {
-        const streamPath = osparc.data.PollTask.extractPathname(this.getStreamHref());
-        const url = `${streamPath}?limit=${this.getPageSize()}`;
-        fetch(url)
-          .then(resp => {
-            if (resp.status === 200) {
-              return resp.json();
-            }
-            const errMsg = qx.locale.Manager.tr("Unsuccessful streaming");
-            const err = new Error(errMsg);
-            this.fireDataEvent("pollingError", err);
-            throw err;
-          })
-          .then(streamData => {
-            if ("error" in streamData && streamData["error"]) {
-              throw streamData["error"];
-            }
-            if ("data" in streamData && streamData["data"]) {
-              const items = streamData["data"]["items"] || [];
-              const end = streamData["data"]["end"] || false;
-              if (items.length === 0 && end === false) {
-                // nothing to stream yet, try again later
-                setTimeout(() => this.fetchStream(), this.getPollInterval());
-                return;
+      return new Promise((resolve, reject) => {
+        if (!this.isEnd()) {
+          const streamPath = osparc.data.PollTask.extractPathname(this.getStreamHref());
+          const url = `${streamPath}?limit=${this.getPageSize()}`;
+          fetch(url)
+            .then(resp => {
+              if (resp.status === 200) {
+                return resp.json();
+              }
+              const errMsg = qx.locale.Manager.tr("Unsuccessful streaming");
+              const err = new Error(errMsg);
+              this.fireDataEvent("pollingError", err);
+              throw err;
+            })
+            .then(streamData => {
+              if ("error" in streamData && streamData["error"]) {
+                throw streamData["error"];
               }
-              this.fireDataEvent("streamReceived", items);
+              const end = streamData["data"]["end"] || false;
               if (end) {
                 this.setEnd(true);
               }
-              return;
-            }
-            throw new Error("Missing stream data");
-          })
-          .catch(err => {
-            this.fireDataEvent("pollingError", err);
-            throw err;
-          });
-      }
+              if ("data" in streamData && streamData["data"]) {
+                resolve(streamData);
+              }
+              throw new Error("Missing stream data");
+            })
+            .catch(err => {
+              this.fireDataEvent("pollingError", err);
+              reject(err);
+            });
+        }
+      });
     },
   }
 });

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

@@ -33,8 +33,8 @@ qx.Class.define("osparc.data.model.File", {
       projectId: fileData.projectId || null,
       createdAt: new Date(fileData.createdAt),
       modifiedAt: new Date(fileData.modifiedAt),
-      size: fileData.size,
-      path: fileData.path || null,
+      size: fileData.size || null,
+      path: fileData.path,
       isDirectory: fileData.isDirectory || false,
     });
   },
@@ -49,7 +49,7 @@ qx.Class.define("osparc.data.model.File", {
 
     projectId: {
       check: "String",
-      nullable: null,
+      nullable: true,
       init: null,
       event: "changeProjectId"
     },
@@ -77,7 +77,7 @@ qx.Class.define("osparc.data.model.File", {
 
     path: {
       check: "String",
-      nullable: true,
+      nullable: false,
       init: null,
       event: "changePath"
     },