renaming

Author: odeimaiz

services/static-webserver/client/source/class/osparc/file/FilesTree.js

@@ -152,17 +152,13 @@ qx.Class.define("osparc.file.FilesTree", {
       this.self().addLoadingChild(studyModel);
 
       const dataStore = osparc.store.Data.getInstance();
-      return dataStore.getPathByLocationAndDataset("0", studyId)
-        .then(data => {
-          const {
-            items
-          } = data;
-
+      return dataStore.getItemsByLocationAndDataset("0", studyId)
+        .then(items => {
           if (items.length && "project_name" in items[0]) {
             this.__resetTree(items[0]["project_name"]);
           }
           studyModel = this.getModel();
-          this.__filesToDataset("0", studyId, items, studyModel);
+          this.__itemsToDataset("0", studyId, items, studyModel);
 
           // select study item
           this.setSelection(new qx.data.Array([studyModel]));
@@ -382,12 +378,12 @@ qx.Class.define("osparc.file.FilesTree", {
       }
 
       const dataStore = osparc.store.Data.getInstance();
-      return dataStore.getPathByLocationAndDataset(locationId, datasetId)
-        .then(data => {
-          const {
-            items
-          } = data;
-          this.__filesToDataset(locationId, datasetId, items);
+      return dataStore.getItemsByLocationAndDataset(locationId, datasetId)
+        .then(items => {
+          const parentModel = this.__getDatasetModel(locationId, datasetId);
+          if (parentModel) {
+            this.__itemsToParentModel(locationId, datasetId, items);
+          }
         });
     },
 
@@ -415,6 +411,39 @@ qx.Class.define("osparc.file.FilesTree", {
       return null;
     },
 
+    __itemsToParentModel(locationId, datasetId, items, model) {
+      if (this.__datasets.has(datasetId)) {
+        return;
+      }
+
+      const datasetModel = model ? model : this.__getDatasetModel(locationId, datasetId);
+      if (datasetModel) {
+        datasetModel.getChildren().removeAll();
+        if (items.length) {
+          const locationData = osparc.data.Converters.fromDSMToVirtualTreeModel(locationId, datasetId, items);
+          const datasetData = locationData[0].children;
+          datasetData[0].children.forEach(data => {
+            this.self().attachPathLabel(datasetModel.getPathLabel(), data);
+            const filesModel = qx.data.marshal.Json.createModel(data, true);
+            datasetModel.getChildren().append(filesModel);
+          });
+        }
+        // sort files
+        osparc.data.Converters.sortModelByLabel(datasetModel);
+
+        this.__rerender(datasetModel);
+
+        this.__datasets.add(datasetId);
+        this.fireEvent("filesAddedToTree");
+      }
+
+      this.__filesReceived(locationId, datasetId, items);
+    },
+
+    __getPathModel: function(locationId, path) {
+
+    },
+
     __itemsToNode: function(files) {
       const currentModel = this.getModel();
       this.self().removeLoadingChild(currentModel);
@@ -467,7 +496,7 @@ qx.Class.define("osparc.file.FilesTree", {
       }
     },
 
-    __filesToDataset: function(locationId, datasetId, files, model) {
+    __itemsToDataset: function(locationId, datasetId, files, model) {
       if (this.__datasets.has(datasetId)) {
         return;
       }

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

@@ -120,16 +120,11 @@ qx.Class.define("osparc.store.Data", {
       });
     },
 
-    getPathByLocationAndDataset: function(locationId, datasetId) {
-      const data = {
-        locationId,
-        datasetId,
-        items: []
-      };
+    getItemsByLocationAndDataset: function(locationId, datasetId) {
       return new Promise((resolve, reject) => {
         // Get list of file meta data
         if (locationId === 1 && !osparc.data.Permissions.getInstance().canDo("storage.datcore.read")) {
-          reject(data);
+          reject([]);
         }
 
         const params = {
@@ -141,13 +136,14 @@ qx.Class.define("osparc.store.Data", {
         osparc.data.Resources.fetch("storagePaths", "getPaths", params)
           .then(pagResp => {
             if (pagResp["items"] && pagResp["items"].length>0) {
-              data.items = pagResp["items"];
+              resolve(pagResp["items"]);
+            } else {
+              resolve([]);
             }
-            resolve(data);
           })
           .catch(err => {
             console.error(err);
-            reject(data);
+            reject([]);
           });
       });
     },