@prenta/admin 2.6.0 → 2.7.0

package/src/__tests__/views/form-entries.render.test.tsx

@@ -172,3 +172,25 @@ describe('FormEntries (All Entries)', () => {
     )
   })
 })
+
+/** TRACKING P-06: Inbox.html's count chips toggle their status filter. */
+describe('All Entries header chips', () => {
+  it('filters to unread from the unread chip, and back to all on a second click', async () => {
+    render(<FormEntries onNavigate={() => {}} />)
+    await screen.findByText('Jordan Avery')
+    const chip = await screen.findByRole('button', { name: /^\d+ unread$/, pressed: false })
+    expect(chip.className).toContain('rounded-pill')
+
+    fireEvent.click(chip)
+    await waitFor(() =>
+      expect(fetchEntries).toHaveBeenLastCalledWith(expect.objectContaining({ unread: true })),
+    )
+    expect(screen.getByRole('button', { name: 'Unread', pressed: true })).toBeTruthy()
+
+    fireEvent.click(screen.getByRole('button', { name: /^\d+ unread$/, pressed: true }))
+    await waitFor(() =>
+      expect(fetchEntries).toHaveBeenLastCalledWith(expect.not.objectContaining({ unread: true })),
+    )
+    expect(screen.getByRole('button', { name: 'All', pressed: true })).toBeTruthy()
+  })
+})

package/src/__tests__/views/form-submissions.render.test.tsx

@@ -156,3 +156,25 @@ describe('FormSubmissions table', () => {
     )
   })
 })
+
+/** TRACKING P-06: a form's entries are a second-level screen titled by the form. */
+describe('FormSubmissions header', () => {
+  it("titles the page with the form's sidebar label under a Forms breadcrumb", async () => {
+    render(<FormSubmissions formId="f1" onNavigate={() => {}} />)
+    expect(await screen.findByRole('heading', { level: 1, name: 'Contact Us' })).toBeTruthy()
+    const crumbs = screen.getByRole('navigation', { name: 'Breadcrumb' })
+    expect(crumbs.textContent).toBe('Dashboard/Forms/Contact Us')
+    expect(screen.getByRole('link', { name: 'Forms' }).getAttribute('href')).toContain('/forms')
+    expect(screen.queryByRole('button', { name: 'Back to Forms' })).toBeNull()
+  })
+
+  it('filters to starred from the starred chip', async () => {
+    render(<FormSubmissions formId="f1" onNavigate={() => {}} />)
+    await screen.findByText('Jordan Avery')
+    fireEvent.click(await screen.findByRole('button', { name: '0 starred', pressed: false }))
+    await waitFor(() =>
+      expect(fetchEntries).toHaveBeenLastCalledWith(expect.objectContaining({ starred: true })),
+    )
+    expect(screen.getByRole('button', { name: '0 starred', pressed: true })).toBeTruthy()
+  })
+})

package/src/__tests__/views/forms-list.render.test.tsx

@@ -169,3 +169,16 @@ describe('Forms list', () => {
     await waitFor(() => expect(screen.queryByRole('region', { name: 'Form schema' })).toBeNull())
   })
 })
+
+/** TRACKING P-06: Forms' header counts share the kit's count chip. */
+describe('Forms header chips', () => {
+  it('uses count chips: active in --suc, unread in --err while any are unread', async () => {
+    render(<Forms onNavigate={() => {}} />)
+    await screen.findByText('Contact Us')
+    for (const label of ['forms', 'active', 'total entries', 'unread']) {
+      expect(screen.getByText(label).className).toContain('rounded-pill')
+    }
+    expect(screen.getByText('active').querySelector('b')?.className).toContain('text-suc')
+    expect(screen.getByText('unread').className).toContain('text-err')
+  })
+})

package/src/__tests__/views/general-settings.render.test.tsx

