@openmrs/esm-laboratory-app 1.5.2-pre.1672 → 1.5.2-pre.1677

package/.turbo/cache/315bf6a4a42cbedd-meta.json

@@ -0,0 +1 @@
+{"hash":"315bf6a4a42cbedd","duration":10165}

package/.turbo/turbo-build.log

@@ -11,4 +11,4 @@
   │       main.js
 
 
-Rspack compiled with 2 warnings in 8.00 s
+Rspack compiled with 2 warnings in 8.79 s

package/dist/openmrs-esm-laboratory-app.js.buildmanifest.json

@@ -29,10 +29,10 @@
       "rendered": true,
       "initial": false,
       "entry": false,
-      "size": 58120,
+      "size": 58020,
       "sizes": {
         "consume-shared": 84,
-        "javascript": 58036
+        "javascript": 57936
       },
       "names": [],
       "idHints": [],
@@ -45,7 +45,7 @@
       "auxiliaryFiles": [
         "1570.js.map"
       ],
-      "hash": "2779f1465ab98ddc",
+      "hash": "4f08338351423afe",
       "childrenByOrder": {}
     },
     {
@@ -125,10 +125,10 @@
       "rendered": true,
       "initial": true,
       "entry": true,
-      "size": 3190579,
+      "size": 3190479,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 3190117,
+        "javascript": 3190017,
         "runtime": 13247,
         "share-init": 210
       },
