cleanup

Author: odeimaiz

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

@@ -1190,10 +1190,6 @@ qx.Class.define("osparc.data.Resources", {
           copy: {
             method: "PUT",
             url: statics.API + "/storage/locations/{toLoc}/files/{fileName}?extra_location={fromLoc}&extra_source={fileUuid}"
-          },
-          delete: {
-            method: "DELETE",
-            url: statics.API + "/storage/locations/{locationId}/files/{fileUuid}"
           }
         }
       },

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

@@ -208,27 +208,10 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
     },
 
     __doDeleteSelected: function(toBeDeleted) {
-      let request = null;
       if (toBeDeleted.length === 0) {
         osparc.FlashMessenger.logAs(this.tr("Nothing to delete"), "ERROR");
         return;
-      } else if (toBeDeleted.length === 1) {
-        const selection = toBeDeleted[0];
-        if (selection) {
-          if (osparc.file.FilesTree.isFile(selection)) {
-            request = this.__deleteItem(selection.getFileId(), selection.getLocation());
-          } else {
-            request = this.__deleteItem(selection.getPath(), selection.getLocation());
-          }
-          request
-            .then(datas => {
-              if (datas.length) {
-                this.fireDataEvent("fileDeleted", datas[0]);
-                osparc.FlashMessenger.logAs(this.tr("Items successfully deleted"), "INFO");
-              }
-            });
-        }
-      } else if (toBeDeleted.length > 1) {
+      } else if (toBeDeleted.length > 0) {
         const paths = toBeDeleted.map(item => item.getPath());
         const dataStore = osparc.store.Data.getInstance();
         const fetchPromise = dataStore.deleteFiles(paths);
@@ -243,14 +226,5 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
           .catch(err => osparc.FlashMessenger.logError(err, this.tr("Unsuccessful files deletion")));
       }
     },
-
-    __deleteItem: function(itemId, locationId) {
-      if (locationId !== 0 && locationId !== "0") {
-        osparc.FlashMessenger.logAs(this.tr("Externally managed items cannot be deleted"));
-        return null;
-      }
-      const dataStore = osparc.store.Data.getInstance();
-      return dataStore.deleteFile(locationId, itemId);
-    },
   }
 });

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

@@ -179,6 +179,14 @@ qx.Class.define("osparc.file.FolderViewer", {
 
     __applyFolder: function() {
       this.getChildControl("selected-file-layout").resetSelection();
-    }
+    },
+
+    resetSelection: function() {
+      const folderContent = this.getChildControl("folder-content");
+      folderContent.resetSelection();
+
+      const selectedFileLayout = this.getChildControl("selected-file-layout");
+      selectedFileLayout.resetSelection();
+    },
   }
 });

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

@@ -137,9 +137,17 @@ qx.Class.define("osparc.file.TreeFolderView", {
     },
 
     pathsDeleted: function(paths) {
-      console.log("pathsDeleted", paths);
-      const folderContent = this.getChildControl("folder-viewer").getChildControl("folder-content");
-      folderContent.resetSelection();
+      this.getChildControl("folder-viewer").resetSelection();
+
+      const folderTree = this.getChildControl("folder-tree");
+      const selectedFolder = folderTree.getSelectedItem();
+      const children = selectedFolder.getChildren();
+      paths.forEach(path => {
+        const found = children.toArray().find(child => child.getPath() === path);
+        if (found) {
+          children.remove(found);
+        }
+      });
     },
 
     openPath: async function(pathParts) {

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

@@ -234,31 +234,6 @@ qx.Class.define("osparc.store.Data", {
       return true;
     },
 
-    // if folder path is provided as fileUuid, it can also be deleted
-    deleteFile: function(locationId, fileUuid) {
-      if (!osparc.data.Permissions.getInstance().canDo("study.node.data.delete", true)) {
-        return null;
-      }
-
-      // Deletes File
-      const params = {
-        url: {
-          locationId,
-          fileUuid: encodeURIComponent(fileUuid)
-        }
-      };
-      return osparc.data.Resources.fetch("storageFiles", "delete", params)
-        .then(files => {
-          const data = {
-            data: files,
-            locationId: locationId,
-            fileUuid: fileUuid
-          };
-          return data;
-        })
-        .catch(err => osparc.FlashMessenger.logError(err, this.tr("Unsuccessful file deletion")));
-    },
-
     deleteFiles: function(paths) {
       if (!osparc.data.Permissions.getInstance().canDo("study.node.data.delete", true)) {
         return null;