fix(viewerAction): replace the history entry when closing the viewer

Opening a file replaces the folder's history entry with one that carries
`openfile`. Closing pushed a new entry on top of it instead of replacing it,
so the entry carrying `openfile` was left behind: going back after closing
reopened the file that had just been closed instead of leaving the folder,
and further back navigation bounced between the leftover entries.

Closing now replaces the current entry, mirroring what opening does.

Signed-off-by: ELHart05 <o.allaoua@esi-sba.dz>

Author: ELHart05

playwright/e2e/navigation.spec.ts

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { expect, setupFilesPage, test } from '../support/fixtures.ts'
-import { getRowForFile, openFile } from '../support/filesUtils.ts'
-import { getViewer } from '../support/viewerUtils.ts'
+import { createRandomUser, expect, loginUser, setupFilesPage, test } from '../support/fixtures.ts'
+import { getRowForFile, navigateToFolder, openFile } from '../support/filesUtils.ts'
+import { getCloseButton, getViewer } from '../support/viewerUtils.ts'
+import { createFolder, uploadFile } from '../support/webdav.ts'
 
 test.describe('Browser navigation', () => {
 	test('Navigating back to the files overview', async ({ browser }) => {
@@ -22,4 +23,28 @@ test.describe('Browser navigation', () => {
 
 		await page.close()
 	})
+
+	test('Navigating back after closing leaves the folder the file was opened from', async ({ browser }) => {
+		const page = await browser.newPage()
+		const user = await createRandomUser()
+		await createFolder(user, '/Photos')
+		await uploadFile(user, 'image.png', 'image/png', '/Photos/image1.png')
+		await loginUser(page, user)
+		await page.goto('apps/files')
+
+		await navigateToFolder(page, 'Photos')
+		await openFile(page, 'image1.png')
+		await expect(getViewer(page)).toBeVisible()
+
+		await getCloseButton(page).click()
+		await expect(getViewer(page)).toHaveCount(0)
+
+		// Closing must not stack an extra entry on top of the folder: one step back
+		// leaves the folder instead of reopening the file that was just closed.
+		await page.goBack()
+		await expect(getViewer(page)).toHaveCount(0)
+		await expect(getRowForFile(page, 'Photos')).toBeVisible()
+
+		await page.close()
+	})
 })

src/files_actions/viewerAction.ts

@@ -69,7 +69,11 @@ async function execAction({ nodes, view, folder }): Promise<boolean|null> {
 		const newQuery = { ...window.OCP?.Files?.Router?.query }
 		delete newQuery.openfile
 		delete newQuery.editing
-		window.OCP?.Files?.Router?.goToRoute(null, window.OCP?.Files?.Router?.params, newQuery)
+		// Replace rather than push: opening the file already replaced the folder's
+		// history entry, so closing has to give it back. Pushing leaves the entry
+		// carrying `openfile` behind, and going back then reopens the file that was
+		// just closed instead of leaving the folder.
+		window.OCP?.Files?.Router?.goToRoute(null, window.OCP?.Files?.Router?.params, newQuery, true)
 	}
 
 	if (window.OCP?.Files?.Router) {