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.

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

feat: decouple workqueue from TCME #8372

Merged
merged 24 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1a2b976
feat: workqueue wip
jamil314 Jan 21, 2025
a05bf00
Merge branch 'develop' into events-v2-workqueue
jamil314 Jan 22, 2025
8412d7b
fix: update types
jamil314 Jan 22, 2025
6c00046
fix: update types
jamil314 Jan 22, 2025
cea14b2
feat: use default columns from defination of all workqueue
jamil314 Jan 22, 2025
023fd7b
feat: use correct anchor
jamil314 Jan 22, 2025
e4fb1d1
chore: Merge branch develop into events-v2-workqueue
jamil314 Jan 22, 2025
fdca6f9
fix: get config of correct event
jamil314 Jan 22, 2025
0b2d957
fix: use same format for intl as in summarypage
jamil314 Jan 22, 2025
3e6147c
Merge branch 'develop' into events-v2-workqueue
jamil314 Jan 23, 2025
5d94576
fix: use flattened intl
jamil314 Jan 23, 2025
57e7de3
fix: await not return
jamil314 Jan 23, 2025
b02b1be
fix: revert changes in indexing
jamil314 Jan 23, 2025
4a412a4
fix: revert changes in initialValue
jamil314 Jan 23, 2025
1b1c93f
add ready for review and ready to print workqueue
jamil314 Jan 23, 2025
293d211
feat: add validation
jamil314 Jan 23, 2025
e1f0677
fix: workqueue in fixture
jamil314 Jan 23, 2025
1e18823
chore: unused export and import and fixtures
jamil314 Jan 23, 2025
16831df
Merge branch 'develop' into events-v2-workqueue
jamil314 Jan 23, 2025
30e76c7
chore: bump up toolkit
jamil314 Jan 23, 2025
df3eb74
Merge branch 'events-v2-workqueue' of https://github.com/opencrvs/ope…
jamil314 Jan 23, 2025
86c3396
fix: refactor and fix types
jamil314 Jan 27, 2025
4afe30d
chore: Merge branch develop into events-v2-workqueue
jamil314 Jan 27, 2025
f5c8014
Merge branch 'develop' into events-v2-workqueue
jamil314 Jan 28, 2025
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
73 changes: 22 additions & 51 deletions packages/client/src/v2-events/features/events/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,51 +157,30 @@ export const tennisClubMembershipEvent = {
},
workqueues: [
{
id: 'in-progress',
title: {
defaultMessage: 'In progress',
description: 'Label for in progress workqueue',
id: 'event.tennis-club-membership.workqueue.in-progress.label'
},
id: 'all',
fields: [
{
id: 'applicant.firstname'
},
{
id: 'event.type'
},
{
id: 'event.createdAt'
},
{
id: 'event.modifiedAt'
column: 'title',
label: {
defaultMessage: '{applicant.firstname} {applicant.surname}',
description: 'Label for name in all workqueue',
id: 'event.tennis-club-membership.workqueue.all.name.label'
}
}
],
filters: [
{
status: ['CREATED']
}
]
filters: []
},
{
id: 'ready-for-review',
title: {
defaultMessage: 'Ready for review',
description: 'Label for in review workqueue',
id: 'event.tennis-club-membership.workqueue.in-review.label'
},

fields: [
{
id: 'applicant.firstname'
},
{
id: 'event.type'
},
{
id: 'event.createdAt'
},
{
id: 'event.modifiedAt'
column: 'title',
label: {
defaultMessage: '{applicant.firstname} {applicant.surname}',
description: 'Label for name in all workqueue',
id: 'event.tennis-club-membership.workqueue.readyForReview.name.label'
}
}
],
filters: [
Expand All @@ -212,23 +191,15 @@ export const tennisClubMembershipEvent = {
},
{
id: 'registered',
title: {
defaultMessage: 'Ready to print',
description: 'Label for registered workqueue',
id: 'event.tennis-club-membership.workqueue.registered.label'
},

fields: [
{
id: 'applicant.firstname'
},
{
id: 'event.type'
},
{
id: 'event.createdAt'
},
{
id: 'event.modifiedAt'
column: 'title',
label: {
defaultMessage: '{applicant.firstname} {applicant.surname}',
description: 'Label for name in all workqueue',
id: 'event.tennis-club-membership.workqueue.registered.name.label'
}
}
],
filters: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,21 @@ function EventOverviewContainer() {
const { getEvents, getEvent } = useEvents()
const { getUsers } = useUsers()

const [config] = useEventConfigurations()
const configs = useEventConfigurations()

const [fullEvent] = getEvent.useSuspenseQuery(params.eventId)
const [events] = getEvents.useSuspenseQuery()
const event = events.find((e) => e.id === params.eventId)

const config = configs.find((c) => c.id === event?.type)

const userIds = getUserIdsFromActions(fullEvent.actions)
const [users] = getUsers.useSuspenseQuery(userIds)
const locations = useSelector(getLocations)

if (!config) {
return null
}
if (!event) {
return null
}
Expand Down
Loading
Loading