Skip to content

Add temporary conditional to approve action #1157

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
cibelius merged 8 commits into from
Nov 26, 2025
Merged

Add temporary conditional to approve action #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
711d65b
upgrade toolkit, add temporary conditional to approve action
cibelius Nov 21, 2025
4c52151
switch to conditionaltype show
cibelius Nov 24, 2025
09e1ada
Merge remote-tracking branch 'origin/develop' into ocrvs-10890
cibelius Nov 24, 2025
a1adb7c
Merge remote-tracking branch 'origin/develop' into ocrvs-10890
cibelius Nov 24, 2025
7ffae13
upgrade toolkit
cibelius Nov 25, 2025
a2169e0
Merge remote-tracking branch 'origin/develop' into ocrvs-10890
cibelius Nov 25, 2025
5be738d
Merge remote-tracking branch 'origin/develop' into ocrvs-10890
cibelius Nov 25, 2025
90c0e79
fix flag
cibelius Nov 26, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@hapi/boom": "^9.1.1",
"@hapi/hapi": "^20.0.1",
"@hapi/inert": "^6.0.3",
"@opencrvs/toolkit": "1.9.0-rc.8476ac9",
"@opencrvs/toolkit": "1.9.0-rc.8a42cc8",
"@types/chalk": "^2.2.0",
"@types/csv2json": "^1.4.0",
"@types/fhir": "^0.0.30",
Expand Down
9 changes: 0 additions & 9 deletions src/form/tennis-club-membership.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,15 +892,6 @@ export const tennisClubMembershipEvent = defineConfig({
},
review: TENNIS_CLUB_DECLARATION_REVIEW
},
{
type: ActionType.DELETE,
label: {
defaultMessage: 'Delete draft',
description:
'This is shown as the action name anywhere the user can trigger the action from',
id: 'event.tennis-club-membership.action.delete.label'
}
},
{
type: ActionType.VALIDATE,
label: {
Expand Down
19 changes: 13 additions & 6 deletions src/form/v2/birth/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
ConditionalType,
defineConfig,
field,
flag,
not
} from '@opencrvs/toolkit/events'
import {
Expand Down Expand Up @@ -228,12 +229,6 @@ export const birthEvent = defineConfig({
'This is shown as the action name anywhere the user can trigger the action from',
id: 'event.birth.action.approve.label'
},
supportingCopy: {
defaultMessage:
'This birth has been registered late. You are now approving it for further validation and registration.',
description: 'This is the confirmation text for the approve action',
id: 'event.birth.action.approve.confirmationText'
},
form: [
{
id: 'notes',
Expand All @@ -249,11 +244,23 @@ export const birthEvent = defineConfig({
flags: [
{ id: 'approval-required-for-late-registration', operation: 'remove' }
],
conditionals: [
{
type: ConditionalType.SHOW,
conditional: flag('approval-required-for-late-registration')
}
],
auditHistoryLabel: {
defaultMessage: 'Approved',
description:
'The label to show in audit history for the approve action',
id: 'event.birth.action.approve.audit-history-label'
},
supportingCopy: {
defaultMessage:
'This birth has been registered late. You are now approving it for further validation and registration.',
description: 'This is the confirmation text for the approve action',
id: 'event.birth.action.approve.confirmationText'
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,10 +834,10 @@
dependencies:
"@octokit/openapi-types" "^18.0.0"

"@opencrvs/[email protected].8476ac9":
version "1.9.0-rc.8476ac9"
resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.9.0-rc.8476ac9.tgz#6794f0e137dc7dd2bd61f42478a79fddfe963902"
integrity sha512-Aqj5E+p+5iMhBjtH007JG7osgd5zCv60GZ2ltcGirAv7C89PWXFeTRumOUpXGMNCdhN2prfIRq32P3ZpXQxXHg==
"@opencrvs/[email protected].8a42cc8":
version "1.9.0-rc.8a42cc8"
resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.9.0-rc.8a42cc8.tgz#29d8299ce1feed7b2d71f6eec1c89d5fb7a0c6dc"
integrity sha512-GCVX2eIHcZdc8GlmQT+RISlJjt0eU0ftld5Nd3lLwsso7lkVNQa7sY/LdbvMZ6dcgx9sdYUr32pgeEwL8iUMYw==
dependencies:
"@trpc/client" "11.4.3"
"@trpc/server" "11.4.3"
Expand Down
Loading