@openmrs/esm-dispensing-app 1.7.1-pre.238 → 1.7.1-pre.244

package/.turbo/cache/95e79aae67c0c3ca-meta.json

@@ -0,0 +1 @@
+{"hash":"95e79aae67c0c3ca","duration":41551}

package/.turbo/turbo-build.log

@@ -40,4 +40,4 @@ Entrypoints:
   main (555 KiB)
       main.js
 
-webpack 5.99.9 compiled with 2 warnings in 39538 ms
+webpack 5.99.9 compiled with 2 warnings in 39381 ms

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.7.1-pre.238"}
+{"$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.7.1-pre.244"}

package/e2e/commands/drug-order-operations.ts

@@ -0,0 +1,44 @@
+/* eslint-disable @typescript-eslint/await-thenable */
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Order } from '@openmrs/esm-patient-common-lib';
+import { type Encounter } from './types';
+
+export const generateRandomDrugOrder = async (
+  api: APIRequestContext,
+  patientId: string,
+  encounter: Encounter,
+  providerUuid: string,
+): Promise<Order> => {
+  const order = await api.post('order', {
+    data: {
+      orderType: '131168f4-15f5-102d-96e4-000c29c2a5d7',
+      type: 'drugorder',
+      action: 'new',
+      drug: '09e58895-e7f0-4649-b7c0-e665c5c08e93',
+      urgency: 'ROUTINE',
+      dateActivated: encounter.encounterDateTime,
+      careSetting: '6f0c9a92-6f24-11e3-af88-005056821db0',
+      encounter: encounter,
+      patient: patientId,
+      concept: '71617AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      orderer: providerUuid,
+      dosingType: 'org.openmrs.SimpleDosingInstructions',
+      dose: '1.0',
+      doseUnits: '161553AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      route: '160240AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      frequency: '160862AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      quantity: 1.0,
+      numRefills: 0,
+      quantityUnits: '1513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      durationUnits: { uuid: '1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', display: 'Days' },
+      orderReason: null,
+      orderReasonNonCoded: 'order reason',
+    },
+  });
+  await expect(order.ok()).toBeTruthy();
+  return await order.json();
+};
+
+export const deleteDrugOrder = async (api: APIRequestContext, uuid: string) => {
+  await api.delete(`order/${uuid}`, { data: {} });
+};

package/e2e/commands/encounter-operations.ts

@@ -0,0 +1,64 @@
+/* eslint-disable @typescript-eslint/await-thenable */
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Encounter } from './types';
+import { type Visit } from '@openmrs/esm-framework';
+import dayjs from 'dayjs';
+
+export interface Observation {
+  uuid: string;
+  concept: {
+    uuid: string;
+    display: string;
+    conceptClass: {
+      uuid: string;
+      display: string;
+    };
+  };
+  display: string;
+  groupMembers: null | Array<{
+    uuid: string;
+    concept: {
+      uuid: string;
+      display: string;
+    };
+    value: {
+      uuid: string;
+      display: string;
+    };
+  }>;
+  value: any;
+  obsDatetime: string;
+}
+
+export const createEncounter = async (
+  api: APIRequestContext,
+  patientId: string,
+  providerId: string,
+  visit: Visit,
+): Promise<Encounter> => {
+  const encounterAfterVisit = dayjs(visit.startDatetime).add(1, 'minute');
+  const now = dayjs().subtract(1, 'second');
+  const encounterDatetime = encounterAfterVisit.isBefore(now) ? encounterAfterVisit.format() : now.format();
+  const encounterRes = await api.post('encounter', {
+    data: {
+      encounterDatetime,
+      form: 'c75f120a-04ec-11e3-8780-2b40bef9a44b',
+      patient: patientId,
+      visit: visit,
+      encounterProviders: [
+        {
+          encounterRole: '240b26f9-dd88-4172-823d-4a8bfeb7841f',
+          provider: providerId,
+        },
+      ],
+      location: process.env.E2E_LOGIN_DEFAULT_LOCATION_UUID,
+      encounterType: '39da3525-afe4-45ff-8977-c53b7b359158',
+    },
+  });
+  await expect(encounterRes.ok()).toBeTruthy();
+  return await encounterRes.json();
+};
+
+export const deleteEncounter = async (api: APIRequestContext, uuid: string) => {
+  await api.delete(`encounter/${uuid}`, { data: {} });
+};

package/e2e/commands/index.ts

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

package/e2e/commands/medication-request-operation.ts

