[Feature] Communities break apart on the update user page

api/app/Models/RoleAssignment.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Support\Facades\Gate;
 
 /**
  * Class User
@@ -51,9 +52,13 @@ public function getTeamableAttribute()
         }
 
         if (is_null($this->team->teamable)) {
+            Gate::authorize('view', $this->team);
+
             return $this->team;
         }
 
+        Gate::authorize('view', $this->team->teamable);
+
         return $this->team->teamable;
     }
 

api/graphql/schema.graphql

@@ -526,7 +526,7 @@ type Role {
 type RoleAssignment {
   id: ID!
   role: Role @belongsTo
-  teamable: HasRoleAssignments # Returns the related team, if it has a teamable returns that instead
+  teamable: HasRoleAssignments @guard # Returns the related team, if it has a teamable returns that instead, guarded in the accessor
   team: Team @belongsTo
   user: UserPublicProfile @morphTo
 }

apps/web/src/lang/fr.json

@@ -363,10 +363,6 @@
     "defaultMessage": "Diplôme d’études postsecondaires exigé",
     "description": "Education level message when candidate has a diploma found on the request page."
   },
-  "/pbxol": {
-    "defaultMessage": "Utilisez le bouton \"Ajouter une nouvelle adhésion\" pour commencer.",
-    "description": "Instructions for adding team membership to a user."
-  },
   "/qN7tM": {
     "defaultMessage": "Expérience supprimée",
     "description": "Message displayed to user after experience deleted."
@@ -883,10 +879,6 @@
     "defaultMessage": "Modifier {label}",
     "description": "Label for link to edit a specific item in a table"
   },
-  "2lNHxh": {
-    "defaultMessage": "Ajouter un nouveau rôle",
-    "description": "Label for the form to add a role to a user"
-  },
   "2ly5G8": {
     "defaultMessage": "L’autodéclaration aide notre équipe à mieux comprendre le bassin de candidats. Connaître la diversité du bassin de candidats aide l’équipe de recrutement et les gestionnaires d’embauche de Talents numériques du GC à éliminer les obstacles et à rendre notre processus plus inclusif. Cela nous permet également de suivre les progrès réalisés par rapport aux objectifs en matière de diversité et de veiller à ce que les groupes sous-représentés aient des possibilités équitables.",
     "description": "Paragraph 3, importance of self-declaration"
@@ -3539,10 +3531,6 @@
     "defaultMessage": "Citoyenneté :",
     "description": "Citizenship label"
   },
-  "GjaLl7": {
-    "defaultMessage": "Rôles des membres",
-    "description": "Title displayed for the role table display roles column"
-  },
   "Gki8Ex": {
     "defaultMessage": "{candidateCount, plural, one {<testId>{candidateCount}</testId> concordance approximative} other {<testId>{candidateCount}</testId> concordances approximatives} }",
     "description": "Message for total estimated matching candidates in pool"
@@ -3799,10 +3787,6 @@
     "defaultMessage": "Consentement notification par courriel",
     "description": "Legend text for email notification consent checkbox in getting started form"
   },
-  "Ibt1fL": {
-    "defaultMessage": "Ajouter une nouvelle adhésion",
-    "description": "Label for the form to add a team membership to a user"
-  },
   "IexFo4": {
     "defaultMessage": "Connaissance de l’autre langue officielle",
     "description": "Second language proficiency label"
@@ -6370,10 +6354,6 @@
     "defaultMessage": "{title} évaluation - {skillName}",
     "description": "Header for application screening decision dialog."
   },
-  "WCOVvw": {
-    "defaultMessage": "Utilisez le bouton \"Ajouter un nouveau rôle\" pour commencer.",
-    "description": "Instructions for adding a role to a user."
-  },
   "WDKT2K": {
     "defaultMessage": "Qu'est-ce qu'une CléGC?",
     "description": "GCKey question for what is GCKey"

apps/web/src/messages/adminMessages.ts

@@ -185,6 +185,30 @@ const messages = defineMessages({
     id: "ae3u1t",
     description: "Title for key field",
   },
+  rolesAdded: {
+    defaultMessage: "Role(s) added successfully",
+    id: "/17wgm",
+    description:
+      "Message displayed to user when one or more roles have been added to a user",
+  },
+  rolesUpdated: {
+    defaultMessage: "Member roles updated successfully",
+    id: "ALIgEC",
+    description:
+      "Alert displayed to user when a team member's roles have been updated",
+  },
+  rolesUpdateFailed: {
+    defaultMessage: "Member role update failed",
+    id: "Ly2bBb",
+    description:
+      "Alert displayed to user when an error occurs while editing a team member's roles",
+  },
+  roleRemoved: {
+    defaultMessage: "Role removed successfully",
+    id: "XcS2q2",
+    description:
+      "Message displayed to user when a role has been removed from a user",
+  },
 });
 
 export default messages;

apps/web/src/pages/Teams/TeamMembersPage/components/AddTeamMemberDialog.tsx

@@ -94,14 +94,7 @@ AddTeamMemberDialogProps) => {
         }
       })
       .catch(() => {
-        toast.error(
-          intl.formatMessage({
-            defaultMessage: "Member role update failed",
-            id: "Ly2bBb",
-            description:
-              "Alert displayed to user when an error occurs while editing a team member's roles",
-          }),
-        );
+        toast.error(intl.formatMessage(adminMessages.rolesUpdateFailed));
       });
   };
 

apps/web/src/pages/Teams/TeamMembersPage/components/EditTeamMemberDialog.tsx

@@ -81,25 +81,11 @@ const EditTeamMemberDialog = ({ user, team }: EditTeamMemberDialogProps) => {
       .then((res) => {
         if (!res.error) {
           setIsOpen(false);
-          toast.success(
-            intl.formatMessage({
-              defaultMessage: "Member roles updated successfully",
-              id: "ALIgEC",
-              description:
-                "Alert displayed to user when a team member's roles have been updated",
-            }),
-          );
+          toast.success(intl.formatMessage(adminMessages.rolesAdded));
         }
       })
       .catch(() => {
-        toast.error(
-          intl.formatMessage({
-            defaultMessage: "Member role update failed",
-            id: "Ly2bBb",
-            description:
-              "Alert displayed to user when an error occurs while editing a team member's roles",
-          }),
-        );
+        toast.error(intl.formatMessage(adminMessages.rolesUpdateFailed));
       });
   };
 

apps/web/src/pages/Users/UpdateUserPage/UpdateUserPage.tsx

@@ -44,6 +44,8 @@ import {
   UpdateUserRoles_Mutation,
   UpdateUserSub_Mutation,
 } from "./operations";
+import CommunityRoleTable from "./components/CommunityRoleTable";
+import ProcessRoleTable from "./components/ProcessRoleTable";
 
 const UpdateUserOptions_Query = graphql(/* GraphQL */ `
   query UpdateUserOptions {
@@ -398,6 +400,18 @@ const UpdateUserPage = () => {
               availableRoles={availableRoles}
               onUpdateUserRoles={handleUpdateUserRoles}
             />
+            <CommunityRoleTable
+              user={data.user}
+              authInfo={data.user?.authInfo}
+              availableRoles={availableRoles}
+              onUpdateUserRoles={handleUpdateUserRoles}
+            />
+            <ProcessRoleTable
+              user={data.user}
+              authInfo={data.user?.authInfo}
+              availableRoles={availableRoles}
+              onUpdateUserRoles={handleUpdateUserRoles}
+            />
             <Heading level="h2" size="h3" data-h2-font-weight="base(700)">
               {intl.formatMessage({
                 defaultMessage: "Advanced tools",