Merge branch 'main' into O3-4190

openmrs · Nov 13, 2024 · 84e84c3 · 84e84c3
2 parents 07e10ba + 3f42ce5
commit 84e84c3
Show file tree

Hide file tree

Showing 8 changed files with 643 additions and 33 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -9,7 +9,7 @@
     "plugin:testing-library/react"
   ],
   "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "jest-dom", "react-hooks", "testing-library"],
+  "plugins": ["@typescript-eslint", "import", "jest-dom", "react-hooks", "testing-library"],
   "rules": {
     "react-hooks/exhaustive-deps": "warn",
     "react-hooks/rules-of-hooks": "error",
@@ -26,6 +26,7 @@
         "fixStyle": "inline-type-imports"
       }
     ],
+    "import/no-duplicates": "error",
     "prefer-const": "off",
     "no-console": ["error", { "allow": ["warn", "error"] }],
     "no-unsafe-optional-chaining": "off",

diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "dayjs": "^1.11.10",
     "dotenv": "^16.3.1",
     "eslint": "^8.50.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest-dom": "^5.4.0",
     "eslint-plugin-playwright": "^0.16.0",
     "eslint-plugin-react-hooks": "^4.6.0",

diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render, within } from '@testing-library/react';
-import { type FetchResponse, getDefaultsFromConfigSchema, showSnackbar, useConfig } from '@openmrs/esm-framework';
-import { mockAllergens, mockAllergicReactions } from '__mocks__';
+import { getDefaultsFromConfigSchema, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { mockAllergens, mockAllergicReactions, mockAllergy } from '__mocks__';
 import { mockPatient } from 'tools';
 import {
   type NewAllergy,
@@ -11,7 +11,6 @@ import {
   useAllergicReactions,
   updatePatientAllergy,
 } from './allergy-form.resource';
-import { mockAllergy } from '__mocks__';
 import { type AllergiesConfigObject, configSchema } from '../../config-schema';
 import { AllergenType } from '../../types';
 import AllergyForm from './allergy-form.workspace';

diff --git a/packages/esm-patient-chart-app/src/index.ts b/packages/esm-patient-chart-app/src/index.ts
@@ -8,16 +8,14 @@ import {
 import * as PatientCommonLib from '@openmrs/esm-patient-common-lib';
 import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import { esmPatientChartSchema } from './config-schema';
-import { genericDashboardConfigSchema } from './side-nav/generic-dashboard.component';
-import { genericNavGroupConfigSchema } from './side-nav/generic-nav-group.component';
+import genericDashboardComponent, { genericDashboardConfigSchema } from './side-nav/generic-dashboard.component';
+import genericNavGroupComponent, { genericNavGroupConfigSchema } from './side-nav/generic-nav-group.component';
 import { moduleName } from './constants';
 import { setupOfflineVisitsSync, setupCacheableRoutes } from './offline';
 import { summaryDashboardMeta, encountersDashboardMeta } from './dashboard.meta';
 import addPastVisitActionButtonComponent from './actions-buttons/add-past-visit.component';
 import cancelVisitActionButtonComponent from './actions-buttons/cancel-visit.component';
 import currentVisitSummaryComponent from './visit/visits-widget/current-visit-summary.component';
-import genericDashboardComponent from './side-nav/generic-dashboard.component';
-import genericNavGroupComponent from './side-nav/generic-nav-group.component';
 import markPatientAliveActionButtonComponent from './actions-buttons/mark-patient-alive.component';
 import markPatientDeceasedActionButtonComponent from './actions-buttons/mark-patient-deceased.component';
 import pastVisitsDetailOverviewComponent from './visit/past-visit-overview.component';

diff --git a/packages/esm-patient-chart-app/src/visit-header/close-button.component.tsx b/packages/esm-patient-chart-app/src/visit-header/close-button.component.tsx
@@ -1,8 +1,7 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { HeaderGlobalAction } from '@carbon/react';
-import { getHistory, goBackInHistory, navigate, CloseFilledIcon } from '@openmrs/esm-framework';
-import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
+import { getHistory, goBackInHistory, navigate, CloseFilledIcon } from '@openmrs/esm-framework';
 import styles from './close-button.scss';
 
 export function CloseButton({ patientUuid }: { patientUuid: string }) {
@@ -29,8 +28,8 @@ export function CloseButton({ patientUuid }: { patientUuid: string }) {
 
   return (
     <HeaderGlobalAction
-      className={styles.headerGlobalBarCloseButton}
       aria-label={t('close', 'Close')}
+      className={styles.headerGlobalBarCloseButton}
       onClick={onClosePatientChart}
     >
       <CloseFilledIcon size={20} />

diff --git a/packages/esm-patient-common-lib/src/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces.ts
@@ -1,15 +1,9 @@
-import {
-  type DefaultWorkspaceProps,
-  launchWorkspace,
-  navigateAndLaunchWorkspace,
-  usePatient,
-} from '@openmrs/esm-framework';
-import { getPatientUuidFromStore } from './store/patient-chart-store';
-import { useSystemVisitSetting } from './useSystemVisitSetting';
-import { useVisitOrOfflineVisit } from './offline/visit';
 import { useCallback } from 'react';
+import { type DefaultWorkspaceProps, launchWorkspace, navigateAndLaunchWorkspace } from '@openmrs/esm-framework';
+import { getPatientUuidFromStore, usePatientChartStore } from './store/patient-chart-store';
 import { launchStartVisitPrompt } from './launchStartVisitPrompt';
-import { usePatientChartStore } from './store/patient-chart-store';
+import { useSystemVisitSetting } from './useSystemVisitSetting';
+import { useVisitOrOfflineVisit } from './offline/visit';
 
 export interface DefaultPatientWorkspaceProps extends DefaultWorkspaceProps {
   patientUuid: string;

diff --git a/...-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx b/...-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Button, ButtonSkeleton, SkeletonText, Tile } from '@carbon/react';
 import { ShoppingCartArrowUp } from '@carbon/react/icons';
-import { launchPatientWorkspace, useOrderBasket } from '@openmrs/esm-patient-common-lib';
+import { launchPatientWorkspace, useOrderBasket, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import {
   ArrowRightIcon,
   closeWorkspace,
@@ -24,7 +24,6 @@ import {
 } from './drug-search.resource';
 import type { DrugOrderBasketItem } from '../../types';
 import styles from './order-basket-search-results.scss';
-import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 export interface OrderBasketSearchResultsProps {
   searchTerm: string;