@openmrs/esm-dispensing-app 1.9.2-pre.916 → 1.9.2-pre.917

package/dist/openmrs-esm-dispensing-app.js.buildmanifest.json

@@ -165,7 +165,7 @@
       "auxiliaryFiles": [
         "963.js.map"
       ],
-      "hash": "68bdd3f6d3d8f00b",
+      "hash": "e2990b60a266c12b",
       "childrenByOrder": {}
     },
     {
@@ -263,9 +263,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 355516,
+      "size": 357574,
       "sizes": {
-        "javascript": 355516
+        "javascript": 357574
       },
       "names": [],
       "idHints": [],
@@ -278,7 +278,7 @@
       "auxiliaryFiles": [
         "1282.js.map"
       ],
-      "hash": "ab327744a05dd14b",
+      "hash": "9cbbd1f9410dd461",
       "childrenByOrder": {}
     },
     {
@@ -585,9 +585,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 116430,
+      "size": 113788,
       "sizes": {
-        "javascript": 116430
+        "javascript": 113788
       },
       "names": [],
       "idHints": [],
@@ -601,7 +601,7 @@
       "auxiliaryFiles": [
         "4099.js.map"
       ],
-      "hash": "87050966ab936f09",
+      "hash": "85b1f1b8aa599cea",
       "childrenByOrder": {}
     },
     {
@@ -1125,7 +1125,7 @@
       "auxiliaryFiles": [
         "6841.js.map"
       ],
-      "hash": "ce5c57e31808f71d",
+      "hash": "0b514e092eae0f75",
       "childrenByOrder": {}
     },
     {
@@ -1416,10 +1416,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 3408134,
+      "size": 3410192,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 3385239,
+        "javascript": 3387297,
         "share-init": 378,
         "runtime": 22307
       },
@@ -1436,7 +1436,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "9d1b00cea4519c55",
+      "hash": "61fedd7ee00eee3a",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"pages":[{"component":"dispensing","route":"dispensing","online":true,"offline":true}],"extensions":[{"name":"dispensing-link","slot":"app-menu-slot","component":"dispensingLink","online":true,"offline":true},{"name":"patient-diagnoses","component":"patientDiagnoses","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"dispensing-dashboard","slot":"dispensing-dashboard-slot","component":"dispensingDashboard","online":true,"offline":true},{"name":"dispensing-dashboard-link","component":"dispensingDashboardLink","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Dispensing"}},{"name":"dispense-action-button","slot":"prescription-action-button-slot","component":"dispenseActionButton"},{"name":"pause-action-button","slot":"prescription-action-button-slot","component":"pauseActionButton"},{"name":"close-action-button","slot":"prescription-action-button-slot","component":"closeActionButton"}],"workspaces":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","type":"dispense","title":"Close prescription"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","type":"dispense","title":"Pause prescription"},{"name":"dispense-workspace","component":"dispenseWorkspace","type":"dispense","title":"Dispense prescription","width":"wider"}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"}],"version":"1.9.2-pre.916"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"pages":[{"component":"dispensing","route":"dispensing","online":true,"offline":true}],"extensions":[{"name":"dispensing-link","slot":"app-menu-slot","component":"dispensingLink","online":true,"offline":true},{"name":"patient-diagnoses","component":"patientDiagnoses","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"dispensing-dashboard","slot":"dispensing-dashboard-slot","component":"dispensingDashboard","online":true,"offline":true},{"name":"dispensing-dashboard-link","component":"dispensingDashboardLink","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Dispensing"}},{"name":"dispense-action-button","slot":"prescription-action-button-slot","component":"dispenseActionButton"},{"name":"pause-action-button","slot":"prescription-action-button-slot","component":"pauseActionButton"},{"name":"close-action-button","slot":"prescription-action-button-slot","component":"closeActionButton"}],"workspaces":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","type":"dispense","title":"Close prescription"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","type":"dispense","title":"Pause prescription"},{"name":"dispense-workspace","component":"dispenseWorkspace","type":"dispense","title":"Dispense prescription","width":"wider"}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"}],"version":"1.9.2-pre.917"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-dispensing-app",
-  "version": "1.9.2-pre.916",
+  "version": "1.9.2-pre.917",
   "license": "MPL-2.0",
   "description": "Medication dispensing application",
   "browser": "dist/openmrs-esm-dispensing-app.js",

