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: Set group name and number columns to handle Safari [DET-9948] [DET-9949] #8355

Merged
merged 3 commits into from
Nov 7, 2023
Merged

fix: Set group name and number columns to handle Safari [DET-9948] [DET-9949] #8355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b7e5ad
fix: Set group name and number columns to handle Safari [DET-9948]
mapmeld Nov 7, 2023
a162da1
display user and group count in parens
mapmeld Nov 7, 2023
b751632
Update webui/react/src/pages/Admin/index.tsx
mapmeld Nov 7, 2023
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
4 changes: 2 additions & 2 deletions webui/react/src/pages/Admin/GroupManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ const GroupManagement: React.FC = () => {
<Nameplate icon={<Icon name="group" title="Group" />} name={r.group.name ?? ''} />
),
title: 'Group',
width: 'fit-content',
width: '100%',
},
{
dataIndex: 'users',
Expand All @@ -273,7 +273,7 @@ const GroupManagement: React.FC = () => {
onCell: onRightClickableCell,
render: (_: string, r: V1GroupSearchResult) => r.numMembers,
title: 'Members',
width: 'fit-content',
width: '100%',
},
{
className: 'fullCell',
Expand Down
4 changes: 2 additions & 2 deletions webui/react/src/pages/Admin/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const SettingsContent: React.FC = () => {
items.push({
children: <UserManagement />,
key: TAB_KEYS[TabType.UserManagement],
label: `${TabType.UserManagement} ${users.length}`,
label: `${TabType.UserManagement} (${users.length})`,
});
},
});
Expand All @@ -86,7 +86,7 @@ const SettingsContent: React.FC = () => {
items.push({
children: <GroupManagement />,
key: TAB_KEYS[TabType.GroupManagement],
label: `${TabType.GroupManagement} ${totalGroup ?? ''}`,
label: `${TabType.GroupManagement} ${totalGroup !== undefined ? `(${totalGroup})` : ''}`,
});
}

Expand Down