Fix relative file links from index pages

cypress/e2e/pages-links.spec.js

@@ -37,6 +37,8 @@ describe('Page Link Handling', function() {
 			anotherCollectiveFirstPageId = id
 		})
 		cy.deleteAndSeedCollective('Link Testing')
+		cy.seedPage('Parent', '', 'Readme.md')
+		cy.seedPage('Child', '', 'Parent.md')
 		cy.seedPage('Link Target', '', 'Readme.md').then((id) => {
 			linkTargetPageId = id
 		})
@@ -53,10 +55,14 @@ describe('Page Link Handling', function() {
 			})
 		}).then(() => {
 			cy.seedPageContent('Link%20Testing/Readme.md', `
-
 ## Links supposed to open in same window
 
 * Relative path to page in this collective with fileId:  [Link Target](./Link%20Target?fileId=${linkTargetPageId})
+			`)
+			cy.seedPageContent('Link%20Testing/Parent/Readme.md', `
+## Links supposed to open in same window
+
+* Relative path to page in this collective with fileId:  [../Link Target.md](../Link%20Target.md?fileId=${linkTargetPageId})
 			`)
 			cy.seedPageContent('Link%20Testing/Link%20Source.md', `
 ## Links supposed to open in viewer
@@ -258,6 +264,17 @@ describe('Page Link Handling', function() {
 				testLinkToNewTab(href, { edit: true })
 			}
 		})
+		it('Opens link with relative path from index page to page in this collective with fileId in same/new tab depending on view/edit mode', function() {
+			cy.visit('/apps/collectives/Link%20Testing/Parent')
+			// Link without origin and containing `fileId` param gets rewritten by editor rendering
+			// const href = `../Link%20Target.md?fileId=${linkTargetPageId}`
+			const href = `/index.php/apps/files/?dir=&openfile=${linkTargetPageId}#relPath=../Link%20Target.md`
+			testLinkToSameTab(href, {
+				expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target',
+				expectedSearch: `?fileId=${linkTargetPageId}`,
+			})
+			// testLinkToNewTab(href, { edit: true })
+		})
 		it('Opens link with relative path from landing page to page in this collective with fileId in same/new tab depending on view/edit mode', function() {
 			cy.visit('/apps/collectives/Link%20Testing')
 			// Link without origin and containing `fileId` param gets rewritten by editor rendering

src/components/Page.vue

@@ -5,10 +5,10 @@
 			<div class="page-title-icon"
 				:class="{ 'mobile': isMobile }">
 				<!-- Landing page: collective emoji or CollectivesIcon -->
-				<div v-if="landingPage && currentCollective.emoji">
+				<div v-if="isLandingPage && currentCollective.emoji">
 					{{ currentCollective.emoji }}
 				</div>
-				<CollectivesIcon v-else-if="landingPage" :size="pageTitleIconSize" fill-color="var(--color-text-maxcontrast)" />
+				<CollectivesIcon v-else-if="isLandingPage" :size="pageTitleIconSize" fill-color="var(--color-text-maxcontrast)" />
 				<PageTemplateIcon v-else-if="isTemplatePage" :size="pageTitleIconSize" fill-color="var(--color-text-maxcontrast)" />
 
 				<!-- Emoji picker if editable -->
@@ -51,7 +51,7 @@
 
 			<!-- Page title -->
 			<form @submit.prevent="focusEditor()">
-				<input v-if="landingPage"
+				<input v-if="isLandingPage"
 					ref="landingPageTitle"
 					v-tooltip="titleIfTruncated(currentCollective.name)"
 					class="title"
@@ -89,7 +89,7 @@
 				:timestamp="currentPage.timestamp"
 				:last-user-id="currentPage.lastUserId"
 				:last-user-display-name="currentPage.lastUserDisplayName"
-				:is-landing-page="landingPage"
+				:is-landing-page="isLandingPage"
 				:is-template="isTemplatePage" />
 
 			<!-- Sidebar toggle -->
@@ -155,10 +155,10 @@ export default {
 			'currentPage',
 			'currentCollective',
 			'currentCollectiveCanEdit',
-			'indexPage',
+			'isIndexPage',
 			'isPublic',
 			'isTemplatePage',
-			'landingPage',
+			'isLandingPage',
 			'loading',
 			'showing',
 		]),
@@ -174,10 +174,10 @@ export default {
 				t('collectives', 'Collectives'),
 				'Nextcloud',
 			]
-			if (!this.landingPage) {
+			if (!this.isLandingPage) {
 				// Add parent page names in reverse order
 				filePath.split('/').forEach(part => part && parts.unshift(part))
-				if (!this.indexPage) {
+				if (!this.isIndexPage) {
 					parts.unshift(title)
 				}
 			}

src/components/Page/RichText.vue

@@ -91,6 +91,7 @@ export default {
 			'currentCollective',
 			'currentPageDirectory',
 			'currentPageFilePath',
+			'isIndexPage',
 			'isPublic',
 			'loading',
 			'pageById',
@@ -135,10 +136,9 @@ export default {
 		handleCollectiveLink({ href }) {
 			const collectiveParam = encodeURIComponent(this.collectiveParam)
 
-			// If we're on landing page, append `/` to location to make `URL()` append relative paths correctly
+			// If we're on index page, append `/` to location to make `URL()` append relative paths correctly
 			let windowLocation = window.location.origin + window.location.pathname
-			if (windowLocation.endsWith(`/collectives/${collectiveParam}`)
-				|| windowLocation.match(new RegExp(`/collectives/p/[^/]+/${collectiveParam}$`))) {
+			if (this.isIndexPage) {
 				windowLocation = `${windowLocation}/`
 			}
 

src/store/store.js

@@ -36,17 +36,17 @@ export default new Store({
 		pageParam: (state) => state.route.params.page,
 		shareTokenParam: (state) => state.route.params.token,
 
-		indexPage: (_state, get) =>
+		isIndexPage: (_state, get) =>
 			get.currentPage.fileName === 'Readme.md',
 
-		landingPage: (_state, get) =>
+		isLandingPage: (_state, get) =>
 			!get.pageParam || get.pageParam === 'Readme',
 
 		isTemplatePage: (_state, get) =>
 			get.currentPage.title === 'Template',
 
 		title: (_state, get) =>
-			get.landingPage ? get.currentCollective.name : get.currentPage.title,
+			get.isLandingPage ? get.currentCollective.name : get.currentPage.title,
 
 		isPublic: (_state, get) =>
 			!!get.shareTokenParam,