package/src/forms/dispense-form.workspace.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, Checkbox, Form, FormLabel, InlineLoading } from '@carbon/react';
 import {
@@ -62,9 +62,6 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
   // Keep track of medication dispense payload
   const [medicationDispensePayload, setMedicationDispensePayload] = useState<MedicationDispense>();
 
-  // whether or not the form is valid and ready to submit
-  const [isValid, setIsValid] = useState(false);
-
   // to prevent duplicate submits
   const [isSubmitting, setIsSubmitting] = useState(false);
 
@@ -175,8 +172,16 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
     }
   };
 
-  const checkIsValid = () => {
-    if (
+  const updateMedicationDispense = useCallback((medicationDispenseUpdate: Partial<MedicationDispense>) => {
+    setMedicationDispensePayload((prevState) => ({
+      ...prevState,
+      ...medicationDispenseUpdate,
+    }));
+  }, []);
+
+  // whether or not the form is valid and ready to submit
+  const isValid = useMemo(() => {
+    return (
       medicationDispensePayload &&
       medicationDispensePayload.performer &&
       medicationDispensePayload.performer[0]?.actor.reference &&
@@ -190,19 +195,12 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
       (!medicationDispensePayload.substitution.wasSubstituted ||
         (medicationDispensePayload.substitution.reason[0]?.coding[0].code &&
           medicationDispensePayload.substitution.type?.coding[0].code))
-    ) {
-      setIsValid(true);
-    } else {
-      setIsValid(false);
-    }
-  };
+    );
+  }, [medicationDispensePayload, quantityRemaining]);
 
   // initialize the internal dispense payload with the dispenses passed in as props
   useEffect(() => setMedicationDispensePayload(medicationDispense), [medicationDispense]);
 
