Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add Admin Settings to NavigationTabbar (ET-194) #9423

Merged
merged 2 commits into from
May 28, 2024
Merged

fix: add Admin Settings to NavigationTabbar (ET-194) #9423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
822c92a
fix: add Admin Settings to NavigationTabbar
johnkim-det May 24, 2024
e451698
fixes
johnkim-det May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions webui/react/src/components/NavigationTabbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const NavigationTabbar: React.FC = () => {

const showNavigation = isAuthenticated && ui.showChrome;

const { canCreateWorkspace } = usePermissions();
const { canCreateWorkspace, canAdministrateUsers } = usePermissions();

const WorkspaceCreateModal = useModal(WorkspaceCreateModalComponent);

Expand Down Expand Up @@ -139,19 +139,27 @@ const NavigationTabbar: React.FC = () => {
</div>
),
},
];

if (canAdministrateUsers) {
overflowActionsTop.push({
johnkim-det marked this conversation as resolved.
Show resolved Hide resolved
icon: 'group',
label: 'Admin Settings',
onClick: (e: AnyMouseEvent) => handlePathUpdate(e, paths.admin()),
});
}

const overflowActionsBottom: OverflowActionProps[] = [
{
icon: 'settings',
label: 'Settings',
label: 'User Settings',
onClick: () => setShowSettings(true),
},
{
icon: 'user',
label: 'Sign out',
onClick: (e: AnyMouseEvent) => handlePathUpdate(e, paths.logout()),
},
];

const overflowActionsBottom: OverflowActionProps[] = [
{
external: true,
icon: 'docs',
Expand Down
Loading