@openmrs/esm-form-engine-lib 2.1.0-pre.1412 → 2.1.0-pre.1414
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/12da1bdc832735e2/12da1bdc832735e2.gz +0 -0
- package/471ef562a5e5986c/471ef562a5e5986c.gz +0 -0
- package/6a510cf3c8453769/6a510cf3c8453769.gz +0 -0
- package/c91985e5da9154a3/c91985e5da9154a3.gz +0 -0
- package/package.json +1 -1
- package/src/components/inputs/multi-select/multi-select.component.tsx +1 -1
- package/src/validators/conditional-answered-validator.test.ts +1 -1
- package/src/validators/conditional-answered-validator.ts +2 -2
Binary file
|
Binary file
|
Binary file
|
Binary file
|
package/package.json
CHANGED
@@ -117,7 +117,7 @@ const MultiSelect: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
|
|
117
117
|
items={selectOptions}
|
118
118
|
initialSelectedItems={initiallySelectedQuestionItems}
|
119
119
|
label={''}
|
120
|
-
titleText={
|
120
|
+
titleText={<FieldLabel field={field} />}
|
121
121
|
key={counter}
|
122
122
|
itemToString={(item) => (item ? item.label : ' ')}
|
123
123
|
disabled={field.isDisabled}
|
@@ -23,7 +23,7 @@ describe('conditionalAnsweredValidator', () => {
|
|
23
23
|
referenceQuestionId: 'referenceQuestionId',
|
24
24
|
referenceQuestionAnswers: ['answer1', 'answer2'],
|
25
25
|
values: { referenceQuestionId: 'answer1' },
|
26
|
-
|
26
|
+
formFields: [{ id: 'referenceQuestionId' }],
|
27
27
|
message: 'Invalid value selected',
|
28
28
|
};
|
29
29
|
});
|
@@ -3,9 +3,9 @@ import { type FormFieldValidator, type FormField } from '../types';
|
|
3
3
|
|
4
4
|
export const conditionalAnsweredValidator: FormFieldValidator = {
|
5
5
|
validate: function (field: FormField, value: unknown, config: Record<string, any>) {
|
6
|
-
const { referenceQuestionId, referenceQuestionAnswers, values,
|
6
|
+
const { referenceQuestionId, referenceQuestionAnswers, values, formFields, message } = config;
|
7
7
|
|
8
|
-
const referencedField =
|
8
|
+
const referencedField = formFields.find((field) => field.id === referenceQuestionId);
|
9
9
|
const referencedFieldValue = values[referencedField.id];
|
10
10
|
|
11
11
|
if (!isEmpty(value) && !referenceQuestionAnswers.includes(referencedFieldValue)) {
|