More review changes

openmrs · Feb 14, 2024 · 7cc625c · 7cc625c
1 parent 8540c08
commit 7cc625c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
@@ -73,10 +73,9 @@ export function LabOrderForm({ initialOrder, closeWorkspace }: LabOrderFormProps
     },
   });
   const config = useConfig<ConfigObject>();
-  const selectedLabTest =
-    config && config.labTestsWithOrderReasons
-      ? config.labTestsWithOrderReasons.find((p) => p.labTestUuid === defaultValues?.testType?.conceptUuid)
-      : null;
+  const orderReasons =
+    (config.labTestsWithOrderReasons?.find((c) => c.labTestUuid === defaultValues?.testType?.conceptUuid) || {})
+      .orderReasons || [];
 
   const handleFormSubmission = useCallback(
     (data: LabOrderBasketItem) => {
@@ -194,7 +193,7 @@ export function LabOrderForm({ initialOrder, closeWorkspace }: LabOrderFormProps
               </InputWrapper>
             </Column>
           </Grid>
-          {selectedLabTest && (
+          {orderReasons.length > 0 && (
             <Grid className={styles.gridRow}>
               <Column lg={16} md={8} sm={4}>
                 <InputWrapper>
@@ -208,7 +207,7 @@ export function LabOrderForm({ initialOrder, closeWorkspace }: LabOrderFormProps
                         titleText={t('orderReason', 'Order reason')}
                         selectedItem={''}
                         itemToString={(item) => item?.label}
-                        items={selectedLabTest.orderReasons}
+                        items={orderReasons}
                         onBlur={onBlur}
                         onChange={({ selectedItem }) => onChange(selectedItem?.concept || '')}
                       />

diff --git a/packages/esm-patient-labs-app/translations/en.json b/packages/esm-patient-labs-app/translations/en.json
@@ -24,6 +24,7 @@
   "onDate": "on",
   "orderActionNew": "New",
   "ordered": "Ordered",
+  "orderReason": "Order reason",
   "other": "Other",
   "panel": "Panel",
   "pleaseRequiredFields": "Please fill all required fields",