Skip to content

Commit 57f0c18

Browse files
authored
Merge pull request #2657 from AkshataKatwal16/release-1.15.0
Issue feat: Filter prgyanpath program from condition to showcase switch program button for logged user
2 parents 22b8039 + acd451b commit 57f0c18

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

mfes/scp-teacher-repo/src/components/Header.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,18 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
423423
if (storedTenantData) {
424424
try {
425425
const parsedTenantData = JSON.parse(storedTenantData);
426-
setTenantData(parsedTenantData);
426+
427+
// Filter out pragyanpath tenant
428+
const filteredTenantData = parsedTenantData.filter(
429+
(tenant: any) => tenant?.tenantName?.toLowerCase() !== 'pragyanpath'
430+
);
431+
432+
setTenantData(filteredTenantData);
427433

428434
// Show switch button if there are multiple tenants or multiple roles in any tenant
429435
const shouldShowButton =
430-
parsedTenantData.length > 1 ||
431-
parsedTenantData.some((tenant: any) => tenant?.roles?.length > 1);
436+
filteredTenantData.length > 1 ||
437+
filteredTenantData.some((tenant: any) => tenant?.roles?.length > 1);
432438
setShowSwitchButton(shouldShowButton);
433439
} catch (error) {
434440
console.error('Error parsing tenantData:', error);

mfes/youthNet/src/components/Header.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,17 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
9292
if (storedTenantData) {
9393
try {
9494
const parsedTenantData = JSON.parse(storedTenantData);
95-
setTenantData(parsedTenantData);
95+
const filteredTenantData = parsedTenantData.filter(
96+
(tenant: any) => tenant?.tenantName?.toLowerCase() !== 'pragyanpath'
97+
);
98+
99+
setTenantData(filteredTenantData);
100+
96101

97102
// Show switch button if there are multiple tenants or multiple roles in any tenant
98103
const shouldShowButton =
99-
parsedTenantData.length > 1 ||
100-
parsedTenantData.some((tenant: any) => tenant?.roles?.length > 1);
104+
filteredTenantData.length > 1 ||
105+
filteredTenantData.some((tenant: any) => tenant?.roles?.length > 1);
101106
setShowSwitchButton(shouldShowButton);
102107
} catch (error) {
103108
console.error('Error parsing tenantData:', error);

0 commit comments

Comments
 (0)