fix: [DHIS2-17854] validate the assigned values from rules engine

i18n/en.pot

@@ -113,66 +113,6 @@ msgstr "This value is validating"
 msgid "Async field update failed"
 msgstr "Async field update failed"
 
-msgid "A value is required"
-msgstr "A value is required"
-
-msgid "Please provide a valid number"
-msgstr "Please provide a valid number"
-
-msgid "Please provide a valid integer"
-msgstr "Please provide a valid integer"
-
-msgid "Please provide a positive integer"
-msgstr "Please provide a positive integer"
-
-msgid "Please provide zero or a positive integer"
-msgstr "Please provide zero or a positive integer"
-
-msgid "Please provide a negative integer"
-msgstr "Please provide a negative integer"
-
-msgid "Please provide a valid date"
-msgstr "Please provide a valid date"
-
-msgid "A date in the future is not allowed"
-msgstr "A date in the future is not allowed"
-
-msgid "Please provide a valid date and time"
-msgstr "Please provide a valid date and time"
-
-msgid "Please provide a valid time"
-msgstr "Please provide a valid time"
-
-msgid "Please provide an integer between 0 and 100"
-msgstr "Please provide an integer between 0 and 100"
-
-msgid "Please provide a valid url"
-msgstr "Please provide a valid url"
-
-msgid "Please provide a valid email address"
-msgstr "Please provide a valid email address"
-
-msgid "Please provide a valid age"
-msgstr "Please provide a valid age"
-
-msgid "Please provide a valid phone number"
-msgstr "Please provide a valid phone number"
-
-msgid "Please provide a valid organisation unit"
-msgstr "Please provide a valid organisation unit"
-
-msgid "Please provide valid coordinates"
-msgstr "Please provide valid coordinates"
-
-msgid "This value already exists"
-msgstr "This value already exists"
-
-msgid "\"From\" cannot be greater than \"To\""
-msgstr "\"From\" cannot be greater than \"To\""
-
-msgid "Checking..."
-msgstr "Checking..."
-
 msgid "Area"
 msgstr "Area"
 
@@ -185,6 +125,12 @@ msgstr "Enrollment"
 msgid "Complete event"
 msgstr "Complete event"
 
+msgid "A value is required"
+msgstr "A value is required"
+
+msgid "Please provide a valid date"
+msgstr "Please provide a valid date"
+
 msgid "{{ stageName }} - Basic info"
 msgstr "{{ stageName }} - Basic info"
 
@@ -1195,6 +1141,9 @@ msgstr "Set coordinates"
 msgid "Coordinates"
 msgstr "Coordinates"
 
+msgid "Please provide valid coordinates"
+msgstr "Please provide valid coordinates"
+
 msgid "Delete polygon"
 msgstr "Delete polygon"
 
@@ -1451,6 +1400,9 @@ msgstr "Scheduled date"
 msgid "Report date"
 msgstr "Report date"
 
+msgid "Please provide a valid organisation unit"
+msgstr "Please provide a valid organisation unit"
+
 msgid "Please select a valid event"
 msgstr "Please select a valid event"
 
@@ -1920,6 +1872,54 @@ msgstr "Error editing the event, the changes made were not saved"
 msgid "Error updating the Assignee"
 msgstr "Error updating the Assignee"
 
+msgid "Please provide a valid number"
+msgstr "Please provide a valid number"
+
+msgid "Please provide a valid integer"
+msgstr "Please provide a valid integer"
+
+msgid "Please provide a positive integer"
+msgstr "Please provide a positive integer"
+
+msgid "Please provide zero or a positive integer"
+msgstr "Please provide zero or a positive integer"
+
+msgid "Please provide a negative integer"
+msgstr "Please provide a negative integer"
+
+msgid "A date in the future is not allowed"
+msgstr "A date in the future is not allowed"
+
+msgid "Please provide a valid date and time"
+msgstr "Please provide a valid date and time"
+
+msgid "Please provide a valid time"
+msgstr "Please provide a valid time"
+
+msgid "Please provide an integer between 0 and 100"
+msgstr "Please provide an integer between 0 and 100"
+
+msgid "Please provide a valid url"
+msgstr "Please provide a valid url"
+
+msgid "Please provide a valid email address"
+msgstr "Please provide a valid email address"
+
+msgid "Please provide a valid age"
+msgstr "Please provide a valid age"
+
+msgid "Please provide a valid phone number"
+msgstr "Please provide a valid phone number"
+
+msgid "This value already exists"
+msgstr "This value already exists"
+
+msgid "\"From\" cannot be greater than \"To\""
+msgstr "\"From\" cannot be greater than \"To\""
+
+msgid "Checking..."
+msgstr "Checking..."
+
 msgid "Set coordinate"
 msgstr "Set coordinate"
 

src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js

