navbar code changes

AOT-Technologies · Oct 9, 2024 · b3cf5a2 · b3cf5a2
1 parent 79f9f50
commit b3cf5a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 40 deletions.
diff --git a/forms-flow-nav/src/sidenav/Sidebar.jsx b/forms-flow-nav/src/sidenav/Sidebar.jsx
@@ -35,8 +35,6 @@ import MenuComponent from "./MenuComponent";
 import { ApplicationLogo } from "@formsflow/components";
 
 const Sidebar = React.memo(({ props }) => {
-  const [tenantLogo, setTenantLogo] = React.useState("");
-  const [tenantName, setTenantName] = React.useState("");
   const [userDetail, setUserDetail] = React.useState({});
   const [instance, setInstance] = React.useState(props.getKcInstance());
   const [tenant, setTenant] = React.useState({});
@@ -45,12 +43,7 @@ const Sidebar = React.memo(({ props }) => {
   const history = useHistory();
   const tenantKey = tenant?.tenantId;
   const { t } = useTranslation();
-
-  // const [activeLink, setActiveLink] = useState("");
   const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : "/";
-  // const defaultLogoPath =
-  //   document.documentElement.style.getPropertyValue("--navbar-logo-path") ||
-  //   "/logo.svg";
   const userRoles = JSON.parse(
     StorageService.get(StorageService.User.USER_ROLE));
   const isCreateSubmissions = userRoles?.includes("create_submissions");
@@ -93,13 +86,13 @@ const Sidebar = React.memo(({ props }) => {
     props.subscribe("FF_AUTH", (msg, data) => {
       setInstance(data);
     });
-
-    props.subscribe("FF_PUBLIC", () => {
-      if (MULTITENANCY_ENABLED) {
-        setApplicationTitle(APPLICATION_NAME);
-        setTenantLogo(defaultLogoPath);
-      }
-    });
+ 
+    // props.subscribe("FF_PUBLIC", () => {
+    //   if (MULTITENANCY_ENABLED) {
+    //     setApplicationTitle(APPLICATION_NAME);
+    //     setTenantLogo(defaultLogoPath);
+    //   }
+    // });
 
     props.subscribe("ES_TENANT", (msg, data) => {
       if (data) {
@@ -133,14 +126,6 @@ const Sidebar = React.memo(({ props }) => {
     }
   }, [isAuthenticated]);
 
-  React.useEffect(() => {
-    const data = JSON.parse(StorageService.get("TENANT_DATA"));
-    if (MULTITENANCY_ENABLED && data?.details) {
-      setTenantName(data?.details?.applicationTitle);
-      const logo = data?.details?.customLogo?.logo;
-      setTenantLogo(logo);
-    }
-  }, [tenant]);
 
   const logout = () => {
     history.push(baseUrl);
@@ -151,12 +136,6 @@ const Sidebar = React.memo(({ props }) => {
     <>
       <div className="sidenav">
         <div className="logo-container">
-          {/* <img
-            className=""
-            src={Appname}
-            alt="applicationName"
-            data-testid="app-logo"
-          /> */}
           <ApplicationLogo data-testid="application-logo" />
         </div>
         <div className="options-container" data-testid="options-container">

diff --git a/forms-flow-nav/src/sidenav/hamburgerMenu.jsx b/forms-flow-nav/src/sidenav/hamburgerMenu.jsx
@@ -4,12 +4,10 @@ import Container from "react-bootstrap/Container";
 import Nav from "react-bootstrap/Nav";
 import Navbar from "react-bootstrap/Navbar";
 import "./hamburger.scss";
-// import Appname from "./formsflow.svg";
 import Offcanvas from "react-bootstrap/Offcanvas";
 import Sidebar from "./Sidebar";
-// import hamburger from "./hamburger.svg";
-// import closebutton from "./closebutton.svg";
 import { HamburgerIcon, CloseIcon, ApplicationLogo } from "@formsflow/components";
+
 function HamburgerMenu({ props }) {
   const [show, setShow] = useState(false);
   const handleClose = () => setShow(false);
@@ -25,24 +23,15 @@ function HamburgerMenu({ props }) {
           data-testid="hamburger-button"
           aria-label="Open sidebar"
         >
-          {/* <img src={hamburger} alt="hamburger icon" /> */}
           <HamburgerIcon data-testid="hamburger-button" aria-label="hamburger button" color={getComputedStyle(document.documentElement).getPropertyValue("--ff-gray-800")} />
         </button>
         <Navbar.Brand href="" className="mx-auto">
-          {/* <img className="" src={Appname} alt="applicationName" /> */}
           <ApplicationLogo data-testid="application-logo" />
         </Navbar.Brand>
         <Navbar.Collapse id="basic-navbar-nav" className="order-2">
           <Nav className="me-auto">
             <Offcanvas show={show} onHide={handleClose} data-testid="offcanvas">
               <Offcanvas.Header className="offcanvas-header">
-                {/* <img
-                  src={closebutton}
-                  alt="close icon"
-                  onClick={handleClose}
-                  data-testid="close-button"
-                  aria-label="Close sidebar"
-                /> */}
                 <CloseIcon onClick={handleClose} data-testid="close-button" aria-label="Close sidebar" />
               </Offcanvas.Header>
               <Offcanvas.Body>