concat roles

Signed-off-by: FaheemOnHub <[email protected]>

Author: FaheemOnHub

src/custom/TeamTable/TeamTable.tsx

@@ -16,13 +16,12 @@ interface TeamTableProps {
   columns: MUIDataTableColumn[];
   updateCols: (cols: any) => void;
   isRemoveFromTeamAllowed: boolean;
-  isEditUserAllowed: any;
-  handleEditUser: any;
+  isEditUserAllowed?: any;
+  handleEditUser?: any;
   org_id: string;
   useGetUsersForOrgQuery: any;
   useNotificationHandlers: any;
   useRemoveUserFromTeamMutation: any;
-  availableRoles?: string[];
 }
 const StyledGrid = styled(Grid2)(({ theme }) => ({
   display: 'grid',

src/custom/UsersTable/UsersTable.tsx

@@ -115,9 +115,29 @@ const UsersTable: React.FC<UsersTableProps> = ({
     orgId: org_id
   });
 
+  //->calling without teamId filter to get organization roles
+  const { data: fullUserData } = useGetUsersForOrgQuery({
+    page: 0,
+    pagesize: pageSize,
+    search: search,
+    order: sortOrder,
+    orgId: org_id
+  });
+
   const [removeUserFromTeam] = useRemoveUserFromTeamMutation();
 
   const users = userData?.data || [];
+  const fullUsers = fullUserData?.data || [];
+
+  const enrichedUsers = users.map((teamUser: any) => {
+    const fullUser = fullUsers.find((fu: any) => fu.user_id === teamUser.user_id);
+    const teamRoles = teamUser.role_names || [];
+    const organizationRoles = fullUser?.organization_with_user_roles?.role_names || [];
+    return {
+      ...teamUser,
+      role_names: [...teamRoles, ...organizationRoles]
+    };
+  });
   const count = userData?.total_count || 0;
 
   const handleRemoveFromTeam = (data: any[]) => async () => {
@@ -407,7 +427,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
           fullWidth: true
         },
         customBodyRender: (_: string, tableMeta: MUIDataTableMeta) => {
-          const rowData = users[tableMeta.rowIndex];
+          const rowData = enrichedUsers[tableMeta.rowIndex];
           return parseDeletionTimestamp(rowData);
         }
       }
@@ -462,7 +482,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
       <div style={{ margin: 'auto', width: '100%' }}>
         <ResponsiveDataTable
           columns={columns}
-          data={users}
+          data={enrichedUsers}
           options={options}
           colViews={colViews}
           tableCols={tableCols}

src/custom/Workspaces/WorkspaceTeamsTable.tsx

@@ -147,8 +147,6 @@ const TeamsTable: React.FC<TeamsTableProps> = ({
         useGetUsersForOrgQuery={useGetUsersForOrgQuery}
         useNotificationHandlers={useNotificationHandlers}
         useRemoveUserFromTeamMutation={useRemoveUserFromTeamMutation}
-        isEditUserAllowed={false}
-        handleEditUser={() => {}}
       />
 
       <AssignmentModal