Skip to content

fix: add edit users sending up wrong data #6923

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

Open
kyle-ssg wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −15
Open

fix: add edit users sending up wrong data #6923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions frontend/common/services/useGroup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ export const groupService = service
}
//Add the members
if (query.users?.length) {
const { error } = await baseQuery({
const res = await baseQuery({
body: { user_ids: query.users.map((u) => u.id) },
method: 'POST',
url: `organisations/${query.orgId}/groups/${data.id}/`,
url: `organisations/${query.orgId}/groups/${data.id}/add-users/`,
})
if (res.error) {
return { error: res.error }
}
}
// Make the admins
await Promise.all(
Copy link
Contributor

@talissoncosta talissoncosta Mar 11, 2026

Choose a reason for hiding this comment

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

Should we handle errors in here also, what if createGroupAdmin fails in here ?

Expand Down Expand Up @@ -115,19 +118,25 @@ export const groupService = service
return { error }
}
//Add the members
if (query.users?.length) {
await baseQuery({
body: { user_ids: query.data.users.map((u) => u.id) },
if (query.usersToAdd?.length) {
const res = await baseQuery({
body: { user_ids: query.usersToAdd },
method: 'POST',
url: `organisations/${query.orgId}/groups/${data.id}/add-users/`,
})
if (res.error) {
return { error: res.error }
}
}
if (query.usersToRemove?.length) {
await baseQuery({
const res = await baseQuery({
body: { user_ids: query.usersToRemove },
method: 'POST',
url: `organisations/${query.orgId}/groups/${data.id}/remove-users/`,
})
if (res.error) {
return { error: res.error }
}
}
// Make the admins
await Promise.all(
Copy link
Contributor

@talissoncosta talissoncosta Mar 11, 2026

Choose a reason for hiding this comment

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

Same here, should these Promise.all calls handle errors for consistency with the add/remove users fix above?

Expand Down
3 changes: 1 addition & 2 deletions frontend/common/types/requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,7 @@ export type Req = {
updateGroup: Req['createGroup'] & {
orgId: number
data: UserGroup
users: UserGroup['users']

usersToAdd: number[] | null
usersToAddAdmin: number[] | null
usersToRemoveAdmin: number[] | null
usersToRemove: number[] | null
Expand Down
10 changes: 4 additions & 6 deletions frontend/web/components/UsersGroups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const UsersGroups: FC<UsersGroupsType> = ({ orgId, user }) => {
updateGroup({
data: { ...group, users: group.users.concat([user]) },
orgId: `${orgId}`,
users: group.users.concat([user]),
usersToAdd: [user.id],
usersToAddAdmin: null,
usersToRemove: null,
usersToRemoveAdmin: null,
Expand All @@ -97,7 +97,7 @@ const UsersGroups: FC<UsersGroupsType> = ({ orgId, user }) => {
updateGroup({
data: group,
orgId: `${orgId}`,
users: group.users,
usersToAdd: null,
usersToAddAdmin: null,
usersToRemove: [user.id],
usersToRemoveAdmin: null,
Expand All @@ -115,9 +115,7 @@ const UsersGroups: FC<UsersGroupsType> = ({ orgId, user }) => {
updateGroup({
data: { ...group, users: group.users.concat([user]) },
orgId: `${orgId}`,
users: isInGroup
? group.users
: group.users.concat([user]),
usersToAdd: isInGroup ? null : [user.id],
usersToAddAdmin: [user.id],
usersToRemove: null,
usersToRemoveAdmin: null,
Expand All @@ -126,7 +124,7 @@ const UsersGroups: FC<UsersGroupsType> = ({ orgId, user }) => {
updateGroup({
data: group,
orgId: `${orgId}`,
users: group.users,
usersToAdd: null,
usersToAddAdmin: null,
usersToRemove: null,
usersToRemoveAdmin: [user.id],
Expand Down
5 changes: 4 additions & 1 deletion frontend/web/components/modals/CreateGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ const CreateGroup: FC<CreateGroupType> = ({ group, orgId, roles }) => {
const getUsersToRemove = (usersToFilter: GroupUser[]) =>
filter(usersToFilter, ({ id }) => !find(users, { id }))

const getUsersToAdd = (existingUsers: GroupUser[]) =>
filter(users, ({ id }) => !find(existingUsers, { id }))

const getUsersAdminChanged = (existingUsers: GroupUser[], value: boolean) => {
return filter(users, (user) => {
if (!!user.group_admin !== value) {
Expand Down Expand Up @@ -140,7 +143,7 @@ const CreateGroup: FC<CreateGroupType> = ({ group, orgId, roles }) => {
updateGroup({
data,
orgId,
users: users as any,
usersToAdd: getUsersToAdd(groupData!.users).map((v) => v.id),
usersToAddAdmin: (usersToAddAdmin || []).map((user) => user.id),
usersToRemove: getUsersToRemove(groupData!.users).map((v) => v.id),
usersToRemoveAdmin: (usersToRemoveAdmin || []).map((user) => user.id),
Expand Down
Loading