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

cypress/e2e/NewPage/NewPage.js

@@ -634,6 +634,9 @@ And('you see the enrollment minimap', () => {
 });
 
 And('you delete the recently added tracked entity', () => {
+    cy.get('[data-test="profile-widget"]')
+        .contains('Person profile')
+        .should('exist');
     cy.get('[data-test="widget-profile-overflow-menu"]')
         .click();
     cy.contains('Delete Person')
@@ -646,6 +649,9 @@ And('you delete the recently added tracked entity', () => {
 });
 
 And('you delete the recently added malaria entity', () => {
+    cy.get('[data-test="profile-widget"]')
+        .contains('Malaria Entity profile')
+        .should('exist');
     cy.get('[data-test="widget-profile-overflow-menu"]')
         .click();
     cy.contains('Delete Malaria Entity')

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n"
-"PO-Revision-Date: 2024-11-07T11:57:59.094Z\n"
+"POT-Creation-Date: 2024-12-03T10:58:18.077Z\n"
+"PO-Revision-Date: 2024-12-03T10:58:18.077Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -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"
 
@@ -197,6 +143,9 @@ msgstr "{{ stageName }} - Status"
 msgid "Please select {{categoryName}}"
 msgstr "Please select {{categoryName}}"
 
+msgid "A date in the future is not allowed"
+msgstr "A date in the future is not allowed"
+
 msgid "Saving a new enrollment in {{programName}} in {{orgUnitName}}."
 msgstr "Saving a new enrollment in {{programName}} in {{orgUnitName}}."
 
@@ -1195,6 +1144,9 @@ msgstr "Set coordinates"
 msgid "Coordinates"
 msgstr "Coordinates"
 
+msgid "Please provide valid coordinates"
+msgstr "Please provide valid coordinates"
+
 msgid "Delete polygon"
 msgstr "Delete polygon"
 
@@ -1454,6 +1406,9 @@ msgstr "Report date"
 msgid "Please enter a date"
 msgstr "Please enter a 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"
 
@@ -1930,6 +1885,51 @@ 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 "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 "Please provide a valid positive integer"
 msgstr "Please provide a valid positive integer"
 

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/D2SectionFields.container.js

@@ -16,7 +16,7 @@ const makeMapStateToProps = () => {
     const getRulesMessages = makeGetMessages();
     const getCompulsory = makeGetCompulsory();
     const getDisabled = makeGetDisabled();
-    const mapStateToProps = (state: Object, props: { formId: string }) => ({
+    const mapStateToProps = (state: Object, props: { formId: string, fieldsMetaData: any }) => ({
         values: getSectionValues(state, props),
         rulesHiddenFields: getHiddenFields(state, props),
         rulesMessages: getRulesMessages(state, props),

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

@@ -11,28 +11,17 @@ 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 { validatorTypes } from '../field/validators/constants';
+import { getValidators, validateValue, validatorTypes } 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, internalError?: ?{
-        error?: ?string,
-        errorCode?: ?string,
-    }) => 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,
 };
@@ -51,7 +40,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,
 |}
 
@@ -100,7 +89,7 @@ export type FieldCommitOptions = {|
     errorCode?: string,
 |};
 
-type FieldCommitOptionsExtended = {|
+export type FieldCommitOptionsExtended = {|
     ...FieldCommitOptions,
     plugin?: ?boolean,
 |};
@@ -109,59 +98,6 @@ type FieldCommitOptionsExtended = {|
 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,
-        commitOptions?: ?FieldCommitOptions,
-    ): 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,
-                        { error: commitOptions?.error, errorCode: commitOptions?.errorCode },
-                        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];
@@ -234,12 +170,12 @@ export class FormBuilder extends React.Component<Props> {
 
                 let validationData;
                 try {
-                    validationData = await FormBuilder.validateField(
-                        field,
-                        values[field.id],
+                    validationData = await validateValue({
+                        validators: field.validators,
+                        value: values[field.id],
                         validationContext,
-                        handleIsValidatingInternal,
-                    );
+                        postProcessAsyncValidatonInitiation: handleIsValidatingInternal,
+                    });
                 } catch (reason) {
                     if (reason && isObject(reason) && reason.isCanceled) {
                         validationData = null;
@@ -468,14 +404,13 @@ export class FormBuilder extends React.Component<Props> {
                 errorMessage: options.error,
                 errorType: validatorTypes.TYPE_BASE,
                 errorData: undefined }) :
-            (await FormBuilder.validateField(
-                { validators },
+            (await validateValue({
+                validators,
                 value,
-                onGetValidationContext && onGetValidationContext(),
-                handleIsValidatingInternal,
-                // $FlowFixMe
-                options,
-            )
+                validationContext: onGetValidationContext && onGetValidationContext(),
+                postProcessAsyncValidatonInitiation: handleIsValidatingInternal,
+                commitOptions: options,
+            })
                 // $FlowFixMe[prop-missing] automated comment
                 .then(({ valid, errorMessage, errorType, errorData }) => {
                     updateField({ valid, errorMessage, errorType, errorData });

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, FieldCommitOptionsExtended } 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/D2Form/index.js

@@ -1,3 +1,4 @@
 // @flow
 export { asyncHandlerActionTypes, asyncUpdateFieldEpic } from './asyncHandlerHOC';
 export { D2Form } from './D2Form.container';
+export type { FieldCommitOptionsExtended } from './FormBuilder';