FE: Fix file path converter (#124)

* eslint

* support nested folders

* refactoring

* cleanup

Author: odeimaiz

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

@@ -48,74 +48,43 @@ qx.Class.define("osparc.data.Converters", {
           file["location_id"],
           ""
         );
-        if (file["location_id"] === 0 || file["location_id"] === "0") {
-          // simcore files
-          let parent = fileInTree;
-          const splitted = file["file_uuid"].split("/");
-          if (splitted.length < 3) {
-            continue;
-          }
+        const isSimcore = file["location_id"] === 0 || file["location_id"] === "0";
 
-          const prjId = splitted[0];
-          const nodeId = splitted[1];
-          const prjLabel = file["project_name"];
-          const nodeLabel = file["node_name"];
-          const prjItem = this.createDirEntry(
-            prjLabel,
-            file["location_id"],
-            prjId
-          );
-          parent.children.push(prjItem);
-          parent = prjItem
-          const nodeItem = this.createDirEntry(
-            nodeLabel,
-            file["location_id"],
-            nodeId
-          );
-          parent.children.push(nodeItem);
-          parent = nodeItem
+        const splitted = file["file_uuid"].split("/");
+        if (isSimcore && splitted.length < 3) {
+          continue;
+        }
 
-          for (let j=2; j<splitted.length-1; j++) {
-            const newItem = this.createDirEntry(
-              splitted[j],
-              file["location_id"],
-              parent.path === "" ? splitted[j] : parent.path +"/"+ splitted[j]
-            );
-            parent.children.push(newItem);
-            parent = newItem;
+        // create directories
+        let parent = fileInTree;
+        for (let j=0; j<splitted.length-1; j++) {
+          let label = "Unknown";
+          if (isSimcore && j===0) {
+            label = file["project_name"];
+          } else if (isSimcore && j===1) {
+            label = file["node_name"];
+          } else {
+            label = splitted[j];
           }
-          let fileInfo = this.createFileEntry(
-            splitted[splitted.length-1],
+          const newItem = this.createDirEntry(
+            label,
             file["location_id"],
-            splitted[splitted.length-1],
-            file["file_id"],
-            file["last_modified"],
-            file["file_size"]);
-          parent.children.push(fileInfo);
-          this.__mergeFileTreeChildren(children, fileInTree);
-        } else if (file["location_id"] === 1 || file["location_id"] === "1") {
-          // datcore files
-          let parent = fileInTree;
-          let splitted = file["file_uuid"].split("/");
-          for (let j=0; j<splitted.length-1; j++) {
-            const newItem = this.createDirEntry(
-              splitted[j],
-              file["location_id"],
-              parent.path === "" ? splitted[j] : parent.path +"/"+ splitted[j]
-            );
-            parent.children.push(newItem);
-            parent = newItem;
-          }
-          let fileInfo = this.createFileEntry(
-            splitted[splitted.length-1],
-            file["location_id"],
-            datasetId,
-            file["file_id"],
-            file["last_modified"],
-            file["file_size"]);
-          parent.children.push(fileInfo);
-          this.__mergeFileTreeChildren(children, fileInTree);
+            parent.path === "" ? splitted[j] : parent.path +"/"+ splitted[j]
+          );
+          parent.children.push(newItem);
+          parent = newItem;
         }
+
+        // create file
+        const fileInfo = this.createFileEntry(
+          splitted[splitted.length-1],
+          file["location_id"],
+          datasetId,
+          file["file_id"],
+          file["last_modified"],
+          file["file_size"]);
+        parent.children.push(fileInfo);
+        this.__mergeFileTreeChildren(children, fileInTree);
       }
 
       return children;

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

@@ -118,6 +118,13 @@ qx.Class.define("osparc.file.FilesTree", {
             .splice(i, 1);
         }
       }
+    },
+
+    attachPathLabel: function(srcPathLabel, data) {
+      data["pathLabel"] = srcPathLabel.concat(data["label"]);
+      if ("children" in data) {
+        data.children.forEach(child => this.self().attachPathLabel(data["pathLabel"], child));
+      }
     }
   },
 
@@ -464,7 +471,7 @@ qx.Class.define("osparc.file.FilesTree", {
           const locationData = osparc.data.Converters.fromDSMToVirtualTreeModel(datasetId, files);
           const datasetData = locationData[0].children;
           datasetData[0].children.forEach(data => {
-            data["pathLabel"] = datasetModel.getPathLabel().concat(data["label"]);
+            this.self().attachPathLabel(datasetModel.getPathLabel(), data);
             const filesModel = qx.data.marshal.Json.createModel(data, true);
             datasetModel.getChildren().append(filesModel);
           });