Skip to content

Commit 7cfc362

Browse files
committed
bugfix/fwf-5429:updated localstorage with tenantData
1 parent 00e9b64 commit 7cfc362

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

forms-flow-nav/src/Navbar.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ const NavBar = React.memo(({ props }) => {
5555
props.subscribe("ES_TENANT", (msg, data) => {
5656
if (data) {
5757
setTenant(data);
58-
if (!JSON.parse(StorageService.get("TENANT_DATA"))?.name) {
59-
StorageService.save("TENANT_DATA", JSON.stringify(data.tenantData));
58+
if (!JSON.parse(StorageService.get("tenantData"))?.name) {
59+
StorageService.save("tenantData", JSON.stringify(data.tenantData));
6060
}
6161
}
6262
});
@@ -79,7 +79,7 @@ const NavBar = React.memo(({ props }) => {
7979
}, [instance]);
8080

8181
React.useEffect(() => {
82-
const data = JSON.parse(StorageService.get("TENANT_DATA"));
82+
const data = JSON.parse(StorageService.get("tenantData"));
8383
if (MULTITENANCY_ENABLED && data?.details) {
8484
setApplicationTitle(data?.details?.applicationTitle);
8585
const logo = data?.details?.customLogo?.logo || "/logo.svg";
@@ -181,7 +181,7 @@ const isUserManager = userRoles?.includes("manage_users");
181181

182182
useEffect(() => {
183183
fetchSelectLanguages((data) => {
184-
const tenantdata = JSON.parse(StorageService.get("TENANT_DATA"));
184+
const tenantdata = JSON.parse(StorageService.get("tenantData"));
185185
const userLanguageList = (MULTITENANCY_ENABLED && tenantdata?.details?.langList) || USER_LANGUAGE_LIST;
186186
let userLanguagesArray = [];
187187
if (typeof userLanguageList === 'object') {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const fetchTenantDetails = (callback) => {
99
tenantData: res.data
1010
}
1111
callback(tenant);
12-
StorageService.save("TENANT_DATA", JSON.stringify(res.data))
12+
StorageService.save("tenantData", JSON.stringify(res.data))
1313
})
1414
.catch((err) => console.log(err));
1515
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const ProfileSettingsModal = ({ show, onClose, tenant, publish }) => {
1818
useEffect(() => {
1919

2020
fetchSelectLanguages((languages) => {
21-
const tenantData = JSON.parse(StorageService.get("TENANT_DATA"));
21+
const tenantData = JSON.parse(StorageService.get("tenantData"));
2222
const userLanguageList = (MULTITENANCY_ENABLED && tenantData?.details?.langList) || USER_LANGUAGE_LIST;
2323
const userLanguagesArray = typeof userLanguageList === 'object' ? Object.values(userLanguageList) : userLanguageList.split(',');
2424
const supportedLanguages = languages.filter(item => userLanguagesArray.includes(item.name));
@@ -27,7 +27,7 @@ export const ProfileSettingsModal = ({ show, onClose, tenant, publish }) => {
2727

2828
// Calculate remaining days from expiry_dt
2929
try {
30-
const tenantDataStr = StorageService.get("TENANT_DATA");
30+
const tenantDataStr = StorageService.get("tenantData");
3131
const expiry_dt = tenantDataStr
3232
? JSON.parse(tenantDataStr)?.expiry_dt
3333
: tenant?.tenantData?.expiry_dt;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
227227
props.subscribe("ES_TENANT", (msg, data) => {
228228
if (data) {
229229
setTenant(data);
230-
if (!JSON.parse(StorageService.get("TENANT_DATA"))?.name) {
231-
StorageService.save("TENANT_DATA", JSON.stringify(data.tenantData));
230+
if (!JSON.parse(StorageService.get("tenantData"))?.name) {
231+
StorageService.save("tenantData", JSON.stringify(data.tenantData));
232232
}
233233
}
234234
});
@@ -262,7 +262,7 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
262262
}, [userDetail]);
263263

264264
React.useEffect(() => {
265-
const data = JSON.parse(StorageService.get("TENANT_DATA"));
265+
const data = JSON.parse(StorageService.get("tenantData"));
266266
if (MULTITENANCY_ENABLED && data?.details) {
267267
setTenantName(data?.details?.applicationTitle);
268268
const logo = data?.details?.customLogo?.logo;

forms-flow-submissions/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const Submissions: React.FC<SubmissionsProps> = React.memo((props) => {
4949
useEffect(() => {
5050
if (MULTITENANCY_ENABLED && tenantId) {
5151
// Get tenant data from StorageService
52-
const storedTenantData = localStorage.getItem("TENANT_DATA");
52+
const storedTenantData = localStorage.getItem("tenantData");
5353

5454
if (storedTenantData) {
5555
try {

0 commit comments

Comments
 (0)