diff --git a/.eslintignore b/.eslintignore index 667d5dc6f..adefaa5ca 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,2 @@ -src/**/*.test.tsx -src/**/*.spec.tsx -**/*.d.tsx +**/*.d.ts **/node_modules/**/* diff --git a/.eslintrc b/.eslintrc index 7941ced68..9e8c845e9 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,34 +1,54 @@ { + "env": { + "node": true + }, + "extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:@typescript-eslint/recommended"], "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint"], - "extends": ["ts-react-important-stuff", "plugin:prettier/recommended"], + "plugins": ["@typescript-eslint", "react-hooks"], "rules": { - "curly": ["error", "all"], + // Disabling these rules for now just to keep the diff small. I'll enable them one by one as we go. + "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/ban-types": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/no-unused-vars": "off", + "@typescript-eslint/no-var-requires": "off", + "@typescript-eslint/triple-slash-reference": "off", + // Use `import type` instead of `import` for type imports https://typescript-eslint.io/blog/consistent-type-imports-and-exports-why-and-how + "@typescript-eslint/consistent-type-imports": [ + "error", + { + "fixStyle": "inline-type-imports" + } + ], + "prefer-const": "off", + "no-console": ["error", { "allow": ["warn", "error"] }], + "no-unsafe-optional-chaining": "off", + "no-explicit-any": "off", + "no-extra-boolean-cast": "off", + "no-prototype-builtins": "off", + "no-useless-escape": "off", "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-es`. e.g. `import map from 'lodash-es/map'`" + "message": "Import specific methods from `lodash`. e.g. `import map from 'lodash/map'`" }, { "name": "lodash-es", - "message": "Import specific methods from `lodash-es`. e.g. `import map from 'lodash-es/map'`" - } - ], - "patterns": [ + "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. { - "group": ["carbon-components-react"], + "name": "carbon-components-react", "message": "Import from `@carbon/react` directly. e.g. `import { Toggle } from '@carbon/react'`" }, { - "group": ["@carbon/icons-react"], + "name": "@carbon/icons-react", "message": "Import from `@carbon/react/icons`. e.g. `import { ChevronUp } from '@carbon/react/icons'`" - }, - { - "group": ["@import '~carbon-components/src/globals/scss/vars'"], - "message": "Import from `@carbon/styles/scss`. e.g. `@use '@carbon/styles/scss/type'`" } ] } diff --git a/.husky/pre-commit b/.husky/pre-commit index 39c5b8eac..39b3f0e75 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -3,5 +3,6 @@ set -e # die on error -npx pretty-quick --staged yarn run extract-translations +yarn prettier && npx lint-staged + diff --git a/jest.config.js b/jest.config.js index b50c061c6..0cb352c5f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -34,7 +34,7 @@ module.exports = { lines: 80, }, }, - setupFilesAfterEnv: [path.resolve(__dirname, 'tools', 'setupTests.ts')], + setupFilesAfterEnv: [path.resolve(__dirname, 'tools', 'setup-tests.ts')], testPathIgnorePatterns: [path.resolve(__dirname, 'e2e')], testEnvironment: 'jsdom', testEnvironmentOptions: { diff --git a/package.json b/package.json index 021c30b33..347b2858e 100644 --- a/package.json +++ b/package.json @@ -41,19 +41,19 @@ "@types/uuid": "^8.3.0", "@types/webpack-env": "^1.16.0", "@types/yup": "^0.29.11", - "@typescript-eslint/eslint-plugin": "^4.15.1", - "@typescript-eslint/parser": "^4.15.1", + "@typescript-eslint/eslint-plugin": "^6.13.2", + "@typescript-eslint/parser": "^6.13.2", "babel-preset-minify": "^0.5.1", "concurrently": "^5.3.0", "cross-env": "^7.0.3", "css-loader": "^6.8.1", "dayjs": "^1.8.36", "dotenv": "^16.0.3", - "eslint": "^7.20.0", - "eslint-config-prettier": "^8.2.0", - "eslint-config-ts-react-important-stuff": "^3.0.0", - "eslint-plugin-prettier": "^3.3.1", - "husky": "^8.0.1", + "eslint": "^8.55.0", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-react-hooks": "^4.6.0", + "husky": "^8.0.3", "i18next": "^21.10.0", "i18next-parser": "^6.6.0", "identity-obj-proxy": "^3.0.0", @@ -61,8 +61,7 @@ "jest-cli": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "openmrs": "next", - "prettier": "^2.4.1", - "pretty-quick": "^2.0.2", + "prettier": "^3.1.1", "react": "^18.1.0", "react-dom": "^18.1.0", "react-i18next": "^11.18.6", @@ -76,5 +75,8 @@ "webpack": "^5.74.0", "webpack-cli": "^4.10.0" }, + "lint-staged": { + "*.{js,jsx,ts,tsx}": "eslint --cache --fix" + }, "packageManager": "yarn@4.0.1" } diff --git a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx index 71ed65bda..3aa5cc5f5 100644 --- a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx +++ b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx @@ -1,4 +1,4 @@ -import React, { useMemo, useState, useCallback, MouseEvent, AnchorHTMLAttributes } from 'react'; +import React, { useMemo, useState, useCallback, type MouseEvent, type AnchorHTMLAttributes } from 'react'; import { DataTable, DataTableSkeleton, diff --git a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx index dda8e3bfa..3d67e1b5f 100644 --- a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx +++ b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx @@ -5,9 +5,9 @@ import isToday from 'dayjs/plugin/isToday'; import last from 'lodash-es/last'; import { openmrsFetch, - Visit, + type Visit, useSession, - FetchResponse, + type FetchResponse, formatDatetime, parseDate, useConfig, diff --git a/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx index 059e49082..a9112a193 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx +++ b/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { ContentSwitcher, DataTableSkeleton, Switch } from '@carbon/react'; -import { Encounter, useVisit } from './visit.resource'; +import { type Encounter, useVisit } from './visit.resource'; import { formatTime, formatDatetime, parseDate } from '@openmrs/esm-framework'; import EncounterList from './visits-components/encounter-list.component'; import VisitSummary from './visits-components/visit-summary.component'; diff --git a/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts b/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts index 8f7b212e1..e9f2dc6a5 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts +++ b/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts @@ -1,4 +1,4 @@ -import { openmrsFetch, Visit } from '@openmrs/esm-framework'; +import { openmrsFetch, type Visit } from '@openmrs/esm-framework'; import useSWR from 'swr'; export interface Encounter { diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx index 6027bca95..4d2b42a88 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx +++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx @@ -15,7 +15,7 @@ import { TableExpandedRow, } from '@carbon/react'; import { useLayoutType, isDesktop } from '@openmrs/esm-framework'; -import { Observation } from '../visit.resource'; +import { type Observation } from '../visit.resource'; import EncounterObservations from './encounter-observations.component'; import styles from '../visit-detail-overview.scss'; diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx index a4a7e936b..747951188 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx +++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { SkeletonText } from '@carbon/react'; -import { Observation } from '../visit.resource'; +import { type Observation } from '../visit.resource'; import styles from '../visit-detail-overview.scss'; interface EncounterObservationsProps { diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx index e8a025ea1..83f4a8456 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx +++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames'; import capitalize from 'lodash-es/capitalize'; import { useTranslation } from 'react-i18next'; import { formatTime, parseDate } from '@openmrs/esm-framework'; -import { OrderItem, getDosage } from '../visit.resource'; +import { type OrderItem, getDosage } from '../visit.resource'; import styles from '../visit-detail-overview.scss'; interface MedicationSummaryProps { diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx index f346111c7..be6d48485 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx +++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from 'react'; import classNames from 'classnames'; import { ExtensionSlot } from '@openmrs/esm-framework'; -import { Encounter } from '../visit.resource'; +import { type Encounter } from '../visit.resource'; import styles from '../visit-detail-overview.scss'; const TestsSummary = ({ patientUuid, encounters }: { patientUuid: string; encounters: Array }) => { diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx index 705a60d2d..0cb59b83c 100644 --- a/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx +++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx @@ -2,11 +2,11 @@ import React, { useState, useMemo } from 'react'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { Tab, Tabs, TabList, TabPanel, TabPanels, Tag } from '@carbon/react'; -import { OpenmrsResource, formatTime, parseDate } from '@openmrs/esm-framework'; +import { type OpenmrsResource, formatTime, parseDate } from '@openmrs/esm-framework'; import NotesSummary from './notes-summary.component'; import MedicationSummary from './medications-summary.component'; import TestsSummary from './tests-summary.component'; -import { Order, Encounter, Note, Observation, OrderItem } from '../visit.resource'; +import { type Order, type Encounter, type Note, type Observation, type OrderItem } from '../visit.resource'; import styles from '../visit-detail-overview.scss'; interface DiagnosisItem { diff --git a/packages/esm-appointments-app/src/admin/appointment-services/appointment-services.component.tsx b/packages/esm-appointments-app/src/admin/appointment-services/appointment-services.component.tsx index c581286e6..024666f5d 100644 --- a/packages/esm-appointments-app/src/admin/appointment-services/appointment-services.component.tsx +++ b/packages/esm-appointments-app/src/admin/appointment-services/appointment-services.component.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Button, ButtonSet, Dropdown, Layer, SelectItem, TextInput, TimePicker, TimePickerSelect } from '@carbon/react'; import { useTranslation } from 'react-i18next'; -import { Form, Formik, FormikHelpers } from 'formik'; +import { Form, Formik, type FormikHelpers } from 'formik'; import { validationSchema } from './appointment-services-validation'; import { useAppointmentServices } from './appointment-services-hook'; import { showNotification, showToast, useLocations } from '@openmrs/esm-framework'; diff --git a/packages/esm-appointments-app/src/appointments-calendar/calendar-view.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/calendar-view.component.tsx index 113b9e6fa..ffd43aa9f 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/calendar-view.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/calendar-view.component.tsx @@ -2,7 +2,7 @@ import React from 'react'; import DailyCalendarView from './daily/daily-calendar-view.component'; import MonthlyCalendarView from './monthly/monthly-calendar-view.component'; import WeeklyCalendarView from './weekly/weekly-calendar-view.component'; -import { CalendarType } from '../types'; +import { type CalendarType } from '../types'; const CalendarView: React.FC<{ calendarView: CalendarType; diff --git a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-calendar-view.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-calendar-view.component.tsx index a19c08740..55a58db7b 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-calendar-view.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-calendar-view.component.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import dayjs, { Dayjs } from 'dayjs'; +import dayjs, { type Dayjs } from 'dayjs'; import isBetween from 'dayjs/plugin/isBetween'; import styles from './daily-calendar.scss'; -import { CalendarType } from '../../types'; +import { type CalendarType } from '../../types'; import { dailyHours } from '../../helpers'; import DailyHeader from './daily-header.component'; import DailyWorkloadView from './daily-view-workload.component'; diff --git a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-header.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-header.component.tsx index e8a41c95d..f7420ac4d 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-header.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-header.component.tsx @@ -1,9 +1,9 @@ import { Button } from '@carbon/react'; -import dayjs, { Dayjs } from 'dayjs'; +import dayjs, { type Dayjs } from 'dayjs'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { type CalendarType } from '../../types'; import styles from './daily-header.scss'; -import { CalendarType } from '../../types'; const Format = { monthly: 'month', diff --git a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.component.tsx index 0672294fa..9437bcc4d 100755 --- a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.component.tsx @@ -6,7 +6,7 @@ import { navigate, useLayoutType } from '@openmrs/esm-framework'; import { useTranslation } from 'react-i18next'; import { spaBasePath } from '../../constants'; import { isSameMonth } from '../../helpers'; -import { CalendarType } from '../../types'; +import { type CalendarType } from '../../types'; interface WeeklyCellProps { type: CalendarType; @@ -30,8 +30,8 @@ const DailyWorkloadView: React.FC = ({ type, dateTime, currentD type === 'daily' ? 'weekly-cell' : isSameMonth(dateTime, currentDate) - ? 'monthly-cell' - : 'monthly-cell-disabled' + ? 'monthly-cell' + : 'monthly-cell-disabled' ] }> {type === 'daily' ? ( diff --git a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.test.tsx b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.test.tsx index 33c47fc68..0a992a03e 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.test.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/daily/daily-view-workload.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { render, screen } from '@testing-library/react'; import { navigate } from '@openmrs/esm-framework'; import { spaBasePath } from '../../constants'; -import { CalendarType } from '../../types'; +import { type CalendarType } from '../../types'; import DailyWorkloadView from './daily-view-workload.component'; jest.mock('@openmrs/esm-framework', () => ({ diff --git a/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-calendar-view.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-calendar-view.component.tsx index f88384390..42057b552 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-calendar-view.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-calendar-view.component.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import dayjs, { Dayjs } from 'dayjs'; +import dayjs, { type Dayjs } from 'dayjs'; import isBetween from 'dayjs/plugin/isBetween'; -import { CalendarType } from '../../types'; +import { type CalendarType } from '../../types'; import { monthDays } from '../../helpers/functions'; import MonthlyViewWorkload from './monthly-view-workload.component'; import MonthlyHeader from './monthly-header.module'; diff --git a/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-header.module.tsx b/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-header.module.tsx index 2d4c88519..29f0f8eda 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-header.module.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/monthly/monthly-header.module.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import dayjs, { Dayjs } from 'dayjs'; +import { type Dayjs } from 'dayjs'; import styles from './monthly-header.module.scss'; import { Button } from '@carbon/react'; import { useTranslation } from 'react-i18next'; -import { CalendarType } from '../../types'; +import { type CalendarType } from '../../types'; import DaysOfWeekCard from '../daily/days-of-week.component'; const Format = { @@ -38,9 +38,7 @@ function MonthlyHeader({
- {daysInWeek?.map((day, i) => ( - - ))} + {daysInWeek?.map((day, i) => )}
); diff --git a/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-calendar-view.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-calendar-view.component.tsx index de3ee0450..ee74229ea 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-calendar-view.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-calendar-view.component.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import dayjs, { Dayjs } from 'dayjs'; +import dayjs, { type Dayjs } from 'dayjs'; import isBetween from 'dayjs/plugin/isBetween'; import styles from './weekly-calendar.scss'; -import { CalendarType } from '../../types'; +import { type CalendarType } from '../../types'; import { isSameMonth, weekAllDays, weekDays } from '../../helpers'; import WeeklyWorkloadView from './weekly-view-workload.component'; import WeeklyHeader from './weekly-header.component'; @@ -51,8 +51,8 @@ const WeeklyCalendarView: React.FC = ({ type === 'weekly' ? 'weekly-cell' : isSameMonth(dateTime, currentDate) - ? 'monthly-cell' - : 'monthly-cell-disabled' + ? 'monthly-cell' + : 'monthly-cell-disabled' ] }> {type === 'weekly' ? ( diff --git a/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-header.component.tsx b/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-header.component.tsx index 47e989e32..7acb080f8 100644 --- a/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-header.component.tsx +++ b/packages/esm-appointments-app/src/appointments-calendar/weekly/weekly-header.component.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Button } from '@carbon/react'; -import { Dayjs } from 'dayjs'; +import { type Dayjs } from 'dayjs'; import { useTranslation } from 'react-i18next'; import { weekDays } from '../../helpers'; import type { CalendarType } from '../../types'; @@ -37,10 +37,10 @@ function WeeklyHeader({ {type === 'monthly' ? currentDate.format(monthFormat) : type === 'daily' - ? currentDate.format(dateFormat) - : `${currentDate.startOf('week').format(dateFormat)} - ${currentDate - .endOf('week') - .format(dateFormat)} , ${currentDate.format(yearFormat)}`} + ? currentDate.format(dateFormat) + : `${currentDate.startOf('week').format(dateFormat)} - ${currentDate + .endOf('week') + .format(dateFormat)} , ${currentDate.format(yearFormat)}`} ); - case isTodayAppointment: + case isTodayAppointment: { const isAfterNoon = new Date().getHours() > 12; if (scheduleType === 'Pending' && isAfterNoon) { @@ -82,6 +82,8 @@ const AppointmentActions: React.FC = ({ visits, appoint } return ; + } + default: if (!isFutureAppointment) { return ( diff --git a/packages/esm-appointments-app/src/appointments/common-components/appointments-actions.test.tsx b/packages/esm-appointments-app/src/appointments/common-components/appointments-actions.test.tsx index 2be602a21..1202d20b6 100644 --- a/packages/esm-appointments-app/src/appointments/common-components/appointments-actions.test.tsx +++ b/packages/esm-appointments-app/src/appointments/common-components/appointments-actions.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import AppointmentActions from './appointments-actions.component'; -import { MappedAppointment } from '../../types'; +import { type MappedAppointment } from '../../types'; describe('AppointmentActions', () => { const defaultProps = { diff --git a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx index d13719866..854234f9a 100644 --- a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx +++ b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx @@ -25,9 +25,9 @@ import { Download } from '@carbon/react/icons'; import { EmptyState } from '../../empty-state/empty-state.component'; import { downloadAppointmentsAsExcel } from '../../helpers/excel'; import { launchOverlay } from '../../hooks/useOverlay'; -import { MappedAppointment } from '../../types'; +import { type MappedAppointment } from '../../types'; import { getPageSizes, useSearchResults } from '../utils'; -import { ConfigObject } from '../../config-schema'; +import { type ConfigObject } from '../../config-schema'; import AppointmentDetails from '../details/appointment-details.component'; import AppointmentActions from './appointments-actions.component'; import PatientSearch from '../../patient-search/patient-search.component'; diff --git a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx index b088cd4eb..f14bd5e12 100644 --- a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx +++ b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import userEvent from '@testing-library/user-event'; import { render, screen } from '@testing-library/react'; -import { MappedAppointment } from '../../types'; +import { type MappedAppointment } from '../../types'; import { usePagination } from '@openmrs/esm-framework'; import { downloadAppointmentsAsExcel } from '../../helpers/excel'; import { launchOverlay } from '../../hooks/useOverlay'; diff --git a/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx b/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx index 8edd0fbb4..36d378679 100644 --- a/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx +++ b/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx @@ -3,7 +3,7 @@ import { Button } from '@carbon/react'; import { useTranslation } from 'react-i18next'; import { launchOverlay } from '../../hooks/useOverlay'; import VisitForm from '../../patient-queue/visit-form/visit-form.component'; -import { MappedAppointment } from '../../types'; +import { type MappedAppointment } from '../../types'; import dayjs from 'dayjs'; import isToday from 'dayjs/plugin/isToday'; import utc from 'dayjs/plugin/utc'; diff --git a/packages/esm-appointments-app/src/appointments/details/appointment-details.component.tsx b/packages/esm-appointments-app/src/appointments/details/appointment-details.component.tsx index 9abcbb014..9aa7f48ca 100644 --- a/packages/esm-appointments-app/src/appointments/details/appointment-details.component.tsx +++ b/packages/esm-appointments-app/src/appointments/details/appointment-details.component.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { MappedAppointment } from '../../types/index'; +import { type MappedAppointment } from '../../types/index'; import styles from './appointment-details.scss'; import { usePatientAppointmentHistory } from '../../hooks/usePatientAppointmentHistory'; import { formatDate } from '@openmrs/esm-framework'; diff --git a/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.component.tsx b/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.component.tsx index ead571839..60bd4046e 100644 --- a/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.component.tsx +++ b/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.component.tsx @@ -6,7 +6,7 @@ import { cancelAppointment } from '../forms.resource'; import { useSWRConfig } from 'swr'; import { useAppointmentDate } from '../../../helpers'; import { closeOverlay } from '../../../hooks/useOverlay'; -import { MappedAppointment } from '../../../types'; +import { type MappedAppointment } from '../../../types'; import styles from './cancel-appointment.scss'; interface CancelAppointmentProps { diff --git a/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.test.tsx b/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.test.tsx index 8aa985f51..ed11a6736 100644 --- a/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.test.tsx +++ b/packages/esm-appointments-app/src/appointments/forms/cancel-form/cancel-appointment.test.tsx @@ -14,8 +14,8 @@ const mockShowToast = showToast as jest.Mock; const mockCancelAppointment = cancelAppointment as jest.Mock; const mockShowNotification = showNotification as jest.Mock; -jest.mock('../forms.resource.ts', () => { - const originalModule = jest.requireActual('../forms.resource.ts'); +jest.mock('../forms.resource', () => { + const originalModule = jest.requireActual('../forms.resource'); return { ...originalModule, diff --git a/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.component.tsx b/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.component.tsx index 442fc6c00..e4ff732cd 100644 --- a/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.component.tsx +++ b/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.component.tsx @@ -28,6 +28,7 @@ import { Toggle, } from '@carbon/react'; import { + type ConfigObject, ExtensionSlot, showNotification, showToast, @@ -39,7 +40,7 @@ import { } from '@openmrs/esm-framework'; import { useAppointmentDate, convertTime12to24 } from '../../../helpers'; import { closeOverlay } from '../../../hooks/useOverlay'; -import { MappedAppointment, AppointmentPayload } from '../../../types'; +import { type MappedAppointment, type AppointmentPayload } from '../../../types'; import { saveAppointment, toAppointmentDateTime, @@ -47,14 +48,13 @@ import { useProviders, useServices, } from '../forms.resource'; -import { useInitialAppointmentFormValue, PatientAppointment } from '../useInitialFormValues'; +import { useAppointmentList } from '../../../hooks/useAppointmentList'; import { useCalendarDistribution } from '../workload-helper'; import { useDefaultLoginLocation } from '../../../hooks/useDefaultLocation'; +import { useInitialAppointmentFormValue, type PatientAppointment } from '../useInitialFormValues'; import LocationSelectOption from '../../common-components/location-select-option.component'; import WorkloadCard from '../workload.component'; import styles from './appointments-form.scss'; -import { useAppointmentList } from '../../../hooks/useAppointmentList'; -import { ConfigObject } from '../../../config-schema'; interface AppointmentFormProps { appointment?: MappedAppointment; diff --git a/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.test.tsx b/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.test.tsx index bd0b769f4..b6d21c04c 100644 --- a/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.test.tsx +++ b/packages/esm-appointments-app/src/appointments/forms/create-edit-form/appointments-form.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render, screen, within } from '@testing-library/react'; import { useConfig, usePatient } from '@openmrs/esm-framework'; import { mockLocations, mockSession, mockPatient, mockServices, mockProviders } from '__mocks__'; -import { MappedAppointment } from '../../../types'; +import { type MappedAppointment } from '../../../types'; import AppointmentForm from './appointments-form.component'; const mockedUseConfig = useConfig as jest.Mock; @@ -12,8 +12,8 @@ function renderAppointmentsForm(context: string, patientUuid?: string, appointme render(); } -jest.mock('../forms.resource.ts', () => { - const originalModule = jest.requireActual('../forms.resource.ts'); +jest.mock('../forms.resource', () => { + const originalModule = jest.requireActual('../forms.resource'); return { ...originalModule, diff --git a/packages/esm-appointments-app/src/appointments/forms/useInitialFormValues.tsx b/packages/esm-appointments-app/src/appointments/forms/useInitialFormValues.ts similarity index 91% rename from packages/esm-appointments-app/src/appointments/forms/useInitialFormValues.tsx rename to packages/esm-appointments-app/src/appointments/forms/useInitialFormValues.ts index f70c16aa3..49f22b8d2 100644 --- a/packages/esm-appointments-app/src/appointments/forms/useInitialFormValues.tsx +++ b/packages/esm-appointments-app/src/appointments/forms/useInitialFormValues.ts @@ -1,7 +1,7 @@ -import { OpenmrsResource, useConfig, useSession } from '@openmrs/esm-framework'; +import { type OpenmrsResource, useConfig, useSession } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; -import { amPm } from '../../helpers'; -import { MappedAppointment } from '../../types'; +import { type amPm } from '../../helpers'; +import { type MappedAppointment } from '../../types'; import { ConfigObject } from '../../config-schema'; export interface PatientAppointment { diff --git a/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx b/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx index 5f6dc8d33..f3edb416b 100644 --- a/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx +++ b/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx @@ -22,7 +22,7 @@ import { useUnscheduledAppointments } from '../../hooks/useUnscheduledAppointmen import { downloadUnscheduledAppointments } from '../../helpers/excel'; import { EmptyState } from '../../empty-state/empty-state.component'; import { getPageSizes, useSearchResults } from '../utils'; -import { ConfigObject } from '../../config-schema'; +import { type ConfigObject } from '../../config-schema'; const UnscheduledAppointments: React.FC = () => { const { t } = useTranslation(); diff --git a/packages/esm-appointments-app/src/createDashboardLink.component.tsx b/packages/esm-appointments-app/src/createDashboardLink.component.tsx index e94357ed4..430c1b03e 100644 --- a/packages/esm-appointments-app/src/createDashboardLink.component.tsx +++ b/packages/esm-appointments-app/src/createDashboardLink.component.tsx @@ -32,9 +32,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash ); } -export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => - ( - - - - ); +export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => ( + + + +); diff --git a/packages/esm-appointments-app/src/home-appointments/appointments-list.component.tsx b/packages/esm-appointments-app/src/home-appointments/appointments-list.component.tsx index 9652f757f..572d1e439 100644 --- a/packages/esm-appointments-app/src/home-appointments/appointments-list.component.tsx +++ b/packages/esm-appointments-app/src/home-appointments/appointments-list.component.tsx @@ -31,10 +31,10 @@ import { ActionsMenu } from './appointment-actions.component'; import { EmptyDataIllustration } from './empty-data-illustration.component'; import { launchCheckInAppointmentModal, handleComplete } from './common'; import { SeeAllAppointmentsLink, AddAppointmentLink, ViewCalendarLink } from './links.component'; -import { Appointment, MappedHomeAppointment } from '../types'; +import { type Appointment, type MappedHomeAppointment } from '../types'; import { useTodaysAppointments } from './appointments-table.resource'; import styles from './appointments-list.scss'; -import { ConfigObject } from '../config-schema'; +import { type ConfigObject } from '../config-schema'; interface PaginationData { goTo: (page: number) => void; diff --git a/packages/esm-appointments-app/src/hooks/useAppointmentList.tsx b/packages/esm-appointments-app/src/hooks/useAppointmentList.ts similarity index 97% rename from packages/esm-appointments-app/src/hooks/useAppointmentList.tsx rename to packages/esm-appointments-app/src/hooks/useAppointmentList.ts index 90ea23fd1..4bf755f33 100644 --- a/packages/esm-appointments-app/src/hooks/useAppointmentList.tsx +++ b/packages/esm-appointments-app/src/hooks/useAppointmentList.ts @@ -1,6 +1,6 @@ import useSWR from 'swr'; import { openmrsFetch } from '@openmrs/esm-framework'; -import { AppointmentService, Identifier, Provider } from '../types'; +import { type AppointmentService, type Identifier, type Provider } from '../types'; import { useAppointmentDate } from '../helpers'; import dayjs from 'dayjs'; import { configSchema } from '../config-schema'; diff --git a/packages/esm-appointments-app/src/hooks/useAppointmentService.tsx b/packages/esm-appointments-app/src/hooks/useAppointmentService.ts similarity index 86% rename from packages/esm-appointments-app/src/hooks/useAppointmentService.tsx rename to packages/esm-appointments-app/src/hooks/useAppointmentService.ts index ac5e87a16..3a9bcdfe8 100644 --- a/packages/esm-appointments-app/src/hooks/useAppointmentService.tsx +++ b/packages/esm-appointments-app/src/hooks/useAppointmentService.ts @@ -1,6 +1,6 @@ import { openmrsFetch } from '@openmrs/esm-framework'; import useSWR from 'swr'; -import { AppointmentService } from '../types'; +import { type AppointmentService } from '../types'; export function useAppointmentServices() { const { data, error, isLoading } = useSWR<{ data: Array }>( diff --git a/packages/esm-appointments-app/src/hooks/useAppointments.tsx b/packages/esm-appointments-app/src/hooks/useAppointments.ts similarity index 96% rename from packages/esm-appointments-app/src/hooks/useAppointments.tsx rename to packages/esm-appointments-app/src/hooks/useAppointments.ts index 8c1ef9daa..183d969ef 100644 --- a/packages/esm-appointments-app/src/hooks/useAppointments.tsx +++ b/packages/esm-appointments-app/src/hooks/useAppointments.ts @@ -2,7 +2,7 @@ import { openmrsFetch } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; import useSWR from 'swr'; import { omrsDateFormat } from '../constants'; -import { Appointment, DurationPeriod } from '../types'; +import { type Appointment, DurationPeriod } from '../types'; interface AppointmentsReturnType { isLoading: boolean; diff --git a/packages/esm-appointments-app/src/hooks/useAppointmentsCalendar.tsx b/packages/esm-appointments-app/src/hooks/useAppointmentsCalendar.ts similarity index 95% rename from packages/esm-appointments-app/src/hooks/useAppointmentsCalendar.tsx rename to packages/esm-appointments-app/src/hooks/useAppointmentsCalendar.ts index 922a50d9f..00fab675b 100644 --- a/packages/esm-appointments-app/src/hooks/useAppointmentsCalendar.tsx +++ b/packages/esm-appointments-app/src/hooks/useAppointmentsCalendar.ts @@ -1,4 +1,4 @@ -import { openmrsFetch, OpenmrsResource } from '@openmrs/esm-framework'; +import { openmrsFetch, type OpenmrsResource } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; import useSWR from 'swr'; import { omrsDateFormat } from '../constants'; diff --git a/packages/esm-appointments-app/src/hooks/useClinicalMetrics.tsx b/packages/esm-appointments-app/src/hooks/useClinicalMetrics.ts similarity index 97% rename from packages/esm-appointments-app/src/hooks/useClinicalMetrics.tsx rename to packages/esm-appointments-app/src/hooks/useClinicalMetrics.ts index ce3bcca33..b5821099d 100644 --- a/packages/esm-appointments-app/src/hooks/useClinicalMetrics.tsx +++ b/packages/esm-appointments-app/src/hooks/useClinicalMetrics.ts @@ -2,7 +2,7 @@ import useSWR from 'swr'; import dayjs from 'dayjs'; import uniqBy from 'lodash-es/uniqBy'; import { openmrsFetch } from '@openmrs/esm-framework'; -import { Appointment, AppointmentSummary } from '../types'; +import { type Appointment, type AppointmentSummary } from '../types'; import { omrsDateFormat } from '../constants'; import { getHighestAppointmentServiceLoad, diff --git a/packages/esm-appointments-app/src/hooks/useDefaultLocation.tsx b/packages/esm-appointments-app/src/hooks/useDefaultLocation.ts similarity index 81% rename from packages/esm-appointments-app/src/hooks/useDefaultLocation.tsx rename to packages/esm-appointments-app/src/hooks/useDefaultLocation.ts index 0f8643667..11dcdabda 100644 --- a/packages/esm-appointments-app/src/hooks/useDefaultLocation.tsx +++ b/packages/esm-appointments-app/src/hooks/useDefaultLocation.ts @@ -1,4 +1,4 @@ -import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework'; +import { type FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework'; import useSWRImmutable from 'swr/immutable'; export const useDefaultLoginLocation = () => { diff --git a/packages/esm-appointments-app/src/hooks/usePatientAppointmentHistory.tsx b/packages/esm-appointments-app/src/hooks/usePatientAppointmentHistory.ts similarity index 96% rename from packages/esm-appointments-app/src/hooks/usePatientAppointmentHistory.tsx rename to packages/esm-appointments-app/src/hooks/usePatientAppointmentHistory.ts index c8c5796aa..a9714f1dc 100644 --- a/packages/esm-appointments-app/src/hooks/usePatientAppointmentHistory.tsx +++ b/packages/esm-appointments-app/src/hooks/usePatientAppointmentHistory.ts @@ -1,5 +1,5 @@ import { openmrsFetch } from '@openmrs/esm-framework'; -import { AppointmentsFetchResponse } from '../types'; +import { type AppointmentsFetchResponse } from '../types'; import useSWR from 'swr'; import dayjs from 'dayjs'; import { useAppointmentDate } from '../helpers'; diff --git a/packages/esm-appointments-app/src/hooks/useProviders.tsx b/packages/esm-appointments-app/src/hooks/useProviders.ts similarity index 90% rename from packages/esm-appointments-app/src/hooks/useProviders.tsx rename to packages/esm-appointments-app/src/hooks/useProviders.ts index 04801a05c..cc464405e 100644 --- a/packages/esm-appointments-app/src/hooks/useProviders.tsx +++ b/packages/esm-appointments-app/src/hooks/useProviders.ts @@ -1,6 +1,6 @@ import { openmrsFetch } from '@openmrs/esm-framework'; import useSWR from 'swr'; -import { Provider } from '../types'; +import { type Provider } from '../types'; export function useProviders() { const apiUrl = `/ws/rest/v1/provider`; diff --git a/packages/esm-appointments-app/src/hooks/useServiceQueus.tsx b/packages/esm-appointments-app/src/hooks/useServiceQueus.ts similarity index 100% rename from packages/esm-appointments-app/src/hooks/useServiceQueus.tsx rename to packages/esm-appointments-app/src/hooks/useServiceQueus.ts diff --git a/packages/esm-appointments-app/src/hooks/useUnscheduledAppointments.tsx b/packages/esm-appointments-app/src/hooks/useUnscheduledAppointments.ts similarity index 91% rename from packages/esm-appointments-app/src/hooks/useUnscheduledAppointments.tsx rename to packages/esm-appointments-app/src/hooks/useUnscheduledAppointments.ts index 5c61b9a96..c7597d67e 100644 --- a/packages/esm-appointments-app/src/hooks/useUnscheduledAppointments.tsx +++ b/packages/esm-appointments-app/src/hooks/useUnscheduledAppointments.ts @@ -1,7 +1,7 @@ import { openmrsFetch } from '@openmrs/esm-framework'; import useSWR from 'swr'; -import { mapAppointmentProperties, useAppointmentDate } from '../helpers'; -import { Identifier } from '../types'; +import { useAppointmentDate } from '../helpers'; +import { type Identifier } from '../types'; import { configSchema } from '../config-schema'; export interface Response { diff --git a/packages/esm-appointments-app/src/hooks/useVisits.tsx b/packages/esm-appointments-app/src/hooks/useVisits.ts similarity index 92% rename from packages/esm-appointments-app/src/hooks/useVisits.tsx rename to packages/esm-appointments-app/src/hooks/useVisits.ts index 3e6ad0992..7f5e4de74 100644 --- a/packages/esm-appointments-app/src/hooks/useVisits.tsx +++ b/packages/esm-appointments-app/src/hooks/useVisits.ts @@ -1,5 +1,5 @@ import useSWR from 'swr'; -import { useSession, Visit, openmrsFetch } from '@openmrs/esm-framework'; +import { useSession, type Visit, openmrsFetch } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; import { useAppointmentDate } from '../helpers'; diff --git a/packages/esm-appointments-app/src/past-visit/encounter-list.component.tsx b/packages/esm-appointments-app/src/past-visit/encounter-list.component.tsx index 832d5905f..a92ad8129 100644 --- a/packages/esm-appointments-app/src/past-visit/encounter-list.component.tsx +++ b/packages/esm-appointments-app/src/past-visit/encounter-list.component.tsx @@ -9,7 +9,7 @@ import { } from '@carbon/react'; import { useTranslation } from 'react-i18next'; import { formatDatetime, parseDate } from '@openmrs/esm-framework'; -import { FormattedEncounter } from './past-visit.component'; +import { type FormattedEncounter } from './past-visit.component'; import styles from './past-visit.scss'; interface EncounterListProps { diff --git a/packages/esm-appointments-app/src/past-visit/past-visit.component.tsx b/packages/esm-appointments-app/src/past-visit/past-visit.component.tsx index 3e0ff1f35..c6c5b3b75 100644 --- a/packages/esm-appointments-app/src/past-visit/past-visit.component.tsx +++ b/packages/esm-appointments-app/src/past-visit/past-visit.component.tsx @@ -2,8 +2,8 @@ import React, { useState } from 'react'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { StructuredListSkeleton, Tab, Tabs } from '@carbon/react'; -import { formatDate, OpenmrsResource, parseDate, useLayoutType } from '@openmrs/esm-framework'; -import { Observation } from '../types'; +import { formatDate, type OpenmrsResource, parseDate, useLayoutType } from '@openmrs/esm-framework'; +import { type Observation } from '../types'; import { usePastVisits } from './past-visit.resource'; import EncounterList from './encounter-list.component'; import styles from './past-visit.scss'; diff --git a/packages/esm-appointments-app/src/patient-queue/visit-form/visit-form.component.tsx b/packages/esm-appointments-app/src/patient-queue/visit-form/visit-form.component.tsx index f4fab1e88..8ad31d504 100644 --- a/packages/esm-appointments-app/src/patient-queue/visit-form/visit-form.component.tsx +++ b/packages/esm-appointments-app/src/patient-queue/visit-form/visit-form.component.tsx @@ -25,7 +25,7 @@ import { ExtensionSlot, useLayoutType, useVisitTypes, - NewVisitPayload, + type NewVisitPayload, saveVisit, toOmrsIsoString, toDateObjectStrict, @@ -37,10 +37,10 @@ import { } from '@openmrs/esm-framework'; import isEmpty from 'lodash-es/isEmpty'; import BaseVisitType from './base-visit-type.component'; -import { amPm, convertTime12to24, useAppointmentDate } from '../../helpers'; +import { type amPm, convertTime12to24, useAppointmentDate } from '../../helpers'; import { closeOverlay } from '../../hooks/useOverlay'; import { saveQueueEntry } from './queue.resource'; -import { MappedAppointment } from '../../types'; +import { type MappedAppointment } from '../../types'; import { useAppointments } from '../../appointments/appointments-table.resource'; import { useDefaultLoginLocation } from '../../hooks/useDefaultLocation'; import { useVisits } from '../../hooks/useVisits'; diff --git a/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx b/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx index d57d26fed..3247995c6 100644 --- a/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx +++ b/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx @@ -15,7 +15,7 @@ import { useConfig, } from '@openmrs/esm-framework'; import { addPatientToList, getAllPatientLists, getPatientListIdsForPatient } from '../api/api-remote'; -import { ConfigSchema } from '../config-schema'; +import { type ConfigSchema } from '../config-schema'; import styles from './add-patient.scss'; interface AddPatientProps { diff --git a/packages/esm-patient-list-management-app/src/api/api-remote.ts b/packages/esm-patient-list-management-app/src/api/api-remote.ts index b4be9b09f..a1dba2ccb 100644 --- a/packages/esm-patient-list-management-app/src/api/api-remote.ts +++ b/packages/esm-patient-list-management-app/src/api/api-remote.ts @@ -1,16 +1,16 @@ import { openmrsFetch } from '@openmrs/esm-framework'; import { - AddPatientData, - CohortResponse, - NewCohortData, - NewCohortDataPayload, - OpenmrsCohort, - OpenmrsCohortMember, - OpenmrsCohortRef, - PatientListFilter, - PatientListMember, + type AddPatientData, + type CohortResponse, + type NewCohortData, + type NewCohortDataPayload, + type OpenmrsCohort, + type OpenmrsCohortMember, + type OpenmrsCohortRef, + type PatientListFilter, + type PatientListMember, PatientListType, - PatientListUpdate, + type PatientListUpdate, } from './types'; export const cohortUrl = '/ws/rest/v1/cohortm'; diff --git a/packages/esm-patient-list-management-app/src/api/hooks.ts b/packages/esm-patient-list-management-app/src/api/hooks.ts index 5945ae011..e863f526b 100755 --- a/packages/esm-patient-list-management-app/src/api/hooks.ts +++ b/packages/esm-patient-list-management-app/src/api/hooks.ts @@ -1,15 +1,15 @@ import { useEffect, useState } from 'react'; import useSWR from 'swr'; import useSWRInfinite from 'swr/infinite'; -import { openmrsFetch, FetchResponse, useConfig } from '@openmrs/esm-framework'; +import { openmrsFetch, type FetchResponse, useConfig } from '@openmrs/esm-framework'; import { cohortUrl, getAllPatientLists, getPatientListIdsForPatient, getPatientListMembers } from './api-remote'; -import { ConfigSchema } from '../config-schema'; +import { type ConfigSchema } from '../config-schema'; import { - CohortResponse, - CohortType, - OpenmrsCohort, - OpenmrsCohortMember, - PatientListFilter, + type CohortResponse, + type CohortType, + type OpenmrsCohort, + type OpenmrsCohortMember, + type PatientListFilter, PatientListType, } from './types'; diff --git a/packages/esm-patient-list-management-app/src/constants.ts b/packages/esm-patient-list-management-app/src/constants.ts index d84c604df..de39bd15a 100644 --- a/packages/esm-patient-list-management-app/src/constants.ts +++ b/packages/esm-patient-list-management-app/src/constants.ts @@ -1,4 +1,4 @@ -import { omrsOfflineCachingStrategyHttpHeaderName, OmrsOfflineHttpHeaders } from '@openmrs/esm-framework'; +import { omrsOfflineCachingStrategyHttpHeaderName, type OmrsOfflineHttpHeaders } from '@openmrs/esm-framework'; export const cacheForOfflineHeaders: OmrsOfflineHttpHeaders = { [omrsOfflineCachingStrategyHttpHeaderName]: 'network-first', diff --git a/packages/esm-patient-list-management-app/src/create-edit-patient-list/create-edit-list.component.tsx b/packages/esm-patient-list-management-app/src/create-edit-patient-list/create-edit-list.component.tsx index db540f09e..46d0d8bb6 100644 --- a/packages/esm-patient-list-management-app/src/create-edit-patient-list/create-edit-list.component.tsx +++ b/packages/esm-patient-list-management-app/src/create-edit-patient-list/create-edit-list.component.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, SyntheticEvent, useEffect, useId, useState } from 'react'; +import React, { useCallback, type SyntheticEvent, useEffect, useId, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Button, ButtonSet, Layer, TextArea, TextInput } from '@carbon/react'; import { useLayoutType, showToast, useSession, useConfig } from '@openmrs/esm-framework'; @@ -126,8 +126,8 @@ const CreateEditPatientList: React.FC = ({ {isSubmitting ? t('submitting', 'Submitting') : isEditing - ? t('editList', 'Edit list') - : t('createList', 'Create list')} + ? t('editList', 'Edit list') + : t('createList', 'Create list')} } diff --git a/packages/esm-patient-list-management-app/src/createDashboardLink.component.tsx b/packages/esm-patient-list-management-app/src/createDashboardLink.component.tsx index e02653e65..d3e877254 100644 --- a/packages/esm-patient-list-management-app/src/createDashboardLink.component.tsx +++ b/packages/esm-patient-list-management-app/src/createDashboardLink.component.tsx @@ -33,9 +33,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash ); } -export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => - ( - - - - ); +export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => ( + + + +); diff --git a/packages/esm-patient-list-management-app/src/list-details-table/list-details-table.component.tsx b/packages/esm-patient-list-management-app/src/list-details-table/list-details-table.component.tsx index c922d28cc..ba1cd4bf5 100644 --- a/packages/esm-patient-list-management-app/src/list-details-table/list-details-table.component.tsx +++ b/packages/esm-patient-list-management-app/src/list-details-table/list-details-table.component.tsx @@ -1,10 +1,10 @@ -import React, { type CSSProperties, HTMLAttributes, useCallback, useId, useMemo, useState } from 'react'; +import React, { type CSSProperties, type HTMLAttributes, useCallback, useId, useMemo, useState } from 'react'; import fuzzy from 'fuzzy'; import { useTranslation } from 'react-i18next'; import { Button, DataTable, - DataTableRow, + type DataTableRow, DataTableSkeleton, InlineLoading, Layer, diff --git a/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx b/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx index 1ae5afa95..d59bbe081 100755 --- a/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx +++ b/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx @@ -4,7 +4,7 @@ import { useLocation } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { Tab, Tabs, TabList } from '@carbon/react'; import { navigate } from '@openmrs/esm-framework'; -import { PatientListFilter, PatientListType } from '../api/types'; +import { type PatientListFilter, PatientListType } from '../api/types'; import { useAllPatientLists } from '../api/hooks'; import CreateEditPatientList from '../create-edit-patient-list/create-edit-list.component'; import Header from '../header/header.component'; diff --git a/packages/esm-patient-registration-app/package.json b/packages/esm-patient-registration-app/package.json index d88ed7a28..1787a829c 100644 --- a/packages/esm-patient-registration-app/package.json +++ b/packages/esm-patient-registration-app/package.json @@ -38,10 +38,11 @@ }, "dependencies": { "@carbon/react": "^1.12.0", + "core-js-pure": "^3.34.0", "formik": "^2.1.5", "geopattern": "^1.2.3", "lodash-es": "^4.17.15", - "react-avatar": "^4.0.0", + "react-avatar": "^5.0.3", "uuid": "^8.3.2", "yup": "^0.29.1" }, diff --git a/packages/esm-patient-registration-app/src/constants.ts b/packages/esm-patient-registration-app/src/constants.ts index 9f28d9d22..11ef70c5c 100644 --- a/packages/esm-patient-registration-app/src/constants.ts +++ b/packages/esm-patient-registration-app/src/constants.ts @@ -1,4 +1,4 @@ -import { omrsOfflineCachingStrategyHttpHeaderName, OmrsOfflineHttpHeaders } from '@openmrs/esm-framework'; +import { omrsOfflineCachingStrategyHttpHeaderName, type OmrsOfflineHttpHeaders } from '@openmrs/esm-framework'; export const personRelationshipRepresentation = 'custom:(display,uuid,' + diff --git a/packages/esm-patient-registration-app/src/offline.resources.ts b/packages/esm-patient-registration-app/src/offline.resources.ts index 8df531a8a..8f6ea3ff6 100644 --- a/packages/esm-patient-registration-app/src/offline.resources.ts +++ b/packages/esm-patient-registration-app/src/offline.resources.ts @@ -2,7 +2,7 @@ import React from 'react'; import find from 'lodash-es/find'; import camelCase from 'lodash-es/camelCase'; import escapeRegExp from 'lodash-es/escapeRegExp'; -import { getConfig, messageOmrsServiceWorker, openmrsFetch, Session } from '@openmrs/esm-framework'; +import { getConfig, messageOmrsServiceWorker, openmrsFetch, type Session } from '@openmrs/esm-framework'; import type { PatientIdentifierType, FetchedPatientIdentifierType, diff --git a/packages/esm-patient-registration-app/src/offline.ts b/packages/esm-patient-registration-app/src/offline.ts index 199e13f74..d1882cf80 100644 --- a/packages/esm-patient-registration-app/src/offline.ts +++ b/packages/esm-patient-registration-app/src/offline.ts @@ -4,7 +4,7 @@ import { navigate, setupDynamicOfflineDataHandler, setupOfflineSync, - SyncProcessOptions, + type SyncProcessOptions, } from '@openmrs/esm-framework'; import { patientRegistration, personRelationshipRepresentation } from './constants'; import { @@ -15,7 +15,7 @@ import { fetchPatientIdentifierTypesWithSources, } from './offline.resources'; import { FormManager } from './patient-registration/form-manager'; -import { PatientRegistration } from './patient-registration/patient-registration.types'; +import { type PatientRegistration } from './patient-registration/patient-registration.types'; export function setupOffline() { setupOfflineSync(patientRegistration, [], syncPatientRegistration, { diff --git a/packages/esm-patient-registration-app/src/patient-registration/before-save-prompt.tsx b/packages/esm-patient-registration-app/src/patient-registration/before-save-prompt.tsx index 7689a9d57..0db6d6896 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/before-save-prompt.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/before-save-prompt.tsx @@ -1,4 +1,5 @@ -import React, { useCallback, useEffect, useRef, useState } from 'react'; +import type React from 'react'; +import { useCallback, useEffect, useRef, useState } from 'react'; import { showModal, navigate } from '@openmrs/esm-framework'; import { useTranslation } from 'react-i18next'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/__mocks__/field.resource.ts b/packages/esm-patient-registration-app/src/patient-registration/field/__mocks__/field.resource.ts new file mode 100644 index 000000000..95a7ed52b --- /dev/null +++ b/packages/esm-patient-registration-app/src/patient-registration/field/__mocks__/field.resource.ts @@ -0,0 +1,60 @@ +import { type ConceptResponse } from '../../patient-registration.types'; + +export const useConcept = jest.fn(function mockUseConceptImplementation(uuid: string): { + data: ConceptResponse; + isLoading: boolean; +} { + let data; + if (uuid == 'weight-uuid') { + data = { + uuid: 'weight-uuid', + display: 'Weight (kg)', + datatype: { display: 'Numeric', uuid: 'num' }, + answers: [], + setMembers: [], + }; + } else if (uuid == 'chief-complaint-uuid') { + data = { + uuid: 'chief-complaint-uuid', + display: 'Chief Complaint', + datatype: { display: 'Text', uuid: 'txt' }, + answers: [], + setMembers: [], + }; + } else if (uuid == 'nationality-uuid') { + data = { + uuid: 'nationality-uuid', + display: 'Nationality', + datatype: { display: 'Coded', uuid: 'cdd' }, + answers: [ + { display: 'USA', uuid: 'usa' }, + { display: 'Mexico', uuid: 'mex' }, + ], + setMembers: [], + }; + } + return { + data: data ?? null, + isLoading: !data, + }; +}); + +export const useConceptAnswers = jest.fn((uuid: string) => { + if (uuid == 'nationality-uuid') { + return { + data: [ + { display: 'USA', uuid: 'usa' }, + { display: 'Mexico', uuid: 'mex' }, + ], + isLoading: false, + }; + } else if (uuid == 'other-countries-uuid') { + return { + data: [ + { display: 'Kenya', uuid: 'ke' }, + { display: 'Uganda', uuid: 'ug' }, + ], + isLoading: false, + }; + } +}); diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/address/address-hierarchy.resource.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/address/address-hierarchy.resource.tsx index aae3c3486..ed9e59ca8 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/address/address-hierarchy.resource.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/address/address-hierarchy.resource.tsx @@ -1,7 +1,7 @@ -import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework'; -import { useField } from 'formik'; import { useCallback, useContext, useEffect, useMemo } from 'react'; +import { useField } from 'formik'; import useSWRImmutable from 'swr/immutable'; +import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework'; import { PatientRegistrationContext } from '../../patient-registration-context'; interface AddressFields { diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx index 46c6999d8..d763dfd3d 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx @@ -72,9 +72,7 @@ const AddressSearchComponent: React.FC = ({ address /* Since the input has a marginBottom of 1rem */
    {addressOptions.map((address, index) => ( -
  • handleChange(address)}> +
  • handleChange(address)}> {address}
  • ))} diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/address/custom-address-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/address/custom-address-field.component.tsx index 185c98f04..aa88979eb 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/address/custom-address-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/address/custom-address-field.component.tsx @@ -4,7 +4,7 @@ import { Field } from 'formik'; import { useTranslation } from 'react-i18next'; import { Input } from '../../input/basic-input/input/input.component'; import styles from '../field.scss'; -import { FieldDefinition } from '../../../config-schema'; +import { type FieldDefinition } from '../../../config-schema'; export interface AddressFieldProps { fieldDefinition: FieldDefinition; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-hierarchy.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-hierarchy.test.tsx index 53374f04c..860c1cc36 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-hierarchy.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-hierarchy.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { cleanup, render, screen } from '@testing-library/react'; import { AddressComponent } from '../address-field.component'; import { Formik, Form } from 'formik'; -import { Resources, ResourcesContext } from '../../../../offline.resources'; +import { type Resources, ResourcesContext } from '../../../../offline.resources'; import { PatientRegistrationContext } from '../../../patient-registration-context'; import { useConfig } from '@openmrs/esm-framework'; import { useOrderedAddressHierarchyLevels } from '../address-hierarchy.resource'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-search-component.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-search-component.test.tsx index 062dd7b4c..45a8fa887 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-search-component.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/address/tests/address-search-component.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import userEvent from '@testing-library/user-event'; import { render, screen } from '@testing-library/react'; import { Formik, Form, useFormikContext } from 'formik'; -import { Resources, ResourcesContext } from '../../../../offline.resources'; +import { type Resources, ResourcesContext } from '../../../../offline.resources'; import { PatientRegistrationContext } from '../../../patient-registration-context'; import { useConfig } from '@openmrs/esm-framework'; import { useAddressHierarchy, useOrderedAddressHierarchyLevels } from '../address-hierarchy.resource'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/custom-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/custom-field.component.tsx index 3b9f35ea2..f8316a022 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/custom-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/custom-field.component.tsx @@ -1,6 +1,6 @@ import { useConfig } from '@openmrs/esm-framework'; import React from 'react'; -import { RegistrationConfig } from '../../config-schema'; +import { type RegistrationConfig } from '../../config-schema'; import { AddressField } from './address/custom-address-field.component'; import { ObsField } from './obs/obs-field.component'; import { PersonAttributeField } from './person-attributes/person-attribute-field.component'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx index f5c01caa8..50f52962a 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx @@ -1,11 +1,11 @@ -import React, { ChangeEvent, useCallback, useContext } from 'react'; +import React, { type ChangeEvent, useCallback, useContext } from 'react'; import { ContentSwitcher, DatePicker, DatePickerInput, Layer, Switch, TextInput } from '@carbon/react'; import { useTranslation } from 'react-i18next'; import { useField } from 'formik'; import { generateFormatting } from '../../date-util'; import { PatientRegistrationContext } from '../../patient-registration-context'; import { useConfig } from '@openmrs/esm-framework'; -import { RegistrationConfig } from '../../../config-schema'; +import { type RegistrationConfig } from '../../../config-schema'; import styles from '../field.scss'; const calcBirthdate = (yearDelta, monthDelta, dateOfBirth) => { diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/field.component.tsx index d8bfa31cc..93790d518 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/field.component.tsx @@ -4,7 +4,7 @@ import { GenderField } from './gender/gender-field.component'; import { Identifiers } from './id/id-field.component'; import { DobField } from './dob/dob.component'; import { reportError, useConfig } from '@openmrs/esm-framework'; -import { builtInFields, RegistrationConfig } from '../../config-schema'; +import { builtInFields, type RegistrationConfig } from '../../config-schema'; import { CustomField } from './custom-field.component'; import { AddressComponent } from './address/address-field.component'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/field.resource.ts b/packages/esm-patient-registration-app/src/patient-registration/field/field.resource.ts index 1c74efaf9..60a80ae13 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/field.resource.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/field/field.resource.ts @@ -1,6 +1,6 @@ -import { FetchResponse, openmrsFetch, showSnackbar } from '@openmrs/esm-framework'; +import { type FetchResponse, openmrsFetch, showSnackbar } from '@openmrs/esm-framework'; import useSWRImmutable from 'swr/immutable'; -import { ConceptAnswers, ConceptResponse } from '../patient-registration.types'; +import { type ConceptAnswers, type ConceptResponse } from '../patient-registration.types'; export function useConcept(conceptUuid: string): { data: ConceptResponse; isLoading: boolean } { const shouldFetch = typeof conceptUuid === 'string' && conceptUuid !== ''; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/field.test.tsx index 5a3dcca4c..151dcf7ea 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/field.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/field.test.tsx @@ -3,9 +3,9 @@ import { Form, Formik } from 'formik'; import { render, screen } from '@testing-library/react'; import { useConfig } from '@openmrs/esm-framework'; import { Field } from './field.component'; -import { FormValues } from '../patient-registration.types'; +import type { AddressTemplate, FormValues } from '../patient-registration.types'; +import { type Resources, ResourcesContext } from '../../offline.resources'; import { PatientRegistrationContext } from '../patient-registration-context'; -import { Resources, ResourcesContext } from '../../offline.resources'; jest.mock('@openmrs/esm-framework', () => ({ ...jest.requireActual('@openmrs/esm-framework'), @@ -38,7 +38,7 @@ const mockedIdentifierTypes = [ isPrimary: true, name: 'OpenMRS ID', required: true, - uniquenessBehavior: 'UNIQUE' as 'UNIQUE', + uniquenessBehavior: 'UNIQUE' as const, uuid: '05a29f94-c0ed-11e2-94be-8c13b969e334', }, { @@ -48,7 +48,7 @@ const mockedIdentifierTypes = [ isPrimary: false, name: 'ID Card', required: false, - uniquenessBehavior: 'UNIQUE' as 'UNIQUE', + uniquenessBehavior: 'UNIQUE' as const, uuid: 'b4143563-16cd-4439-b288-f83d61670fc8', }, { @@ -84,7 +84,7 @@ const mockedIdentifierTypes = [ ]; const mockResourcesContextValue: Resources = { - addressTemplate: predefinedAddressTemplate, + addressTemplate: predefinedAddressTemplate as unknown as AddressTemplate, currentSession: { authenticated: true, sessionId: 'JSESSION', diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx index d7bf15b36..570321aa2 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx @@ -4,7 +4,7 @@ import styles from '../field.scss'; import { useTranslation } from 'react-i18next'; import { PatientRegistrationContext } from '../../patient-registration-context'; import { useField } from 'formik'; -import { RegistrationConfig } from '../../../config-schema'; +import { type RegistrationConfig } from '../../../config-schema'; import { useConfig } from '@openmrs/esm-framework'; export const GenderField: React.FC = () => { diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.component.tsx index 54f2c88be..b7b890a05 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.component.tsx @@ -7,10 +7,10 @@ import IdentifierSelectionOverlay from './identifier-selection-overlay.component import { IdentifierInput } from '../../input/custom-input/identifier/identifier-input.component'; import { PatientRegistrationContext } from '../../patient-registration-context'; import { - FormValues, - IdentifierSource, - PatientIdentifierType, - PatientIdentifierValue, + type FormValues, + type IdentifierSource, + type PatientIdentifierType, + type PatientIdentifierValue, } from '../../patient-registration.types'; import { ResourcesContext } from '../../../offline.resources'; import styles from '../field.scss'; @@ -31,8 +31,8 @@ export function setIdentifierSource( identifierValue: autoGeneration ? 'auto-generated' : identifierValue !== 'auto-generated' - ? identifierValue - : initialValue, + ? identifierValue + : initialValue, }; } diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.test.tsx index 6af5394f0..b1b0e6742 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/id/id-field.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import userEvent from '@testing-library/user-event'; import { render, screen } from '@testing-library/react'; import { Identifiers } from './id-field.component'; -import { Resources, ResourcesContext } from '../../../offline.resources'; +import { type Resources, ResourcesContext } from '../../../offline.resources'; import { Form, Formik } from 'formik'; import { PatientRegistrationContext } from '../../patient-registration-context'; import { openmrsID, mockedIdentifierTypes } from '__mocks__'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx index d8ee316b3..b181c5114 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useCallback, useEffect, useState, useContext } from 're import { useTranslation } from 'react-i18next'; import { Button, ButtonSet, Checkbox, Search, RadioButtonGroup, RadioButton } from '@carbon/react'; import { isDesktop, useConfig, useLayoutType } from '@openmrs/esm-framework'; -import { FormValues, PatientIdentifierType, PatientIdentifierValue } from '../../patient-registration.types'; +import { type FormValues, type PatientIdentifierType, PatientIdentifierValue } from '../../patient-registration.types'; import Overlay from '../../ui-components/overlay/overlay.component'; import { ResourcesContext } from '../../../offline.resources'; import { PatientRegistrationContext } from '../../patient-registration-context'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx index b70313356..d2a9ea0fa 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx @@ -6,7 +6,7 @@ import { ExtensionSlot, useConfig } from '@openmrs/esm-framework'; import { Input } from '../../input/basic-input/input/input.component'; import { PatientRegistrationContext } from '../../patient-registration-context'; import styles from '../field.scss'; -import { RegistrationConfig } from '../../../config-schema'; +import { type RegistrationConfig } from '../../../config-schema'; export const unidentifiedPatientAttributeTypeUuid = '8b56eac7-5c76-4b9c-8c6f-1deab8d3fc47'; const containsNoNumbers = /^([^0-9]*)$/; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx index e483671a3..a69e4220d 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx @@ -4,8 +4,8 @@ import { Field } from 'formik'; import { useTranslation } from 'react-i18next'; import { InlineNotification, Layer, Select, SelectItem } from '@carbon/react'; import { useConfig } from '@openmrs/esm-framework'; -import { ConceptResponse } from '../../patient-registration.types'; -import { FieldDefinition, RegistrationConfig } from '../../../config-schema'; +import { type ConceptResponse } from '../../patient-registration.types'; +import { type FieldDefinition, type RegistrationConfig } from '../../../config-schema'; import { Input } from '../../input/basic-input/input/input.component'; import { useConcept, useConceptAnswers } from '../field.resource'; import styles from './../field.scss'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx index 8cb8c5017..1d4e54c02 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { useConfig } from '@openmrs/esm-framework'; -import { FieldDefinition } from '../../../config-schema'; +import { type FieldDefinition } from '../../../config-schema'; import { ObsField } from './obs-field.component'; const mockUseConfig = useConfig as jest.Mock; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-attributes.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-attributes.component.tsx index 01a0b2dbd..c66025dea 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-attributes.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-attributes.component.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames'; import { Layer, Select, SelectItem } from '@carbon/react'; import { useConfig } from '@openmrs/esm-framework'; import { Input } from '../../input/basic-input/input/input.component'; -import { CodedPersonAttributeConfig } from '../../patient-registration.types'; +import { type CodedPersonAttributeConfig } from '../../patient-registration.types'; import { useConceptAnswers } from '../field.resource'; import { usePersonAttributeType } from './person-attributes.resource'; import styles from './../field.scss'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx index 8185f8ebc..944c6376f 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import { Field } from 'formik'; import { Layer, Select, SelectItem } from '@carbon/react'; import { Input } from '../../input/basic-input/input/input.component'; -import { PersonAttributeTypeResponse } from '../../patient-registration.types'; +import { type PersonAttributeTypeResponse } from '../../patient-registration.types'; import { useConceptAnswers } from '../field.resource'; import styles from './../field.scss'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.component.tsx index 0478744f4..a2f447835 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.component.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react'; import { InlineNotification, TextInputSkeleton, SkeletonText } from '@carbon/react'; -import { FieldDefinition } from '../../../config-schema'; +import { type FieldDefinition } from '../../../config-schema'; import { CodedPersonAttributeField } from './coded-person-attribute-field.component'; import { usePersonAttributeType } from './person-attributes.resource'; import { TextPersonAttributeField } from './text-person-attribute-field.component'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx index 8dc81e01a..14cd16fa9 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx @@ -4,7 +4,7 @@ import { usePersonAttributeType } from './person-attributes.resource'; import { PersonAttributeField } from './person-attribute-field.component'; import { useConceptAnswers } from '../field.resource'; import { Form, Formik } from 'formik'; -import { FieldDefinition } from '../../../config-schema'; +import { type FieldDefinition } from '../../../config-schema'; jest.mock('./person-attributes.resource'); // Mock the usePersonAttributeType hook jest.mock('../field.resource'); // Mock the useConceptAnswers hook diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attributes.resource.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attributes.resource.ts similarity index 73% rename from packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attributes.resource.tsx rename to packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attributes.resource.ts index 9fe3419d3..fb9f180f1 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attributes.resource.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attributes.resource.ts @@ -1,6 +1,6 @@ -import { FetchResponse, openmrsFetch } from '@openmrs/esm-framework'; +import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework'; import useSWRImmutable from 'swr/immutable'; -import { PersonAttributeTypeResponse } from '../../patient-registration.types'; +import { type PersonAttributeTypeResponse } from '../../patient-registration.types'; export function usePersonAttributeType(personAttributeTypeUuid: string): { data: PersonAttributeTypeResponse; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/text-person-attribute-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/text-person-attribute-field.component.tsx index 48baced4d..16b9c6f86 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/text-person-attribute-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/text-person-attribute-field.component.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames'; import { Field } from 'formik'; import { useTranslation } from 'react-i18next'; import { Input } from '../../input/basic-input/input/input.component'; -import { PersonAttributeTypeResponse } from '../../patient-registration.types'; +import { type PersonAttributeTypeResponse } from '../../patient-registration.types'; import styles from './../field.scss'; export interface TextPersonAttributeFieldProps { diff --git a/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts b/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts index ffedd3ce1..56b4e528f 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts @@ -1,5 +1,5 @@ import { FormManager } from './form-manager'; -import { FormValues } from './patient-registration.types'; +import { type FormValues } from './patient-registration.types'; jest.mock('./patient-registration.resource'); diff --git a/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts b/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts index 6c5e4b44f..3a3d248d2 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts @@ -1,15 +1,15 @@ -import { FetchResponse, openmrsFetch, queueSynchronizationItem, Session } from '@openmrs/esm-framework'; +import { type FetchResponse, openmrsFetch, queueSynchronizationItem, type Session } from '@openmrs/esm-framework'; import { patientRegistration } from '../constants'; import { - FormValues, - AttributeValue, - PatientUuidMapType, - Patient, - CapturePhotoProps, - PatientIdentifier, - PatientRegistration, - RelationshipValue, - Encounter, + type FormValues, + type AttributeValue, + type PatientUuidMapType, + type Patient, + type CapturePhotoProps, + type PatientIdentifier, + type PatientRegistration, + type RelationshipValue, + type Encounter, } from './patient-registration.types'; import { addPatientIdentifier, @@ -24,7 +24,7 @@ import { updatePatientIdentifier, saveEncounter, } from './patient-registration.resource'; -import { RegistrationConfig } from '../config-schema'; +import { type RegistrationConfig } from '../config-schema'; export type SavePatientForm = ( isNewPatient: boolean, diff --git a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/autosuggest/autosuggest.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/autosuggest/autosuggest.component.tsx index 8d21f639e..148aaea2f 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/autosuggest/autosuggest.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/autosuggest/autosuggest.component.tsx @@ -1,5 +1,5 @@ -import React, { HTMLAttributes, useEffect, useRef, useState } from 'react'; -import { Layer, Search, SearchProps } from '@carbon/react'; +import React, { type HTMLAttributes, useEffect, useRef, useState } from 'react'; +import { Layer, Search, type SearchProps } from '@carbon/react'; import classNames from 'classnames'; import styles from './autosuggest.scss'; @@ -175,9 +175,7 @@ export const Autosuggest: React.FC = ({ {suggestions.length > 0 && (
      {suggestions.map((suggestion, index) => ( -
    • handleClick(index)}> +
    • handleClick(index)}> {getDisplayValue(suggestion)}
    • ))} diff --git a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx index 28a8c585b..ec24d0317 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx @@ -7,7 +7,7 @@ import { ResourcesContext } from '../../../../offline.resources'; import { showModal, useConfig, UserHasAccess } from '@openmrs/esm-framework'; import { shouldBlockPatientIdentifierInOfflineMode } from './utils'; import { deleteIdentifierType, setIdentifierSource } from '../../../field/id/id-field.component'; -import { PatientIdentifierValue } from '../../../patient-registration.types'; +import { type PatientIdentifierValue } from '../../../patient-registration.types'; import { PatientRegistrationContext } from '../../../patient-registration-context'; import { Input } from '../../basic-input/input/input.component'; import styles from '../../input.scss'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.test.tsx index 9df4ef894..d29f55856 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.test.tsx @@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react'; import { Formik, Form } from 'formik'; import { IdentifierInput } from './identifier-input.component'; import { initialFormValues } from '../../../patient-registration.component'; -import { PatientIdentifierType } from '../../../patient-registration-types'; +import { type PatientIdentifierType } from '../../../patient-registration-types'; jest.mock('@openmrs/esm-framework', () => { const originalModule = jest.requireActual('@openmrs/esm-framework'); @@ -52,10 +52,7 @@ describe.skip('identifier input', () => { , ); const identifierInput = screen.getByLabelText(identifierType.fieldName) as HTMLInputElement; - let identifierSourceSelectInput = undefined; - try { - identifierSourceSelectInput = screen.getByLabelText('source-for-' + identifierType.fieldName) as HTMLInputElement; - } catch (e) {} + let identifierSourceSelectInput = screen.getByLabelText('source-for-' + identifierType.fieldName); return { identifierInput, identifierSourceSelectInput, diff --git a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/utils.ts b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/utils.ts index 0cb736841..a0a0436ce 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/utils.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/utils.ts @@ -1,4 +1,4 @@ -import { FetchedPatientIdentifierType, PatientIdentifierType } from '../../../patient-registration.types'; +import { type FetchedPatientIdentifierType, type PatientIdentifierType } from '../../../patient-registration.types'; export function shouldBlockPatientIdentifierInOfflineMode(identifierType: PatientIdentifierType) { // Patient Identifiers which are unique and can be manually entered are prohibited while offline because diff --git a/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.component.tsx index 8a3f1d064..79f76218b 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.component.tsx @@ -1,7 +1,7 @@ import React from 'react'; import classNames from 'classnames'; import { v4 } from 'uuid'; -import { FormValues } from '../../patient-registration.types'; +import { type FormValues } from '../../patient-registration.types'; import styles from './../input.scss'; interface DummyDataInputProps { diff --git a/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.test.tsx index ecf0c4ddc..2cf995b23 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/input/dummy-data/dummy-data-input.test.tsx @@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { DummyDataInput, dummyFormValues } from './dummy-data-input.component'; import { initialFormValues } from '../../patient-registration.component'; -import { FormValues } from '../../patient-registration-types'; +import { type FormValues } from '../../patient-registration-types'; jest.mock('@openmrs/esm-framework', () => { const originalModule = jest.requireActual('@openmrs/esm-framework'); diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-context.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-context.ts index eb259af3c..96092c1de 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-context.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-context.ts @@ -1,7 +1,7 @@ import { useConfig } from '@openmrs/esm-framework'; -import { createContext, SetStateAction } from 'react'; -import { RegistrationConfig } from '../config-schema'; -import { FormValues, CapturePhotoProps } from './patient-registration.types'; +import { createContext, type SetStateAction } from 'react'; +import { type RegistrationConfig } from '../config-schema'; +import { type FormValues, type CapturePhotoProps } from './patient-registration.types'; export interface PatientRegistrationContextProps { identifierTypes: Array; diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts index 4ad89972d..76c829620 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts @@ -1,24 +1,24 @@ import { - FetchResponse, - OpenmrsResource, + type FetchResponse, + type OpenmrsResource, getSynchronizationItems, openmrsFetch, useConfig, usePatient, } from '@openmrs/esm-framework'; import camelCase from 'lodash-es/camelCase'; -import { Dispatch, useEffect, useMemo, useState } from 'react'; +import { type Dispatch, useEffect, useMemo, useState } from 'react'; import useSWR from 'swr'; import { v4 } from 'uuid'; -import { RegistrationConfig } from '../config-schema'; +import { type RegistrationConfig } from '../config-schema'; import { patientRegistration } from '../constants'; import { - FormValues, - PatientRegistration, - PatientUuidMapType, - PersonAttributeResponse, - PatientIdentifierResponse, - Encounter, + type FormValues, + type PatientRegistration, + type PatientUuidMapType, + type PersonAttributeResponse, + type PatientIdentifierResponse, + type Encounter, } from './patient-registration.types'; import { getAddressFieldValuesFromFhirPatient, diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts index bed641732..c93fd5a7b 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts @@ -1,11 +1,11 @@ import * as Yup from 'yup'; import { - AddressValidationSchemaType, - FormValues, - PatientIdentifier, - PatientUuidMapType, - PatientIdentifierValue, - Encounter, + type AddressValidationSchemaType, + type FormValues, + type PatientIdentifier, + type PatientUuidMapType, + type PatientIdentifierValue, + type Encounter, } from './patient-registration.types'; import { parseDate } from '@openmrs/esm-framework'; import camelCase from 'lodash-es/camelCase'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx index 4e1c1a7b9..cf9f196e0 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx @@ -4,18 +4,18 @@ import { Button, Link, InlineLoading } from '@carbon/react'; import { XAxis } from '@carbon/react/icons'; import { useLocation, useParams } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; -import { Formik, Form, FormikHelpers } from 'formik'; +import { Formik, Form, type FormikHelpers } from 'formik'; import { createErrorHandler, showSnackbar, useConfig, interpolateUrl, usePatient } from '@openmrs/esm-framework'; import { validationSchema as initialSchema } from './validation/patient-registration-validation'; -import { FormValues, CapturePhotoProps } from './patient-registration.types'; +import { type FormValues, type CapturePhotoProps } from './patient-registration.types'; import { PatientRegistrationContext } from './patient-registration-context'; -import { SavePatientForm, SavePatientTransactionManager } from './form-manager'; +import { type SavePatientForm, SavePatientTransactionManager } from './form-manager'; import { usePatientPhoto } from './patient-registration.resource'; import { DummyDataInput } from './input/dummy-data/dummy-data-input.component'; import { cancelRegistration, filterUndefinedPatientIdenfier, scrollIntoView } from './patient-registration-utils'; import { useInitialAddressFieldValues, useInitialFormValues, usePatientUuidMap } from './patient-registration-hooks'; import { ResourcesContext } from '../offline.resources'; -import { builtInSections, RegistrationConfig, SectionDefinition } from '../config-schema'; +import { builtInSections, type RegistrationConfig, type SectionDefinition } from '../config-schema'; import { SectionWrapper } from './section/section-wrapper.component'; import BeforeSavePrompt from './before-save-prompt'; import styles from './patient-registration.scss'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.resource.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.resource.ts similarity index 98% rename from packages/esm-patient-registration-app/src/patient-registration/patient-registration.resource.tsx rename to packages/esm-patient-registration-app/src/patient-registration/patient-registration.resource.ts index 056250446..d9590f5b3 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.resource.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.resource.ts @@ -1,6 +1,6 @@ import useSWR from 'swr'; import { openmrsFetch, useConfig } from '@openmrs/esm-framework'; -import { Patient, Relationship, PatientIdentifier, Encounter } from './patient-registration.types'; +import { type Patient, type Relationship, type PatientIdentifier, type Encounter } from './patient-registration.types'; export const uuidIdentifier = '05a29f94-c0ed-11e2-94be-8c13b969e334'; export const uuidTelephoneNumber = '14d4f066-15f5-102d-96e4-000c29c2a5d7'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx index 630cdc857..e28d5fc83 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx @@ -2,13 +2,13 @@ import React from 'react'; import { BrowserRouter as Router, useParams } from 'react-router-dom'; import { render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import type { AddressTemplate, Encounter } from './patient-registration.types'; import { showSnackbar, useConfig, usePatient } from '@openmrs/esm-framework'; +import type { AddressTemplate, Encounter } from './patient-registration.types'; +import { type RegistrationConfig } from '../config-schema'; import { FormManager } from './form-manager'; -import { saveEncounter, savePatient } from './patient-registration.resource'; import { ResourcesContext } from '../offline.resources'; import { PatientRegistration } from './patient-registration.component'; -import { RegistrationConfig } from '../config-schema'; +import { saveEncounter, savePatient } from './patient-registration.resource'; import { mockedAddressTemplate } from '__mocks__'; import { mockPatient } from 'tools'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.types.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.types.ts similarity index 97% rename from packages/esm-patient-registration-app/src/patient-registration/patient-registration.types.tsx rename to packages/esm-patient-registration-app/src/patient-registration/patient-registration.types.ts index e00acd988..eeb4149cf 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.types.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.types.ts @@ -1,6 +1,6 @@ -import { OpenmrsResource, Session } from '@openmrs/esm-framework'; -import { RegistrationConfig } from '../config-schema'; -import { SavePatientTransactionManager } from './form-manager'; +import { type OpenmrsResource, type Session } from '@openmrs/esm-framework'; +import { type RegistrationConfig } from '../config-schema'; +import { type SavePatientTransactionManager } from './form-manager'; interface NameValue { uuid: string; diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/death-info/death-info-section.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/death-info/death-info-section.test.tsx index 0de698100..d119a7270 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/death-info/death-info-section.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/death-info/death-info-section.test.tsx @@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react'; import { Formik, Form } from 'formik'; import { initialFormValues } from '../../patient-registration.component'; import { DeathInfoSection } from './death-info-section.component'; -import { FormValues } from '../../patient-registration.types'; +import { type FormValues } from '../../patient-registration.types'; import { PatientRegistrationContext } from '../../patient-registration-context'; jest.mock('@openmrs/esm-framework', () => { diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.test.tsx index 5222a3ed1..0f584c939 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.test.tsx @@ -4,7 +4,7 @@ import { Formik, Form } from 'formik'; import { initialFormValues } from '../../patient-registration.component'; import { DemographicsSection } from './demographics-section.component'; import { PatientRegistrationContext } from '../../patient-registration-context'; -import { FormValues } from '../../patient-registration.types'; +import { type FormValues } from '../../patient-registration.types'; jest.mock('@openmrs/esm-framework', () => { const originalModule = jest.requireActual('@openmrs/esm-framework'); diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/generic-section.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/generic-section.component.tsx index 2ad0fb6eb..8544a5913 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/generic-section.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/generic-section.component.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { SectionDefinition } from '../../config-schema'; +import { type SectionDefinition } from '../../config-schema'; import { Field } from '../field/field.component'; export interface GenericSectionProps { diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx index ddc175890..6d6f25532 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx @@ -15,7 +15,7 @@ import { Autosuggest } from '../../input/custom-input/autosuggest/autosuggest.co import { PatientRegistrationContext } from '../../patient-registration-context'; import { ResourcesContext } from '../../../offline.resources'; import { fetchPerson } from '../../patient-registration.resource'; -import { RelationshipValue } from '../../patient-registration.types'; +import { type RelationshipValue } from '../../patient-registration.types'; import sectionStyles from '../section.scss'; import styles from './relationships.scss'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.test.tsx index 22b6b4001..0ef00a4bc 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Form, Formik } from 'formik'; import { render, screen } from '@testing-library/react'; import { PatientRegistrationContext } from '../../patient-registration-context'; -import { Resources, ResourcesContext } from '../../../offline.resources'; +import { type Resources, ResourcesContext } from '../../../offline.resources'; import { RelationshipsSection } from './relationships-section.component'; jest.mock('../../patient-registration.resource', () => ({ diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx index 69e9178d8..4813404af 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx @@ -1,7 +1,7 @@ -import { FetchResponse, openmrsFetch } from '@openmrs/esm-framework'; -import { RelationshipValue } from '../../patient-registration.types'; -import useSWR from 'swr'; import { useMemo } from 'react'; +import useSWR from 'swr'; +import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework'; +import { type RelationshipValue } from '../../patient-registration.types'; import { personRelationshipRepresentation } from '../../../constants'; export function useInitialPatientRelationships(patientUuid: string): { diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/section-wrapper.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/section-wrapper.component.tsx index b0bcb6ea8..acc9e7aba 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/section-wrapper.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/section-wrapper.component.tsx @@ -2,7 +2,7 @@ import React from 'react'; import styles from '../patient-registration.scss'; import { Tile } from '@carbon/react'; import { useTranslation } from 'react-i18next'; -import { SectionDefinition } from '../../config-schema'; +import { type SectionDefinition } from '../../config-schema'; import { Section } from './section.component'; export interface SectionWrapperProps { diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/section.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/section.component.tsx index 54bbae981..1f3429c67 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/section/section.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/section/section.component.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { SectionDefinition } from '../../config-schema'; +import { type SectionDefinition } from '../../config-schema'; import { GenericSection } from './generic-section.component'; import { DeathInfoSection } from './death-info/death-info-section.component'; import { DemographicsSection } from './demographics/demographics-section.component'; diff --git a/packages/esm-patient-registration-app/src/patient-registration/validation/patient-registration-validation.tsx b/packages/esm-patient-registration-app/src/patient-registration/validation/patient-registration-validation.tsx index 326a86591..b61e90637 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/validation/patient-registration-validation.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/validation/patient-registration-validation.tsx @@ -1,6 +1,6 @@ import * as Yup from 'yup'; import mapValues from 'lodash/mapValues'; -import { FormValues } from '../patient-registration.types'; +import { type FormValues } from '../patient-registration.types'; export const validationSchema = Yup.object({ givenName: Yup.string().required('givenNameRequired'), diff --git a/packages/esm-patient-search-app/src/compact-patient-search-extension/index.tsx b/packages/esm-patient-search-app/src/compact-patient-search-extension/index.tsx index 82389962e..8eeb8d96a 100644 --- a/packages/esm-patient-search-app/src/compact-patient-search-extension/index.tsx +++ b/packages/esm-patient-search-app/src/compact-patient-search-extension/index.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useState, useMemo, useRef, useEffect } from 'react'; import PatientSearch from '../compact-patient-search/patient-search.component'; -import { SearchedPatient } from '../types'; +import { type SearchedPatient } from '../types'; import { Search, Button } from '@carbon/react'; import { useTranslation } from 'react-i18next'; import styles from './compact-patient-search.scss'; @@ -60,7 +60,7 @@ const CompactPatientSearchComponent: React.FC = ({ const inputRef = useRef(null); const handleFocusToInput = useCallback(() => { - var len = inputRef.current.value?.length ?? 0; + let len = inputRef.current.value?.length ?? 0; inputRef.current.setSelectionRange(len, len); inputRef.current.focus(); }, [inputRef]); diff --git a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx index fe75af221..5c0aebdd8 100644 --- a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx +++ b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx @@ -101,9 +101,8 @@ const PatientSearchResults = React.forwardRef
      -

      {`${patient.name?.[0]?.given?.join(' ')} ${ - patient.name?.[0]?.family - }`}

      +

      {`${patient.name?.[0]?.given?.join(' ')} ${patient.name?.[0] + ?.family}`}

      {/* { export const usePatientContactAttributes = (patientUuid: string) => { const { contactAttributeType } = useConfig(); const { attributes, isLoading } = usePatientAttributes(patientUuid); - const contactAttributes = attributes.filter(({ attributeType }) => - contactAttributeType?.some((uuid) => attributeType.uuid === uuid), + const contactAttributes = attributes.filter( + ({ attributeType }) => contactAttributeType?.some((uuid) => attributeType.uuid === uuid), ); return { contactAttributes: contactAttributes ?? [], diff --git a/packages/esm-patient-search-app/src/patient-search-page/patient-banner/types/index.ts b/packages/esm-patient-search-app/src/patient-search-page/patient-banner/types/index.ts index 0cfa652b7..473d1163e 100644 --- a/packages/esm-patient-search-app/src/patient-search-page/patient-banner/types/index.ts +++ b/packages/esm-patient-search-app/src/patient-search-page/patient-banner/types/index.ts @@ -1,4 +1,4 @@ -import { OpenmrsResource } from '@openmrs/esm-framework'; +import { type OpenmrsResource } from '@openmrs/esm-framework'; export interface Location { uuid: string; diff --git a/packages/esm-patient-search-app/src/patient-search-page/patient-search-views.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/patient-search-views.component.tsx index 793f32d1e..2482c7a2b 100644 --- a/packages/esm-patient-search-app/src/patient-search-page/patient-search-views.component.tsx +++ b/packages/esm-patient-search-app/src/patient-search-page/patient-search-views.component.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import { Layer, Tile } from '@carbon/react'; import EmptyDataIllustration from '../ui-components/empty-data-illustration.component'; import PatientBanner, { PatientBannerSkeleton } from './patient-banner/banner/patient-banner.component'; -import { SearchedPatient } from '../types'; +import { type SearchedPatient } from '../types'; import styles from './patient-search-lg.scss'; interface CommonProps { diff --git a/packages/esm-patient-search-app/src/patient-search.resource.tsx b/packages/esm-patient-search-app/src/patient-search.resource.tsx index 62c20a3d2..febb74e56 100644 --- a/packages/esm-patient-search-app/src/patient-search.resource.tsx +++ b/packages/esm-patient-search-app/src/patient-search.resource.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import useSWR from 'swr'; import useSWRInfinite from 'swr/infinite'; -import { openmrsFetch, showNotification, useSession, FetchResponse, LoggedInUser } from '@openmrs/esm-framework'; +import { openmrsFetch, showNotification, useSession, type FetchResponse, LoggedInUser } from '@openmrs/esm-framework'; import type { PatientSearchResponse, SearchedPatient, User } from './types'; const v = diff --git a/packages/esm-patient-search-app/src/types/index.ts b/packages/esm-patient-search-app/src/types/index.ts index 73b5ae233..8d69bd2df 100644 --- a/packages/esm-patient-search-app/src/types/index.ts +++ b/packages/esm-patient-search-app/src/types/index.ts @@ -1,4 +1,4 @@ -import { FetchResponse, OpenmrsResource } from '@openmrs/esm-framework'; +import { type FetchResponse, type OpenmrsResource } from '@openmrs/esm-framework'; export interface SearchedPatient { uuid: string; identifiers: Array; diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx index 68689f4e8..8c751038c 100644 --- a/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx +++ b/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx @@ -1,9 +1,9 @@ -import React, { useMemo, useState, MouseEvent, AnchorHTMLAttributes, useCallback, useEffect } from 'react'; +import React, { useMemo, useState, type MouseEvent, type AnchorHTMLAttributes, useCallback, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { Button, DataTable, - DataTableHeader, + type DataTableHeader, DataTableSkeleton, DefinitionTooltip, Dropdown, @@ -39,7 +39,7 @@ import { ExtensionSlot, usePagination, useConfig, - ConfigObject, + type ConfigObject, useSession, showModal, } from '@openmrs/esm-framework'; @@ -47,7 +47,7 @@ import { useVisitQueueEntries, useServices, getOriginFromPathName, - MappedVisitQueueEntry, + type MappedVisitQueueEntry, } from './active-visits-table.resource'; import { SearchTypes } from '../types'; import { diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts b/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts index 68a79faa1..40934d89e 100644 --- a/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts +++ b/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts @@ -5,16 +5,16 @@ import useSWR from 'swr'; import useSWRImmutable from 'swr/immutable'; import { useTranslation } from 'react-i18next'; import { - FetchResponse, + type FetchResponse, formatDate, openmrsFetch, parseDate, toDateObjectStrict, toOmrsIsoString, useConfig, - Visit, + type Visit, } from '@openmrs/esm-framework'; -import { Identifer, MappedServiceQueueEntry, QueueServiceInfo } from '../types'; +import { type Identifer, type MappedServiceQueueEntry, type QueueServiceInfo } from '../types'; import { useQueueLocations } from '../patient-search/hooks/useQueueLocations'; import isToday from 'dayjs/plugin/isToday'; diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx index bf78714e4..3607448bd 100644 --- a/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx +++ b/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { of } from 'rxjs'; import { screen } from '@testing-library/react'; -import { ConfigObject, useConfig, usePagination, useSession } from '@openmrs/esm-framework'; +import { type ConfigObject, useConfig, usePagination, useSession } from '@openmrs/esm-framework'; import { mockServices, mockVisitQueueEntries, mockMappedQueueEntries, mockSession } from '__mocks__'; import { renderWithSwr } from 'tools'; import { useVisitQueueEntries } from './active-visits-table.resource'; diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx index b8d481131..edd0edcf3 100644 --- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx +++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx @@ -14,8 +14,8 @@ import { RadioButtonGroup, } from '@carbon/react'; import { useTranslation } from 'react-i18next'; -import { ConfigObject, navigate, showNotification, showToast, useConfig } from '@openmrs/esm-framework'; -import { MappedQueueEntry } from '../types'; +import { type ConfigObject, navigate, showNotification, showToast, useConfig } from '@openmrs/esm-framework'; +import { type MappedQueueEntry } from '../types'; import { updateQueueEntry, usePriority, diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx index d448a9c57..f7debba06 100644 --- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx +++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import userEvent from '@testing-library/user-event'; import { screen, render, within } from '@testing-library/react'; import { mockServices, mockPriorities, mockStatus, mockSession, mockLocations, mockQueueEntry } from '__mocks__'; -import { ConfigObject, showToast, useConfig, showNotification } from '@openmrs/esm-framework'; +import { type ConfigObject, showToast, useConfig, showNotification } from '@openmrs/esm-framework'; import { updateQueueEntry } from './active-visits-table.resource'; import ChangeStatus from './change-status-dialog.component'; @@ -11,8 +11,8 @@ const mockShowToast = showToast as jest.Mock; const mockUpdateQueueEntry = updateQueueEntry as jest.Mock; const mockShowNotification = showNotification as jest.Mock; -jest.mock('./active-visits-table.resource.ts', () => { - const originalModule = jest.requireActual('./active-visits-table.resource.ts'); +jest.mock('./active-visits-table.resource', () => { + const originalModule = jest.requireActual('./active-visits-table.resource'); return { ...originalModule, diff --git a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx index c078e09d9..b4fd09480 100644 --- a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx +++ b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx @@ -12,7 +12,7 @@ import { RadioButtonGroup, RadioButton, } from '@carbon/react'; -import { ConfigObject, showSnackbar, useConfig } from '@openmrs/esm-framework'; +import { type ConfigObject, showSnackbar, useConfig } from '@openmrs/esm-framework'; import { addQueueEntry, usePriority, @@ -21,7 +21,7 @@ import { useVisitQueueEntries, } from '../active-visits/active-visits-table.resource'; import styles from './add-patient-toqueue-dialog.scss'; -import { ActiveVisit, useMissingQueueEntries } from '../visits-missing-inqueue/visits-missing-inqueue.resource'; +import { type ActiveVisit, useMissingQueueEntries } from '../visits-missing-inqueue/visits-missing-inqueue.resource'; import { useQueueLocations } from '../patient-search/hooks/useQueueLocations'; interface AddVisitToQueueDialogProps { diff --git a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.ts similarity index 96% rename from packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx rename to packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.ts index 4adb4df64..50fbe9e81 100644 --- a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.tsx +++ b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.resource.ts @@ -1,6 +1,6 @@ import { openmrsFetch } from '@openmrs/esm-framework'; import useSWR from 'swr'; -import { ProvidersQueueRoom, QueueRoom } from '../types'; +import { type ProvidersQueueRoom, type QueueRoom } from '../types'; export function useQueueRooms(location: string, queueUuid: string) { const apiUrl = queueUuid diff --git a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx index 9cf220c61..8c7e3c2bd 100644 --- a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx +++ b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.component.tsx @@ -4,7 +4,7 @@ import styles from './clear-queue-entries-dialog.scss'; import { Button, ButtonSkeleton, ModalBody, ModalFooter, ModalHeader } from '@carbon/react'; import { showSnackbar } from '@openmrs/esm-framework'; import { batchClearQueueEntries } from './clear-queue-entries-dialog.resource'; -import { MappedVisitQueueEntry, useVisitQueueEntries } from '../active-visits/active-visits-table.resource'; +import { type MappedVisitQueueEntry, useVisitQueueEntries } from '../active-visits/active-visits-table.resource'; interface ClearQueueEntriesDialogProps { visitQueueEntries: Array; diff --git a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.ts similarity index 87% rename from packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx rename to packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.ts index fb9bab760..dba325f9a 100644 --- a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx +++ b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.ts @@ -1,5 +1,5 @@ -import { openmrsFetch, parseDate, toDateObjectStrict, toOmrsIsoString } from '@openmrs/esm-framework'; -import { endPatientStatus, MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; +import { openmrsFetch, parseDate } from '@openmrs/esm-framework'; +import { endPatientStatus, type MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; export async function batchClearQueueEntries(queueEntries: Array) { const abortController = new AbortController(); diff --git a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx index 4e5f83ae3..771c5afd3 100644 --- a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx +++ b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries.component.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { showModal } from '@openmrs/esm-framework'; import { useTranslation } from 'react-i18next'; -import { MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; +import { type MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; import { Button } from '@carbon/react'; import { TrashCan } from '@carbon/react/icons'; import styles from './clear-queue-entries-dialog.scss'; diff --git a/packages/esm-service-queues-app/src/config-schema.ts b/packages/esm-service-queues-app/src/config-schema.ts index 282003b54..d0b5498f5 100644 --- a/packages/esm-service-queues-app/src/config-schema.ts +++ b/packages/esm-service-queues-app/src/config-schema.ts @@ -1,6 +1,8 @@ import { Type } from '@openmrs/esm-framework'; -import vitalsConfigSchema, { VitalsConfigObject } from './current-visit/visit-details/vitals-config-schema'; -import biometricsConfigSchema, { BiometricsConfigObject } from './current-visit/visit-details/biometrics-config-schema'; +import vitalsConfigSchema, { type VitalsConfigObject } from './current-visit/visit-details/vitals-config-schema'; +import biometricsConfigSchema, { + type BiometricsConfigObject, +} from './current-visit/visit-details/biometrics-config-schema'; export const configSchema = { concepts: { diff --git a/packages/esm-service-queues-app/src/createDashboardLink.component.tsx b/packages/esm-service-queues-app/src/createDashboardLink.component.tsx index 71c8f1308..29b9dda28 100644 --- a/packages/esm-service-queues-app/src/createDashboardLink.component.tsx +++ b/packages/esm-service-queues-app/src/createDashboardLink.component.tsx @@ -32,9 +32,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash ); } -export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => - ( - - - - ); +export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => ( + + + +); diff --git a/packages/esm-service-queues-app/src/current-visit/current-visit.resource.ts b/packages/esm-service-queues-app/src/current-visit/current-visit.resource.ts index da5215b07..6b20399dd 100644 --- a/packages/esm-service-queues-app/src/current-visit/current-visit.resource.ts +++ b/packages/esm-service-queues-app/src/current-visit/current-visit.resource.ts @@ -1,7 +1,7 @@ import useSWR from 'swr'; -import { openmrsFetch, Visit } from '@openmrs/esm-framework'; -import { ConceptMetadata } from './hooks/useVitalsConceptMetadata'; -import { ObsMetaInfo } from '../types/index'; +import { openmrsFetch, type Visit } from '@openmrs/esm-framework'; +import { type ConceptMetadata } from './hooks/useVitalsConceptMetadata'; +import { type ObsMetaInfo } from '../types/index'; export function useVisit(visitUuid: string) { const customRepresentation = diff --git a/packages/esm-service-queues-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx b/packages/esm-service-queues-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx index 7b31f7aa5..9ae9bd03a 100644 --- a/packages/esm-service-queues-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx +++ b/packages/esm-service-queues-app/src/current-visit/hooks/useVitalsConceptMetadata.tsx @@ -1,7 +1,7 @@ import useSWRImmutable from 'swr/immutable'; import { openmrsFetch, useConfig, formatTime, parseDate } from '@openmrs/esm-framework'; -import { Observation, PatientVitals, Encounter } from '../../types/index'; -import { ConfigObject } from '../../config-schema'; +import { type Observation, type PatientVitals, Encounter } from '../../types/index'; +import { type ConfigObject } from '../../config-schema'; export function useVitalsConceptMetadata() { const customRepresentation = diff --git a/packages/esm-service-queues-app/src/current-visit/visit-details/current-visit-details.component.tsx b/packages/esm-service-queues-app/src/current-visit/visit-details/current-visit-details.component.tsx index 57a614a36..c5eec5c43 100644 --- a/packages/esm-service-queues-app/src/current-visit/visit-details/current-visit-details.component.tsx +++ b/packages/esm-service-queues-app/src/current-visit/visit-details/current-visit-details.component.tsx @@ -7,8 +7,8 @@ import { StructuredListRow, StructuredListWrapper, } from '@carbon/react'; -import { OpenmrsResource, formatTime, parseDate } from '@openmrs/esm-framework'; -import { Note, Encounter, Observation, DiagnosisItem } from '../../types/index'; +import { type OpenmrsResource, formatTime, parseDate } from '@openmrs/esm-framework'; +import { type Note, type Encounter, type Observation, type DiagnosisItem } from '../../types/index'; import { useVitalsFromObs } from '../hooks/useVitalsConceptMetadata'; import TriageNote from './triage-note.component'; import Vitals from './vitals.component'; diff --git a/packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.component.tsx b/packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.component.tsx index 99ee71abb..7875a8d94 100644 --- a/packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.component.tsx +++ b/packages/esm-service-queues-app/src/current-visit/visit-details/triage-note.component.tsx @@ -3,7 +3,7 @@ import { Button, Tag } from '@carbon/react'; import { useTranslation } from 'react-i18next'; import { ArrowRight } from '@carbon/react/icons'; import { navigate } from '@openmrs/esm-framework'; -import { DiagnosisItem, Note } from '../../types/index'; +import { type DiagnosisItem, type Note } from '../../types/index'; import styles from './triage-note.scss'; interface TriageNoteProps { diff --git a/packages/esm-service-queues-app/src/current-visit/visit-details/vitals.component.tsx b/packages/esm-service-queues-app/src/current-visit/visit-details/vitals.component.tsx index d2657b21f..f0369e7c8 100644 --- a/packages/esm-service-queues-app/src/current-visit/visit-details/vitals.component.tsx +++ b/packages/esm-service-queues-app/src/current-visit/visit-details/vitals.component.tsx @@ -6,8 +6,8 @@ import { ArrowRight, CircleFilled } from '@carbon/react/icons'; import { navigate, useConfig } from '@openmrs/esm-framework'; import { calculateBMI, assessValue, getReferenceRangesForConcept } from '../current-visit.resource'; import { useVitalsConceptMetadata } from '../hooks/useVitalsConceptMetadata'; -import { ConfigObject } from '../../config-schema'; -import { PatientVitals } from '../../types/index'; +import { type ConfigObject } from '../../config-schema'; +import { type PatientVitals } from '../../types/index'; import styles from './triage-note.scss'; interface VitalsComponentProps { diff --git a/packages/esm-service-queues-app/src/helpers/functions.ts b/packages/esm-service-queues-app/src/helpers/functions.ts index 19b3fd594..3714133b9 100644 --- a/packages/esm-service-queues-app/src/helpers/functions.ts +++ b/packages/esm-service-queues-app/src/helpers/functions.ts @@ -1,5 +1,5 @@ -import { OpenmrsResource } from '@openmrs/esm-framework'; -import { MappedQueuePriority } from '../active-visits/active-visits-table.resource'; +import { type OpenmrsResource } from '@openmrs/esm-framework'; +import { type MappedQueuePriority } from '../active-visits/active-visits-table.resource'; export const getTagType = (priority: string) => { switch (priority as MappedQueuePriority) { diff --git a/packages/esm-service-queues-app/src/home.component.tsx b/packages/esm-service-queues-app/src/home.component.tsx index 0be18f6d5..0facae82e 100644 --- a/packages/esm-service-queues-app/src/home.component.tsx +++ b/packages/esm-service-queues-app/src/home.component.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ConfigObject, useConfig } from '@openmrs/esm-framework'; +import { type ConfigObject, useConfig } from '@openmrs/esm-framework'; import ActiveVisitsTable from './active-visits/active-visits-table.component'; import ActiveVisitsTabs from './active-visits/active-visits-tab.component'; import ClinicMetrics from './patient-queue-metrics/clinic-metrics.component'; diff --git a/packages/esm-service-queues-app/src/home.test.tsx b/packages/esm-service-queues-app/src/home.test.tsx index 5e9cd741a..c00006e92 100644 --- a/packages/esm-service-queues-app/src/home.test.tsx +++ b/packages/esm-service-queues-app/src/home.test.tsx @@ -15,8 +15,8 @@ jest.mock('@openmrs/esm-framework', () => ({ })), })); -jest.mock('./helpers/helpers.ts', () => ({ - ...jest.requireActual('./helpers/helpers.ts'), +jest.mock('./helpers/helpers', () => ({ + ...jest.requireActual('./helpers/helpers'), useSelectedQueueLocationName: jest.fn(() => 'Test Location'), })); diff --git a/packages/esm-service-queues-app/src/past-visit/past-visit-details/encounter-list.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/encounter-list.component.tsx index 42ed2e3f7..8736831df 100644 --- a/packages/esm-service-queues-app/src/past-visit/past-visit-details/encounter-list.component.tsx +++ b/packages/esm-service-queues-app/src/past-visit/past-visit-details/encounter-list.component.tsx @@ -9,7 +9,7 @@ import { StructuredListWrapper, } from '@carbon/react'; import { formatDatetime, parseDate } from '@openmrs/esm-framework'; -import { FormattedEncounter } from '../../types/index'; +import { type FormattedEncounter } from '../../types/index'; import styles from '../past-visit.scss'; interface EncounterListProps { diff --git a/packages/esm-service-queues-app/src/past-visit/past-visit-details/medications-list.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/medications-list.component.tsx index b6031e729..1a5f194e3 100644 --- a/packages/esm-service-queues-app/src/past-visit/past-visit-details/medications-list.component.tsx +++ b/packages/esm-service-queues-app/src/past-visit/past-visit-details/medications-list.component.tsx @@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'; import { Tile } from '@carbon/react'; import { formatDate } from '@openmrs/esm-framework'; import { getDosage } from '../past-visit.resource'; -import { OrderItem } from '../../types/index'; +import { type OrderItem } from '../../types/index'; import styles from './past-visit-summary.scss'; interface MedicationProps { medications: Array; diff --git a/packages/esm-service-queues-app/src/past-visit/past-visit-details/notes-list.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/notes-list.component.tsx index 2ec3e4487..d461a2f31 100644 --- a/packages/esm-service-queues-app/src/past-visit/past-visit-details/notes-list.component.tsx +++ b/packages/esm-service-queues-app/src/past-visit/past-visit-details/notes-list.component.tsx @@ -2,7 +2,7 @@ import React from 'react'; import classNames from 'classnames'; import { Tag } from '@carbon/react'; import { useTranslation } from 'react-i18next'; -import { DiagnosisItem, Note } from '../../types/index'; +import { type DiagnosisItem, type Note } from '../../types/index'; import styles from './past-visit-summary.scss'; interface NotesProps { diff --git a/packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx b/packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx index c78412862..26eed919d 100644 --- a/packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx +++ b/packages/esm-service-queues-app/src/past-visit/past-visit-details/past-visit-summary.component.tsx @@ -3,7 +3,14 @@ import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { Tab, Tabs, TabList, TabPanel, TabPanels } from '@carbon/react'; import { formatTime, parseDate, useLayoutType, formatDatetime } from '@openmrs/esm-framework'; -import { Encounter, OrderItem, Order, Note, DiagnosisItem, Observation } from '../../types/index'; +import { + type Encounter, + type OrderItem, + type Order, + type Note, + type DiagnosisItem, + type Observation, +} from '../../types/index'; import { useVitalsFromObs } from '../../current-visit/hooks/useVitalsConceptMetadata'; import EncounterList from './encounter-list.component'; import Notes from './notes-list.component'; diff --git a/packages/esm-service-queues-app/src/past-visit/past-visit.resource.ts b/packages/esm-service-queues-app/src/past-visit/past-visit.resource.ts index f4810c8d9..6e57f9632 100644 --- a/packages/esm-service-queues-app/src/past-visit/past-visit.resource.ts +++ b/packages/esm-service-queues-app/src/past-visit/past-visit.resource.ts @@ -1,5 +1,5 @@ import useSWR from 'swr'; -import { openmrsFetch, Visit } from '@openmrs/esm-framework'; +import { openmrsFetch, type Visit } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; export function usePastVisits(patientUuid: string) { diff --git a/packages/esm-service-queues-app/src/patient-info/appointment-details.component.tsx b/packages/esm-service-queues-app/src/patient-info/appointment-details.component.tsx index 52805c36f..ca064b56f 100644 --- a/packages/esm-service-queues-app/src/patient-info/appointment-details.component.tsx +++ b/packages/esm-service-queues-app/src/patient-info/appointment-details.component.tsx @@ -2,11 +2,11 @@ import React from 'react'; import dayjs from 'dayjs'; import { useTranslation } from 'react-i18next'; import { InlineLoading } from '@carbon/react'; -import { formatDatetime, parseDate, Visit } from '@openmrs/esm-framework'; +import { formatDatetime, parseDate, type Visit } from '@openmrs/esm-framework'; import { useAppointments } from './appointments.resource'; import styles from './appointment-details.scss'; import { usePastVisits } from '../past-visit/past-visit.resource'; -import { Appointment } from '../types'; +import { type Appointment } from '../types'; interface AppointmentDetailsProps { patientUuid: string; diff --git a/packages/esm-service-queues-app/src/patient-info/appointments.resource.tsx b/packages/esm-service-queues-app/src/patient-info/appointments.resource.ts similarity index 95% rename from packages/esm-service-queues-app/src/patient-info/appointments.resource.tsx rename to packages/esm-service-queues-app/src/patient-info/appointments.resource.ts index 96ad5dd25..0efc22401 100644 --- a/packages/esm-service-queues-app/src/patient-info/appointments.resource.tsx +++ b/packages/esm-service-queues-app/src/patient-info/appointments.resource.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import useSWR from 'swr'; import { openmrsFetch } from '@openmrs/esm-framework'; -import { AppointmentsFetchResponse } from '../types'; +import { type AppointmentsFetchResponse } from '../types'; export const appointmentsSearchUrl = `/ws/rest/v1/appointments/search`; diff --git a/packages/esm-service-queues-app/src/patient-info/hooks/usePatientAttributes.tsx b/packages/esm-service-queues-app/src/patient-info/hooks/usePatientAttributes.tsx index 1dfd4fffa..48af0b7b6 100644 --- a/packages/esm-service-queues-app/src/patient-info/hooks/usePatientAttributes.tsx +++ b/packages/esm-service-queues-app/src/patient-info/hooks/usePatientAttributes.tsx @@ -1,7 +1,7 @@ import { openmrsFetch, useConfig } from '@openmrs/esm-framework'; import useSWRImmutable from 'swr/immutable'; -import { ConfigObject } from '../../config-schema'; -import { Patient, Attribute } from '../../types'; +import { type ConfigObject } from '../../config-schema'; +import { type Patient, Attribute } from '../../types'; const customRepresentation = 'custom:(uuid,display,identifiers:(identifier,uuid,preferred,location:(uuid,name),identifierType:(uuid,name,format,formatDescription,validator)),person:(uuid,display,gender,birthdate,dead,age,deathDate,birthdateEstimated,causeOfDeath,preferredName:(uuid,preferred,givenName,middleName,familyName),attributes,preferredAddress:(uuid,preferred,address1,address2,cityVillage,longitude,stateProvince,latitude,country,postalCode,countyDistrict,address3,address4,address5,address6,address7)))'; @@ -32,8 +32,8 @@ export const usePatientAttributes = (patientUuid: string) => { export const usePatientContactAttributes = (patientUuid: string) => { const { contactAttributeType } = useConfig() as ConfigObject; const { attributes, isLoading } = usePatientAttributes(patientUuid); - const contactAttributes = attributes.filter(({ attributeType }) => - contactAttributeType?.some((uuid) => attributeType.uuid === uuid), + const contactAttributes = attributes.filter( + ({ attributeType }) => contactAttributeType?.some((uuid) => attributeType.uuid === uuid), ); return { contactAttributes: contactAttributes ?? [], diff --git a/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.ts similarity index 93% rename from packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.tsx rename to packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.ts index e1011927a..0102cd6f4 100644 --- a/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.tsx +++ b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.resource.ts @@ -1,7 +1,7 @@ -import { useSession, Visit, openmrsFetch } from '@openmrs/esm-framework'; +import { useSession, type Visit, openmrsFetch } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; import useSWR from 'swr'; -import { WaitTime } from '../types'; +import { type WaitTime } from '../types'; export function useActiveVisits() { const currentUserSession = useSession(); diff --git a/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.test.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.test.tsx index e90d12c52..7527d9577 100644 --- a/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.test.tsx +++ b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.test.tsx @@ -7,8 +7,8 @@ import ClinicMetrics from './clinic-metrics.component'; const mockedOpenmrsFetch = openmrsFetch as jest.Mock; const mockedUseConfig = useConfig as jest.Mock; -jest.mock('./queue-metrics.resource.ts', () => { - const originalModule = jest.requireActual('./queue-metrics.resource.ts'); +jest.mock('./queue-metrics.resource', () => { + const originalModule = jest.requireActual('./queue-metrics.resource'); return { ...originalModule, @@ -17,8 +17,8 @@ jest.mock('./queue-metrics.resource.ts', () => { }; }); -jest.mock('./clinic-metrics.resource.tsx', () => { - const originalModule = jest.requireActual('./clinic-metrics.resource.tsx'); +jest.mock('./clinic-metrics.resource', () => { + const originalModule = jest.requireActual('./clinic-metrics.resource'); return { ...originalModule, @@ -37,8 +37,8 @@ jest.mock('@openmrs/esm-framework', () => { }; }); -jest.mock('../helpers/helpers.ts', () => { - const originalModule = jest.requireActual('../helpers/helpers.ts'); +jest.mock('../helpers/helpers', () => { + const originalModule = jest.requireActual('../helpers/helpers'); return { ...originalModule, @@ -46,8 +46,8 @@ jest.mock('../helpers/helpers.ts', () => { }; }); -jest.mock('../active-visits/active-visits-table.resource.ts', () => { - const originalModule = jest.requireActual('../active-visits/active-visits-table.resource.ts'); +jest.mock('../active-visits/active-visits-table.resource', () => { + const originalModule = jest.requireActual('../active-visits/active-visits-table.resource'); return { ...originalModule, diff --git a/packages/esm-service-queues-app/src/patient-queue-metrics/queue-metrics.resource.ts b/packages/esm-service-queues-app/src/patient-queue-metrics/queue-metrics.resource.ts index 45f24fcdc..c5ff7605c 100644 --- a/packages/esm-service-queues-app/src/patient-queue-metrics/queue-metrics.resource.ts +++ b/packages/esm-service-queues-app/src/patient-queue-metrics/queue-metrics.resource.ts @@ -1,7 +1,7 @@ import useSWR from 'swr'; import useSWRImmutable from 'swr/immutable'; import { openmrsFetch } from '@openmrs/esm-framework'; -import { Appointment, QueueServiceInfo } from '../types'; +import { type Appointment, type QueueServiceInfo } from '../types'; import { startOfDay } from '../constants'; export function useServices(location: string) { diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx index 49f827fcd..9716261e9 100644 --- a/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx +++ b/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx @@ -1,11 +1,11 @@ +import { useMemo } from 'react'; import useSWR from 'swr'; import { openmrsFetch } from '@openmrs/esm-framework'; -import { useMemo } from 'react'; -import { PatientProgram } from '../../types'; +import { type PatientProgram } from '../../types'; import uniqBy from 'lodash-es/uniqBy'; -const customRepresentation = `custom:(uuid,display,program,dateEnrolled,dateCompleted,location:(uuid,display))`; export const useActivePatientEnrollment = (patientUuid: string) => { + const customRepresentation = `custom:(uuid,display,program,dateEnrolled,dateCompleted,location:(uuid,display))`; const apiUrl = `/ws/rest/v1/programenrollment?patient=${patientUuid}&v=${customRepresentation}`; const { data, error, isLoading } = useSWR<{ data: { results: Array } }>( diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.ts similarity index 81% rename from packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.tsx rename to packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.ts index 0f8643667..11dcdabda 100644 --- a/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.tsx +++ b/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.ts @@ -1,4 +1,4 @@ -import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework'; +import { type FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework'; import useSWRImmutable from 'swr/immutable'; export const useDefaultLoginLocation = () => { diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx index 403c17d0b..990e95f8b 100644 --- a/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx +++ b/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx @@ -1,6 +1,6 @@ +import { useMemo } from 'react'; import useSWR from 'swr'; import { fhirBaseUrl, openmrsFetch } from '@openmrs/esm-framework'; -import { useMemo } from 'react'; interface FHIRResponse { entry: Array<{ resource: fhir.Patient }>; diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx index 46f1ddb74..6da8e8010 100644 --- a/packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx +++ b/packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx @@ -1,6 +1,6 @@ +import { useMemo } from 'react'; import useSWR from 'swr'; import { fhirBaseUrl, openmrsFetch } from '@openmrs/esm-framework'; -import { useMemo } from 'react'; interface FHIRResponse { entry: Array<{ resource: fhir.Location }>; diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx index c0e502591..116f91e71 100644 --- a/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx +++ b/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx @@ -1,6 +1,6 @@ import useSWR from 'swr'; import { openmrsFetch, useConfig } from '@openmrs/esm-framework'; -import { ConfigObject, OutpatientConfig } from '../../config-schema'; +import { type ConfigObject, type OutpatientConfig } from '../../config-schema'; import { useMemo } from 'react'; interface EnrollmentVisitType { diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.ts similarity index 96% rename from packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.tsx rename to packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.ts index d2b6b9fbc..ed059cf8f 100644 --- a/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.tsx +++ b/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.ts @@ -1,7 +1,7 @@ import useSWR from 'swr'; import { openmrsFetch } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; -import { AppointmentsFetchResponse } from '../../types'; +import { type AppointmentsFetchResponse } from '../../types'; export function useScheduledVisits(patientUuid: string) { const abortController = new AbortController(); diff --git a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx index d28d744a1..44d4e6c1e 100644 --- a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx +++ b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx @@ -21,14 +21,14 @@ import { showSnackbar, useSession, useLocations, - NewVisitPayload, + type NewVisitPayload, saveVisit, useVisitTypes, useVisit, useConfig, - ConfigObject, + type ConfigObject, } from '@openmrs/esm-framework'; -import { Appointment, SearchTypes } from '../types'; +import { type Appointment, SearchTypes } from '../types'; import styles from './patient-scheduled-visits.scss'; import { useScheduledVisits } from './hooks/useScheduledVisits'; import isNil from 'lodash-es/isNil'; @@ -40,7 +40,7 @@ import { } from '../active-visits/active-visits-table.resource'; import { addQueueEntry } from './visit-form/queue.resource'; import { first } from 'rxjs/operators'; -import { convertTime12to24, amPm } from '../helpers/time-helpers'; +import { convertTime12to24, type amPm } from '../helpers/time-helpers'; import dayjs from 'dayjs'; import head from 'lodash-es/head'; import { useQueueLocations } from './hooks/useQueueLocations'; diff --git a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx index 4f7d90375..2996f5049 100644 --- a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx +++ b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { screen } from '@testing-library/react'; import { renderWithSwr, waitForLoadingToFinish } from 'tools'; import { mockPatientsVisits, mockLocations, mockSession, mockPatient } from '__mocks__'; -import { ConfigObject, openmrsFetch, useConfig } from '@openmrs/esm-framework'; +import { type ConfigObject, openmrsFetch, useConfig } from '@openmrs/esm-framework'; import PatientScheduledVisits from './patient-scheduled-visits.component'; const mockedUseConfig = useConfig as jest.Mock; diff --git a/packages/esm-service-queues-app/src/patient-search/patient-search.component.tsx b/packages/esm-service-queues-app/src/patient-search/patient-search.component.tsx index 18008f1f4..d5c999047 100644 --- a/packages/esm-service-queues-app/src/patient-search/patient-search.component.tsx +++ b/packages/esm-service-queues-app/src/patient-search/patient-search.component.tsx @@ -23,8 +23,8 @@ const PatientSearch: React.FC = ({ closePanel, view, viewSta view === 'queue_service_form' ? SearchTypes.QUEUE_SERVICE_FORM : view === 'queue_room_form' - ? SearchTypes.QUEUE_ROOM_FORM - : SearchTypes.SCHEDULED_VISITS, + ? SearchTypes.QUEUE_ROOM_FORM + : SearchTypes.SCHEDULED_VISITS, ); const [newVisitMode, setNewVisitMode] = useState(false); diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx index 3a47f4574..b2f7f315b 100644 --- a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx +++ b/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx @@ -5,7 +5,7 @@ import { useQueueLocations } from '../hooks/useQueueLocations'; import { usePriority, useStatus } from '../../active-visits/active-visits-table.resource'; import { useServices } from '../../patient-queue-metrics/queue-metrics.resource'; import styles from './visit-form-queue-fields.scss'; -import { ConfigObject, useConfig, useLayoutType } from '@openmrs/esm-framework'; +import { type ConfigObject, useConfig, useLayoutType } from '@openmrs/esm-framework'; import { useTranslation } from 'react-i18next'; const StartVisitQueueFields: React.FC = () => { diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.component.tsx index 756413e5e..f2918f4e5 100644 --- a/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.component.tsx +++ b/packages/esm-service-queues-app/src/patient-search/visit-form/base-visit-type.component.tsx @@ -4,7 +4,7 @@ import debounce from 'lodash-es/debounce'; import isEmpty from 'lodash-es/isEmpty'; import { useTranslation } from 'react-i18next'; import { Layer, Search, RadioButtonGroup, RadioButton, Tile } from '@carbon/react'; -import { useLayoutType, usePagination, VisitType } from '@openmrs/esm-framework'; +import { useLayoutType, usePagination, type VisitType } from '@openmrs/esm-framework'; import EmptyDataIllustration from '../empty-data-illustration.component'; import styles from './base-visit-type.scss'; diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts b/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts index d7ea75c71..4ebcf61b0 100644 --- a/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts +++ b/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts @@ -1,6 +1,6 @@ import { openmrsFetch, toDateObjectStrict, toOmrsIsoString } from '@openmrs/esm-framework'; import { generateVisitQueueNumber } from '../../active-visits/active-visits-table.resource'; -import { Appointment } from '../../types'; +import { type Appointment } from '../../types'; export async function addQueueEntry( visitUuid: string, diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/recommended-visit-type.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/recommended-visit-type.component.tsx index ca83e6ca0..01ee4d578 100644 --- a/packages/esm-service-queues-app/src/patient-search/visit-form/recommended-visit-type.component.tsx +++ b/packages/esm-service-queues-app/src/patient-search/visit-form/recommended-visit-type.component.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { StructuredListSkeleton } from '@carbon/react'; import { useRecommendedVisitTypes } from '../hooks/useRecommendedVisitTypes'; import BaseVisitType from './base-visit-type.component'; -import { PatientProgram } from '../../types'; +import { type PatientProgram } from '../../types'; interface RecommendedVisitTypeProp { patientUuid: string; diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx index 9513014d7..77339aa8d 100644 --- a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx +++ b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx @@ -35,14 +35,14 @@ import { showNotification, showToast, useConfig, - ConfigObject, + type ConfigObject, } from '@openmrs/esm-framework'; import BaseVisitType from './base-visit-type.component'; import { addQueueEntry, useVisitQueueEntries } from '../../active-visits/active-visits-table.resource'; -import { convertTime12to24, amPm } from '../../helpers/time-helpers'; +import { convertTime12to24, type amPm } from '../../helpers/time-helpers'; import { MemoizedRecommendedVisitType } from './recommended-visit-type.component'; import { useActivePatientEnrollment } from '../hooks/useActivePatientEnrollment'; -import { SearchTypes, PatientProgram, NewVisitPayload } from '../../types'; +import { SearchTypes, type PatientProgram, type NewVisitPayload } from '../../types'; import styles from './visit-form.scss'; import { useDefaultLoginLocation } from '../hooks/useDefaultLocation'; import isEmpty from 'lodash-es/isEmpty'; diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.component.tsx index e453f125e..144aed8ed 100644 --- a/packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.component.tsx +++ b/packages/esm-service-queues-app/src/queue-entry-table-components/actions-menu.component.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { navigate, showModal } from '@openmrs/esm-framework'; import { useTranslation } from 'react-i18next'; -import { MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; +import { type MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; import { Layer, OverflowMenu, OverflowMenuItem } from '@carbon/react'; import styles from './actions-menu.scss'; diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.component.tsx index 8661709b8..78b34d67f 100644 --- a/packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.component.tsx +++ b/packages/esm-service-queues-app/src/queue-entry-table-components/edit-entry.component.tsx @@ -1,5 +1,5 @@ import React, { useCallback } from 'react'; -import { MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; +import { type MappedVisitQueueEntry } from '../active-visits/active-visits-table.resource'; import { useTranslation } from 'react-i18next'; import { showModal } from '@openmrs/esm-framework'; import { Button } from '@carbon/react'; diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.component.tsx index 451fe85cf..00382780e 100644 --- a/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.component.tsx +++ b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.component.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { ConfigObject, navigate, useConfig } from '@openmrs/esm-framework'; +import { type ConfigObject, navigate, useConfig } from '@openmrs/esm-framework'; import { Button } from '@carbon/react'; import styles from './open-chart.scss'; import usePatientId from './open-chart.resource'; diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.ts similarity index 82% rename from packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.tsx rename to packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.ts index 8c22202be..eb4227cad 100644 --- a/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.tsx +++ b/packages/esm-service-queues-app/src/queue-entry-table-components/open-chart.resource.ts @@ -1,4 +1,4 @@ -import { ConfigObject, openmrsFetch, useConfig } from '@openmrs/esm-framework'; +import { type ConfigObject, openmrsFetch, useConfig } from '@openmrs/esm-framework'; import useSWR from 'swr'; const usePatientId = (patientUuid: string) => { diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx index 8fe9ed139..ffb035f86 100644 --- a/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx +++ b/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx @@ -5,7 +5,7 @@ import { mutate } from 'swr'; import { Button } from '@carbon/react'; import { Notification } from '@carbon/react/icons'; import { showModal, showNotification } from '@openmrs/esm-framework'; -import { MappedVisitQueueEntry, serveQueueEntry } from '../active-visits/active-visits-table.resource'; +import { type MappedVisitQueueEntry, serveQueueEntry } from '../active-visits/active-visits-table.resource'; import styles from './transition-entry.scss'; interface TransitionMenuProps { queueEntry: MappedVisitQueueEntry; diff --git a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx index 93cb6807b..f9d95391a 100644 --- a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx +++ b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { Button, DataTable, - DataTableHeader, + type DataTableHeader, Layer, Table, TableBody, @@ -23,7 +23,7 @@ import { import { Filter, OverflowMenuVertical } from '@carbon/react/icons'; import { ConfigurableLink, ExtensionSlot, formatDatetime, parseDate, usePagination } from '@openmrs/esm-framework'; import styles from './queue-linelist-base-table.scss'; -import { FilterTypes } from '../types'; +import { type FilterTypes } from '../types'; import QueueLinelist from './queue-linelist.component'; import { getGender } from '../helpers/functions'; diff --git a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.ts similarity index 95% rename from packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.tsx rename to packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.ts index 3e9a7b8f4..e6489e98d 100644 --- a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.tsx +++ b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist.resource.ts @@ -1,7 +1,7 @@ import useSWR from 'swr'; import { openmrsFetch } from '@openmrs/esm-framework'; -import { Appointment, AppointmentsFetchResponse } from '../types/index'; -import { Provider } from '../types'; +import { type Appointment, type AppointmentsFetchResponse } from '../types/index'; +import { type Provider } from '../types'; import { startOfDay } from '../constants'; import dayjs from 'dayjs'; diff --git a/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx index 6c433d977..cc7613fbe 100644 --- a/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx +++ b/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { Button, DataTable, - DataTableHeader, + type DataTableHeader, Layer, Table, TableBody, @@ -23,7 +23,7 @@ import { } from '@carbon/react'; import { Filter, OverflowMenuVertical } from '@carbon/react/icons'; import { - ConfigObject, + type ConfigObject, ExtensionSlot, formatDatetime, useConfig, diff --git a/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.component.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.component.tsx index e365f55d7..0e46bc807 100644 --- a/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.component.tsx +++ b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.component.tsx @@ -13,7 +13,7 @@ import { InlineNotification, } from '@carbon/react'; import { showSnackbar, useLayoutType } from '@openmrs/esm-framework'; -import { SearchTypes } from '../types'; +import { type SearchTypes } from '../types'; import { mutate } from 'swr'; import { useQueueLocations } from '../patient-search/hooks/useQueueLocations'; import { useServices } from '../active-visits/active-visits-table.resource'; diff --git a/packages/esm-service-queues-app/src/queue-rooms/queue-room.resource.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room.resource.ts similarity index 100% rename from packages/esm-service-queues-app/src/queue-rooms/queue-room.resource.tsx rename to packages/esm-service-queues-app/src/queue-rooms/queue-room.resource.ts diff --git a/packages/esm-service-queues-app/src/queue-services/queue-service-form.component.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service-form.component.tsx index 15f8ece14..fc5fec946 100644 --- a/packages/esm-service-queues-app/src/queue-services/queue-service-form.component.tsx +++ b/packages/esm-service-queues-app/src/queue-services/queue-service-form.component.tsx @@ -15,7 +15,7 @@ import { import { mutate } from 'swr'; import { showSnackbar, useLayoutType } from '@openmrs/esm-framework'; import { saveQueue, useServiceConcepts } from './queue-service.resource'; -import { SearchTypes } from '../types'; +import { type SearchTypes } from '../types'; import { useQueueLocations } from '../patient-search/hooks/useQueueLocations'; import styles from './queue-service-form.scss'; diff --git a/packages/esm-service-queues-app/src/queue-services/queue-service.resource.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service.resource.ts similarity index 81% rename from packages/esm-service-queues-app/src/queue-services/queue-service.resource.tsx rename to packages/esm-service-queues-app/src/queue-services/queue-service.resource.ts index c951d0d94..46a463b01 100644 --- a/packages/esm-service-queues-app/src/queue-services/queue-service.resource.tsx +++ b/packages/esm-service-queues-app/src/queue-services/queue-service.resource.ts @@ -1,6 +1,5 @@ -import useSWR from 'swr'; import useSWRImmutable from 'swr/immutable'; -import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework'; +import { type FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework'; export function useServiceConcepts() { const config = useConfig(); @@ -9,7 +8,7 @@ export function useServiceConcepts() { } = config; const apiUrl = `/ws/rest/v1/concept/${serviceConceptSetUuid}`; - const { data, error, isLoading } = useSWRImmutable(apiUrl, openmrsFetch); + const { data, isLoading } = useSWRImmutable(apiUrl, openmrsFetch); return { queueConcepts: data ? data?.data?.setMembers : [], diff --git a/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx index 6d8fe02ab..8179f2e70 100644 --- a/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx +++ b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react'; -import { parseDate, showSnackbar, toDateObjectStrict, toOmrsIsoString, useVisit } from '@openmrs/esm-framework'; -import { MappedQueueEntry } from '../types'; +import { parseDate, showSnackbar, useVisit } from '@openmrs/esm-framework'; +import { type MappedQueueEntry } from '../types'; import { startOfDay } from '../constants'; import { useCheckedInAppointments, voidQueueEntry } from './remove-queue-entry.resource'; import { useVisitQueueEntries } from '../active-visits/active-visits-table.resource'; diff --git a/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.ts similarity index 96% rename from packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx rename to packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.ts index 84087630b..efa04107b 100644 --- a/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.tsx +++ b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.resource.ts @@ -1,7 +1,7 @@ import { openmrsFetch, updateVisit } from '@openmrs/esm-framework'; import dayjs from 'dayjs'; import { endPatientStatus } from '../active-visits/active-visits-table.resource'; -import { AppointmentsFetchResponse, EndVisitPayload } from '../types'; +import { type AppointmentsFetchResponse, type EndVisitPayload } from '../types'; import useSWR from 'swr'; import { omrsDateFormat, timeZone } from '../constants'; import { first } from 'rxjs/operators'; diff --git a/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx index 02485ac17..d6dbb94fc 100644 --- a/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx +++ b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx @@ -3,7 +3,7 @@ import dayjs from 'dayjs'; import { useTranslation } from 'react-i18next'; import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react'; import { - ConfigObject, + type ConfigObject, ExtensionSlot, formatDatetime, navigate, @@ -14,7 +14,7 @@ import { useConfig, } from '@openmrs/esm-framework'; import { - MappedVisitQueueEntry, + type MappedVisitQueueEntry, serveQueueEntry, updateQueueEntry, useVisitQueueEntries, diff --git a/packages/esm-service-queues-app/src/types/index.ts b/packages/esm-service-queues-app/src/types/index.ts index 189f506f6..9323bf341 100644 --- a/packages/esm-service-queues-app/src/types/index.ts +++ b/packages/esm-service-queues-app/src/types/index.ts @@ -1,4 +1,4 @@ -import { OpenmrsResource } from '@openmrs/esm-framework'; +import { type OpenmrsResource } from '@openmrs/esm-framework'; export enum SearchTypes { BASIC = 'basic', diff --git a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx index 9aae1f9ad..412e6fa93 100644 --- a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx +++ b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx @@ -1,4 +1,4 @@ -import React, { useMemo, useEffect, useState, useCallback, MouseEvent, AnchorHTMLAttributes } from 'react'; +import React, { useMemo, useEffect, useState, useCallback, type MouseEvent, type AnchorHTMLAttributes } from 'react'; import classNames from 'classnames'; import { DataTable, @@ -37,7 +37,7 @@ import { import { useTranslation } from 'react-i18next'; import styles from './visits-missing-inqueue.scss'; import { getOriginFromPathName } from '../active-visits/active-visits-table.resource'; -import { ActiveVisit, useMissingQueueEntries } from './visits-missing-inqueue.resource'; +import { type ActiveVisit, useMissingQueueEntries } from './visits-missing-inqueue.resource'; import { Add } from '@carbon/react/icons'; interface PaginationData { diff --git a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts index 416738f1a..3cfd8b828 100644 --- a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts +++ b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts @@ -2,8 +2,8 @@ import useSWR from 'swr'; import dayjs from 'dayjs'; import isToday from 'dayjs/plugin/isToday'; import last from 'lodash-es/last'; -import { openmrsFetch, Visit, useSession } from '@openmrs/esm-framework'; -import { VisitQueueEntry } from '../active-visits/active-visits-table.resource'; +import { openmrsFetch, type Visit, useSession } from '@openmrs/esm-framework'; +import { type VisitQueueEntry } from '../active-visits/active-visits-table.resource'; dayjs.extend(isToday); diff --git a/tools/setupTests.ts b/tools/setup-tests.ts similarity index 100% rename from tools/setupTests.ts rename to tools/setup-tests.ts diff --git a/yarn.lock b/yarn.lock index d677cccc9..dbd88a624 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 8 cacheKey: 10 +"@aashutoshrathi/word-wrap@npm:^1.2.3": + version: 1.2.6 + resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" + checksum: 6eebd12a5cd03cee38fcb915ef9f4ea557df6a06f642dfc7fe8eb4839eb5c9ca55a382f3604d52c14200b0c214c12af5e1f23d2a6d8e23ef2d016b105a9d6c0a + languageName: node + linkType: hard + "@adobe/css-tools@npm:^4.3.1": version: 4.3.2 resolution: "@adobe/css-tools@npm:4.3.2" @@ -55,15 +62,6 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:7.12.11": - version: 7.12.11 - resolution: "@babel/code-frame@npm:7.12.11" - dependencies: - "@babel/highlight": "npm:^7.10.4" - checksum: d243f0b1e475f5953ae452f70c0b4bd47a106df59733631b9ae36fb9ad1ae068c3a11d936ed22117084ec7439e843a4b75700922b507aac723ad84a257ae94f9 - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.8.3": version: 7.18.6 resolution: "@babel/code-frame@npm:7.18.6" @@ -382,7 +380,7 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.18.6": +"@babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" dependencies: @@ -1302,17 +1300,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime-corejs3@npm:^7.10.2": - version: 7.20.1 - resolution: "@babel/runtime-corejs3@npm:7.20.1" - dependencies: - core-js-pure: "npm:^3.25.1" - regenerator-runtime: "npm:^0.13.10" - checksum: d0a74c4149c31cbf2c78b923ee7c7d450e94d192493f872ac3fc18704f14c23ec9791acb98a0cdb0c0163a78a6dd03ee6effc1dbc27e52f7e92b9fb8ab004cd3 - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2": version: 7.20.1 resolution: "@babel/runtime@npm:7.20.1" dependencies: @@ -1701,20 +1689,45 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^0.4.3": - version: 0.4.3 - resolution: "@eslint/eslintrc@npm:0.4.3" +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": + version: 4.4.0 + resolution: "@eslint-community/eslint-utils@npm:4.4.0" + dependencies: + eslint-visitor-keys: "npm:^3.3.0" + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: 8d70bcdcd8cd279049183aca747d6c2ed7092a5cf0cf5916faac1ef37ffa74f0c245c2a3a3d3b9979d9dfdd4ca59257b4c5621db699d637b847a2c5e02f491c2 + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": + version: 4.10.0 + resolution: "@eslint-community/regexpp@npm:4.10.0" + checksum: 8c36169c815fc5d726078e8c71a5b592957ee60d08c6470f9ce0187c8046af1a00afbda0a065cc40ff18d5d83f82aed9793c6818f7304a74a7488dc9f3ecbd42 + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/eslintrc@npm:2.1.4" dependencies: ajv: "npm:^6.12.4" - debug: "npm:^4.1.1" - espree: "npm:^7.3.0" - globals: "npm:^13.9.0" - ignore: "npm:^4.0.6" + debug: "npm:^4.3.2" + espree: "npm:^9.6.0" + globals: "npm:^13.19.0" + ignore: "npm:^5.2.0" import-fresh: "npm:^3.2.1" - js-yaml: "npm:^3.13.1" - minimatch: "npm:^3.0.4" + js-yaml: "npm:^4.1.0" + minimatch: "npm:^3.1.2" strip-json-comments: "npm:^3.1.1" - checksum: d41857d255e75870a523b9d88a0367e576cd51acb87732dc5f1ec1857efa56ef82f1c46873fab1fc6944aafaf0a6902ce3eb47c8a55abf8de135558f6f5405f5 + checksum: 7a3b14f4b40fc1a22624c3f84d9f467a3d9ea1ca6e9a372116cb92507e485260359465b58e25bcb6c9981b155416b98c9973ad9b796053fd7b3f776a6946bce8 + languageName: node + linkType: hard + +"@eslint/js@npm:8.56.0": + version: 8.56.0 + resolution: "@eslint/js@npm:8.56.0" + checksum: 97a4b5ccf7e24f4d205a1fb0f21cdcd610348ecf685f6798a48dd41ba443f2c1eedd3050ff5a0b8f30b8cf6501ab512aa9b76e531db15e59c9ebaa41f3162e37 languageName: node linkType: hard @@ -1774,21 +1787,28 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.5.0": - version: 0.5.0 - resolution: "@humanwhocodes/config-array@npm:0.5.0" +"@humanwhocodes/config-array@npm:^0.11.13": + version: 0.11.13 + resolution: "@humanwhocodes/config-array@npm:0.11.13" dependencies: - "@humanwhocodes/object-schema": "npm:^1.2.0" + "@humanwhocodes/object-schema": "npm:^2.0.1" debug: "npm:^4.1.1" - minimatch: "npm:^3.0.4" - checksum: 478ad89d87e6a4aa7ea5626024f24efe0ec695e8d0393e22e5c495e1070fd562220ab74b5cd7a428882eec751126ec4e4e5883c2b1ec1740eb1af2bf4f3329f0 + minimatch: "npm:^3.0.5" + checksum: 9f655e1df7efa5a86822cd149ca5cef57240bb8ffd728f0c07cc682cc0a15c6bdce68425fbfd58f9b3e8b16f79b3fd8cb1e96b10c434c9a76f20b2a89f213272 languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.0": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: b48a8f87fcd5fdc4ac60a31a8bf710d19cc64556050575e6a35a4a48a8543cf8cde1598a65640ff2cdfbfd165b38f9db4fa3782bea7848eb585cc3db824002e6 +"@humanwhocodes/module-importer@npm:^1.0.1": + version: 1.0.1 + resolution: "@humanwhocodes/module-importer@npm:1.0.1" + checksum: e993950e346331e5a32eefb27948ecdee2a2c4ab3f072b8f566cd213ef485dd50a3ca497050608db91006f5479e43f91a439aef68d2a313bd3ded06909c7c5b3 + languageName: node + linkType: hard + +"@humanwhocodes/object-schema@npm:^2.0.1": + version: 2.0.1 + resolution: "@humanwhocodes/object-schema@npm:2.0.1" + checksum: dbddfd0465aecf92ed845ec30d06dba3f7bb2496d544b33b53dac7abc40370c0e46b8787b268d24a366730d5eeb5336ac88967232072a183905ee4abf7df4dab languageName: node linkType: hard @@ -2694,7 +2714,7 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.walk@npm:^1.2.3": +"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": version: 1.2.8 resolution: "@nodelib/fs.walk@npm:1.2.8" dependencies: @@ -3053,8 +3073,8 @@ __metadata: "@types/uuid": "npm:^8.3.0" "@types/webpack-env": "npm:^1.16.0" "@types/yup": "npm:^0.29.11" - "@typescript-eslint/eslint-plugin": "npm:^4.15.1" - "@typescript-eslint/parser": "npm:^4.15.1" + "@typescript-eslint/eslint-plugin": "npm:^6.13.2" + "@typescript-eslint/parser": "npm:^6.13.2" babel-preset-minify: "npm:^0.5.1" classnames: "npm:^2.3.2" concurrently: "npm:^5.3.0" @@ -3062,11 +3082,11 @@ __metadata: css-loader: "npm:^6.8.1" dayjs: "npm:^1.8.36" dotenv: "npm:^16.0.3" - eslint: "npm:^7.20.0" - eslint-config-prettier: "npm:^8.2.0" - eslint-config-ts-react-important-stuff: "npm:^3.0.0" - eslint-plugin-prettier: "npm:^3.3.1" - husky: "npm:^8.0.1" + eslint: "npm:^8.55.0" + eslint-config-prettier: "npm:^9.1.0" + eslint-plugin-prettier: "npm:^5.0.1" + eslint-plugin-react-hooks: "npm:^4.6.0" + husky: "npm:^8.0.3" i18next: "npm:^21.10.0" i18next-parser: "npm:^6.6.0" identity-obj-proxy: "npm:^3.0.0" @@ -3074,8 +3094,7 @@ __metadata: jest-cli: "npm:^29.7.0" jest-environment-jsdom: "npm:^29.7.0" openmrs: "npm:next" - prettier: "npm:^2.4.1" - pretty-quick: "npm:^2.0.2" + prettier: "npm:^3.1.1" react: "npm:^18.1.0" react-dom: "npm:^18.1.0" react-i18next: "npm:^11.18.6" @@ -3098,10 +3117,11 @@ __metadata: resolution: "@openmrs/esm-patient-registration-app@workspace:packages/esm-patient-registration-app" dependencies: "@carbon/react": "npm:^1.12.0" + core-js-pure: "npm:^3.34.0" formik: "npm:^2.1.5" geopattern: "npm:^1.2.3" lodash-es: "npm:^4.17.15" - react-avatar: "npm:^4.0.0" + react-avatar: "npm:^5.0.3" uuid: "npm:^8.3.2" webpack: "npm:^5.74.0" yup: "npm:^0.29.1" @@ -3242,6 +3262,20 @@ __metadata: languageName: node linkType: hard +"@pkgr/utils@npm:^2.4.2": + version: 2.4.2 + resolution: "@pkgr/utils@npm:2.4.2" + dependencies: + cross-spawn: "npm:^7.0.3" + fast-glob: "npm:^3.3.0" + is-glob: "npm:^4.0.3" + open: "npm:^9.1.0" + picocolors: "npm:^1.0.0" + tslib: "npm:^2.6.0" + checksum: f0b0b305a83bd65fac5637d28ad3e33f19194043e03ceef6b4e13d260bfa2678b73df76dc56ed906469ffe0494d4bd214e6b92ca80684f38547982edf982dd15 + languageName: node + linkType: hard + "@playwright/test@npm:1.40.1": version: 1.40.1 resolution: "@playwright/test@npm:1.40.1" @@ -4906,13 +4940,20 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" checksum: e50864a93f4dcb9de64c0c605d836f5416341c824d7a8cde1aa15a5fc68bed44b33cdcb2e04e5098339e9121848378f2d0cc5b124dec41c89203c6f67d6f344a languageName: node linkType: hard +"@types/json-schema@npm:^7.0.12": + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 1a3c3e06236e4c4aab89499c428d585527ce50c24fe8259e8b3926d3df4cfbbbcf306cfc73ddfb66cbafc973116efd15967020b0f738f63e09e64c7d260519e7 + languageName: node + linkType: hard + "@types/lodash-es@npm:^4.17.3": version: 4.17.6 resolution: "@types/lodash-es@npm:4.17.6" @@ -5056,6 +5097,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:^7.5.0": + version: 7.5.6 + resolution: "@types/semver@npm:7.5.6" + checksum: e77282b17f74354e17e771c0035cccb54b94cc53d0433fa7e9ba9d23fd5d7edcd14b6c8b7327d58bbd89e83b1c5eda71dfe408e06b929007e2b89586e9b63459 + languageName: node + linkType: hard + "@types/serve-index@npm:^1.9.1": version: 1.9.1 resolution: "@types/serve-index@npm:1.9.1" @@ -5167,103 +5215,132 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.15.1": - version: 4.33.0 - resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0" +"@typescript-eslint/eslint-plugin@npm:^6.13.2": + version: 6.15.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.15.0" dependencies: - "@typescript-eslint/experimental-utils": "npm:4.33.0" - "@typescript-eslint/scope-manager": "npm:4.33.0" - debug: "npm:^4.3.1" - functional-red-black-tree: "npm:^1.0.1" - ignore: "npm:^5.1.8" - regexpp: "npm:^3.1.0" - semver: "npm:^7.3.5" - tsutils: "npm:^3.21.0" + "@eslint-community/regexpp": "npm:^4.5.1" + "@typescript-eslint/scope-manager": "npm:6.15.0" + "@typescript-eslint/type-utils": "npm:6.15.0" + "@typescript-eslint/utils": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" + debug: "npm:^4.3.4" + graphemer: "npm:^1.4.0" + ignore: "npm:^5.2.4" + natural-compare: "npm:^1.4.0" + semver: "npm:^7.5.4" + ts-api-utils: "npm:^1.0.1" peerDependencies: - "@typescript-eslint/parser": ^4.0.0 - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 9b8d1a1ba5b6fc4fb79f01c965597704ff7d639cb1146663d5e924730bb761dae5b0f62fc94382aea7b6ebd184ebb3651f59bb5ccc8177213d411cf68591a151 + checksum: 9020370c5e89b52b65ed2373c755d4b70f57ec7ebcf02d3e2f323f31ec81717af110d8e5f903b189b71e0a952f042e0fe2b637e77959c3102907efed4ba55512 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/experimental-utils@npm:4.33.0" +"@typescript-eslint/parser@npm:^6.13.2": + version: 6.15.0 + resolution: "@typescript-eslint/parser@npm:6.15.0" dependencies: - "@types/json-schema": "npm:^7.0.7" - "@typescript-eslint/scope-manager": "npm:4.33.0" - "@typescript-eslint/types": "npm:4.33.0" - "@typescript-eslint/typescript-estree": "npm:4.33.0" - eslint-scope: "npm:^5.1.1" - eslint-utils: "npm:^3.0.0" + "@typescript-eslint/scope-manager": "npm:6.15.0" + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/typescript-estree": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" + debug: "npm:^4.3.4" peerDependencies: - eslint: "*" - checksum: 718d9445d6e6ca4ad70dd2eb7ade7a13f78b042203d118d5dfa59ddc2476f68a8f59b95802b046319bc9a219c9dfd57f2bbb8243480e8ff0329211eff45e155e + eslint: ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: fdd1f584e5068216c36a01e40750950ef309b36a522f6ecde36931690558a319960a702b4b4a806f335fb28ca99f8a07bb206571141550aaab1f6f40066f6605 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.15.1": - version: 4.33.0 - resolution: "@typescript-eslint/parser@npm:4.33.0" +"@typescript-eslint/scope-manager@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/scope-manager@npm:6.15.0" dependencies: - "@typescript-eslint/scope-manager": "npm:4.33.0" - "@typescript-eslint/types": "npm:4.33.0" - "@typescript-eslint/typescript-estree": "npm:4.33.0" - debug: "npm:^4.3.1" - peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 92c30f0d2e2305ca0840e87262b72187fb664be14675352dee021534ef999bb932dfc2388ac77eb359f7cb0384f00498836d35722238dd80d4d857ed02c43bbe + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" + checksum: 168d783c06a99784362e2eaaa56396b31716ee785779707ef984c2abb3e822c56440473efc6580cb8b84b2da508731ad184a00b3618bc7f3f93d8243804f2fcf languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/scope-manager@npm:4.33.0" +"@typescript-eslint/type-utils@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/type-utils@npm:6.15.0" dependencies: - "@typescript-eslint/types": "npm:4.33.0" - "@typescript-eslint/visitor-keys": "npm:4.33.0" - checksum: f7348fe593fe977704bc9d2edd23b2d17a7a6073b0e14756e816578f6cfb56600f71f236eccac2743a1c209e77c467bfb3b5ce93d2067ff257da32a500458c86 + "@typescript-eslint/typescript-estree": "npm:6.15.0" + "@typescript-eslint/utils": "npm:6.15.0" + debug: "npm:^4.3.4" + ts-api-utils: "npm:^1.0.1" + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 8dabb355f09f57de8b46d726ad95a57593e5b87427dee5182afecb490624424afec02b69a27018b352dcb5f930eb391cb8cdc12cd60a93231d4f04e63e2f2c0b languageName: node linkType: hard -"@typescript-eslint/types@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/types@npm:4.33.0" - checksum: c7ec55e6aef47ac49f712da52968c825552a23c59717f338f08c480e5336d592a689a324d21e2d370f48713a1302d7c78c14e6250bcea9b91f0b62ab6b2db3e1 +"@typescript-eslint/types@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/types@npm:6.15.0" + checksum: d55de64d532c9016c922cc36b86ab661d7d64d942057486a0bca7a7db07fade95c3de59bfe364bc76ab538fb979ca2e4e6744c3acf8919a2d61e73cc7f544363 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/typescript-estree@npm:4.33.0" +"@typescript-eslint/typescript-estree@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.15.0" dependencies: - "@typescript-eslint/types": "npm:4.33.0" - "@typescript-eslint/visitor-keys": "npm:4.33.0" - debug: "npm:^4.3.1" - globby: "npm:^11.0.3" - is-glob: "npm:^4.0.1" - semver: "npm:^7.3.5" - tsutils: "npm:^3.21.0" + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" + debug: "npm:^4.3.4" + globby: "npm:^11.1.0" + is-glob: "npm:^4.0.3" + semver: "npm:^7.5.4" + ts-api-utils: "npm:^1.0.1" peerDependenciesMeta: typescript: optional: true - checksum: e9409ec992d9d3c44efd53106bf63a6d5f6041e9dc359d54ea4b5f6787404cf44057cbd3090e9cc45ed4157dc631e398079f954490e50a4608cea1fbf9e69226 + checksum: 920f7f3bfe463a9da943e1a686b7f13ac802a5e33be52f39ac711aa53a1e274dbe173b41bba05581c560fabfc3e1fadcfd81ab53a036afe25fb1a76651fcad7a + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/utils@npm:6.15.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@types/json-schema": "npm:^7.0.12" + "@types/semver": "npm:^7.5.0" + "@typescript-eslint/scope-manager": "npm:6.15.0" + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/typescript-estree": "npm:6.15.0" + semver: "npm:^7.5.4" + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + checksum: 7895240933ad28295508f8c4286a8b905550a35eda83a11ecf9511e53078e0af07e75a1872f1bc757f165b41fdc84616ea97c1e2e3bf80cff985935f25596228 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/visitor-keys@npm:4.33.0" +"@typescript-eslint/visitor-keys@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.15.0" dependencies: - "@typescript-eslint/types": "npm:4.33.0" - eslint-visitor-keys: "npm:^2.0.0" - checksum: b28cd3f2c5cd919587d576e0cec8a95ea6c12a2e22dfec59ce70714efad4a7af4d467f9f964dd4ba1a4ad82d4a8c680a6d397e621b9be9d1df89b3a95380813f + "@typescript-eslint/types": "npm:6.15.0" + eslint-visitor-keys: "npm:^3.4.1" + checksum: 4641a829485f67a5d9d3558aa0d152e5ab57b468cfd9653168ce9a141e1f051730669a024505183b64f7a7e5d8f62533af4ebd4ad7366b551390461e9c45ec18 + languageName: node + linkType: hard + +"@ungap/structured-clone@npm:^1.2.0": + version: 1.2.0 + resolution: "@ungap/structured-clone@npm:1.2.0" + checksum: c6fe89a505e513a7592e1438280db1c075764793a2397877ff1351721fe8792a966a5359769e30242b3cd023f2efb9e63ca2ca88019d73b564488cc20e3eab12 languageName: node linkType: hard @@ -5508,7 +5585,7 @@ __metadata: languageName: node linkType: hard -"acorn-jsx@npm:^5.3.1": +"acorn-jsx@npm:^5.3.2": version: 5.3.2 resolution: "acorn-jsx@npm:5.3.2" peerDependencies: @@ -5531,15 +5608,6 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^7.4.0": - version: 7.4.1 - resolution: "acorn@npm:7.4.1" - bin: - acorn: bin/acorn - checksum: 8be2a40714756d713dfb62544128adce3b7102c6eb94bc312af196c2cc4af76e5b93079bd66b05e9ca31b35a9b0ce12171d16bc55f366cafdb794fdab9d753ec - languageName: node - linkType: hard - "acorn@npm:^8.0.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1": version: 8.8.1 resolution: "acorn@npm:8.8.1" @@ -5549,7 +5617,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.1.0, acorn@npm:^8.8.1": +"acorn@npm:^8.1.0, acorn@npm:^8.8.1, acorn@npm:^8.9.0": version: 8.11.2 resolution: "acorn@npm:8.11.2" bin: @@ -5638,7 +5706,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.10.0, ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5": +"ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -5650,7 +5718,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.6.0, ajv@npm:^8.8.0": +"ajv@npm:^8.0.0, ajv@npm:^8.6.0, ajv@npm:^8.8.0": version: 8.11.0 resolution: "ajv@npm:8.11.0" dependencies: @@ -5662,13 +5730,6 @@ __metadata: languageName: node linkType: hard -"ansi-colors@npm:^4.1.1": - version: 4.1.3 - resolution: "ansi-colors@npm:4.1.3" - checksum: 43d6e2fc7b1c6e4dc373de708ee76311ec2e0433e7e8bd3194e7ff123ea6a747428fc61afdcf5969da5be3a5f0fd054602bec56fc0ebe249ce2fcde6e649e3c2 - languageName: node - linkType: hard - "ansi-escapes@npm:^4.2.1": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" @@ -5794,23 +5855,6 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:^4.2.2": - version: 4.2.2 - resolution: "aria-query@npm:4.2.2" - dependencies: - "@babel/runtime": "npm:^7.10.2" - "@babel/runtime-corejs3": "npm:^7.10.2" - checksum: c9f0b85c1f948fe76c60bd1e08fc61a73c9d12cae046723d31b1dd0e029a1b23f8d3badea651453475fa3ff974c801fb96065ff58a1344d9bd7eef992096116e - languageName: node - linkType: hard - -"array-differ@npm:^3.0.0": - version: 3.0.0 - resolution: "array-differ@npm:3.0.0" - checksum: 117edd9df5c1530bd116c6e8eea891d4bd02850fd89b1b36e532b6540e47ca620a373b81feca1c62d1395d9ae601516ba538abe5e8172d41091da2c546b05fb7 - languageName: node - linkType: hard - "array-flatten@npm:1.1.1": version: 1.1.1 resolution: "array-flatten@npm:1.1.1" @@ -5825,19 +5869,6 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.5": - version: 3.1.5 - resolution: "array-includes@npm:3.1.5" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.1.4" - es-abstract: "npm:^1.19.5" - get-intrinsic: "npm:^1.1.1" - is-string: "npm:^1.0.7" - checksum: 006a776c24f4f6cfa7ef108d1703213aa52cee82161acb845c8f80862656019788c115c9f3a4469028fc220dd067a6884fe01107043611d8b3de69be8c1d9e9e - languageName: node - linkType: hard - "array-union@npm:^1.0.1": version: 1.0.2 resolution: "array-union@npm:1.0.2" @@ -5861,27 +5892,6 @@ __metadata: languageName: node linkType: hard -"arrify@npm:^2.0.1": - version: 2.0.1 - resolution: "arrify@npm:2.0.1" - checksum: 067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209 - languageName: node - linkType: hard - -"ast-types-flow@npm:^0.0.7": - version: 0.0.7 - resolution: "ast-types-flow@npm:0.0.7" - checksum: 663b90e99b56ee2d7f736a6b6fff8b3c5404f28fa1860bb8d83ee5a9bff9e687520d0d6d9db6edff5a34fd4d3c0c11a3beb1cf75e43c9a880cca04371cc99808 - languageName: node - linkType: hard - -"astral-regex@npm:^2.0.0": - version: 2.0.0 - resolution: "astral-regex@npm:2.0.0" - checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766 - languageName: node - linkType: hard - "async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" @@ -5928,13 +5938,6 @@ __metadata: languageName: node linkType: hard -"axe-core@npm:^4.4.3": - version: 4.5.1 - resolution: "axe-core@npm:4.5.1" - checksum: a597e4806acb28e8a152e74b2bad9c53fe185cde78abf76f6eff42cbabf780f7c96e7db283f0822c9e4d3f89cb259520a3faeb04479fff87bbc467af703fda6d - languageName: node - linkType: hard - "axios@npm:^0.21.1": version: 0.21.4 resolution: "axios@npm:0.21.4" @@ -5944,13 +5947,6 @@ __metadata: languageName: node linkType: hard -"axobject-query@npm:^2.2.0": - version: 2.2.0 - resolution: "axobject-query@npm:2.2.0" - checksum: 25de4b5ba6b28f5856fab60d86ea20fea941586bc38f33c81b78d66cd7e9c5792a9b9a9e60a38407aa634e01fee6a34133fbbd1d1d3d24cc686de83c6bb1e634 - languageName: node - linkType: hard - "babel-helper-evaluate-path@npm:^0.5.0": version: 0.5.0 resolution: "babel-helper-evaluate-path@npm:0.5.0" @@ -6343,6 +6339,13 @@ __metadata: languageName: node linkType: hard +"big-integer@npm:^1.6.44": + version: 1.6.52 + resolution: "big-integer@npm:1.6.52" + checksum: 4bc6ae152a96edc9f95020f5fc66b13d26a9ad9a021225a9f0213f7e3dc44269f423aa8c42e19d6ac4a63bb2b22140b95d10be8f9ca7a6d9aa1b22b330d1f514 + languageName: node + linkType: hard + "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -6403,6 +6406,15 @@ __metadata: languageName: node linkType: hard +"bplist-parser@npm:^0.2.0": + version: 0.2.0 + resolution: "bplist-parser@npm:0.2.0" + dependencies: + big-integer: "npm:^1.6.44" + checksum: 15d31c1b0c7e0fb384e96349453879a33609d92d91b55a9ccee04b4be4b0645f1c823253d73326a1a23104521fbc45c2dd97fb05adf61863841b68cbb2ca7a3d + languageName: node + linkType: hard + "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -6555,6 +6567,15 @@ __metadata: languageName: node linkType: hard +"bundle-name@npm:^3.0.0": + version: 3.0.0 + resolution: "bundle-name@npm:3.0.0" + dependencies: + run-applescript: "npm:^5.0.0" + checksum: edf2b1fbe6096ed32e7566947ace2ea937ee427391744d7510a2880c4b9a5b3543d3f6c551236a29e5c87d3195f8e2912516290e638c15bcbede7b37cc375615 + languageName: node + linkType: hard + "bytes@npm:3.0.0": version: 3.0.0 resolution: "bytes@npm:3.0.0" @@ -7288,10 +7309,10 @@ __metadata: languageName: node linkType: hard -"core-js-pure@npm:^3.25.1": - version: 3.26.0 - resolution: "core-js-pure@npm:3.26.0" - checksum: c83b659ae95991d5b7e183e8f45e47f5d78769382fb2e40fd0b5921bd35a7496755a40b57a77a071301d505b2814f3f02f185fca9a654df52209b13b4bff7b7f +"core-js-pure@npm:^3.34.0": + version: 3.34.0 + resolution: "core-js-pure@npm:3.34.0" + checksum: d0f9487663e329651abdae508119c46dd4eed91cc746dd1e1b2c389440281133e17dd4ee3c45541761216b6cd75879ee1050a6276dde34df0381980956d28f94 languageName: node linkType: hard @@ -7366,7 +7387,7 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": +"cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" dependencies: @@ -8011,13 +8032,6 @@ __metadata: languageName: node linkType: hard -"damerau-levenshtein@npm:^1.0.8": - version: 1.0.8 - resolution: "damerau-levenshtein@npm:1.0.8" - checksum: f4eba1c90170f96be25d95fa3857141b5f81e254f7e4d530da929217b19990ea9a0390fc53d3c1cafac9152fda78e722ea4894f765cf6216be413b5af1fbf821 - languageName: node - linkType: hard - "data-urls@npm:^3.0.2": version: 3.0.2 resolution: "data-urls@npm:3.0.2" @@ -8068,7 +8082,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.3": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -8150,6 +8164,28 @@ __metadata: languageName: node linkType: hard +"default-browser-id@npm:^3.0.0": + version: 3.0.0 + resolution: "default-browser-id@npm:3.0.0" + dependencies: + bplist-parser: "npm:^0.2.0" + untildify: "npm:^4.0.0" + checksum: 279c7ad492542e5556336b6c254a4eaf31b2c63a5433265655ae6e47301197b6cfb15c595a6fdc6463b2ff8e1a1a1ed3cba56038a60e1527ba4ab1628c6b9941 + languageName: node + linkType: hard + +"default-browser@npm:^4.0.0": + version: 4.0.0 + resolution: "default-browser@npm:4.0.0" + dependencies: + bundle-name: "npm:^3.0.0" + default-browser-id: "npm:^3.0.0" + execa: "npm:^7.1.1" + titleize: "npm:^3.0.0" + checksum: 40c5af984799042b140300be5639c9742599bda76dc9eba5ac9ad5943c83dd36cebc4471eafcfddf8e0ec817166d5ba89d56f08e66a126c7c7908a179cead1a7 + languageName: node + linkType: hard + "default-gateway@npm:^6.0.3": version: 6.0.3 resolution: "default-gateway@npm:6.0.3" @@ -8166,6 +8202,13 @@ __metadata: languageName: node linkType: hard +"define-lazy-prop@npm:^3.0.0": + version: 3.0.0 + resolution: "define-lazy-prop@npm:3.0.0" + checksum: f28421cf9ee86eecaf5f3b8fe875f13d7009c2625e97645bfff7a2a49aca678270b86c39f9c32939e5ca7ab96b551377ed4139558c795e076774287ad3af1aa4 + languageName: node + linkType: hard + "define-properties@npm:^1.1.3, define-properties@npm:^1.1.4": version: 1.1.4 resolution: "define-properties@npm:1.1.4" @@ -8526,13 +8569,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^9.2.2": - version: 9.2.2 - resolution: "emoji-regex@npm:9.2.2" - checksum: 915acf859cea7131dac1b2b5c9c8e35c4849e325a1d114c30adb8cd615970f6dca0e27f64f3a4949d7d6ed86ecd79a1c5c63f02e697513cddd7b5835c90948b8 - languageName: node - linkType: hard - "emojis-list@npm:^3.0.0": version: 3.0.0 resolution: "emojis-list@npm:3.0.0" @@ -8575,15 +8611,6 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.5": - version: 2.3.6 - resolution: "enquirer@npm:2.3.6" - dependencies: - ansi-colors: "npm:^4.1.1" - checksum: 751d14f037eb7683997e696fb8d5fe2675e0b0cde91182c128cf598acf3f5bd9005f35f7c2a9109e291140af496ebec237b6dac86067d59a9b44f3688107f426 - languageName: node - linkType: hard - "ensure-posix-path@npm:^1.1.0": version: 1.1.1 resolution: "ensure-posix-path@npm:1.1.1" @@ -8764,83 +8791,38 @@ __metadata: languageName: node linkType: hard -"eslint-config-important-stuff@npm:^1.1.0": - version: 1.1.0 - resolution: "eslint-config-important-stuff@npm:1.1.0" - checksum: 17986ec3fda91d9b2e08603817d2ff5aaba23651fb6c722e69df02290e31075f62349e16f4f03f1772f08c678904de51e82b735945f3a895f5d29aae7ef8b397 - languageName: node - linkType: hard - -"eslint-config-prettier@npm:^8.2.0": - version: 8.5.0 - resolution: "eslint-config-prettier@npm:8.5.0" +"eslint-config-prettier@npm:^9.1.0": + version: 9.1.0 + resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: cafd93fb39997969e9e79b3e0b3466d0b8570273d15423986597b8422b7363d4a80f009aec1d1443fa2329972dafde79031b1649590cc35069b0a68d31098e7b - languageName: node - linkType: hard - -"eslint-config-react-important-stuff@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-config-react-important-stuff@npm:3.0.0" - dependencies: - eslint-config-important-stuff: "npm:^1.1.0" - eslint-plugin-jsx-a11y: "npm:^6.3.1" - eslint-plugin-react-hooks: "npm:^4.0.8" - checksum: 542547f0be617d27d828cf8d55ac3c640fa928a18b223b5865d943c575999ec8905a2bc581d184fa59f7b633f8b7d14b362ba6d9d5686d4406f03a68c4d534b7 - languageName: node - linkType: hard - -"eslint-config-ts-react-important-stuff@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-config-ts-react-important-stuff@npm:3.0.0" - dependencies: - eslint-config-react-important-stuff: "npm:^3.0.0" - checksum: 47e60bd7352aa3c2d5d16af63204ec7b71681a8a61cefcb13165f0624f063030f5c5d98d6bc4704e9f7df1e104c868997727c3716eed3baeb2082d6801645efc + checksum: 411e3b3b1c7aa04e3e0f20d561271b3b909014956c4dba51c878bf1a23dbb8c800a3be235c46c4732c70827276e540b6eed4636d9b09b444fd0a8e07f0fcd830 languageName: node linkType: hard -"eslint-plugin-jsx-a11y@npm:^6.3.1": - version: 6.6.1 - resolution: "eslint-plugin-jsx-a11y@npm:6.6.1" - dependencies: - "@babel/runtime": "npm:^7.18.9" - aria-query: "npm:^4.2.2" - array-includes: "npm:^3.1.5" - ast-types-flow: "npm:^0.0.7" - axe-core: "npm:^4.4.3" - axobject-query: "npm:^2.2.0" - damerau-levenshtein: "npm:^1.0.8" - emoji-regex: "npm:^9.2.2" - has: "npm:^1.0.3" - jsx-ast-utils: "npm:^3.3.2" - language-tags: "npm:^1.0.5" - minimatch: "npm:^3.1.2" - semver: "npm:^6.3.0" - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: e904ef8a914e86c6624e6126116467a5fba975bc52ffeaa381ee914d888fc3f272e6b3daa6eb398d1562673d3ce76a58676e2a105be7af4b5112bb97dcc06099 - languageName: node - linkType: hard - -"eslint-plugin-prettier@npm:^3.3.1": - version: 3.4.1 - resolution: "eslint-plugin-prettier@npm:3.4.1" +"eslint-plugin-prettier@npm:^5.0.1": + version: 5.1.1 + resolution: "eslint-plugin-prettier@npm:5.1.1" dependencies: prettier-linter-helpers: "npm:^1.0.0" + synckit: "npm:^0.8.5" peerDependencies: - eslint: ">=5.0.0" - prettier: ">=1.13.0" + "@types/eslint": ">=8.0.0" + eslint: ">=8.0.0" + eslint-config-prettier: "*" + prettier: ">=3.0.0" peerDependenciesMeta: + "@types/eslint": + optional: true eslint-config-prettier: optional: true - checksum: d7ab93df9a93f0afb9fa9c9c3cf30479075e1b56303c82ed6efbfff30c2d3d3741537b490c2b517d501bfa97a3d8d0269a1ab4b6fa741a6e966e5811efbfe8b8 + checksum: 58ed63a1d937519fef5d0656df74a98163f3bdad978e20040a1fdfaa773a61fe8ca362ca19a316856446b226a64a227dd03f2ffe8fe7397f067d4442355b35fa languageName: node linkType: hard -"eslint-plugin-react-hooks@npm:^4.0.8": +"eslint-plugin-react-hooks@npm:^4.6.0": version: 4.6.0 resolution: "eslint-plugin-react-hooks@npm:4.6.0" peerDependencies: @@ -8849,7 +8831,7 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1": +"eslint-scope@npm:5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" dependencies: @@ -8859,98 +8841,79 @@ __metadata: languageName: node linkType: hard -"eslint-utils@npm:^2.1.0": - version: 2.1.0 - resolution: "eslint-utils@npm:2.1.0" - dependencies: - eslint-visitor-keys: "npm:^1.1.0" - checksum: a7e43a5154a16a90c021cabeb160c3668cccbcf6474ccb2a7d7762698582398f3b938c5330909b858ef7c21182edfc9786dbf89ed7b294f51b7659a378bf7cec - languageName: node - linkType: hard - -"eslint-utils@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-utils@npm:3.0.0" +"eslint-scope@npm:^7.2.2": + version: 7.2.2 + resolution: "eslint-scope@npm:7.2.2" dependencies: - eslint-visitor-keys: "npm:^2.0.0" - peerDependencies: - eslint: ">=5" - checksum: 7675260a6b220c70f13e4cdbf077e93cad0dfb388429a27d6c0b584b2b20dca24594508e8bdb00a460a5764bd364a5018e20c2b8b1d70f82bcc3fdc30692a4d2 - languageName: node - linkType: hard - -"eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.0": - version: 1.3.0 - resolution: "eslint-visitor-keys@npm:1.3.0" - checksum: 595ab230e0fcb52f86ba0986a9a473b9fcae120f3729b43f1157f88f27f8addb1e545c4e3d444185f2980e281ca15be5ada6f65b4599eec227cf30e41233b762 + esrecurse: "npm:^4.3.0" + estraverse: "npm:^5.2.0" + checksum: 5c660fb905d5883ad018a6fea2b49f3cb5b1cbf2cd4bd08e98646e9864f9bc2c74c0839bed2d292e90a4a328833accc197c8f0baed89cbe8d605d6f918465491 languageName: node linkType: hard -"eslint-visitor-keys@npm:^2.0.0": - version: 2.1.0 - resolution: "eslint-visitor-keys@npm:2.1.0" - checksum: db4547eef5039122d518fa307e938ceb8589da5f6e8f5222efaf14dd62f748ce82e2d2becd3ff9412a50350b726bda95dbea8515a471074547daefa58aee8735 +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 3f357c554a9ea794b094a09bd4187e5eacd1bc0d0653c3adeb87962c548e6a1ab8f982b86963ae1337f5d976004146536dcee5d0e2806665b193fbfbf1a9231b languageName: node linkType: hard -"eslint@npm:^7.20.0": - version: 7.32.0 - resolution: "eslint@npm:7.32.0" +"eslint@npm:^8.55.0": + version: 8.56.0 + resolution: "eslint@npm:8.56.0" dependencies: - "@babel/code-frame": "npm:7.12.11" - "@eslint/eslintrc": "npm:^0.4.3" - "@humanwhocodes/config-array": "npm:^0.5.0" - ajv: "npm:^6.10.0" + "@eslint-community/eslint-utils": "npm:^4.2.0" + "@eslint-community/regexpp": "npm:^4.6.1" + "@eslint/eslintrc": "npm:^2.1.4" + "@eslint/js": "npm:8.56.0" + "@humanwhocodes/config-array": "npm:^0.11.13" + "@humanwhocodes/module-importer": "npm:^1.0.1" + "@nodelib/fs.walk": "npm:^1.2.8" + "@ungap/structured-clone": "npm:^1.2.0" + ajv: "npm:^6.12.4" chalk: "npm:^4.0.0" cross-spawn: "npm:^7.0.2" - debug: "npm:^4.0.1" + debug: "npm:^4.3.2" doctrine: "npm:^3.0.0" - enquirer: "npm:^2.3.5" escape-string-regexp: "npm:^4.0.0" - eslint-scope: "npm:^5.1.1" - eslint-utils: "npm:^2.1.0" - eslint-visitor-keys: "npm:^2.0.0" - espree: "npm:^7.3.1" - esquery: "npm:^1.4.0" + eslint-scope: "npm:^7.2.2" + eslint-visitor-keys: "npm:^3.4.3" + espree: "npm:^9.6.1" + esquery: "npm:^1.4.2" esutils: "npm:^2.0.2" fast-deep-equal: "npm:^3.1.3" file-entry-cache: "npm:^6.0.1" - functional-red-black-tree: "npm:^1.0.1" - glob-parent: "npm:^5.1.2" - globals: "npm:^13.6.0" - ignore: "npm:^4.0.6" - import-fresh: "npm:^3.0.0" + find-up: "npm:^5.0.0" + glob-parent: "npm:^6.0.2" + globals: "npm:^13.19.0" + graphemer: "npm:^1.4.0" + ignore: "npm:^5.2.0" imurmurhash: "npm:^0.1.4" is-glob: "npm:^4.0.0" - js-yaml: "npm:^3.13.1" + is-path-inside: "npm:^3.0.3" + js-yaml: "npm:^4.1.0" json-stable-stringify-without-jsonify: "npm:^1.0.1" levn: "npm:^0.4.1" lodash.merge: "npm:^4.6.2" - minimatch: "npm:^3.0.4" + minimatch: "npm:^3.1.2" natural-compare: "npm:^1.4.0" - optionator: "npm:^0.9.1" - progress: "npm:^2.0.0" - regexpp: "npm:^3.1.0" - semver: "npm:^7.2.1" - strip-ansi: "npm:^6.0.0" - strip-json-comments: "npm:^3.1.0" - table: "npm:^6.0.9" + optionator: "npm:^0.9.3" + strip-ansi: "npm:^6.0.1" text-table: "npm:^0.2.0" - v8-compile-cache: "npm:^2.0.3" bin: eslint: bin/eslint.js - checksum: 2015a72bc4c49a933fc7bd707bdb61b0386542c9e23d28be79434b5fd914f14355a4565a29fdcd1c69a8a3682cf20b4f2aed6b60e294b0b0d98ace69138c3a02 + checksum: ef6193c6e4cef20774b985a5cc2fd4bf6d3c4decd423117cbc4a0196617861745db291217ad3c537bc3a160650cca965bc818f55e1f3e446af1fcb293f9940a5 languageName: node linkType: hard -"espree@npm:^7.3.0, espree@npm:^7.3.1": - version: 7.3.1 - resolution: "espree@npm:7.3.1" +"espree@npm:^9.6.0, espree@npm:^9.6.1": + version: 9.6.1 + resolution: "espree@npm:9.6.1" dependencies: - acorn: "npm:^7.4.0" - acorn-jsx: "npm:^5.3.1" - eslint-visitor-keys: "npm:^1.3.0" - checksum: 7cf230d4d726f6e2c53925566ef96e78a5656eb05adbb6cd493f863341e532b491b035db7a4ce292b70243bb727722acff98b66ae751888ee51791d8389c6819 + acorn: "npm:^8.9.0" + acorn-jsx: "npm:^5.3.2" + eslint-visitor-keys: "npm:^3.4.1" + checksum: 255ab260f0d711a54096bdeda93adff0eadf02a6f9b92f02b323e83a2b7fc258797919437ad331efec3930475feb0142c5ecaaf3cdab4befebd336d47d3f3134 languageName: node linkType: hard @@ -8964,12 +8927,12 @@ __metadata: languageName: node linkType: hard -"esquery@npm:^1.4.0": - version: 1.4.0 - resolution: "esquery@npm:1.4.0" +"esquery@npm:^1.4.2": + version: 1.5.0 + resolution: "esquery@npm:1.5.0" dependencies: estraverse: "npm:^5.1.0" - checksum: 25b571ec54f186521819be48cd12643f9f5bdef6be9679161a48dec9cfd478764970a77ef563a516cf1f0f05e7e490e3ff2d514715b86cb8d03329cbb56ae4a8 + checksum: e65fcdfc1e0ff5effbf50fb4f31ea20143ae5df92bb2e4953653d8d40aa4bc148e0d06117a592ce4ea53eeab1dafdfded7ea7e22a5be87e82d73757329a1b01d languageName: node linkType: hard @@ -9031,23 +8994,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:^2.1.0": - version: 2.1.0 - resolution: "execa@npm:2.1.0" - dependencies: - cross-spawn: "npm:^7.0.0" - get-stream: "npm:^5.0.0" - is-stream: "npm:^2.0.0" - merge-stream: "npm:^2.0.0" - npm-run-path: "npm:^3.0.0" - onetime: "npm:^5.1.0" - p-finally: "npm:^2.0.0" - signal-exit: "npm:^3.0.2" - strip-final-newline: "npm:^2.0.0" - checksum: e1280d17f95f18860bb3e6e2c4a096c847d4fbe06d7a49f4c6d2e3832cb66e84cdf5c302d8c63ffd110f870b8cad4927bd3ea596a69b130a5919de21afcd087a - languageName: node - linkType: hard - "execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" @@ -9065,6 +9011,23 @@ __metadata: languageName: node linkType: hard +"execa@npm:^7.1.1": + version: 7.2.0 + resolution: "execa@npm:7.2.0" + dependencies: + cross-spawn: "npm:^7.0.3" + get-stream: "npm:^6.0.1" + human-signals: "npm:^4.3.0" + is-stream: "npm:^3.0.0" + merge-stream: "npm:^2.0.0" + npm-run-path: "npm:^5.1.0" + onetime: "npm:^6.0.0" + signal-exit: "npm:^3.0.7" + strip-final-newline: "npm:^3.0.0" + checksum: 473feff60f9d4dbe799225948de48b5158c1723021d19c4b982afe37bcd111ae84e1b4c9dfe967fae5101b0894b1a62e4dd564a286dfa3e46d7b0cfdbf7fe62b + languageName: node + linkType: hard + "exif-parser@npm:^0.1.12": version: 0.1.12 resolution: "exif-parser@npm:0.1.12" @@ -9203,6 +9166,19 @@ __metadata: languageName: node linkType: hard +"fast-glob@npm:^3.3.0": + version: 3.3.2 + resolution: "fast-glob@npm:3.3.2" + dependencies: + "@nodelib/fs.stat": "npm:^2.0.2" + "@nodelib/fs.walk": "npm:^1.2.3" + glob-parent: "npm:^5.1.2" + merge2: "npm:^1.3.0" + micromatch: "npm:^4.0.4" + checksum: 222512e9315a0efca1276af9adb2127f02105d7288fa746145bf45e2716383fb79eb983c89601a72a399a56b7c18d38ce70457c5466218c5f13fad957cee16df + languageName: node + linkType: hard + "fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" @@ -9328,6 +9304,16 @@ __metadata: languageName: node linkType: hard +"find-up@npm:^5.0.0": + version: 5.0.0 + resolution: "find-up@npm:5.0.0" + dependencies: + locate-path: "npm:^6.0.0" + path-exists: "npm:^4.0.0" + checksum: 07955e357348f34660bde7920783204ff5a26ac2cafcaa28bace494027158a97b9f56faaf2d89a6106211a8174db650dd9f503f9c0d526b1202d5554a00b9095 + languageName: node + linkType: hard + "flat-cache@npm:^3.0.4": version: 3.0.4 resolution: "flat-cache@npm:3.0.4" @@ -9613,13 +9599,6 @@ __metadata: languageName: node linkType: hard -"functional-red-black-tree@npm:^1.0.1": - version: 1.0.1 - resolution: "functional-red-black-tree@npm:1.0.1" - checksum: debe73e92204341d1fa5f89614e44284d3add26dee660722978d8c50829170f87d1c74768f68c251d215ae461c11db7bac13101c77f4146ff051da75466f7a12 - languageName: node - linkType: hard - "functions-have-names@npm:^1.2.2": version: 1.2.3 resolution: "functions-have-names@npm:1.2.3" @@ -9698,16 +9677,7 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:^5.0.0": - version: 5.2.0 - resolution: "get-stream@npm:5.2.0" - dependencies: - pump: "npm:^3.0.0" - checksum: 13a73148dca795e41421013da6e3ebff8ccb7fba4d2f023fd0c6da2c166ec4e789bec9774a73a7b49c08daf2cae552f8a3e914042ac23b5f59dd278cc8f9cbfb - languageName: node - linkType: hard - -"get-stream@npm:^6.0.0": +"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": version: 6.0.1 resolution: "get-stream@npm:6.0.1" checksum: 781266d29725f35c59f1d214aedc92b0ae855800a980800e2923b3fbc4e56b3cb6e462c42e09a1cf1a00c64e056a78fa407cbe06c7c92b7e5cd49b4b85c2a497 @@ -9753,7 +9723,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^6.0.1": +"glob-parent@npm:^6.0.1, glob-parent@npm:^6.0.2": version: 6.0.2 resolution: "glob-parent@npm:6.0.2" dependencies: @@ -9831,16 +9801,16 @@ __metadata: languageName: node linkType: hard -"globals@npm:^13.6.0, globals@npm:^13.9.0": - version: 13.17.0 - resolution: "globals@npm:13.17.0" +"globals@npm:^13.19.0": + version: 13.24.0 + resolution: "globals@npm:13.24.0" dependencies: type-fest: "npm:^0.20.2" - checksum: 1e3e0ede067a99ca16bdeb2fe241d5f8f2458d1bf64b8c17986b17e42ab0760c9a4bc190f2ae4359337d63de1d96ed07b93b29c47282f724f1a56b958c5df6f0 + checksum: 62c5b1997d06674fc7191d3e01e324d3eda4d65ac9cc4e78329fa3b5c4fd42a0e1c8722822497a6964eee075255ce21ccf1eec2d83f92ef3f06653af4d0ee28e languageName: node linkType: hard -"globby@npm:^11.0.3": +"globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -9887,6 +9857,13 @@ __metadata: languageName: node linkType: hard +"graphemer@npm:^1.4.0": + version: 1.4.0 + resolution: "graphemer@npm:1.4.0" + checksum: 6dd60dba97007b21e3a829fab3f771803cc1292977fe610e240ea72afd67e5690ac9eeaafc4a99710e78962e5936ab5a460787c2a1180f1cb0ccfac37d29f897 + languageName: node + linkType: hard + "gulp-sort@npm:^2.0.0": version: 2.0.0 resolution: "gulp-sort@npm:2.0.0" @@ -10244,6 +10221,13 @@ __metadata: languageName: node linkType: hard +"human-signals@npm:^4.3.0": + version: 4.3.1 + resolution: "human-signals@npm:4.3.1" + checksum: fa59894c358fe9f2b5549be2fb083661d5e1dff618d3ac70a49ca73495a72e873fbf6c0878561478e521e17d498292746ee391791db95ffe5747bfb5aef8765b + languageName: node + linkType: hard + "humanize-ms@npm:^1.2.1": version: 1.2.1 resolution: "humanize-ms@npm:1.2.1" @@ -10253,12 +10237,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^8.0.1": - version: 8.0.1 - resolution: "husky@npm:8.0.1" +"husky@npm:^8.0.3": + version: 8.0.3 + resolution: "husky@npm:8.0.3" bin: husky: lib/bin.js - checksum: 0f4c1162845cd8c4ecf13af85fe62a1c9de3d4277053004a59dae90a36346fe7eeb7eff3bc7a8484c4f365f6eccf7fd17aa6935198028980c9d6e95306455f3c + checksum: b754cf70fdc97c3b60fec5b80056b9c11436464953b1691bf2b5dcf0081fb6685d2c5f47abb8b2b1c49f504aabea5321fdd6496f8b755d9f6e7525a493406abb languageName: node linkType: hard @@ -10367,20 +10351,20 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^4.0.6": - version: 4.0.6 - resolution: "ignore@npm:4.0.6" - checksum: e04d6bd60d9da12cfe8896acf470824172843dddc25a9be0726199d5e031254634a69ce8479a82f194154b9b28cb3b08bb7a53e56f7f7eba2663e04791e74742 - languageName: node - linkType: hard - -"ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0": +"ignore@npm:^5.2.0": version: 5.2.0 resolution: "ignore@npm:5.2.0" checksum: 30283f05fb7d867ee0e08faebb3e69caba2c6c55092042cd061eac1b37a3e78db72bfcfbb08b3598999344fba3d93a9c693b5401da5faaecc0fb7c2dce87beb4 languageName: node linkType: hard +"ignore@npm:^5.2.4": + version: 5.3.0 + resolution: "ignore@npm:5.3.0" + checksum: 51594355cea4c6ad6b28b3b85eb81afa7b988a1871feefd7062baf136c95aa06760ee934fa9590e43d967bd377ce84a4cf6135fbeb6063e063f1182a0e9a3bcd + languageName: node + linkType: hard + "image-q@npm:^4.0.0": version: 4.0.0 resolution: "image-q@npm:4.0.0" @@ -10397,7 +10381,7 @@ __metadata: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": +"import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -10678,6 +10662,15 @@ __metadata: languageName: node linkType: hard +"is-docker@npm:^3.0.0": + version: 3.0.0 + resolution: "is-docker@npm:3.0.0" + bin: + is-docker: cli.js + checksum: b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90 + languageName: node + linkType: hard + "is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -10731,6 +10724,17 @@ __metadata: languageName: node linkType: hard +"is-inside-container@npm:^1.0.0": + version: 1.0.0 + resolution: "is-inside-container@npm:1.0.0" + dependencies: + is-docker: "npm:^3.0.0" + bin: + is-inside-container: cli.js + checksum: c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03 + languageName: node + linkType: hard + "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -10814,6 +10818,13 @@ __metadata: languageName: node linkType: hard +"is-path-inside@npm:^3.0.3": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 + languageName: node + linkType: hard + "is-plain-obj@npm:^3.0.0": version: 3.0.0 resolution: "is-plain-obj@npm:3.0.0" @@ -10900,6 +10911,13 @@ __metadata: languageName: node linkType: hard +"is-stream@npm:^3.0.0": + version: 3.0.0 + resolution: "is-stream@npm:3.0.0" + checksum: 172093fe99119ffd07611ab6d1bcccfe8bc4aa80d864b15f43e63e54b7abc71e779acd69afdb854c4e2a67fdc16ae710e370eda40088d1cfc956a50ed82d8f16 + languageName: node + linkType: hard + "is-string@npm:^1.0.5, is-string@npm:^1.0.7": version: 1.0.7 resolution: "is-string@npm:1.0.7" @@ -11674,7 +11692,7 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:4.1.0": +"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": version: 4.1.0 resolution: "js-yaml@npm:4.1.0" dependencies: @@ -11858,16 +11876,6 @@ __metadata: languageName: node linkType: hard -"jsx-ast-utils@npm:^3.3.2": - version: 3.3.3 - resolution: "jsx-ast-utils@npm:3.3.3" - dependencies: - array-includes: "npm:^3.1.5" - object.assign: "npm:^4.1.3" - checksum: c85f6f239593e09d8445a7e43412234304addf4bfb5d2114dc19f5ce27dfe3a8f8b12a50ff74e94606d0ad48cf1d5aff2381c939446b3fe48a5d433bb52ccb29 - languageName: node - linkType: hard - "kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" @@ -11889,22 +11897,6 @@ __metadata: languageName: node linkType: hard -"language-subtag-registry@npm:~0.3.2": - version: 0.3.22 - resolution: "language-subtag-registry@npm:0.3.22" - checksum: 5591f4abd775d1ab5945355a5ba894327d2d94c900607bdb69aac1bc5bb921dbeeeb5f616df95e8c0ae875501d19c1cfa0e852ece822121e95048deb34f2b4d2 - languageName: node - linkType: hard - -"language-tags@npm:^1.0.5": - version: 1.0.5 - resolution: "language-tags@npm:1.0.5" - dependencies: - language-subtag-registry: "npm:~0.3.2" - checksum: 2161292ddae73ff2f5a15fd2d753b21096b81324337dff4ad78d702c63210d5beb18892cd53a3455ee6e88065807c8e285e82c40503678951d2071d101a473b4 - languageName: node - linkType: hard - "lazystream@npm:^1.0.0": version: 1.0.1 resolution: "lazystream@npm:1.0.1" @@ -12017,6 +12009,15 @@ __metadata: languageName: node linkType: hard +"locate-path@npm:^6.0.0": + version: 6.0.0 + resolution: "locate-path@npm:6.0.0" + dependencies: + p-locate: "npm:^5.0.0" + checksum: 72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a + languageName: node + linkType: hard + "lodash-es@npm:4.17.21, lodash-es@npm:^4.17.11, lodash-es@npm:^4.17.15, lodash-es@npm:^4.17.21": version: 4.17.21 resolution: "lodash-es@npm:4.17.21" @@ -12080,13 +12081,6 @@ __metadata: languageName: node linkType: hard -"lodash.truncate@npm:^4.4.2": - version: 4.4.2 - resolution: "lodash.truncate@npm:4.4.2" - checksum: 7a495616121449e5d2288c606b1025d42ab9979e8c93ba885e5c5802ffd4f1ebad4428c793ccc12f73e73237e85a9f5b67dd6415757546fbd5a4653ba83e25ac - languageName: node - linkType: hard - "lodash.uniq@npm:^4.5.0": version: 4.5.0 resolution: "lodash.uniq@npm:4.5.0" @@ -12360,6 +12354,13 @@ __metadata: languageName: node linkType: hard +"mimic-fn@npm:^4.0.0": + version: 4.0.0 + resolution: "mimic-fn@npm:4.0.0" + checksum: 995dcece15ee29aa16e188de6633d43a3db4611bcf93620e7e62109ec41c79c0f34277165b8ce5e361205049766e371851264c21ac64ca35499acb5421c2ba56 + languageName: node + linkType: hard + "min-document@npm:^2.19.0": version: 2.19.0 resolution: "min-document@npm:2.19.0" @@ -12394,7 +12395,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -12548,13 +12549,6 @@ __metadata: languageName: node linkType: hard -"mri@npm:^1.1.4": - version: 1.2.0 - resolution: "mri@npm:1.2.0" - checksum: 6775a1d2228bb9d191ead4efc220bd6be64f943ad3afd4dcb3b3ac8fc7b87034443f666e38805df38e8d047b29f910c3cc7810da0109af83e42c82c73bd3f6bc - languageName: node - linkType: hard - "mrmime@npm:^1.0.0": version: 1.0.1 resolution: "mrmime@npm:1.0.1" @@ -12595,19 +12589,6 @@ __metadata: languageName: node linkType: hard -"multimatch@npm:^4.0.0": - version: 4.0.0 - resolution: "multimatch@npm:4.0.0" - dependencies: - "@types/minimatch": "npm:^3.0.3" - array-differ: "npm:^3.0.0" - array-union: "npm:^2.1.0" - arrify: "npm:^2.0.1" - minimatch: "npm:^3.0.4" - checksum: bdb6a98dad4e919d9a1a2a0db872f44fa2337315f2fd5827d91ae005cf22f4425782bdfa97c10b80d567f0cb3c226c31f4e85f8f6a4a4be4facf9af0de1bb0c2 - languageName: node - linkType: hard - "mute-stream@npm:0.0.8": version: 0.0.8 resolution: "mute-stream@npm:0.0.8" @@ -12874,15 +12855,6 @@ __metadata: languageName: node linkType: hard -"npm-run-path@npm:^3.0.0": - version: 3.1.0 - resolution: "npm-run-path@npm:3.1.0" - dependencies: - path-key: "npm:^3.0.0" - checksum: 141e0b8f0e3b137347a2896572c9a84701754dda0670d3ceb8c56a87702ee03c26227e4517ab93f2904acfc836547315e740b8289bb24ca0cd8ba2b198043b0f - languageName: node - linkType: hard - "npm-run-path@npm:^4.0.1": version: 4.0.1 resolution: "npm-run-path@npm:4.0.1" @@ -12892,6 +12864,15 @@ __metadata: languageName: node linkType: hard +"npm-run-path@npm:^5.1.0": + version: 5.2.0 + resolution: "npm-run-path@npm:5.2.0" + dependencies: + path-key: "npm:^4.0.0" + checksum: c5325e016014e715689c4014f7e0be16cc4cbf529f32a1723e511bc4689b5f823b704d2bca61ac152ce2bda65e0205dc8b3ba0ec0f5e4c3e162d302f6f5b9efb + languageName: node + linkType: hard + "npmlog@npm:^6.0.0": version: 6.0.2 resolution: "npmlog@npm:6.0.2" @@ -12951,7 +12932,7 @@ __metadata: languageName: node linkType: hard -"object.assign@npm:^4.0.4, object.assign@npm:^4.1.2, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4": +"object.assign@npm:^4.0.4, object.assign@npm:^4.1.2, object.assign@npm:^4.1.4": version: 4.1.4 resolution: "object.assign@npm:4.1.4" dependencies: @@ -13011,6 +12992,15 @@ __metadata: languageName: node linkType: hard +"onetime@npm:^6.0.0": + version: 6.0.0 + resolution: "onetime@npm:6.0.0" + dependencies: + mimic-fn: "npm:^4.0.0" + checksum: 0846ce78e440841335d4e9182ef69d5762e9f38aa7499b19f42ea1c4cd40f0b4446094c455c713f9adac3f4ae86f613bb5e30c99e52652764d06a89f709b3788 + languageName: node + linkType: hard + "open@npm:^8.0.9": version: 8.4.0 resolution: "open@npm:8.4.0" @@ -13022,6 +13012,18 @@ __metadata: languageName: node linkType: hard +"open@npm:^9.1.0": + version: 9.1.0 + resolution: "open@npm:9.1.0" + dependencies: + default-browser: "npm:^4.0.0" + define-lazy-prop: "npm:^3.0.0" + is-inside-container: "npm:^1.0.0" + is-wsl: "npm:^2.2.0" + checksum: b45bcc7a6795804a2f560f0ca9f5e5344114bc40754d10c28a811c0c8f7027356979192931a6a7df2ab9e5bab3058988c99ae55f4fb71db2ce9fc77c40f619aa + languageName: node + linkType: hard + "opener@npm:^1.5.2": version: 1.5.2 resolution: "opener@npm:1.5.2" @@ -13083,17 +13085,17 @@ __metadata: languageName: node linkType: hard -"optionator@npm:^0.9.1": - version: 0.9.1 - resolution: "optionator@npm:0.9.1" +"optionator@npm:^0.9.3": + version: 0.9.3 + resolution: "optionator@npm:0.9.3" dependencies: + "@aashutoshrathi/word-wrap": "npm:^1.2.3" deep-is: "npm:^0.1.3" fast-levenshtein: "npm:^2.0.6" levn: "npm:^0.4.1" prelude-ls: "npm:^1.2.1" type-check: "npm:^0.4.0" - word-wrap: "npm:^1.2.3" - checksum: 19cfb625ba3cafd99c204744595a8b5111491632d379be341a8286c53a0101adac6f7ca9be4319ccecaaf5d43a55e65dde8b434620726032472833d958d43698 + checksum: fa28d3016395974f7fc087d6bbf0ac7f58ac3489f4f202a377e9c194969f329a7b88c75f8152b33fb08794a30dcd5c079db6bb465c28151357f113d80bbf67da languageName: node linkType: hard @@ -13113,13 +13115,6 @@ __metadata: languageName: node linkType: hard -"p-finally@npm:^2.0.0": - version: 2.0.1 - resolution: "p-finally@npm:2.0.1" - checksum: 6306a2851c3b28f8b603624f395ae84dce76970498fed8aa6aae2d930595053746edf1e4ee0c4b78a97410d84aa4504d63179f5310d555511ecd226f53ed1e8e - languageName: node - linkType: hard - "p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -13129,7 +13124,7 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^3.1.0": +"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0": version: 3.1.0 resolution: "p-limit@npm:3.1.0" dependencies: @@ -13156,6 +13151,15 @@ __metadata: languageName: node linkType: hard +"p-locate@npm:^5.0.0": + version: 5.0.0 + resolution: "p-locate@npm:5.0.0" + dependencies: + p-limit: "npm:^3.0.2" + checksum: 1623088f36cf1cbca58e9b61c4e62bf0c60a07af5ae1ca99a720837356b5b6c5ba3eb1b2127e47a06865fee59dd0453cad7cc844cda9d5a62ac1a5a51b7c86d3 + languageName: node + linkType: hard + "p-map@npm:^2.0.0": version: 2.1.0 resolution: "p-map@npm:2.1.0" @@ -13382,6 +13386,13 @@ __metadata: languageName: node linkType: hard +"path-key@npm:^4.0.0": + version: 4.0.0 + resolution: "path-key@npm:4.0.0" + checksum: 8e6c314ae6d16b83e93032c61020129f6f4484590a777eed709c4a01b50e498822b00f76ceaf94bc64dbd90b327df56ceadce27da3d83393790f1219e07721d7 + languageName: node + linkType: hard + "path-parse@npm:^1.0.7": version: 1.0.7 resolution: "path-parse@npm:1.0.7" @@ -13971,12 +13982,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.4.1": - version: 2.7.1 - resolution: "prettier@npm:2.7.1" +"prettier@npm:^3.1.1": + version: 3.1.1 + resolution: "prettier@npm:3.1.1" bin: - prettier: bin-prettier.js - checksum: 9d29f81c1a470efca6851cd926a3e132a8d9c9d290c3d084c917c1c5aad5c392551406cf6012c724a136bd15911ede5eadc255d121c2761813b33a541a9c34c6 + prettier: bin/prettier.cjs + checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b languageName: node linkType: hard @@ -14030,24 +14041,6 @@ __metadata: languageName: node linkType: hard -"pretty-quick@npm:^2.0.2": - version: 2.0.2 - resolution: "pretty-quick@npm:2.0.2" - dependencies: - chalk: "npm:^2.4.2" - execa: "npm:^2.1.0" - find-up: "npm:^4.1.0" - ignore: "npm:^5.1.4" - mri: "npm:^1.1.4" - multimatch: "npm:^4.0.0" - peerDependencies: - prettier: ">=1.8.0" - bin: - pretty-quick: bin/pretty-quick.js - checksum: 34aa6ec1f1c54dba0f87d3d4ecfb4c3e0b5744113d5e0a4d6d0d4ba67ac32f0ac44c3c425e1b23255d193696c75df8ad889a010ea200e389b5fab3db81cd8046 - languageName: node - linkType: hard - "proc-log@npm:^3.0.0": version: 3.0.0 resolution: "proc-log@npm:3.0.0" @@ -14069,13 +14062,6 @@ __metadata: languageName: node linkType: hard -"progress@npm:^2.0.0": - version: 2.0.3 - resolution: "progress@npm:2.0.3" - checksum: e6f0bcb71f716eee9dfac0fe8a2606e3704d6a64dd93baaf49fbadbc8499989a610fe14cf1bc6f61b6d6653c49408d94f4a94e124538084efd8e4cf525e0293d - languageName: node - linkType: hard - "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -14162,16 +14148,6 @@ __metadata: languageName: node linkType: hard -"pump@npm:^3.0.0": - version: 3.0.0 - resolution: "pump@npm:3.0.0" - dependencies: - end-of-stream: "npm:^1.1.0" - once: "npm:^1.3.1" - checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9 - languageName: node - linkType: hard - "pumpify@npm:^1.3.5": version: 1.5.1 resolution: "pumpify@npm:1.5.1" @@ -14273,9 +14249,9 @@ __metadata: languageName: node linkType: hard -"react-avatar@npm:^4.0.0": - version: 4.1.0 - resolution: "react-avatar@npm:4.1.0" +"react-avatar@npm:^5.0.3": + version: 5.0.3 + resolution: "react-avatar@npm:5.0.3" dependencies: is-retina: "npm:^1.0.3" md5: "npm:^2.0.0" @@ -14284,7 +14260,7 @@ __metadata: core-js-pure: ">=3" prop-types: ^15.0.0 || ^16.0.0 react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 - checksum: db3ba4d2a534c0271427d967be918f7032bb34db0eb0f1625248d6fc79da52966fe7b5b3d785321ad7b842751277301674f1a562a506b8093ba9e5f31c244d6f + checksum: cdbb231d7d19cd3890873b465affe984aa006341c8b6130a670bfe406461665fb8f5607e0c3d7650aa4ec43b96acdad0b572b760e16c2cc41ddc15986aac7590 languageName: node linkType: hard @@ -14531,13 +14507,6 @@ __metadata: languageName: node linkType: hard -"regexpp@npm:^3.1.0": - version: 3.2.0 - resolution: "regexpp@npm:3.2.0" - checksum: 3310010895a906873262f4b494fc99bcef1e71ef6720a0532c5999ca586498cbd4a284c8e3c2423f9d1d37512fd08d6064b7564e0e59508cf938f76dd15ace84 - languageName: node - linkType: hard - "regexpu-core@npm:^5.1.0": version: 5.2.1 resolution: "regexpu-core@npm:5.2.1" @@ -14834,6 +14803,15 @@ __metadata: languageName: node linkType: hard +"run-applescript@npm:^5.0.0": + version: 5.0.0 + resolution: "run-applescript@npm:5.0.0" + dependencies: + execa: "npm:^5.0.0" + checksum: d00c2dbfa5b2d774de7451194b8b125f40f65fc183de7d9dcae97f57f59433586d3c39b9001e111c38bfa24c3436c99df1bb4066a2a0c90d39a8c4cd6889af77 + languageName: node + linkType: hard + "run-async@npm:^2.4.0": version: 2.4.1 resolution: "run-async@npm:2.4.1" @@ -15098,7 +15076,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": version: 7.3.8 resolution: "semver@npm:7.3.8" dependencies: @@ -15347,17 +15325,6 @@ __metadata: languageName: node linkType: hard -"slice-ansi@npm:^4.0.0": - version: 4.0.0 - resolution: "slice-ansi@npm:4.0.0" - dependencies: - ansi-styles: "npm:^4.0.0" - astral-regex: "npm:^2.0.0" - is-fullwidth-code-point: "npm:^3.0.0" - checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756 - languageName: node - linkType: hard - "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" @@ -15757,6 +15724,13 @@ __metadata: languageName: node linkType: hard +"strip-final-newline@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-final-newline@npm:3.0.0" + checksum: 23ee263adfa2070cd0f23d1ac14e2ed2f000c9b44229aec9c799f1367ec001478469560abefd00c5c99ee6f0b31c137d53ec6029c53e9f32a93804e18c201050 + languageName: node + linkType: hard + "strip-indent@npm:^3.0.0": version: 3.0.0 resolution: "strip-indent@npm:3.0.0" @@ -15766,7 +15740,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 @@ -15908,6 +15882,16 @@ __metadata: languageName: node linkType: hard +"synckit@npm:^0.8.5": + version: 0.8.6 + resolution: "synckit@npm:0.8.6" + dependencies: + "@pkgr/utils": "npm:^2.4.2" + tslib: "npm:^2.6.2" + checksum: 565c659b5c935905e3774f8a53b013aeb1db03b69cb26cfea742021a274fba792e6ec22f1f918bfb6a7fe16dc9ab6e32a94b4289a8d5d9039b695cd9d524953d + languageName: node + linkType: hard + "systemjs@npm:^6.8.3": version: 6.13.0 resolution: "systemjs@npm:6.13.0" @@ -15915,19 +15899,6 @@ __metadata: languageName: node linkType: hard -"table@npm:^6.0.9": - version: 6.8.1 - resolution: "table@npm:6.8.1" - dependencies: - ajv: "npm:^8.0.1" - lodash.truncate: "npm:^4.4.2" - slice-ansi: "npm:^4.0.0" - string-width: "npm:^4.2.3" - strip-ansi: "npm:^6.0.1" - checksum: 512c4f2bfb6f46f4d5ced19943ae5db1a5163eac1f23ce752625eb49715f84217c1c62bc2d017eb8985b37e0f85731108f654df809c0b34cca1678a672e7ea20 - languageName: node - linkType: hard - "tapable@npm:^1.0.0": version: 1.1.3 resolution: "tapable@npm:1.1.3" @@ -16116,6 +16087,13 @@ __metadata: languageName: node linkType: hard +"titleize@npm:^3.0.0": + version: 3.0.0 + resolution: "titleize@npm:3.0.0" + checksum: 71fbbeabbfb36ccd840559f67f21e356e1d03da2915b32d2ae1a60ddcc13a124be2739f696d2feb884983441d159a18649e8d956648d591bdad35c430a6b6d28 + languageName: node + linkType: hard + "tmp@npm:^0.0.33": version: 0.0.33 resolution: "tmp@npm:0.0.33" @@ -16247,7 +16225,16 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.10.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0": +"ts-api-utils@npm:^1.0.1": + version: 1.0.3 + resolution: "ts-api-utils@npm:1.0.3" + peerDependencies: + typescript: ">=4.2.0" + checksum: 1350a5110eb1e534e9a6178f4081fb8a4fcc439749e19f4ad699baec9090fcb90fe532d5e191d91a062dc6e454a14a8d7eb2ad202f57135a30c4a44a3024f039 + languageName: node + linkType: hard + +"tslib@npm:^1.10.0, tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: 7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb @@ -16261,24 +16248,13 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.4.0, tslib@npm:^2.6.2": +"tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca languageName: node linkType: hard -"tsutils@npm:^3.21.0": - version: 3.21.0 - resolution: "tsutils@npm:3.21.0" - dependencies: - tslib: "npm:^1.8.1" - peerDependencies: - typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - checksum: ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2 - languageName: node - linkType: hard - "turbo-darwin-64@npm:1.6.3": version: 1.6.3 resolution: "turbo-darwin-64@npm:1.6.3" @@ -16593,6 +16569,13 @@ __metadata: languageName: node linkType: hard +"untildify@npm:^4.0.0": + version: 4.0.0 + resolution: "untildify@npm:4.0.0" + checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9 + languageName: node + linkType: hard + "upath@npm:^1.2.0": version: 1.2.0 resolution: "upath@npm:1.2.0" @@ -16702,13 +16685,6 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:^2.0.3": - version: 2.3.0 - resolution: "v8-compile-cache@npm:2.3.0" - checksum: 7de7423db6f48d76cffae93d70d503e160c97fc85e55945036d719111e20b33c4be5c21aa8b123a3da203bbb3bc4c8180f9667d5ccafcff11d749fae204ec7be - languageName: node - linkType: hard - "v8-to-istanbul@npm:^9.0.1": version: 9.0.1 resolution: "v8-to-istanbul@npm:9.0.1" @@ -17313,7 +17289,7 @@ __metadata: languageName: node linkType: hard -"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": +"word-wrap@npm:~1.2.3": version: 1.2.3 resolution: "word-wrap@npm:1.2.3" checksum: 08a677e1578b9cc367a03d52bc51b6869fec06303f68d29439e4ed647257411f857469990c31066c1874678937dac737c9f8f20d3fd59918fb86b7d926a76b15