fix: add edit users sending up wrong data (#6923)

Author: kyle-ssg

frontend/common/services/useGroup.ts

@@ -27,14 +27,17 @@ 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(
+          const adminResults = await Promise.all(
             (query.usersToAddAdmin || []).map((v) =>
               createGroupAdmin(getStore(), {
                 group: data.id,
@@ -43,6 +46,10 @@ export const groupService = service
               }),
             ),
           )
+          const adminError = adminResults.find((r: any) => r.error)
+          if (adminError?.error) {
+            return { error: adminError.error }
+          }
           return { data }
         },
       }),
@@ -115,22 +122,28 @@ 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(
+          const addAdminResults = await Promise.all(
             (query.usersToAddAdmin || []).map((v) =>
               createGroupAdmin(getStore(), {
                 group: data.id,
@@ -139,8 +152,12 @@ export const groupService = service
               }),
             ),
           )
+          const addAdminError = addAdminResults.find((r: any) => r.error)
+          if (addAdminError?.error) {
+            return { error: addAdminError.error }
+          }
 
-          await Promise.all(
+          const removeAdminResults = await Promise.all(
             (query.usersToRemoveAdmin || []).map((v) =>
               deleteGroupAdmin(getStore(), {
                 group: data.id,
@@ -149,6 +166,10 @@ export const groupService = service
               }),
             ),
           )
+          const removeAdminError = removeAdminResults.find((r: any) => r.error)
+          if (removeAdminError?.error) {
+            return { error: removeAdminError.error }
+          }
           return { data }
         },
       }),

frontend/common/types/requests.ts

@@ -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

frontend/web/components/UsersGroups.tsx

@@ -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,
@@ -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,
@@ -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,
@@ -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],

frontend/web/components/modals/CreateGroup.tsx

@@ -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) {
@@ -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),