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]>

Author: artonge

apps/files/src/components/FilesListVirtual.vue

@@ -83,6 +83,7 @@ import VirtualList from './VirtualList.vue'
 import logger from '../logger.ts'
 import FilesListTableHeaderActions from './FilesListTableHeaderActions.vue'
 import FileListFilters from './FileListFilters.vue'
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 export default defineComponent({
 	name: 'FilesListVirtual',
@@ -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)
 					}
 				})
@@ -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) {
@@ -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: {
@@ -251,12 +256,31 @@ export default defineComponent({
 			}
 		},
 
+		handleSideBarCloseEvent() {
+			if (OCA.Viewer.file === '') {
+				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
 			}