@@ -0,0 +1,97 @@
+/* eslint-disable @typescript-eslint/await-thenable */
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Order } from '@openmrs/esm-patient-common-lib';
+import { type Patient } from '../commands';
+import { type Encounter } from './types';
+import { type MedicationRequest } from '../../src/types';
+
+export const generateRandomMedicationRequest = async (
+  fhirApi: APIRequestContext,
+  patient: Patient,
+  encounter: Encounter,
+  providerUuid: string,
+  drugOrder: Order,
+): Promise<MedicationRequest> => {
+  const dispense = await fhirApi.post('MedicationRequest?_summary=data', {
+    data: {
+      resourceType: 'MedicationDispense',
+      medicationReference: {
+        reference: 'Medication/',
+      },
+      encounter: encounter,
+      intent: String,
+      priority: String,
+      subject: patient,
+      requester: [
+        {
+          actor: {
+            reference: providerUuid,
+          },
+        },
+      ],
+      quantity: {
+        value: 1,
+        unit: 'Tablet',
+        code: '1513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      },
+      asNeededBoolean: false,
+      location: process.env.E2E_LOGIN_DEFAULT_LOCATION_UUID,
+      dosageInstruction: [
+        {
+          timing: {
+            code: {
+              coding: [
+                {
+                  code: '160862AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+                  display: 'Once daily',
+                },
+                {
+                  system: 'https://cielterminology.org',
+                  code: '160862',
+                },
+                {
+                  system: 'http://snomed.info/sct/',
+                  code: '229797004',
+                },
+              ],
+              text: 'Once daily',
+            },
+          },
+          asNeededBoolean: false,
+          route: {
+            coding: [
+              {
+                code: '160240AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+                display: 'Oral',
+              },
+              {
+                system: 'https://cielterminology.org',
+                code: '160240',
+              },
+              {
+                system: 'http://snomed.info/sct/',
+                code: '26643006',
+              },
+            ],
+            text: 'Oral',
+          },
+          doseAndRate: [
+            {
+              doseQuantity: {
+                value: 1,
+                unit: 'Milligram',
+                code: '161553AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+              },
+            },
+          ],
+        },
+      ],
+    },
+  });
+  await expect(dispense.ok()).toBeTruthy();
+  return await dispense.json();
+};
+
+export const deleteMedicationRequest = async (fhirApi: APIRequestContext, uuid: string) => {
+  await fhirApi.delete(`MedicationDispense/${uuid}`, { data: {} });
+};

package/e2e/commands/provider-operations.ts

@@ -0,0 +1,12 @@
+/* eslint-disable @typescript-eslint/await-thenable */
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Provider } from './types';
+
+export const getProvider = async (api: APIRequestContext): Promise<Provider> => {
+  const providerRes = await api.get('provider?q=admin', {
+    data: {},
+  });
+  await expect(providerRes.ok()).toBeTruthy();
+  const { results } = await providerRes.json();
+  return await results[0];
+};

package/e2e/commands/types/index.ts

@@ -0,0 +1,157 @@
+import { type OpenmrsResource } from '@openmrs/esm-framework';
+
+export interface Encounter {
+  uuid: string;
+  encounterDateTime: string;
+  encounterProviders: Array<{
+    uuid: string;
+    display: string;
+    encounterRole: {
+      uuid: string;
+      display: string;
+    };
+    provider: {
+      uuid: string;
+      person: {
+        uuid: string;
+        display: string;
+      };
+    };
+  }>;
+  encounterType: {
+    uuid: string;
+    display: string;
+  };
+  obs: Array<Observation>;
+  orders: Array<Order>;
+}
+
+export interface Observation {
+  uuid: string;
+  concept: {
+    uuid: string;
+    display: string;
+    conceptClass: {
+      uuid: string;
+      display: string;
+    };
+  };
+  display: string;
+  groupMembers: null | Array<{
+    uuid: string;
+    concept: {
+      uuid: string;
+      display: string;
+    };
+    value: {
+      uuid: string;
+      display: string;
+    };
+  }>;
+  value: any;
+  obsDatetime: string;
+}
+
+export interface Order {
+  uuid: string;
+  dateActivated: string;
+  dateStopped?: Date | null;
+  dose: number;
+  dosingInstructions: string | null;
+  dosingType?: 'org.openmrs.FreeTextDosingInstructions' | 'org.openmrs.SimpleDosingInstructions';
+  doseUnits: {
+    uuid: string;
+    display: string;
+  };
+  drug: {
+    uuid: string;
+    name: string;
+    strength: string;
+    display: string;
+  };
+  duration: number;
+  durationUnits: {
+    uuid: string;
+    display: string;
+  };
+  frequency: {
+    uuid: string;
+    display: string;
+  };
+  numRefills: number;
+  orderNumber: string;
+  orderReason: string | null;
+  orderReasonNonCoded: string | null;
+  orderer: {
+    uuid: string;
+    person: {
+      uuid: string;
+      display: string;
+    };
+  };
+  orderType: {
+    uuid: string;
+    display: string;
+  };
+  route: {
+    uuid: string;
+    display: string;
+  };
+  quantity: number;
+  quantityUnits: OpenmrsResource;
+}
+
+export interface Provider {
+  uuid: string;
+  display: string;
+  comments?: string;
+  response?: string;
+  person: OpenmrsResource;
+  name?: string;
+}
+
+export interface Patient {
+  uuid: string;
+  identifiers: Identifier[];
+  display: string;
+  person: {
+    uuid: string;
+    display: string;
+    gender: string;
+    age: number;
+    birthdate: string;
+    birthdateEstimated: boolean;
+    dead: boolean;
+    deathDate?: any;
+    causeOfDeath?: any;
+    preferredAddress: {
+      address1: string;
+      cityVillage: string;
+      country: string;
+      postalCode: string;
+      stateProvince: string;
+      countyDistrict: string;
+    };
+    attributes: any[];
+    voided: boolean;
+    birthtime?: any;
+    deathdateEstimated: boolean;
+    resourceVersion: string;
+  };
+  attributes: { value: string; attributeType: { uuid: string; display: string } }[];
+  voided: boolean;
+}
+
+export interface Address {
+  preferred: boolean;
+  address1: string;
+  cityVillage: string;
+  country: string;
+  postalCode: string;
+  stateProvince: string;
+}
+
+export interface Identifier {
+  uuid: string;
+  display: string;
+}

package/e2e/core/test.ts

@@ -24,11 +24,7 @@ export const test = base.extend<CustomTestFixtures, CustomWorkerFixtures>({
     async ({ api }, use) => {
       const patient = await generateRandomPatient(api);
       await use(patient);
-      try {
-        if (patient) await deletePatient(api, patient.uuid);
-      } catch (e) {
-        console.warn('Failed to delete patient:', e);
-      }
+      await deletePatient(api, patient.uuid);
     },
     { scope: 'test', auto: true },
   ],

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

@@ -0,0 +1,65 @@
+import { expect } from '@playwright/test';
+import { type Visit } from '@openmrs/esm-framework';
+import {
+  generateRandomDrugOrder,
+  deleteDrugOrder,
+  createEncounter,
+  deleteEncounter,
+  getProvider,
+  startVisit,
+  endVisit,
+} from '../commands';
+import { type Encounter, type Provider } from '../commands/types';
+import { type Order } from '@openmrs/esm-patient-common-lib';
+import { test } from '../core';
+import { DispensingPage } from '../pages';
+
+let visit: Visit;
+let drugOrder: Order;
+let encounter: Encounter;
+let orderer: Provider;
+
+test.beforeEach(async ({ api, 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);
+});
+
+test('Dispense prescription', async ({ page, patient }) => {
+  const dispensingPage = new DispensingPage(page);
+  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 expand a table row in the Prescriptions table corresponding to an active prescription', async () => {
+    const rowText = new RegExp(`Expand current row`);
+    await page.getByRole('row', { name: rowText }).getByLabel('Expand current row').nth(0).click();
+    await expect(page.getByLabel('Prescription details', { exact: true }).getByText('Aspirin 81mg')).toBeVisible();
+  });
+
+  await test.step('Then I click the Dispense button to launch the Dispense prescription form', async () => {
+    await page.getByRole('button', { name: 'Dispense', exact: true }).click();
+    await expect(page.getByLabel('Workspace header').getByText('Dispense prescription')).toBeVisible();
+  });
+
+  await test.step('Then I submit the form by clicking the Dispense prescription button', async () => {
+    await page.getByRole('button', { name: 'Dispense prescription' }).click();
+  });
+
+  await test.step('Then I should see a success notification', async () => {
+    await expect(page.getByText(/medication successfully dispensed/i)).toBeVisible();
+  });
+
+  await test.step('And when I click the `History and comments` tab I should see the updated `Dispensed` status reflected', async () => {
+    await page.getByRole('tab', { name: 'History and comments' }).click();
+    await expect(page.getByText('Dispensed', { exact: true })).toBeVisible();
+  });
+});
+
+test.afterEach(async ({ api }) => {
+  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.7.1-pre.238",
+  "version": "1.7.1-pre.244",
   "license": "MPL-2.0",
   "description": "Medication dispensing application",
   "browser": "dist/openmrs-esm-dispensing-app.js",

package/.turbo/cache/8e1c24192904ade7-meta.json

@@ -1 +0,0 @@
-{"hash":"8e1c24192904ade7","duration":41556}