more cleanup

Author: odeimaiz

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

@@ -76,7 +76,7 @@ qx.Class.define("osparc.dashboard.DataBrowser", {
       reloadButton.addListener("execute", () => this.__reloadTree(), this);
 
       const selectedFileLayout = treeFolderView.getChildControl("folder-viewer").getChildControl("selected-file-layout");
-      selectedFileLayout.addListener("fileDeleted", e => this.__fileDeleted(e.getData()), this);
+      selectedFileLayout.addListener("pathsDeleted", e => treeFolderView.pathsDeleted(e.getData()), this);
     },
 
     __reloadTree: function() {
@@ -89,34 +89,5 @@ qx.Class.define("osparc.dashboard.DataBrowser", {
       const folderViewer = treeFolderView.getChildControl("folder-viewer");
       folderViewer.resetFolder();
     },
-
-    __fileDeleted: function(fileMetadata) {
-      // After deleting a file, try to keep the user in the same folder.
-      // If the folder doesn't longer exist, open the closest available parent
-
-      const pathParts = ("getPath" in fileMetadata ? fileMetadata.getPath() : fileMetadata["fileUuid"]).split("/");
-
-      const treeFolderView = this.getChildControl("tree-folder-view");
-      const foldersTree = treeFolderView.getChildControl("folder-tree");
-      const folderViewer = treeFolderView.getChildControl("folder-viewer");
-
-      const openSameFolder = () => {
-        // drop last, which is the file
-        pathParts.pop();
-        treeFolderView.openPath(pathParts);
-      };
-
-      folderViewer.resetFolder();
-      const locationId = fileMetadata["locationId"];
-      const path = pathParts[0];
-      foldersTree.resetCache();
-      foldersTree.populateLocations()
-        .then(datasetPromises => {
-          Promise.all(datasetPromises)
-            .then(() => foldersTree.requestPathItems(locationId, path))
-            .then(() => openSameFolder());
-        })
-        .catch(err => console.error(err));
-    }
   }
 });

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

@@ -21,7 +21,7 @@
  *   It is used together with a virtual tree of files where the selection is displayed
  * in the text field and the download and delete are related to that selection.
  * Download and deleted methods are also provided.
- * If a file is deleted it fires "fileDeleted" data event
+ * If a file is deleted it fires "pathsDeleted" data event
  *
  * *Example*
  *
@@ -54,7 +54,6 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
   },
 
   events: {
-    "fileDeleted": "qx.event.type.Data",
     "pathsDeleted": "qx.event.type.Data",
   },
 

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

@@ -150,31 +150,6 @@ qx.Class.define("osparc.file.TreeFolderView", {
       });
     },
 
-    openPath: async function(pathParts) {
-      console.log("openPath", pathParts);
-      const foldersTree = this.getChildControl("folder-tree");
-      const folderViewer = this.getChildControl("folder-viewer");
-
-      const locationId = 0;
-      let found = false;
-      for (let i=1; i<=pathParts.length; i++) {
-        try {
-          let path = pathParts.slice(0, i);
-          path = path.join("/");
-          found = await foldersTree.requestPathItems(locationId, path);
-        } catch (err) {
-          console.error(err);
-        }
-      }
-      if (found) {
-        foldersTree.openNodeAndParents(found);
-        foldersTree.setSelection(new qx.data.Array([found]));
-        foldersTree.fireEvent("selectionChanged");
-      } else {
-        folderViewer.resetFolder();
-      }
-    },
-
     requestSize: function(pathId) {
       const totalSize = this.getChildControl("total-size-label");
       totalSize.getChildControl("icon").getContentElement().addClass("rotate");

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

@@ -96,7 +96,6 @@ qx.Class.define("osparc.widget.StudyDataManager", {
       treeFolderView.getChildControl("folder-tree").setBackgroundColor("window-popup-background");
 
       const selectedFileLayout = treeFolderView.getChildControl("folder-viewer").getChildControl("selected-file-layout");
-      selectedFileLayout.addListener("fileDeleted", e => this.__fileDeleted(e.getData()), this);
       selectedFileLayout.addListener("pathsDeleted", e => treeFolderView.pathsDeleted(e.getData()), this);
     },
 
@@ -116,36 +115,5 @@ qx.Class.define("osparc.widget.StudyDataManager", {
       const folderViewer = treeFolderView.getChildControl("folder-viewer");
       folderViewer.resetFolder();
     },
-
-    __fileDeleted: function(fileMetadata) {
-      // After deleting a file, try to keep the user in the same folder.
-      // If the folder doesn't longer exist, open the closest available parent
-
-      const pathParts = ("getPath" in fileMetadata ? fileMetadata.getPath() : fileMetadata["fileUuid"]).split("/");
-
-      const treeFolderView = this.getChildControl("tree-folder-view");
-      const foldersTree = treeFolderView.getChildControl("folder-tree");
-      foldersTree.resetCache();
-
-      const openSameFolder = () => {
-        if (!this.getStudyId()) {
-          // drop first, which is the study id
-          pathParts.shift();
-        }
-        // drop last, which is the file
-        pathParts.pop();
-        treeFolderView.openPath(pathParts);
-      };
-
-      if (this.getNodeId()) {
-        foldersTree.populateNodeTree(this.getStudyId(), this.getNodeId())
-          .then(() => openSameFolder())
-          .catch(err => console.error(err));
-      } else if (this.getStudyId()) {
-        foldersTree.populateStudyTree(this.getStudyId())
-          .then(() => openSameFolder())
-          .catch(err => console.error(err));
-      }
-    }
   }
 });