debug: pipeline

owncloud · Mar 15, 2023 · b61393f · b61393f
1 parent fcffbe7
commit b61393f
Showing 1 changed file with 27 additions and 28 deletions.
diff --git a/packages/web-app-files/src/mixins/deleteResources.ts b/packages/web-app-files/src/mixins/deleteResources.ts
@@ -131,36 +131,35 @@ export default {
     },
 
     $_deleteResources_trashbin_delete() {
-      return loadingService.addTask(
-        ({ setProgress }) => {
-          // TODO: use clear all if all files are selected
-          this.toggleModalConfirmButton()
+      // TODO: use clear all if all files are selected
+      this.toggleModalConfirmButton()
 
-          for (const [i, file] of this.$_deleteResources_resources.entries()) {
-            const p = this.deleteResources_queue.add(() => {
-              setProgress({ total: this.$_deleteResources_resources.length, current: i + 1 })
-              return this.$_deleteResources_trashbin_deleteOp(file)
-            })
-            this.deleteResources_deleteOps.push(p)
-          }
+      for (const [i, file] of this.$_deleteResources_resources.entries()) {
+        const p = this.deleteResources_queue.add(() => {
+          return this.$_deleteResources_trashbin_deleteOp(file)
+        })
+        this.deleteResources_deleteOps.push(p)
+      }
 
-          return Promise.all(this.deleteResources_deleteOps).then((resources) => {
-            this.removeFilesFromTrashbin(resources)
-            const title =
-              resources.length > 1
-                ? this.$gettext('%{count} files were deleted successfully', {
-                    count: resources.length
-                  })
-                : this.$gettext('"%{file}" was deleted successfully', {
-                    file: resources[0].name
-                  })
-            this.showMessage({ title })
-            this.hideModal()
-            this.toggleModalConfirmButton()
-          })
-        },
-        { indeterminate: false }
-      )
+      return Promise.allSettled(this.deleteResources_deleteOps)
+        .then((result) => {
+          const resources = result.filter((r) => r.status === 'fulfilled').map((r: any) => r.value)
+
+          this.removeFilesFromTrashbin(resources)
+          const title =
+            resources.length > 1
+              ? this.$gettext('%{count} files were deleted successfully', {
+                  count: resources.length
+                })
+              : this.$gettext('"%{file}" was deleted successfully', {
+                  file: resources[0].name
+                })
+          this.showMessage({ title })
+        })
+        .finally(() => {
+          this.hideModal()
+          this.toggleModalConfirmButton()
+        })
     },
 
     $_deleteResources_filesList_delete() {