@openmrs/esm-patient-vitals-app 9.2.3-pre.7474 → 9.2.3-pre.7484

package/src/vitals-biometrics-form/vitals-biometrics-form.workspace.tsx

@@ -15,14 +15,13 @@ import {
 } from '@carbon/react';
 import {
   age,
-  createErrorHandler,
+  ExtensionSlot,
   showSnackbar,
+  useAbortController,
   useConfig,
   useLayoutType,
   useSession,
-  ExtensionSlot,
   useVisit,
-  useAbortController,
 } from '@openmrs/esm-framework';
 import { type DefaultPatientWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 import { type ConfigObject } from '../config-schema';
@@ -34,14 +33,15 @@ import {
 } from './vitals-biometrics-form.utils';
 import {
   assessValue,
+  createOrUpdateVitalsAndBiometrics,
   getReferenceRangesForConcept,
   interpretBloodPressure,
   invalidateCachedVitalsAndBiometrics,
-  useVitalsConceptMetadata,
-  createOrUpdateVitalsAndBiometrics,
+  useConceptUnits,
   useEncounterVitalsAndBiometrics,
 } from '../common';
 import { prepareObsForSubmission } from '../common/helpers';
+import { useVitalsConceptMetadata } from '../common/data.resource';
 import { VitalsAndBiometricsFormSchema, type VitalsBiometricsFormData } from './schema';
 import VitalsAndBiometricsInput from './vitals-biometrics-input.component';
 import styles from './vitals-biometrics-form.scss';
@@ -68,12 +68,8 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
 
   const session = useSession();
   const { currentVisit } = useVisit(patientUuid);
-  const {
-    data: conceptUnits,
-    conceptMetadata,
-    conceptRanges,
-    isLoading: isLoadingConceptMetadata,
-  } = useVitalsConceptMetadata();
+  const { conceptUnits, isLoading: isLoadingConceptUnits } = useConceptUnits();
+  const { conceptRanges, conceptRangeMap } = useVitalsConceptMetadata(patientUuid);
   const {
     getRefinedInitialValues,
     isLoading: isLoadingEncounter,
@@ -153,28 +149,17 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
 
   const concepts = useMemo(
     () => ({
-      midUpperArmCircumferenceRange: conceptRanges.get(config.concepts.midUpperArmCircumferenceUuid),
-      diastolicBloodPressureRange: conceptRanges.get(config.concepts.diastolicBloodPressureUuid),
-      systolicBloodPressureRange: conceptRanges.get(config.concepts.systolicBloodPressureUuid),
-      oxygenSaturationRange: conceptRanges.get(config.concepts.oxygenSaturationUuid),
-      respiratoryRateRange: conceptRanges.get(config.concepts.respiratoryRateUuid),
-      temperatureRange: conceptRanges.get(config.concepts.temperatureUuid),
-      weightRange: conceptRanges.get(config.concepts.weightUuid),
-      heightRange: conceptRanges.get(config.concepts.heightUuid),
-      pulseRange: conceptRanges.get(config.concepts.pulseUuid),
+      midUpperArmCircumferenceRange: conceptRangeMap.get(config.concepts.midUpperArmCircumferenceUuid),
+      diastolicBloodPressureRange: conceptRangeMap.get(config.concepts.diastolicBloodPressureUuid),
+      systolicBloodPressureRange: conceptRangeMap.get(config.concepts.systolicBloodPressureUuid),
+      oxygenSaturationRange: conceptRangeMap.get(config.concepts.oxygenSaturationUuid),
+      respiratoryRateRange: conceptRangeMap.get(config.concepts.respiratoryRateUuid),
+      temperatureRange: conceptRangeMap.get(config.concepts.temperatureUuid),
+      weightRange: conceptRangeMap.get(config.concepts.weightUuid),
+      heightRange: conceptRangeMap.get(config.concepts.heightUuid),
+      pulseRange: conceptRangeMap.get(config.concepts.pulseUuid),
     }),
-    [
-      conceptRanges,
-      config.concepts.diastolicBloodPressureUuid,
-      config.concepts.heightUuid,
-      config.concepts.midUpperArmCircumferenceUuid,
-      config.concepts.oxygenSaturationUuid,
-      config.concepts.pulseUuid,
-      config.concepts.respiratoryRateUuid,
-      config.concepts.systolicBloodPressureUuid,
-      config.concepts.temperatureUuid,
-      config.concepts.weightUuid,
-    ],
+    [conceptRangeMap, config.concepts],
   );
 
   const savePatientVitalsAndBiometrics = useCallback(
@@ -187,7 +172,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
 
       const allFieldsAreValid = Object.entries(formData)
         .filter(([, value]) => Boolean(value))
-        .every(([key, value]) => isValueWithinReferenceRange(conceptMetadata, config.concepts[`${key}Uuid`], value));
+        .every(([key, value]) => isValueWithinReferenceRange(conceptRanges, config.concepts[`${key}Uuid`], value));
 
       if (allFieldsAreValid) {
         setShowErrorMessage(false);
@@ -224,7 +209,6 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
             });
           })
           .catch(() => {
-            createErrorHandler();
             showSnackbar({
               title:
                 formContext === 'creating'
@@ -241,17 +225,17 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
     },
     [
       abortController,
-      conceptMetadata,
+      closeWorkspaceWithSavedChanges,
       config.concepts,
       config.vitals.encounterTypeUuid,
       dirtyFields,
       editEncounterUuid,
+      conceptRanges,
       formContext,
       initialFieldValuesMap,
+      mutateEncounter,
       patientUuid,
       session?.sessionLocation?.uuid,
-      closeWorkspaceWithSavedChanges,
-      mutateEncounter,
       t,
     ],
   );
@@ -274,7 +258,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
     );
   }
 
