Skip to content

fix(admin): use Radio for single-select role assignment #1631

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
paanSinghCoder merged 3 commits into from
May 21, 2026
Merged

fix(admin): use Radio for single-select role assignment #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a64547
fix(admin): use Radio for single-select role assignment
paanSinghCoder May 20, 2026
920df84
Merge branch 'main' into fix/assign-role-radio
paanSinghCoder May 20, 2026
cc8590f
Merge branch 'main' into fix/assign-role-radio
paanSinghCoder May 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
28 changes: 11 additions & 17 deletions web/sdk/admin/components/AssignRole.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
Button,
Checkbox,
Dialog,
Flex,
Label,
Radio,
Text,
toastManager,
} from "@raystack/apsara-v1";
Expand Down Expand Up @@ -62,13 +62,6 @@ export const AssignRole = ({

const selectedRoleId = watch("roleId");

function onCheckedChange(value: boolean | string, roleId?: string) {
if (!roleId) return;
if (value) {
setValue("roleId", roleId, { shouldDirty: true });
}
}

const onSubmit = async (data: FormData) => {
try {
await setMemberRole(
Expand Down Expand Up @@ -106,20 +99,21 @@ export const AssignRole = ({
Taking this action may result in changes in the role which might
lead to changes in access of the user.
</Text>
<div role="group" aria-labelledby="roles-group">
<Radio.Group
value={selectedRoleId}
onValueChange={(value) =>
setValue("roleId", value as string, { shouldDirty: true })
}
>
<Flex direction="column" gap={4}>
{roles.map((role) => {
const htmlId = `role-${role.id}`;
const checked = selectedRoleId === role.id;
return (
<Flex gap={3} key={role.id}>
<Checkbox
<Radio
id={htmlId}
data-test-id={`role-checkbox-${role.id}`}
checked={checked}
onCheckedChange={(value) =>
onCheckedChange(value, role.id)
}
value={role.id || ""}
data-test-id={`role-radio-${role.id}`}
/>
<Label htmlFor={htmlId}>{role.title}</Label>
</Flex>
Expand All @@ -129,7 +123,7 @@ export const AssignRole = ({
<Text variant="danger">{errors.roleId.message}</Text>
)}
</Flex>
</div>
</Radio.Group>
</Flex>
</Dialog.Body>
<Dialog.Footer>
Expand Down
23 changes: 11 additions & 12 deletions web/sdk/admin/views/organizations/details/projects/members/assign-role.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
Button,
Checkbox,
Dialog,
Flex,
Label,
Radio,
Text,
toastManager,
} from "@raystack/apsara-v1";
Expand Down Expand Up @@ -105,22 +105,21 @@ export const AssignRole = ({
Taking this action may result in changes in the role which might
lead to changes in access of the user.
</Text>
<div role="group" aria-labelledby="roles-group">
<Radio.Group
value={selectedRoleId}
onValueChange={(value) =>
setValue("roleId", value as string, { shouldDirty: true })
}
>
<Flex direction="column" gap={4}>
{roles.map((role) => {
const htmlId = `role-${role.id}`;
const checked = selectedRoleId === role.id;
return (
<Flex gap={3} key={role.id}>
<Checkbox
<Radio
id={htmlId}
data-test-id={`role-checkbox-${role.id}`}
checked={checked}
onCheckedChange={() =>
setValue("roleId", role.id || "", {
shouldDirty: true,
})
}
value={role.id || ""}
data-test-id={`role-radio-${role.id}`}
/>
<Label htmlFor={htmlId}>{role.title}</Label>
</Flex>
Expand All @@ -130,7 +129,7 @@ export const AssignRole = ({
<Text variant="danger">{errors.roleId.message}</Text>
)}
</Flex>
</div>
</Radio.Group>
</Flex>
</Dialog.Body>
<Dialog.Footer>
Expand Down
Loading