Skip to content

feat: migrate UI from RemoveOrganizationUser to RemoveOrganizationMember #1563

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

Merged
rohilsurana merged 2 commits into from
Apr 22, 2026
Merged

feat: migrate UI from RemoveOrganizationUser to RemoveOrganizationMember #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a000b40
feat: migrate UI from RemoveOrganizationUser to RemoveOrganizationMember
rohilsurana Apr 21, 2026
c53a16a
chore: update @raystack/proton to 0.1.0-432d98ce
rohilsurana Apr 21, 2026
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
2 changes: 1 addition & 1 deletion web/apps/admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@radix-ui/react-icons": "^1.3.0",
"@raystack/apsara": "0.56.6",
"@raystack/frontier": "workspace:^",
"@raystack/proton": "0.1.0-a34fad75e08453004b9a8c0931e4ca9b087de8cd",
"@raystack/proton": "0.1.0-432d98ce56451cd9461a755d8db4842ec4354669",
"@stitches/react": "^1.2.8",
"@tanstack/react-query": "^5.90.2",
"@tanstack/react-query-devtools": "^5.90.2",
Expand Down
14 changes: 7 additions & 7 deletions web/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions web/sdk/admin/views/organizations/details/members/remove-member.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { SearchOrganizationUsersResponse_OrganizationUser } from "@raystack/proton/frontier";
import {
FrontierServiceQueries,
RemoveOrganizationUserRequestSchema,
RemoveOrganizationMemberRequestSchema,
} from "@raystack/proton/frontier";
import { create } from "@bufbuild/protobuf";
import { useMutation } from "@connectrpc/connect-query";
Expand All @@ -23,17 +23,18 @@ export const RemoveMember = ({
onClose,
}: RemoveMemberProps) => {
const t = useTerminology();
const { mutateAsync: removeOrganizationUser, isPending } = useMutation(
FrontierServiceQueries.removeOrganizationUser,
const { mutateAsync: removeOrganizationMember, isPending } = useMutation(
FrontierServiceQueries.removeOrganizationMember,
);

async function onSubmit() {
try {
if (!user) return;
await removeOrganizationUser(
create(RemoveOrganizationUserRequestSchema, {
id: organizationId,
userId: user?.id || "",
await removeOrganizationMember(
create(RemoveOrganizationMemberRequestSchema, {
orgId: organizationId,
principalId: user?.id || "",
principalType: "app/user",
}),
);
if (onRemove) {
Expand Down
2 changes: 1 addition & 1 deletion web/sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"@connectrpc/connect-web": "2.1.1",
"@hookform/resolvers": "^3.10.0",
"@raystack/apsara-v1": "npm:@raystack/apsara@1.0.0-rc.2",
"@raystack/proton": "0.1.0-a34fad75e08453004b9a8c0931e4ca9b087de8cd",
"@raystack/proton": "0.1.0-432d98ce56451cd9461a755d8db4842ec4354669",
"@tanstack/react-query": "^5.90.2",
"@tanstack/react-router": "^1.168.3",
"axios": "^1.9.0",
Expand Down
20 changes: 11 additions & 9 deletions web/sdk/react/views-new/members/components/remove-member-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useMutation } from '@connectrpc/connect-query';
import {
FrontierServiceQueries,
DeleteOrganizationInvitationRequestSchema,
RemoveOrganizationUserRequestSchema
RemoveOrganizationMemberRequestSchema
} from '@raystack/proton/frontier';
import {
Button,
Expand Down Expand Up @@ -43,17 +43,17 @@ export function RemoveMemberDialog({ handle, refetch }: RemoveMemberDialogProps)
{
onSuccess: () => {
handle.close();
toastManager.add({ title: 'Member deleted', type: 'success' });
toastManager.add({ title: 'Invitation deleted', type: 'success' });
}
}
);

const { mutateAsync: removeUser } = useMutation(
FrontierServiceQueries.removeOrganizationUser,
const { mutateAsync: removeMember } = useMutation(
FrontierServiceQueries.removeOrganizationMember,
{
onSuccess: () => {
handle.close();
toastManager.add({ title: 'Member deleted', type: 'success' });
toastManager.add({ title: 'User removed', type: 'success' });
Copy link
Copy Markdown
Member

@whoAbhishekSah whoAbhishekSah Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use "member" consistently everywhere?

Copy link
Copy Markdown
Member Author

@rohilsurana rohilsurana Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes more sense to use "User" in places where it is only used for user, (n this case hardcoded app/user principal type)

}
}
);
Expand All @@ -68,16 +68,18 @@ export function RemoveMemberDialog({ handle, refetch }: RemoveMemberDialogProps)
});
await deleteInvitation(req);
} else {
const req = create(RemoveOrganizationUserRequestSchema, {
id: organizationId,
userId: memberId
const req = create(RemoveOrganizationMemberRequestSchema, {
orgId: organizationId,
principalId: memberId,
principalType: 'app/user'
});
await removeUser(req);
await removeMember(req);
}
} catch (error) {
handleConnectError(error, {
NotFound: (err) => toastManager.add({ title: 'Not found', description: err.message, type: 'error' }),
PermissionDenied: () => toastManager.add({ title: "You don't have permission to perform this action", type: 'error' }),
FailedPrecondition: (err) => toastManager.add({ title: 'Cannot remove user', description: err.message, type: 'error' }),
Default: (err) => toastManager.add({ title: 'Something went wrong', description: err.message, type: 'error' }),
});
} finally {
Expand Down
19 changes: 10 additions & 9 deletions web/sdk/react/views/members/remove-member-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useMutation } from '@connectrpc/connect-query';
import {
FrontierServiceQueries,
DeleteOrganizationInvitationRequestSchema,
RemoveOrganizationUserRequestSchema
RemoveOrganizationMemberRequestSchema
} from '@raystack/proton/frontier';
import { create } from '@bufbuild/protobuf';

Expand All @@ -34,7 +34,7 @@ export const RemoveMemberDialog = ({
{
onSuccess: () => {
onOpenChange(false);
toast.success('Member deleted');
toast.success('Invitation deleted');
},
onError: (error: any) => {
toast.error('Something went wrong', {
Expand All @@ -44,12 +44,12 @@ export const RemoveMemberDialog = ({
}
);

const { mutateAsync: removeUser } = useMutation(
FrontierServiceQueries.removeOrganizationUser,
const { mutateAsync: removeMember } = useMutation(
FrontierServiceQueries.removeOrganizationMember,
{
onSuccess: () => {
onOpenChange(false);
toast.success('Member deleted');
toast.success('User removed');
},
onError: (error: any) => {
toast.error('Something went wrong', {
Expand All @@ -69,11 +69,12 @@ export const RemoveMemberDialog = ({
});
await deleteInvitation(req);
} else {
const req = create(RemoveOrganizationUserRequestSchema, {
id: organizationId,
userId: memberId
const req = create(RemoveOrganizationMemberRequestSchema, {
orgId: organizationId,
principalId: memberId,
principalType: 'app/user'
});
await removeUser(req);
await removeMember(req);
}
} catch (error: any) {
toast.error('Something went wrong', {
Expand Down
6 changes: 6 additions & 0 deletions web/sdk/utils/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ type ErrorHandlerMap = {
AlreadyExists?: ErrorHandler;
InvalidArgument?: ErrorHandler;
PermissionDenied?: ErrorHandler;
FailedPrecondition?: ErrorHandler;
NotFound?: ErrorHandler;
Default?: ErrorHandler;
};
Expand Down Expand Up @@ -51,6 +52,11 @@ export function handleConnectError(
? handlers.NotFound(connectError)
: defaultHandler(connectError);
break;
case Code.FailedPrecondition:
handlers?.FailedPrecondition
? handlers.FailedPrecondition(connectError)
: defaultHandler(connectError);
break;
default:
defaultHandler(connectError);
}
Expand Down
Loading