Skip to content

Commit b73a7f2

Browse files
authored
feat: add dropdown to make user an org admin workspaces (#1771)
1 parent 70e4b28 commit b73a7f2

File tree

1 file changed

+29
-2
lines changed
  • src/smart-components/access-management/users-and-user-groups/users

1 file changed

+29
-2
lines changed

src/smart-components/access-management/users-and-user-groups/users/UsersTable.tsx

+29-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,13 @@ import { PER_PAGE_OPTIONS } from '../../../../helpers/shared/pagination';
4141
import messages from '../../../../Messages';
4242
import paths from '../../../../utilities/pathnames';
4343
import PermissionsContext from '../../../../utilities/permissions-context';
44+
import OrgAdminDropdown from '../../../user/OrgAdminDropdown';
45+
import { useFlag } from '@unleash/proxy-client-react';
4446

45-
const COLUMNS: string[] = ['Username', 'Email', 'First name', 'Last name', 'Status', 'Org admin'];
47+
const authModel = useFlag('platform.rbac.common-auth-model');
48+
const COLUMNS: string[] = authModel
49+
? ['Org admin', 'Username', 'Email', 'First name', 'Last name', 'Status']
50+
: ['Username', 'Email', 'First name', 'Last name', 'Status', 'Org admin'];
4651

4752
const EmptyTable: React.FunctionComponent<{ titleText: string }> = ({ titleText }) => {
4853
return (
@@ -210,6 +215,27 @@ const UsersTable: React.FunctionComponent<UsersTableProps> = ({ onAddUserClick,
210215
id: user.username,
211216
is_active: user.is_active,
212217
row: [
218+
authModel && orgAdmin ? (
219+
<OrgAdminDropdown
220+
key={`dropdown-${user.username}`}
221+
isOrgAdmin={user.is_org_admin}
222+
username={user.username}
223+
intl={intl}
224+
userId={user.uuid}
225+
fetchData={() => {
226+
fetchData({
227+
limit: perPage,
228+
offset: (page - 1) * perPage,
229+
orderBy: 'username',
230+
count: totalCount || 0,
231+
});
232+
}}
233+
/>
234+
) : user.is_org_admin ? (
235+
intl.formatMessage(messages['usersAndUserGroupsYes'])
236+
) : (
237+
intl.formatMessage(messages['usersAndUserGroupsNo'])
238+
),
213239
user.username,
214240
user.email,
215241
user.first_name,
@@ -225,7 +251,8 @@ const UsersTable: React.FunctionComponent<UsersTableProps> = ({ onAddUserClick,
225251
labelOff={intl.formatMessage(messages['usersAndUserGroupsInactive'])}
226252
></Switch>,
227253
],
228-
user.is_org_admin ? intl.formatMessage(messages['usersAndUserGroupsYes']) : intl.formatMessage(messages['usersAndUserGroupsNo']),
254+
!authModel &&
255+
(user.is_org_admin ? intl.formatMessage(messages['usersAndUserGroupsYes']) : intl.formatMessage(messages['usersAndUserGroupsNo'])),
229256
{
230257
cell: (
231258
<ActionsColumn

0 commit comments

Comments
 (0)