Debug: Revert #926 revert 1.7.0

.github/workflows/ci.yaml

@@ -135,6 +135,52 @@ jobs:
       - name: 🧪 Run tests
         run: pnpm test
 
+  e2e:
+    name: e2e
+    if: github.event_name == 'merge_group'
+    environment: Preview
+    runs-on: ubuntu-latest
+    env:
+      DATABASE_URI: 'file:./dev.db'
+      PAYLOAD_SECRET: ${{ secrets.PAYLOAD_SECRET }}
+      ALLOW_SIMPLE_PASSWORDS: 'true'
+      LOCAL_FLAG_ENABLE_LOCAL_PRODUCTION_BUILDS: 'true'
+    steps:
+      - name: 🏗 Setup repo
+        uses: actions/checkout@v4
+      - name: 🏗 Setup pnpm
+        uses: pnpm/action-setup@v4
+      - name: 🏗 Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.x
+          cache: pnpm
+      - name: 📦 Install dependencies
+        run: pnpm ii
+        shell: bash
+      - name: 🎭 Install Playwright Chromium
+        run: pnpm exec playwright install --with-deps chromium
+      - name: 📦 Opt out of image optimization
+        run: "sed -i 's/unoptimized: false/unoptimized: true/' next.config.js"
+        shell: bash
+      - name: 🌱 Seed database
+        run: pnpm seed:standalone
+      - name: 🔨 Build
+        run: pnpm build
+      - name: 🚀 Start server
+        run: pnpm start &
+      - name: ⏳ Wait for server
+        run: timeout 120 bash -c 'until curl -sf http://localhost:3000/admin/login > /dev/null; do sleep 2; done'
+      - name: 🧪 Run E2E tests
+        run: pnpm test:e2e
+      - name: 📤 Upload Playwright report
+        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 14
+
   migrations-check:
     name: migrations-check
     runs-on: ubuntu-latest

.gitignore

@@ -32,3 +32,9 @@ tsconfig.tsbuildinfo
 .cursor
 .claude
 plans/
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

__tests__/builders.ts

@@ -0,0 +1,42 @@
+import { BuiltInPage, Page, Post, Tenant } from '@/payload-types'
+
+/**
+ * Factory helpers that provide defaults for all required fields,
+ * so tests only specify the fields they care about.
+ */
+
+export function buildBuiltInPage(fields: Partial<BuiltInPage>): BuiltInPage {
+  return { id: 0, title: '', url: '', tenant: 0, updatedAt: '', createdAt: '', ...fields }
+}
+
+export function buildPage(fields: Partial<Page>): Page {
+  return {
+    id: 0,
+    title: '',
+    layout: [],
+    slug: '',
+    tenant: 0,
+    updatedAt: '',
+    createdAt: '',
+    ...fields,
+  }
+}
+
+export function buildTenant(fields: Partial<Tenant>): Tenant {
+  return { id: 0, name: '', slug: 'dvac', updatedAt: '', createdAt: '', ...fields }
+}
+
+export function buildPost(fields: Partial<Post>): Post {
+  return {
+    id: 0,
+    tenant: 0,
+    title: '',
+    content: {
+      root: { type: 'root', children: [], direction: null, format: '', indent: 0, version: 1 },
+    },
+    slug: '',
+    updatedAt: '',
+    createdAt: '',
+    ...fields,
+  }
+}

__tests__/client/Breadcrumbs.client.test.tsx → __tests__/client/components/Breadcrumbs.client.test.tsx

@@ -4,17 +4,13 @@ import { BreadcrumbProvider } from '@/providers/BreadcrumbProvider'
 import { NotFoundProvider } from '@/providers/NotFoundProvider'
 import '@testing-library/jest-dom'
 import { render, screen } from '@testing-library/react'
+import { useSelectedLayoutSegments } from 'next/navigation'
 
 jest.mock('next/navigation', () => ({
   useSelectedLayoutSegments: jest.fn(),
 }))
 