-  if (isLoadingConceptMetadata || isLoadingInitialValues) {
+  if (isLoadingConceptUnits || isLoadingInitialValues) {
     return (
       <Form className={styles.form}>
         <ExtensionSlot name="visit-context-header-slot" state={{ patientUuid }} />
@@ -322,7 +306,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                 fieldProperties={[
                   {
                     id: 'temperature',
-                    max: concepts.temperatureRange?.highAbsolute,
+                    max: concepts.temperatureRange?.hiAbsolute,
                     min: concepts.temperatureRange?.lowAbsolute,
                     name: t('temperature', 'Temperature'),
                     type: 'number',
@@ -330,14 +314,11 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                 ]}
                 interpretation={
                   temperature &&
-                  assessValue(
-                    temperature,
-                    getReferenceRangesForConcept(config.concepts.temperatureUuid, conceptMetadata),
-                  )
+                  assessValue(temperature, getReferenceRangesForConcept(config.concepts.temperatureUuid, conceptRanges))
                 }
                 isValueWithinReferenceRange={
                   temperature
-                    ? isValueWithinReferenceRange(conceptMetadata, config.concepts['temperatureUuid'], temperature)
+                    ? isValueWithinReferenceRange(conceptRanges, config.concepts['temperatureUuid'], temperature)
                     : true
                 }
                 showErrorMessage={showErrorMessage}
@@ -354,37 +335,32 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     separator: '/',
                     type: 'number',
                     min: concepts.systolicBloodPressureRange?.lowAbsolute,
-                    max: concepts.systolicBloodPressureRange?.highAbsolute,
+                    max: concepts.systolicBloodPressureRange?.hiAbsolute,
                     id: 'systolicBloodPressure',
                   },
                   {
                     name: t('diastolic', 'diastolic'),
                     type: 'number',
                     min: concepts.diastolicBloodPressureRange?.lowAbsolute,
-                    max: concepts.diastolicBloodPressureRange?.highAbsolute,
+                    max: concepts.diastolicBloodPressureRange?.hiAbsolute,
                     id: 'diastolicBloodPressure',
                   },
                 ]}
                 interpretation={
                   systolicBloodPressure &&
                   diastolicBloodPressure &&
-                  interpretBloodPressure(
-                    systolicBloodPressure,
-                    diastolicBloodPressure,
-                    config.concepts,
-                    conceptMetadata,
-                  )
+                  interpretBloodPressure(systolicBloodPressure, diastolicBloodPressure, config.concepts, conceptRanges)
                 }
                 isValueWithinReferenceRange={
                   systolicBloodPressure &&
                   diastolicBloodPressure &&
                   isValueWithinReferenceRange(
-                    conceptMetadata,
+                    conceptRanges,
                     config.concepts.systolicBloodPressureUuid,
                     systolicBloodPressure,
                   ) &&
                   isValueWithinReferenceRange(
-                    conceptMetadata,
+                    conceptRanges,
                     config.concepts.diastolicBloodPressureUuid,
                     diastolicBloodPressure,
                   )
@@ -402,15 +378,15 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     name: t('pulse', 'Pulse'),
                     type: 'number',
                     min: concepts.pulseRange?.lowAbsolute,
-                    max: concepts.pulseRange?.highAbsolute,
+                    max: concepts.pulseRange?.hiAbsolute,
                     id: 'pulse',
                   },
                 ]}
                 interpretation={
-                  pulse && assessValue(pulse, getReferenceRangesForConcept(config.concepts.pulseUuid, conceptMetadata))
+                  pulse && assessValue(pulse, getReferenceRangesForConcept(config.concepts.pulseUuid, conceptRanges))
                 }
                 isValueWithinReferenceRange={
-                  pulse && isValueWithinReferenceRange(conceptMetadata, config.concepts['pulseUuid'], pulse)
+                  pulse && isValueWithinReferenceRange(conceptRanges, config.concepts['pulseUuid'], pulse)
                 }
                 label={t('heartRate', 'Heart rate')}
                 showErrorMessage={showErrorMessage}
@@ -425,7 +401,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     name: t('respirationRate', 'Respiration rate'),
                     type: 'number',
                     min: concepts.respiratoryRateRange?.lowAbsolute,
-                    max: concepts.respiratoryRateRange?.highAbsolute,
+                    max: concepts.respiratoryRateRange?.hiAbsolute,
                     id: 'respiratoryRate',
                   },
                 ]}
