@openmrs/esm-dispensing-app 1.9.2-pre.901 → 1.9.2-pre.903

package/.eslintrc

@@ -7,13 +7,6 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/recommended-requiring-type-checking"
   ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": true,
-    "tsconfigRootDir": "__dirname"
-  },
-  "plugins": ["@typescript-eslint", "import", "react-hooks", "unused-imports"],
-  "root": true,
   "overrides": [
     {
       "files": ["e2e/**/*.ts"],
@@ -22,6 +15,13 @@
       }
     }
   ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": true,
+    "tsconfigRootDir": "__dirname"
+  },
+  "plugins": ["@typescript-eslint", "import", "react-hooks", "unused-imports"],
+  "root": true,
   "rules": {
     "react-hooks/exhaustive-deps": "warn",
     "react-hooks/rules-of-hooks": "error",

package/.turbo/cache/2355faddea0ea7e0-meta.json

@@ -0,0 +1 @@
+{"hash":"2355faddea0ea7e0","duration":43585}

package/.turbo/turbo-build.log

@@ -40,4 +40,4 @@ Entrypoints:
   main (568 KiB)
       main.js
 
-webpack 5.99.9 compiled with 2 warnings in 42270 ms
+webpack 5.99.9 compiled with 2 warnings in 41211 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.9.2-pre.901"}
+{"$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.903"}

package/e2e/commands/encounter-operations.ts

@@ -1,6 +1,6 @@
 import { type APIRequestContext, expect } from '@playwright/test';
-import { type Encounter } from './types';
 import { type Visit } from '@openmrs/esm-framework';
+import { type Encounter } from './types';
 
 export interface Observation {
   uuid: string;

package/e2e/commands/patient-operations.ts

@@ -51,7 +51,8 @@ export const generateRandomPatient = async (api: APIRequestContext): Promise<Pat
     data: {},
   });
 
-  expect(identifierRes.ok()).toBeTruthy();
+  // eslint-disable-next-line @typescript-eslint/await-thenable
+  await expect(identifierRes.ok()).toBeTruthy();
   const { identifier } = await identifierRes.json();
 
   const patientRes = await api.post('patient', {
@@ -93,7 +94,8 @@ export const generateRandomPatient = async (api: APIRequestContext): Promise<Pat
     },
   });
 
-  expect(patientRes.ok()).toBeTruthy();
+  // eslint-disable-next-line @typescript-eslint/await-thenable
+  await expect(patientRes.ok()).toBeTruthy();
   return await patientRes.json();
 };
 

package/e2e/commands/visit-operations.ts

@@ -1,6 +1,6 @@
+import dayjs from 'dayjs';
 import { type APIRequestContext, expect } from '@playwright/test';
 import { type Visit } from '@openmrs/esm-framework';
-import dayjs from 'dayjs';
 
 export const visitStartDatetime = dayjs().subtract(1, 'D');
 
@@ -16,16 +16,15 @@ export const startVisit = async (api: APIRequestContext, patientId: string): Pro
   });
 
   expect(visitRes.ok()).toBeTruthy();
