Merge pull request #363 from fahad-aot/bugfix/fwf-4023-undefined-in-u…

…rl-on-manage-tab Bugfix/fwf 4023 undefined in url on manage tab
AOT-Technologies · Dec 9, 2024 · b5e0923 · b5e0923
2 parents 7180b14 + 5cf8aa7
commit b5e0923
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/forms-flow-nav/src/sidenav/MenuComponent.jsx b/forms-flow-nav/src/sidenav/MenuComponent.jsx
@@ -14,15 +14,13 @@ const MenuComponent = ({
   subMenu,
   optionsCount,
   subscribe,
+  baseUrl
 }) => {
   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) {
@@ -108,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
@@ -97,6 +97,12 @@ const Sidebar = React.memo(({ props, sidenavHeight }) => {
       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) => {
@@ -229,6 +235,7 @@ const Sidebar = React.memo(({ props, sidenavHeight }) => {
             {ENABLE_FORMS_MODULE &&
               (isCreateDesigns || isViewDesigns) && (
                 <MenuComponent
+                  baseUrl={baseUrl}
                   eventKey={SectionKeys.DESIGN}
                   optionsCount="5"
                   mainMenu="Design"
@@ -287,6 +294,7 @@ const Sidebar = React.memo(({ props, sidenavHeight }) => {
               isViewSubmissions &&
               ENABLE_APPLICATIONS_MODULE && (
                 <MenuComponent
+                  baseUrl={baseUrl}
                   eventKey={SectionKeys.SUBMIT}
                   optionsCount="1"
                   mainMenu="Submit"
@@ -306,6 +314,7 @@ const Sidebar = React.memo(({ props, sidenavHeight }) => {
               )}
               {(isViewTask || isManageTask) && ENABLE_TASKS_MODULE && (
               <MenuComponent
+                baseUrl={baseUrl}
                 eventKey={SectionKeys.REVIEW}
                 optionsCount="1"
                 mainMenu="Review"
@@ -321,6 +330,7 @@ const Sidebar = React.memo(({ props, sidenavHeight }) => {
             )}
             {isViewDashboard && ENABLE_DASHBOARDS_MODULE && (
               <MenuComponent
+                baseUrl={baseUrl}
                 eventKey={SectionKeys.ANALYZE}
                 optionsCount="2"
                 mainMenu="Analyze"
@@ -345,6 +355,7 @@ const Sidebar = React.memo(({ props, sidenavHeight }) => {
             )}
             {isAdmin && (
               <MenuComponent
+                baseUrl={baseUrl}
                 eventKey={SectionKeys.MANAGE}
                 optionsCount="3"
                 mainMenu="Manage"