Simplify validation

Amsterdam · Aug 22, 2024 · 8419df1 · 8419df1
1 parent aa5be45
commit 8419df1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/src/signals/incident/definitions/wizard-step-2-vulaan/afval-thor.ts b/src/signals/incident/definitions/wizard-step-2-vulaan/afval-thor.ts
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (C) 2024 Gemeente Amsterdam
-import {
-  falsyOrNumberOrNow,
-  inPast,
-} from 'signals/incident/services/custom-validators'
+import { inPast } from 'signals/incident/services/custom-validators'
 import { QuestionFieldType } from 'types/question'
 
 import locatie from './locatie'
@@ -16,7 +13,7 @@ export const controls = {
       canBeNull: true,
     },
     options: {
-      validators: [falsyOrNumberOrNow, inPast, 'required'],
+      validators: [inPast, 'required'],
     },
     render: QuestionFieldType.DateTimeInput,
   },

diff --git a/src/signals/incident/definitions/wizard-step-2-vulaan/overlast-op-het-water.ts b/src/signals/incident/definitions/wizard-step-2-vulaan/overlast-op-het-water.ts
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (C) 2021 - 2024 Gemeente Amsterdam
-import {
-  falsyOrNumberOrNow,
-  inPast,
-} from 'signals/incident/services/custom-validators'
+import { inPast } from 'signals/incident/services/custom-validators'
 import { QuestionFieldType } from 'types/question'
 
 import locatie from './locatie'
@@ -23,7 +20,7 @@ export const overlastOpHetWater = {
       },
     },
     options: {
-      validators: [falsyOrNumberOrNow, inPast, 'required'],
+      validators: [inPast, 'required'],
     },
     render: QuestionFieldType.DateTimeInput,
   },
@@ -42,7 +39,7 @@ export const overlastOpHetWater = {
       },
     },
     options: {
-      validators: [falsyOrNumberOrNow, inPast, 'required'],
+      validators: [inPast, 'required'],
     },
     render: QuestionFieldType.DateTimeInput,
   },

diff --git a/...als/incident/definitions/wizard-step-2-vulaan/overlast-van-en-door-personen-of-groepen.ts b/...als/incident/definitions/wizard-step-2-vulaan/overlast-van-en-door-personen-of-groepen.ts
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (C) 2018 - 2024 Gemeente Amsterdam
-import {
-  falsyOrNumberOrNow,
-  inPast,
-} from 'signals/incident/services/custom-validators'
+import { inPast } from 'signals/incident/services/custom-validators'
 import { QuestionFieldType } from 'types/question'
 
 import locatie from './locatie'
@@ -29,7 +26,7 @@ export const overlastPersonenEnGroepen = {
       canBeNull: true,
     },
     options: {
-      validators: [falsyOrNumberOrNow, inPast, 'required'],
+      validators: [inPast, 'required'],
     },
     render: QuestionFieldType.DateTimeInput,
   },

diff --git a/src/signals/incident/definitions/wizard-step-2-vulaan/verkeersoverlast.ts b/src/signals/incident/definitions/wizard-step-2-vulaan/verkeersoverlast.ts
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (C) 2018 - 2024 Gemeente Amsterdam
-import {
-  falsyOrNumberOrNow,
-  inPast,
-} from 'signals/incident/services/custom-validators'
+import { inPast } from 'signals/incident/services/custom-validators'
 import { QuestionFieldType } from 'types/question'
 
 import locatie from './locatie'
@@ -16,7 +13,7 @@ export const verkeersoverlast = {
       canBeNull: true,
     },
     options: {
-      validators: [falsyOrNumberOrNow, inPast, 'required'],
+      validators: [inPast, 'required'],
     },
     render: QuestionFieldType.DateTimeInput,
   },