From c643a9ac2606582f1cd0979271ef8fb193c524d3 Mon Sep 17 00:00:00 2001
From: fahad-aot <fahad.k@aot-technologies.com>
Date: Sun, 8 Dec 2024 21:32:43 -0800
Subject: [PATCH 1/2] bugfix/fwf-4023:Fixed undefined in url on manage tab

---
 forms-flow-nav/src/sidenav/MenuComponent.jsx | 5 +----
 forms-flow-nav/src/sidenav/Sidebar.jsx       | 9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/forms-flow-nav/src/sidenav/MenuComponent.jsx b/forms-flow-nav/src/sidenav/MenuComponent.jsx
index d4b737742..369087638 100644
--- a/forms-flow-nav/src/sidenav/MenuComponent.jsx
+++ b/forms-flow-nav/src/sidenav/MenuComponent.jsx
@@ -18,11 +18,8 @@ const MenuComponent = ({
   const [tenant, setTenant] = React.useState({});
   const location = useLocation();
   const history = useHistory();
-  const tenantKey = tenant?.tenantId;
-  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : "/";
   const { t } = useTranslation();
   const noOptionsMenu = optionsCount === "0";
-
   React.useEffect(() => {
     subscribe("ES_TENANT", (msg, data) => {
       if (data) {
@@ -31,7 +28,7 @@ const MenuComponent = ({
           StorageService.save("TENANT_DATA", JSON.stringify(data.tenantData));
         }
       }
-    });
+    });  
   }, []);
 
   const handleHeaderClick = () => {
diff --git a/forms-flow-nav/src/sidenav/Sidebar.jsx b/forms-flow-nav/src/sidenav/Sidebar.jsx
index ac599eb59..78e9dfff1 100644
--- a/forms-flow-nav/src/sidenav/Sidebar.jsx
+++ b/forms-flow-nav/src/sidenav/Sidebar.jsx
@@ -97,7 +97,13 @@ const Sidebar = React.memo(({ props }) => {
       JSON.parse(StorageService.get(StorageService.User.USER_DETAILS)) || {}
     );
   }, [instance]);
-
+ 
+  React.useEffect(() => {
+    if (MULTITENANCY_ENABLED && !tenant.tenantId && instance?.isAuthenticated) {
+      fetchTenantDetails(setTenant);
+    }
+  }, [instance]);
+  
   React.useEffect(() => {
     props.subscribe("FF_AUTH", (msg, data) => {
       setInstance(data);
@@ -345,6 +351,7 @@ const Sidebar = React.memo(({ props }) => {
             )}
             {isAdmin && (
               <MenuComponent
+                baseUrl={baseUrl}
                 eventKey={SectionKeys.MANAGE}
                 optionsCount="3"
                 mainMenu="Manage"

From 5cf8aa78a1acdee984db7c8aa866f09b3d309288 Mon Sep 17 00:00:00 2001
From: fahad-aot <fahad.k@aot-technologies.com>
Date: Sun, 8 Dec 2024 23:01:31 -0800
Subject: [PATCH 2/2] added baseurl propvalidation

---
 forms-flow-nav/src/sidenav/MenuComponent.jsx | 4 +++-
 forms-flow-nav/src/sidenav/Sidebar.jsx       | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/forms-flow-nav/src/sidenav/MenuComponent.jsx b/forms-flow-nav/src/sidenav/MenuComponent.jsx
index 369087638..b79020160 100644
--- a/forms-flow-nav/src/sidenav/MenuComponent.jsx
+++ b/forms-flow-nav/src/sidenav/MenuComponent.jsx
@@ -14,6 +14,7 @@ const MenuComponent = ({
   subMenu,
   optionsCount,
   subscribe,
+  baseUrl
 }) => {
   const [tenant, setTenant] = React.useState({});
   const location = useLocation();
@@ -28,7 +29,7 @@ const MenuComponent = ({
           StorageService.save("TENANT_DATA", JSON.stringify(data.tenantData));
         }
       }
-    });  
+    });
   }, []);
 
   const handleHeaderClick = () => {
@@ -105,6 +106,7 @@ MenuComponent.propTypes = {
   ).isRequired,
   optionsCount: PropTypes.string.isRequired,
   subscribe: PropTypes.func.isRequired,
+  baseUrl: PropTypes.string.isRequired,
 };
 
 export default MenuComponent;
diff --git a/forms-flow-nav/src/sidenav/Sidebar.jsx b/forms-flow-nav/src/sidenav/Sidebar.jsx
index 78e9dfff1..fccdaf9ef 100644
--- a/forms-flow-nav/src/sidenav/Sidebar.jsx
+++ b/forms-flow-nav/src/sidenav/Sidebar.jsx
@@ -103,7 +103,7 @@ const Sidebar = React.memo(({ props }) => {
       fetchTenantDetails(setTenant);
     }
   }, [instance]);
-  
+
   React.useEffect(() => {
     props.subscribe("FF_AUTH", (msg, data) => {
       setInstance(data);
@@ -235,6 +235,7 @@ const Sidebar = React.memo(({ props }) => {
             {ENABLE_FORMS_MODULE &&
               (isCreateDesigns || isViewDesigns) && (
                 <MenuComponent
+                  baseUrl={baseUrl}
                   eventKey={SectionKeys.DESIGN}
                   optionsCount="5"
                   mainMenu="Design"
@@ -293,6 +294,7 @@ const Sidebar = React.memo(({ props }) => {
               isViewSubmissions &&
               ENABLE_APPLICATIONS_MODULE && (
                 <MenuComponent
+                  baseUrl={baseUrl}
                   eventKey={SectionKeys.SUBMIT}
                   optionsCount="1"
                   mainMenu="Submit"
@@ -312,6 +314,7 @@ const Sidebar = React.memo(({ props }) => {
               )}
               {(isViewTask || isManageTask) && ENABLE_TASKS_MODULE && (
               <MenuComponent
+                baseUrl={baseUrl}
                 eventKey={SectionKeys.REVIEW}
                 optionsCount="1"
                 mainMenu="Review"
@@ -327,6 +330,7 @@ const Sidebar = React.memo(({ props }) => {
             )}
             {isViewDashboard && ENABLE_DASHBOARDS_MODULE && (
               <MenuComponent
+                baseUrl={baseUrl}
                 eventKey={SectionKeys.ANALYZE}
                 optionsCount="2"
                 mainMenu="Analyze"