From 34ac8f9ab71e9814c1cc7b6ba8db78b0628bdf95 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:32:34 +0300
Subject: [PATCH 01/22] home page header

---
 .../home-page-widgets.component.tsx           | 11 ++-
 .../appointments-illustration.component.tsx   | 22 +++++
 .../homepage-header.component.tsx             | 49 +++++++++++
 .../src/homepage-header/homepage-header.scss  | 85 +++++++++++++++++++
 4 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 packages/esm-home-app/src/homepage-header/appointments-illustration.component.tsx
 create mode 100644 packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
 create mode 100644 packages/esm-home-app/src/homepage-header/homepage-header.scss

diff --git a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
index 9c9e5511a..a46002886 100644
--- a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
+++ b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
@@ -1,11 +1,20 @@
 import { ExtensionSlot } from '@openmrs/esm-framework';
 import React from 'react';
 import styles from './home-page-widgets.scss';
+import HomepageHeader from '../homepage-header/homepage-header.component';
+import { useTranslation } from 'react-i18next';
 
 interface HomePageWidgetsProps {}
 
 const HomePageWidgets: React.FC<HomePageWidgetsProps> = () => {
-  return <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />;
+  const { t } = useTranslation();
+
+  return (
+    <React.Fragment>
+      <HomepageHeader title={t('home', 'Home')} />
+      <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />
+    </React.Fragment>
+  );
 };
 
 export default HomePageWidgets;
