review changes

openmrs · Sep 30, 2024 · e466776 · e466776
1 parent fea4fb8
commit e466776
Show file tree

Hide file tree

Showing 3 changed files with 1,440 additions and 1,188 deletions.
diff --git a/src/components/inputs/date/date.component.tsx b/src/components/inputs/date/date.component.tsx
@@ -72,7 +72,7 @@ const DateField: React.FC<FormFieldInputProps> = ({ field, value: dateValue, err
     [field.datePickerFormat, field.label, t],
   );
 
-  return sessionMode == 'view' || sessionMode == 'embedded-view' || isTrue(field.readonly) ? (
+  return sessionMode == 'view' || sessionMode == 'embedded-view' ? (
     <FieldValueView
       label={t(field.label)}
       value={dateValue instanceof Date ? formatDateAsDisplayString(field, dateValue) : dateValue}

diff --git a/src/components/inputs/multi-select/multi-select.component.tsx b/src/components/inputs/multi-select/multi-select.component.tsx
@@ -25,6 +25,7 @@ const MultiSelect: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
       label: answer.label,
       key: index,
       disabled: answer.disable?.isDisabled,
+      readonly: isTrue(field.readonly),
     }));
 
   const initiallySelectedQuestionItems = useMemo(() => {
@@ -80,7 +81,7 @@ const MultiSelect: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
     return field.isRequired ? <FieldLabel field={field} /> : <span>{t(field.label)}</span>;
   }, [field.isRequired, field.label, t]);
 
-  return sessionMode == 'view' || sessionMode == 'embedded-view' || isTrue(field.readonly) ? (
+  return sessionMode == 'view' || sessionMode == 'embedded-view' ? (
     <div className={styles.formField}>
       <FieldValueView
         label={t(field.label)}
@@ -129,6 +130,7 @@ const MultiSelect: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
                       checked={initiallyCheckedQuestionItems.some((item) => item === value.concept)}
                       onBlur={onblur}
                       disabled={value.disable?.isDisabled}
+                      readOnly={isTrue(field.readonly)}
                     />
                   );
                 })}