Stop landing pages from rendering at the dynamic route

common/services/prismic/link-resolver.ts

@@ -7,6 +7,8 @@ type Props = {
   type: string;
   siteSection?: SiteSection;
 };
+
+// Untransformed data
 type DataProps = {
   uid?: string;
   type: string;
@@ -20,7 +22,8 @@ type DataProps = {
 };
 
 function linkResolver(doc: Props | DataProps): string {
-  // this is mostly useful for scenarios like rendering in Page Builder
+  // This is mostly useful for scenarios like rendering in Page Builder
+  // which doesn't necessarily have access to all data
   if (!doc) return '/';
 
   const { uid, type } = doc;
@@ -52,18 +55,20 @@ function linkResolver(doc: Props | DataProps): string {
   }
 
   if (type === 'pages') {
-    if ('siteSection' in doc) {
-      return `${doc.siteSection}/${uid}`;
-    } else if ('tags' in doc) {
-      // Needed for Prismic previews
-      const docSiteSection = doc.tags.find(t => isSiteSection(t));
+    let siteSection: SiteSection | undefined;
 
-      const isLandingPage = docSiteSection === uid;
-      if (isLandingPage) return `/${uid}`;
+    if ('siteSection' in doc) {
+      siteSection = doc.siteSection;
+    }
 
-      return `${docSiteSection ? '/' + docSiteSection : ''}/${uid}`;
+    // Prismic previews come through here.
+    if ('tags' in doc) {
+      siteSection = doc.tags.find(t => isSiteSection(t));
     }
-    return `/${uid}`;
+
+    const isLandingPage = siteSection === uid;
+
+    return isLandingPage || !siteSection ? `/${uid}` : `/${siteSection}/${uid}`;
   }
 
   if (isContentType(type)) {

content/webapp/pages/events/[eventId]/index.tsx

@@ -185,14 +185,11 @@ const EventPage: NextPage<EventProps> = ({
         url: '/events',
         text: 'Events',
       },
-      ...event.series.map(series => {
-        console.log(series);
-        return {
-          url: linkResolver(series),
-          text: series.title || '',
-          prefix: 'Part of',
-        };
-      }),
+      ...event.series.map(series => ({
+        url: linkResolver(series),
+        text: series.title || '',
+        prefix: 'Part of',
+      })),
       scheduledIn
         ? {
             url: linkResolver(scheduledIn),

content/webapp/pages/pages/[pageId].tsx

@@ -108,7 +108,13 @@ export const getServerSideProps: GetServerSideProps<
   const { pageId } = context.query;
   const siteSection = toMaybeString(context.params?.siteSection);
 
-  if (!looksLikePrismicId(pageId)) {
+  // We don't allow e.g. /visit-us/visit-us as it's a landing page
+  // Should only display on /visit-us
+  const isLandingPageRenderingAsSubPage =
+    pageId === siteSection &&
+    context.resolvedUrl.indexOf(`/${siteSection}/${pageId}`) === 0;
+
+  if (!looksLikePrismicId(pageId) || isLandingPageRenderingAsSubPage) {
     return { notFound: true };
   }
 
@@ -123,10 +129,16 @@ export const getServerSideProps: GetServerSideProps<
       const basicDocSiteSection = basicDocument.tags.find(t =>
         isSiteSection(t)
       );
+      const isLandingPage = basicDocSiteSection === pageId;
+
+      const redirectUrl =
+        isLandingPage || !basicDocSiteSection
+          ? `/${pageId}`
+          : `/${basicDocSiteSection}/${pageId}`;
 
       return {
         redirect: {
-          destination: `${basicDocSiteSection ? '/' + basicDocSiteSection : ''}/${basicDocument.uid}`,
+          destination: redirectUrl,
           permanent: false,
         },
       };

content/webapp/services/prismic/transformers/exhibition-guides.test.ts

@@ -213,7 +213,6 @@ describe('transformExhibitionGuide', () => {
   it('returns a set of components', () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const exhibition = transformExhibitionGuide(exhibitionGuidesDoc as any);
-    console.log(exhibition.components.length, 'the exhibition');
     expect(exhibition.components.length).toBe(2);
   });
 });

playwright/test/helpers/contexts.ts

@@ -84,9 +84,7 @@ const stageApiToggleCookie = createCookie({
   value: 'true',
 });
 
-// TODO: context.addCookies should run for the first test of a suite (even on beforeAll/beforeEach)
-
-const requiredCookies = useStageApis
+export const requiredCookies = useStageApis
   ? [acceptCookieCookie, stageApiToggleCookie]
   : [acceptCookieCookie];
 

playwright/test/pages.test.ts

@@ -0,0 +1,32 @@
+import { expect, test } from '@playwright/test';
+
+import { gotoWithoutCache, requiredCookies } from './helpers/contexts';
+import { baseUrl } from './helpers/utils';
+
+test.describe('Server-side redirection logic works as expected', () => {
+  test('/pages/ route redirects to relevant URL', async ({ context, page }) => {
+    await context.addCookies(requiredCookies);
+
+    // Visit Us site section
+    await gotoWithoutCache(`${baseUrl}/pages/accessibility`, page);
+    await expect(page.url()).toEqual(`${baseUrl}/visit-us/accessibility`);
+
+    // Orphan page
+    await gotoWithoutCache(`${baseUrl}/pages/contact-us`, page);
+    await expect(page.url()).toEqual(`${baseUrl}/contact-us`);
+  });
+
+  test("Landing pages don't have a parent route", async ({ context, page }) => {
+    await context.addCookies(requiredCookies);
+
+    await gotoWithoutCache(`${baseUrl}/visit-us/visit-us`, page);
+    await expect(
+      page
+        .getByRole('heading')
+        .getByText('Not the Wellcome you were expecting?')
+    ).toBeVisible();
+
+    await gotoWithoutCache(`${baseUrl}/pages/visit-us`, page);
+    await expect(page.url()).toEqual(`${baseUrl}/visit-us`);
+  });
+});