Promise all

Author: odeimaiz

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

@@ -175,13 +175,32 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
 
     __deleteSelected: function() {
       if (this.isMultiSelect()) {
+        const requests = [];
         this.__multiSelection.forEach(selection => {
-          this.__deleteFile(selection);
+          const request = this.__deleteFile(selection);
+          if (request) {
+            requests.push(request);
+          }
         });
+        Promise.all(requests)
+          .then(datas => {
+            if (datas.length) {
+              this.fireDataEvent("fileDeleted", datas[0]);
+              osparc.FlashMessenger.getInstance().logAs(this.tr("Files successfully deleted"), "ERROR");
+            }
+          });
+        requests
       } else {
         const selection = this.getItemSelected();
         if (selection) {
-          this.__deleteFile(selection);
+          const request = this.__deleteFile(selection);
+          if (request) {
+            request
+              .then(data => {
+                this.fireDataEvent("fileDeleted", data);
+                osparc.FlashMessenger.getInstance().logAs(this.tr("File successfully deleted"), "ERROR");
+              });
+          }
         }
       }
     },
@@ -198,19 +217,12 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
     },
 
     __deleteFile: function(file) {
-      console.log("Delete ", file);
       const fileId = file.getFileId();
       const locationId = file.getLocation();
       if (locationId !== 0 && locationId !== "0") {
         osparc.FlashMessenger.getInstance().logAs(this.tr("Only files in simcore.s3 can be deleted"));
-        return false;
       }
       const dataStore = osparc.store.Data.getInstance();
-      dataStore.addListenerOnce("deleteFile", e => {
-        if (e) {
-          this.fireDataEvent("fileDeleted", e.getData());
-        }
-      }, this);
       return dataStore.deleteFile(locationId, fileId);
     },
   }

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

@@ -33,7 +33,6 @@ qx.Class.define("osparc.store.Data", {
 
   events: {
     "fileCopied": "qx.event.type.Data",
-    "deleteFile": "qx.event.type.Data"
   },
 
   members: {
@@ -286,7 +285,7 @@ qx.Class.define("osparc.store.Data", {
 
     deleteFile: function(locationId, fileUuid) {
       if (!osparc.data.Permissions.getInstance().canDo("study.node.data.delete", true)) {
-        return false;
+        return null;
       }
 
       // Deletes File
@@ -296,22 +295,19 @@ qx.Class.define("osparc.store.Data", {
           fileUuid: encodeURIComponent(fileUuid)
         }
       };
-      osparc.data.Resources.fetch("storageFiles", "delete", params)
+      return osparc.data.Resources.fetch("storageFiles", "delete", params)
         .then(files => {
           const data = {
             data: files,
             locationId: locationId,
             fileUuid: fileUuid
           };
-          this.fireDataEvent("deleteFile", data);
+          return data;
         })
         .catch(err => {
           console.error(err);
           osparc.FlashMessenger.getInstance().logAs(this.tr("Failed deleting file"), "ERROR");
-          this.fireDataEvent("deleteFile", null);
         });
-
-      return true;
     }
   }
 });