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

Fixes #4673 Improvements in user management screen #4674

Merged
merged 7 commits into from
Jul 22, 2024
Merged

Fixes #4673 Improvements in user management screen #4674

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
148c170
fix: Accept Invitation Button duplicates
JanhaviAlekar May 24, 2024
32eaa8c
fix: Delete project Invite Dialog not closing on delete invite
JanhaviAlekar May 24, 2024
5cac8c2
fix: Leave project Dialog not closing on leaving project
JanhaviAlekar May 24, 2024
0400670
fix: handling create user error with toast
JanhaviAlekar May 24, 2024
1e03a53
Merge remote-tracking branch 'origin/master' into improvements-in-use…
JanhaviAlekar Jul 19, 2024
f6d530b
Merge branch 'master' into improvements-in-user-management-screen
JanhaviAlekar Jul 19, 2024
0bb6a70
Merge branch 'master' into improvements-in-user-management-screen
Saranya-jena Jul 22, 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
7 changes: 6 additions & 1 deletion chaoscenter/web/src/controllers/DeleteProjectInvitation/DeleteProjectInvitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ export default function DeleteProjectInvitationController(
const { handleClose, listInvitationsRefetch, projectID } = props;
const { mutate: declineInvitationMutation } = useDeclineInvitationMutation(
{},
{ onSuccess: () => listInvitationsRefetch() }
{
onSuccess: () => {
listInvitationsRefetch();
handleClose();
}
}
);

return (
Expand Down
1 change: 1 addition & 0 deletions chaoscenter/web/src/controllers/LeaveProject/LeaveProject.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default function LeaveProjectController(props: LeaveProjectControllerProp
onSuccess: () => {
projectsJoinedRefetch();
getUserWithProjectsRefetch();
handleClose();
}
}
);
Expand Down
6 changes: 5 additions & 1 deletion 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, useToaster } from '@harnessio/uicore';
import { Formik, Form } from 'formik';
import { Icon } from '@harnessio/icons';
import * as Yup from 'yup';
Expand All @@ -26,6 +26,7 @@ interface CreateNewUserFormProps {
export default function CreateNewUserView(props: CreateNewUserViewProps): React.ReactElement {
const { createNewUserMutation, createNewUserMutationLoading, handleClose } = props;
const { getString } = useStrings();
const { showError } = useToaster();

function handleSubmit(values: CreateNewUserFormProps): void {
createNewUserMutation(
Expand All @@ -41,6 +42,9 @@ export default function CreateNewUserView(props: CreateNewUserViewProps): React.
{
onSuccess: () => {
handleClose();
},
onError: (err: any) => {
showError(err.errorDescription);
amityt marked this conversation as resolved.
Show resolved Hide resolved
}
}
);
Expand Down
4 changes: 2 additions & 2 deletions chaoscenter/web/src/views/ProjectInvitations/ProjectInvitations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function MemoizedInvitationsTable(props: InvitationsTableProps): React.ReactElem
return (
<Layout.Horizontal flex={{ alignItems: 'center', justifyContent: 'flex-start' }} style={{ gap: '0.25rem' }}>
<Button
key={data.projectID}
key={`${data.projectID}-accept`}
variation={ButtonVariation.PRIMARY}
text={getString('acceptInvitation')}
onClick={() =>
Expand All @@ -122,7 +122,7 @@ function MemoizedInvitationsTable(props: InvitationsTableProps): React.ReactElem
}
/>
<Button
key={data.projectID}
key={`${data.projectID}-decline`}
icon="main-trash"
iconProps={{ size: 18, color: Color.RED_300 }}
variation={ButtonVariation.ICON}
Expand Down
Loading