Skip to content

[stable28] fix(files): Close sidebar and update fileid when current node is deleted #45658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 4 commits into from
Jun 10, 2024
Merged

[stable28] fix(files): Close sidebar and update fileid when current node is deleted #45658

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c74559
fix(files): Close sidebar if shown node is deleted
susnux Apr 17, 2024
3808a5b
fix(files): Update current fileid in route if that node was deleted
susnux Apr 17, 2024
892f17a
feat(cypress): Add tests for files sidebar
susnux Apr 17, 2024
83877b3
chore: Compile assets
susnux Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(files): Close sidebar if shown node is deleted 
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux
susnux committed Jun 10, 2024
commit 3c74559e4ce81ba5b0427125c67c5d31c33c0376
15 changes: 14 additions & 1 deletion apps/files/src/views/Sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
import { getCurrentUser } from '@nextcloud/auth'
import { getCapabilities } from '@nextcloud/capabilities'
import { showError } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
import { File, Folder, formatFileSize } from '@nextcloud/files'
import { encodePath } from '@nextcloud/paths'
import { generateRemoteUrl, generateUrl } from '@nextcloud/router'
Expand Down Expand Up @@ -304,10 +304,13 @@ export default {
},
},
created() {
subscribe('files:node:deleted', this.onNodeDeleted)

window.addEventListener('resize', this.handleWindowResize)
this.handleWindowResize()
},
beforeDestroy() {
unsubscribe('file:node:deleted', this.onNodeDeleted)
window.removeEventListener('resize', this.handleWindowResize)
},

Expand Down Expand Up @@ -507,6 +510,16 @@ export default {
this.resetData()
},

/**
* Handle if the current node was deleted
* @param {import('@nextcloud/files').Node} node The deleted node
*/
onNodeDeleted(node) {
if (this.fileInfo && node && this.fileInfo.id === node.fileid) {
this.close()
}
},

/**
* Allow to set the Sidebar as fullscreen from OCA.Files.Sidebar
*
Expand Down