@opencrvs/toolkit 2.0.0-rc.f20384d → 2.0.0-rc.f2211be
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/application-config/index.js +12 -2
- package/dist/cli.js +8 -3
- package/dist/commons/api/router.d.ts +17 -4
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventIndex.d.ts +11 -0
- package/dist/commons/events/EventMetadata.d.ts +26 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/locations.d.ts +1 -0
- package/dist/commons/events/state/index.d.ts +8 -0
- package/dist/commons/events/state/utils.d.ts +9 -0
- package/dist/conditionals/index.js +7 -2
- package/dist/events/index.js +171 -55
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/index.js +8 -3
- package/dist/notification/index.js +94 -4
- package/dist/scopes/index.d.ts +88 -0
- package/dist/scopes/index.js +7 -2
- package/opencrvs-toolkit-2.0.0-rc.f2211be.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.f20384d.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -521,6 +521,8 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
521
521
|
placeOfEvent: JurisdictionFilter.optional()
|
|
522
522
|
}).describe("Options applicable to all record scopes.");
|
|
523
523
|
var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
|
|
524
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
525
|
+
notifiedBy: UserFilter.optional(),
|
|
524
526
|
declaredIn: JurisdictionFilter.optional(),
|
|
525
527
|
declaredBy: UserFilter.optional()
|
|
526
528
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
@@ -562,6 +564,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
562
564
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
563
565
|
);
|
|
564
566
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
567
|
+
notifiedIn: UUID.nullish(),
|
|
568
|
+
notifiedBy: z2.string().optional(),
|
|
565
569
|
declaredIn: UUID.nullish(),
|
|
566
570
|
declaredBy: z2.string().optional()
|
|
567
571
|
}).describe(
|
|
@@ -730,8 +734,9 @@ var decodeScope = (encodedScope) => {
|
|
|
730
734
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
731
735
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
732
736
|
accessLevel: JurisdictionFilter.enum.all,
|
|
733
|
-
|
|
734
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
737
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
738
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
739
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
735
740
|
};
|
|
736
741
|
function getAcceptedScopesByType({
|
|
737
742
|
acceptedScopes,
|
|
@@ -1815,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1815
1820
|
)
|
|
1816
1821
|
});
|
|
1817
1822
|
var LegalStatuses = z16.object({
|
|
1823
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1818
1824
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1819
1825
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1820
1826
|
});
|
|
@@ -1956,6 +1962,8 @@ var eventMetadataLabelMap = {
|
|
|
1956
1962
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1957
1963
|
"createdAt",
|
|
1958
1964
|
"updatedAt",
|
|
1965
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1959
1967
|
"legalStatuses.DECLARED.createdAt",
|
|
1960
1968
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1961
1969
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1964,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1964
1972
|
var EventMetadataDateFieldId = z16.enum([
|
|
1965
1973
|
"event.createdAt",
|
|
1966
1974
|
"event.updatedAt",
|
|
1975
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1967
1977
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1968
1978
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1969
1979
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -3222,6 +3232,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3222
3232
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3223
3233
|
}).shape
|
|
3224
3234
|
);
|
|
3235
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3236
|
+
z24.object({
|
|
3237
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3238
|
+
}).shape
|
|
3239
|
+
);
|
|
3225
3240
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3226
3241
|
z24.object({
|
|
3227
3242
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3306,9 +3321,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3306
3321
|
id: "ReadActionConfig",
|
|
3307
3322
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3308
3323
|
}),
|
|
3324
|
+
NotifyConfig.meta({
|
|
3325
|
+
id: "NotifyActionConfig",
|
|
3326
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3327
|
+
}),
|
|
3309
3328
|
DeclareConfig.meta({
|
|
3310
3329
|
id: "DeclareActionConfig",
|
|
3311
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3330
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3312
3331
|
}),
|
|
3313
3332
|
RejectConfig.meta({
|
|
3314
3333
|
id: "RejectActionConfig",
|
|
@@ -3915,7 +3934,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3915
3934
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3916
3935
|
};
|
|
3917
3936
|
var isNonInteractiveFieldType = (field3) => {
|
|
3918
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
3937
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3919
3938
|
};
|
|
3920
3939
|
|
|
3921
3940
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4477,13 +4496,13 @@ function getActionConfig({
|
|
|
4477
4496
|
actionType,
|
|
4478
4497
|
customActionType
|
|
4479
4498
|
}) {
|
|
4499
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4500
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4501
|
+
}
|
|
4480
4502
|
return eventConfiguration.actions.find((a) => {
|
|
4481
4503
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4482
4504
|
return a.customActionType === customActionType;
|
|
4483
4505
|
}
|
|
4484
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4485
|
-
return a.type === ActionType.DECLARE;
|
|
4486
|
-
}
|
|
4487
4506
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4488
4507
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4489
4508
|
}
|
|
@@ -4520,7 +4539,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4520
4539
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4521
4540
|
return actionConfig.form;
|
|
4522
4541
|
}
|
|
4523
|
-
if ("review" in actionConfig) {
|
|
4542
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4524
4543
|
return actionConfig.review.fields;
|
|
4525
4544
|
}
|
|
4526
4545
|
return [];
|
|
@@ -6492,6 +6511,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6492
6511
|
ActionType.ARCHIVE,
|
|
6493
6512
|
ActionType.PRINT_CERTIFICATE,
|
|
6494
6513
|
ActionType.REQUEST_CORRECTION,
|
|
6514
|
+
ActionType.APPROVE_CORRECTION,
|
|
6515
|
+
ActionType.REJECT_CORRECTION,
|
|
6495
6516
|
ActionType.CUSTOM
|
|
6496
6517
|
]);
|
|
6497
6518
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6519,6 +6540,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6519
6540
|
}
|
|
6520
6541
|
function getLegalStatuses(actions) {
|
|
6521
6542
|
return {
|
|
6543
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6544
|
+
ActionType.NOTIFY,
|
|
6545
|
+
actions
|
|
6546
|
+
),
|
|
6522
6547
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6523
6548
|
ActionType.DECLARE,
|
|
6524
6549
|
actions
|
|
@@ -6533,9 +6558,6 @@ function getLegalStatuses(actions) {
|
|
|
6533
6558
|
// ../commons/src/events/state/flags.ts
|
|
6534
6559
|
var import_lodash3 = require("lodash");
|
|
6535
6560
|
var import_date_fns3 = require("date-fns");
|
|
6536
|
-
function isEditInProgress(actions) {
|
|
6537
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6538
|
-
}
|
|
6539
6561
|
function findPendingCorrectionAction(writeActions2) {
|
|
6540
6562
|
let correctionRequestAction;
|
|
6541
6563
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6550,29 +6572,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6550
6572
|
}
|
|
6551
6573
|
return correctionRequestAction;
|
|
6552
6574
|
}
|
|
6553
|
-
function isCorrectionRequested(actions) {
|
|
6554
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6555
|
-
}
|
|
6556
|
-
function isDeclarationIncomplete(actions) {
|
|
6557
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6558
|
-
}
|
|
6559
|
-
function isRejected(actions) {
|
|
6560
|
-
const resettingActionTypes = [
|
|
6561
|
-
ActionType.NOTIFY,
|
|
6562
|
-
ActionType.DECLARE,
|
|
6563
|
-
ActionType.EDIT,
|
|
6564
|
-
ActionType.REGISTER
|
|
6565
|
-
];
|
|
6566
|
-
return actions.reduce((prev, { type }) => {
|
|
6567
|
-
if (type === ActionType.REJECT) {
|
|
6568
|
-
return true;
|
|
6569
|
-
}
|
|
6570
|
-
if (resettingActionTypes.includes(type)) {
|
|
6571
|
-
return false;
|
|
6572
|
-
}
|
|
6573
|
-
return prev;
|
|
6574
|
-
}, false);
|
|
6575
|
-
}
|
|
6576
6575
|
function isPotentialDuplicate(actions) {
|
|
6577
6576
|
return actions.reduce((prev, { type }) => {
|
|
6578
6577
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6600,6 +6599,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6600
6599
|
}
|
|
6601
6600
|
});
|
|
6602
6601
|
}
|
|
6602
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6603
|
+
if (!isActionConfigType(action.type)) {
|
|
6604
|
+
return false;
|
|
6605
|
+
}
|
|
6606
|
+
const actionConfig = getActionConfig({
|
|
6607
|
+
eventConfiguration,
|
|
6608
|
+
actionType: action.type,
|
|
6609
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6610
|
+
});
|
|
6611
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6612
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6613
|
+
);
|
|
6614
|
+
if (removeOperations.length === 0) {
|
|
6615
|
+
return false;
|
|
6616
|
+
}
|
|
6617
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6618
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6619
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6620
|
+
const form = { ...declaration, ...annotation };
|
|
6621
|
+
return removeOperations.some(
|
|
6622
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6623
|
+
);
|
|
6624
|
+
}
|
|
6625
|
+
var INHERENT_FLAG_RULES = [
|
|
6626
|
+
{
|
|
6627
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6628
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6629
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6630
|
+
},
|
|
6631
|
+
{
|
|
6632
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6633
|
+
// other status-changing action (see getStatusFromActions).
|
|
6634
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6635
|
+
setOn: [ActionType.NOTIFY],
|
|
6636
|
+
resetOn: [
|
|
6637
|
+
ActionType.CREATE,
|
|
6638
|
+
ActionType.DECLARE,
|
|
6639
|
+
ActionType.REGISTER,
|
|
6640
|
+
ActionType.ARCHIVE
|
|
6641
|
+
]
|
|
6642
|
+
},
|
|
6643
|
+
{
|
|
6644
|
+
flag: InherentFlags.REJECTED,
|
|
6645
|
+
setOn: [ActionType.REJECT],
|
|
6646
|
+
resetOn: [
|
|
6647
|
+
ActionType.NOTIFY,
|
|
6648
|
+
ActionType.DECLARE,
|
|
6649
|
+
ActionType.EDIT,
|
|
6650
|
+
ActionType.REGISTER
|
|
6651
|
+
]
|
|
6652
|
+
},
|
|
6653
|
+
{
|
|
6654
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6655
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6656
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6657
|
+
},
|
|
6658
|
+
{
|
|
6659
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6660
|
+
setOn: [ActionType.EDIT],
|
|
6661
|
+
resetOnAnyOtherAction: true
|
|
6662
|
+
}
|
|
6663
|
+
];
|
|
6664
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6665
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6666
|
+
if (rule.setOn.includes(action.type)) {
|
|
6667
|
+
return true;
|
|
6668
|
+
}
|
|
6669
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6670
|
+
return false;
|
|
6671
|
+
}
|
|
6672
|
+
if (actionConfigRemovesFlag(
|
|
6673
|
+
action,
|
|
6674
|
+
rule.flag,
|
|
6675
|
+
acceptedActions.slice(0, idx + 1),
|
|
6676
|
+
event2,
|
|
6677
|
+
eventConfiguration
|
|
6678
|
+
)) {
|
|
6679
|
+
return false;
|
|
6680
|
+
}
|
|
6681
|
+
return present;
|
|
6682
|
+
}, false);
|
|
6683
|
+
}
|
|
6603
6684
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6604
6685
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6605
6686
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6648,33 +6729,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6648
6729
|
return flag2;
|
|
6649
6730
|
});
|
|
6650
6731
|
}
|
|
6651
|
-
function getInherentFlags(sortedActions) {
|
|
6732
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6652
6733
|
const acceptedActions = sortedActions.filter(
|
|
6653
6734
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6654
6735
|
);
|
|
6655
|
-
|
|
6656
|
-
|
|
6657
|
-
|
|
6658
|
-
}
|
|
6659
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6660
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6661
|
-
}
|
|
6662
|
-
if (isRejected(acceptedActions)) {
|
|
6663
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6664
|
-
}
|
|
6665
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6666
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6667
|
-
}
|
|
6668
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6669
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6670
|
-
}
|
|
6671
|
-
return inherentFlags;
|
|
6736
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6737
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6738
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6672
6739
|
}
|
|
6673
6740
|
function getEventFlags(event2, config) {
|
|
6674
6741
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6675
6742
|
return [
|
|
6676
6743
|
...getActionStatusFlags(sortedActions),
|
|
6677
|
-
...getInherentFlags(sortedActions),
|
|
6744
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6678
6745
|
...resolveEventCustomFlags(event2, config)
|
|
6679
6746
|
];
|
|
6680
6747
|
}
|
|
@@ -7679,6 +7746,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7679
7746
|
id: "signature.upload.modal.title",
|
|
7680
7747
|
defaultMessage: "Draw signature",
|
|
7681
7748
|
description: "Title for the modal to draw signature"
|
|
7749
|
+
},
|
|
7750
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7751
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7752
|
+
configuration: {
|
|
7753
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7682
7754
|
}
|
|
7683
7755
|
}
|
|
7684
7756
|
]
|
|
@@ -8235,6 +8307,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8235
8307
|
},
|
|
8236
8308
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8237
8309
|
},
|
|
8310
|
+
{
|
|
8311
|
+
type: ActionType.NOTIFY,
|
|
8312
|
+
label: {
|
|
8313
|
+
defaultMessage: "Notify health worker",
|
|
8314
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8315
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8316
|
+
},
|
|
8317
|
+
flags: [
|
|
8318
|
+
{
|
|
8319
|
+
id: "health-worker-notified",
|
|
8320
|
+
operation: "add"
|
|
8321
|
+
}
|
|
8322
|
+
]
|
|
8323
|
+
},
|
|
8238
8324
|
{
|
|
8239
8325
|
type: ActionType.REJECT,
|
|
8240
8326
|
label: {
|
|
@@ -8477,6 +8563,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8477
8563
|
}
|
|
8478
8564
|
}
|
|
8479
8565
|
],
|
|
8566
|
+
flags: [
|
|
8567
|
+
{
|
|
8568
|
+
id: "health-worker-notified",
|
|
8569
|
+
requiresAction: false,
|
|
8570
|
+
label: {
|
|
8571
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8572
|
+
defaultMessage: "Health worker notified",
|
|
8573
|
+
description: "Label for the health-worker-notified flag"
|
|
8574
|
+
}
|
|
8575
|
+
}
|
|
8576
|
+
],
|
|
8480
8577
|
advancedSearch: [
|
|
8481
8578
|
{
|
|
8482
8579
|
title: {
|
|
@@ -10235,7 +10332,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10235
10332
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10236
10333
|
}
|
|
10237
10334
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10238
|
-
return user2.administrativeAreaId
|
|
10335
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10239
10336
|
}
|
|
10240
10337
|
return true;
|
|
10241
10338
|
}
|
|
@@ -10262,6 +10359,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10262
10359
|
}
|
|
10263
10360
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10264
10361
|
const { options } = scope;
|
|
10362
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10363
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10364
|
+
return false;
|
|
10365
|
+
}
|
|
10366
|
+
}
|
|
10367
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10368
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10369
|
+
JurisdictionFilter.enum.location,
|
|
10370
|
+
user2
|
|
10371
|
+
)) {
|
|
10372
|
+
return false;
|
|
10373
|
+
}
|
|
10374
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10375
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10376
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10377
|
+
user2
|
|
10378
|
+
)) {
|
|
10379
|
+
return false;
|
|
10380
|
+
}
|
|
10265
10381
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10266
10382
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10267
10383
|
return false;
|
|
@@ -10324,7 +10440,7 @@ function canAccessUserWithScope({
|
|
|
10324
10440
|
}
|
|
10325
10441
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10326
10442
|
(id) => user2.administrativeAreaId === id
|
|
10327
|
-
) || user2.administrativeAreaId
|
|
10443
|
+
) || !user2.administrativeAreaId;
|
|
10328
10444
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10329
10445
|
return false;
|
|
10330
10446
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "release
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release/2.0.0";
|
|
3
3
|
/**
|
|
4
4
|
* Runs a git command in the country config working directory.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAc9C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -59,7 +59,7 @@ exports.main = main;
|
|
|
59
59
|
*/
|
|
60
60
|
const child_process_1 = require("child_process");
|
|
61
61
|
exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
62
|
-
exports.UPSTREAM_BRANCH = 'release
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release/2.0.0';
|
|
63
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
64
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
65
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -2205,6 +2205,8 @@ var scopeOptionsPlaceEvent = z3.object({
|
|
|
2205
2205
|
placeOfEvent: JurisdictionFilter.optional()
|
|
2206
2206
|
}).describe("Options applicable to all record scopes.");
|
|
2207
2207
|
var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
|
|
2208
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
2209
|
+
notifiedBy: UserFilter.optional(),
|
|
2208
2210
|
declaredIn: JurisdictionFilter.optional(),
|
|
2209
2211
|
declaredBy: UserFilter.optional()
|
|
2210
2212
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
@@ -2246,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
|
|
|
2246
2248
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
2247
2249
|
);
|
|
2248
2250
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
2251
|
+
notifiedIn: UUID.nullish(),
|
|
2252
|
+
notifiedBy: z3.string().optional(),
|
|
2249
2253
|
declaredIn: UUID.nullish(),
|
|
2250
2254
|
declaredBy: z3.string().optional()
|
|
2251
2255
|
}).describe(
|
|
@@ -2412,8 +2416,9 @@ var decodeScope = (encodedScope) => {
|
|
|
2412
2416
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2413
2417
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2414
2418
|
accessLevel: JurisdictionFilter.enum.all,
|
|
2415
|
-
|
|
2416
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
2419
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
2420
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
2421
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
2417
2422
|
};
|
|
2418
2423
|
|
|
2419
2424
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
@@ -4312,7 +4317,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4312
4317
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4313
4318
|
var import_child_process = require("child_process");
|
|
4314
4319
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4315
|
-
var UPSTREAM_BRANCH = "release
|
|
4320
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4316
4321
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4317
4322
|
var FILES_TO_CHECKOUT = [
|
|
4318
4323
|
"src/analytics/analytics.ts",
|
|
@@ -119,6 +119,8 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
119
119
|
placeOfEvent: JurisdictionFilter.optional()
|
|
120
120
|
}).describe("Options applicable to all record scopes.");
|
|
121
121
|
var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
|
|
122
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
123
|
+
notifiedBy: UserFilter.optional(),
|
|
122
124
|
declaredIn: JurisdictionFilter.optional(),
|
|
123
125
|
declaredBy: UserFilter.optional()
|
|
124
126
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
@@ -160,6 +162,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
160
162
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
161
163
|
);
|
|
162
164
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
165
|
+
notifiedIn: UUID.nullish(),
|
|
166
|
+
notifiedBy: z2.string().optional(),
|
|
163
167
|
declaredIn: UUID.nullish(),
|
|
164
168
|
declaredBy: z2.string().optional()
|
|
165
169
|
}).describe(
|
|
@@ -294,8 +298,9 @@ var EncodedScope = z2.string().brand("EncodedScope");
|
|
|
294
298
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
295
299
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
296
300
|
accessLevel: JurisdictionFilter.enum.all,
|
|
297
|
-
|
|
298
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
301
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
302
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
303
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
299
304
|
};
|
|
300
305
|
|
|
301
306
|
// ../commons/src/authentication.ts
|
|
@@ -1357,6 +1362,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1357
1362
|
)
|
|
1358
1363
|
});
|
|
1359
1364
|
var LegalStatuses = z16.object({
|
|
1365
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1360
1366
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1361
1367
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1362
1368
|
});
|
|
@@ -1416,6 +1422,8 @@ var EventMetadataKeys = z16.enum(EventMetadataKeysArray);
|
|
|
1416
1422
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1417
1423
|
"createdAt",
|
|
1418
1424
|
"updatedAt",
|
|
1425
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1426
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1419
1427
|
"legalStatuses.DECLARED.createdAt",
|
|
1420
1428
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1421
1429
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1424,6 +1432,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1424
1432
|
var EventMetadataDateFieldId = z16.enum([
|
|
1425
1433
|
"event.createdAt",
|
|
1426
1434
|
"event.updatedAt",
|
|
1435
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1436
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1427
1437
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1428
1438
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1429
1439
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2679,6 +2689,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
2679
2689
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
2680
2690
|
}).shape
|
|
2681
2691
|
);
|
|
2692
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
2693
|
+
z24.object({
|
|
2694
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
2695
|
+
}).shape
|
|
2696
|
+
);
|
|
2682
2697
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
2683
2698
|
z24.object({
|
|
2684
2699
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -2763,9 +2778,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
2763
2778
|
id: "ReadActionConfig",
|
|
2764
2779
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
2765
2780
|
}),
|
|
2781
|
+
NotifyConfig.meta({
|
|
2782
|
+
id: "NotifyActionConfig",
|
|
2783
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
2784
|
+
}),
|
|
2766
2785
|
DeclareConfig.meta({
|
|
2767
2786
|
id: "DeclareActionConfig",
|
|
2768
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
2787
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
2769
2788
|
}),
|
|
2770
2789
|
RejectConfig.meta({
|
|
2771
2790
|
id: "RejectActionConfig",
|
|
@@ -3199,7 +3218,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
3199
3218
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
3200
3219
|
return actionConfig.form;
|
|
3201
3220
|
}
|
|
3202
|
-
if ("review" in actionConfig) {
|
|
3221
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
3203
3222
|
return actionConfig.review.fields;
|
|
3204
3223
|
}
|
|
3205
3224
|
return [];
|
|
@@ -4703,12 +4722,53 @@ var updateActions = ActionTypes.extract([
|
|
|
4703
4722
|
ActionType.ARCHIVE,
|
|
4704
4723
|
ActionType.PRINT_CERTIFICATE,
|
|
4705
4724
|
ActionType.REQUEST_CORRECTION,
|
|
4725
|
+
ActionType.APPROVE_CORRECTION,
|
|
4726
|
+
ActionType.REJECT_CORRECTION,
|
|
4706
4727
|
ActionType.CUSTOM
|
|
4707
4728
|
]);
|
|
4708
4729
|
|
|
4709
4730
|
// ../commons/src/events/state/flags.ts
|
|
4710
4731
|
var import_lodash3 = require("lodash");
|
|
4711
4732
|
var import_date_fns3 = require("date-fns");
|
|
4733
|
+
var INHERENT_FLAG_RULES = [
|
|
4734
|
+
{
|
|
4735
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
4736
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
4737
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
4738
|
+
},
|
|
4739
|
+
{
|
|
4740
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
4741
|
+
// other status-changing action (see getStatusFromActions).
|
|
4742
|
+
flag: InherentFlags.INCOMPLETE,
|
|
4743
|
+
setOn: [ActionType.NOTIFY],
|
|
4744
|
+
resetOn: [
|
|
4745
|
+
ActionType.CREATE,
|
|
4746
|
+
ActionType.DECLARE,
|
|
4747
|
+
ActionType.REGISTER,
|
|
4748
|
+
ActionType.ARCHIVE
|
|
4749
|
+
]
|
|
4750
|
+
},
|
|
4751
|
+
{
|
|
4752
|
+
flag: InherentFlags.REJECTED,
|
|
4753
|
+
setOn: [ActionType.REJECT],
|
|
4754
|
+
resetOn: [
|
|
4755
|
+
ActionType.NOTIFY,
|
|
4756
|
+
ActionType.DECLARE,
|
|
4757
|
+
ActionType.EDIT,
|
|
4758
|
+
ActionType.REGISTER
|
|
4759
|
+
]
|
|
4760
|
+
},
|
|
4761
|
+
{
|
|
4762
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
4763
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
4764
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
4765
|
+
},
|
|
4766
|
+
{
|
|
4767
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
4768
|
+
setOn: [ActionType.EDIT],
|
|
4769
|
+
resetOnAnyOtherAction: true
|
|
4770
|
+
}
|
|
4771
|
+
];
|
|
4712
4772
|
|
|
4713
4773
|
// ../commons/src/events/defineConfig.ts
|
|
4714
4774
|
var IGNORED_EVENT_TYPES = [
|
|
@@ -5454,6 +5514,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
5454
5514
|
id: "signature.upload.modal.title",
|
|
5455
5515
|
defaultMessage: "Draw signature",
|
|
5456
5516
|
description: "Title for the modal to draw signature"
|
|
5517
|
+
},
|
|
5518
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
5519
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
5520
|
+
configuration: {
|
|
5521
|
+
maxFileSize: 5 * 1024 * 1024
|
|
5457
5522
|
}
|
|
5458
5523
|
}
|
|
5459
5524
|
]
|
|
@@ -6010,6 +6075,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6010
6075
|
},
|
|
6011
6076
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
6012
6077
|
},
|
|
6078
|
+
{
|
|
6079
|
+
type: ActionType.NOTIFY,
|
|
6080
|
+
label: {
|
|
6081
|
+
defaultMessage: "Notify health worker",
|
|
6082
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
6083
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
6084
|
+
},
|
|
6085
|
+
flags: [
|
|
6086
|
+
{
|
|
6087
|
+
id: "health-worker-notified",
|
|
6088
|
+
operation: "add"
|
|
6089
|
+
}
|
|
6090
|
+
]
|
|
6091
|
+
},
|
|
6013
6092
|
{
|
|
6014
6093
|
type: ActionType.REJECT,
|
|
6015
6094
|
label: {
|
|
@@ -6252,6 +6331,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6252
6331
|
}
|
|
6253
6332
|
}
|
|
6254
6333
|
],
|
|
6334
|
+
flags: [
|
|
6335
|
+
{
|
|
6336
|
+
id: "health-worker-notified",
|
|
6337
|
+
requiresAction: false,
|
|
6338
|
+
label: {
|
|
6339
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
6340
|
+
defaultMessage: "Health worker notified",
|
|
6341
|
+
description: "Label for the health-worker-notified flag"
|
|
6342
|
+
}
|
|
6343
|
+
}
|
|
6344
|
+
],
|
|
6255
6345
|
advancedSearch: [
|
|
6256
6346
|
{
|
|
6257
6347
|
title: {
|