@@ -145,7 +145,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "1df7318ec36ed07e",
+      "hash": "bc37e1c937e185de",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"laboratory"}],"extensions":[{"name":"laboratory-dashboard","slot":"laboratory-dashboard-slot","component":"root"},{"name":"laboratory-dashboard-link","slot":"homepage-dashboard-slot","component":"laboratoryDashboardLink","meta":{"name":"laboratory","slot":"laboratory-dashboard-slot","title":"Laboratory"}},{"name":"pickup-lab-request-modal","component":"pickupLabRequestModal"},{"name":"approval-lab-results-modal","component":"approvalLabResultsModal"},{"name":"reject-lab-request-modal","component":"rejectLabRequestModal"},{"name":"all-lab-requests-table","slot":"lab-panels-slot","order":0,"component":"allLabRequestsTable","meta":{"name":"testsOrderedPanel","title":"Tests ordered"}},{"name":"inprogress-lab-requests-table","slot":"lab-panels-slot","component":"inprogressLabRequestsTable","order":1,"meta":{"name":"inprogressPanel","title":"In progress"}},{"name":"completed-lab-requests-table","slot":"lab-panels-slot","component":"completedLabRequestsTable","order":3,"meta":{"name":"completedPanel","title":"Completed"}},{"name":"tests-ordered-tile-component","slot":"lab-tiles-slot","component":"testOrderedTile","meta":{"name":"testsOrderedTileSlot","title":"Ordered tests"}},{"name":"pending-review-lab-requests-table","slot":"lab-panels-slot","component":"pendingReviewLabRequestsTable","order":2,"meta":{"name":"pendingReviewPanel","title":"Pending review tests"}},{"name":"worklist-tile-component","slot":"lab-tiles-slot","component":"worklistTile","meta":{"name":"worklistTileSlot","title":"Worklist"}},{"name":"pending-review-list-tile-component","slot":"lab-tiles-slot","component":"pendingReviewListTile","meta":{"name":"pendingReviewTileSlot","title":"Pending review tests"}},{"name":"completed-tile-component","slot":"lab-tiles-slot","component":"completedTile","meta":{"name":"completedTileSlot","title":"Completed"}},{"name":"declined-tile-component","slot":"lab-panels-slot","component":"declinedLabRequestsTable","order":4,"meta":{"name":"declinedPanel","title":"Declined tests"}},{"name":"pick-lab-request-action","component":"pickupLabRequestAction","slot":"tests-ordered-actions-slot"},{"name":"approve-lab-results-tests-ordered-action","component":"approveLabResultsAction","slot":"approved-ordered-actions-slot"},{"name":"amend-lab-results-tests-ordered-action","component":"amendLabResultsAction","slot":"amended-ordered-actions-slot"},{"name":"reject-lab-request-tests-ordered-action","component":"rejectLabRequestAction","slot":"rejected-ordered-actions-slot"},{"name":"reject-lab-request-worklist-action","component":"rejectLabRequestAction","slot":"inprogress-tests-actions-slot"},{"name":"add-lab-request-results-action","component":"addLabRequestResultsAction","slot":"inprogress-tests-actions-slot"}],"workspaces2":[{"name":"lab-app-test-results-form-workspace","component":"@openmrs/esm-patient-orders-app#exportedTestResultsFormWorkspace","window":"labs-app-test-results-window"},{"name":"lab-app-test-results-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"labs-app-test-results-window"},{"name":"add-test-order-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"add-test-order-window"},{"name":"add-test-order-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"add-test-order-window"},{"name":"add-test-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"add-test-order-window"},{"name":"add-test-order-basket-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"add-test-order-window"}],"workspaceWindows2":[{"name":"labs-app-test-results-window","group":"labs-app-group"},{"name":"add-test-order-window","group":"add-test-order-group"}],"workspaceGroups2":[{"name":"labs-app-group","scopePattern":"/home/laboratory"},{"name":"add-test-order-group","scopePattern":"/home/laboratory"}],"version":"1.5.2-pre.1672"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"laboratory"}],"extensions":[{"name":"laboratory-dashboard","slot":"laboratory-dashboard-slot","component":"root"},{"name":"laboratory-dashboard-link","slot":"homepage-dashboard-slot","component":"laboratoryDashboardLink","meta":{"name":"laboratory","slot":"laboratory-dashboard-slot","title":"Laboratory"}},{"name":"pickup-lab-request-modal","component":"pickupLabRequestModal"},{"name":"approval-lab-results-modal","component":"approvalLabResultsModal"},{"name":"reject-lab-request-modal","component":"rejectLabRequestModal"},{"name":"all-lab-requests-table","slot":"lab-panels-slot","order":0,"component":"allLabRequestsTable","meta":{"name":"testsOrderedPanel","title":"Tests ordered"}},{"name":"inprogress-lab-requests-table","slot":"lab-panels-slot","component":"inprogressLabRequestsTable","order":1,"meta":{"name":"inprogressPanel","title":"In progress"}},{"name":"completed-lab-requests-table","slot":"lab-panels-slot","component":"completedLabRequestsTable","order":3,"meta":{"name":"completedPanel","title":"Completed"}},{"name":"tests-ordered-tile-component","slot":"lab-tiles-slot","component":"testOrderedTile","meta":{"name":"testsOrderedTileSlot","title":"Ordered tests"}},{"name":"pending-review-lab-requests-table","slot":"lab-panels-slot","component":"pendingReviewLabRequestsTable","order":2,"meta":{"name":"pendingReviewPanel","title":"Pending review tests"}},{"name":"worklist-tile-component","slot":"lab-tiles-slot","component":"worklistTile","meta":{"name":"worklistTileSlot","title":"Worklist"}},{"name":"pending-review-list-tile-component","slot":"lab-tiles-slot","component":"pendingReviewListTile","meta":{"name":"pendingReviewTileSlot","title":"Pending review tests"}},{"name":"completed-tile-component","slot":"lab-tiles-slot","component":"completedTile","meta":{"name":"completedTileSlot","title":"Completed"}},{"name":"declined-tile-component","slot":"lab-panels-slot","component":"declinedLabRequestsTable","order":4,"meta":{"name":"declinedPanel","title":"Declined tests"}},{"name":"pick-lab-request-action","component":"pickupLabRequestAction","slot":"tests-ordered-actions-slot"},{"name":"approve-lab-results-tests-ordered-action","component":"approveLabResultsAction","slot":"approved-ordered-actions-slot"},{"name":"amend-lab-results-tests-ordered-action","component":"amendLabResultsAction","slot":"amended-ordered-actions-slot"},{"name":"reject-lab-request-tests-ordered-action","component":"rejectLabRequestAction","slot":"rejected-ordered-actions-slot"},{"name":"reject-lab-request-worklist-action","component":"rejectLabRequestAction","slot":"inprogress-tests-actions-slot"},{"name":"add-lab-request-results-action","component":"addLabRequestResultsAction","slot":"inprogress-tests-actions-slot"}],"workspaces2":[{"name":"lab-app-test-results-form-workspace","component":"@openmrs/esm-patient-orders-app#exportedTestResultsFormWorkspace","window":"labs-app-test-results-window"},{"name":"lab-app-test-results-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"labs-app-test-results-window"},{"name":"add-test-order-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"add-test-order-window"},{"name":"add-test-order-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"add-test-order-window"},{"name":"add-test-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"add-test-order-window"},{"name":"add-test-order-basket-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"add-test-order-window"}],"workspaceWindows2":[{"name":"labs-app-test-results-window","group":"labs-app-group"},{"name":"add-test-order-window","group":"add-test-order-group"}],"workspaceGroups2":[{"name":"labs-app-group","scopePattern":"/home/laboratory"},{"name":"add-test-order-group","scopePattern":"/home/laboratory"}],"version":"1.5.2-pre.1677"}

package/e2e/commands/patient-operations.ts

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

package/e2e/specs/reject-lab-request.spec.ts

@@ -27,6 +27,18 @@ test.beforeEach(async ({ api, patient }) => {
   fullName = patient.person?.display;
 });
 
+test.afterEach(async ({ api }) => {
+  if (visit) {
+    await endVisit(api, visit);
+  }
+  if (encounter?.uuid) {
+    await deleteEncounter(api, encounter.uuid);
+  }
+  if (testOrder?.uuid) {
+    await deleteTestOrder(api, testOrder.uuid);
+  }
+});
+
 test('Reject a lab request', async ({ page }) => {
   const laboratoryPage = new LaboratoryPage(page);
 
@@ -74,15 +86,3 @@ test('Reject a lab request', async ({ page }) => {
     await expect(page.getByRole('cell', { name: 'Declined' })).toBeVisible();
   });
 });
-
-test.afterEach(async ({ api }) => {
-  if (visit) {
-    await endVisit(api, visit);
-  }
-  if (encounter?.uuid) {
-    await deleteEncounter(api, encounter.uuid);
-  }
-  if (testOrder?.uuid) {
-    await deleteTestOrder(api, testOrder.uuid);
-  }
-});

package/e2e/specs/test-orders.spec.ts

@@ -29,6 +29,18 @@ test.beforeEach(async ({ api, patient }) => {
   fullName = patient.person?.display;
 });
 
+test.afterEach(async ({ api }) => {
+  if (visit) {
+    await endVisit(api, visit);
+  }
+  if (encounter?.uuid) {
+    await deleteEncounter(api, encounter.uuid);
+  }
+  if (testOrder?.uuid) {
+    await deleteTestOrder(api, testOrder.uuid);
+  }
+});
+
 test('View test orders', async ({ page }) => {
   const laboratoryPage = new LaboratoryPage(page);
 
@@ -55,15 +67,3 @@ test('View test orders', async ({ page }) => {
     await expect(laboratoryPage.getPatientRow(fullName).getByText(/1 Routine/i)).toBeVisible();
   });
 });
-
-test.afterEach(async ({ api }) => {
-  if (visit) {
-    await endVisit(api, visit);
-  }
-  if (encounter?.uuid) {
-    await deleteEncounter(api, encounter.uuid);
-  }
-  if (testOrder?.uuid) {
-    await deleteTestOrder(api, testOrder.uuid);
-  }
-});

package/eslint.config.mjs

@@ -0,0 +1,35 @@
+import openmrs from '@openmrs/eslint-config';
+
+export default [
+  { ignores: ['dist/**', 'coverage/**'] },
+  ...openmrs,
+  {
+    rules: {
+      // Rules this repo enforces where the shared config turns them off.
+      '@typescript-eslint/no-empty-object-type': 'error',
+      '@typescript-eslint/no-unsafe-function-type': 'error',
+      '@typescript-eslint/no-wrapper-object-types': 'error',
+      '@typescript-eslint/triple-slash-reference': 'error',
+      'no-extra-boolean-cast': 'error',
+      'no-prototype-builtins': 'error',
+      'no-unsafe-optional-chaining': 'error',
+      'no-useless-escape': 'error',
+      'prefer-const': 'error',
+      'react-hooks/exhaustive-deps': 'warn',
+    },
+  },
+  {
+    // consistent-type-exports needs type information, which the old config
+    // supplied through parserOptions.project.
+    files: ['**/*.{ts,tsx}'],
+    languageOptions: {
+      parserOptions: {
+        project: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+    rules: {
+      '@typescript-eslint/consistent-type-exports': 'error',
+    },
+  },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-laboratory-app",
-  "version": "1.5.2-pre.1672",
+  "version": "1.5.2-pre.1677",
   "license": "MPL-2.0",
   "description": "An O3 frontend module for managing laboratory requests and queues",
   "browser": "dist/openmrs-esm-laboratory-app.js",
@@ -11,7 +11,7 @@
     "serve": "rspack serve --mode=development",
     "build": "rspack --mode production",
     "analyze": "rspack --mode=production --env analyze=true",
-    "lint": "eslint src --ext ts,tsx",
+    "lint": "eslint src",
     "prettier": "prettier --write \"src/**/*.{css,scss,ts,tsx}\" --list-different",
     "typescript": "tsc",
     "test": "cross-env TZ=UTC vitest run --passWithNoTests",
@@ -58,6 +58,7 @@
     "react-router-dom": "6.x"
   },
   "devDependencies": {
+    "@openmrs/eslint-config": "^2.0.0",
     "@openmrs/esm-framework": "next",
     "@playwright/test": "^1.52.0",
     "@swc/cli": "^0.1.62",
@@ -69,14 +70,10 @@
     "@types/dotenv": "^8.2.3",
     "@types/react": "^18.3.21",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.45.0",
-    "@typescript-eslint/parser": "^8.45.0",
     "@vitest/coverage-v8": "^4.1.2",
     "cross-env": "^10.1.0",
     "dayjs": "^1.11.11",
-    "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint": "^9.39.0",
     "file-saver": "^2.0.5",
     "husky": "^8.0.0",
     "i18next-parser": "^9.3.0",

package/src/components/orders-table/orders-data-table.test.tsx

@@ -204,6 +204,7 @@ describe('OrdersDataTable', () => {
 
     render(<OrdersDataTable />);
 
+    // eslint-disable-next-line testing-library/no-node-access -- asserting on Carbon's search wrapper, which has no Testing Library query
     const search = screen.getByPlaceholderText('Search this list').closest('.cds--search');
     expect(search).toHaveClass('cds--search--lg');
     expect(search).not.toHaveClass('cds--search--sm');
@@ -216,6 +217,7 @@ describe('OrdersDataTable', () => {
 
     render(<OrdersDataTable />);
 
+    // eslint-disable-next-line testing-library/no-node-access -- asserting on Carbon's search wrapper, which has no Testing Library query
     expect(screen.getByPlaceholderText('Search this list').closest('.cds--search')).toHaveClass('toolbarSearch');
   });
 

package/src/lab-tabs/laboratory-tabs.component.tsx

@@ -4,7 +4,7 @@ import { Tab, TabList, TabPanel, TabPanels, Tabs } from '@carbon/react';
 import { Extension, useAssignedExtensions, useConfig } from '@openmrs/esm-framework';
 // ComponentContext is not part of the public API but is needed here to render extensions
 // inside Carbon Tabs structure (TabList + TabPanels must be separate siblings).
-// eslint-disable-next-line no-restricted-imports
+
 import { ComponentContext } from '@openmrs/esm-framework/src/internal';
 import { type Config } from '../config-schema';
 import styles from './laboratory-tabs.scss';

package/src/lab-tabs/modals/pickup-lab-request-modal.test.tsx

@@ -113,7 +113,7 @@ describe('PickupLabRequestModal', () => {
 
     const user = userEvent.setup();
     const submitButton = screen.getByRole('button', { name: 'Pick up lab request' });
-    expect(submitButton).not.toBeDisabled();
+    expect(submitButton).toBeEnabled();
 
     await user.click(submitButton);
 

package/src/lab-tabs/modals/reject-lab-request-modal.test.tsx

@@ -121,7 +121,7 @@ describe('RejectLabRequestModal', () => {
 
     const user = userEvent.setup();
     const submitButton = screen.getByRole('button', { name: /Reject/ });
-    expect(submitButton).not.toBeDisabled();
+    expect(submitButton).toBeEnabled();
 
     await user.click(submitButton);
 

package/src/lab-tiles/laboratory-summary-tiles.component.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { type AssignedExtension, useAssignedExtensions, Extension, useConfig } from '@openmrs/esm-framework';
 // ComponentContext is not part of the public API but is needed here to render extensions
 // in a custom layout (CSS grid tiles) without the wrapper div that ExtensionSlot adds.
-// eslint-disable-next-line no-restricted-imports
+
 import { ComponentContext } from '@openmrs/esm-framework/src/internal';
 import styles from './laboratory-summary-tiles.scss';
 import { type Config } from '../config-schema';

package/tools/update-openmrs-deps.mjs

@@ -1,7 +1,7 @@
 import { execSync } from 'node:child_process';
 
 try {
-  execSync(`yarn up --fixed '@openmrs/*@next' 'openmrs@next'`, {
+  execSync(`yarn up --fixed '@openmrs/esm-framework@next' 'openmrs@next'`, {
     stdio: ['ignore', 'inherit', 'inherit'],
     windowsHide: true,
   });

package/.eslintignore

@@ -1 +0,0 @@
-**/node_modules/**/*

package/.eslintrc

@@ -1,68 +0,0 @@
-{
-  "env": {
-    "node": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": true
-  },
-  "plugins": ["@typescript-eslint", "import", "react-hooks"],
-  "root": true,
-  "rules": {
-    // The following rules need `noImplicitAny` to be set to `true` in our tsconfig. They are too restrictive for now, but should be reconsidered in future
-    "@typescript-eslint/ban-types": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-floating-promises": "off",
-    "@typescript-eslint/no-unsafe-argument": "off",
-    "@typescript-eslint/no-unsafe-assignment": "off",
-    "@typescript-eslint/no-unsafe-call": "off",
-    "@typescript-eslint/no-unsafe-member-access": "off",
-    "@typescript-eslint/no-unsafe-return": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/unbound-method": "off",
-    "@typescript-eslint/consistent-type-definitions": "off",
-    "@typescript-eslint/consistent-type-exports": "error",
-    // Use `import type` instead of `import` for type imports
-    "@typescript-eslint/consistent-type-imports": [
-      "error",
-      {
-        "fixStyle": "inline-type-imports"
-      }
-    ],
-    "import/no-duplicates": "error",
-    "no-console": ["error", { "allow": ["warn", "error"] }],
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          // These two rules ensure that we're importing lodash and lodash-es correctly. Not doing so can bloat our bundle size significantly.
-          {
-            "name": "lodash",
-            "message": "Import specific methods from `lodash`. e.g. `import map from 'lodash/map'`"
-          },
-          {
-            "name": "lodash-es",
-            "importNames": ["default"],
-            "message": "Import specific methods from `lodash-es`. e.g. `import { map } from 'lodash-es'`"
-          },
-          // These two rules ensure that we're importing Carbon components and icons from the correct packages (after v10). May be removed in the future.
-          {
-            "name": "carbon-components-react",
-            "message": "Import from `@carbon/react` directly. e.g. `import { Toggle } from '@carbon/react'`"
-          },
-          {
-            "name": "@carbon/icons-react",
-            "message": "Import from `@carbon/react/icons`. e.g. `import { ChevronUp } from '@carbon/react/icons'`"
-          }
-        ]
-      }
-    ],
-    "react-hooks/exhaustive-deps": "warn",
-    "react-hooks/rules-of-hooks": "error"
-  }
-}

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

@@ -1 +0,0 @@
-{"hash":"a026b448d2bb2bd8","duration":9222}