-  const visit = await visitRes.json();
-  return await getVisit(api, visit.uuid);
+  return await visitRes.json();
 };
 
 export const endVisit = async (api: APIRequestContext, visit: Visit) => {
   const visitRes = await api.post(`visit/${visit.uuid}`, {
     data: {
-      location: visit?.location?.uuid,
-      startDatetime: visit?.startDatetime,
-      visitType: visit?.visitType?.uuid,
+      location: visit.location.uuid,
+      startDatetime: visit.startDatetime,
+      visitType: visit.visitType.uuid,
       stopDatetime: dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZZ'),
     },
   });

package/e2e/core/test.ts

@@ -1,5 +1,5 @@
 import { type APIRequestContext, type Page, test as base } from '@playwright/test';
-import { api, fhirApi } from '../fixtures';
+import { api } from '../fixtures';
 import { type Patient } from '../types';
 import { generateRandomPatient, deletePatient } from '../commands';
 
@@ -16,12 +16,10 @@ 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/api.ts

@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { type APIRequestContext, type PlaywrightWorkerArgs, type WorkerFixture } from '@playwright/test';
 
 /**

package/e2e/fixtures/index.ts

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

package/e2e/support/github/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.3
 FROM --platform=$BUILDPLATFORM node:22-alpine as dev
 
 ARG APP_SHELL_VERSION=next

package/e2e/support/github/run-e2e-docker-env.sh

@@ -9,16 +9,16 @@ trap 'rm -rf "$working_dir"' EXIT
 # get the app name
 app_name=$(jq -r '.name' "$script_dir/../../../package.json")
 
-echo "Creating packed archive of the app..."
+echo "Creating packed archive of the app for Docker build..."
 # @openmrs/esm-whatever -> _openmrs_esm_whatever
 packed_app_name=$(echo "$app_name" | tr '[:punct:]' '_');
 # run yarn pack for our app and add it to the working directory
 yarn pack -o "$working_dir/$packed_app_name.tgz" >/dev/null;
-echo "Created packed app archives"
+echo "Successfully created packed app archive: $packed_app_name.tgz"
 
-echo "Creating dynamic spa-assemble-config.json..."
-# dynamically assemble our list of frontend modules, prepending the login app and
-# primary navigation apps; apps will all be in the /app directory of the Docker
+echo "Creating dynamic spa-assemble-config.json with frontend modules..."
+# dynamically assemble our list of frontend modules, prepending the primary navigation
+# and patient banner apps; apps will all be in the /app directory of the Docker
 # container
 jq -n \
   --arg app_name "$app_name" \
@@ -29,15 +29,14 @@ jq -n \
   } + {
     ($app_name): $app_file
   }' | jq '{"frontendModules": .}' > "$working_dir/spa-assemble-config.json"
-echo "Created dynamic spa-assemble-config.json"
+echo "Successfully created spa-assemble-config.json with frontend modules"
 
-echo "Copying Docker configuration..."
+echo "Copying Docker configuration files to working directory..."
 cp "$script_dir/Dockerfile" "$working_dir/Dockerfile"
 cp "$script_dir/docker-compose.yml" "$working_dir/docker-compose.yml"
 
 cd "$working_dir"
-echo "Starting Docker containers..."
+echo "Building and starting Docker containers for e2e testing..."
 # CACHE_BUST to ensure the assemble step is always run
 docker compose build --build-arg CACHE_BUST=$(date +%s) frontend
 docker compose up -d
-

package/package.json

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

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

@@ -1 +0,0 @@
-{"hash":"bf5fb3ad4647f8e0","duration":44397}

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

@@ -1,93 +0,0 @@
-import dayjs from 'dayjs';
-import { type APIRequestContext, expect } from '@playwright/test';
-import { type Patient } from '.';
-import { type Provider } from './types';
-import { MedicationDispenseStatus, type MedicationDispense } 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}`,
-      },
-      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, id: string) => {
-  await fhirApi.delete(`MedicationDispense/${id}`);
-};

package/e2e/fixtures/fhirApi.ts

@@ -1,27 +0,0 @@
-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 API server. The context is automatically authenticated
- * using the configured admin account.
- *
- * Use the request context like this:
- * ```ts
- * test('your test', async ({ api }) => {
- *   const res = await api.get('patient/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/specs/delete-medication-dispense.spec.ts

@@ -1,80 +0,0 @@
-import { expect } from '@playwright/test';
-import { type Visit } from '@openmrs/esm-framework';
-import { type Order } from '@openmrs/esm-patient-common-lib';
-import {
-  createEncounter,
-  deleteDrugOrder,
-  deleteEncounter,
-  endVisit,
-  generateRandomDrugOrder,
-  getProvider,
-  startVisit,
-} from '../commands';
-import { deleteMedicationDispense, generateMedicationDispense } from '../commands/medication-dispense-operations';
-import { DispensingPage } from '../pages';
-import { test } from '../core';
-import { type Encounter, type Provider } from '../commands/types';
-import { type MedicationDispense } from '../../src/types';
-
-let drugOrder: Order;
-let encounter: Encounter;
-let medicationDispense: MedicationDispense;
-let orderer: Provider;
-let visit: Visit;
-
-test.beforeEach(async ({ fhirApi, 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);
-  medicationDispense = await generateMedicationDispense(fhirApi, patient, orderer, drugOrder.uuid);
-});
-
-test('Delete medication dispense', async ({ fhirApi, 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(`/openmrs/spa/dispensing`);
-  });
-
-  await test.step('And I click on the "Active prescriptions" tab', async () => {
-    await page.getByRole('tab', { name: 'Active prescriptions' }).click();
-    await expect(page.getByRole('tab', { name: 'Active prescriptions' })).toHaveAttribute('aria-selected', 'true');
-  });
-
-  await test.step('Then I should see the prescription in the table', async () => {
-    await expect(page.getByRole('row', { name: 'Expand current row' }).first()).toBeVisible();
-  });
-
-  await test.step('And I expand the prescription row', async () => {
-    await page.getByRole('row', { name: 'Expand current row' }).getByLabel('Expand current row').first().click();
-  });
-
-  await test.step('And I navigate to the History and comments tab', async () => {
-    await page.getByRole('tab', { name: 'History and comments' }).click();
-  });
-
-  await test.step('And I click on the "Options" menu', async () => {
-    await page.getByRole('button', { name: 'Options' }).first().click();
-  });
-
-  await test.step('And I select the "Delete" option', async () => {
-    await page.getByRole('menuitem', { name: 'Delete' }).click();
-  });
-
-  await test.step('And I select the "Delete" button in the modal', async () => {
-    await page.getByRole('button', { name: 'danger Delete' }).click();
-  });
-
-  await test.step('Then I should see a success notification confirming the deletion', async () => {
-    await expect(page.getByText(/medication dispense was deleted successfully/i)).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);
-});