-import { useSelectedLayoutSegments } from 'next/navigation'
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const mockUseSelectedLayoutSegments = useSelectedLayoutSegments as jest.MockedFunction<
-  typeof useSelectedLayoutSegments
->
+const mockUseSelectedLayoutSegments = jest.mocked(useSelectedLayoutSegments)
 
 describe('Breadcrumbs', () => {
   afterEach(() => {

__tests__/client/utilities/extractID.client.test.ts

@@ -0,0 +1,12 @@
+import { extractID } from '@/utilities/extractID'
+import { buildBuiltInPage } from '../../builders'
+
+describe('extractID', () => {
+  it('extracts id from an object with an id property', () => {
+    expect(extractID(buildBuiltInPage({ id: 42 }))).toBe(42)
+  })
+
+  it('returns the value directly when given a number', () => {
+    expect(extractID(42)).toBe(42)
+  })
+})

__tests__/client/utilities/formatAuthors.client.test.ts

@@ -0,0 +1,51 @@
+import { formatAuthors } from '@/utilities/formatAuthors'
+
+const author = (name: string) => ({ id: name, name })
+const noName = () => ({ id: 'no-name' })
+
+describe('formatAuthors', () => {
+  it('returns empty string for empty array', () => {
+    expect(formatAuthors([])).toBe('')
+  })
+
+  it('returns empty string when all authors have no name', () => {
+    expect(formatAuthors([noName(), noName()])).toBe('')
+  })
+
+  it('returns the name for a single author', () => {
+    expect(formatAuthors([author('Alice Smith')])).toBe('Alice Smith')
+  })
+
+  it('joins two authors with "&"', () => {
+    expect(formatAuthors([author('Alice Smith'), author('Bob Jones')])).toBe(
+      'Alice Smith & Bob Jones',
+    )
+  })
+
+  it('joins three authors with commas and "&"', () => {
+    expect(
+      formatAuthors([author('Alice Smith'), author('Bob Jones'), author('Charlie Brown')]),
+    ).toBe('Alice Smith, Bob Jones & Charlie Brown')
+  })
+
+  it('joins four authors with commas and "&"', () => {
+    expect(
+      formatAuthors([
+        author('Alice Smith'),
+        author('Bob Jones'),
+        author('Charlie Brown'),
+        author('Diana Prince'),
+      ]),
+    ).toBe('Alice Smith, Bob Jones, Charlie Brown & Diana Prince')
+  })
+
+  it('filters out authors without names before formatting', () => {
+    expect(formatAuthors([author('Alice Smith'), noName(), author('Bob Jones')])).toBe(
+      'Alice Smith & Bob Jones',
+    )
+  })
+
+  it('returns single author when filtering leaves only one', () => {
+    expect(formatAuthors([noName(), author('Alice Smith'), noName()])).toBe('Alice Smith')
+  })
+})

__tests__/client/utilities/getAuthorInitials.client.test.ts

@@ -0,0 +1,19 @@
+import { getAuthorInitials } from '@/utilities/getAuthorInitials'
+
+describe('getAuthorInitials', () => {
+  it('returns initials for a two-part name', () => {
+    expect(getAuthorInitials('John Doe')).toBe('JD')
+  })
+
+  it('returns initial for a single name', () => {
+    expect(getAuthorInitials('Alice')).toBe('A')
+  })
+
+  it('returns initials for a three-part name', () => {
+    expect(getAuthorInitials('Mary Jane Watson')).toBe('MJW')
+  })
+
+  it('handles single character names', () => {
+    expect(getAuthorInitials('A B')).toBe('AB')
+  })
+})

__tests__/client/utilities/getRelativeTime.client.test.ts

@@ -0,0 +1,40 @@
+import { getRelativeTime } from '@/utilities/getRelativeTime'
+
+describe('getRelativeTime', () => {
+  beforeEach(() => {
+    jest.useFakeTimers()
+    jest.setSystemTime(new Date('2025-01-15T12:00:00Z'))
+  })
+
+  afterEach(() => {
+    jest.useRealTimers()
+  })
+
+  it('returns "today" for the current date', () => {
+    expect(getRelativeTime('2025-01-15T08:00:00Z')).toBe('today')
+  })
+
+  it('returns "yesterday" for one day ago', () => {
+    expect(getRelativeTime('2025-01-14T12:00:00Z')).toBe('yesterday')
+  })
+
+  it('returns "X days ago" for 2-6 days ago', () => {
+    expect(getRelativeTime('2025-01-12T12:00:00Z')).toBe('3 days ago')
+  })
+
+  it('returns "1 weeks ago" for 7 days ago', () => {
+    expect(getRelativeTime('2025-01-08T12:00:00Z')).toBe('1 weeks ago')
+  })
+
+  it('returns "3 weeks ago" for 21 days ago', () => {
+    expect(getRelativeTime('2024-12-25T12:00:00Z')).toBe('3 weeks ago')
+  })
+
+  it('returns "1 months ago" for 30+ days', () => {
+    expect(getRelativeTime('2024-12-15T12:00:00Z')).toBe('1 months ago')
+  })
+
+  it('returns "1 years ago" for 365+ days', () => {
+    expect(getRelativeTime('2024-01-10T12:00:00Z')).toBe('1 years ago')
+  })
+})

__tests__/client/handleURL.client.test.ts → __tests__/client/utilities/handleURL.client.test.ts

@@ -1,5 +1,5 @@
-import { BuiltInPage, Page, Post } from '@/payload-types'
 import { handleReferenceURL } from '@/utilities/handleReferenceURL'
+import { buildBuiltInPage, buildPage, buildPost } from '../../builders'
 
 describe('handleReferenceURL', () => {
   describe('when type is external', () => {
@@ -19,8 +19,7 @@ describe('handleReferenceURL', () => {
         type: 'internal',
         reference: {
           relationTo: 'builtInPages',
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          value: { url: '/built-in-page' } as BuiltInPage,
+          value: buildBuiltInPage({ url: '/built-in-page' }),
         },
       })
 
@@ -32,8 +31,7 @@ describe('handleReferenceURL', () => {
         type: 'internal',
         reference: {
           relationTo: 'pages',
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          value: { slug: 'test-page' } as Page,
+          value: buildPage({ slug: 'test-page' }),
         },
       })
 
@@ -45,8 +43,7 @@ describe('handleReferenceURL', () => {
         type: 'internal',
         reference: {
           relationTo: 'posts',
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          value: { slug: 'my-blog-post' } as Post,
+          value: buildPost({ slug: 'my-blog-post' }),
         },
       })
 
@@ -61,8 +58,7 @@ describe('handleReferenceURL', () => {
         type: 'internal',
         reference: {
           relationTo: 'pages',
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          value: { slug: '' } as Page,
+          value: buildPage({ slug: '' }),
         },
       })
 

__tests__/client/utilities/isAbsoluteUrl.client.test.ts

@@ -0,0 +1,35 @@
+import isAbsoluteUrl from '@/utilities/isAbsoluteUrl'
+
+describe('isAbsoluteUrl', () => {
+  it('returns true for https URL', () => {
+    expect(isAbsoluteUrl('https://example.com')).toBe(true)
+  })
+
+  it('returns true for http URL', () => {
+    expect(isAbsoluteUrl('http://example.com')).toBe(true)
+  })
+
+  it('returns true for URL with path', () => {
+    expect(isAbsoluteUrl('https://example.com/path/to/page')).toBe(true)
+  })
+
+  it('returns false for relative path', () => {
+    expect(isAbsoluteUrl('/images/photo.jpg')).toBe(false)
+  })
+
+  it('returns false for bare string', () => {
+    expect(isAbsoluteUrl('not-a-url')).toBe(false)
+  })
+
+  it('returns false for null', () => {
+    expect(isAbsoluteUrl(null)).toBe(false)
+  })
+
+  it('returns false for undefined', () => {
+    expect(isAbsoluteUrl(undefined)).toBe(false)
+  })
+
+  it('returns false for empty string', () => {
+    expect(isAbsoluteUrl('')).toBe(false)
+  })
+})

__tests__/client/utilities/normalizePath.client.test.ts

@@ -0,0 +1,57 @@
+import { normalizePath } from '@/utilities/path'
+
+describe('normalizePath', () => {
+  describe('default options (no leading slash)', () => {
+    it('strips leading slash from a simple path', () => {
+      expect(normalizePath('/hello')).toBe('hello')
+    })
+
+    it('strips multiple leading slashes', () => {
+      expect(normalizePath('///hello')).toBe('hello')
+    })
+
+    it('strips trailing slashes', () => {
+      expect(normalizePath('hello/')).toBe('hello')
+    })
+
+    it('strips both leading and trailing slashes', () => {
+      expect(normalizePath('/hello/')).toBe('hello')
+    })
+
+    it('handles paths without slashes', () => {
+      expect(normalizePath('hello')).toBe('hello')
+    })
+
+    it('handles multi-segment paths', () => {
+      expect(normalizePath('/blog/post-1/')).toBe('blog/post-1')
+    })
+
+    it('handles empty string', () => {
+      expect(normalizePath('')).toBe('')
+    })
+  })
+
+  describe('with ensureLeadingSlash', () => {
+    const opts = { ensureLeadingSlash: true }
+
+    it('keeps existing leading slash', () => {
+      expect(normalizePath('/hello', opts)).toBe('/hello')
+    })
+
+    it('adds leading slash when missing', () => {
+      expect(normalizePath('hello', opts)).toBe('/hello')
+    })
+
+    it('collapses multiple leading slashes to one', () => {
+      expect(normalizePath('///hello', opts)).toBe('/hello')
+    })
+
+    it('strips trailing slashes', () => {
+      expect(normalizePath('/hello/', opts)).toBe('/hello')
+    })
+
+    it('handles multi-segment paths', () => {
+      expect(normalizePath('blog/post-1/', opts)).toBe('/blog/post-1')
+    })
+  })
+})