Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add condition for "manage-organization" permission #121

Merged
merged 5 commits into from
Aug 11, 2023
Merged

add condition for "manage-organization" permission #121

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4315a2
add condition for "manage-organization" permission
ilyarudyi Aug 3, 2023
f567f5c
update changelog
ilyarudyi Aug 9, 2023
8ecf7c7
user with manage-organization permission should see all roles when ed…
ilyarudyi Aug 10, 2023
a09e115
update changelog
ilyarudyi Aug 10, 2023
4bf983c
Merge branch 'master' into fix/can-manage-organization
wender Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions react/components/OrganizationUsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ const OrganizationUsersTable: FunctionComponent<Props> = ({
}
}

const canManageOrganization = permissions.includes('manage-organization')

const canEdit = isAdmin || permissions.includes('add-users-organization')

const canEditSales =
isAdmin ||
permissions.includes('add-sales-users-all') ||
Expand Down Expand Up @@ -387,14 +390,19 @@ const OrganizationUsersTable: FunctionComponent<Props> = ({
}

const getSchema = () => {
const isEnabled = ({ role: { slug } }: { role: { slug: string } }) =>
ruleClickEnabled({
isAdmin,
canEditSales,
slug,
canEdit,
isSalesAdmin,
})
const isEnabled = ({ role: { slug } }: { role: { slug: string } }) => {
if (!canManageOrganization) {
return ruleClickEnabled({
isAdmin,
canEditSales,
slug,
canEdit,
isSalesAdmin,
})
}

return canManageOrganization
}

const properties = {
email: {
Expand Down Expand Up @@ -535,7 +543,20 @@ const OrganizationUsersTable: FunctionComponent<Props> = ({
}

const handleRowClick = ({ rowData }: CellRendererProps) => {
if (
if (canManageOrganization) {
setEditUserDetails({
id: rowData.id,
roleId: rowData.roleId,
userId: rowData.userId,
clId: rowData.clId,
orgId: rowData.orgId,
costId: rowData.costId,
name: rowData.name,
email: rowData.email,
canImpersonate: rowData.canImpersonate,
})
setEditUserModalOpen(true)
} else if (
!ruleClickEnabled({
isAdmin,
canEditSales,
Expand All @@ -544,21 +565,9 @@ const OrganizationUsersTable: FunctionComponent<Props> = ({
isSalesAdmin,
})
) {
// eslint-disable-next-line no-useless-return
return
}

setEditUserDetails({
id: rowData.id,
roleId: rowData.roleId,
userId: rowData.userId,
clId: rowData.clId,
orgId: rowData.orgId,
costId: rowData.costId,
name: rowData.name,
email: rowData.email,
canImpersonate: rowData.canImpersonate,
})
setEditUserModalOpen(true)
}

const handleSort = ({
Expand Down
Loading