remove sync from RoleAssignmentHasMany

GCTC-NTGC · Jun 25, 2024 · 7e2d841 · 7e2d841
1 parent 81dd930
commit 7e2d841
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/api/graphql/schema.graphql b/api/graphql/schema.graphql
@@ -1679,7 +1679,6 @@ input RolesInput
 input RoleAssignmentHasMany {
   attach: RolesInput
   detach: RolesInput
-  sync: RolesInput
 }
 
 # This input only accepts Team-Based roles. It is assumed that a team id will be provided at a higher level of input.

diff --git a/api/storage/app/lighthouse-schema.graphql b/api/storage/app/lighthouse-schema.graphql
@@ -1457,7 +1457,6 @@ input RolesInput {
 input RoleAssignmentHasMany {
   attach: RolesInput
   detach: RolesInput
-  sync: RolesInput
 }
 
 input RolesForTeamInput {

diff --git a/apps/web/src/pages/Users/UpdateUserPage/components/EditTeamRoleDialog.tsx b/apps/web/src/pages/Users/UpdateUserPage/components/EditTeamRoleDialog.tsx
@@ -48,10 +48,11 @@ const EditTeamRoleDialog = ({
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const userDisplayName = getFullNameHtml(user.firstName, user.lastName, intl);
   const teamDisplayName = getLocalizedName(team.displayName, intl);
+  const initialRolesIds = initialRoles.map((role) => role.id);
 
   const methods = useForm<FormValues>({
     defaultValues: {
-      roles: initialRoles.map((role) => role.id),
+      roles: initialRolesIds,
     },
   });
 
@@ -61,13 +62,28 @@ const EditTeamRoleDialog = ({
   } = methods;
 
   const handleEditRoles = async (formValues: FormValues) => {
+    const rolesToAttach = formValues.roles.filter(
+      (role) => !initialRolesIds.includes(role),
+    );
+    const rolesToDetach = initialRolesIds.filter(
+      (role) => !formValues.roles.includes(role),
+    );
+
     return onEditRoles({
       userId: user.id,
       roleAssignmentsInput: {
-        sync: {
-          roles: formValues.roles,
-          team: team.id,
-        },
+        attach: rolesToAttach.length
+          ? {
+              roles: rolesToAttach,
+              team: team.id,
+            }
+          : undefined,
+        detach: rolesToDetach.length
+          ? {
+              roles: rolesToDetach,
+              team: team.id,
+            }
+          : undefined,
       },
     })
       .then(() => {