Skip to content

Commit

Permalink
feat: Reset route if neither the Viewer of the Sidebar is open
Browse files Browse the repository at this point in the history
When the viewer or the sidebar is opened, we add the fileid to the route.
When both of them are closed, we do not remove the fileid from the route.
This means that, upon reload, the sidebar will be opened even though it was closed previously.

This PR ensure that the fileid is removed from the route when both the Sidebar and the Viewer are closed.

Signed-off-by: Louis Chemineau <louis@chmn.me>
  • Loading branch information
artonge committed Sep 13, 2024
1 parent 2480567 commit 11ff3d0
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
26 changes: 25 additions & 1 deletion apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import type { UserConfig } from '../types'
import { getFileListHeaders, Folder, View, getFileActions, FileType } from '@nextcloud/files'
import { showError } from '@nextcloud/dialogs'
import { translate as t } from '@nextcloud/l10n'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { defineComponent } from 'vue'

import { action as sidebarAction } from '../actions/sidebarAction.ts'
Expand Down Expand Up @@ -200,7 +201,7 @@ export default defineComponent({
handler() {
// wait for scrolling and updating the actions to settle
this.$nextTick(() => {
if (this.fileId && this.openFile) {
if (this.fileId) {
this.handleOpenFile(this.fileId)
}
})
Expand All @@ -214,6 +215,8 @@ export default defineComponent({
const mainContent = window.document.querySelector('main.app-content') as HTMLElement
mainContent.addEventListener('dragover', this.onDragOver)

subscribe('files:sidebar:closed', this.handleSideBarCloseEvent)

// If the file list is mounted with a fileId specified
// then we need to open the sidebar initially
if (this.fileId) {
Expand All @@ -224,6 +227,8 @@ export default defineComponent({
beforeDestroy() {
const mainContent = window.document.querySelector('main.app-content') as HTMLElement
mainContent.removeEventListener('dragover', this.onDragOver)

unsubscribe('files:sidebar:closed', this.handleSideBarCloseEvent)
},

methods: {
Expand Down Expand Up @@ -251,12 +256,31 @@ export default defineComponent({
}
},

handleSideBarCloseEvent() {
if (!this.openFile) {
window.OCP.Files.Router.goToRoute(
null,
{ ...this.$route.params, fileid: undefined },
this.$route.query,
)
}
},

/**
* Handle opening a file (e.g. by ?openfile=true)
* @param fileId File to open
*/
handleOpenFile(fileId: number|null) {
if (!this.openFile) {
// If the Sidebar is closed and if openFile is false, remove the file id from the URL
if (OCA.Files.Sidebar.file === '') {
window.OCP.Files.Router.goToRoute(
null,
{ ...this.$route.params, fileid: undefined },
this.$route.query,
)
}

return
}

Expand Down
4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

0 comments on commit 11ff3d0

Please sign in to comment.