(feat) O3-2430: User should be able to look up frequency in dropdown …

…by abbreviation (#1767) Co-authored-by: Dennis Kigen <[email protected]> Co-authored-by: Ian <[email protected]>
openmrs · May 17, 2024 · 0894ef4 · 0894ef4
1 parent eb476fe
commit 0894ef4
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 14 deletions.
diff --git a/e2e/specs/drug-orders.spec.ts b/e2e/specs/drug-orders.spec.ts
@@ -137,7 +137,25 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
   });
 
   await test.step('And I change the frequency to `Twice daily`', async () => {
-    await page.getByPlaceholder(/frequency/i).click();
+    await page.getByPlaceholder(/frequency/i).clear();
+    await page.getByText('Twice daily', { exact: true }).click();
+  });
+
+  await test.step('And I set the frequency to `q12`', async () => {
+    await page.getByPlaceholder(/frequency/i).clear();
+    await page.getByPlaceholder(/frequency/i).fill('q12');
+    await page.getByText('Every twelve hours', { exact: true }).click();
+  });
+
+  await test.step('And I set the frequency to `od`', async () => {
+    await page.getByPlaceholder(/frequency/i).clear();
+    await page.getByPlaceholder(/frequency/i).fill('od');
+    await page.getByText('Once daily', { exact: true }).click();
+  });
+
+  await test.step('And I set the frequency to `bd`', async () => {
+    await page.getByPlaceholder(/frequency/i).clear();
+    await page.getByPlaceholder(/frequency/i).fill('bd');
     await page.getByText('Twice daily', { exact: true }).click();
   });
 

diff --git a/packages/esm-patient-common-lib/src/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces.ts
@@ -1,4 +1,9 @@
-import { type DefaultWorkspaceProps, launchWorkspace, navigateAndLaunchWorkspace, usePatient } from '@openmrs/esm-framework';
+import {
+  type DefaultWorkspaceProps,
+  launchWorkspace,
+  navigateAndLaunchWorkspace,
+  usePatient,
+} from '@openmrs/esm-framework';
 import { getPatientUuidFromUrl } from './get-patient-uuid-from-url';
 import { useSystemVisitSetting } from './useSystemVisitSetting';
 import { useVisitOrOfflineVisit } from './offline/visit';

diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
@@ -304,10 +304,16 @@ export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel, prompt
     [orderConfigObject, config?.daysDurationUnit],
   );
 
-  const orderFrequencies: Array<MedicationFrequency> = useMemo(
-    () => orderConfigObject?.orderFrequencies ?? [],
-    [orderConfigObject],
-  );
+  const orderFrequencies: Array<MedicationFrequency> = useMemo(() => {
+    return orderConfigObject?.orderFrequencies ?? [];
+  }, [orderConfigObject]);
+
+  const filterItems = useCallback((menu) => {
+    if (menu?.inputValue?.length) {
+      return menu.item?.names?.some((abbr: string) => abbr.toLowerCase().includes(menu.inputValue.toLowerCase()));
+    }
+    return menu?.item?.names ?? [];
+  }, []);
 
   const [showStickyMedicationHeader, setShowMedicationHeader] = useState(false);
   const { patient, isLoading: isLoadingPatientDetails } = usePatient();
@@ -479,6 +485,7 @@ export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel, prompt
                         size={isTablet ? 'lg' : 'md'}
                         id="editFrequency"
                         items={orderFrequencies}
+                        shouldFilterItem={filterItems}
                         placeholder={t('editFrequencyComboBoxTitle', 'Frequency')}
                         titleText={t('editFrequencyComboBoxTitle', 'Frequency')}
                         itemToString={(item) => item?.value}
@@ -768,6 +775,8 @@ const ControlledFieldInput = ({
   control,
   getValues,
   handleAfterChange,
+  optionsWithAbbreviations,
+  orderFrequencies,
   ...restProps
 }: ControlledFieldInputProps) => {
   const {

diff --git a/packages/esm-patient-medications-app/src/api/order-config.ts b/packages/esm-patient-medications-app/src/api/order-config.ts
@@ -9,9 +9,16 @@ import {
   type QuantityUnit,
 } from '../types';
 
+export interface ConceptName {
+  uuid: string;
+  display: string;
+}
 export interface CommonConfigProps {
   uuid: string;
   display: string;
+  concept?: {
+    names: ConceptName[];
+  };
 }
 
 export interface OrderConfig {
@@ -37,6 +44,14 @@ export function useOrderConfig(): {
     `${restBaseUrl}/orderentryconfig`,
     openmrsFetch,
   );
+  const {
+    data: frequencyData,
+    error: frequencyError,
+    isLoading: frequencyLoading,
+  } = useSWRImmutable<{ data: OrderConfig }, Error>(
+    `${restBaseUrl}/orderentryconfig?v=custom:(uuid,display,concept:(names:(display,uuid)))`,
+    openmrsFetch,
+  );
 
   const results = useMemo(
     () => ({
@@ -57,16 +72,18 @@ export function useOrderConfig(): {
           valueCoded: uuid,
           value: display,
         })),
-        orderFrequencies: data?.data?.orderFrequencies?.map(({ uuid, display }) => ({
-          valueCoded: uuid,
-          value: display,
-        })),
+        orderFrequencies: frequencyData?.data?.orderFrequencies?.map(({ uuid, display, concept }) => {
+          return {
+            valueCoded: uuid,
+            value: display,
+            names: concept.names.map((name) => name.display),
+          };
+        }),
       },
-      isLoading,
-      error,
+      isLoading: isLoading || frequencyLoading,
+      error: error || frequencyError,
     }),
-    [data, error, isLoading],
+    [data, error, isLoading, frequencyData, frequencyError, frequencyLoading],
   );
-
   return results;
 }
diff --git a/packages/esm-patient-medications-app/src/types.ts b/packages/esm-patient-medications-app/src/types.ts
@@ -72,4 +72,5 @@ interface CommonMedicationProps {
 
 export interface CommonMedicationValueCoded extends CommonMedicationProps {
   valueCoded: string;
+  names?: string[];
 }