Skip to content

Hotfix - Complete list of teams not showing for participants #993

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

Merged
wickathou merged 2 commits into from
Nov 9, 2024
Merged

Hotfix - Complete list of teams not showing for participants #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ee0425
Fixed team query to paginate results correctly and list all existing …
wickathou Nov 9, 2024
263106e
Updated AdminTeamEdit to keep commented code for later implementation…
wickathou Nov 9, 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
37 changes: 14 additions & 23 deletions backend/modules/team/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,32 +491,23 @@ controller.attachUserApplicant = (teams, userId) => {

controller.getTeamsForEvent = async (eventId, userId, page, size, filter) => {
let eventTeams = []
let teamCount = 0
const query = { event: eventId }

if (filter) {
query.challenge = filter
}

const teamCount = await Team.countDocuments(query)

if (page && size) {
if (filter) {
eventTeams = await Team.find({
event: eventId,
challenge: filter,
})
.sort({ createdAt: 'desc' })
.skip(parseInt(size * page))
.limit(parseInt(size))
teamCount = await eventTeams.length
} else {
eventTeams = await Team.find({
event: eventId,
})
.sort({ createdAt: 'desc' })
.skip(parseInt(size * page))
.limit(parseInt(size))
teamCount = await eventTeams.length
}
eventTeams = await Team.find(query)
.sort({ createdAt: 'desc' })
.skip(parseInt(size * page))
.limit(parseInt(size))
} else {
eventTeams = await Team.find({
event: eventId,
}).sort({ createdAt: 'desc' })
teamCount = await eventTeams.length
eventTeams = await Team.find(query).sort({ createdAt: 'desc' })
}

const teamsWithoutTeamCode = convertToObjectAndStripProperties(eventTeams, [
'code',
])
Expand Down
94 changes: 47 additions & 47 deletions frontend/src/components/Team/AdminTeamEdit/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,53 +53,53 @@ export default ({
// console.log("delete")
// }

const handleRemove = useEffect(() => {
console.log('delete', slug, teamData?.code, teamMemberToRemove)
setLoading(true)
dispatch(
DashboardActions.organiserRemoveMemberFromTeam(
slug,
teamData.code,
teamMemberToRemove,
),
)
.then(team => {
console.log('removed succesfully.', team)
dispatch(OrganiserActions.updateTeamsForEvent(slug))
})
.then(() => {
console.log(
'teams updated',
teamMembersArr.filter(
t => t.profile.userId !== teamMemberToRemove,
),
)
setTeamMembersArr(
teamMembersArr.filter(
t => t.profile.userId !== teamMemberToRemove,
),
)
dispatch(
SnackbarActions.success(
'removed ' +
teamMemberToRemove +
' from team ' +
teamData?.code,
),
)
})
.catch(() => {
dispatch(
SnackbarActions.error(
'Something went wrong... please try again.',
),
)
})
.finally(() => {
setTeamMemberToRemove('')
setLoading(false)
})
}, [teamMemberToRemove, slug, teamData?.code, dispatch])
// const handleRemove = useEffect(() => {
// console.log('delete', slug, teamData?.code, teamMemberToRemove)
// setLoading(true)
// dispatch(
// DashboardActions.organiserRemoveMemberFromTeam(
// slug,
// teamData.code,
// teamMemberToRemove,
// ),
// )
// .then(team => {
// console.log('removed succesfully.', team)
// dispatch(OrganiserActions.updateTeamsForEvent(slug))
// })
// .then(() => {
// console.log(
// 'teams updated',
// teamMembersArr.filter(
// t => t.profile.userId !== teamMemberToRemove,
// ),
// )
// setTeamMembersArr(
// teamMembersArr.filter(
// t => t.profile.userId !== teamMemberToRemove,
// ),
// )
// dispatch(
// SnackbarActions.success(
// 'removed ' +
// teamMemberToRemove +
// ' from team ' +
// teamData?.code,
// ),
// )
// })
// .catch(() => {
// dispatch(
// SnackbarActions.error(
// 'Something went wrong... please try again.',
// ),
// )
// })
// .finally(() => {
// setTeamMemberToRemove('')
// setLoading(false)
// })
// }, [teamMemberToRemove, slug, teamData?.code, dispatch])

const classes = junctionStyle()
return (
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/Team/TeamHeader/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ export default ({
let challengeName = null
let event = useSelector(DashboardSelectors.event)
if (event === null) {
console.log('from organiser')
event = useSelector(OrganiserSelectors.event)
}
console.log('event', event)
if (teamChallenge && typeof teamChallenge === 'string') {
const challengeDetails = event.challenges.find(
challenge => challenge._id === teamChallenge,
Expand Down
1 change: 0 additions & 1 deletion frontend/src/pages/_dashboard/renderDashboard/participant/team/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export default () => {
component: CandidatesPage,
})
}
// const hasTeam = useSelector(DashboardSelectors.hasTeam)
// TODO make tab "my team" and "Team candidates" visible only if user has a team
return (
<Container>
Expand Down
55 changes: 24 additions & 31 deletions frontend/src/pages/_dashboard/renderDashboard/participant/team/teams/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import JoinTeamByCode from 'components/Team/JoinTeamByCode'
import { useTranslation } from 'react-i18next'

export default () => {
const numberOfTeamsShown = 30
const dispatch = useDispatch()
const event = useSelector(DashboardSelectors.event)
const { t } = useTranslation()
Expand All @@ -36,44 +37,34 @@ export default () => {

const [currentPage, SetCurrentPage] = useState(0)
const totalResults = useSelector(DashboardSelectors.teamsCount)
const totalPages = Math.ceil(totalResults / 25)
const totalPages = Math.ceil(totalResults / numberOfTeamsShown)

const hadleTeamCardClick = useCallback(
async teamId => {
if (teamId) {
setLoading(true)
dispatch(DashboardActions.updateSelectedTeam(slug, teamId))
.then(team => {
setSelectedTeam(team)
})
.catch(err => {
console.log(err)
})
.finally(() => {
setLoading(false)
})
}
},
[selectedTeam],
)
const hadleTeamCardClick = async teamId => {
if (teamId) {
setLoading(true)
dispatch(DashboardActions.updateSelectedTeam(slug, teamId))
.then(team => {
setSelectedTeam(team)
})
.catch(err => {
console.log(err)
})
.finally(() => {
setLoading(false)
})
}
}

useEffect(() => {
dispatch(
DashboardActions.updateTeams(
slug,
currentPage,
25,
numberOfTeamsShown,
challengeFilter,
),
)
}, [
currentPage,
applying,
selected,
selectedTeam,
joinByCode,
challengeFilter,
])
}, [currentPage, joinByCode, challengeFilter])

let teamCards = []
if (challengeFilter !== 'All challenges') {
Expand Down Expand Up @@ -180,15 +171,14 @@ export default () => {
)}
{!selected && !applying && (
<>
<div className="tw-flex tw-justify-between tw-items-center tw-mb-4">
<div className="tw-flex tw-flex-col md:tw-flex-row tw-justify-between tw-items-center tw-mb-4 tw-gap-2">
{!hasTeam ? (
<Button
color="outlined_button"
variant="jOutlined"
onClick={() => setJoinByCode(!joinByCode)}
>
{t('Join_team_using_code_')}
{/* Join team using a code */}
</Button>
) : (
<span></span>
Expand All @@ -199,7 +189,10 @@ export default () => {
label: challenge.name,
value: challenge._id,
}))}
onChange={setChallengeFilter}
onChange={value => {
SetCurrentPage(0)
setChallengeFilter(value)
}}
/>
</div>
{joinByCode && (
Expand Down