Skip to content

Commit e6da72d

Browse files
committed
add teams func
Signed-off-by: FaheemOnHub <[email protected]>
1 parent b790461 commit e6da72d

File tree

3 files changed

+50
-15
lines changed

3 files changed

+50
-15
lines changed

src/custom/TeamTable/TeamTable.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ interface TeamTableProps {
1616
columns: MUIDataTableColumn[];
1717
updateCols: (cols: any) => void;
1818
isRemoveFromTeamAllowed: boolean;
19+
isEditUserAllowed: any;
20+
handleEditUser: any;
1921
org_id: string;
2022
useGetUsersForOrgQuery: any;
2123
useNotificationHandlers: any;
2224
useRemoveUserFromTeamMutation: any;
25+
availableRoles?: string[];
2326
}
2427
const StyledGrid = styled(Grid2)(({ theme }) => ({
2528
display: 'grid',
@@ -39,6 +42,8 @@ const TeamTable: React.FC<TeamTableProps> = ({
3942
columns,
4043
updateCols,
4144
isRemoveFromTeamAllowed,
45+
isEditUserAllowed,
46+
handleEditUser,
4247
org_id,
4348
useGetUsersForOrgQuery,
4449
useNotificationHandlers,
@@ -66,6 +71,8 @@ const TeamTable: React.FC<TeamTableProps> = ({
6671
<UsersTable
6772
teamID={teamID}
6873
isRemoveFromTeamAllowed={isRemoveFromTeamAllowed}
74+
isEditUserAllowed={isEditUserAllowed}
75+
handleEditUser={handleEditUser}
6976
org_id={org_id}
7077
useGetUsersForOrgQuery={useGetUsersForOrgQuery}
7178
useNotificationHandlers={useNotificationHandlers}

src/custom/UsersTable/UsersTable.tsx

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,55 @@ import UserTableAvatarInfo from './UserTableAvatarInfo';
2222
interface ActionButtonsProps {
2323
tableMeta: MUIDataTableMeta;
2424
isRemoveFromTeamAllowed: boolean;
25+
isEditUserAllowed: boolean;
2526
handleRemoveFromTeam: (data: any[]) => () => void;
27+
handleEditUser: (data: any[]) => () => void;
2628
theme?: Theme;
2729
}
2830

2931
const ActionButtons: React.FC<ActionButtonsProps> = ({
3032
tableMeta,
3133
handleRemoveFromTeam,
34+
handleEditUser,
3235
isRemoveFromTeamAllowed,
36+
isEditUserAllowed,
3337
theme
3438
}) => {
3539
return (
36-
<div>
40+
<TableIconsContainer>
41+
{isEditUserAllowed ? (
42+
<TooltipIcon
43+
id={`edit_user-${tableMeta.rowIndex}`}
44+
onClick={handleEditUser(tableMeta.rowData)}
45+
title="Edit user"
46+
iconType="edit"
47+
>
48+
<EditIcon fill={theme?.palette.text.primary} />
49+
</TooltipIcon>
50+
) : (
51+
<EditIcon
52+
style={{
53+
marginRight: '.5rem'
54+
}}
55+
fill={CHARCOAL}
56+
height="30"
57+
width="30"
58+
/>
59+
)}
60+
3761
{isRemoveFromTeamAllowed ? (
38-
<TableIconsContainer>
39-
<TooltipIcon
40-
id={`delete_user-${tableMeta.rowIndex}`}
41-
onClick={handleRemoveFromTeam(tableMeta.rowData)}
42-
title="Remove user membership from team"
43-
iconType="delete"
44-
>
45-
<LogoutIcon fill={theme?.palette.icon.default} />
46-
</TooltipIcon>
47-
</TableIconsContainer>
62+
<TooltipIcon
63+
id={`delete_user-${tableMeta.rowIndex}`}
64+
onClick={handleRemoveFromTeam(tableMeta.rowData)}
65+
title="Remove user membership from team"
66+
iconType="delete"
67+
>
68+
<LogoutIcon fill={theme?.palette.text.primary} />
69+
</TooltipIcon>
4870
) : (
49-
<TableIconsDisabledContainer>
50-
<LogoutIcon fill={theme?.palette.icon.disabled} secondaryFill={CHARCOAL} />
51-
</TableIconsDisabledContainer>
71+
<LogoutIcon fill={CHARCOAL} secondaryFill={CHARCOAL} />
5272
)}
53-
</div>
73+
</TableIconsContainer>
5474
);
5575
};
5676

@@ -61,6 +81,8 @@ interface UsersTableProps {
6181
useRemoveUserFromTeamMutation: any;
6282
useNotificationHandlers: any;
6383
isRemoveFromTeamAllowed: boolean;
84+
isEditUserAllowed: boolean;
85+
handleEditUser: (data: any[]) => () => void;
6486
theme?: Theme;
6587
}
6688

@@ -71,6 +93,8 @@ const UsersTable: React.FC<UsersTableProps> = ({
7193
useRemoveUserFromTeamMutation,
7294
useNotificationHandlers,
7395
isRemoveFromTeamAllowed,
96+
isEditUserAllowed,
97+
handleEditUser,
7498
theme
7599
}) => {
76100
const [page, setPage] = useState<number>(0);
@@ -412,7 +436,9 @@ const UsersTable: React.FC<UsersTableProps> = ({
412436
<ActionButtons
413437
tableMeta={tableMeta}
414438
handleRemoveFromTeam={handleRemoveFromTeam}
439+
handleEditUser={handleEditUser}
415440
isRemoveFromTeamAllowed={isRemoveFromTeamAllowed}
441+
isEditUserAllowed={isEditUserAllowed}
416442
theme={theme}
417443
/>
418444
)

src/custom/Workspaces/WorkspaceTeamsTable.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ const TeamsTable: React.FC<TeamsTableProps> = ({
147147
useGetUsersForOrgQuery={useGetUsersForOrgQuery}
148148
useNotificationHandlers={useNotificationHandlers}
149149
useRemoveUserFromTeamMutation={useRemoveUserFromTeamMutation}
150+
isEditUserAllowed={false}
151+
handleEditUser={() => {}}
150152
/>
151153

152154
<AssignmentModal

0 commit comments

Comments
 (0)