Merge pull request #42 from open-formulieren/feature/add-min-max-coun…

…t-for-selectboxes Add min max count validator for selectboxes
open-formulieren · Feb 5, 2024 · 4ec5a0f · 4ec5a0f
2 parents 3187fc9 + 1a64fe0
commit 4ec5a0f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/formio/components/selectboxes.ts b/src/formio/components/selectboxes.ts
@@ -2,7 +2,7 @@ import {InputComponentSchema} from '..';
 import {OFExtensions} from '../base';
 import {ManualValues, Option, VariableValues} from '../common';
 
-type Validator = 'required';
+type Validator = 'required' | 'minSelectedCount' | 'maxSelectedCount';
 type TranslatableKeys = 'label' | 'description' | 'tooltip';
 
 export type SelectboxesInputSchema = InputComponentSchema<

diff --git a/src/formio/validation.ts b/src/formio/validation.ts
@@ -28,6 +28,8 @@ export type BaseErrorKeys =
   | 'minDate'
   | 'maxDate'
   | 'customMessage'
+  | 'minSelectedCount'
+  | 'maxSelectedCount'
   // custom, added by OF
   | 'minTime'
   | 'maxTime'
@@ -44,8 +46,6 @@ type UnsupportedValidateNames =
   | 'minLength'
   | 'custom'
   | 'customPrivate'
-  | 'minSelectedCount'
-  | 'maxSelectedCount'
   | 'minWords'
   | 'maxWords'
   | 'email' // email component is exposed, but adds the validation implicitly
@@ -66,6 +66,8 @@ const VALIDATOR_TO_ERROR_KEY = {
   max: 'max',
   maxLength: 'maxLength',
   pattern: 'pattern',
+  minSelectedCount: 'minSelectedCount',
+  maxSelectedCount: 'maxSelectedCount',
   // 'email': 'invalid_email',  // email component is exposed, but adds the validation implicitly
   minDate: 'minDate',
   maxDate: 'maxDate',

diff --git a/test-d/formio/components/selectboxes.test-d.ts b/test-d/formio/components/selectboxes.test-d.ts
@@ -17,7 +17,7 @@ expectAssignable<SelectboxesComponentSchema>({
     {
       value: 'dummy',
       label: 'dummy',
-    }
+    },
   ],
 });
 
@@ -57,11 +57,11 @@ expectAssignable<SelectboxesComponentSchema>({
           },
           nl: {
             label: 'dummy_nl',
-          }
-        }
-      }
-    }
-  ]
+          },
+        },
+      },
+    },
+  ],
 });
 
 // full, correct schema
@@ -90,6 +90,8 @@ expectAssignable<SelectboxesComponentSchema>({
   validate: {
     required: false,
     plugins: [],
+    minSelectedCount: 2,
+    maxSelectedCount: 3,
   },
   translatedErrors: {nl: {required: 'Geef checkbox.'}},
   errors: {required: 'Geef checkbox.'},