fix: results route handling in dev mode

lib/Controller/PageController.php

@@ -112,6 +112,16 @@ public function views(string $hash): TemplateResponse {
 		return $this->index($hash);
 	}
 
+	/**
+	 * @return TemplateResponse
+	 */
+	#[NoAdminRequired()]
+	#[NoCSRFRequired()]
+	#[FrontpageRoute(verb: 'GET', url: '/{hash}/results/{view}', requirements: ['hash' => '[a-zA-Z0-9]{16,}'])]
+	public function resultsViews(string $hash): TemplateResponse {
+		return $this->index($hash);
+	}
+
 	/**
 	 * @return TemplateResponse
 	 */

playwright/e2e/results-view.spec.ts

@@ -49,13 +49,11 @@
 		await submitView.checkOption('Pick colors', 'Red')
 		await submitView.checkOption('Pick colors', 'Blue')
 		await submitView.submit()
 		await expect(submitView.successMessage).toBeVisible()
 
-		// Navigate to Results view via URL — the SPA route transition
-		// from submit → results after submission causes a brief redirect loop,
-		// so we use direct navigation instead of clicking the TopBar.
+		// Navigate to Results view. The router will redirect to the summary tab.
 		await page.goto(page.url().replace(/\/submit.*$/, '/results'))
-		await page.waitForURL(/\/results(?:\?.*)?$/)
+		await page.waitForURL(/\/results\/summary$/)
 	})
 
 	test('Summary tab shows submitted data', async ({ resultsView }) => {
@@ -80,76 +78,38 @@
 		// Should show the individual submission with the answers
 		await expect(resultsView.responsesTab).toBeChecked()
 		await expect(resultsView.responseCount).toBeVisible()
-		await expect(resultsView.page).toHaveURL(/\/results\?view=responses$/)
+		await expect(resultsView.page).toHaveURL(/\/results\/responses$/)
 	})
 
 	test('Tab switching between Summary and Responses updates the URL', async ({
 		resultsView,
 	}) => {
 		// Start on Summary
 		await expect(resultsView.summaryTab).toBeChecked()
-		await expect(resultsView.page).toHaveURL(/\/results\?view=summary$/)
+		await expect(resultsView.page).toHaveURL(/\/results\/summary$/)
 
 		// Switch to Responses
 		await resultsView.switchToResponses()
 		await expect(resultsView.responsesTab).toBeChecked()
 		await expect(resultsView.summaryTab).not.toBeChecked()
-		await expect(resultsView.page).toHaveURL(/\/results\?view=responses$/)
+		await expect(resultsView.page).toHaveURL(/\/results\/responses$/)
 
 		// Switch back to Summary
 		await resultsView.switchToSummary()
 		await expect(resultsView.summaryTab).toBeChecked()
 		await expect(resultsView.responsesTab).not.toBeChecked()
-		await expect(resultsView.page).toHaveURL(/\/results\?view=summary$/)
+		await expect(resultsView.page).toHaveURL(/\/results\/summary$/)
 	})
 
-	test('Explicit query route wins over remembered localStorage view', async ({
-		page,
-		resultsView,
-	}) => {
-		await page.evaluate(() => {
-			const match = window.location.pathname.match(
-				/\/apps\/forms\/([^/]+)\/results$/,
-			)
-			if (!match) {
-				throw new Error('Expected results route before setting localStorage')
-			}
-
-			localStorage.setItem(
-				`nextcloud_forms_${match[1]}_activeResponseView`,
-				'responses',
-			)
-		})
-
-		await page.goto(page.url().replace(/\/results.*$/, '/results?view=summary'))
-		await page.waitForURL(/\/results\?view=summary$/)
-
-		await expect(resultsView.summaryTab).toBeChecked()
-		await expect(resultsView.responsesTab).not.toBeChecked()
-	})
+	test('Navigating to /results redirects to /results/summary', async ({ page }) => {
+		// Start on the responses tab
+		await page.goto(page.url().replace(/\/summary$/, '/responses'))
+		await page.waitForURL(/\/results\/responses$/)
 
-	test('Query-less results route restores the remembered localStorage view', async ({
-		page,
-		resultsView,
-	}) => {
-		await page.evaluate(() => {
-			const match = window.location.pathname.match(
-				/\/apps\/forms\/([^/]+)\/results$/,
-			)
-			if (!match) {
-				throw new Error('Expected results route before setting localStorage')
-			}
-
-			localStorage.setItem(
-				`nextcloud_forms_${match[1]}_activeResponseView`,
-				'responses',
-			)
-		})
-
-		await page.goto(page.url().replace(/\/results.*$/, '/results'))
-		await page.waitForURL(/\/results\?view=responses$/)
-
-		await expect(resultsView.responsesTab).toBeChecked()
-		await expect(resultsView.summaryTab).not.toBeChecked()
+		// Navigate to the parent results route
+		await page.goto(page.url().replace(/\/responses$/, ''))
+		await page.waitForURL(/\/results\/summary$/)
+		await expect(page).toHaveURL(/\/results\/summary$/)
 	})
 })
+

src/Forms.vue

@@ -238,9 +238,10 @@ export default {
 				return false
 			}
 
-			if (route.name === 'results') {
+			const resultRoutes = ['results', 'results.summary', 'results.responses']
+			if (resultRoutes.includes(route.name)) {
 				return (
-					form.permissions.includes(route.name) || form.submissionCount > 0
+					form.permissions.includes('results') || form.submissionCount > 0
 				)
 			}
 

src/components/TopBar.vue

@@ -115,7 +115,11 @@ export default {
 
 	computed: {
 		currentView() {
-			return this.availableViews.filter((v) => v.id === this.$route.name)[0]
+			return this.availableViews.find(
+				(v) =>
+					this.$route.name === v.id
+					|| this.$route.name.startsWith(v.id + '.'),
+			)
 		},
 
 		availableViews() {

src/router.ts

@@ -33,9 +33,37 @@ const routes = [
 	},
 	{
 		path: '/:hash/results',
-		components: { default: Results },
-		name: 'results',
 		props: { default: true },
+		children: [
+			{
+				path: '',
+				name: 'results',
+				redirect: (to) => {
+					const validViews = ['summary', 'responses']
+					const storedView = localStorage.getItem(
+						`nextcloud_forms_${to.params.hash as string}_activeResponseView`,
+					)
+					const lastViewId =
+						storedView && validViews.includes(storedView)
+							? storedView
+							: 'summary'
+					return {
+						name: `results.${lastViewId}`,
+						params: { hash: to.params.hash },
+					}
+				},
+			},
+			{
+				path: 'summary',
+				name: 'results.summary',
+				components: { default: Results },
+			},
+			{
+				path: 'responses',
+				name: 'results.responses',
+				components: { default: Results },
+			},
+		],
 	},
 	{
 		path: '/:hash/submit/:submissionId?',