nextcloud
/
bookmarks
mirror of https://github.com/nextcloud/bookmarks
0
0
Fork 0
Code Issues Releases Wiki Activity

UI: Rollback moving folders after failure 

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
Marcel Klehr 2023-07-30 13:24:22 +02:00
parent 154cd3ce04
commit 666189a970
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Folder.vue
View File

@ -130,7 +130,7 @@ export default {
return this.$store.state.sharedFoldersById[this.folder.id] !== undefined
},
isEditable() {
return this.isOwner || (!this.isOwner && (this.isDirectShare || this.permissions.canWrite))
return this.isOwner || this.isDirectShare || this.permissions.canWrite
},
shares() {
return this.$store.getters.getSharesOfFolder(this.folder.id)
@ -210,8 +210,11 @@ export default {
},
async onDrop(e) {
e.preventDefault()
await this.$store.dispatch(actions.MOVE_SELECTION, this.folder.id)
this.$store.commit(mutations.RESET_SELECTION)
try {
await this.$store.dispatch(actions.MOVE_SELECTION, this.folder.id)
} finally {
this.$store.commit(mutations.RESET_SELECTION)
}
},
},
}

7
src/components/MoveDialog.vue
View File

@ -56,8 +56,11 @@ export default {
methods: {
async onSubmit(folderId) {
this.$store.commit(mutations.DISPLAY_MOVE_DIALOG, false)
await this.$store.dispatch(actions.MOVE_SELECTION, folderId)
this.$store.commit(mutations.RESET_SELECTION)
try {
await this.$store.dispatch(actions.MOVE_SELECTION, folderId)
} finally {
this.$store.commit(mutations.RESET_SELECTION)
}
},
onClose() {
this.$store.commit(mutations.DISPLAY_MOVE_DIALOG, false)

8
src/store/actions.js
View File

@ -785,7 +785,13 @@ export default {
commit(mutations.MOVE_FOLDER, { folder: folder.id, target: folderId })
const oldParent = folder.parent_folder
folder.parent_folder = folderId
await dispatch(actions.SAVE_FOLDER, folder.id) // reloads children order for new parent
try {
await dispatch(actions.SAVE_FOLDER, folder.id) // reloads children order for new parent
} catch (err) {
commit(mutations.MOVE_FOLDER, { folder: folder.id, target: oldParent })
folder.parent_folder = oldParent
throw err
}
dispatch(
actions.LOAD_FOLDER_CHILDREN_ORDER,
oldParent