Merge branch 'main' into chore/bump-billing-version

IntelliSOFT-Consulting · Nov 13, 2024 · 9daff84 · 9daff84
2 parents d6b9e38 + 4aca5a3
commit 9daff84
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/packages/esm-admin-nav-app/package.json b/packages/esm-admin-nav-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ehospital/esm-admin-nav-app",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Admin micro-frontend to navigate to all admin apps",
   "browser": "dist/ehospital-esm-admin-nav-app.js",
   "main": "src/index.ts",
@@ -50,5 +50,5 @@
   "devDependencies": {
     "webpack": "^5.74.0"
   },
-  "gitHead": "88728baaf0c8c1127aa782d7957c18ef4d1d2fdf"
+  "gitHead": "84de2ad51336d61002fbbcaa5b8147d9a8d724d6"
 }
diff --git a/packages/esm-admin-nav-app/src/navbar/navbar-action-button.component.tsx b/packages/esm-admin-nav-app/src/navbar/navbar-action-button.component.tsx
@@ -1,11 +1,11 @@
-import React, { useState } from 'react';
-import { HeaderGlobalAction } from '@carbon/react';
-import styles from './navbar-action-button.scss';
-import { useDebounce, useOnClickOutside } from '@openmrs/esm-framework';
-import NavBarOverlay from './navbar-overlay.component';
-import { Switcher, Close } from '@carbon/react/icons';
-import { moduleLinks } from './nav-utils';
-import { useTranslation } from 'react-i18next';
+import React, { useState } from "react";
+import { HeaderGlobalAction } from "@carbon/react";
+import styles from "./navbar-action-button.scss";
+import { useDebounce, useOnClickOutside } from "@openmrs/esm-framework";
+import NavBarOverlay from "./navbar-overlay.component";
+import { Switcher, Close } from "@carbon/react/icons";
+import { moduleLinks } from "./nav-utils";
+import { useTranslation } from "react-i18next";
 import NavAppIconComponent from "../components/nav-app-icon.component";
 
 type NavbarActionButtonProps = {};
@@ -14,7 +14,7 @@ const DEBOUNCE_TIME = 500;
 const NavbarActionButton: React.FC<NavbarActionButtonProps> = () => {
   const { t } = useTranslation();
   const [showOverlay, setShowOverlay] = React.useState(false);
-  const [searchTerm, setSearchTerm] = useState('');
+  const [searchTerm, setSearchTerm] = useState("");
 
   const toggleOverlay = (event) => {
     setShowOverlay((prevState) => !prevState);
@@ -24,9 +24,11 @@ const NavbarActionButton: React.FC<NavbarActionButtonProps> = () => {
 
   const debounceSearchTerm = useDebounce(searchTerm, DEBOUNCE_TIME);
   const searchResults =
-    debounceSearchTerm === ''
+    debounceSearchTerm === ""
       ? moduleLinks
-      : moduleLinks.filter((item) => item.label.toLowerCase().includes(searchTerm.toLowerCase()));
+      : moduleLinks.filter((item) =>
+          item.label.toLowerCase().includes(searchTerm.toLowerCase())
+        );
 
   return (
     <div id="module" ref={ref}>
@@ -40,13 +42,14 @@ const NavbarActionButton: React.FC<NavbarActionButtonProps> = () => {
       )}
 
       <HeaderGlobalAction
-        aria-label={t('adminModules', 'Admin Modules')}
-        aria-labelledby={t('adminModules', 'Admin Modules')}
+        aria-label={t("adminModules", "Admin Modules")}
+        aria-labelledby={t("adminModules", "Admin Modules")}
         enterDelayMs={500}
         name="adminModules"
         onClick={toggleOverlay}
-        className={showOverlay ? styles.active : styles.slotStyles}>
-        {showOverlay ? <Close size={20} /> : <NavAppIconComponent />}
+        className={showOverlay ? styles.active : styles.slotStyles}
+      >
+        {showOverlay ? <Close size={20} /> : <Switcher size={20} />}
       </HeaderGlobalAction>
     </div>
   );

diff --git a/packages/esm-import-export-app/package.json b/packages/esm-import-export-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ehospital/esm-import-export-app",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Import and Export Micro-frontend for OpenMRS3",
   "browser": "dist/sjthc-esm-import-export-app.js",
   "main": "src/index.ts",
@@ -52,5 +52,5 @@
   "devDependencies": {
     "webpack": "^5.74.0"
   },
-  "gitHead": "88728baaf0c8c1127aa782d7957c18ef4d1d2fdf"
+  "gitHead": "5c98b15de606d8ed20e545aab6be67546a6dc3df"
 }
diff --git a/packages/esm-patient-registration-app/package.json b/packages/esm-patient-registration-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ehospital/esm-patient-registration-app",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Patient registration microfrontend for O3",
   "browser": "dist/sjthc-esm-patient-registration-app.js",
   "main": "src/index.ts",
@@ -54,5 +54,5 @@
   "devDependencies": {
     "webpack": "^5.74.0"
   },
-  "gitHead": "88728baaf0c8c1127aa782d7957c18ef4d1d2fdf"
+  "gitHead": "12c269b30d0cbaf91537798bd9f2ca42d62213c4"
 }