-  // check is valid on any changes
-  useEffect(checkIsValid, [medicationDispensePayload, quantityRemaining, inventoryItem]);
-
   const isButtonDisabled = (config.enableStockDispense ? !inventoryItem : false) || !isValid || isSubmitting;
 
   const bannerState = useMemo(() => {
@@ -240,7 +238,7 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
             <div>
               <MedicationDispenseReview
                 medicationDispense={medicationDispensePayload}
-                updateMedicationDispense={setMedicationDispensePayload}
+                updateMedicationDispense={updateMedicationDispense}
                 quantityRemaining={quantityRemaining}
                 quantityDispensed={quantityDispensed}
               />

package/src/forms/medication-dispense-review.component.tsx

@@ -7,6 +7,7 @@ import { getConceptCodingUuid, getMedicationReferenceOrCodeableConcept, getOpenM
 import { useMedicationCodeableConcept, useMedicationFormulations } from '../medication/medication.resource';
 import { useMedicationRequest, usePrescriptionDetails } from '../medication-request/medication-request.resource';
 import {
+  blankSubstitution,
   useOrderConfig,
   useProviders,
   useSubstitutionReasonValueSet,
@@ -20,7 +21,7 @@ import styles from '../components/medication-dispense-review.scss';
 
 interface MedicationDispenseReviewProps {
   medicationDispense: MedicationDispense;
-  updateMedicationDispense: Function;
+  updateMedicationDispense(updates: Partial<MedicationDispense>);
   quantityRemaining: number;
   quantityDispensed: number;
 }
@@ -35,15 +36,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
   const config = useConfig<PharmacyConfig>();
   const session = useSession();
   const [isEditingFormulation, setIsEditingFormulation] = useState(false);
-  const [isSubstitution, setIsSubstitution] = useState(false);
-  // Dosing Unit eg Tablets
-  const [drugDosingUnits, setDrugDosingUnits] = useState([]);
-  // Dispensing Unit eg Tablets
-  const [drugDispensingUnits, setDrugDispensingUnits] = useState([]);
-  // Route eg Oral
-  const [drugRoutes, setDrugRoutes] = useState([]);
-  // Frequency eg Twice daily
-  const [orderFrequencies, setOrderFrequencies] = useState([]);
   // type of substitution question
   const [substitutionTypes, setSubstitutionTypes] = useState([]);
   // reason for substitution question
@@ -72,41 +64,21 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
   // we fetch this just to get the prescription date
   const { prescriptionDate } = usePrescriptionDetails(medicationRequest ? medicationRequest.encounter.reference : null);
 
-  useEffect(() => {
+  const { drugRoutes, drugDosingUnits, drugDispensingUnits, orderFrequencies } = useMemo(() => {
     if (orderConfigObject) {
-      // sync drug route options order config
-      const availableRoutes = drugRoutes.map((x) => x.id);
-      const otherRouteOptions = [];
-      orderConfigObject.drugRoutes.forEach(
-        (x) => availableRoutes.includes(x.uuid) || otherRouteOptions.push({ id: x.uuid, text: x.display }),
-      );
-      setDrugRoutes([...drugRoutes, ...otherRouteOptions]);
-
-      // sync dosage.unit options with what's defined in the order config
-      const availableDosingUnits = drugDosingUnits.map((x) => x.id);
-      const otherDosingUnits = [];
-      orderConfigObject.drugDosingUnits.forEach(
-        (x) => availableDosingUnits.includes(x.uuid) || otherDosingUnits.push({ id: x.uuid, text: x.display }),
-      );
-      setDrugDosingUnits([...drugDosingUnits, ...otherDosingUnits]);
-
-      // sync dispensing unit options with what's defined in the order config
-      const availableDispensingUnits = drugDispensingUnits.map((x) => x.id);
-      const otherDispensingUnits = [];
-      orderConfigObject.drugDispensingUnits.forEach(
-        (x) => availableDispensingUnits.includes(x.uuid) || otherDispensingUnits.push({ id: x.uuid, text: x.display }),
-      );
-      setDrugDispensingUnits([...drugDispensingUnits, ...otherDispensingUnits]);
-
-      // sync order frequency options with order config
-      const availableFrequencies = orderFrequencies.map((x) => x.id);
-      const otherFrequencyOptions = [];
-      orderConfigObject.orderFrequencies.forEach(
-        (x) => availableFrequencies.includes(x.uuid) || otherFrequencyOptions.push({ id: x.uuid, text: x.display }),
-      );
-      setOrderFrequencies([...orderFrequencies, ...otherFrequencyOptions]);
+      // Dosing Unit eg Tablets
+      const drugRoutes = orderConfigObject.drugRoutes.map((x) => ({ id: x.uuid, text: x.display }));
+      // Dispensing Unit eg Tablets
+      const drugDosingUnits = orderConfigObject.drugDosingUnits.map((x) => ({ id: x.uuid, text: x.display }));
+      // Route eg Oral
+      const drugDispensingUnits = orderConfigObject.drugDispensingUnits.map((x) => ({ id: x.uuid, text: x.display }));
+      // Frequency eg Twice daily
+      const orderFrequencies = orderConfigObject.orderFrequencies.map((x) => ({ id: x.uuid, text: x.display }));
+      return { drugRoutes, drugDosingUnits, drugDispensingUnits, orderFrequencies };
+    } else {
+      return { drugRoutes: [], drugDosingUnits: [], drugDispensingUnits: [], orderFrequencies: [] };
     }
-  }, [drugDispensingUnits, drugDosingUnits, drugRoutes, orderConfigObject, orderFrequencies]);
+  }, [orderConfigObject]);
 
   useEffect(() => {
     const substitutionTypeOptions = [];
@@ -164,36 +136,25 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
   );
 
   // check to see if the current dispense would be a substitution, and update accordingly
+  const isSubstitution =
+    medicationRequest?.medicationReference?.reference &&
+    medicationDispense?.medicationReference?.reference &&
+    medicationRequest.medicationReference.reference != medicationDispense.medicationReference.reference;
+
+  const { substitution } = medicationDispense;
   useEffect(() => {
-    if (
-      medicationRequest?.medicationReference?.reference &&
-      medicationDispense?.medicationReference?.reference &&
-      medicationRequest.medicationReference.reference != medicationDispense.medicationReference.reference
-    ) {
-      setIsSubstitution(true);
-      updateMedicationDispense({
-        ...medicationDispense,
-        substitution: {
-          ...medicationDispense.substitution,
-          wasSubstituted: true,
-        },
-      });
+    if (isSubstitution) {
+      // make sure that the value substitution.wasSubstituted exists and is truthy
+      if (!substitution.wasSubstituted) {
+        const newSubstitution = { ...substitution, wasSubstituted: true };
+        updateMedicationDispense({ substitution: newSubstitution });
+      }
     } else {
-      setIsSubstitution(false);
-      updateMedicationDispense({
-        ...medicationDispense,
-        substitution: {
-          wasSubstituted: false,
-          reason: [
-            {
-              coding: [{ code: null }],
-            },
-          ],
-          type: { coding: [{ code: null }] },
-        },
-      });
+      if (substitution != blankSubstitution) {
+        updateMedicationDispense({ substitution: blankSubstitution });
+      }
     }
-  }, [medicationDispense, medicationRequest, updateMedicationDispense]);
+  }, [isSubstitution, substitution, updateMedicationDispense]);
 
   useEffect(() => {
     setUserCanModify(session?.user && userHasAccess(PRIVILEGE_CREATE_DISPENSE_MODIFY_DETAILS, session.user));
@@ -211,11 +172,9 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
           }
         : undefined;
   }, [medicationDispense?.performer, providers, session?.currentProvider?.uuid, session?.user?.person?.display]);
-
   useEffect(() => {
     if (initialDispenser?.uuid) {
       updateMedicationDispense({
-        ...medicationDispense,
         performer: [
           {
             actor: {
@@ -225,7 +184,7 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
         ],
       });
     }
-  }, [initialDispenser, medicationDispense, updateMedicationDispense]);
+  }, [initialDispenser, updateMedicationDispense]);
 
   return (
     <div className={styles.medicationDispenseReviewContainer}>
@@ -251,7 +210,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
               onChange={({ selectedItem }) => {
                 const typedItem = selectedItem as Medication;
                 updateMedicationDispense({
-                  ...medicationDispense,
                   medicationCodeableConcept: undefined,
                   medicationReference: {
                     reference: 'Medication/' + typedItem?.id,
@@ -279,7 +237,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
                 }}
                 onChange={({ selectedItem }) => {
                   updateMedicationDispense({
-                    ...medicationDispense,
                     substitution: {
                       ...medicationDispense.substitution,
                       type: {
@@ -312,7 +269,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
                 }}
                 onChange={({ selectedItem }) => {
                   updateMedicationDispense({
-                    ...medicationDispense,
                     substitution: {
                       ...medicationDispense.substitution,
                       reason: [
@@ -362,10 +318,9 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
             max={config.dispenseBehavior.restrictTotalQuantityDispensed ? quantityRemaining : undefined}
             onChange={(event, state) => {
               updateMedicationDispense({
-                ...medicationDispense,
                 quantity: {
                   ...medicationDispense.quantity,
-                  value: state.value ? parseFloat(state.value.toString()) : '',
+                  value: state.value ? parseFloat(state.value.toString()) : 0,
                 },
               });
             }}
@@ -383,7 +338,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
               }}
               onChange={({ selectedItem }) => {
                 updateMedicationDispense({
-                  ...medicationDispense,
                   // note that we specifically recreate doseQuantity to overwrite any unit or system properties that may have been set
                   quantity: {
                     value: medicationDispense.quantity.value,
@@ -408,7 +362,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
             value={medicationDispense.dosageInstruction[0].doseAndRate[0].doseQuantity.value}
             onChange={(event, state) => {
               updateMedicationDispense({
-                ...medicationDispense,
                 dosageInstruction: [
                   {
                     ...medicationDispense.dosageInstruction[0],
@@ -417,7 +370,7 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
                         ...medicationDispense.dosageInstruction[0].doseAndRate[0],
                         doseQuantity: {
                           ...medicationDispense.dosageInstruction[0].doseAndRate[0].doseQuantity,
-                          value: state.value ? parseFloat(state.value.toString()) : '',
+                          value: state.value ? parseFloat(state.value.toString()) : 0,
                         },
                       },
                     ],
@@ -440,7 +393,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
               }}
               onChange={({ selectedItem }) => {
                 updateMedicationDispense({
-                  ...medicationDispense,
                   dosageInstruction: [
                     {
                       ...medicationDispense.dosageInstruction[0],
@@ -474,7 +426,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
               itemToString={(item) => item?.text}
               onChange={({ selectedItem }) => {
                 updateMedicationDispense({
-                  ...medicationDispense,
                   dosageInstruction: [
                     {
                       ...medicationDispense.dosageInstruction[0],
@@ -507,7 +458,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
             itemToString={(item) => item?.text}
             onChange={({ selectedItem }) => {
               updateMedicationDispense({
-                ...medicationDispense,
                 dosageInstruction: [
                   {
                     ...medicationDispense.dosageInstruction[0],
@@ -535,7 +485,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
           maxLength={65535}
           onChange={(e) => {
             updateMedicationDispense({
-              ...medicationDispense,
               dosageInstruction: [
                 {
                   ...medicationDispense.dosageInstruction[0],
@@ -555,7 +504,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
             const currentDate = medicationDispense.whenHandedOver ? dayjs(medicationDispense.whenHandedOver) : null;
             const selectedDate = dayjs(input);
             updateMedicationDispense({
-              ...medicationDispense,
               whenHandedOver: currentDate?.isSame(selectedDate, 'day')
                 ? currentDate.toISOString()
                 : selectedDate.toISOString(), // to preserve any time component, only update if the day actually changes
@@ -570,7 +518,6 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({
               initialSelectedItem={initialDispenser}
               onChange={({ selectedItem }) => {
                 updateMedicationDispense({
-                  ...medicationDispense,
                   performer: [
                     {
                       actor: {

package/src/forms/medication-dispense-review.test.tsx

@@ -126,7 +126,7 @@ describe('Medication Dispense Review Component tests', () => {
       },
     };
 
-    const mockUpdate: Function = jest.fn();
+    const mockUpdate = jest.fn();
     render(
       <MedicationDispenseReview
         medicationDispense={medicationDispense}

package/src/medication-dispense/medication-dispense.resource.tsx

@@ -166,16 +166,18 @@ export function initiateMedicationDispenseBody(
               ],
         },
       ],
-      substitution: {
-        wasSubstituted: false,
-        reason: [
-          {
-            coding: [{ code: null }],
-          },
-        ],
-        type: { coding: [{ code: null }] },
-      },
+      substitution: blankSubstitution,
     };
   }
   return medicationDispense;
 }
+
+export const blankSubstitution = {
+  wasSubstituted: false,
+  reason: [
+    {
+      coding: [{ code: null }],
+    },
+  ],
+  type: { coding: [{ code: null }] },
+};

package/src/medication-request/medication-request.resource.test.tsx

@@ -13,6 +13,10 @@ import { JSON_MERGE_PATH_MIME_TYPE, OPENMRS_FHIR_EXT_REQUEST_FULFILLER_STATUS }
 
 jest.mocked(openmrsFetch);
 jest.mock('swr');
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useMemo: jest.fn((fn) => fn()),
+}));
 
 describe('Medication Request Resource Test', () => {
   test('usePrescriptionsTable should call active endpoint and proper date based on expiration period if status parameter is active', () => {

package/src/medication-request/medication-request.resource.tsx

@@ -23,6 +23,7 @@ import {
 } from '../utils';
 import dayjs from 'dayjs';
 import { JSON_MERGE_PATH_MIME_TYPE, OPENMRS_FHIR_EXT_REQUEST_FULFILLER_STATUS } from '../constants';
+import { useMemo } from 'react';
 
 export function usePrescriptionsTable(
   loadData: boolean,
@@ -127,54 +128,53 @@ function buildPrescriptionsTableRow(
 }
 
 export function usePrescriptionDetails(encounterUuid: string, refreshInterval = null) {
-  const medicationRequestBundles: Array<MedicationRequestBundle> = [];
-  let prescriptionDate: Date;
-  let isLoading = true;
-
-  const { data, error } = useSWR<{ data: MedicationRequestResponse }, Error>(
+  const { data, ...rest } = useSWR<{ data: MedicationRequestResponse }, Error>(
     getPrescriptionDetailsEndpoint(encounterUuid),
     openmrsFetch,
     { refreshInterval: refreshInterval },
   );
 
-  if (data) {
-    const results = data?.data.entry;
-
-    const encounter = results
-      ?.filter((entry) => entry?.resource?.resourceType == 'Encounter')
-      .map((entry) => entry.resource as Encounter);
-
-    if (encounter) {
-      // by definition of the request (search by encounter) there should be one and only one encounter
-      prescriptionDate = parseDate(encounter[0]?.period.start);
+  const { medicationRequestBundles, prescriptionDate } = useMemo(() => {
+    const medicationRequestBundles: Array<MedicationRequestBundle> = [];
+    let prescriptionDate: Date;
+    if (data) {
+      const results = data?.data.entry;
 
-      const medicationRequests = results
-        ?.filter((entry) => entry?.resource?.resourceType == 'MedicationRequest')
-        .map((entry) => entry.resource as MedicationRequest);
-
-      const medicationDispenses = results
-        ?.filter((entry) => entry?.resource?.resourceType == 'MedicationDispense')
-        .map((entry) => entry.resource as MedicationDispense)
-        .sort(sortMedicationDispensesByWhenHandedOver);
+      const encounter = results
+        ?.filter((entry) => entry?.resource?.resourceType == 'Encounter')
+        .map((entry) => entry.resource as Encounter);
 
-      medicationRequests.every((medicationRequest) =>
-        medicationRequestBundles.push({
-          request: medicationRequest,
-          dispenses: getAssociatedMedicationDispenses(medicationRequest, medicationDispenses).sort(
-            sortMedicationDispensesByWhenHandedOver,
-          ),
-        }),
-      );
+      if (encounter) {
+        // by definition of the request (search by encounter) there should be one and only one encounter
+        prescriptionDate = parseDate(encounter[0]?.period.start);
+
+        const medicationRequests = results
+          ?.filter((entry) => entry?.resource?.resourceType == 'MedicationRequest')
+          .map((entry) => entry.resource as MedicationRequest);
+
+        const medicationDispenses = results
+          ?.filter((entry) => entry?.resource?.resourceType == 'MedicationDispense')
+          .map((entry) => entry.resource as MedicationDispense)
+          .sort(sortMedicationDispensesByWhenHandedOver);
+
+        medicationRequests.every((medicationRequest) =>
+          medicationRequestBundles.push({
+            request: medicationRequest,
+            dispenses: getAssociatedMedicationDispenses(medicationRequest, medicationDispenses).sort(
+              sortMedicationDispensesByWhenHandedOver,
+            ),
+          }),
+        );
+      }
     }
-  }
 
-  isLoading = (!medicationRequestBundles || medicationRequestBundles.length == 0) && !error;
+    return { medicationRequestBundles, prescriptionDate };
+  }, [data]);
 
   return {
     medicationRequestBundles,
     prescriptionDate,
-    error,
-    isLoading,
+    ...rest,
   };
 }
 

package/src/types.ts

@@ -451,7 +451,7 @@ export interface PrescriptionsTableRow {
 
 export interface Quantity {
   value: number;
-  unit: string;
+  unit?: string;
   code: string;
   system?: string;
 }

package/.turbo/cache/73ee20738420f8cc-meta.json

@@ -1 +0,0 @@
-{"hash":"73ee20738420f8cc","duration":44568}