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

Added loader in UserManagement modal. #4452

Merged
merged 8 commits into from
Mar 5, 2024
Merged

Added loader in UserManagement modal. #4452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c5a34e
Added loader in UserManagement modal.
aryan-bhokare Feb 19, 2024
3523d78
Removed OverlaySpinner and extra state variable.
aryan-bhokare Feb 20, 2024
9bbad28
fixed web tests failing.
aryan-bhokare Feb 20, 2024
d55c599
fixed minwidth for all buttons.
aryan-bhokare Feb 21, 2024
3d4065c
Merge branch 'master' into userManagementLoader
Saranya-jena Feb 23, 2024
e580b7a
Merge branch 'master' into userManagementLoader
Saranya-jena Feb 23, 2024
142f6d8
Merge branch 'master' into userManagementLoader
Saranya-jena Mar 5, 2024
e4fdb49
Merge branch 'master' into userManagementLoader
Saranya-jena Mar 5, 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
4 changes: 2 additions & 2 deletions chaoscenter/web/src/controllers/DeleteApiToken/DeleteApiToken.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface DeleteApiTokenControllerProps {

export default function DeleteApiTokenController(props: DeleteApiTokenControllerProps): React.ReactElement {
const { token, apiTokensRefetch, handleClose } = props;
const { mutate: deleteApiTokenMutation } = useRemoveApiTokenMutation(
const { mutate: deleteApiTokenMutation, isLoading: deleteApiTokenMutationLoading } = useRemoveApiTokenMutation(
{},
{
onSuccess: () => {
Expand All @@ -23,5 +23,5 @@ export default function DeleteApiTokenController(props: DeleteApiTokenController
}
);

return <DeleteApiTokenView handleClose={handleClose} deleteApiTokenMutation={deleteApiTokenMutation} token={token} />;
return <DeleteApiTokenView handleClose={handleClose} deleteApiTokenMutation={deleteApiTokenMutation} deleteApiTokenMutationLoading={deleteApiTokenMutationLoading} token={token} />;
}
4 changes: 2 additions & 2 deletions chaoscenter/web/src/controllers/EnableDisableUser/EnableDisableUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function EnableDisableUserController(props: EnableDisableUserCont
const { getUsersRefetch } = props;
const { showSuccess } = useToaster();

const { mutate: updateStateMutation } = useUpdateStateMutation(
const { mutate: updateStateMutation, isLoading: updateStateMutationLoading} = useUpdateStateMutation(
{},
{
onSuccess: data => {
Expand All @@ -27,5 +27,5 @@ export default function EnableDisableUserController(props: EnableDisableUserCont
}
);

return <EnableDisableUserView {...props} updateStateMutation={updateStateMutation} />;
return <EnableDisableUserView {...props} updateStateMutation={updateStateMutation} updateStateMutationLoading={updateStateMutationLoading} />;
}
4 changes: 2 additions & 2 deletions chaoscenter/web/src/controllers/ResetPassword/ResetPassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export default function ResetPasswordController(props: ResetPasswordControllerPr
const { username, handleClose } = props;
const { getString } = useStrings();
const { showSuccess } = useToaster();
const { mutate: resetPasswordMutation } = useResetPasswordMutation(
const { mutate: resetPasswordMutation, isLoading: resetPasswordMutationLoading } = useResetPasswordMutation(
{},
{ onSuccess: () => showSuccess(getString('passwordResetSuccess')) }
);

return (
<ResetPasswordView username={username} handleClose={handleClose} resetPasswordMutation={resetPasswordMutation} />
<ResetPasswordView username={username} handleClose={handleClose} resetPasswordMutation={resetPasswordMutation} resetPasswordMutationLoading={resetPasswordMutationLoading} />
);
}
5 changes: 3 additions & 2 deletions chaoscenter/web/src/views/AccountDetailsChange/AccountDetailsChange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@ export default function AccountDetailsChangeView(props: AccountDetailsChangeView
<Button
type="submit"
variation={ButtonVariation.PRIMARY}
text={getString('confirm')}
text={updateDetailsMutationLoading ? <Icon name='loading' size={16}/> : getString('confirm')}
loading={updateDetailsMutationLoading}
disabled={isUserDetailsUpdated(formikProps.values)}
disabled={updateDetailsMutationLoading || isUserDetailsUpdated(formikProps.values)}
style={{minWidth: '90px'}}
/>
<Button
variation={ButtonVariation.TERTIARY}
Expand Down
5 changes: 3 additions & 2 deletions chaoscenter/web/src/views/AccountPasswordChange/AccountPasswordChange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,10 @@ export default function AccountPasswordChangeView(props: AccountPasswordChangeVi
<Button
type="submit"
variation={ButtonVariation.PRIMARY}
text={getString('confirm')}
text={updatePasswordMutationLoading ? <Icon name='loading' size={16}/> : getString('confirm')}
loading={updatePasswordMutationLoading}
disabled={isSubmitButtonDisabled(formikProps.values)}
disabled={updatePasswordMutationLoading || isSubmitButtonDisabled(formikProps.values)}
style={{minWidth: '90px'}}
/>
<Button
variation={ButtonVariation.TERTIARY}
Expand Down
4 changes: 3 additions & 1 deletion chaoscenter/web/src/views/CreateNewToken/CreateNewToken.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { UseMutateFunction } from '@tanstack/react-query';
import React from 'react';
import { FontVariation } from '@harnessio/design-system';
import { Layout, Container, FormInput, ButtonVariation, Text, Button } from '@harnessio/uicore';
import { Layout, Container, FormInput, ButtonVariation, Text, Button, OverlaySpinner } from '@harnessio/uicore';
import { Formik, Form } from 'formik';
import { Icon } from '@harnessio/icons';
import * as Yup from 'yup';
Expand Down Expand Up @@ -48,6 +48,7 @@ export default function CreateNewTokenView(props: CreateNewTokenViewProps): Reac
}

return (
<OverlaySpinner show={createNewTokenMutationLoading}>
<Layout.Vertical padding="medium" style={{ gap: '1rem' }}>
<Layout.Horizontal flex={{ alignItems: 'center', justifyContent: 'space-between' }}>
<Text font={{ variation: FontVariation.H4 }}>{getString('createNewToken')}</Text>
Expand Down Expand Up @@ -109,5 +110,6 @@ export default function CreateNewTokenView(props: CreateNewTokenViewProps): Reac
</Formik>
</Container>
</Layout.Vertical>
</OverlaySpinner>
);
}
9 changes: 5 additions & 4 deletions chaoscenter/web/src/views/CreateNewUser/CreateNewUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { UseMutateFunction } from '@tanstack/react-query';
import React from 'react';
import { FontVariation } from '@harnessio/design-system';
import { Layout, Container, FormInput, ButtonVariation, Text, Button } from '@harnessio/uicore';
import { Layout, Container, FormInput, ButtonVariation, Text, Button} from '@harnessio/uicore';
import { Formik, Form } from 'formik';
import { Icon } from '@harnessio/icons';
import * as Yup from 'yup';
Expand Down Expand Up @@ -111,9 +111,10 @@ export default function CreateNewUserView(props: CreateNewUserViewProps): React.
<Button
type="submit"
variation={ButtonVariation.PRIMARY}
text={getString('confirm')}
text={createNewUserMutationLoading ? <Icon name='loading' size={16}/> : getString('confirm')}
loading={createNewUserMutationLoading || formikProps.isSubmitting}
disabled={Object.keys(formikProps.errors).length > 0}
disabled={createNewUserMutationLoading || Object.keys(formikProps.errors).length > 0}
style={{minWidth: '90px'}}
/>
<Button
variation={ButtonVariation.TERTIARY}
Expand All @@ -122,7 +123,7 @@ export default function CreateNewUserView(props: CreateNewUserViewProps): React.
/>
</Layout.Horizontal>
</Layout.Vertical>
</Form>
</Form>
);
}}
</Formik>
Expand Down
7 changes: 5 additions & 2 deletions chaoscenter/web/src/views/DeleteApiToken/DeleteApiToken.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ interface DeleteApiTokenViewProps {
unknown
>;
token: string | undefined;
deleteApiTokenMutationLoading: boolean;
}

export default function DeleteApiTokenView(props: DeleteApiTokenViewProps): React.ReactElement {
const { handleClose, deleteApiTokenMutation, token } = props;
const { handleClose, deleteApiTokenMutation, token, deleteApiTokenMutationLoading} = props;
const { getString } = useStrings();

return (
Expand All @@ -33,7 +34,9 @@ export default function DeleteApiTokenView(props: DeleteApiTokenViewProps): Reac
type="submit"
variation={ButtonVariation.PRIMARY}
intent="danger"
text={getString('confirm')}
text={deleteApiTokenMutationLoading ? <Icon name='loading' size={16}/> : getString('confirm')}
style={{minWidth: '90px'}}
disabled={deleteApiTokenMutationLoading}
onClick={() =>
deleteApiTokenMutation({
body: {
Expand Down
37 changes: 22 additions & 15 deletions chaoscenter/web/src/views/EnableDisableUser/EnableDisableUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,29 @@ interface EnableDisableUserViewProps {
currentState: boolean | undefined;
username: string | undefined;
updateStateMutation: UseMutateFunction<UpdateStateOkResponse, unknown, UpdateStateMutationProps<never>, unknown>;
updateStateMutationLoading: boolean;
}

export default function EnableDisableUserView(props: EnableDisableUserViewProps): React.ReactElement {
const { handleClose, username, currentState, updateStateMutation } = props;
const { handleClose, username, currentState, updateStateMutation, updateStateMutationLoading } = props;
const { getString } = useStrings();

const handleMutation = () => {
updateStateMutation(
{
body: {
username: username ?? '',
isDeactivate: !currentState
}
},
{
onSuccess: () => {
handleClose();
}
}
)
}

return (
<Layout.Vertical padding="medium" style={{ gap: '1rem' }}>
<Layout.Horizontal flex={{ alignItems: 'center', justifyContent: 'space-between' }}>
Expand All @@ -33,20 +50,10 @@ export default function EnableDisableUserView(props: EnableDisableUserViewProps)
type="submit"
variation={ButtonVariation.PRIMARY}
intent={!currentState ? 'danger' : 'primary'}
text={getString('confirm')}
onClick={() =>
updateStateMutation(
{
body: {
username: username ?? '',
isDeactivate: !currentState
}
},
{
onSuccess: () => handleClose()
}
)
}
text={updateStateMutationLoading ? <Icon name='loading' size={16}/> : getString('confirm')}
disabled={updateStateMutationLoading}
style={{minWidth: '90px'}}
onClick={handleMutation}
/>
<Button variation={ButtonVariation.TERTIARY} text={getString('cancel')} onClick={() => handleClose()} />
</Layout.Horizontal>
Expand Down
8 changes: 5 additions & 3 deletions chaoscenter/web/src/views/ResetPassword/ResetPassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ interface ResetPasswordViewProps {
unknown
>;
username: string | undefined;
resetPasswordMutationLoading: boolean;
}
interface ResetPasswordFormProps {
password: string;
reEnterPassword: string;
}

export default function ResetPasswordView(props: ResetPasswordViewProps): React.ReactElement {
const { handleClose, resetPasswordMutation, username } = props;
const { handleClose, resetPasswordMutation, username, resetPasswordMutationLoading } = props;
const { getString } = useStrings();

function isSubmitButtonDisabled(values: ResetPasswordFormProps): boolean {
Expand Down Expand Up @@ -103,9 +104,10 @@ export default function ResetPasswordView(props: ResetPasswordViewProps): React.
<Button
type="submit"
variation={ButtonVariation.PRIMARY}
text={getString('confirm')}
disabled={isSubmitButtonDisabled(formikProps.values)}
text={resetPasswordMutationLoading ? <Icon name='loading' size={16}/> : getString('confirm')}
disabled={resetPasswordMutationLoading || isSubmitButtonDisabled(formikProps.values)}
onClick={() => formikProps.handleSubmit()}
style={{minWidth: '90px'}}
/>
<Button
variation={ButtonVariation.TERTIARY}
Expand Down
4 changes: 4 additions & 0 deletions chaoscenter/web/src/views/ResetPassword/__tests__/ResetPassword.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ describe('ResetPasswordView Component', () => {
<ResetPasswordView
handleClose={mockClose}
resetPasswordMutation={mockRestPasswordMutation}
resetPasswordMutationLoading={false}
username="testUser"
/>
</TestWrapper>
Expand All @@ -42,6 +43,7 @@ describe('ResetPasswordView Component', () => {
resetPasswordMutation={() => {
/* noop */
}}
resetPasswordMutationLoading={false}
username="testUser"
/>
);
Expand All @@ -56,6 +58,7 @@ describe('ResetPasswordView Component', () => {
<ResetPasswordView
handleClose={mockClose}
resetPasswordMutation={mockRestPasswordMutation}
resetPasswordMutationLoading={false}
username="testUser"
/>
</TestWrapper>
Expand All @@ -77,6 +80,7 @@ describe('ResetPasswordView Component', () => {
<ResetPasswordView
handleClose={mockClose}
resetPasswordMutation={mockRestPasswordMutation}
resetPasswordMutationLoading={false}
username="testUser"
/>
</TestWrapper>
Expand Down
Loading