@openmrs/esm-form-engine-lib 2.1.0-pre.1367 → 2.1.0-pre.1373

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1367",
+  "version": "2.1.0-pre.1373",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/components/inputs/multi-select/multi-select.component.tsx

@@ -130,19 +130,21 @@ const MultiSelect: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
             )}
           </Layer>
         </div>
-        <div className={styles.selectionDisplay}>
-          {value?.length && field.questionOptions.answers?.length > 5 ? (
-            <div className={styles.tagContainer}>
-              {formFieldAdapters[field.type]?.getDisplayValue(field, value)?.map((displayValue, index) => (
-                <Tag key={index} type="cool-gray">
-                  {displayValue}
-                </Tag>
-              ))}
-            </div>
-          ) : (
-            <ValueEmpty />
-          )}
-        </div>
+        {!field.inlineMultiCheckbox && (
+          <div className={styles.selectionDisplay}>
+            {value?.length ? (
+              <div className={styles.tagContainer}>
+                {formFieldAdapters[field.type]?.getDisplayValue(field, value)?.map((displayValue, index) => (
+                  <Tag key={index} type="cool-gray">
+                    {displayValue}
+                  </Tag>
+                ))}
+              </div>
+            ) : (
+              <ValueEmpty />
+            )}
+          </div>
+        )}
       </>
     )
   );

package/src/form-engine.component.tsx

@@ -3,7 +3,6 @@ import type { FormField, SessionMode, FormSchema } from './types';
 import { useSession, type Visit } from '@openmrs/esm-framework';
 import { useFormJson } from '.';
 import FormProcessorFactory from './components/processor-factory/form-processor-factory.component';
-import { Form } from '@carbon/react';
 import Loader from './components/loaders/loader.component';
 import { usePatientData } from './hooks/usePatientData';
 import { useWorkspaceLayout } from './hooks/useWorkspaceLayout';
@@ -66,13 +65,16 @@ const FormEngine = ({
   // TODO: Updating this prop triggers a rerender of the entire form. This means whenever we scroll into a new page, the form is rerendered.
   // Figure out a way to avoid this. Maybe use a ref with an observer instead of a state?
   const [currentPage, setCurrentPage] = useState('');
-  const [showPatientBanner, setShowPatientBanner] = useState(false);
   const {
     formJson: refinedFormJson,
     isLoading: isLoadingFormJson,
     formError,
   } = useFormJson(formUUID, formJson, encounterUUID, formSessionIntent);
 
+  const showPatientBanner = useMemo(() => {
+    return patient && workspaceLayout !== 'minimized' && mode !== 'embedded-view';
+  }, [patient, mode, workspaceLayout]);
+
   const showButtonSet = useMemo(() => {
     // if (mode === 'embedded-view') {
     //   return false;
@@ -102,7 +104,7 @@ const FormEngine = ({
   }, []);
 
   return (
-    <Form noValidate ref={ref} className={classNames('cds--form', styles.form)} onSubmit={handleSubmit}>
+    <form ref={ref} noValidate className={classNames('cds--form', styles.form)} onSubmit={handleSubmit}>
       {isLoadingPatient || isLoadingFormJson ? (
         <Loader />
       ) : (
@@ -171,7 +173,7 @@ const FormEngine = ({
           </div>
         </FormFactoryProvider>
       )}
-    </Form>
+    </form>
   );
 };
 

package/src/provider/form-factory-provider.tsx

@@ -14,7 +14,6 @@ import { type FormContextProps } from './form-provider';
 import { processPostSubmissionActions, validateForm } from './form-factory-helper';
 import { useTranslation } from 'react-i18next';
 import { usePostSubmissionActions } from '../hooks/usePostSubmissionActions';
-import { reportError } from '../utils/error-utils';
 
 interface FormFactoryProviderContextProps {
   patient: fhir.Patient;

package/translations/en.json

@@ -2,22 +2,17 @@
   "add": "Add",
   "addCameraImage": "Add camera image",
   "addFile": "Add files",
-  "attachmentsSaved": "Attachment(s) saved successfully",
   "cameraCapture": "Camera capture",
   "cancel": "Cancel",
   "chooseAnOption": "Choose an option",
+  "clearFile": "Clear file",
   "close": "Close",
   "closeCamera": "Close camera",
   "closesNotification": "Closes notification",
-  "submittedForm": "Form submitted",
-  "submittedFormDescription": "Form submitted successfully",
-  "errorDescription": "{{errors}}",
-  "errorDescriptionTitle": "Error on saving form",
+  "errorLoadingFormSchema": "Error loading form schema",
+  "errorLoadingInitialValues": "Error loading initial values",
   "errorRenderingField": "Error rendering field",
-  "errorSavingAttachments": "Error saving attachment(s)",
-  "errorSavingEncounter": "Error saving encounter",
-  "errorSavingPatientIdentifiers": "Error saving patient identifiers",
-  "errorSavingPatientPrograms": "Error saving patient program(s)",
+  "fieldErrorDescriptionTitle": "Validation Errors",
   "fileUploadDescription": "",
   "fileUploadDescriptionAny": "Upload any file type",
   "invalidWorkspaceName": "Invalid workspace name.",
@@ -25,13 +20,12 @@
   "launchWorkspace": "",
   "loading": "Loading",
   "notification": "Notification",
-  "ordersSaved": "Order(s) saved sucessfully",
-  "patientIdentifiersSaved": "Patient identifier(s) saved sucessfully",
-  "patientProgramsSaved": "Patient program(s) saved successfully",
+  "nullMandatoryField": "Please fill the required fields",
   "preview": "Preview",
   "previousValue": "Previous value:",
   "remove": "Remove",
   "required": "Required",
+  "reuseValue": "Reuse value",
   "revert": "Revert",
   "save": "Save",
   "search": "Search",
@@ -39,9 +33,8 @@
   "time": "Time",
   "unspecified": "Unspecified",
   "unspecifyAll": "Unspecify All",
-  "updatedRecord": "Record updated",
-  "updatedRecordDescription": "The patient encounter was updated",
   "upload": "Upload",
   "uploadedPhoto": "Uploaded photo",
-  "uploadImage": "Upload image"
+  "uploadImage": "Upload image",
+  "valuesOutOfBound": "Some of the values are out of bounds"
 }