diff --git a/packages/esm-commons-lib/src/api/types.ts b/packages/esm-commons-lib/src/api/types.ts index c9b20ec4d..9e71bf993 100644 --- a/packages/esm-commons-lib/src/api/types.ts +++ b/packages/esm-commons-lib/src/api/types.ts @@ -235,7 +235,7 @@ export interface OhriDashboardMeta { * Used to generate the menu title displayed on the sidenav * @example "Covid Cases" */ - menuTitle: string; + title: string; slot: string; config: { columns?: number; diff --git a/packages/esm-commons-lib/src/components/patient-chart/ohri-patient-chart-sidenav.meta.tsx b/packages/esm-commons-lib/src/components/patient-chart/ohri-patient-chart-sidenav.meta.tsx index fba566e81..f99f298b9 100644 --- a/packages/esm-commons-lib/src/components/patient-chart/ohri-patient-chart-sidenav.meta.tsx +++ b/packages/esm-commons-lib/src/components/patient-chart/ohri-patient-chart-sidenav.meta.tsx @@ -9,10 +9,3 @@ export const createOHRIPatientChartSideNavLink = (meta) => { }; return NavItem; }; - -export const patientChartDivider_dashboardMeta = { - name: 'clinical-views-divider', - slot: 'patient-chart-sidenav-divider-slot', - config: { columns: 1, type: 'grid' }, - title: 'Clinical Views', -}; diff --git a/packages/esm-covid-app/src/dashboard.meta.tsx b/packages/esm-covid-app/src/dashboard.meta.tsx index c2e2861a4..bb8fd421a 100644 --- a/packages/esm-covid-app/src/dashboard.meta.tsx +++ b/packages/esm-covid-app/src/dashboard.meta.tsx @@ -34,15 +34,15 @@ export const covidVaccinationsDashboardMeta = { // Clinical Dashboards export const covidClinicalViewDashboardMeta: OhriDashboardMeta = { - menuTitle: 'COVID', slot: 'ohri-covid-dashboard-slot', config: { columns: 1, type: 'grid', icon: Coronavirus }, isFolder: true, + title: 'COVID', }; export const covid19CasesDashboardMeta: OhriDashboardLinkMeta = { name: 'covid-cases', slot: 'covid-cases-dashboard-slot', - config: { columns: 1, type: 'grid', programme: 'covid', icon: Coronavirus }, + config: { columns: 1, type: 'grid', programme: 'covid', dashboardTitle: 'Covid-19 Cases' }, title: 'COVID-19 Cases', }; diff --git a/packages/esm-hiv-app/src/dashboard.meta.tsx b/packages/esm-hiv-app/src/dashboard.meta.tsx index 7ed9404ab..696c44a61 100644 --- a/packages/esm-hiv-app/src/dashboard.meta.tsx +++ b/packages/esm-hiv-app/src/dashboard.meta.tsx @@ -97,7 +97,7 @@ export const hivFolderDashboardMeta: OhriDashboardMeta = { slot: 'ohri-hiv-dashboard-slot', config: { columns: 1, type: 'grid', icon: Home }, isFolder: true, - menuTitle: 'HIV', + title: 'HIV', }; export const htsDashboardMeta: OhriDashboardLinkMeta = { diff --git a/packages/esm-ohri-core-app/src/ohri-dashboard/appointments/appointments-dashboard.component.tsx b/packages/esm-ohri-core-app/src/appointments/appointments-dashboard.component.tsx similarity index 100% rename from packages/esm-ohri-core-app/src/ohri-dashboard/appointments/appointments-dashboard.component.tsx rename to packages/esm-ohri-core-app/src/appointments/appointments-dashboard.component.tsx diff --git a/packages/esm-ohri-core-app/src/dashboard.meta.tsx b/packages/esm-ohri-core-app/src/dashboard.meta.tsx index f7e2a671b..23f2ff3cc 100644 --- a/packages/esm-ohri-core-app/src/dashboard.meta.tsx +++ b/packages/esm-ohri-core-app/src/dashboard.meta.tsx @@ -40,3 +40,10 @@ export const serviceQueuesDashboardMeta = { isLink: true, title: 'Service Queues', }; + +export const patientChartDivider_dashboardMeta = { + name: 'clinical-views-divider', + slot: 'patient-chart-sidenav-divider-slot', + config: { columns: 1, type: 'grid' }, + title: 'Clinical Views', +}; diff --git a/packages/esm-ohri-core-app/src/dashboard/create-dashboard-link.component.tsx b/packages/esm-ohri-core-app/src/dashboard/create-dashboard-link.component.tsx new file mode 100644 index 000000000..888f9158d --- /dev/null +++ b/packages/esm-ohri-core-app/src/dashboard/create-dashboard-link.component.tsx @@ -0,0 +1,36 @@ +import React, { useMemo } from 'react'; +import { BrowserRouter, useLocation } from 'react-router-dom'; +import { ConfigurableLink } from '@openmrs/esm-framework'; + +export interface DashboardLinkConfig { + name: string; + title: string; +} + +const DashboardLink = ({ dashboardLinkConfig }: { dashboardLinkConfig: DashboardLinkConfig }) => { + const { name } = dashboardLinkConfig; + const location = useLocation(); + const spaBasePath = `${window.spaBase}/home`; + + const navLink = useMemo(() => { + const pathArray = location.pathname.split('/'); + const lastElement = pathArray[pathArray.length - 1]; + return decodeURIComponent(lastElement); + }, [location.pathname]); + + return ( + + {name} + + ); +}; + +export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => { + return () => ( + + + + ); +}; diff --git a/packages/esm-ohri-core-app/src/dashboard/dashboard-view.component.tsx b/packages/esm-ohri-core-app/src/dashboard/dashboard-view.component.tsx new file mode 100644 index 000000000..98a0254bd --- /dev/null +++ b/packages/esm-ohri-core-app/src/dashboard/dashboard-view.component.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import { ExtensionSlot } from '@openmrs/esm-framework'; +import styles from './dashboard-view.scss'; + +const DashboardView: React.FC<{ dashboardSlot: string; title: string }> = ({ dashboardSlot, title }) => { + return ; +}; + +export default DashboardView; diff --git a/packages/esm-ohri-core-app/src/dashboard/dashboard-view.scss b/packages/esm-ohri-core-app/src/dashboard/dashboard-view.scss new file mode 100644 index 000000000..399d01531 --- /dev/null +++ b/packages/esm-ohri-core-app/src/dashboard/dashboard-view.scss @@ -0,0 +1,5 @@ +@use '@carbon/colors'; + +.dashboardView { + background-color: colors.$white-0; +} diff --git a/packages/esm-ohri-core-app/src/dashboard/home.component.tsx b/packages/esm-ohri-core-app/src/dashboard/home.component.tsx new file mode 100644 index 000000000..0051a944f --- /dev/null +++ b/packages/esm-ohri-core-app/src/dashboard/home.component.tsx @@ -0,0 +1,31 @@ +import React from 'react'; +import { useParams } from 'react-router-dom'; +import { useLayoutType, isDesktop, useExtensionStore, ExtensionSlot } from '@openmrs/esm-framework'; +import DashboardView from './dashboard-view.component'; +import styles from './home-dashboard.scss'; + +// TODO PIUS move this to a shared location +export interface DashboardConfig { + name: string; + slot: string; + title: string; +} + +export default function HomeDashboard() { + const params = useParams(); + const extensionStore = useExtensionStore(); + const layout = useLayoutType(); + const ungroupedDashboards = + extensionStore.slots['ohri-dashboard-slot']?.assignedExtensions + .map((e) => e.meta) + .filter((e) => Object.keys(e).length) || []; + const dashboards = ungroupedDashboards as Array; + const activeDashboard = dashboards.find((dashboard) => dashboard.name === params?.dashboard) || dashboards[0]; + + return ( +
+ {isDesktop(layout) && } + +
+ ); +} diff --git a/packages/esm-ohri-core-app/src/dashboard/routes.json b/packages/esm-ohri-core-app/src/dashboard/routes.json new file mode 100644 index 000000000..c43ffe707 --- /dev/null +++ b/packages/esm-ohri-core-app/src/dashboard/routes.json @@ -0,0 +1,43 @@ +{ + "$schema": "https://json.openmrs.org/routes.schema.json", + "backendDependencies": { + "webservices.rest": "^2.24.0" + }, + "pages": [ + { + "component": "root", + "route": "home", + "online": true, + "offline": true + } + ], + "extensions": [ + { + "name": "home-nav-menu", + "slot": "home-sidebar-slot", + "component": "homeNavMenu", + "online": true, + "offline": true + }, + { + "name": "home-widget-db-link", + "slot": "ohri-dashboard-slot", + "component": "homeWidgetDbLink", + "meta": { + "name": "Home", + "slot": "home-dashboard-slot", + "title": "" + }, + "order": 0, + "online": true, + "offline": true + }, + { + "name": "home-widget-dashboard", + "slot": "home-dashboard-slot", + "component": "homeWidgetDashboard", + "online": true, + "offline": true + } + ] +} diff --git a/packages/esm-ohri-core-app/src/dashboard/side-menu.component.tsx b/packages/esm-ohri-core-app/src/dashboard/side-menu.component.tsx new file mode 100644 index 000000000..32493547a --- /dev/null +++ b/packages/esm-ohri-core-app/src/dashboard/side-menu.component.tsx @@ -0,0 +1,6 @@ +import React from 'react'; +import { LeftNavMenu } from '@openmrs/esm-framework'; + +const SideMenu = () => ; + +export default SideMenu; diff --git a/packages/esm-ohri-core-app/src/ohri-dashboard/dispensing/dispensing-dashboard.component.tsx b/packages/esm-ohri-core-app/src/dispensing/dispensing-dashboard.component.tsx similarity index 100% rename from packages/esm-ohri-core-app/src/ohri-dashboard/dispensing/dispensing-dashboard.component.tsx rename to packages/esm-ohri-core-app/src/dispensing/dispensing-dashboard.component.tsx diff --git a/packages/esm-ohri-core-app/src/index.ts b/packages/esm-ohri-core-app/src/index.ts index a4de7a249..691e8286b 100644 --- a/packages/esm-ohri-core-app/src/index.ts +++ b/packages/esm-ohri-core-app/src/index.ts @@ -1,7 +1,6 @@ import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, provide } from '@openmrs/esm-framework'; import { createOHRIPatientChartSideNavLink, - patientChartDivider_dashboardMeta, createOHRIDashboardLink, PatientListTable, } from '@ohri/openmrs-esm-ohri-commons-lib'; @@ -10,6 +9,7 @@ import { homeDashboardMeta, dispensingDashboardMeta, serviceQueuesDashboardMeta, + patientChartDivider_dashboardMeta, } from './dashboard.meta'; export const importTranslation = require.context('../translations', false, /.json$/, 'lazy'); @@ -36,7 +36,7 @@ export const patientList = getSyncLifecycle(PatientListTable, { export const appointmentsLink = getSyncLifecycle(createOHRIDashboardLink(appointmentsDashboardMeta), options); export const appointmentsDashboard = getAsyncLifecycle( - () => import('./ohri-dashboard/appointments/appointments-dashboard.component'), + () => import('./appointments/appointments-dashboard.component'), { featureName: 'appointments-dashboard', moduleName, @@ -44,17 +44,14 @@ export const appointmentsDashboard = getAsyncLifecycle( ); export const dispensingLink = getSyncLifecycle(createOHRIDashboardLink(dispensingDashboardMeta), options); -export const dispensingDashboard = getAsyncLifecycle( - () => import('./ohri-dashboard/dispensing/dispensing-dashboard.component'), - { - featureName: 'dispensing-dashboard', - moduleName, - }, -); +export const dispensingDashboard = getAsyncLifecycle(() => import('./dispensing/dispensing-dashboard.component'), { + featureName: 'dispensing-dashboard', + moduleName, +}); export const serviceQueuesLink = getSyncLifecycle(createOHRIDashboardLink(serviceQueuesDashboardMeta), options); export const serviceQueuesDashboard = getAsyncLifecycle( - () => import('./ohri-dashboard/service-queues/service-queues-dashboard.component'), + () => import('./service-queues/service-queues-dashboard.component'), { featureName: 'service-queues-dashboard', moduleName, diff --git a/packages/esm-ohri-core-app/src/root.tsx b/packages/esm-ohri-core-app/src/root.tsx index 6c7d6ac3b..c96fd6b1e 100644 --- a/packages/esm-ohri-core-app/src/root.tsx +++ b/packages/esm-ohri-core-app/src/root.tsx @@ -1,15 +1,28 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'; import OHRIDashboard from './ohri-dashboard/ohri-dashboard.component'; +import HomeDashboard from './dashboard/home.component'; +import { setLeftNav, unsetLeftNav } from '@openmrs/esm-framework'; + +const Root: React.FC = () => { + const spaBasePath = window.spaBase; + + useEffect(() => { + setLeftNav({ name: 'ohri-dashboard-slot', basePath: spaBasePath }); + return () => unsetLeftNav('ohri-dashboard-slot'); + }, [spaBasePath]); -export default function Root() { return ( - - - } /> - } /> - } /> - + +
+ + } /> + } /> + } /> + +
); -} +}; + +export default Root; diff --git a/packages/esm-ohri-core-app/src/ohri-dashboard/service-queues/service-queues-dashboard.component.tsx b/packages/esm-ohri-core-app/src/service-queues/service-queues-dashboard.component.tsx similarity index 100% rename from packages/esm-ohri-core-app/src/ohri-dashboard/service-queues/service-queues-dashboard.component.tsx rename to packages/esm-ohri-core-app/src/service-queues/service-queues-dashboard.component.tsx diff --git a/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx b/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx index d29b8fbf8..40c5abb6c 100644 --- a/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx +++ b/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx @@ -37,7 +37,7 @@ export const childVisitsDashboardMeta = { export const motherChildDashboardMeta = { name: 'mother-child-health', slot: 'mother-child-health-dashboard-slot', - menuTitle: 'Maternal & Child Health', + title: 'Maternal & Child Health', config: { columns: 1, type: 'grid', diff --git a/yarn.lock b/yarn.lock index c120eecd0..de170d034 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3852,9 +3852,9 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-api@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-api@npm:5.1.1-pre.997" +"@openmrs/esm-api@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-api@npm:5.1.1-pre.966" dependencies: "@types/fhir": 0.0.31 lodash-es: ^4.17.21 @@ -3862,17 +3862,17 @@ __metadata: "@openmrs/esm-config": 5.x "@openmrs/esm-error-handling": 5.x "@openmrs/esm-offline": 5.x - checksum: cae349b471240726cde6095642a594d8305c21bacd348f2e1ba61f948523784c58488bcbbad2b340113878179c885552549272951f5e8e23dc0a9fa1b59da58f + checksum: 8282b5cd883d142586a26f57c9cf2f36302d43a9b1330c16742c6810332099e24a209f6b859287f40bc2f5993bab6569df5a48c29cee52761a57955c86ce5a9b languageName: node linkType: hard -"@openmrs/esm-app-shell@npm:5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-app-shell@npm:5.1.1-pre.997" +"@openmrs/esm-app-shell@npm:5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-app-shell@npm:5.1.1-pre.966" dependencies: "@carbon/react": ^1.12.0 - "@openmrs/esm-framework": 5.1.1-pre.997 - "@openmrs/esm-styleguide": 5.1.1-pre.997 + "@openmrs/esm-framework": 5.1.1-pre.966 + "@openmrs/esm-styleguide": 5.1.1-pre.966 dayjs: ^1.10.4 dexie: ^3.0.3 html-webpack-plugin: ^5.5.0 @@ -3896,55 +3896,55 @@ __metadata: workbox-strategies: ^6.1.5 workbox-webpack-plugin: ^6.1.5 workbox-window: ^6.1.5 - checksum: b09fc06bcfc31ced9d74dd482e40c04352dfb1f05a11c0de35c3ad936f4557227d48605ae7d2f3c606d3d9bbd050969ca2876ea948e43dc521898fee3f1cabd6 + checksum: dd2088120346682816c7dc46b5a30034d6769e851b827ac65136399f7a67c8abef6b4b9718c7f7f659e5b7a03eb7d328958937996badeb064c99b81d6e712c17 languageName: node linkType: hard -"@openmrs/esm-breadcrumbs@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-breadcrumbs@npm:5.1.1-pre.997" +"@openmrs/esm-breadcrumbs@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-breadcrumbs@npm:5.1.1-pre.966" dependencies: path-to-regexp: 6.1.0 peerDependencies: "@openmrs/esm-state": 5.x - checksum: d6935d49a35788423e5841720c31acc347da237a0030ab4e23056586378a0aff014e6b787fdab57c36877ccec54285843060e91a0009534e28fc98cd8331e131 + checksum: 2fc40c820298d99743dd52ef91fbaa16f2bb5ecb3b540243750c5302c3f2209b40eddf447ba199b91df36ba1c5b592a28f91a30cd14121db46bd1a93a384afc1 languageName: node linkType: hard -"@openmrs/esm-config@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-config@npm:5.1.1-pre.997" +"@openmrs/esm-config@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-config@npm:5.1.1-pre.966" dependencies: ramda: ^0.26.1 peerDependencies: "@openmrs/esm-globals": 5.x "@openmrs/esm-state": 5.x single-spa: 5.x - checksum: c98fcea6fccf7f1463d77e6b415ecb5cc2f1a818cdac4f8ce4d803f1528b5365c8bb38d1491ef2ead2a3256897c18c380c597b42dbd4dce0a7fe7a269e820b4b + checksum: 7b23b60b2fccd3f8f61af8b5a6f9cc9483d80e9d073f14cef0e04d375de119a441cdae557a6b23e5d08ebe9f373075f1ab2cf3940d2e1b0e759eaa8abe0cb5c7 languageName: node linkType: hard -"@openmrs/esm-dynamic-loading@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-dynamic-loading@npm:5.1.1-pre.997" +"@openmrs/esm-dynamic-loading@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-dynamic-loading@npm:5.1.1-pre.966" peerDependencies: "@openmrs/esm-globals": 5.x - checksum: 3b7344c85231e8ad228bd66ddb59b420ad3b876d2fdfa0f0c6ef551b69dcaa568e2ee6593077553f88e895fadbfa319ff13c577953984a3d96f2fe711d66ac09 + checksum: 3709ce1ea9141f3e6fa06705bbd6ad92beaebb509149a453f02d05c4c884803adfe4cb37c92fc506ff41cc7b13fa805ec24059f6f02124bd4b3b83c1b37e3421 languageName: node linkType: hard -"@openmrs/esm-error-handling@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-error-handling@npm:5.1.1-pre.997" +"@openmrs/esm-error-handling@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-error-handling@npm:5.1.1-pre.966" peerDependencies: "@openmrs/esm-globals": 5.x - checksum: ed9ff693ad829d03b73cac282fac8623438f15e60195787ae79d2431762275a5552fa200d65e16b4b8df483dd4663e8d8ecc7b04ee6a1fa541cbdb832be0435a + checksum: e8ccdeeb7a73fd13654531875f906e9f058a5a52a690ca80750fc9ea983e6486ea83a2704a315509ec4a529afdbd2829de62c305533d62cc7432694e1d5c17d2 languageName: node linkType: hard -"@openmrs/esm-extensions@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-extensions@npm:5.1.1-pre.997" +"@openmrs/esm-extensions@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-extensions@npm:5.1.1-pre.966" dependencies: lodash-es: ^4.17.21 peerDependencies: @@ -3953,40 +3953,40 @@ __metadata: "@openmrs/esm-feature-flags": 5.x "@openmrs/esm-state": 5.x single-spa: 5.x - checksum: db1fd0f0f0fe06b62f166a959161ab6150bbef0e7208ad4e930d91c96d9902f1f80d35118f26c8eb2d40c562e9ebdcc258ed217f9f8c85fd5bb568cda481ce1e + checksum: 1ee17bd3185d3d36a7f8399dd8c882441cc2503d80e24a9b11ebfcadbc17c49eb6cd2f3329a88628aeb46950102e7c7f0608ff39f5fee431ab7ba8ae8371d60a languageName: node linkType: hard -"@openmrs/esm-feature-flags@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-feature-flags@npm:5.1.1-pre.997" +"@openmrs/esm-feature-flags@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-feature-flags@npm:5.1.1-pre.966" dependencies: ramda: ^0.26.1 peerDependencies: "@openmrs/esm-globals": 5.x "@openmrs/esm-state": 5.x single-spa: 5.x - checksum: 01b5526c4c381a71f7182b1d35690f0e5ffb6efa9f991c19d7546573072217e76e80d395753deca8cea26b36382857690204d108c062a635119a63d5dc7ccab9 - languageName: node - linkType: hard - -"@openmrs/esm-framework@npm:5.1.1-pre.997, @openmrs/esm-framework@npm:next": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-framework@npm:5.1.1-pre.997" - dependencies: - "@openmrs/esm-api": ^5.1.1-pre.997 - "@openmrs/esm-breadcrumbs": ^5.1.1-pre.997 - "@openmrs/esm-config": ^5.1.1-pre.997 - "@openmrs/esm-dynamic-loading": ^5.1.1-pre.997 - "@openmrs/esm-error-handling": ^5.1.1-pre.997 - "@openmrs/esm-extensions": ^5.1.1-pre.997 - "@openmrs/esm-feature-flags": ^5.1.1-pre.997 - "@openmrs/esm-globals": ^5.1.1-pre.997 - "@openmrs/esm-offline": ^5.1.1-pre.997 - "@openmrs/esm-react-utils": ^5.1.1-pre.997 - "@openmrs/esm-state": ^5.1.1-pre.997 - "@openmrs/esm-styleguide": ^5.1.1-pre.997 - "@openmrs/esm-utils": ^5.1.1-pre.997 + checksum: 92833c9ada71f41eed5e3cb41e524932b25767cabf62b922558027727b0c532620ece8f01db41eee9f4cc91d78f93d87e10295b65b3cbbb01ecf4812251dea02 + languageName: node + linkType: hard + +"@openmrs/esm-framework@npm:5.1.1-pre.966, @openmrs/esm-framework@npm:next": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-framework@npm:5.1.1-pre.966" + dependencies: + "@openmrs/esm-api": ^5.1.1-pre.966 + "@openmrs/esm-breadcrumbs": ^5.1.1-pre.966 + "@openmrs/esm-config": ^5.1.1-pre.966 + "@openmrs/esm-dynamic-loading": ^5.1.1-pre.966 + "@openmrs/esm-error-handling": ^5.1.1-pre.966 + "@openmrs/esm-extensions": ^5.1.1-pre.966 + "@openmrs/esm-feature-flags": ^5.1.1-pre.966 + "@openmrs/esm-globals": ^5.1.1-pre.966 + "@openmrs/esm-offline": ^5.1.1-pre.966 + "@openmrs/esm-react-utils": ^5.1.1-pre.966 + "@openmrs/esm-state": ^5.1.1-pre.966 + "@openmrs/esm-styleguide": ^5.1.1-pre.966 + "@openmrs/esm-utils": ^5.1.1-pre.966 dayjs: ^1.10.7 peerDependencies: dayjs: 1.x @@ -3996,22 +3996,22 @@ __metadata: react-i18next: 11.x rxjs: 6.x single-spa: 5.x - checksum: e637b325d0a74961717f4cfc9d328bd29aa74e9f14d833677e1241c1115d1424154c27a33c1204932a3b51464bb87b61923948bc86f495c792ab207d8b2bc6c4 + checksum: 827a963123a6574d4798964d562ba6c21af9c8f5869dc3249e54ac8e8c3b356fba9eb92fb4e7cdd47ba35e24fcb3f2c3b374244481ce5e1cb51d0d7b28f5ddc2 languageName: node linkType: hard -"@openmrs/esm-globals@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-globals@npm:5.1.1-pre.997" +"@openmrs/esm-globals@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-globals@npm:5.1.1-pre.966" peerDependencies: single-spa: 5.x - checksum: 534290c2a1f1535871954a147fe30e6c8e437ec7d9fa517bc0950fa5193eea75905c2e7627e0fa76282bd89b57a65bb8fbf41907a54ab0e07fdda27792650b16 + checksum: e9664929c7c671019ae7b38effb23a6865c1ef5bcc55ac5df71cd2ee639b685664b69ddc3b19e05b8b8a419acd13c63d2846fca2ac329a6b49b2fe2cadb77b6c languageName: node linkType: hard -"@openmrs/esm-offline@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-offline@npm:5.1.1-pre.997" +"@openmrs/esm-offline@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-offline@npm:5.1.1-pre.966" dependencies: dexie: ^3.0.3 lodash-es: ^4.17.21 @@ -4023,7 +4023,7 @@ __metadata: "@openmrs/esm-state": 5.x "@openmrs/esm-styleguide": 5.x rxjs: 6.x - checksum: a04e0c687ddc2b8efe8b9b1808462496e0c3fcfd165980047be2beda66fe9d97a84e59f31fe1db562b316e0fefd412e4e94afdcb537efcc448eb580ec2993105 + checksum: 7829f9ea00ef483e7f51e04c5bbf7fbd164c9d7a9a0b2eb8f8f127f7a5ec91d6393f047613acec7e044125bf9d85cb7f12a5f1fd79c00b1bd53c6071c669d592 languageName: node linkType: hard @@ -4042,9 +4042,9 @@ __metadata: languageName: node linkType: hard -"@openmrs/esm-react-utils@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-react-utils@npm:5.1.1-pre.997" +"@openmrs/esm-react-utils@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-react-utils@npm:5.1.1-pre.966" dependencies: lodash-es: ^4.17.21 single-spa-react: ~5.0.0 @@ -4060,24 +4060,24 @@ __metadata: react: 18.x react-dom: 18.x react-i18next: 11.x - checksum: 36e47bb93d1e10412ef1b4822f80f3274e0b902eb25ab275fa5306c6ba157138fc10c55d792781e6865317aaf202a5c4e807cf74eef5a589e7177a25f9a864f8 + checksum: 275dc77daceaefeb4461807a9b6008b34380bc7d67bc53b6c0c0ab33847ca782c1597ba4b241ab6b86e106cc1d43299d1f1d54690628fd6103c0249f27f5617b languageName: node linkType: hard -"@openmrs/esm-state@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-state@npm:5.1.1-pre.997" +"@openmrs/esm-state@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-state@npm:5.1.1-pre.966" dependencies: zustand: ^4.3.6 peerDependencies: "@openmrs/esm-globals": 5.x - checksum: c2b6ea008ffed40227b475bea614083e840cec9790d2c6b4d7301b2606152bbdab18d6f0a79b4ea366480e38c2e3666db3de395625e8265db6cfad5f45600c16 + checksum: 72a1dcd6c51d1c19e200fd6872a5750d5c48d5363e63e6319720f3cb5942751e57d84c9983a2c5c88f056ba74bf5cb275c8faf8233462dee5302c2fd4421255a languageName: node linkType: hard -"@openmrs/esm-styleguide@npm:5.1.1-pre.997, @openmrs/esm-styleguide@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-styleguide@npm:5.1.1-pre.997" +"@openmrs/esm-styleguide@npm:5.1.1-pre.966, @openmrs/esm-styleguide@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-styleguide@npm:5.1.1-pre.966" dependencies: "@carbon/charts": ^1.6.3 "@carbon/react": ^1.12.0 @@ -4094,20 +4094,20 @@ __metadata: react: 18.x react-dom: 18.x rxjs: 6.x - checksum: 33e0280f38a49e5c95bdb9a2721200ae83a46cf146fc8e3fccd3bb95f0c3e8b366b9d04055abaf146aaa4b80bb41a1fc591c55c52b25fa32ab45ee3e0565d4df + checksum: 21cf920901e84ee30d46d666a855f5517720e58cd20593f6bd5873320f75861f8ecc5f3bbbd5229c34dc0c051f362ef0d39130ddd854d4e44e8fa6ee42fdcbc8 languageName: node linkType: hard -"@openmrs/esm-utils@npm:^5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/esm-utils@npm:5.1.1-pre.997" +"@openmrs/esm-utils@npm:^5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/esm-utils@npm:5.1.1-pre.966" dependencies: semver: 7.3.2 peerDependencies: dayjs: 1.x i18next: 19.x rxjs: 6.x - checksum: 631d5e785bc0824044e6ec41b37c8466cb9134af9edd10f2ca4f4b89d99ea521f2b32c2d7a99e5bc25e86133d995d5eec10da36f1743588d8660fe0232c0a981 + checksum: bf78692a2f8b0e4918b0372e243fe8ac3837b7a888df76b431267e0da0a88e25c4a811be1fefbdcd4150c4f88d914a15138111e58880fbbe7c7ecb33264c30d8 languageName: node linkType: hard @@ -4139,9 +4139,9 @@ __metadata: languageName: node linkType: hard -"@openmrs/webpack-config@npm:5.1.1-pre.997": - version: 5.1.1-pre.997 - resolution: "@openmrs/webpack-config@npm:5.1.1-pre.997" +"@openmrs/webpack-config@npm:5.1.1-pre.966": + version: 5.1.1-pre.966 + resolution: "@openmrs/webpack-config@npm:5.1.1-pre.966" dependencies: "@swc/core": ^1.3.58 babel-preset-minify: ^0.5.1 @@ -4159,7 +4159,7 @@ __metadata: webpack-stats-plugin: ^1.0.3 peerDependencies: webpack: 5.x - checksum: 60c5acf3c9927f0c2d856c9bf01bef07c0b6778b0c30a536152526070e86500d29730fdce7f71b72231346c2bf7f79b01adecf9bfe456e2db0b787b79bc466e0 + checksum: 1182a763a9a0033450ce4d5ace45a5aa45eefb348c1f1bb1bcc5207f5cd223c6d158b51ac187b23dcd044bcb64d2d65bc9a2ab9d2fee293e5590cf207de51394 languageName: node linkType: hard @@ -16374,11 +16374,11 @@ __metadata: linkType: hard "openmrs@npm:next": - version: 5.1.1-pre.997 - resolution: "openmrs@npm:5.1.1-pre.997" + version: 5.1.1-pre.966 + resolution: "openmrs@npm:5.1.1-pre.966" dependencies: - "@openmrs/esm-app-shell": 5.1.1-pre.997 - "@openmrs/webpack-config": 5.1.1-pre.997 + "@openmrs/esm-app-shell": 5.1.1-pre.966 + "@openmrs/webpack-config": 5.1.1-pre.966 "@pnpm/npm-conf": ^2.1.0 "@swc/core": ^1.3.58 autoprefixer: ^10.4.2 @@ -16407,7 +16407,21 @@ __metadata: yargs: ^17.6.2 bin: openmrs: dist/cli.js - checksum: 9c59de1a4cfb764a49884894dce13e48a81fc2483a2bce568d727392bd3d1c7315f8b5c4fb48824a7aecf6c884a97147062090d7d7ed8569ba7884170e685be0 + checksum: a8744a21c7c40bf4953ad5a2bfe463068f8140e152622de7d7c1763c5fa8c54ddab1872dfc8423a98ea7bade8c8dab6ee687e37ad8b962d4e31847f38dbe7547 + languageName: node + linkType: hard + +"optionator@npm:^0.8.1": + version: 0.8.3 + resolution: "optionator@npm:0.8.3" + dependencies: + deep-is: ~0.1.3 + fast-levenshtein: ~2.0.6 + levn: ~0.3.0 + prelude-ls: ~1.1.2 + type-check: ~0.3.2 + word-wrap: ~1.2.3 + checksum: b8695ddf3d593203e25ab0900e265d860038486c943ff8b774f596a310f8ceebdb30c6832407a8198ba3ec9debe1abe1f51d4aad94843612db3b76d690c61d34 languageName: node linkType: hard