@@ -63,6 +63,7 @@ const cmsApi = vi.fn(async (endpoint: string, options?: { method?: string }) =>
 vi.mock('../../lib/api.js', () => ({ cmsApi: (e: string, o?: unknown) => cmsApi(e, o as any) }))
 
 const { GeneralSettingsTab } = await import('../../views/settings/GeneralSettingsTab.js')
+const { Toaster } = await import('../../components/ui/Toaster.js')
 
 beforeEach(() => {
   cmsApi.mockClear()
@@ -70,7 +71,7 @@ beforeEach(() => {
 })
 
 describe('GeneralSettingsTab', () => {
-  it('renders the index status pill, loaded site info, and a clean (disabled) save bar', async () => {
+  it('renders the index status pill, loaded site info, and no save bar while clean', async () => {
     render(<GeneralSettingsTab role="ADMIN" />)
 
     await screen.findByLabelText('Site Title')
@@ -80,18 +81,22 @@ describe('GeneralSettingsTab', () => {
     expect((screen.getByLabelText('Site URL') as HTMLInputElement).value).toBe(
       'https://prentamedia.com',
     )
-    // Nothing dirty yet → Save disabled.
-    expect(
-      (screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement).disabled,
-    ).toBe(true)
+    // Nothing dirty yet → no save bar at all (save bars render only when dirty).
+    expect(screen.queryByRole('button', { name: 'Save changes' })).toBeNull()
+    expect(screen.queryByRole('button', { name: 'Reset' })).toBeNull()
   })
 
   it('enables Save when a field changes and persists site info to the settings global', async () => {
-    render(<GeneralSettingsTab role="ADMIN" />)
+    render(
+      <>
+        <GeneralSettingsTab role="ADMIN" />
+        <Toaster />
+      </>,
+    )
     const title = (await screen.findByLabelText('Site Title')) as HTMLInputElement
 
     fireEvent.change(title, { target: { value: 'Actuate Media Co' } })
-    const save = screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement
+    const save = screen.getByRole('button', { name: 'Save changes' }) as HTMLButtonElement
     expect(save.disabled).toBe(false)
 
     fireEvent.click(save)
@@ -102,6 +107,28 @@ describe('GeneralSettingsTab', () => {
         expect.objectContaining({ method: 'PUT' }),
       ),
     )
+    // The dirty-only bar is gone once saved; a toast confirms the save.
+    expect(await screen.findByText('Saved')).toBeTruthy()
+    await waitFor(() =>
+      expect(screen.queryByRole('region', { name: 'Unsaved changes' })).toBeNull(),
+    )
+  })
+
+  it('shows the save bar only once dirty, and Reset restores the saved values', async () => {
+    render(<GeneralSettingsTab role="ADMIN" />)
+    const title = (await screen.findByLabelText('Site Title')) as HTMLInputElement
+    expect(screen.queryByRole('button', { name: 'Save changes' })).toBeNull()
+
+    fireEvent.change(title, { target: { value: 'Actuate Media Co' } })
+    expect(screen.getByRole('region', { name: 'Unsaved changes' })).toBeTruthy()
+
+    fireEvent.click(screen.getByRole('button', { name: 'Reset' }))
+    expect(title.value).toBe('Actuate Media')
+    expect(screen.queryByRole('button', { name: 'Save changes' })).toBeNull()
+    expect(cmsApi).not.toHaveBeenCalledWith(
+      '/globals/settings',
+      expect.objectContaining({ method: 'PUT' }),
+    )
   })
 
   it('blocks save and shows an error for an invalid Site URL', async () => {
@@ -113,7 +140,7 @@ describe('GeneralSettingsTab', () => {
 
     expect((await screen.findAllByText(/valid absolute URL/i)).length).toBeGreaterThan(0)
     expect(
-      (screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement).disabled,
+      (screen.getByRole('button', { name: 'Save changes' }) as HTMLButtonElement).disabled,
     ).toBe(true)
   })
 
@@ -133,12 +160,12 @@ describe('GeneralSettingsTab', () => {
     render(<GeneralSettingsTab role="ADMIN" />)
     await screen.findByLabelText('Site Title')
 
-    expect(screen.queryByText('Unsaved changes')).toBeNull()
+    expect(screen.queryByRole('region', { name: 'Unsaved changes' })).toBeNull()
     fireEvent.click(screen.getByRole('switch', { name: 'Default No Follow' }))
 
-    expect(await screen.findByText('Unsaved changes')).toBeTruthy()
+    expect(await screen.findByRole('region', { name: 'Unsaved changes' })).toBeTruthy()
     expect(
-      (screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement).disabled,
+      (screen.getByRole('button', { name: 'Save changes' }) as HTMLButtonElement).disabled,
     ).toBe(false)
   })