Skip to content

fix: user management team view #476

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

Closed
ferruhcihan wants to merge 6 commits into from
Closed

fix: user management team view #476

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa68308
fix: user management team view
ferruhcihan Nov 26, 2024
c1b1c15
fix: add default admin team to create user page
ferruhcihan Nov 26, 2024
08c8404
fix: revert default admin team from create user page
ferruhcihan Nov 26, 2024
de36a0a
Merge branch 'main' into APL-305
j-zimnowoda Nov 28, 2024
06e2032
Merge branch 'main' into APL-305
dennisvankekem Nov 28, 2024
a8bd0d0
Merge branch 'main' into APL-305
dennisvankekem Dec 4, 2024
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
36 changes: 15 additions & 21 deletions src/components/Users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Box, Button, Checkbox, Tooltip } from '@mui/material'
import ContentCopyIcon from '@mui/icons-material/ContentCopy'
import DoneIcon from '@mui/icons-material/Done'
import useSettings from 'hooks/useSettings'
import { isEqual } from 'lodash'
import ListTable from './ListTable'
import RLink from './Link'
import { HeadCell } from './EnhancedTable'
Expand Down Expand Up @@ -93,9 +94,9 @@ function UserTeamSelector({
)
}

const updateUsers = (onClick: () => void) => {
const updateUsers = (onClick: () => void, disabled: boolean) => {
return (
<Button variant='contained' onClick={onClick}>
<Button variant='contained' onClick={onClick} disabled={disabled}>
Update Users
</Button>
)
Expand Down Expand Up @@ -134,24 +135,17 @@ export default function ({ users: inUsers, teamId }: Props): React.ReactElement
},
]
: []
const assignToTeam =
isTeamView && oboTeamId !== 'admin'
? [
{
id: 'assign',
label: t(`Assign to team ${oboTeamId}`),
renderer: (row: Row) => (
<UserTeamSelector
row={row}
sessionUser={sessionUser}
users={inUsers}
setUsers={setUsers}
teamId={teamId}
/>
),
},
]
: []
const assignToTeam = isTeamView
? [
{
id: 'assign',
label: t(`Assign to team ${oboTeamId}`),
renderer: (row: Row) => (
<UserTeamSelector row={row} sessionUser={sessionUser} users={inUsers} setUsers={setUsers} teamId={teamId} />
),
},
]
: []
const headCells: HeadCell[] = [
{
id: 'email',
Expand Down Expand Up @@ -180,7 +174,7 @@ export default function ({ users: inUsers, teamId }: Props): React.ReactElement
resourceType='User'
title='Users'
noCrud={isTeamView}
customButton={isTeamView && updateUsers(handleUpdateUsers)}
customButton={isTeamView && updateUsers(handleUpdateUsers, isEqual(users, inUsers))}
/>
)
}
Loading