Skip to content

[stable29] feat: Reset route if neither the Viewer of the Sidebar is open #48001

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
artonge merged 2 commits into from
Sep 16, 2024
Merged

[stable29] feat: Reset route if neither the Viewer of the Sidebar is open #48001

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
936f34d
feat: Reset route if neither the Viewer of the Sidebar is open
artonge Sep 16, 2024
08c35a5
chore: Compile assets
artonge Sep 16, 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
feat: Reset route if neither the Viewer of the Sidebar is open 
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 <[email protected]>
  • Loading branch information
@artonge
artonge committed Sep 16, 2024
commit 936f34d3a5bb12181608574ed5db0e1ce1c919c3
28 changes: 22 additions & 6 deletions apps/files/src/components/FilesListVirtual.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import type { UserConfig } from '../types'
import { getFileListHeaders, Folder, View, getFileActions, FileType } from '@nextcloud/files'
import { showError } from '@nextcloud/dialogs'
import { translate as t, translatePlural as n } 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 @@ -216,8 +217,12 @@ export default defineComponent({
handler() {
// wait for scrolling and updating the actions to settle
this.$nextTick(() => {
if (this.fileId && this.openFile) {
this.handleOpenFile(this.fileId)
if (this.fileId) {
if (this.openFile) {
this.handleOpenFile(this.fileId)
} else {
this.unselectFile()
}
}
})
},
Expand All @@ -230,6 +235,8 @@ export default defineComponent({
const mainContent = window.document.querySelector('main.app-content') as HTMLElement
mainContent.addEventListener('dragover', this.onDragOver)

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

// If the file list is mounted with a fileId specified
// then we need to open the sidebar initially
if (this.fileId) {
Expand All @@ -240,6 +247,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.unselectFile)
},

methods: {
Expand Down Expand Up @@ -267,15 +276,22 @@ export default defineComponent({
}
},

unselectFile() {
// If the Sidebar is closed and if openFile is false, remove the file id from the URL
if (!this.openFile && OCA.Files.Sidebar.file === '') {
window.OCP.Files.Router.goToRoute(
null,
{ ...this.$route.params, fileid: String(this.currentFolder.fileid ?? '') },
this.$route.query,
)
}
},

/**
* Handle opening a file (e.g. by ?openfile=true)
* @param fileId File to open
*/
handleOpenFile(fileId: number|null) {
if (!this.openFile) {
return
}

if (fileId === null || this.openFileId === fileId) {
return
}
Expand Down