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

package/.eslintrc

@@ -7,6 +7,14 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/recommended-requiring-type-checking"
   ],
+  "overrides": [
+    {
+      "files": ["e2e/**/*.ts"],
+      "rules": {
+        "react-hooks/rules-of-hooks": "off"
+      }
+    }
+  ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "project": true,

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 41536 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.902"}
+{"$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/drug-order-operations.ts

@@ -1,4 +1,3 @@
-/* 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';
@@ -35,10 +34,10 @@ export const generateRandomDrugOrder = async (
       orderReasonNonCoded: 'order reason',
     },
   });
-  await expect(order.ok()).toBeTruthy();
+  expect(order.ok()).toBeTruthy();
   return await order.json();
 };
 
 export const deleteDrugOrder = async (api: APIRequestContext, uuid: string) => {
-  await api.delete(`order/${uuid}`, { data: {} });
+  await api.delete(`order/${uuid}`);
 };

package/e2e/commands/encounter-operations.ts

@@ -1,7 +1,6 @@
-/* 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 { type Encounter } from './types';
 
 export interface Observation {
   uuid: string;
@@ -52,10 +51,10 @@ export const createEncounter = async (
       encounterType: '39da3525-afe4-45ff-8977-c53b7b359158',
     },
   });
-  await expect(encounterRes.ok()).toBeTruthy();
+  expect(encounterRes.ok()).toBeTruthy();
   return await encounterRes.json();
 };
 
 export const deleteEncounter = async (api: APIRequestContext, uuid: string) => {
-  await api.delete(`encounter/${uuid}`, { data: {} });
+  await api.delete(`encounter/${uuid}`);
 };

package/e2e/commands/index.ts

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

package/e2e/commands/patient-operations.ts

@@ -105,5 +105,5 @@ export const getPatient = async (api: APIRequestContext, uuid: string): Promise<
 };
 
 export const deletePatient = async (api: APIRequestContext, uuid: string) => {
-  await api.delete(`patient/${uuid}`, { data: {} });
+  await api.delete(`patient/${uuid}`);
 };

package/e2e/commands/provider-operations.ts

@@ -1,12 +1,9 @@
-/* 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 providerRes = await api.get('provider?q=admin');
+  expect(providerRes.ok()).toBeTruthy();
   const { results } = await providerRes.json();
   return await results[0];
 };

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');
 

package/e2e/fixtures/api.ts

@@ -23,5 +23,5 @@ export const api: WorkerFixture<APIRequestContext, PlaywrightWorkerArgs> = async
     },
   });
 
-  await use(ctx);
+  use(ctx);
 };

package/e2e/support/github/Dockerfile

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

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

@@ -4,45 +4,39 @@
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # create a temporary working directory
 working_dir=$(mktemp -d "${TMPDIR:-/tmp/}openmrs-e2e-frontends.XXXXXXXXXX")
-# get a list of all the apps in this workspace
-apps=$(yarn workspaces list --json | jq -r 'select(.name | test("-app")) | .name')
-# this array will hold all of the packed app names
-app_names=()
+# cleanup temp directory on exit
+trap 'rm -rf "$working_dir"' EXIT
+# get the app name
+app_name=$(jq -r '.name' "$script_dir/../../../package.json")
 
-echo "Packing local dispensing app..."
-yarn workspace "@openmrs/esm-dispensing-app" pack -o "$working_dir/_openmrs_esm_dispensing_app.tgz" >/dev/null
-app_names+=("_openmrs_esm_dispensing_app.tgz")
+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 "Successfully created packed app archive: $packed_app_name.tgz"
 
-echo "Packing other apps..."
-for app in $apps; do
-  if [ "$app" != "@openmrs/esm-dispensing-app" ]; then
-    app_name=$(echo "$app" | tr '[:punct:]' '_')
-    app_names+=("$app_name.tgz")
-    yarn workspace "$app" pack -o "$working_dir/$app_name.tgz" >/dev/null
-  fi
-done
-
-echo "Generating spa-assemble-config.json..."
+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 apps "$apps" \
-  --arg app_names "$(echo ${app_names[@]})" \
+  --arg app_name "$app_name" \
+  --arg app_file "/app/$packed_app_name.tgz" \
   '{
     "@openmrs/esm-primary-navigation-app": "next",
     "@openmrs/esm-patient-banner-app": "next"
-  } + (
-    ($apps | split("\n")) as $apps |
-    ($app_names | split(" ") | map("/app/" + .)) as $app_files
-    | [$apps, $app_files]
-    | transpose
-    | map({"key": .[0], "value": .[1]})
-    | from_entries
-  )' | jq '{"frontendModules": .}' > "$working_dir/spa-assemble-config.json"
+  } + {
+    ($app_name): $app_file
+  }' | jq '{"frontendModules": .}' > "$working_dir/spa-assemble-config.json"
+echo "Successfully created spa-assemble-config.json with frontend modules"
 
-echo "Setting up Docker..."
+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 "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.902",
+  "version": "1.9.2-pre.903",
   "license": "MPL-2.0",
   "description": "Medication dispensing application",
   "browser": "dist/openmrs-esm-dispensing-app.js",

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

@@ -1 +0,0 @@
-{"hash":"c12da28d78393da6","duration":44199}

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

@@ -1,97 +0,0 @@
-/* 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: {} });
-};