nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'filebrowser:master' into feature/upload-progress-indicators-take-two

Browse Source
This commit is contained in:
Alex Yong 2024-04-25 10:28:07 -04:00 committed by GitHub
commit 9102678f69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/prompts/UploadFiles.vue
View File

@ -80,7 +80,6 @@ export default {
"getTotalSize" "getTotalSize"
]), ]),
...mapWritableState(useFileStore, ["reload"]), ...mapWritableState(useFileStore, ["reload"]),
...mapActions(useUploadStore, ["reset"]),
formattedETA() { formattedETA() {
if (!this.getETA || this.getETA === Infinity) { if (!this.getETA || this.getETA === Infinity) {
return "--:--:--"; return "--:--:--";
@ -98,6 +97,7 @@ export default {
}, },
}, },
methods: { methods: {
...mapActions(useUploadStore, ["reset"]), // Mapping reset action from upload store
toggle: function () { toggle: function () {
this.open = !this.open; this.open = !this.open;
}, },
@ -106,8 +106,8 @@ export default {
abortAllUploads(); abortAllUploads();
buttons.done("upload"); buttons.done("upload");
this.open = false; this.open = false;
this.reset(); this.reset(); // Resetting the upload store state
this.reload = true; this.reload = true; // Trigger reload in the file store
} }
}, },
}, },

1
http/http.go
View File

@ -69,6 +69,7 @@ func NewHandler(
api.PathPrefix("/tus").Handler(monkey(tusPostHandler(), "/api/tus")).Methods("POST") 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(tusHeadHandler(), "/api/tus")).Methods("HEAD", "GET")
api.PathPrefix("/tus").Handler(monkey(tusPatchHandler(), "/api/tus")).Methods("PATCH") 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") api.PathPrefix("/usage").Handler(monkey(diskUsage, "/api/usage")).Methods("GET")

2
http/resource.go
View File

@ -87,7 +87,7 @@ func resourceDeleteHandler(fileCache FileCache) handleFunc {
return errToStatus(err), err return errToStatus(err), err
} }
return http.StatusOK, nil return http.StatusNoContent, nil
}) })
} }