@@ -433,12 +409,12 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                   respiratoryRate &&
                   assessValue(
                     respiratoryRate,
-                    getReferenceRangesForConcept(config.concepts.respiratoryRateUuid, conceptMetadata),
+                    getReferenceRangesForConcept(config.concepts.respiratoryRateUuid, conceptRanges),
                   )
                 }
                 isValueWithinReferenceRange={
                   respiratoryRate &&
-                  isValueWithinReferenceRange(conceptMetadata, config.concepts['respiratoryRateUuid'], respiratoryRate)
+                  isValueWithinReferenceRange(conceptRanges, config.concepts['respiratoryRateUuid'], respiratoryRate)
                 }
                 showErrorMessage={showErrorMessage}
                 label={t('respirationRate', 'Respiration rate')}
@@ -453,7 +429,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     name: t('oxygenSaturation', 'Oxygen saturation'),
                     type: 'number',
                     min: concepts.oxygenSaturationRange?.lowAbsolute,
-                    max: concepts.oxygenSaturationRange?.highAbsolute,
+                    max: concepts.oxygenSaturationRange?.hiAbsolute,
                     id: 'oxygenSaturation',
                   },
                 ]}
@@ -461,16 +437,12 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                   oxygenSaturation &&
                   assessValue(
                     oxygenSaturation,
-                    getReferenceRangesForConcept(config.concepts.oxygenSaturationUuid, conceptMetadata),
+                    getReferenceRangesForConcept(config.concepts.oxygenSaturationUuid, conceptRanges),
                   )
                 }
                 isValueWithinReferenceRange={
                   oxygenSaturation &&
-                  isValueWithinReferenceRange(
-                    conceptMetadata,
-                    config.concepts['oxygenSaturationUuid'],
-                    oxygenSaturation,
-                  )
+                  isValueWithinReferenceRange(conceptRanges, config.concepts['oxygenSaturationUuid'], oxygenSaturation)
                 }
                 showErrorMessage={showErrorMessage}
                 label={t('spo2', 'SpO2')}
@@ -510,16 +482,15 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     name: t('weight', 'Weight'),
                     type: 'number',
                     min: concepts.weightRange?.lowAbsolute,
-                    max: concepts.weightRange?.highAbsolute,
+                    max: concepts.weightRange?.hiAbsolute,
                     id: 'weight',
                   },
                 ]}
                 interpretation={
-                  weight &&
-                  assessValue(weight, getReferenceRangesForConcept(config.concepts.weightUuid, conceptMetadata))
+                  weight && assessValue(weight, getReferenceRangesForConcept(config.concepts.weightUuid, conceptRanges))
                 }
                 isValueWithinReferenceRange={
-                  height && isValueWithinReferenceRange(conceptMetadata, config.concepts['weightUuid'], weight)
+                  height && isValueWithinReferenceRange(conceptRanges, config.concepts['weightUuid'], weight)
                 }
                 showErrorMessage={showErrorMessage}
                 label={t('weight', 'Weight')}
@@ -534,16 +505,15 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     name: t('height', 'Height'),
                     type: 'number',
                     min: concepts.heightRange?.lowAbsolute,
-                    max: concepts.heightRange?.highAbsolute,
+                    max: concepts.heightRange?.hiAbsolute,
                     id: 'height',
                   },
                 ]}
                 interpretation={
-                  height &&
-                  assessValue(height, getReferenceRangesForConcept(config.concepts.heightUuid, conceptMetadata))
+                  height && assessValue(height, getReferenceRangesForConcept(config.concepts.heightUuid, conceptRanges))
                 }
                 isValueWithinReferenceRange={
-                  weight && isValueWithinReferenceRange(conceptMetadata, config.concepts['heightUuid'], height)
+                  weight && isValueWithinReferenceRange(conceptRanges, config.concepts['heightUuid'], height)
                 }
                 showErrorMessage={showErrorMessage}
                 label={t('height', 'Height')}
@@ -573,7 +543,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                     name: t('muac', 'MUAC'),
                     type: 'number',
                     min: concepts.midUpperArmCircumferenceRange?.lowAbsolute,
-                    max: concepts.midUpperArmCircumferenceRange?.highAbsolute,
+                    max: concepts.midUpperArmCircumferenceRange?.hiAbsolute,
                     id: 'midUpperArmCircumference',
                   },
                 ]}
@@ -582,7 +552,7 @@ const VitalsAndBiometricsForm: React.FC<VitalsAndBiometricsFormProps> = ({
                   height &&
                   weight &&
                   isValueWithinReferenceRange(
-                    conceptMetadata,
+                    conceptRanges,
                     config.concepts['midUpperArmCircumferenceUuid'],
                     midUpperArmCircumference,
                   )

package/src/vitals-biometrics-form/vitals-biometrics-input.test.tsx

@@ -91,7 +91,7 @@ jest.mock('../common', () => {
   return {
     ...originalModule,
     launchPatientWorkspace: jest.fn(),
-    useVitalsConceptMetadata: jest.fn().mockImplementation(() => ({
+    useConceptUnits: jest.fn().mockImplementation(() => ({
       data: mockConceptUnits,
       conceptMetadata: { ...overridenMetadata },
       isLoading: false,