Merge branch 'filebrowser:master' into feature/upload-progress-indica…

…tors-take-two
filebrowser · Apr 25, 2024 · 9102678 · 9102678
2 parents 65f996d + 434e49b
commit 9102678
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/frontend/src/components/prompts/UploadFiles.vue b/frontend/src/components/prompts/UploadFiles.vue
@@ -80,7 +80,6 @@ export default {
       "getTotalSize"
     ]),
     ...mapWritableState(useFileStore, ["reload"]),
-    ...mapActions(useUploadStore, ["reset"]),
     formattedETA() {
       if (!this.getETA || this.getETA === Infinity) {
         return "--:--:--";
@@ -98,6 +97,7 @@ export default {
     },
   },
   methods: {
+    ...mapActions(useUploadStore, ["reset"]),  // Mapping reset action from upload store
     toggle: function () {
       this.open = !this.open;
     },
@@ -106,8 +106,8 @@ export default {
         abortAllUploads();
         buttons.done("upload");
         this.open = false;
-        this.reset();
-        this.reload = true;
+        this.reset();  // Resetting the upload store state
+        this.reload = true;  // Trigger reload in the file store
       }
     },
   },

diff --git a/http/http.go b/http/http.go
@@ -69,6 +69,7 @@ func NewHandler(
 	api.PathPrefix("/tus").Handler(monkey(tusPostHandler(), "/api/tus")).Methods("POST")
 	api.PathPrefix("/tus").Handler(monkey(tusHeadHandler(), "/api/tus")).Methods("HEAD", "GET")
 	api.PathPrefix("/tus").Handler(monkey(tusPatchHandler(), "/api/tus")).Methods("PATCH")
+	api.PathPrefix("/tus").Handler(monkey(resourceDeleteHandler(fileCache), "/api/tus")).Methods("DELETE")
 
 	api.PathPrefix("/usage").Handler(monkey(diskUsage, "/api/usage")).Methods("GET")
 

diff --git a/http/resource.go b/http/resource.go
@@ -87,7 +87,7 @@ func resourceDeleteHandler(fileCache FileCache) handleFunc {
 			return errToStatus(err), err
 		}
 
-		return http.StatusOK, nil
+		return http.StatusNoContent, nil
 	})
 }