diff --git a/packages/esm-home-app/src/homepage-header/appointments-illustration.component.tsx b/packages/esm-home-app/src/homepage-header/appointments-illustration.component.tsx
new file mode 100644
index 000000000..1561d523c
--- /dev/null
+++ b/packages/esm-home-app/src/homepage-header/appointments-illustration.component.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+const HomepageIllustration: React.FC = () => {
+  return (
+    <svg width="92" height="94" viewBox="0 0 92 94" xmlns="http://www.w3.org/2000/svg">
+      <title>Patient queue illustration</title>
+      <g fill="none" fillRule="evenodd">
+        <path fill="#FFF" d="M0 0h92v94H0z" />
+        <path
+          d="M40 32c.84-.602 1.12-1.797 1-3 .12-5.005-3.96-9-9-9s-9.12 3.995-9 9c-.12 3.572 2.1 6.706 5 8-6.76 1.741-12 7.91-12 15v15h28V32h-4zM76 67V52c0-7.09-5.24-13.278-12-15 2.9-1.294 5.12-4.428 5-8 .12-5.005-3.96-9-9-9s-9.12 3.995-9 9c-.12 1.203.14 2.398 1 3h-4v35h28z"
+          fill="#CEE6E5"
+        />
+        <path
+          d="M32 75V60.312c0-7.402 5.24-13.59 12.3-15.216-3.2-1.39-5.42-4.523-5.42-8.166 0-4.935 4.08-8.93 9.12-8.93 5.04 0 9.12 3.995 9.12 8.93 0 3.642-2.22 6.776-5.42 8.166C58.76 46.741 64 52.91 64 60.313V75"
+          fill="#7BBCB9"
+        />
+      </g>
+    </svg>
+  );
+};
+
+export default HomepageIllustration;
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
new file mode 100644
index 000000000..505b9a536
--- /dev/null
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Location } from '@carbon/react/icons';
+import { useSession } from '@openmrs/esm-framework';
+import { DatePicker, DatePickerInput } from '@carbon/react';
+import dayjs from 'dayjs';
+import styles from './homepage-header.scss';
+import HomepageIllustration from './appointments-illustration.component';
+
+interface HomepageHeaderProps {
+  title: string;
+}
+
+const HomepageHeader: React.FC<HomepageHeaderProps> = ({ title }) => {
+  const { t } = useTranslation();
+  const session = useSession();
+  const location = session?.sessionLocation?.display;
+
+  return (
+    <div className={styles.header} data-testid="homepage-header">
+      <div className={styles['left-justified-items']}>
+        <HomepageIllustration />
+        <div className={styles['page-labels']}>
+          <p>{t('home', 'Home')}</p>
+          <p className={styles['page-name']}>{title}</p>
+        </div>
+      </div>
+      <div className={styles['right-justified-items']}>
+        <div className={styles['date-and-location']}>
+          <Location size={16} />
+          <span className={styles.value}>{location}</span>
+          <span className={styles.middot}>&middot;</span>
+          <DatePicker dateFormat="d-M-Y" datePickerType="single">
+            <DatePickerInput
+              style={{ backgroundColor: 'transparent', border: 'none', maxWidth: '10rem' }}
+              id="date-picker-calendar-id"
+              placeholder="DD-MMM-YYYY"
+              labelText=""
+              type="text"
+              value={dayjs(new Date()).format('DD MMM YYYY')}
+            />
+          </DatePicker>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default HomepageHeader;
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.scss b/packages/esm-home-app/src/homepage-header/homepage-header.scss
new file mode 100644
index 000000000..7348cdce8
--- /dev/null
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.scss
@@ -0,0 +1,85 @@
+@use '@carbon/colors';
+@use '@carbon/styles/scss/spacing';
+@use '@carbon/styles/scss/type';
+@import '~@openmrs/esm-styleguide/src/vars';
+
+.header {
+    @include type.type-style('body-compact-02');
+    color: $text-02;
+    height: spacing.$spacing-12;
+    background-color: $ui-02;
+    border-bottom: 1px solid $ui-03;
+    display: flex;
+    justify-content: space-between;
+}
+
+.left-justified-items {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    cursor: pointer;
+}
+
+.right-justified-items {
+    @include type.type-style('body-compact-02');
+    color: $text-02;
+    margin: 0.5rem;
+}
+
+.page-name {
+    @include type.type-style('heading-04');
+}
+
+.page-labels {
+    margin: 1rem 0;
+
+    p:first-of-type {
+        margin-bottom: 0.25rem;
+    }
+}
+
+.date-and-location {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+}
+
+.dropdownContainer {
+    display: flex;
+    justify-content: flex-end;
+}
+
+.value {
+    margin-left: 0.25rem;
+}
+
+.middot {
+    margin: 0 0.5rem;
+}
+
+.view {
+    @include type.type-style('label-01');
+}
+
+.datePicker {
+    background-color: transparent;
+    width: 10rem;
+    border: none;
+
+    &>input {
+        color: colors.$blue-10;
+    }
+}
+
+// Overriding styles for RTL support
+html[dir='rtl'] {
+    .date-and-location {
+        &>svg {
+            order: -1;
+        }
+
+        &>span:nth-child(2) {
+            order: -2;
+        }
+    }
+}
\ No newline at end of file

From d37a0ec84bde2c4f9ed0eced305a80374b49c2e6 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:33:36 +0300
Subject: [PATCH 02/22] Update translations file

---
 packages/esm-home-app/translations/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index a5ff8c612..c3d9a87e4 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,3 +1,4 @@
 {
+  "home": "Home",
   "Home": "Home"
 }

From a9f7c8a2bcdf08dee8edcbb0dc6f844b069441b5 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:42:49 +0300
Subject: [PATCH 03/22] cleanup

---
 .../src/homepage-header/homepage-header.component.tsx           | 2 +-
 ...ration.component.tsx => homepage-illustration.component.tsx} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/esm-home-app/src/homepage-header/{appointments-illustration.component.tsx => homepage-illustration.component.tsx} (100%)

diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
index 505b9a536..6c7370893 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
@@ -5,7 +5,7 @@ import { useSession } from '@openmrs/esm-framework';
 import { DatePicker, DatePickerInput } from '@carbon/react';
 import dayjs from 'dayjs';
 import styles from './homepage-header.scss';
-import HomepageIllustration from './appointments-illustration.component';
+import HomepageIllustration from './homepage-illustration.component';
 
 interface HomepageHeaderProps {
   title: string;
diff --git a/packages/esm-home-app/src/homepage-header/appointments-illustration.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx
similarity index 100%
rename from packages/esm-home-app/src/homepage-header/appointments-illustration.component.tsx
rename to packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx

From 1ac66bca5fd40a6295632ceb040de247c12471fa Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:42:27 +0300
Subject: [PATCH 04/22] load header via extension

---
 package.json                                  |   4 +-
 .../home-page-widgets.component.tsx           |  11 +-
 packages/esm-home-app/src/index.ts            |   3 +
 packages/esm-home-app/src/routes.json         |   7 +
 yarn.lock                                     | 249 ++++++++++--------
 5 files changed, 150 insertions(+), 124 deletions(-)

diff --git a/package.json b/package.json
index b6c1741b2..b1538e330 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.17",
     "@carbon/react": "^1.37.0",
-    "@openmrs/esm-framework": "next",
+    "@openmrs/esm-framework": "^5.4.1-pre.1581",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.84",
     "@swc/jest": "^0.2.29",
@@ -48,7 +48,7 @@
     "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^14.0.1",
-    "openmrs": "next",
+    "openmrs": "^5.4.1-pre.1581",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
index a46002886..9c9e5511a 100644
--- a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
+++ b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
@@ -1,20 +1,11 @@
 import { ExtensionSlot } from '@openmrs/esm-framework';
 import React from 'react';
 import styles from './home-page-widgets.scss';
-import HomepageHeader from '../homepage-header/homepage-header.component';
-import { useTranslation } from 'react-i18next';
 
 interface HomePageWidgetsProps {}
 
 const HomePageWidgets: React.FC<HomePageWidgetsProps> = () => {
-  const { t } = useTranslation();
-
-  return (
-    <React.Fragment>
-      <HomepageHeader title={t('home', 'Home')} />
-      <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />
-    </React.Fragment>
-  );
+  return <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />;
 };
 
 export default HomePageWidgets;
diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts
index 3b79dc733..3c96cb2c7 100644
--- a/packages/esm-home-app/src/index.ts
+++ b/packages/esm-home-app/src/index.ts
@@ -5,6 +5,7 @@ import { esmHomeSchema } from './openmrs-esm-home-schema';
 import rootComponent from './root.component';
 import homeNavMenuComponent from './side-menu/side-menu.component';
 import homeWidgetDashboardComponent from './home-page-widgets/home-page-widgets.component';
+import homepageHeaderComponent from './homepage-header/homepage-header.component';
 
 const moduleName = '@openmrs/esm-home-app';
 const pageName = 'home';
@@ -24,6 +25,8 @@ export const homeWidgetDbLink = getSyncLifecycle(createDashboardLink(dashboardMe
 
 export const homeWidgetDashboard = getSyncLifecycle(homeWidgetDashboardComponent, options);
 
+export const homePageHeader = getSyncLifecycle(homepageHeaderComponent, options);
+
 export function startupApp() {
   defineConfigSchema(moduleName, esmHomeSchema);
   // t('Home', 'Home');
diff --git a/packages/esm-home-app/src/routes.json b/packages/esm-home-app/src/routes.json
index c131cc1fc..c60ebbf5a 100644
--- a/packages/esm-home-app/src/routes.json
+++ b/packages/esm-home-app/src/routes.json
@@ -32,6 +32,13 @@
       "online": true,
       "offline": true
     },
+    {
+      "name": "home-page-header",
+      "slot": "home-dashboard-slot",
+      "component": "homePageHeader",
+      "online": true,
+      "offline": true
+    },
     {
       "name": "home-widget-dashboard",
       "slot": "home-dashboard-slot",
diff --git a/yarn.lock b/yarn.lock
index 266a749e4..f9db4d109 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1711,7 +1711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons-react@npm:^11.26.0":
+"@carbon/icons-react@npm:11.26.0, @carbon/icons-react@npm:^11.26.0":
   version: 11.26.0
   resolution: "@carbon/icons-react@npm:11.26.0"
   dependencies:
@@ -1738,7 +1738,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/react@npm:^1.37.0":
+"@carbon/react@npm:^1.37.0, @carbon/react@npm:~1.37.0":
   version: 1.37.0
   resolution: "@carbon/react@npm:1.37.0"
   dependencies:
@@ -3142,27 +3142,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-api@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-api@npm:5.2.1-pre.1156"
+"@openmrs/esm-api@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-api@npm:5.4.1-pre.1581"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
   peerDependencies:
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
+    "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: c59e1e7cdddf600d242f0cc44b6e84ddbd343ec84b6aa69d03259f5cce71efe3219fbb378c94a1410ebbf0b441b287739b1743ce735c2394bec2fdcf0be3c6d5
+  checksum: 5bae75d720cbc1a4da136ac0d7cd05b99227201720d044a11c12d22d25acbef96f5681cb65e6af0f8979397cbf3119474ac00c9781d79f77e60de3e00b838e9d
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-app-shell@npm:5.2.1-pre.1156"
+"@openmrs/esm-app-shell@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-app-shell@npm:5.4.1-pre.1581"
   dependencies:
-    "@carbon/react": "npm:^1.37.0"
-    "@openmrs/esm-framework": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-styleguide": "npm:5.2.1-pre.1156"
+    "@carbon/react": "npm:~1.37.0"
+    "@openmrs/esm-framework": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1581"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -3176,7 +3177,7 @@ __metadata:
     react-router-dom: "npm:^6.3.0"
     rxjs: "npm:^6.5.3"
     semver: "npm:^7.3.4"
-    single-spa: "npm:^5.9.2"
+    single-spa: "npm:^6.0.0"
     swc-loader: "npm:^0.2.3"
     swr: "npm:^2.2.2"
     systemjs: "npm:^6.8.3"
@@ -3187,55 +3188,44 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 5e10e1ddefcfd874c57cce106c36db7690bc52d02ef496095eba44b4b413578a2886832f4be9a008177415d2470fe457ab071f72c941f7cd0db7dc30b9dd78f9
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-breadcrumbs@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-breadcrumbs@npm:5.2.1-pre.1156"
-  dependencies:
-    path-to-regexp: "npm:6.1.0"
-  peerDependencies:
-    "@openmrs/esm-state": 5.x
-  checksum: 26a9ed07ff73be542a20dd31a8cb198bdac1908bbf997f63df5d81dacbb761f279ac29e52b8f20f56de5af60d96d8f79da576c39b2eeab990519c7650d231ca0
+  checksum: 2e1f8ac266256f16bb588cf04399c86be2c4a5230a8d6943a2e477210eb69a0e3d66c21d3f5918f3810869d2d1adcfe1e88782ad0851da719e5d2bec6a2f8e60
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-config@npm:5.2.1-pre.1156"
+"@openmrs/esm-config@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-config@npm:5.4.1-pre.1581"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 1578df5d53146d66b7e78981efc8fe4e75d62d39935eebd91db4fad3f00a61f28839b50ca44f6c937698ed1887d4b2f94831ec0f36c49b97ad6ae5dbf04cff52
+  checksum: 2f57c26907ac8fbff5d3ac20deedfa9a69c2fb3b6047c1db95849cd81f5a530d0ce607aa55f0378af46764c6c8b9abc2219df94b741605cba88d21995d1cd8ef
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.2.1-pre.1156"
+"@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1581"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 9778f56531ed07bfdd501bf4bd83a06229811b4cd23f9fc956eac96c75c129f61fac0edb346fb5eff5c636ec45169ed525f9d90949a6f518272f4b4da68f0939
+  checksum: eccc7b3ea89133e38a51ca90ddbe7ba7a82fe5e43ae074e722c916a0f5c950a4cebc5f06096d9c1cc83d5ae386d214810f7f2d65ae85e2a91933e67a8ea2f7a7
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-error-handling@npm:5.2.1-pre.1156"
+"@openmrs/esm-error-handling@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-error-handling@npm:5.4.1-pre.1581"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: afebbc441bacba68d9715d127e13b18300f2006c2f7d2e044b2e13bf431c5449da2b44ae17f1a3924d7dbdf2f248ae31d5e16c8800f296d060a276737df34f6c
+  checksum: 0812daa71471c708f824c23d11f187fd773a967ff53c6e12becd53405649f84362b058b558f5a9cacbc636513da257ff79fb561743b02290fe1b2ef92dc2b489
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-extensions@npm:5.2.1-pre.1156"
+"@openmrs/esm-extensions@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-extensions@npm:5.4.1-pre.1581"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -3244,40 +3234,41 @@ __metadata:
     "@openmrs/esm-feature-flags": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: f623672b92918a69a8d47c1d287167d81d1b36ce0456c60f33a670d281dc67d20bd47187283a89581201f2743e11975ae9b0003569763a20715ba70baf9d9ec8
+  checksum: 9a8a9210b577a38910a8e4c05ec1504afeaf75785988600da4dda372c8b33c6d80ae916eb2c42b1ab6a06cc6ea6539733b7e7f0b19f30b5c2d5e9dba9e0b7255
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-feature-flags@npm:5.2.1-pre.1156"
+"@openmrs/esm-feature-flags@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-feature-flags@npm:5.4.1-pre.1581"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: ee3ab530cb86c7b754b3e74d30c3b52a60a7a684bf31a76c167a4b9bb9c7147a93e345ecc0956a285c49d368523fcbd125a287d5c75a995065fb665d065947f3
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-framework@npm:5.2.1-pre.1156, @openmrs/esm-framework@npm:next":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-framework@npm:5.2.1-pre.1156"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-breadcrumbs": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-config": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-dynamic-loading": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-error-handling": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-extensions": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-feature-flags": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-globals": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-offline": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-react-utils": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-state": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-styleguide": "npm:5.2.1-pre.1156"
-    "@openmrs/esm-utils": "npm:5.2.1-pre.1156"
+  checksum: 3554f0685a41430dbceadde30a212b586031e6b270e5a1d2921f70d44aa68c05fc6a1ab170b0c1c4d5b0fde97bf6c15ca9169db487e65aee16ce2a03ad54dc47
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-framework@npm:5.4.1-pre.1581, @openmrs/esm-framework@npm:^5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-framework@npm:5.4.1-pre.1581"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-config": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-dynamic-loading": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-error-handling": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-extensions": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-feature-flags": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-globals": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-navigation": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-offline": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-react-utils": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-routes": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-state": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-utils": "npm:5.4.1-pre.1581"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -3288,16 +3279,16 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 33541cdee2bcfd016cf74f25e745463fbc25e6a6c5aa3af58018e4f108320c64d26eab4c3823adb21ab3acc032c43c9ad85b7a2adfa726f21675f0de36402b42
+  checksum: 4e5c63319db6ae233a810b76888882cbced0297ea46a3deaabcf232d99a807b2fc7f16e996fab6f339ee54cd9391f041f3d5d037b63604dc6c1ffd14e9c9f651
   languageName: node
   linkType: hard
 
-"@openmrs/esm-globals@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-globals@npm:5.2.1-pre.1156"
+"@openmrs/esm-globals@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-globals@npm:5.4.1-pre.1581"
   peerDependencies:
     single-spa: 5.x
-  checksum: 9a5347f1e5a00e3e50a76c1154caf1f8ccb510cc51b940f492482d86558eb8499f9a93ea76211d2b19c9c1b17071e808d60338684bdbc0845e43d95a436cf172
+  checksum: e3b52fbf52ef8f2add7c2c1a141363a1dfd271a1f48bcfb5955a7cf6bc8190b433bb8f4576ab83c91b7ff8a90951d2fc7cf98f017fd6ed8a744999e54314eb48
   languageName: node
   linkType: hard
 
@@ -3319,7 +3310,7 @@ __metadata:
   dependencies:
     "@babel/core": "npm:^7.22.17"
     "@carbon/react": "npm:^1.37.0"
-    "@openmrs/esm-framework": "npm:next"
+    "@openmrs/esm-framework": "npm:^5.4.1-pre.1581"
     "@swc/cli": "npm:^0.1.62"
     "@swc/core": "npm:^1.3.84"
     "@swc/jest": "npm:^0.2.29"
@@ -3348,7 +3339,7 @@ __metadata:
     jest-cli: "npm:^29.7.0"
     jest-environment-jsdom: "npm:^29.7.0"
     lint-staged: "npm:^14.0.1"
-    openmrs: "npm:next"
+    openmrs: "npm:^5.4.1-pre.1581"
     prettier: "npm:^3.0.3"
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
@@ -3364,9 +3355,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-offline@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-offline@npm:5.2.1-pre.1156"
+"@openmrs/esm-navigation@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-navigation@npm:5.4.1-pre.1581"
+  dependencies:
+    path-to-regexp: "npm:6.1.0"
+  peerDependencies:
+    "@openmrs/esm-state": 5.x
+  checksum: 3480815505917ef732b728df4fe8bccee723488dbb6cd4c74555a6f4e01641fea50c49b71cd554a662ca7a28f44c91298860333974db664419620a7be7facfda
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-offline@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-offline@npm:5.4.1-pre.1581"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -3378,22 +3380,23 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-styleguide": 5.x
     rxjs: 6.x
-  checksum: 773d1727e0d5ea3c5c4d278ca5e11569224f1b4da9d9818343fb037001ccea0d8a62d12947d9079774256bf3dc58abeb0b225ba858921bce71224d2d6a5e241c
+  checksum: 5496afe10561ad7440cc9e1ecaf676ef33872e9234d6e416c6d462d13b51f2cadf8677678fd8d4c6a2d73e4fee25493b9f0b9c23e0762cd1b5c4ae4445d68683
   languageName: node
   linkType: hard
 
-"@openmrs/esm-react-utils@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-react-utils@npm:5.2.1-pre.1156"
+"@openmrs/esm-react-utils@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-react-utils@npm:5.4.1-pre.1581"
   dependencies:
     lodash-es: "npm:^4.17.21"
-    single-spa-react: "npm:~5.0.0"
+    single-spa-react: "npm:^6.0.0"
   peerDependencies:
     "@openmrs/esm-api": 5.x
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-extensions": 5.x
     "@openmrs/esm-globals": 5.x
+    "@openmrs/esm-navigation": 5.x
     dayjs: 1.x
     i18next: 19.x
     react: 18.x
@@ -3401,27 +3404,37 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: 33f5d950e9236ab0ecde6fd74ec918db03c20db84160925ac4407c5d68251c00af80fbe88045a7e30315fb8fec8aad8756e19a8576b933bd820bccbb73ce5d0a
+  checksum: ed3ef88e35dd35060c29ac4a966ca6e2691adc363d00752873b6333105049eb00153b3f7994c4a4fe8e3d14c8c0f84f4594d3747a52a9224cd980b6ee24e69ba
   languageName: node
   linkType: hard
 
-"@openmrs/esm-state@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-state@npm:5.2.1-pre.1156"
+"@openmrs/esm-routes@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-routes@npm:5.4.1-pre.1581"
+  peerDependencies:
+    "@openmrs/esm-globals": 5.x
+    "@openmrs/esm-utils": 5.x
+  checksum: e10752810c38d016d59a2f78073785077322dc6a520a1d8044302aa2ecd4c9b57d3ac2ae6d7c8f3e6023e4003acb038b875e7cc2529a6a32d882c72752d777e3
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-state@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-state@npm:5.4.1-pre.1581"
   dependencies:
     zustand: "npm:^4.3.6"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 5098e60c78f8d11c981733076d04e0182c0aa90007e63cc885e253da0908cdbb78620e7472b1200b6810f0748b80085e951cc9214ffaaed32d6733f344e1de6e
+  checksum: da55e9387f3cd0a079ae98a6e69a5e15246341fc7a3fff2d5c5a24c0b84aa532f1493a86c60db5e8a54985461f339a6a3efd083159d6e298c5473b700aa6e364
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-styleguide@npm:5.2.1-pre.1156"
+"@openmrs/esm-styleguide@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-styleguide@npm:5.4.1-pre.1581"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
-    "@carbon/react": "npm:^1.37.0"
+    "@carbon/react": "npm:~1.37.0"
     "@internationalized/date": "npm:^3.5.0"
     "@react-spectrum/datepicker": "npm:^3.8.0"
     "@react-spectrum/provider": "npm:^3.9.0"
@@ -3430,31 +3443,33 @@ __metadata:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
     "@openmrs/esm-extensions": 5.x
+    "@openmrs/esm-framework": 5.x
     "@openmrs/esm-react-utils": 5.x
     "@openmrs/esm-state": 5.x
+    dayjs: 1.x
     react: 18.x
     react-dom: 18.x
     rxjs: 6.x
-  checksum: 67f55f0789455562f34d70f3732a354ee1a60596193f8428c799aced29e751d6939e3475260d61d2924a4aa6a537031ff7914227b10a1fcd1b068a03764b7434
+  checksum: 44b0c1f6c36618f1b5aa42f67de633e7338e1f3ed4c176f7c65a6a6f525492384d0ea3333fca9afb2c32e4c8e3830fc0c559b10d7cc42a8c3446415e5a42c102
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/esm-utils@npm:5.2.1-pre.1156"
+"@openmrs/esm-utils@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/esm-utils@npm:5.4.1-pre.1581"
   dependencies:
     semver: "npm:7.3.2"
   peerDependencies:
     dayjs: 1.x
     i18next: 19.x
     rxjs: 6.x
-  checksum: 419efd53200c5ab904b06bf47fc64cb591eed7e4309a97431d63a29fac10bb769e18f966902d833bb08c5f703ddb6fe1e919b5c6c6d1f89d1276d1a7f160cbc4
+  checksum: dba93c8da41e7ba7f06bd59f82e886d753de1137aebda0507c9a53b7b33ea151ada04660400cf5b8b3012b01ba26f696358a837293b8f8dc5e621b07fcc4f09b
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.2.1-pre.1156":
-  version: 5.2.1-pre.1156
-  resolution: "@openmrs/webpack-config@npm:5.2.1-pre.1156"
+"@openmrs/webpack-config@npm:5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "@openmrs/webpack-config@npm:5.4.1-pre.1581"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -3471,7 +3486,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 2e9ae0ebc57635dc95a80ad37a7612bd8eed03335d41c1f408833560a965854bc21c1246578fb0c20a8309259b6ba958637436ff6e90a5404b2919cf7cdc89cd
+  checksum: 66ccc4b72a48de57b758ed0172c3f13ed4ea326cdde2a504f14047afc7ba78c6730bb36b1a38afc0bf86854c4165ecce2a97d5b451535158f2a0de53e6b48964
   languageName: node
   linkType: hard
 
@@ -13308,6 +13323,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-watch@npm:^0.7.4":
+  version: 0.7.4
+  resolution: "node-watch@npm:0.7.4"
+  checksum: ea752dd5cd0aa1344ced1002409c8a81829cc5406fd949f34e8886786f2015651d2da9c3d3d4f164d23b9e84c7062ff97051746fe77db18955ffb23dc3dc0b76
+  languageName: node
+  linkType: hard
+
 "nopt@npm:^5.0.0":
   version: 5.0.0
   resolution: "nopt@npm:5.0.0"
@@ -13642,17 +13664,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openmrs@npm:next":
-  version: 5.2.1-pre.1156
-  resolution: "openmrs@npm:5.2.1-pre.1156"
+"openmrs@npm:^5.4.1-pre.1581":
+  version: 5.4.1-pre.1581
+  resolution: "openmrs@npm:5.4.1-pre.1581"
   dependencies:
-    "@openmrs/esm-app-shell": "npm:5.2.1-pre.1156"
-    "@openmrs/webpack-config": "npm:5.2.1-pre.1156"
+    "@carbon/icons-react": "npm:11.26.0"
+    "@openmrs/esm-app-shell": "npm:5.4.1-pre.1581"
+    "@openmrs/webpack-config": "npm:5.4.1-pre.1581"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.2"
     axios: "npm:^0.21.1"
     browserslist-config-openmrs: "npm:^1.0.1"
+    chalk: "npm:^4.1.2"
     copy-webpack-plugin: "npm:^11.0.0"
     cssnano: "npm:^5.0.16"
     ejs: "npm:^3.1.8"
@@ -13660,6 +13684,7 @@ __metadata:
     html-webpack-plugin: "npm:^5.5.0"
     inquirer: "npm:^7.3.3"
     mini-css-extract-plugin: "npm:^2.4.5"
+    node-watch: "npm:^0.7.4"
     npm-registry-fetch: "npm:^14.0.3"
     pacote: "npm:^15.0.0"
     postcss: "npm:^8.4.6"
@@ -13676,7 +13701,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 7de397c768c0eb54b154ac08a49517097c3ada806bb287708896a2e9503ff515c48d2ebe049507024173a548677abe7199fa8042e1f5dec478ea57821d4b9abe
+  checksum: 4584cf1300dcfd399512e193e708dc1526516c464c33b5a937887ddef913d0158b2d4ceb4c32d1ede9a16605ed14694247b32aab8dfa26f024c038f7fb89db48
   languageName: node
   linkType: hard
 
@@ -15990,9 +16015,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"single-spa-react@npm:~5.0.0":
-  version: 5.0.2
-  resolution: "single-spa-react@npm:5.0.2"
+"single-spa-react@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "single-spa-react@npm:6.0.1"
   dependencies:
     browserslist-config-single-spa: "npm:^1.0.1"
   peerDependencies:
@@ -16004,14 +16029,14 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 142f04ffde1cbede0c3b81abe0439b1a87d0a031efa6a4f8c4ae61ffbefe0e9368e32944a63b96e7cd83d2b09ac102278d256fbf4272cf01ad438fdef2295c50
+  checksum: 5c75581a0925f031248c184f09dd90200e7518a78642f050ddcc52ff1c59bfb84752a15dd4642511b5388061bf2c594872faeac3469e1f80e2d2c48f013ded8f
   languageName: node
   linkType: hard
 
-"single-spa@npm:^5.9.2":
-  version: 5.9.4
-  resolution: "single-spa@npm:5.9.4"
-  checksum: 7b89384063885d3f25bce45996e29928fce9e36ad39bf1189d59b601796bbfe086b40e82d1843a38507c0d9f91f3710a7ddd1f81bf23ec4f24649b2e1ec4f98b
+"single-spa@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "single-spa@npm:6.0.1"
+  checksum: 6c192226c0c6d94dbb0d2576c6552ebb9ec01ecad69d069cac47ddd5aa3c2c90e1370765e2d0e36203120a2c48bb7e967e2d6d8a6f9ede4315fd4b9e11cd9e85
   languageName: node
   linkType: hard
 

From 23104a2e04dc2cb205840d1a4f5eb047d99bb50f Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:47:02 +0300
Subject: [PATCH 05/22] loaded header via extension

---
 .../home-page-widgets/home-page-widgets.component.tsx | 11 +----------
 packages/esm-home-app/src/index.ts                    |  3 +++
 packages/esm-home-app/src/routes.json                 |  7 +++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
index a46002886..9c9e5511a 100644
--- a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
+++ b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
@@ -1,20 +1,11 @@
 import { ExtensionSlot } from '@openmrs/esm-framework';
 import React from 'react';
 import styles from './home-page-widgets.scss';
-import HomepageHeader from '../homepage-header/homepage-header.component';
-import { useTranslation } from 'react-i18next';
 
 interface HomePageWidgetsProps {}
 
 const HomePageWidgets: React.FC<HomePageWidgetsProps> = () => {
-  const { t } = useTranslation();
-
-  return (
-    <React.Fragment>
-      <HomepageHeader title={t('home', 'Home')} />
-      <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />
-    </React.Fragment>
-  );
+  return <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />;
 };
 
 export default HomePageWidgets;
diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts
index 3b79dc733..3c96cb2c7 100644
--- a/packages/esm-home-app/src/index.ts
+++ b/packages/esm-home-app/src/index.ts
@@ -5,6 +5,7 @@ import { esmHomeSchema } from './openmrs-esm-home-schema';
 import rootComponent from './root.component';
 import homeNavMenuComponent from './side-menu/side-menu.component';
 import homeWidgetDashboardComponent from './home-page-widgets/home-page-widgets.component';
+import homepageHeaderComponent from './homepage-header/homepage-header.component';
 
 const moduleName = '@openmrs/esm-home-app';
 const pageName = 'home';
@@ -24,6 +25,8 @@ export const homeWidgetDbLink = getSyncLifecycle(createDashboardLink(dashboardMe
 
 export const homeWidgetDashboard = getSyncLifecycle(homeWidgetDashboardComponent, options);
 
+export const homePageHeader = getSyncLifecycle(homepageHeaderComponent, options);
+
 export function startupApp() {
   defineConfigSchema(moduleName, esmHomeSchema);
   // t('Home', 'Home');
diff --git a/packages/esm-home-app/src/routes.json b/packages/esm-home-app/src/routes.json
index c131cc1fc..c60ebbf5a 100644
--- a/packages/esm-home-app/src/routes.json
+++ b/packages/esm-home-app/src/routes.json
@@ -32,6 +32,13 @@
       "online": true,
       "offline": true
     },
+    {
+      "name": "home-page-header",
+      "slot": "home-dashboard-slot",
+      "component": "homePageHeader",
+      "online": true,
+      "offline": true
+    },
     {
       "name": "home-widget-dashboard",
       "slot": "home-dashboard-slot",

From e29cac04ff10ee99ac4c1465a9157450281b4114 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:01:50 +0300
Subject: [PATCH 06/22] remove tertiary files

---
 .../home-page-widgets/home-page-widgets.component.tsx | 11 +----------
 packages/esm-home-app/src/index.ts                    |  3 +++
 packages/esm-home-app/src/routes.json                 |  7 +++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
index a46002886..9c9e5511a 100644
--- a/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
+++ b/packages/esm-home-app/src/home-page-widgets/home-page-widgets.component.tsx
@@ -1,20 +1,11 @@
 import { ExtensionSlot } from '@openmrs/esm-framework';
 import React from 'react';
 import styles from './home-page-widgets.scss';
-import HomepageHeader from '../homepage-header/homepage-header.component';
-import { useTranslation } from 'react-i18next';
 
 interface HomePageWidgetsProps {}
 
 const HomePageWidgets: React.FC<HomePageWidgetsProps> = () => {
-  const { t } = useTranslation();
-
-  return (
-    <React.Fragment>
-      <HomepageHeader title={t('home', 'Home')} />
-      <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />
-    </React.Fragment>
-  );
+  return <ExtensionSlot className={styles.homePageWidget} name="homepage-widgets-slot" />;
 };
 
 export default HomePageWidgets;
diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts
index 3b79dc733..3c96cb2c7 100644
--- a/packages/esm-home-app/src/index.ts
+++ b/packages/esm-home-app/src/index.ts
@@ -5,6 +5,7 @@ import { esmHomeSchema } from './openmrs-esm-home-schema';
 import rootComponent from './root.component';
 import homeNavMenuComponent from './side-menu/side-menu.component';
 import homeWidgetDashboardComponent from './home-page-widgets/home-page-widgets.component';
+import homepageHeaderComponent from './homepage-header/homepage-header.component';
 
 const moduleName = '@openmrs/esm-home-app';
 const pageName = 'home';
@@ -24,6 +25,8 @@ export const homeWidgetDbLink = getSyncLifecycle(createDashboardLink(dashboardMe
 
 export const homeWidgetDashboard = getSyncLifecycle(homeWidgetDashboardComponent, options);
 
+export const homePageHeader = getSyncLifecycle(homepageHeaderComponent, options);
+
 export function startupApp() {
   defineConfigSchema(moduleName, esmHomeSchema);
   // t('Home', 'Home');
diff --git a/packages/esm-home-app/src/routes.json b/packages/esm-home-app/src/routes.json
index c131cc1fc..c60ebbf5a 100644
--- a/packages/esm-home-app/src/routes.json
+++ b/packages/esm-home-app/src/routes.json
@@ -32,6 +32,13 @@
       "online": true,
       "offline": true
     },
+    {
+      "name": "home-page-header",
+      "slot": "home-dashboard-slot",
+      "component": "homePageHeader",
+      "online": true,
+      "offline": true
+    },
     {
       "name": "home-widget-dashboard",
       "slot": "home-dashboard-slot",

From 301f1882c19a2055826f0ab5ae80ae57a4bfcbf6 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 29 Feb 2024 08:39:23 +0300
Subject: [PATCH 07/22] removed tertiary files commited

---
 package.json |   4 +-
 yarn.lock    | 251 +++++++++++++++++++++++----------------------------
 2 files changed, 115 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index b1538e330..b6c1741b2 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.17",
     "@carbon/react": "^1.37.0",
-    "@openmrs/esm-framework": "^5.4.1-pre.1581",
+    "@openmrs/esm-framework": "next",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.84",
     "@swc/jest": "^0.2.29",
@@ -48,7 +48,7 @@
     "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^14.0.1",
-    "openmrs": "^5.4.1-pre.1581",
+    "openmrs": "next",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/yarn.lock b/yarn.lock
index f9db4d109..a6748d18a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1711,7 +1711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons-react@npm:11.26.0, @carbon/icons-react@npm:^11.26.0":
+"@carbon/icons-react@npm:^11.26.0":
   version: 11.26.0
   resolution: "@carbon/icons-react@npm:11.26.0"
   dependencies:
@@ -1738,7 +1738,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/react@npm:^1.37.0, @carbon/react@npm:~1.37.0":
+"@carbon/react@npm:^1.37.0":
   version: 1.37.0
   resolution: "@carbon/react@npm:1.37.0"
   dependencies:
@@ -3142,28 +3142,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-api@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-api@npm:5.4.1-pre.1581"
+"@openmrs/esm-api@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-api@npm:5.2.1-pre.1156"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
   peerDependencies:
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
-    "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 5bae75d720cbc1a4da136ac0d7cd05b99227201720d044a11c12d22d25acbef96f5681cb65e6af0f8979397cbf3119474ac00c9781d79f77e60de3e00b838e9d
+  checksum: c59e1e7cdddf600d242f0cc44b6e84ddbd343ec84b6aa69d03259f5cce71efe3219fbb378c94a1410ebbf0b441b287739b1743ce735c2394bec2fdcf0be3c6d5
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-app-shell@npm:5.4.1-pre.1581"
+"@openmrs/esm-app-shell@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-app-shell@npm:5.2.1-pre.1156"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1581"
+    "@carbon/react": "npm:^1.37.0"
+    "@openmrs/esm-framework": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-styleguide": "npm:5.2.1-pre.1156"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -3177,7 +3176,7 @@ __metadata:
     react-router-dom: "npm:^6.3.0"
     rxjs: "npm:^6.5.3"
     semver: "npm:^7.3.4"
-    single-spa: "npm:^6.0.0"
+    single-spa: "npm:^5.9.2"
     swc-loader: "npm:^0.2.3"
     swr: "npm:^2.2.2"
     systemjs: "npm:^6.8.3"
@@ -3188,44 +3187,55 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 2e1f8ac266256f16bb588cf04399c86be2c4a5230a8d6943a2e477210eb69a0e3d66c21d3f5918f3810869d2d1adcfe1e88782ad0851da719e5d2bec6a2f8e60
+  checksum: 5e10e1ddefcfd874c57cce106c36db7690bc52d02ef496095eba44b4b413578a2886832f4be9a008177415d2470fe457ab071f72c941f7cd0db7dc30b9dd78f9
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-breadcrumbs@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-breadcrumbs@npm:5.2.1-pre.1156"
+  dependencies:
+    path-to-regexp: "npm:6.1.0"
+  peerDependencies:
+    "@openmrs/esm-state": 5.x
+  checksum: 26a9ed07ff73be542a20dd31a8cb198bdac1908bbf997f63df5d81dacbb761f279ac29e52b8f20f56de5af60d96d8f79da576c39b2eeab990519c7650d231ca0
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-config@npm:5.4.1-pre.1581"
+"@openmrs/esm-config@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-config@npm:5.2.1-pre.1156"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 2f57c26907ac8fbff5d3ac20deedfa9a69c2fb3b6047c1db95849cd81f5a530d0ce607aa55f0378af46764c6c8b9abc2219df94b741605cba88d21995d1cd8ef
+  checksum: 1578df5d53146d66b7e78981efc8fe4e75d62d39935eebd91db4fad3f00a61f28839b50ca44f6c937698ed1887d4b2f94831ec0f36c49b97ad6ae5dbf04cff52
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1581"
+"@openmrs/esm-dynamic-loading@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.2.1-pre.1156"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: eccc7b3ea89133e38a51ca90ddbe7ba7a82fe5e43ae074e722c916a0f5c950a4cebc5f06096d9c1cc83d5ae386d214810f7f2d65ae85e2a91933e67a8ea2f7a7
+  checksum: 9778f56531ed07bfdd501bf4bd83a06229811b4cd23f9fc956eac96c75c129f61fac0edb346fb5eff5c636ec45169ed525f9d90949a6f518272f4b4da68f0939
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-error-handling@npm:5.4.1-pre.1581"
+"@openmrs/esm-error-handling@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-error-handling@npm:5.2.1-pre.1156"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 0812daa71471c708f824c23d11f187fd773a967ff53c6e12becd53405649f84362b058b558f5a9cacbc636513da257ff79fb561743b02290fe1b2ef92dc2b489
+  checksum: afebbc441bacba68d9715d127e13b18300f2006c2f7d2e044b2e13bf431c5449da2b44ae17f1a3924d7dbdf2f248ae31d5e16c8800f296d060a276737df34f6c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-extensions@npm:5.4.1-pre.1581"
+"@openmrs/esm-extensions@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-extensions@npm:5.2.1-pre.1156"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -3234,41 +3244,40 @@ __metadata:
     "@openmrs/esm-feature-flags": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 9a8a9210b577a38910a8e4c05ec1504afeaf75785988600da4dda372c8b33c6d80ae916eb2c42b1ab6a06cc6ea6539733b7e7f0b19f30b5c2d5e9dba9e0b7255
+  checksum: f623672b92918a69a8d47c1d287167d81d1b36ce0456c60f33a670d281dc67d20bd47187283a89581201f2743e11975ae9b0003569763a20715ba70baf9d9ec8
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-feature-flags@npm:5.4.1-pre.1581"
+"@openmrs/esm-feature-flags@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-feature-flags@npm:5.2.1-pre.1156"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 3554f0685a41430dbceadde30a212b586031e6b270e5a1d2921f70d44aa68c05fc6a1ab170b0c1c4d5b0fde97bf6c15ca9169db487e65aee16ce2a03ad54dc47
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-framework@npm:5.4.1-pre.1581, @openmrs/esm-framework@npm:^5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-framework@npm:5.4.1-pre.1581"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-config": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-dynamic-loading": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-error-handling": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-extensions": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-feature-flags": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-globals": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-navigation": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-offline": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-react-utils": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-routes": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-state": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-utils": "npm:5.4.1-pre.1581"
+  checksum: ee3ab530cb86c7b754b3e74d30c3b52a60a7a684bf31a76c167a4b9bb9c7147a93e345ecc0956a285c49d368523fcbd125a287d5c75a995065fb665d065947f3
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-framework@npm:5.2.1-pre.1156, @openmrs/esm-framework@npm:next":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-framework@npm:5.2.1-pre.1156"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-breadcrumbs": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-config": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-dynamic-loading": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-error-handling": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-extensions": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-feature-flags": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-globals": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-offline": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-react-utils": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-state": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-styleguide": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-utils": "npm:5.2.1-pre.1156"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -3279,16 +3288,16 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 4e5c63319db6ae233a810b76888882cbced0297ea46a3deaabcf232d99a807b2fc7f16e996fab6f339ee54cd9391f041f3d5d037b63604dc6c1ffd14e9c9f651
+  checksum: 33541cdee2bcfd016cf74f25e745463fbc25e6a6c5aa3af58018e4f108320c64d26eab4c3823adb21ab3acc032c43c9ad85b7a2adfa726f21675f0de36402b42
   languageName: node
   linkType: hard
 
-"@openmrs/esm-globals@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-globals@npm:5.4.1-pre.1581"
+"@openmrs/esm-globals@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-globals@npm:5.2.1-pre.1156"
   peerDependencies:
     single-spa: 5.x
-  checksum: e3b52fbf52ef8f2add7c2c1a141363a1dfd271a1f48bcfb5955a7cf6bc8190b433bb8f4576ab83c91b7ff8a90951d2fc7cf98f017fd6ed8a744999e54314eb48
+  checksum: 9a5347f1e5a00e3e50a76c1154caf1f8ccb510cc51b940f492482d86558eb8499f9a93ea76211d2b19c9c1b17071e808d60338684bdbc0845e43d95a436cf172
   languageName: node
   linkType: hard
 
@@ -3296,7 +3305,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-home-app@workspace:packages/esm-home-app"
   peerDependencies:
-    "@openmrs/esm-framework": 4.x
+    "@openmrs/esm-framework": 5.x
     react: 18.x
     react-i18next: 11.x
     react-router-dom: 6.x
@@ -3310,7 +3319,7 @@ __metadata:
   dependencies:
     "@babel/core": "npm:^7.22.17"
     "@carbon/react": "npm:^1.37.0"
-    "@openmrs/esm-framework": "npm:^5.4.1-pre.1581"
+    "@openmrs/esm-framework": "npm:next"
     "@swc/cli": "npm:^0.1.62"
     "@swc/core": "npm:^1.3.84"
     "@swc/jest": "npm:^0.2.29"
@@ -3339,7 +3348,7 @@ __metadata:
     jest-cli: "npm:^29.7.0"
     jest-environment-jsdom: "npm:^29.7.0"
     lint-staged: "npm:^14.0.1"
-    openmrs: "npm:^5.4.1-pre.1581"
+    openmrs: "npm:next"
     prettier: "npm:^3.0.3"
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
@@ -3355,20 +3364,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-navigation@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-navigation@npm:5.4.1-pre.1581"
-  dependencies:
-    path-to-regexp: "npm:6.1.0"
-  peerDependencies:
-    "@openmrs/esm-state": 5.x
-  checksum: 3480815505917ef732b728df4fe8bccee723488dbb6cd4c74555a6f4e01641fea50c49b71cd554a662ca7a28f44c91298860333974db664419620a7be7facfda
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-offline@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-offline@npm:5.4.1-pre.1581"
+"@openmrs/esm-offline@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-offline@npm:5.2.1-pre.1156"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -3380,23 +3378,22 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-styleguide": 5.x
     rxjs: 6.x
-  checksum: 5496afe10561ad7440cc9e1ecaf676ef33872e9234d6e416c6d462d13b51f2cadf8677678fd8d4c6a2d73e4fee25493b9f0b9c23e0762cd1b5c4ae4445d68683
+  checksum: 773d1727e0d5ea3c5c4d278ca5e11569224f1b4da9d9818343fb037001ccea0d8a62d12947d9079774256bf3dc58abeb0b225ba858921bce71224d2d6a5e241c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-react-utils@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-react-utils@npm:5.4.1-pre.1581"
+"@openmrs/esm-react-utils@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-react-utils@npm:5.2.1-pre.1156"
   dependencies:
     lodash-es: "npm:^4.17.21"
-    single-spa-react: "npm:^6.0.0"
+    single-spa-react: "npm:~5.0.0"
   peerDependencies:
     "@openmrs/esm-api": 5.x
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-extensions": 5.x
     "@openmrs/esm-globals": 5.x
-    "@openmrs/esm-navigation": 5.x
     dayjs: 1.x
     i18next: 19.x
     react: 18.x
@@ -3404,37 +3401,27 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: ed3ef88e35dd35060c29ac4a966ca6e2691adc363d00752873b6333105049eb00153b3f7994c4a4fe8e3d14c8c0f84f4594d3747a52a9224cd980b6ee24e69ba
+  checksum: 33f5d950e9236ab0ecde6fd74ec918db03c20db84160925ac4407c5d68251c00af80fbe88045a7e30315fb8fec8aad8756e19a8576b933bd820bccbb73ce5d0a
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-routes@npm:5.4.1-pre.1581"
-  peerDependencies:
-    "@openmrs/esm-globals": 5.x
-    "@openmrs/esm-utils": 5.x
-  checksum: e10752810c38d016d59a2f78073785077322dc6a520a1d8044302aa2ecd4c9b57d3ac2ae6d7c8f3e6023e4003acb038b875e7cc2529a6a32d882c72752d777e3
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-state@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-state@npm:5.4.1-pre.1581"
+"@openmrs/esm-state@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-state@npm:5.2.1-pre.1156"
   dependencies:
     zustand: "npm:^4.3.6"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: da55e9387f3cd0a079ae98a6e69a5e15246341fc7a3fff2d5c5a24c0b84aa532f1493a86c60db5e8a54985461f339a6a3efd083159d6e298c5473b700aa6e364
+  checksum: 5098e60c78f8d11c981733076d04e0182c0aa90007e63cc885e253da0908cdbb78620e7472b1200b6810f0748b80085e951cc9214ffaaed32d6733f344e1de6e
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-styleguide@npm:5.4.1-pre.1581"
+"@openmrs/esm-styleguide@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-styleguide@npm:5.2.1-pre.1156"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.37.0"
     "@internationalized/date": "npm:^3.5.0"
     "@react-spectrum/datepicker": "npm:^3.8.0"
     "@react-spectrum/provider": "npm:^3.9.0"
@@ -3443,33 +3430,31 @@ __metadata:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
     "@openmrs/esm-extensions": 5.x
-    "@openmrs/esm-framework": 5.x
     "@openmrs/esm-react-utils": 5.x
     "@openmrs/esm-state": 5.x
-    dayjs: 1.x
     react: 18.x
     react-dom: 18.x
     rxjs: 6.x
-  checksum: 44b0c1f6c36618f1b5aa42f67de633e7338e1f3ed4c176f7c65a6a6f525492384d0ea3333fca9afb2c32e4c8e3830fc0c559b10d7cc42a8c3446415e5a42c102
+  checksum: 67f55f0789455562f34d70f3732a354ee1a60596193f8428c799aced29e751d6939e3475260d61d2924a4aa6a537031ff7914227b10a1fcd1b068a03764b7434
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-utils@npm:5.4.1-pre.1581"
+"@openmrs/esm-utils@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-utils@npm:5.2.1-pre.1156"
   dependencies:
     semver: "npm:7.3.2"
   peerDependencies:
     dayjs: 1.x
     i18next: 19.x
     rxjs: 6.x
-  checksum: dba93c8da41e7ba7f06bd59f82e886d753de1137aebda0507c9a53b7b33ea151ada04660400cf5b8b3012b01ba26f696358a837293b8f8dc5e621b07fcc4f09b
+  checksum: 419efd53200c5ab904b06bf47fc64cb591eed7e4309a97431d63a29fac10bb769e18f966902d833bb08c5f703ddb6fe1e919b5c6c6d1f89d1276d1a7f160cbc4
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/webpack-config@npm:5.4.1-pre.1581"
+"@openmrs/webpack-config@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/webpack-config@npm:5.2.1-pre.1156"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -3486,7 +3471,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 66ccc4b72a48de57b758ed0172c3f13ed4ea326cdde2a504f14047afc7ba78c6730bb36b1a38afc0bf86854c4165ecce2a97d5b451535158f2a0de53e6b48964
+  checksum: 2e9ae0ebc57635dc95a80ad37a7612bd8eed03335d41c1f408833560a965854bc21c1246578fb0c20a8309259b6ba958637436ff6e90a5404b2919cf7cdc89cd
   languageName: node
   linkType: hard
 
@@ -13323,13 +13308,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-watch@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "node-watch@npm:0.7.4"
-  checksum: ea752dd5cd0aa1344ced1002409c8a81829cc5406fd949f34e8886786f2015651d2da9c3d3d4f164d23b9e84c7062ff97051746fe77db18955ffb23dc3dc0b76
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^5.0.0":
   version: 5.0.0
   resolution: "nopt@npm:5.0.0"
@@ -13664,19 +13642,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openmrs@npm:^5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "openmrs@npm:5.4.1-pre.1581"
+"openmrs@npm:next":
+  version: 5.2.1-pre.1156
+  resolution: "openmrs@npm:5.2.1-pre.1156"
   dependencies:
-    "@carbon/icons-react": "npm:11.26.0"
-    "@openmrs/esm-app-shell": "npm:5.4.1-pre.1581"
-    "@openmrs/webpack-config": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-app-shell": "npm:5.2.1-pre.1156"
+    "@openmrs/webpack-config": "npm:5.2.1-pre.1156"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.2"
     axios: "npm:^0.21.1"
     browserslist-config-openmrs: "npm:^1.0.1"
-    chalk: "npm:^4.1.2"
     copy-webpack-plugin: "npm:^11.0.0"
     cssnano: "npm:^5.0.16"
     ejs: "npm:^3.1.8"
@@ -13684,7 +13660,6 @@ __metadata:
     html-webpack-plugin: "npm:^5.5.0"
     inquirer: "npm:^7.3.3"
     mini-css-extract-plugin: "npm:^2.4.5"
-    node-watch: "npm:^0.7.4"
     npm-registry-fetch: "npm:^14.0.3"
     pacote: "npm:^15.0.0"
     postcss: "npm:^8.4.6"
@@ -13701,7 +13676,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 4584cf1300dcfd399512e193e708dc1526516c464c33b5a937887ddef913d0158b2d4ceb4c32d1ede9a16605ed14694247b32aab8dfa26f024c038f7fb89db48
+  checksum: 7de397c768c0eb54b154ac08a49517097c3ada806bb287708896a2e9503ff515c48d2ebe049507024173a548677abe7199fa8042e1f5dec478ea57821d4b9abe
   languageName: node
   linkType: hard
 
@@ -16015,9 +15990,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"single-spa-react@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "single-spa-react@npm:6.0.1"
+"single-spa-react@npm:~5.0.0":
+  version: 5.0.2
+  resolution: "single-spa-react@npm:5.0.2"
   dependencies:
     browserslist-config-single-spa: "npm:^1.0.1"
   peerDependencies:
@@ -16029,14 +16004,14 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 5c75581a0925f031248c184f09dd90200e7518a78642f050ddcc52ff1c59bfb84752a15dd4642511b5388061bf2c594872faeac3469e1f80e2d2c48f013ded8f
+  checksum: 142f04ffde1cbede0c3b81abe0439b1a87d0a031efa6a4f8c4ae61ffbefe0e9368e32944a63b96e7cd83d2b09ac102278d256fbf4272cf01ad438fdef2295c50
   languageName: node
   linkType: hard
 
-"single-spa@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "single-spa@npm:6.0.1"
-  checksum: 6c192226c0c6d94dbb0d2576c6552ebb9ec01ecad69d069cac47ddd5aa3c2c90e1370765e2d0e36203120a2c48bb7e967e2d6d8a6f9ede4315fd4b9e11cd9e85
+"single-spa@npm:^5.9.2":
+  version: 5.9.4
+  resolution: "single-spa@npm:5.9.4"
+  checksum: 7b89384063885d3f25bce45996e29928fce9e36ad39bf1189d59b601796bbfe086b40e82d1843a38507c0d9f91f3710a7ddd1f81bf23ec4f24649b2e1ec4f98b
   languageName: node
   linkType: hard
 

From 4eeeb65dec571c63de8f80e01ce073c6fa237a80 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 29 Feb 2024 08:39:23 +0300
Subject: [PATCH 08/22] removed extra committed files

---
 package.json |   4 +-
 yarn.lock    | 251 +++++++++++++++++++++++----------------------------
 2 files changed, 115 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index b1538e330..b6c1741b2 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.17",
     "@carbon/react": "^1.37.0",
-    "@openmrs/esm-framework": "^5.4.1-pre.1581",
+    "@openmrs/esm-framework": "next",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.84",
     "@swc/jest": "^0.2.29",
@@ -48,7 +48,7 @@
     "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^14.0.1",
-    "openmrs": "^5.4.1-pre.1581",
+    "openmrs": "next",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/yarn.lock b/yarn.lock
index f9db4d109..a6748d18a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1711,7 +1711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons-react@npm:11.26.0, @carbon/icons-react@npm:^11.26.0":
+"@carbon/icons-react@npm:^11.26.0":
   version: 11.26.0
   resolution: "@carbon/icons-react@npm:11.26.0"
   dependencies:
@@ -1738,7 +1738,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/react@npm:^1.37.0, @carbon/react@npm:~1.37.0":
+"@carbon/react@npm:^1.37.0":
   version: 1.37.0
   resolution: "@carbon/react@npm:1.37.0"
   dependencies:
@@ -3142,28 +3142,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-api@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-api@npm:5.4.1-pre.1581"
+"@openmrs/esm-api@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-api@npm:5.2.1-pre.1156"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
   peerDependencies:
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
-    "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 5bae75d720cbc1a4da136ac0d7cd05b99227201720d044a11c12d22d25acbef96f5681cb65e6af0f8979397cbf3119474ac00c9781d79f77e60de3e00b838e9d
+  checksum: c59e1e7cdddf600d242f0cc44b6e84ddbd343ec84b6aa69d03259f5cce71efe3219fbb378c94a1410ebbf0b441b287739b1743ce735c2394bec2fdcf0be3c6d5
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-app-shell@npm:5.4.1-pre.1581"
+"@openmrs/esm-app-shell@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-app-shell@npm:5.2.1-pre.1156"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1581"
+    "@carbon/react": "npm:^1.37.0"
+    "@openmrs/esm-framework": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-styleguide": "npm:5.2.1-pre.1156"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -3177,7 +3176,7 @@ __metadata:
     react-router-dom: "npm:^6.3.0"
     rxjs: "npm:^6.5.3"
     semver: "npm:^7.3.4"
-    single-spa: "npm:^6.0.0"
+    single-spa: "npm:^5.9.2"
     swc-loader: "npm:^0.2.3"
     swr: "npm:^2.2.2"
     systemjs: "npm:^6.8.3"
@@ -3188,44 +3187,55 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 2e1f8ac266256f16bb588cf04399c86be2c4a5230a8d6943a2e477210eb69a0e3d66c21d3f5918f3810869d2d1adcfe1e88782ad0851da719e5d2bec6a2f8e60
+  checksum: 5e10e1ddefcfd874c57cce106c36db7690bc52d02ef496095eba44b4b413578a2886832f4be9a008177415d2470fe457ab071f72c941f7cd0db7dc30b9dd78f9
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-breadcrumbs@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-breadcrumbs@npm:5.2.1-pre.1156"
+  dependencies:
+    path-to-regexp: "npm:6.1.0"
+  peerDependencies:
+    "@openmrs/esm-state": 5.x
+  checksum: 26a9ed07ff73be542a20dd31a8cb198bdac1908bbf997f63df5d81dacbb761f279ac29e52b8f20f56de5af60d96d8f79da576c39b2eeab990519c7650d231ca0
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-config@npm:5.4.1-pre.1581"
+"@openmrs/esm-config@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-config@npm:5.2.1-pre.1156"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 2f57c26907ac8fbff5d3ac20deedfa9a69c2fb3b6047c1db95849cd81f5a530d0ce607aa55f0378af46764c6c8b9abc2219df94b741605cba88d21995d1cd8ef
+  checksum: 1578df5d53146d66b7e78981efc8fe4e75d62d39935eebd91db4fad3f00a61f28839b50ca44f6c937698ed1887d4b2f94831ec0f36c49b97ad6ae5dbf04cff52
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1581"
+"@openmrs/esm-dynamic-loading@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.2.1-pre.1156"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: eccc7b3ea89133e38a51ca90ddbe7ba7a82fe5e43ae074e722c916a0f5c950a4cebc5f06096d9c1cc83d5ae386d214810f7f2d65ae85e2a91933e67a8ea2f7a7
+  checksum: 9778f56531ed07bfdd501bf4bd83a06229811b4cd23f9fc956eac96c75c129f61fac0edb346fb5eff5c636ec45169ed525f9d90949a6f518272f4b4da68f0939
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-error-handling@npm:5.4.1-pre.1581"
+"@openmrs/esm-error-handling@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-error-handling@npm:5.2.1-pre.1156"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 0812daa71471c708f824c23d11f187fd773a967ff53c6e12becd53405649f84362b058b558f5a9cacbc636513da257ff79fb561743b02290fe1b2ef92dc2b489
+  checksum: afebbc441bacba68d9715d127e13b18300f2006c2f7d2e044b2e13bf431c5449da2b44ae17f1a3924d7dbdf2f248ae31d5e16c8800f296d060a276737df34f6c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-extensions@npm:5.4.1-pre.1581"
+"@openmrs/esm-extensions@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-extensions@npm:5.2.1-pre.1156"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -3234,41 +3244,40 @@ __metadata:
     "@openmrs/esm-feature-flags": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 9a8a9210b577a38910a8e4c05ec1504afeaf75785988600da4dda372c8b33c6d80ae916eb2c42b1ab6a06cc6ea6539733b7e7f0b19f30b5c2d5e9dba9e0b7255
+  checksum: f623672b92918a69a8d47c1d287167d81d1b36ce0456c60f33a670d281dc67d20bd47187283a89581201f2743e11975ae9b0003569763a20715ba70baf9d9ec8
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-feature-flags@npm:5.4.1-pre.1581"
+"@openmrs/esm-feature-flags@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-feature-flags@npm:5.2.1-pre.1156"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 3554f0685a41430dbceadde30a212b586031e6b270e5a1d2921f70d44aa68c05fc6a1ab170b0c1c4d5b0fde97bf6c15ca9169db487e65aee16ce2a03ad54dc47
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-framework@npm:5.4.1-pre.1581, @openmrs/esm-framework@npm:^5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-framework@npm:5.4.1-pre.1581"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-config": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-dynamic-loading": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-error-handling": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-extensions": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-feature-flags": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-globals": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-navigation": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-offline": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-react-utils": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-routes": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-state": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1581"
-    "@openmrs/esm-utils": "npm:5.4.1-pre.1581"
+  checksum: ee3ab530cb86c7b754b3e74d30c3b52a60a7a684bf31a76c167a4b9bb9c7147a93e345ecc0956a285c49d368523fcbd125a287d5c75a995065fb665d065947f3
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-framework@npm:5.2.1-pre.1156, @openmrs/esm-framework@npm:next":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-framework@npm:5.2.1-pre.1156"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-breadcrumbs": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-config": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-dynamic-loading": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-error-handling": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-extensions": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-feature-flags": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-globals": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-offline": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-react-utils": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-state": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-styleguide": "npm:5.2.1-pre.1156"
+    "@openmrs/esm-utils": "npm:5.2.1-pre.1156"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -3279,16 +3288,16 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 4e5c63319db6ae233a810b76888882cbced0297ea46a3deaabcf232d99a807b2fc7f16e996fab6f339ee54cd9391f041f3d5d037b63604dc6c1ffd14e9c9f651
+  checksum: 33541cdee2bcfd016cf74f25e745463fbc25e6a6c5aa3af58018e4f108320c64d26eab4c3823adb21ab3acc032c43c9ad85b7a2adfa726f21675f0de36402b42
   languageName: node
   linkType: hard
 
-"@openmrs/esm-globals@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-globals@npm:5.4.1-pre.1581"
+"@openmrs/esm-globals@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-globals@npm:5.2.1-pre.1156"
   peerDependencies:
     single-spa: 5.x
-  checksum: e3b52fbf52ef8f2add7c2c1a141363a1dfd271a1f48bcfb5955a7cf6bc8190b433bb8f4576ab83c91b7ff8a90951d2fc7cf98f017fd6ed8a744999e54314eb48
+  checksum: 9a5347f1e5a00e3e50a76c1154caf1f8ccb510cc51b940f492482d86558eb8499f9a93ea76211d2b19c9c1b17071e808d60338684bdbc0845e43d95a436cf172
   languageName: node
   linkType: hard
 
@@ -3296,7 +3305,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-home-app@workspace:packages/esm-home-app"
   peerDependencies:
-    "@openmrs/esm-framework": 4.x
+    "@openmrs/esm-framework": 5.x
     react: 18.x
     react-i18next: 11.x
     react-router-dom: 6.x
@@ -3310,7 +3319,7 @@ __metadata:
   dependencies:
     "@babel/core": "npm:^7.22.17"
     "@carbon/react": "npm:^1.37.0"
-    "@openmrs/esm-framework": "npm:^5.4.1-pre.1581"
+    "@openmrs/esm-framework": "npm:next"
     "@swc/cli": "npm:^0.1.62"
     "@swc/core": "npm:^1.3.84"
     "@swc/jest": "npm:^0.2.29"
@@ -3339,7 +3348,7 @@ __metadata:
     jest-cli: "npm:^29.7.0"
     jest-environment-jsdom: "npm:^29.7.0"
     lint-staged: "npm:^14.0.1"
-    openmrs: "npm:^5.4.1-pre.1581"
+    openmrs: "npm:next"
     prettier: "npm:^3.0.3"
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
@@ -3355,20 +3364,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-navigation@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-navigation@npm:5.4.1-pre.1581"
-  dependencies:
-    path-to-regexp: "npm:6.1.0"
-  peerDependencies:
-    "@openmrs/esm-state": 5.x
-  checksum: 3480815505917ef732b728df4fe8bccee723488dbb6cd4c74555a6f4e01641fea50c49b71cd554a662ca7a28f44c91298860333974db664419620a7be7facfda
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-offline@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-offline@npm:5.4.1-pre.1581"
+"@openmrs/esm-offline@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-offline@npm:5.2.1-pre.1156"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -3380,23 +3378,22 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-styleguide": 5.x
     rxjs: 6.x
-  checksum: 5496afe10561ad7440cc9e1ecaf676ef33872e9234d6e416c6d462d13b51f2cadf8677678fd8d4c6a2d73e4fee25493b9f0b9c23e0762cd1b5c4ae4445d68683
+  checksum: 773d1727e0d5ea3c5c4d278ca5e11569224f1b4da9d9818343fb037001ccea0d8a62d12947d9079774256bf3dc58abeb0b225ba858921bce71224d2d6a5e241c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-react-utils@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-react-utils@npm:5.4.1-pre.1581"
+"@openmrs/esm-react-utils@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-react-utils@npm:5.2.1-pre.1156"
   dependencies:
     lodash-es: "npm:^4.17.21"
-    single-spa-react: "npm:^6.0.0"
+    single-spa-react: "npm:~5.0.0"
   peerDependencies:
     "@openmrs/esm-api": 5.x
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-extensions": 5.x
     "@openmrs/esm-globals": 5.x
-    "@openmrs/esm-navigation": 5.x
     dayjs: 1.x
     i18next: 19.x
     react: 18.x
@@ -3404,37 +3401,27 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: ed3ef88e35dd35060c29ac4a966ca6e2691adc363d00752873b6333105049eb00153b3f7994c4a4fe8e3d14c8c0f84f4594d3747a52a9224cd980b6ee24e69ba
+  checksum: 33f5d950e9236ab0ecde6fd74ec918db03c20db84160925ac4407c5d68251c00af80fbe88045a7e30315fb8fec8aad8756e19a8576b933bd820bccbb73ce5d0a
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-routes@npm:5.4.1-pre.1581"
-  peerDependencies:
-    "@openmrs/esm-globals": 5.x
-    "@openmrs/esm-utils": 5.x
-  checksum: e10752810c38d016d59a2f78073785077322dc6a520a1d8044302aa2ecd4c9b57d3ac2ae6d7c8f3e6023e4003acb038b875e7cc2529a6a32d882c72752d777e3
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-state@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-state@npm:5.4.1-pre.1581"
+"@openmrs/esm-state@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-state@npm:5.2.1-pre.1156"
   dependencies:
     zustand: "npm:^4.3.6"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: da55e9387f3cd0a079ae98a6e69a5e15246341fc7a3fff2d5c5a24c0b84aa532f1493a86c60db5e8a54985461f339a6a3efd083159d6e298c5473b700aa6e364
+  checksum: 5098e60c78f8d11c981733076d04e0182c0aa90007e63cc885e253da0908cdbb78620e7472b1200b6810f0748b80085e951cc9214ffaaed32d6733f344e1de6e
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-styleguide@npm:5.4.1-pre.1581"
+"@openmrs/esm-styleguide@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-styleguide@npm:5.2.1-pre.1156"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.37.0"
     "@internationalized/date": "npm:^3.5.0"
     "@react-spectrum/datepicker": "npm:^3.8.0"
     "@react-spectrum/provider": "npm:^3.9.0"
@@ -3443,33 +3430,31 @@ __metadata:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
     "@openmrs/esm-extensions": 5.x
-    "@openmrs/esm-framework": 5.x
     "@openmrs/esm-react-utils": 5.x
     "@openmrs/esm-state": 5.x
-    dayjs: 1.x
     react: 18.x
     react-dom: 18.x
     rxjs: 6.x
-  checksum: 44b0c1f6c36618f1b5aa42f67de633e7338e1f3ed4c176f7c65a6a6f525492384d0ea3333fca9afb2c32e4c8e3830fc0c559b10d7cc42a8c3446415e5a42c102
+  checksum: 67f55f0789455562f34d70f3732a354ee1a60596193f8428c799aced29e751d6939e3475260d61d2924a4aa6a537031ff7914227b10a1fcd1b068a03764b7434
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/esm-utils@npm:5.4.1-pre.1581"
+"@openmrs/esm-utils@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/esm-utils@npm:5.2.1-pre.1156"
   dependencies:
     semver: "npm:7.3.2"
   peerDependencies:
     dayjs: 1.x
     i18next: 19.x
     rxjs: 6.x
-  checksum: dba93c8da41e7ba7f06bd59f82e886d753de1137aebda0507c9a53b7b33ea151ada04660400cf5b8b3012b01ba26f696358a837293b8f8dc5e621b07fcc4f09b
+  checksum: 419efd53200c5ab904b06bf47fc64cb591eed7e4309a97431d63a29fac10bb769e18f966902d833bb08c5f703ddb6fe1e919b5c6c6d1f89d1276d1a7f160cbc4
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "@openmrs/webpack-config@npm:5.4.1-pre.1581"
+"@openmrs/webpack-config@npm:5.2.1-pre.1156":
+  version: 5.2.1-pre.1156
+  resolution: "@openmrs/webpack-config@npm:5.2.1-pre.1156"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -3486,7 +3471,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 66ccc4b72a48de57b758ed0172c3f13ed4ea326cdde2a504f14047afc7ba78c6730bb36b1a38afc0bf86854c4165ecce2a97d5b451535158f2a0de53e6b48964
+  checksum: 2e9ae0ebc57635dc95a80ad37a7612bd8eed03335d41c1f408833560a965854bc21c1246578fb0c20a8309259b6ba958637436ff6e90a5404b2919cf7cdc89cd
   languageName: node
   linkType: hard
 
@@ -13323,13 +13308,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-watch@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "node-watch@npm:0.7.4"
-  checksum: ea752dd5cd0aa1344ced1002409c8a81829cc5406fd949f34e8886786f2015651d2da9c3d3d4f164d23b9e84c7062ff97051746fe77db18955ffb23dc3dc0b76
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^5.0.0":
   version: 5.0.0
   resolution: "nopt@npm:5.0.0"
@@ -13664,19 +13642,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openmrs@npm:^5.4.1-pre.1581":
-  version: 5.4.1-pre.1581
-  resolution: "openmrs@npm:5.4.1-pre.1581"
+"openmrs@npm:next":
+  version: 5.2.1-pre.1156
+  resolution: "openmrs@npm:5.2.1-pre.1156"
   dependencies:
-    "@carbon/icons-react": "npm:11.26.0"
-    "@openmrs/esm-app-shell": "npm:5.4.1-pre.1581"
-    "@openmrs/webpack-config": "npm:5.4.1-pre.1581"
+    "@openmrs/esm-app-shell": "npm:5.2.1-pre.1156"
+    "@openmrs/webpack-config": "npm:5.2.1-pre.1156"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.2"
     axios: "npm:^0.21.1"
     browserslist-config-openmrs: "npm:^1.0.1"
-    chalk: "npm:^4.1.2"
     copy-webpack-plugin: "npm:^11.0.0"
     cssnano: "npm:^5.0.16"
     ejs: "npm:^3.1.8"
@@ -13684,7 +13660,6 @@ __metadata:
     html-webpack-plugin: "npm:^5.5.0"
     inquirer: "npm:^7.3.3"
     mini-css-extract-plugin: "npm:^2.4.5"
-    node-watch: "npm:^0.7.4"
     npm-registry-fetch: "npm:^14.0.3"
     pacote: "npm:^15.0.0"
     postcss: "npm:^8.4.6"
@@ -13701,7 +13676,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 4584cf1300dcfd399512e193e708dc1526516c464c33b5a937887ddef913d0158b2d4ceb4c32d1ede9a16605ed14694247b32aab8dfa26f024c038f7fb89db48
+  checksum: 7de397c768c0eb54b154ac08a49517097c3ada806bb287708896a2e9503ff515c48d2ebe049507024173a548677abe7199fa8042e1f5dec478ea57821d4b9abe
   languageName: node
   linkType: hard
 
@@ -16015,9 +15990,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"single-spa-react@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "single-spa-react@npm:6.0.1"
+"single-spa-react@npm:~5.0.0":
+  version: 5.0.2
+  resolution: "single-spa-react@npm:5.0.2"
   dependencies:
     browserslist-config-single-spa: "npm:^1.0.1"
   peerDependencies:
@@ -16029,14 +16004,14 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 5c75581a0925f031248c184f09dd90200e7518a78642f050ddcc52ff1c59bfb84752a15dd4642511b5388061bf2c594872faeac3469e1f80e2d2c48f013ded8f
+  checksum: 142f04ffde1cbede0c3b81abe0439b1a87d0a031efa6a4f8c4ae61ffbefe0e9368e32944a63b96e7cd83d2b09ac102278d256fbf4272cf01ad438fdef2295c50
   languageName: node
   linkType: hard
 
-"single-spa@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "single-spa@npm:6.0.1"
-  checksum: 6c192226c0c6d94dbb0d2576c6552ebb9ec01ecad69d069cac47ddd5aa3c2c90e1370765e2d0e36203120a2c48bb7e967e2d6d8a6f9ede4315fd4b9e11cd9e85
+"single-spa@npm:^5.9.2":
+  version: 5.9.4
+  resolution: "single-spa@npm:5.9.4"
+  checksum: 7b89384063885d3f25bce45996e29928fce9e36ad39bf1189d59b601796bbfe086b40e82d1843a38507c0d9f91f3710a7ddd1f81bf23ec4f24649b2e1ec4f98b
   languageName: node
   linkType: hard
 

From c2de7e9539507aa6c6d2fa9e8c03905bff128b28 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 29 Feb 2024 08:44:05 +0300
Subject: [PATCH 09/22] cleanup

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index a6748d18a..266a749e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3305,7 +3305,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-home-app@workspace:packages/esm-home-app"
   peerDependencies:
-    "@openmrs/esm-framework": 5.x
+    "@openmrs/esm-framework": 4.x
     react: 18.x
     react-i18next: 11.x
     react-router-dom: 6.x

From 1add09a51135349d144402b10e63ac186db547b7 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 29 Feb 2024 08:45:40 +0300
Subject: [PATCH 10/22] yarn.lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index a6748d18a..266a749e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3305,7 +3305,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-home-app@workspace:packages/esm-home-app"
   peerDependencies:
-    "@openmrs/esm-framework": 5.x
+    "@openmrs/esm-framework": 4.x
     react: 18.x
     react-i18next: 11.x
     react-router-dom: 6.x

From fcca606ade90854e2ba73cd1023d86b136af0c7c Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 29 Feb 2024 23:00:48 +0300
Subject: [PATCH 11/22] PR reviews

---
 .../homepage-header.component.tsx             | 11 +--
 .../src/homepage-header/homepage-header.scss  | 84 +++++++++----------
 .../homepage-illustration.component.tsx       |  2 +-
 .../src/openmrs-esm-home-schema.ts            |  5 ++
 4 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
index 6c7370893..ff7e2a0d2 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
@@ -1,28 +1,29 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Location } from '@carbon/react/icons';
-import { useSession } from '@openmrs/esm-framework';
+import { ConfigObject, useConfig, useSession } from '@openmrs/esm-framework';
 import { DatePicker, DatePickerInput } from '@carbon/react';
 import dayjs from 'dayjs';
 import styles from './homepage-header.scss';
 import HomepageIllustration from './homepage-illustration.component';
 
 interface HomepageHeaderProps {
-  title: string;
+  dashboardTitle: string;
 }
 
-const HomepageHeader: React.FC<HomepageHeaderProps> = ({ title }) => {
+const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
   const { t } = useTranslation();
   const session = useSession();
   const location = session?.sessionLocation?.display;
+  const config = useConfig() as ConfigObject;
 
   return (
     <div className={styles.header} data-testid="homepage-header">
       <div className={styles['left-justified-items']}>
         <HomepageIllustration />
         <div className={styles['page-labels']}>
-          <p>{t('home', 'Home')}</p>
-          <p className={styles['page-name']}>{title}</p>
+          <p>{config.appNameLabel}</p>
+          <p className={styles['page-name']}>{dashboardTitle}</p>
         </div>
       </div>
       <div className={styles['right-justified-items']}>
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.scss b/packages/esm-home-app/src/homepage-header/homepage-header.scss
index 7348cdce8..6d20766dc 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.scss
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.scss
@@ -1,85 +1,85 @@
 @use '@carbon/colors';
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/layout';
+@use '@carbon/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
 .header {
-    @include type.type-style('body-compact-02');
-    color: $text-02;
-    height: spacing.$spacing-12;
-    background-color: $ui-02;
-    border-bottom: 1px solid $ui-03;
-    display: flex;
-    justify-content: space-between;
+  @include type.type-style('body-compact-02');
+  color: $text-02;
+  height: layout.$spacing-12;
+  background-color: $ui-02;
+  border-bottom: 1px solid $ui-03;
+  display: flex;
+  justify-content: space-between;
 }
 
 .left-justified-items {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    cursor: pointer;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  cursor: pointer;
 }
 
 .right-justified-items {
-    @include type.type-style('body-compact-02');
-    color: $text-02;
-    margin: 0.5rem;
+  @include type.type-style('body-compact-02');
+  color: $text-02;
+  margin: 0.5rem;
 }
 
 .page-name {
-    @include type.type-style('heading-04');
+  @include type.type-style('heading-04');
 }
 
 .page-labels {
-    margin: 1rem 0;
+  margin: 1rem 0;
 
-    p:first-of-type {
-        margin-bottom: 0.25rem;
-    }
+  p:first-of-type {
+    margin-bottom: 0.25rem;
+  }
 }
 
 .date-and-location {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
 }
 
 .dropdownContainer {
-    display: flex;
-    justify-content: flex-end;
+  display: flex;
+  justify-content: flex-end;
 }
 
 .value {
-    margin-left: 0.25rem;
+  margin-left: 0.25rem;
 }
 
 .middot {
-    margin: 0 0.5rem;
+  margin: 0 0.5rem;
 }
 
 .view {
-    @include type.type-style('label-01');
+  @include type.type-style('label-01');
 }
 
 .datePicker {
-    background-color: transparent;
-    width: 10rem;
-    border: none;
+  background-color: transparent;
+  width: 10rem;
+  border: none;
 
-    &>input {
-        color: colors.$blue-10;
-    }
+  &>input {
+    color: colors.$blue-10;
+  }
 }
 
 // Overriding styles for RTL support
 html[dir='rtl'] {
-    .date-and-location {
-        &>svg {
-            order: -1;
-        }
+  .date-and-location {
+    &>svg {
+      order: -1;
+    }
 
-        &>span:nth-child(2) {
-            order: -2;
-        }
+    &>span:nth-child(2) {
+      order: -2;
     }
+  }
 }
\ No newline at end of file
diff --git a/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx
index 1561d523c..fc559a19b 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx
+++ b/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 const HomepageIllustration: React.FC = () => {
   return (
     <svg width="92" height="94" viewBox="0 0 92 94" xmlns="http://www.w3.org/2000/svg">
-      <title>Patient queue illustration</title>
+      <title>Homepage illustration</title>
       <g fill="none" fillRule="evenodd">
         <path fill="#FFF" d="M0 0h92v94H0z" />
         <path
diff --git a/packages/esm-home-app/src/openmrs-esm-home-schema.ts b/packages/esm-home-app/src/openmrs-esm-home-schema.ts
index fad80e60d..700996099 100644
--- a/packages/esm-home-app/src/openmrs-esm-home-schema.ts
+++ b/packages/esm-home-app/src/openmrs-esm-home-schema.ts
@@ -35,4 +35,9 @@ export const esmHomeSchema = {
       _validators: [validators.isUrlWithTemplateParameters(['patientUuid'])],
     },
   },
+  appNameLabel: {
+    _type: Type.String,
+    _default: 'Home',
+    _description: 'The name of the frontend app which is appended to the app header.',
+  },
 };

From ef35d020becb93451339deb4c1bb4b6043141abd Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Fri, 1 Mar 2024 11:15:00 +0300
Subject: [PATCH 12/22] cleanup

---
 .../src/homepage-header/homepage-header.component.tsx           | 2 +-
 packages/esm-home-app/translations/en.json                      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
index ff7e2a0d2..171774da7 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
@@ -18,7 +18,7 @@ const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
   const config = useConfig() as ConfigObject;
 
   return (
-    <div className={styles.header} data-testid="homepage-header">
+    <div className={styles.header} role="banner">
       <div className={styles['left-justified-items']}>
         <HomepageIllustration />
         <div className={styles['page-labels']}>
diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index c3d9a87e4..a5ff8c612 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,4 +1,3 @@
 {
-  "home": "Home",
   "Home": "Home"
 }

From b9c9d0ea1541b22d97dc564138efbd31694ba362 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:45:53 +0300
Subject: [PATCH 13/22] PR review resolutions

---
 .../homepage-header-date.component.tsx             | 13 +++++++++++++
 .../homepage-header-date/homepage-header-date.scss |  3 +++
 .../homepage-header/homepage-header.component.tsx  | 14 +++-----------
 .../src/homepage-header/homepage-header.scss       |  4 ++--
 packages/esm-home-app/src/index.ts                 |  3 +--
 5 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx
 create mode 100644 packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss

diff --git a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx
new file mode 100644
index 000000000..9992b83d6
--- /dev/null
+++ b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Calendar } from '@carbon/react/icons';
+import styles from './homepage-header-date.scss';
+import { formatDate } from '@openmrs/esm-framework';
+
+export const HomepageHeaderDate = () => {
+  return (
+    <React.Fragment>
+      <Calendar size={16} />
+      <span className={styles.value}>{formatDate(new Date(), { mode: 'standard' })}</span>
+    </React.Fragment>
+  );
+};
diff --git a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
new file mode 100644
index 000000000..12cc7d164
--- /dev/null
+++ b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
@@ -0,0 +1,3 @@
+.value{
+  margin-left: 0.25rem
+}
\ No newline at end of file
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
index 171774da7..49c2a72b8 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
@@ -6,6 +6,7 @@ import { DatePicker, DatePickerInput } from '@carbon/react';
 import dayjs from 'dayjs';
 import styles from './homepage-header.scss';
 import HomepageIllustration from './homepage-illustration.component';
+import { HomepageHeaderDate } from '../homepage-header-date/homepage-header-date.component';
 
 interface HomepageHeaderProps {
   dashboardTitle: string;
@@ -22,7 +23,7 @@ const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
       <div className={styles['left-justified-items']}>
         <HomepageIllustration />
         <div className={styles['page-labels']}>
-          <p>{config.appNameLabel}</p>
+          <p>{t('home', config.appNameLabel)}</p>
           <p className={styles['page-name']}>{dashboardTitle}</p>
         </div>
       </div>
@@ -31,16 +32,7 @@ const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
           <Location size={16} />
           <span className={styles.value}>{location}</span>
           <span className={styles.middot}>&middot;</span>
-          <DatePicker dateFormat="d-M-Y" datePickerType="single">
-            <DatePickerInput
-              style={{ backgroundColor: 'transparent', border: 'none', maxWidth: '10rem' }}
-              id="date-picker-calendar-id"
-              placeholder="DD-MMM-YYYY"
-              labelText=""
-              type="text"
-              value={dayjs(new Date()).format('DD MMM YYYY')}
-            />
-          </DatePicker>
+          <HomepageHeaderDate />
         </div>
       </div>
     </div>
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.scss b/packages/esm-home-app/src/homepage-header/homepage-header.scss
index 6d20766dc..00c3e60d3 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.scss
+++ b/packages/esm-home-app/src/homepage-header/homepage-header.scss
@@ -23,7 +23,7 @@
 .right-justified-items {
   @include type.type-style('body-compact-02');
   color: $text-02;
-  margin: 0.5rem;
+  margin: 1rem;
 }
 
 .page-name {
@@ -82,4 +82,4 @@ html[dir='rtl'] {
       order: -2;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts
index 3c96cb2c7..b4b827e2f 100644
--- a/packages/esm-home-app/src/index.ts
+++ b/packages/esm-home-app/src/index.ts
@@ -5,7 +5,6 @@ import { esmHomeSchema } from './openmrs-esm-home-schema';
 import rootComponent from './root.component';
 import homeNavMenuComponent from './side-menu/side-menu.component';
 import homeWidgetDashboardComponent from './home-page-widgets/home-page-widgets.component';
-import homepageHeaderComponent from './homepage-header/homepage-header.component';
 
 const moduleName = '@openmrs/esm-home-app';
 const pageName = 'home';
@@ -25,7 +24,7 @@ export const homeWidgetDbLink = getSyncLifecycle(createDashboardLink(dashboardMe
 
 export const homeWidgetDashboard = getSyncLifecycle(homeWidgetDashboardComponent, options);
 
-export const homePageHeader = getSyncLifecycle(homepageHeaderComponent, options);
+export const homePageHeader = getAsyncLifecycle(() => import('./homepage-header/homepage-header.component'), options);
 
 export function startupApp() {
   defineConfigSchema(moduleName, esmHomeSchema);

From 489ad06604ba8a38293798b64dbca5cc307397e6 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:37:43 +0300
Subject: [PATCH 14/22] updated translations

---
 packages/esm-home-app/translations/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index a5ff8c612..5c9d9fb5c 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,3 +1,4 @@
 {
+  "home": "",
   "Home": "Home"
 }

From c2110da8bf0192591ca19e2e0f4c2e6adb5df7a2 Mon Sep 17 00:00:00 2001
From: Jamie Arodi <51090527+arodidev@users.noreply.github.com>
Date: Thu, 21 Mar 2024 12:30:13 +0300
Subject: [PATCH 15/22] Update
 packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
---
 .../src/homepage-header-date/homepage-header-date.scss        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
index 12cc7d164..95170282d 100644
--- a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
+++ b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
@@ -1,3 +1,3 @@
-.value{
+.value {
   margin-left: 0.25rem
-}
\ No newline at end of file
+}

From 80b6b508452dd6887402c4341609048e48baab60 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 21 Mar 2024 12:57:01 +0300
Subject: [PATCH 16/22] PR reviews

---
 packages/esm-home-app/src/index.ts                  |  2 +-
 .../esm-home-app/src/openmrs-esm-home-schema.ts     |  5 -----
 .../page-header-date.component.tsx}                 |  2 +-
 .../src/page-header-date/page-header-date.scss      |  3 +++
 .../page-header.component.tsx}                      | 13 +++++--------
 .../page-header.scss}                               |  2 +-
 .../page-illustration.component.tsx}                |  4 +++-
 packages/esm-home-app/src/routes.json               |  4 ++--
 packages/esm-home-app/translations/en.json          |  3 +--
 9 files changed, 17 insertions(+), 21 deletions(-)
 rename packages/esm-home-app/src/{homepage-header-date/homepage-header-date.component.tsx => page-header-date/page-header-date.component.tsx} (87%)
 create mode 100644 packages/esm-home-app/src/page-header-date/page-header-date.scss
 rename packages/esm-home-app/src/{homepage-header/homepage-header.component.tsx => page-header/page-header.component.tsx} (69%)
 rename packages/esm-home-app/src/{homepage-header/homepage-header.scss => page-header/page-header.scss} (99%)
 rename packages/esm-home-app/src/{homepage-header/homepage-illustration.component.tsx => page-header/page-illustration.component.tsx} (85%)

diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts
index b4b827e2f..80b7cfa1f 100644
--- a/packages/esm-home-app/src/index.ts
+++ b/packages/esm-home-app/src/index.ts
@@ -24,7 +24,7 @@ export const homeWidgetDbLink = getSyncLifecycle(createDashboardLink(dashboardMe
 
 export const homeWidgetDashboard = getSyncLifecycle(homeWidgetDashboardComponent, options);
 
-export const homePageHeader = getAsyncLifecycle(() => import('./homepage-header/homepage-header.component'), options);
+export const pageHeader = getAsyncLifecycle(() => import('./page-header/page-header.component'), options);
 
 export function startupApp() {
   defineConfigSchema(moduleName, esmHomeSchema);
diff --git a/packages/esm-home-app/src/openmrs-esm-home-schema.ts b/packages/esm-home-app/src/openmrs-esm-home-schema.ts
index 700996099..fad80e60d 100644
--- a/packages/esm-home-app/src/openmrs-esm-home-schema.ts
+++ b/packages/esm-home-app/src/openmrs-esm-home-schema.ts
@@ -35,9 +35,4 @@ export const esmHomeSchema = {
       _validators: [validators.isUrlWithTemplateParameters(['patientUuid'])],
     },
   },
-  appNameLabel: {
-    _type: Type.String,
-    _default: 'Home',
-    _description: 'The name of the frontend app which is appended to the app header.',
-  },
 };
diff --git a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx b/packages/esm-home-app/src/page-header-date/page-header-date.component.tsx
similarity index 87%
rename from packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx
rename to packages/esm-home-app/src/page-header-date/page-header-date.component.tsx
index 9992b83d6..5cc6ec8c3 100644
--- a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.component.tsx
+++ b/packages/esm-home-app/src/page-header-date/page-header-date.component.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Calendar } from '@carbon/react/icons';
-import styles from './homepage-header-date.scss';
+import styles from './page-header-date.scss';
 import { formatDate } from '@openmrs/esm-framework';
 
 export const HomepageHeaderDate = () => {
diff --git a/packages/esm-home-app/src/page-header-date/page-header-date.scss b/packages/esm-home-app/src/page-header-date/page-header-date.scss
new file mode 100644
index 000000000..12cc7d164
--- /dev/null
+++ b/packages/esm-home-app/src/page-header-date/page-header-date.scss
@@ -0,0 +1,3 @@
+.value{
+  margin-left: 0.25rem
+}
\ No newline at end of file
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx b/packages/esm-home-app/src/page-header/page-header.component.tsx
similarity index 69%
rename from packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
rename to packages/esm-home-app/src/page-header/page-header.component.tsx
index 49c2a72b8..bf854381b 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.component.tsx
+++ b/packages/esm-home-app/src/page-header/page-header.component.tsx
@@ -1,12 +1,10 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Location } from '@carbon/react/icons';
-import { ConfigObject, useConfig, useSession } from '@openmrs/esm-framework';
-import { DatePicker, DatePickerInput } from '@carbon/react';
-import dayjs from 'dayjs';
-import styles from './homepage-header.scss';
-import HomepageIllustration from './homepage-illustration.component';
-import { HomepageHeaderDate } from '../homepage-header-date/homepage-header-date.component';
+import { useSession } from '@openmrs/esm-framework';
+import styles from './page-header.scss';
+import HomepageIllustration from './page-illustration.component';
+import { HomepageHeaderDate } from '../page-header-date/page-header-date.component';
 
 interface HomepageHeaderProps {
   dashboardTitle: string;
@@ -16,14 +14,13 @@ const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
   const { t } = useTranslation();
   const session = useSession();
   const location = session?.sessionLocation?.display;
-  const config = useConfig() as ConfigObject;
 
   return (
     <div className={styles.header} role="banner">
       <div className={styles['left-justified-items']}>
         <HomepageIllustration />
         <div className={styles['page-labels']}>
-          <p>{t('home', config.appNameLabel)}</p>
+          <p>{t('home', 'Home')}</p>
           <p className={styles['page-name']}>{dashboardTitle}</p>
         </div>
       </div>
diff --git a/packages/esm-home-app/src/homepage-header/homepage-header.scss b/packages/esm-home-app/src/page-header/page-header.scss
similarity index 99%
rename from packages/esm-home-app/src/homepage-header/homepage-header.scss
rename to packages/esm-home-app/src/page-header/page-header.scss
index 00c3e60d3..4ab1bad89 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-header.scss
+++ b/packages/esm-home-app/src/page-header/page-header.scss
@@ -82,4 +82,4 @@ html[dir='rtl'] {
       order: -2;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx b/packages/esm-home-app/src/page-header/page-illustration.component.tsx
similarity index 85%
rename from packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx
rename to packages/esm-home-app/src/page-header/page-illustration.component.tsx
index fc559a19b..54126cbea 100644
--- a/packages/esm-home-app/src/homepage-header/homepage-illustration.component.tsx
+++ b/packages/esm-home-app/src/page-header/page-illustration.component.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const HomepageIllustration: React.FC = () => {
+  const { t } = useTranslation();
   return (
     <svg width="92" height="94" viewBox="0 0 92 94" xmlns="http://www.w3.org/2000/svg">
-      <title>Homepage illustration</title>
+      <title>{t('homepageIllustration', 'Homepage illustration')}</title>
       <g fill="none" fillRule="evenodd">
         <path fill="#FFF" d="M0 0h92v94H0z" />
         <path
diff --git a/packages/esm-home-app/src/routes.json b/packages/esm-home-app/src/routes.json
index c60ebbf5a..1fb6c95d3 100644
--- a/packages/esm-home-app/src/routes.json
+++ b/packages/esm-home-app/src/routes.json
@@ -33,9 +33,9 @@
       "offline": true
     },
     {
-      "name": "home-page-header",
+      "name": "page-header",
       "slot": "home-dashboard-slot",
-      "component": "homePageHeader",
+      "component": "pageHeader",
       "online": true,
       "offline": true
     },
diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index 5c9d9fb5c..ecacb6f18 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,4 +1,3 @@
 {
-  "home": "",
-  "Home": "Home"
+  "home": "Home"
 }

From 67753b4401789a9f3e238da93fcb7b4beeb34134 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Thu, 21 Mar 2024 13:02:10 +0300
Subject: [PATCH 17/22] translations and cleanup

---
 .../header-date.component.tsx}                                 | 2 +-
 .../page-header-date.scss => header-date/header-date.scss}     | 0
 .../esm-home-app/src/page-header/page-header.component.tsx     | 2 +-
 packages/esm-home-app/translations/en.json                     | 3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename packages/esm-home-app/src/{page-header-date/page-header-date.component.tsx => header-date/header-date.component.tsx} (88%)
 rename packages/esm-home-app/src/{page-header-date/page-header-date.scss => header-date/header-date.scss} (100%)

diff --git a/packages/esm-home-app/src/page-header-date/page-header-date.component.tsx b/packages/esm-home-app/src/header-date/header-date.component.tsx
similarity index 88%
rename from packages/esm-home-app/src/page-header-date/page-header-date.component.tsx
rename to packages/esm-home-app/src/header-date/header-date.component.tsx
index 5cc6ec8c3..5499b45e9 100644
--- a/packages/esm-home-app/src/page-header-date/page-header-date.component.tsx
+++ b/packages/esm-home-app/src/header-date/header-date.component.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Calendar } from '@carbon/react/icons';
-import styles from './page-header-date.scss';
+import styles from './header-date.scss';
 import { formatDate } from '@openmrs/esm-framework';
 
 export const HomepageHeaderDate = () => {
diff --git a/packages/esm-home-app/src/page-header-date/page-header-date.scss b/packages/esm-home-app/src/header-date/header-date.scss
similarity index 100%
rename from packages/esm-home-app/src/page-header-date/page-header-date.scss
rename to packages/esm-home-app/src/header-date/header-date.scss
diff --git a/packages/esm-home-app/src/page-header/page-header.component.tsx b/packages/esm-home-app/src/page-header/page-header.component.tsx
index bf854381b..00ee5fa99 100644
--- a/packages/esm-home-app/src/page-header/page-header.component.tsx
+++ b/packages/esm-home-app/src/page-header/page-header.component.tsx
@@ -4,7 +4,7 @@ import { Location } from '@carbon/react/icons';
 import { useSession } from '@openmrs/esm-framework';
 import styles from './page-header.scss';
 import HomepageIllustration from './page-illustration.component';
-import { HomepageHeaderDate } from '../page-header-date/page-header-date.component';
+import { HomepageHeaderDate } from '../header-date/header-date.component';
 
 interface HomepageHeaderProps {
   dashboardTitle: string;
diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index ecacb6f18..f6522ef8b 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,3 +1,4 @@
 {
-  "home": "Home"
+  "home": "Home",
+  "homepageIllustration": "Homepage illustration"
 }

From aba4da21127c7f944130d4bd26ffc63ab06282da Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Wed, 3 Apr 2024 20:53:38 +0300
Subject: [PATCH 18/22] PR review resolutions

---
 .../src/header-date/header-date.scss          |  2 +-
 .../homepage-header-date.scss                 |  3 --
 packages/esm-home-app/src/index.ts            |  2 +-
 .../src/page-header/page-header.scss          | 39 +++++--------------
 packages/esm-home-app/src/routes.json         |  2 +-
 5 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss

diff --git a/packages/esm-home-app/src/header-date/header-date.scss b/packages/esm-home-app/src/header-date/header-date.scss
index 12cc7d164..491876a1b 100644
--- a/packages/esm-home-app/src/header-date/header-date.scss
+++ b/packages/esm-home-app/src/header-date/header-date.scss
@@ -1,3 +1,3 @@
-.value{
+.value {
   margin-left: 0.25rem
 }
\ No newline at end of file
diff --git a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss b/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
deleted file mode 100644
index 95170282d..000000000
--- a/packages/esm-home-app/src/homepage-header-date/homepage-header-date.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.value {
-  margin-left: 0.25rem
-}
diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts
index 97e81c07f..bf3e71009 100644
--- a/packages/esm-home-app/src/index.ts
+++ b/packages/esm-home-app/src/index.ts
@@ -38,4 +38,4 @@ export function startupApp() {
       title: () => Promise.resolve(window.i18next.t('Home', { defaultValue: 'Home', ns: moduleName })),
     },
   ]);
-}
\ No newline at end of file
+}
diff --git a/packages/esm-home-app/src/page-header/page-header.scss b/packages/esm-home-app/src/page-header/page-header.scss
index 4ab1bad89..5fb771cf5 100644
--- a/packages/esm-home-app/src/page-header/page-header.scss
+++ b/packages/esm-home-app/src/page-header/page-header.scss
@@ -44,11 +44,6 @@
   align-items: center;
 }
 
-.dropdownContainer {
-  display: flex;
-  justify-content: flex-end;
-}
-
 .value {
   margin-left: 0.25rem;
 }
@@ -57,29 +52,15 @@
   margin: 0 0.5rem;
 }
 
-.view {
-  @include type.type-style('label-01');
-}
-
-.datePicker {
-  background-color: transparent;
-  width: 10rem;
-  border: none;
-
-  &>input {
-    color: colors.$blue-10;
-  }
-}
-
 // Overriding styles for RTL support
-html[dir='rtl'] {
-  .date-and-location {
-    &>svg {
-      order: -1;
-    }
+// html[dir='rtl'] {
+//   .date-and-location {
+//     &>svg {
+//       order: -1;
+//     }
 
-    &>span:nth-child(2) {
-      order: -2;
-    }
-  }
-}
\ No newline at end of file
+//     &>span:nth-child(2) {
+//       order: -2;
+//     }
+//   }
+// }
\ No newline at end of file
diff --git a/packages/esm-home-app/src/routes.json b/packages/esm-home-app/src/routes.json
index af740f869..3d28a3682 100644
--- a/packages/esm-home-app/src/routes.json
+++ b/packages/esm-home-app/src/routes.json
@@ -35,7 +35,7 @@
     {
       "name": "page-header",
       "slot": "home-dashboard-slot",
-      "component": "pageHeader",
+      "component": "pageHeader"
     }, 
     {
       "name": "metrics-slot",

From cb972c69b2d50fb03753659cc65f6ce53356623f Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 16 Apr 2024 11:04:42 +0300
Subject: [PATCH 19/22] reinstate RTL style overrides

---
 .../src/page-header/page-header.scss          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/esm-home-app/src/page-header/page-header.scss b/packages/esm-home-app/src/page-header/page-header.scss
index 5fb771cf5..7942c2bb7 100644
--- a/packages/esm-home-app/src/page-header/page-header.scss
+++ b/packages/esm-home-app/src/page-header/page-header.scss
@@ -53,14 +53,14 @@
 }
 
 // Overriding styles for RTL support
-// html[dir='rtl'] {
-//   .date-and-location {
-//     &>svg {
-//       order: -1;
-//     }
+html[dir='rtl'] {
+  .date-and-location {
+    &>svg {
+      order: -1;
+    }
 
-//     &>span:nth-child(2) {
-//       order: -2;
-//     }
-//   }
-// }
\ No newline at end of file
+    &>span:nth-child(2) {
+      order: -2;
+    }
+  }
+}
\ No newline at end of file

From 9702c0e55979594e00ffda42f78734d27efaf1b9 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 16 Apr 2024 11:06:56 +0300
Subject: [PATCH 20/22] translations

---
 packages/esm-home-app/translations/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index f6522ef8b..477e93a06 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,4 +1,5 @@
 {
   "home": "Home",
+  "Home": "Home",
   "homepageIllustration": "Homepage illustration"
 }

From 9a1000283b79ecaf47f3b3f63c6feabf1347c105 Mon Sep 17 00:00:00 2001
From: arodidev <51090527+arodidev@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:33:16 +0300
Subject: [PATCH 21/22] Name changes

---
 .../src/header-date/header-date.component.tsx          |  2 +-
 .../src/page-header/page-header.component.tsx          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/esm-home-app/src/header-date/header-date.component.tsx b/packages/esm-home-app/src/header-date/header-date.component.tsx
index 5499b45e9..fe67116d6 100644
--- a/packages/esm-home-app/src/header-date/header-date.component.tsx
+++ b/packages/esm-home-app/src/header-date/header-date.component.tsx
@@ -3,7 +3,7 @@ import { Calendar } from '@carbon/react/icons';
 import styles from './header-date.scss';
 import { formatDate } from '@openmrs/esm-framework';
 
-export const HomepageHeaderDate = () => {
+export const HeaderDate = () => {
   return (
     <React.Fragment>
       <Calendar size={16} />
diff --git a/packages/esm-home-app/src/page-header/page-header.component.tsx b/packages/esm-home-app/src/page-header/page-header.component.tsx
index 00ee5fa99..b4c98b00a 100644
--- a/packages/esm-home-app/src/page-header/page-header.component.tsx
+++ b/packages/esm-home-app/src/page-header/page-header.component.tsx
@@ -4,13 +4,13 @@ import { Location } from '@carbon/react/icons';
 import { useSession } from '@openmrs/esm-framework';
 import styles from './page-header.scss';
 import HomepageIllustration from './page-illustration.component';
-import { HomepageHeaderDate } from '../header-date/header-date.component';
+import { HeaderDate } from '../header-date/header-date.component';
 
-interface HomepageHeaderProps {
+interface PageHeaderProps {
   dashboardTitle: string;
 }
 
-const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
+const PageHeader: React.FC<PageHeaderProps> = ({ dashboardTitle }) => {
   const { t } = useTranslation();
   const session = useSession();
   const location = session?.sessionLocation?.display;
@@ -29,11 +29,11 @@ const HomepageHeader: React.FC<HomepageHeaderProps> = ({ dashboardTitle }) => {
           <Location size={16} />
           <span className={styles.value}>{location}</span>
           <span className={styles.middot}>&middot;</span>
-          <HomepageHeaderDate />
+          <HeaderDate />
         </div>
       </div>
     </div>
   );
 };
 
-export default HomepageHeader;
+export default PageHeader;

From 333f9ec267625619fcb64095c349c602242c9b1a Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Tue, 16 Apr 2024 15:48:24 +0300
Subject: [PATCH 22/22] Useful tweaks

---
 .../esm-home-app/src/dashboard/home-dashboard.scss     |  4 ----
 .../src/header-date/header-date.component.tsx          | 10 ++++++----
 packages/esm-home-app/src/header-date/header-date.scss |  2 +-
 .../src/page-header/page-header.component.tsx          |  4 ++--
 packages/esm-home-app/src/page-header/page-header.scss |  6 +++---
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/packages/esm-home-app/src/dashboard/home-dashboard.scss b/packages/esm-home-app/src/dashboard/home-dashboard.scss
index 8a1eea03a..85beb97cb 100644
--- a/packages/esm-home-app/src/dashboard/home-dashboard.scss
+++ b/packages/esm-home-app/src/dashboard/home-dashboard.scss
@@ -14,10 +14,6 @@
     width: 100%;
   }
 }
-/*TO BE REMOVED ONCE WE IMPROVE LEFT SIDE NAVIGATION*/
-li::marker{
-  font-size: 0px;
-}
 
 .logoSection {
   display: flex;
diff --git a/packages/esm-home-app/src/header-date/header-date.component.tsx b/packages/esm-home-app/src/header-date/header-date.component.tsx
index fe67116d6..d042d595e 100644
--- a/packages/esm-home-app/src/header-date/header-date.component.tsx
+++ b/packages/esm-home-app/src/header-date/header-date.component.tsx
@@ -1,13 +1,15 @@
 import React from 'react';
 import { Calendar } from '@carbon/react/icons';
-import styles from './header-date.scss';
 import { formatDate } from '@openmrs/esm-framework';
+import styles from './header-date.scss';
 
-export const HeaderDate = () => {
+const HeaderDate: React.FC = () => {
   return (
-    <React.Fragment>
+    <>
       <Calendar size={16} />
       <span className={styles.value}>{formatDate(new Date(), { mode: 'standard' })}</span>
-    </React.Fragment>
+    </>
   );
 };
+
+export default HeaderDate;
diff --git a/packages/esm-home-app/src/header-date/header-date.scss b/packages/esm-home-app/src/header-date/header-date.scss
index 491876a1b..95170282d 100644
--- a/packages/esm-home-app/src/header-date/header-date.scss
+++ b/packages/esm-home-app/src/header-date/header-date.scss
@@ -1,3 +1,3 @@
 .value {
   margin-left: 0.25rem
-}
\ No newline at end of file
+}
diff --git a/packages/esm-home-app/src/page-header/page-header.component.tsx b/packages/esm-home-app/src/page-header/page-header.component.tsx
index b4c98b00a..005287cb8 100644
--- a/packages/esm-home-app/src/page-header/page-header.component.tsx
+++ b/packages/esm-home-app/src/page-header/page-header.component.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Location } from '@carbon/react/icons';
 import { useSession } from '@openmrs/esm-framework';
-import styles from './page-header.scss';
 import HomepageIllustration from './page-illustration.component';
-import { HeaderDate } from '../header-date/header-date.component';
+import HeaderDate from '../header-date/header-date.component';
+import styles from './page-header.scss';
 
 interface PageHeaderProps {
   dashboardTitle: string;
diff --git a/packages/esm-home-app/src/page-header/page-header.scss b/packages/esm-home-app/src/page-header/page-header.scss
index 7942c2bb7..ecc2ddfec 100644
--- a/packages/esm-home-app/src/page-header/page-header.scss
+++ b/packages/esm-home-app/src/page-header/page-header.scss
@@ -55,12 +55,12 @@
 // Overriding styles for RTL support
 html[dir='rtl'] {
   .date-and-location {
-    &>svg {
+    & > svg {
       order: -1;
     }
 
-    &>span:nth-child(2) {
+    & > span:nth-child(2) {
       order: -2;
     }
   }
-}
\ No newline at end of file
+}