Skip to content

Commit 2bda950

Browse files
committed
#2128 admin can see both tools
1 parent c4f07a4 commit 2bda950

1 file changed

Lines changed: 21 additions & 7 deletions

File tree

src/frontend/src/pages/AdminToolsPage/AdminToolsPage.tsx

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,26 @@ const AdminToolsPage: React.FC = () => {
3939
tabs.push({ tabUrlValue: 'miscellaneous', tabName: 'Miscellaneous' });
4040
}
4141

42-
const showUserManagement = () => {
43-
return isUserAdmin ? <TeamsTools /> : isUserHead && <AdminToolsUserManagement />;
42+
const UserManagementTab = () => {
43+
return isUserAdmin ? (
44+
<>
45+
<AdminToolsUserManagement />
46+
<TeamsTools />
47+
</>
48+
) : (
49+
<AdminToolsUserManagement />
50+
);
4451
};
4552

46-
const showProjectConfiguration = () => {
47-
return isUserAdmin ? <AdminToolsBOMConfig /> : isUserHead && <AdminToolsProjectsConfig />;
53+
const ProjectConfigurationTab = () => {
54+
return isUserAdmin ? (
55+
<>
56+
<AdminToolsProjectsConfig />
57+
<AdminToolsBOMConfig />
58+
</>
59+
) : (
60+
<AdminToolsProjectsConfig />
61+
);
4862
};
4963

5064
return (
@@ -56,14 +70,14 @@ const AdminToolsPage: React.FC = () => {
5670
tabsLabels={tabs}
5771
baseUrl={routes.ADMIN_TOOLS}
5872
defaultTab={defaultTab}
59-
id="admin-tabs"
73+
id="admin-tools-tabs"
6074
/>
6175
}
6276
>
6377
{tabIndex === 0 ? (
64-
showUserManagement()
78+
<UserManagementTab />
6579
) : tabIndex === 1 ? (
66-
showProjectConfiguration()
80+
<ProjectConfigurationTab />
6781
) : tabIndex === 2 ? (
6882
<AdminToolsFinanceConfig />
6983
) : (

0 commit comments

Comments
 (0)