@openmrs/esm-dispensing-app 1.9.2-pre.889 → 1.9.2-pre.897

package/.eslintrc

@@ -14,6 +14,14 @@
   },
   "plugins": ["@typescript-eslint", "import", "react-hooks", "unused-imports"],
   "root": true,
+  "overrides": [
+    {
+      "files": ["e2e/**/*.ts"],
+      "rules": {
+        "react-hooks/rules-of-hooks": "off"
+      }
+    }
+  ],
   "rules": {
     "react-hooks/exhaustive-deps": "warn",
     "react-hooks/rules-of-hooks": "error",

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

@@ -0,0 +1 @@
+{"hash":"c4771faf2947f17f","duration":41501}

package/.turbo/turbo-build.log

@@ -40,4 +40,4 @@ Entrypoints:
   main (568 KiB)
       main.js
 
-webpack 5.99.9 compiled with 2 warnings in 42736 ms
+webpack 5.99.9 compiled with 2 warnings in 39350 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.889"}
+{"$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.897"}

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,4 +1,3 @@
-/* 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';
@@ -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/medication-dispense-operations.ts

@@ -0,0 +1,93 @@
+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/commands/patient-operations.ts

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

@@ -16,15 +16,16 @@ export const startVisit = async (api: APIRequestContext, patientId: string): Pro
   });
 
   expect(visitRes.ok()).toBeTruthy();
-  return await visitRes.json();
+  const visit = await visitRes.json();
+  return await getVisit(api, visit.uuid);
 };
 
 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 } 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/api.ts

@@ -1,4 +1,3 @@
-/* eslint-disable react-hooks/rules-of-hooks */
 import { type APIRequestContext, type PlaywrightWorkerArgs, type WorkerFixture } from '@playwright/test';
 
 /**
@@ -23,5 +22,5 @@ export const api: WorkerFixture<APIRequestContext, PlaywrightWorkerArgs> = async
     },
   });
 
-  await use(ctx);
+  use(ctx);
 };

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 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/fixtures/index.ts

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

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

@@ -0,0 +1,80 @@
+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);
+});

package/e2e/support/github/Dockerfile

@@ -1,5 +1,4 @@
-# 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,40 @@
 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..."
+# @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 "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..."
+# 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
+# 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 "Created dynamic spa-assemble-config.json"
 
-echo "Setting up Docker..."
+echo "Copying Docker configuration..."
 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..."
+# 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.889",
+  "version": "1.9.2-pre.897",
   "license": "MPL-2.0",
   "description": "Medication dispensing application",
   "browser": "dist/openmrs-esm-dispensing-app.js",

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

@@ -1 +0,0 @@
-{"hash":"adf051de4b68cd85","duration":45181}

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: {} });
-};