StudyDataManager

Author: odeimaiz

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

@@ -54,8 +54,8 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       });
     },
 
-    openStudyDataManager: function(node) {
-      const win = osparc.widget.StudyDataManager.popUpInWindow(null, node.getNodeId(), node.getLabel());
+    openNodeDataManager: function(node) {
+      const win = osparc.widget.StudyDataManager.popUpInWindow(node.getStudy().getUuid(), node.getNodeId(), node.getLabel());
       const closeBtn = win.getChildControl("close-button");
       osparc.utils.Utils.setIdToWidget(closeBtn, "nodeDataManagerCloseBtn");
     }
@@ -1046,7 +1046,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
         allowGrowY: false
       });
       osparc.utils.Utils.setIdToWidget(nodeFilesBtn, "nodeFilesBtn");
-      nodeFilesBtn.addListener("execute", () => this.self().openStudyDataManager(node));
+      nodeFilesBtn.addListener("execute", () => this.self().openNodeDataManager(node));
       outputsBox.add(nodeFilesBtn);
 
       const outputs = new osparc.desktop.PanelView(this.tr("Outputs"), outputsBox);

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

@@ -186,41 +186,26 @@ qx.Class.define("osparc.file.FilesTree", {
           }
           this.__itemsToTree(locationId, path, items, studyModel);
 
-          // select study item
           this.setSelection(new qx.data.Array([studyModel]));
           this.__selectionChanged();
         });
     },
 
-    populateNodeTree(nodeId) {
+    populateNodeTree(studyId, nodeId) {
       const treeName = "Node Files";
       this.__resetTree(treeName);
-      const rootModel = this.getModel();
-      this.self().addLoadingChild(rootModel);
+      const nodeModel = this.getModel();
+      this.self().addLoadingChild(nodeModel);
 
       const dataStore = osparc.store.Data.getInstance();
-      return dataStore.getNodeFiles(nodeId)
-        .then(files => {
-          const newChildren = osparc.data.Converters.fromDSMToVirtualTreeModel(0, null, files);
-          if (newChildren.length && // location
-            newChildren[0].children.length && // study
-            newChildren[0].children[0].children.length) { // node
-            const nodeData = newChildren[0].children[0].children[0];
-            const nodeTreeName = nodeData.label;
-            this.__resetTree(nodeTreeName, nodeId);
-            const rootNodeModel = this.getModel();
-            if (nodeData.children.length) {
-              const nodeItemsOnly = nodeData.children;
-              this.__itemsToNode(nodeItemsOnly);
-            }
-            this.openNode(rootNodeModel);
+      const locationId = 0;
+      const path = encodeURIComponent(studyId) + "/" + encodeURIComponent(nodeId);
+      return dataStore.getItemsByLocationAndPath(locationId, path)
+        .then(items => {
+          this.__itemsToTree(0, path, items, nodeModel);
 
-            // select node item
-            this.setSelection(new qx.data.Array([rootNodeModel]));
-            this.__selectionChanged();
-          } else {
-            rootModel.getChildren().removeAll();
-          }
+          this.setSelection(new qx.data.Array([nodeModel]));
+          this.__selectionChanged();
         });
     },
 

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

@@ -148,31 +148,6 @@ qx.Class.define("osparc.store.Data", {
       });
     },
 
-    getNodeFiles: function(nodeId) {
-      return new Promise((resolve, reject) => {
-        const nodePath = encodeURIComponent(nodeId);
-        const params = {
-          url: {
-            locationId: 0,
-            path: nodePath,
-          }
-        };
-        osparc.data.Resources.fetch("storagePaths", "getPaths", params)
-          .then(files => {
-            console.log("Node Files", files);
-            if (files && files.length>0) {
-              resolve(files);
-            } else {
-              resolve([]);
-            }
-          })
-          .catch(err => {
-            console.error(err);
-            reject([]);
-          });
-      });
-    },
-
     getPresignedLink: function(download = true, locationId, fileUuid, fileSize) {
       return new Promise((resolve, reject) => {
         if (download && !osparc.data.Permissions.getInstance().canDo("study.node.data.pull", true)) {

services/static-webserver/client/source/class/osparc/widget/StudyDataManager.js

@@ -42,16 +42,10 @@ qx.Class.define("osparc.widget.StudyDataManager", {
 
     this._setLayout(new qx.ui.layout.VBox(10));
 
-    if (studyId) {
-      this.set({
-        studyId
-      });
-    }
+    this.setStudyId(studyId);
 
     if (nodeId) {
-      this.set({
-        nodeId
-      });
+      this.setNodeId(nodeId);
     }
 
     this.__buildLayout();
@@ -113,11 +107,10 @@ qx.Class.define("osparc.widget.StudyDataManager", {
 
       const foldersTree = treeFolderView.getChildControl("folder-tree");
       foldersTree.resetCache();
-      if (this.getStudyId()) {
-        foldersTree.populateStudyTree(this.getStudyId());
-      }
       if (this.getNodeId()) {
-        foldersTree.populateNodeTree(this.getNodeId());
+        foldersTree.populateNodeTree(this.getStudyId(), this.getNodeId());
+      } else if (this.getStudyId()) {
+        foldersTree.populateStudyTree(this.getStudyId());
       }
 
       const folderViewer = treeFolderView.getChildControl("folder-viewer");
@@ -144,13 +137,12 @@ qx.Class.define("osparc.widget.StudyDataManager", {
         treeFolderView.openPath(path);
       };
 
-      if (this.getStudyId()) {
-        foldersTree.populateStudyTree(this.getStudyId())
+      if (this.getNodeId()) {
+        foldersTree.populateNodeTree(this.getStudyId(), this.getNodeId())
           .then(() => openSameFolder())
           .catch(err => console.error(err));
-      }
-      if (this.getNodeId()) {
-        foldersTree.populateNodeTree(this.getNodeId())
+      } else if (this.getStudyId()) {
+        foldersTree.populateStudyTree(this.getStudyId())
           .then(() => openSameFolder())
           .catch(err => console.error(err));
       }