From 8474642f821702eb7872ba8624387311d564700b Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Mon, 3 Feb 2025 11:34:45 +0100 Subject: [PATCH] :sparkles: [open-formulieren/open-forms#5016] Display isGeldig instead of datum for referentielijst tabellen --- src/components/builder/values/referentielijsten/code.tsx | 6 +++--- src/registry/radio/radio-referentielijsten.stories.ts | 6 +++--- src/registry/select/select-referentielijsten.stories.ts | 6 +++--- .../selectboxes/selectboxes-referentielijsten.stories.ts | 6 +++--- src/tests/sharedUtils.tsx | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/builder/values/referentielijsten/code.tsx b/src/components/builder/values/referentielijsten/code.tsx index 12b3c538..62ff468f 100644 --- a/src/components/builder/values/referentielijsten/code.tsx +++ b/src/components/builder/values/referentielijsten/code.tsx @@ -9,7 +9,7 @@ import {BuilderContext} from '@/context'; export interface ReferentielijstenTabelOption { code: string; naam: string; - einddatumGeldigheid: string | null; + isGeldig: boolean; } function isTabelOptions( @@ -20,10 +20,10 @@ function isTabelOptions( function transformItems(items: ReferentielijstenTabelOption[]) { return items.map(item => { - const {code, naam, einddatumGeldigheid} = item; + const {code, naam, isGeldig} = item; return { value: code, - label: einddatumGeldigheid ? `${naam} (${einddatumGeldigheid})` : naam, + label: !isGeldig ? `${naam} (niet meer geldig)` : naam, }; }); } diff --git a/src/registry/radio/radio-referentielijsten.stories.ts b/src/registry/radio/radio-referentielijsten.stories.ts index bbfb79ff..ba9cd37b 100644 --- a/src/registry/radio/radio-referentielijsten.stories.ts +++ b/src/registry/radio/radio-referentielijsten.stories.ts @@ -57,7 +57,7 @@ export const StoreValuesInComponent: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await userEvent.click(canvas.getByRole('button', {name: 'Save'})); @@ -89,7 +89,7 @@ export const SwitchToVariableResetOptions: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await rsSelect(dataSourceInput, 'From variable'); @@ -126,7 +126,7 @@ export const SwitchToManualResetOptions: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await rsSelect(dataSourceInput, 'Manually fill in'); diff --git a/src/registry/select/select-referentielijsten.stories.ts b/src/registry/select/select-referentielijsten.stories.ts index 69092198..ecc55918 100644 --- a/src/registry/select/select-referentielijsten.stories.ts +++ b/src/registry/select/select-referentielijsten.stories.ts @@ -57,7 +57,7 @@ export const StoreValuesInComponent: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await userEvent.click(canvas.getByRole('button', {name: 'Save'})); @@ -89,7 +89,7 @@ export const SwitchToVariableResetOptions: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await rsSelect(dataSourceInput, 'From variable'); @@ -126,7 +126,7 @@ export const SwitchToManualResetOptions: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await rsSelect(dataSourceInput, 'Manually fill in'); diff --git a/src/registry/selectboxes/selectboxes-referentielijsten.stories.ts b/src/registry/selectboxes/selectboxes-referentielijsten.stories.ts index 66b1ca5c..293f2ce4 100644 --- a/src/registry/selectboxes/selectboxes-referentielijsten.stories.ts +++ b/src/registry/selectboxes/selectboxes-referentielijsten.stories.ts @@ -54,7 +54,7 @@ export const StoreValuesInComponent: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await userEvent.click(canvas.getByRole('button', {name: 'Save'})); @@ -86,7 +86,7 @@ export const SwitchToVariableResetOptions: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await rsSelect(dataSourceInput, 'From variable'); @@ -123,7 +123,7 @@ export const SwitchToManualResetOptions: Story = { await rsSelect(serviceInput, 'Referentielijsten'); const codeInput = canvas.getByLabelText('Referentielijsten table code'); - await rsSelect(codeInput, 'Tabel 2 (2025-04-11T13:02:25Z)'); + await rsSelect(codeInput, 'Tabel 2 (niet meer geldig)'); await rsSelect(dataSourceInput, 'Manually fill in'); diff --git a/src/tests/sharedUtils.tsx b/src/tests/sharedUtils.tsx index 9f0b6275..f213aba7 100644 --- a/src/tests/sharedUtils.tsx +++ b/src/tests/sharedUtils.tsx @@ -56,12 +56,12 @@ export const DEFAULT_REFERENTIELIJSTEN_TABELLEN: ReferentielijstenTabelOption[] { code: 'tabel1', naam: 'Tabel 1', - einddatumGeldigheid: null, + isGeldig: true, }, { code: 'tabel2', naam: 'Tabel 2', - einddatumGeldigheid: '2025-04-11T13:02:25Z', + isGeldig: false, }, ];