deprecate/replace updateUserTeamRoles

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

Hide file tree

Showing 6 changed files with 50 additions and 22 deletions.
diff --git a/api/graphql/schema.graphql b/api/graphql/schema.graphql
@@ -2109,7 +2109,10 @@ type Mutation {
     @canFind(ability: "delete", find: "id")
   updateUserTeamRoles(
     teamRoleAssignments: UpdateUserTeamRolesInput! @spread
-  ): Team @guard @canFind(ability: "assignTeamMembers", find: "teamId")
+  ): Team
+    @guard
+    @canFind(ability: "assignTeamMembers", find: "teamId")
+    @deprecated(reason: "use updateUserRoles")
 
   # Notifications
   markNotificationAsRead(id: UUID!): Notification @guard # can only affect notifications belonging to the logged-in user

diff --git a/api/storage/app/lighthouse-schema.graphql b/api/storage/app/lighthouse-schema.graphql
@@ -178,7 +178,7 @@ type Mutation {
   createTeam(team: CreateTeamInput!): Team
   updateTeam(id: UUID!, team: UpdateTeamInput!): Team
   deleteTeam(id: UUID!): Team
-  updateUserTeamRoles(teamRoleAssignments: UpdateUserTeamRolesInput!): Team
+  updateUserTeamRoles(teamRoleAssignments: UpdateUserTeamRolesInput!): Team @deprecated(reason: "use updateUserRoles")
   markNotificationAsRead(id: UUID!): Notification
   markNotificationAsUnread(id: UUID!): Notification
   deleteNotification(id: UUID!): Notification

diff --git a/apps/web/src/pages/Teams/TeamMembersPage/components/AddTeamMemberDialog.tsx b/apps/web/src/pages/Teams/TeamMembersPage/components/AddTeamMemberDialog.tsx
@@ -66,12 +66,12 @@ AddTeamMemberDialogProps) => {
 
   const handleSave = async (formValues: TeamMemberFormValues) => {
     await executeMutation({
-      teamRoleAssignments: {
+      updateUserRolesInput: {
         userId: formValues.userId,
-        teamId: formValues.teamId,
-        roleAssignments: {
+        roleAssignmentsInput: {
           attach: {
             roles: formValues.roles,
+            team: formValues.teamId,
           },
         },
       },

diff --git a/apps/web/src/pages/Teams/TeamMembersPage/components/EditTeamMemberDialog.tsx b/apps/web/src/pages/Teams/TeamMembersPage/components/EditTeamMemberDialog.tsx
@@ -35,14 +35,15 @@ const EditTeamMemberDialog = ({ user, team }: EditTeamMemberDialogProps) => {
   const { roles, fetching } = useAvailableRoles();
   const [, executeMutation] = useMutation(UpdateUserTeamRoles_Mutation);
   const [isOpen, setIsOpen] = useState<boolean>(false);
+  const initialRolesIds = user.roles.map((role) => role.id);
 
   const methods = useForm<TeamMemberFormValues>({
     defaultValues: {
       userId: user.id,
       userDisplay: user.id,
       teamId: team.id,
       teamDisplay: team.id,
-      roles: user.roles.map((role) => role.id),
+      roles: initialRolesIds,
     },
   });
 
@@ -52,14 +53,29 @@ const EditTeamMemberDialog = ({ user, team }: EditTeamMemberDialogProps) => {
   } = methods;
 
   const handleSave = async (formValues: TeamMemberFormValues) => {
+    const rolesToAttach = formValues.roles.filter(
+      (role) => !initialRolesIds.includes(role),
+    );
+    const rolesToDetach = initialRolesIds.filter(
+      (role) => !formValues.roles.includes(role),
+    );
+
     await executeMutation({
-      teamRoleAssignments: {
+      updateUserRolesInput: {
         userId: formValues.userId,
-        teamId: formValues.teamId,
-        roleAssignments: {
-          attach: {
-            roles: formValues.roles,
-          },
+        roleAssignmentsInput: {
+          attach: rolesToAttach.length
+            ? {
+                roles: rolesToAttach,
+                team: team.id,
+              }
+            : undefined,
+          detach: rolesToDetach.length
+            ? {
+                roles: rolesToDetach,
+                team: team.id,
+              }
+            : undefined,
         },
       },
     })

diff --git a/apps/web/src/pages/Teams/TeamMembersPage/components/RemoveTeamMemberDialog.tsx b/apps/web/src/pages/Teams/TeamMembersPage/components/RemoveTeamMemberDialog.tsx
@@ -36,12 +36,12 @@ const RemoveTeamMemberDialog = ({
 
   const handleRemove = async () => {
     await executeMutation({
-      teamRoleAssignments: {
+      updateUserRolesInput: {
         userId: user.id,
-        teamId: team.id,
-        roleAssignments: {
+        roleAssignmentsInput: {
           detach: {
             roles: user.roles.map((role) => role.id),
+            team: team.id,
           },
         },
       },

diff --git a/apps/web/src/pages/Teams/TeamMembersPage/components/operations.ts b/apps/web/src/pages/Teams/TeamMembersPage/components/operations.ts
@@ -2,18 +2,27 @@ import { graphql } from "@gc-digital-talent/graphql";
 
 // eslint-disable-next-line import/prefer-default-export
 export const UpdateUserTeamRoles_Mutation = graphql(/* GraphQL */ `
-  mutation UpdateUserTeamRoles(
-    $teamRoleAssignments: UpdateUserTeamRolesInput!
-  ) {
-    updateUserTeamRoles(teamRoleAssignments: $teamRoleAssignments) {
+  mutation UpdateUserRoles($updateUserRolesInput: UpdateUserRolesInput!) {
+    updateUserRoles(updateUserRolesInput: $updateUserRolesInput) {
+      id
       roleAssignments {
+        id
         role {
+          id
           name
+          isTeamBased
+          displayName {
+            en
+            fr
+          }
         }
-        user {
+        team {
           id
-          firstName
-          lastName
+          name
+          displayName {
+            en
+            fr
+          }
         }
       }
     }