empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 00:45:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fleet UI: Transition fixed to edit user modal (#11128)

Browse Source
This commit is contained in:
RachelElysia 2023-04-11 11:45:26 -04:00 committed by GitHub
parent 5176e86e26
commit 8ae9738dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/11087-fix-edit-user-modal-transition Normal file
View File

@ -0,0 +1 @@
- Fleet UI: Fix animation for opening edit user modal

42
frontend/pages/admin/UserManagementPage/components/UsersTable/UsersTable.tsx
View File

@ -432,29 +432,25 @@ const UsersTable = ({ router }: IUsersTableProps): JSX.Element => {
const userData = getUser(userEditing.type, userEditing.id);
return (
<Modal title="Edit user" onExit={toggleEditUserModal}>
<>
<EditUserModal
defaultEmail={userData?.email}
defaultName={userData?.name}
defaultGlobalRole={userData?.global_role}
defaultTeams={userData?.teams}
onCancel={toggleEditUserModal}
onSubmit={onEditUser}
availableTeams={teams || []}
isPremiumTier={isPremiumTier || false}
smtpConfigured={config?.smtp_settings.configured || false}
sesConfigured={config?.email?.backend === "ses" || false}
canUseSso={config?.sso_settings.enable_sso || false}
isSsoEnabled={userData?.sso_enabled}
isApiOnly={userData?.api_only || false}
isModifiedByGlobalAdmin
isInvitePending={userEditing.type === "invite"}
editUserErrors={editUserErrors}
isUpdatingUsers={isUpdatingUsers}
/>
</>
</Modal>
<EditUserModal
defaultEmail={userData?.email}
defaultName={userData?.name}
defaultGlobalRole={userData?.global_role}
defaultTeams={userData?.teams}
onCancel={toggleEditUserModal}
onSubmit={onEditUser}
availableTeams={teams || []}
isPremiumTier={isPremiumTier || false}
smtpConfigured={config?.smtp_settings.configured || false}
sesConfigured={config?.email?.backend === "ses" || false}
canUseSso={config?.sso_settings.enable_sso || false}
isSsoEnabled={userData?.sso_enabled}
isApiOnly={userData?.api_only || false}
isModifiedByGlobalAdmin
isInvitePending={userEditing.type === "invite"}
editUserErrors={editUserErrors}
isUpdatingUsers={isUpdatingUsers}
/>
);
};