@@ -11,7 +11,7 @@ import { buildField } from './field/buildField';
 import { validationStrategies } from '../../metaData/RenderFoundation/renderFoundation.const';
 import type { CustomForm, DataElement } from '../../metaData';
 import { messageStateKeys } from '../../reducers/descriptions/rulesEffects.reducerDescription';
-import { validatorTypes } from './field/validators/constants';
+import { validatorTypes } from '../../utils/validation/constants';
 import type { QuerySingleResource } from '../../utils/api/api.types';
 import { FormFieldPlugin } from './FormFieldPlugin';
 import { FormFieldPluginConfig } from '../../metaData/FormFieldPluginConfig';

src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.js

@@ -11,24 +11,18 @@ import isObject from 'd2-utilizr/lib/isObject';
 import defaultClasses from './formBuilder.module.css';
 import type { ErrorData, PostProcessErrorMessage } from './formbuilder.types';
 import type { PluginContext } from '../FormFieldPlugin/FormFieldPlugin.types';
-import { getValidators } from '../field/validators';
+import { getValidators, validateValue } from '../../../utils/validation';
+import type { ValidatorContainer } from '../../../utils/validation';
 import type { DataElement } from '../../../metaData';
 import type { QuerySingleResource } from '../../../utils/api';
 
-export type ValidatorContainer = {
-    validator: (value: any, validationContext: ?Object) => boolean | Promise<boolean>,
-    message: string,
-    validatingMessage?: ?string,
-    type?: ?string,
-    async?: ?boolean,
-};
 
 export type FieldConfig = {
     id: string,
     component: React.ComponentType<any>,
     plugin?: boolean,
     props: Object,
-    validators?: ?Array<ValidatorContainer>,
+    validators?: Array<ValidatorContainer>,
     commitEvent?: ?string,
     onIsEqual?: ?(newValue: any, oldValue: any) => boolean,
 };
