@@ -41,8 +41,13 @@ import { PER_PAGE_OPTIONS } from '../../../../helpers/shared/pagination';
41
41
import messages from '../../../../Messages' ;
42
42
import paths from '../../../../utilities/pathnames' ;
43
43
import PermissionsContext from '../../../../utilities/permissions-context' ;
44
+ import OrgAdminDropdown from '../../../user/OrgAdminDropdown' ;
45
+ import { useFlag } from '@unleash/proxy-client-react' ;
44
46
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' ] ;
46
51
47
52
const EmptyTable : React . FunctionComponent < { titleText : string } > = ( { titleText } ) => {
48
53
return (
@@ -210,6 +215,27 @@ const UsersTable: React.FunctionComponent<UsersTableProps> = ({ onAddUserClick,
210
215
id : user . username ,
211
216
is_active : user . is_active ,
212
217
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
+ ) ,
213
239
user . username ,
214
240
user . email ,
215
241
user . first_name ,
@@ -225,7 +251,8 @@ const UsersTable: React.FunctionComponent<UsersTableProps> = ({ onAddUserClick,
225
251
labelOff = { intl . formatMessage ( messages [ 'usersAndUserGroupsInactive' ] ) }
226
252
> </ Switch > ,
227
253
] ,
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' ] ) ) ,
229
256
{
230
257
cell : (
231
258
< ActionsColumn
0 commit comments