✨ [open-formulieren/open-forms#5016] Display isGeldig instead of datu…

…m for referentielijst tabellen
open-formulieren · Feb 3, 2025 · 77c6828 · 77c6828
1 parent c7d840f
commit 77c6828
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,
   },
 ];