Merge pull request #1098 from fahad-aot/bugfix/fwf-5429-localStoragekey-for-tenant-identification

bugfix/fwf-5429:updated localstorage with tenantData

Author: arun-s-aot

forms-flow-nav/src/Navbar.jsx

@@ -55,8 +55,8 @@ const NavBar = React.memo(({ props }) => {
     props.subscribe("ES_TENANT", (msg, data) => {
       if (data) {
         setTenant(data);
-        if (!JSON.parse(StorageService.get("TENANT_DATA"))?.name) {
-          StorageService.save("TENANT_DATA", JSON.stringify(data.tenantData));
+        if (!JSON.parse(StorageService.get("tenantData"))?.name) {
+          StorageService.save("tenantData", JSON.stringify(data.tenantData));
         }
       }
     });
@@ -79,7 +79,7 @@ const NavBar = React.memo(({ props }) => {
   }, [instance]);
 
   React.useEffect(() => {
-    const data = JSON.parse(StorageService.get("TENANT_DATA"));
+    const data = JSON.parse(StorageService.get("tenantData"));
     if (MULTITENANCY_ENABLED && data?.details) {
       setApplicationTitle(data?.details?.applicationTitle);
       const logo = data?.details?.customLogo?.logo || "/logo.svg";
@@ -181,7 +181,7 @@ const isUserManager = userRoles?.includes("manage_users");
 
   useEffect(() => {
     fetchSelectLanguages((data) => {
-      const tenantdata = JSON.parse(StorageService.get("TENANT_DATA"));
+      const tenantdata = JSON.parse(StorageService.get("tenantData"));
       const userLanguageList = (MULTITENANCY_ENABLED && tenantdata?.details?.langList) || USER_LANGUAGE_LIST;
       let userLanguagesArray = [];
       if (typeof userLanguageList === 'object') {

forms-flow-nav/src/services/tenant/index.js

@@ -9,7 +9,7 @@ export const fetchTenantDetails = (callback) => {
         tenantData: res.data
       }
       callback(tenant);
-      StorageService.save("TENANT_DATA", JSON.stringify(res.data))
+      StorageService.save("tenantData", JSON.stringify(res.data))
     })
     .catch((err) => console.log(err));
 };

forms-flow-nav/src/sidenav/ProfileSettingsModal.jsx

@@ -50,7 +50,7 @@ export const ProfileSettingsModal = ({ show, onClose, tenant, publish }) => {
   useEffect(() => { 
 
     fetchSelectLanguages((languages) => {
-      const tenantData = JSON.parse(StorageService.get("TENANT_DATA"));
+      const tenantData = JSON.parse(StorageService.get("tenantData"));
       const userLanguageList = (MULTITENANCY_ENABLED && tenantData?.details?.langList) || USER_LANGUAGE_LIST;
       const userLanguagesArray = typeof userLanguageList === 'object' ? Object.values(userLanguageList) : userLanguageList.split(',');
       const supportedLanguages = languages.filter(item => userLanguagesArray.includes(item.name));
@@ -59,7 +59,7 @@ export const ProfileSettingsModal = ({ show, onClose, tenant, publish }) => {
 
     // Calculate remaining days from expiry_dt 
     try {
-      const tenantDataStr = StorageService.get("TENANT_DATA");
+      const tenantDataStr = StorageService.get("tenantData");
       const expiry_dt = tenantDataStr 
         ? JSON.parse(tenantDataStr)?.expiry_dt 
         : tenant?.tenantData?.expiry_dt;

forms-flow-nav/src/sidenav/Sidebar.jsx

@@ -227,8 +227,8 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
     props.subscribe("ES_TENANT", (msg, data) => {
       if (data) {
         setTenant(data);
-        if (!JSON.parse(StorageService.get("TENANT_DATA"))?.name) {
-          StorageService.save("TENANT_DATA", JSON.stringify(data.tenantData));
+        if (!JSON.parse(StorageService.get("tenantData"))?.name) {
+          StorageService.save("tenantData", JSON.stringify(data.tenantData));
         }
       }
     });
@@ -262,7 +262,7 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
     }, [userDetail]);
 
   React.useEffect(() => {
-    const data = JSON.parse(StorageService.get("TENANT_DATA"));
+    const data = JSON.parse(StorageService.get("tenantData"));
     if (MULTITENANCY_ENABLED && data?.details) {
       setTenantName(data?.details?.applicationTitle);
       const logo = data?.details?.customLogo?.logo;

forms-flow-submissions/src/index.tsx

@@ -49,7 +49,7 @@ const Submissions: React.FC<SubmissionsProps> = React.memo((props) => {
   useEffect(() => {
     if (MULTITENANCY_ENABLED && tenantId) {
       // Get tenant data from StorageService
-      const storedTenantData = localStorage.getItem("TENANT_DATA");
+      const storedTenantData = localStorage.getItem("tenantData");
 
       if (storedTenantData) {
         try {