@openmrs/esm-dispensing-app 1.11.2-pre.1811 → 1.11.2-pre.1814

package/.turbo/cache/b639f8894500c9f3-meta.json

@@ -0,0 +1 @@
+{"hash":"b639f8894500c9f3","duration":11866}

package/.turbo/turbo-build.log

@@ -12,4 +12,4 @@
   │       main.js
 
 
-Rspack compiled with 2 warnings in 10.23 s
+Rspack compiled with 2 warnings in 9.63 s

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0 <4.0.0"},"optionalBackendDependencies":{"emrapi":{"version":">=3.3.0 <4.0.0","feature":{"flagName":"emrapi-module","label":"EMR API Module","description":"Required if the locationBehavior.restrictToVisitLocationDescendants config is set to true."}}},"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"}],"workspaces2":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","window":"dispensing-window"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","window":"dispensing-window"},{"name":"dispense-workspace","component":"dispenseWorkspace","window":"dispensing-window"},{"name":"dispensing-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"fill-prescription-window"},{"name":"dispensing-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"fill-prescription-window"},{"name":"dispensing-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"fill-prescription-window"},{"name":"dispensing-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"fill-prescription-window"},{"name":"dispensing-order-basket-add-allergy-workspace","component":"@openmrs/esm-patient-allergies-app#exportedAllergyFormWorkspace","window":"fill-prescription-window"}],"workspaceWindows2":[{"name":"dispensing-window","group":"dispensing-group"},{"name":"fill-prescription-window","group":"dispensing-group"}],"workspaceGroups2":[{"name":"dispensing-group","overlay":true}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"},{"name":"duplicate-dispense-modal","component":"duplicateDispenseModal"},{"name":"on-prescription-filled-modal","component":"onPrescriptionFilledModal"}],"version":"1.11.2-pre.1811"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0 <4.0.0"},"optionalBackendDependencies":{"emrapi":{"version":">=3.3.0 <4.0.0","feature":{"flagName":"emrapi-module","label":"EMR API Module","description":"Required if the locationBehavior.restrictToVisitLocationDescendants config is set to true."}}},"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"}],"workspaces2":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","window":"dispensing-window"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","window":"dispensing-window"},{"name":"dispense-workspace","component":"dispenseWorkspace","window":"dispensing-window"},{"name":"dispensing-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"fill-prescription-window"},{"name":"dispensing-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"fill-prescription-window"},{"name":"dispensing-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"fill-prescription-window"},{"name":"dispensing-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"fill-prescription-window"},{"name":"dispensing-order-basket-add-allergy-workspace","component":"@openmrs/esm-patient-allergies-app#exportedAllergyFormWorkspace","window":"fill-prescription-window"}],"workspaceWindows2":[{"name":"dispensing-window","group":"dispensing-group"},{"name":"fill-prescription-window","group":"dispensing-group"}],"workspaceGroups2":[{"name":"dispensing-group","overlay":true}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"},{"name":"duplicate-dispense-modal","component":"duplicateDispenseModal"},{"name":"on-prescription-filled-modal","component":"onPrescriptionFilledModal"}],"version":"1.11.2-pre.1814"}

package/e2e/commands/index.ts

@@ -1,5 +1,6 @@
 export * from './drug-order-operations';
 export * from './encounter-operations';
+export * from './medication-dispense-operations';
 export * from './patient-operations';
 export * from './provider-operations';
 export * from './visit-operations';

package/e2e/commands/medication-dispense-operations.ts

@@ -0,0 +1,98 @@
+import dayjs from 'dayjs';
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Patient } from './patient-operations';
+import { type Provider } from './types';
+import { type MedicationDispense, MedicationDispenseStatus } from '../../src/types';
+
+export const generateMedicationDispense = async (
+  fhirApi: APIRequestContext,
+  patient: Patient,
+  provider: Provider,
+  medicationRequestUuid: string,
+): Promise<MedicationDispense> => {
+  const dispense = await fhirApi.post('MedicationDispense', {
+    data: {
+      resourceType: 'MedicationDispense',
+      status: MedicationDispenseStatus.completed,
+      authorizingPrescription: [
+        {
+          reference: `MedicationRequest/${medicationRequestUuid}`,
+          type: 'MedicationRequest',
+        },
+      ],
+      medicationReference: {
+        reference: 'Medication/09e58895-e7f0-4649-b7c0-e665c5c08e93',
+        type: 'Medication',
+        display: 'Aspirin 81mg',
+      },
+      subject: {
+        reference: `Patient/${patient.uuid}`,
+      },
+      performer: [
+        {
+          actor: {
+            reference: `Practitioner/${provider.uuid}`,
+          },
+        },
+      ],
+      location: {
+        reference: `Location/${process.env.E2E_LOGIN_DEFAULT_LOCATION_UUID}`,
+      },
+      substitution: {
+        wasSubstituted: false,
+        reason: [],
+        type: null,
+      },
+      whenHandedOver: dayjs().format(),
+      quantity: {
+        value: 5,
+        code: '1513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        unit: 'Tablet',
+      },
+      dosageInstruction: [
+        {
+          timing: {
+            repeat: {
+              durationUnit: 'd',
+            },
+            code: {
+              coding: [
+                {
+                  code: '160862AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+                  display: 'Once daily',
+                },
+              ],
+              text: 'Once daily',
+            },
+          },
+          asNeededBoolean: false,
+          route: {
+            coding: [
+              {
+                code: '160240AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+                display: 'Oral',
+              },
+            ],
+            text: 'Oral',
+          },
+          doseAndRate: [
+            {
+              doseQuantity: {
+                value: 1,
+                unit: 'Milligram',
+                code: '161553AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+              },
+            },
+          ],
+        },
+      ],
+    },
+  });
+
+  expect(dispense.ok()).toBeTruthy();
+  return await dispense.json();
+};
+
+export const deleteMedicationDispense = async (fhirApi: APIRequestContext, uuid: string) => {
+  await fhirApi.delete(`MedicationDispense/${uuid}`);
+};

package/e2e/core/test.ts

@@ -1,5 +1,5 @@
 import { type APIRequestContext, type Page, test as base } from '@playwright/test';
-import { api } from '../fixtures';
+import { api, fhirApi } from '../fixtures';
 import { type Patient } from '../types';
 import { generateRandomPatient, deletePatient } from '../commands';
 
@@ -16,10 +16,12 @@ export interface CustomTestFixtures {
 
 export interface CustomWorkerFixtures {
   api: APIRequestContext;
+  fhirApi: APIRequestContext;
 }
 
 export const test = base.extend<CustomTestFixtures, CustomWorkerFixtures>({
   api: [api, { scope: 'worker' }],
+  fhirApi: [fhirApi, { scope: 'worker' }],
   patient: [
     async ({ api }, use) => {
       const patient = await generateRandomPatient(api);

package/e2e/fixtures/fhirApi.ts

@@ -0,0 +1,27 @@
+import { type APIRequestContext, type PlaywrightWorkerArgs, type WorkerFixture } from '@playwright/test';
+
+/**
+ * A fixture which initializes an [`APIRequestContext`](https://playwright.dev/docs/api/class-apirequestcontext)
+ * that is bound to the configured OpenMRS FHIR R4 API server. The context is automatically
+ * authenticated using the configured admin account.
+ *
+ * Use the request context like this:
+ * ```ts
+ * test('your test', async ({ fhirApi }) => {
+ *   const res = await fhirApi.get('MedicationDispense/1234');
+ *   await expect(res.ok()).toBeTruthy();
+ * });
+ * ```
+ */
+
+export const fhirApi: WorkerFixture<APIRequestContext, PlaywrightWorkerArgs> = async ({ playwright }, use) => {
+  const fhirctx = await playwright.request.newContext({
+    baseURL: `${process.env.E2E_BASE_URL}/ws/fhir2/R4/`,
+    httpCredentials: {
+      username: process.env.E2E_USER_ADMIN_USERNAME,
+      password: process.env.E2E_USER_ADMIN_PASSWORD,
+    },
+  });
+
+  use(fhirctx);
+};

package/e2e/fixtures/index.ts

@@ -1 +1,2 @@
 export * from './api';
+export * from './fhirApi';

package/e2e/specs/edit-medication-dispense.spec.ts

@@ -0,0 +1,111 @@
+import { expect } from '@playwright/test';
+import { type Order, type Visit } from '@openmrs/esm-framework';
+import {
+  createEncounter,
+  deleteDrugOrder,
+  deleteEncounter,
+  deleteMedicationDispense,
+  endVisit,
+  generateMedicationDispense,
+  generateRandomDrugOrder,
+  getProvider,
+  startVisit,
+} from '../commands';
+import { DispensingPage } from '../pages';
+import { test } from '../core';
+import { type Encounter, type Provider } from '../commands/types';
+import { type MedicationDispense } from '../../src/types';
+
+let visit: Visit;
+let drugOrder: Order;
+let encounter: Encounter;
+let orderer: Provider;
+let medicationDispense: MedicationDispense;
+
+test.beforeEach(async ({ api, fhirApi, patient }) => {
+  visit = await startVisit(api, patient.uuid);
+  orderer = await getProvider(api);
+  encounter = await createEncounter(api, patient.uuid, orderer.uuid, visit);
+  drugOrder = await generateRandomDrugOrder(api, patient.uuid, encounter, orderer.uuid);
+  medicationDispense = await generateMedicationDispense(fhirApi, patient, orderer, drugOrder.uuid);
+
+  // Wait until the dispense is returned by the same FHIR search the prescription
+  // details view issues, so the UI is guaranteed to see it once the test starts
+  await expect
+    .poll(
+      async () => {
+        const response = await fhirApi.get(
+          `MedicationRequest?encounter=${encounter.uuid}&_revinclude=MedicationDispense:prescription`,
+        );
+        if (!response.ok()) {
+          return 0;
+        }
+        const bundle = await response.json();
+        return (
+          bundle.entry?.filter(
+            (entry: { resource?: { resourceType?: string } }) => entry.resource?.resourceType === 'MedicationDispense',
+          ).length ?? 0
+        );
+      },
+      { timeout: 30000 },
+    )
+    .toBeGreaterThan(0);
+});
+
+test('Edit medication dispense', async ({ page, patient }) => {
+  const dispensingPage = new DispensingPage(page);
+  const patientRow = page.getByRole('row', { name: new RegExp(patient.person.display) });
+  const historyTabPanel = page.getByRole('tabpanel', { name: 'History and comments' });
+
+  await test.step('When I navigate to the dispensing app', async () => {
+    await dispensingPage.goTo();
+    await expect(page).toHaveURL(`${process.env.E2E_BASE_URL}/spa/dispensing`);
+  });
+
+  await test.step('And I click on the "All prescriptions" tab', async () => {
+    await page.getByRole('tab', { name: 'All prescriptions' }).click();
+    await expect(page.getByRole('tab', { name: 'All prescriptions' })).toHaveAttribute('aria-selected', 'true');
+  });
+
+  await test.step("Then I should see the patient's prescription in the table", async () => {
+    await expect(patientRow).toBeVisible({ timeout: 15000 });
+  });
+
+  await test.step('And I expand the prescription row', async () => {
+    await patientRow.getByLabel('Expand current row').click();
+  });
+
+  await test.step('And I navigate to the History and comments tab', async () => {
+    await page.getByRole('tab', { name: 'History and comments' }).click();
+    await expect(historyTabPanel.getByText('QUANTITY 5 Tablet')).toBeVisible();
+  });
+
+  await test.step('And I edit the dispense record', async () => {
+    await historyTabPanel.getByRole('button', { name: 'Options' }).click();
+    await page.getByRole('menuitem', { name: 'Edit Record' }).click();
+  });
+
+  await test.step('And I update the quantity to 9', async () => {
+    await page.getByRole('spinbutton', { name: 'Quantity' }).click();
+    await page.getByRole('spinbutton', { name: 'Quantity' }).fill('9');
+  });
+
+  await test.step('And I save the changes', async () => {
+    await page.getByRole('button', { name: 'Save changes' }).click();
+  });
+
+  await test.step('Then I should see a success notification confirming the update', async () => {
+    await expect(page.getByText(/medication dispense list has been updated/i)).toBeVisible();
+  });
+
+  await test.step('And the quantity should be updated to 9', async () => {
+    await expect(historyTabPanel.getByText('QUANTITY 9 Tablet')).toBeVisible();
+  });
+});
+
+test.afterEach(async ({ api, fhirApi }) => {
+  await deleteMedicationDispense(fhirApi, medicationDispense.id);
+  await deleteEncounter(api, encounter.uuid);
+  await deleteDrugOrder(api, drugOrder.uuid);
+  await endVisit(api, visit);
+});

package/package.json

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

package/.turbo/cache/3728e9c2a4a6b6ce-meta.json

@@ -1 +0,0 @@
-{"hash":"3728e9c2a4a6b6ce","duration":11666}