@@ -47,7 +41,7 @@ type GetContainerPropsFn = (index: number, fieldsCount: number, field: FieldConf
 
 type FieldCommitConfig = {|
     fieldId: string,
-    validators?: ?Array<ValidatorContainer>,
+    validators?: Array<ValidatorContainer>,
     onIsEqual?: ?(newValue: any, oldValue: any) => boolean,
 |}
 
@@ -99,54 +93,6 @@ type FieldCommitOptions = {
 type FieldsValidatingPromiseContainer = { [fieldId: string]: ?{ cancelableValidatingPromise?: ?CancelablePromise<any>, validatingCompleteUid: string } };
 
 export class FormBuilder extends React.Component<Props> {
-    static async validateField(
-        { validators }: { validators?: ?Array<ValidatorContainer> },
-        value: any,
-        validationContext: ?Object,
-        onIsValidatingInternal: ?Function,
-    ): Promise<{ valid: boolean, errorMessage?: ?string, errorType?: ?string }> {
-        if (!validators || validators.length === 0) {
-            return {
-                valid: true,
-            };
-        }
-
-        const validatorResult = await validators
-            .reduce(async (passPromise, currentValidator) => {
-                const pass = await passPromise;
-                if (pass === true) {
-                    let result = currentValidator.validator(value, validationContext);
-                    if (result instanceof Promise) {
-                        result = onIsValidatingInternal ? onIsValidatingInternal(currentValidator.validatingMessage, result) : result;
-                        result = await result;
-                    }
-
-                    if (result === true || (result && result.valid)) {
-                        return true;
-                    }
-                    return {
-                        message: (result && result.errorMessage) || currentValidator.message,
-                        type: currentValidator.type,
-                        data: result && result.data,
-                    };
-                }
-                return pass;
-            }, Promise.resolve(true));
-
-        if (validatorResult !== true) {
-            return {
-                valid: false,
-                errorMessage: validatorResult.message,
-                errorType: validatorResult.type,
-                errorData: validatorResult.data,
-            };
-        }
-
-        return {
-            valid: true,
-        };
-    }
-
     static getAsyncUIState(fieldsUI: { [id: string]: FieldUI }) {
         return Object.keys(fieldsUI).reduce((accAsyncUIState, fieldId) => {
             const fieldUI = fieldsUI[fieldId];
@@ -219,8 +165,9 @@ export class FormBuilder extends React.Component<Props> {
 
                 let validationData;
                 try {
-                    validationData = await FormBuilder.validateField(
-                        field,
+                    const { validators } = field;
+                    validationData = await validateValue(
+                        validators,
                         values[field.id],
                         validationContext,
                         handleIsValidatingInternal,
@@ -429,8 +376,8 @@ export class FormBuilder extends React.Component<Props> {
         };
 
         this.commitUpdateTriggeredForFields[fieldId] = true;
-        const updatePromise = FormBuilder.validateField(
-            { validators },
+        const updatePromise = validateValue(
+            validators,
             value,
             onGetValidationContext && onGetValidationContext(),
             handleIsValidatingInternal,

src/core_modules/capture-core/components/D2Form/FormBuilder/index.js

@@ -1,4 +1,4 @@
 // @flow
 export { FormBuilder } from './FormBuilder.component';
 export type { PostProcessErrorMessage, ErrorData } from './formbuilder.types';
-export type { FieldConfig, ValidatorContainer } from './FormBuilder.component';
+export type { FieldConfig } from './FormBuilder.component';

src/core_modules/capture-core/components/D2Form/field/configs/base/configBase.js

@@ -1,7 +1,7 @@
 // @flow
 import { type ComponentType } from 'react';
-import type { ValidatorContainer } from '../../../FormBuilder';
-import { getValidators } from '../../validators';
+import type { ValidatorContainer } from '../../../../../utils/validation';
+import { getValidators } from '../../../../../utils/validation';
 import type { DataElement } from '../../../../../metaData';
 import type { QuerySingleResource } from '../../../../../utils/api/api.types';
 

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.js

@@ -419,17 +419,38 @@ export class EnrollmentDataEntryComponent extends React.Component<PreEnrollmentD
 
     handleUpdateField = (...args: Array<any>) => {
         const { programId, orgUnit, firstStageMetaData, formFoundation } = this.props;
-        this.props.onUpdateField(...args, programId, orgUnit, firstStageMetaData?.stage, formFoundation);
-    }
+        this.props.onUpdateField(
+            ...args,
+            programId,
+            orgUnit,
+            firstStageMetaData?.stage,
+            formFoundation,
+            this.getValidationContext,
+        );
+    };
 
     handleUpdateDataEntryField = (...args: Array<any>) => {
         const { programId, orgUnit, firstStageMetaData, formFoundation } = this.props;
-        this.props.onUpdateDataEntryField(...args, programId, orgUnit, firstStageMetaData?.stage, formFoundation);
+        this.props.onUpdateDataEntryField(
+            ...args,
+            programId,
+            orgUnit,
+            firstStageMetaData?.stage,
+            formFoundation,
+            this.getValidationContext,
+        );
     }
 
     handleStartAsyncUpdateField = (...args: Array<any>) => {
         const { programId, orgUnit, firstStageMetaData, formFoundation } = this.props;
-        this.props.onStartAsyncUpdateField(...args, programId, orgUnit, firstStageMetaData?.stage, formFoundation);
+        this.props.onStartAsyncUpdateField(
+            ...args,
+            programId,
+            orgUnit,
+            firstStageMetaData?.stage,
+            formFoundation,
+            this.getValidationContext,
+        );
     }
 
     render() {

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.container.js

@@ -14,17 +14,21 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({
         orgUnit: OrgUnit,
         stage?: ProgramStage,
         formFoundation: RenderFoundation,
+        onGetValidationContext: () => Object,
     ) => {
-        dispatch(updateDataEntryFieldBatch(innerAction, programId, orgUnit, stage, formFoundation));
+        dispatch(
+            updateDataEntryFieldBatch(innerAction, programId, orgUnit, stage, formFoundation, onGetValidationContext),
+        );
     },
     onUpdateField: (
         innerAction: ReduxAction<any, any>,
         programId: string,
         orgUnit: OrgUnit,
         stage?: ProgramStage,
         formFoundation: RenderFoundation,
+        onGetValidationContext: () => Object,
     ) => {
-        dispatch(updateFieldBatch(innerAction, programId, orgUnit, stage, formFoundation));
+        dispatch(updateFieldBatch(innerAction, programId, orgUnit, stage, formFoundation, onGetValidationContext));
     },
     onStartAsyncUpdateField: (
         innerAction: ReduxAction<any, any>,
@@ -34,9 +38,10 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({
         orgUnit: OrgUnit,
         stage?: ProgramStage,
         formFoundation: RenderFoundation,
+        onGetValidationContext: () => Object,
     ) => {
         const onAsyncUpdateSuccess = (successInnerAction: ReduxAction<any, any>) =>
-            asyncUpdateSuccessBatch(successInnerAction, dataEntryId, itemId, programId, orgUnit, stage, formFoundation);
+            asyncUpdateSuccessBatch(successInnerAction, dataEntryId, itemId, programId, orgUnit, stage, formFoundation, onGetValidationContext);
         const onAsyncUpdateError = (errorInnerAction: ReduxAction<any, any>) => errorInnerAction;
 
         dispatch(startAsyncUpdateFieldForNewEnrollment(innerAction, onAsyncUpdateSuccess, onAsyncUpdateError));

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentWithFirstStageDataEntry/fieldValidators/eventDate.validatorContainersGetter.js

@@ -1,7 +1,7 @@
 // @flow
 import { hasValue } from 'capture-core-utils/validators/form';
 import i18n from '@dhis2/d2-i18n';
-import { isValidDate } from '../../../../../utils/validators/form';
+import { isValidDate } from '../../../../../utils/validation/validators/form';
 
 const preValidateDate = (value?: ?string) => {
     if (!value) {