@opencrvs/toolkit 2.0.0-rc.abc5419 → 2.0.0-rc.abe5d6d
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 +9 -2
- package/dist/cli.js +10 -4
- package/dist/commons/api/router.d.ts +28 -17
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventIndex.d.ts +14 -0
- package/dist/commons/events/FieldConfig.d.ts +1 -0
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/field.d.ts +6 -0
- package/dist/commons/events/state/utils.d.ts +12 -290
- package/dist/events/index.js +168 -67
- 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 +10 -4
- package/dist/notification/index.js +101 -4
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.abe5d6d.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.abc5419.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -151,6 +151,7 @@ __export(events_exports, {
|
|
|
151
151
|
FormPageConfig: () => FormPageConfig,
|
|
152
152
|
Fuzzy: () => Fuzzy,
|
|
153
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
154
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
155
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
156
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -711,14 +712,20 @@ var unflattenScope = (input) => {
|
|
|
711
712
|
return { type, options };
|
|
712
713
|
};
|
|
713
714
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
714
|
-
var
|
|
715
|
-
|
|
715
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
716
|
+
var decodeScope = (encodedScope) => {
|
|
717
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
718
|
+
return decodedScopeCache.get(encodedScope);
|
|
719
|
+
}
|
|
720
|
+
const scope = qs.parse(encodedScope, {
|
|
716
721
|
ignoreQueryPrefix: true,
|
|
717
722
|
comma: true,
|
|
718
723
|
allowDots: true
|
|
719
724
|
});
|
|
720
725
|
const unflattenedScope = unflattenScope(scope);
|
|
721
|
-
|
|
726
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
727
|
+
decodedScopeCache.set(encodedScope, result);
|
|
728
|
+
return result;
|
|
722
729
|
};
|
|
723
730
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
724
731
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -1213,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1213
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1214
1221
|
FieldType.ALPHA_HIDDEN
|
|
1215
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1216
1228
|
|
|
1217
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1218
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1339,7 +1351,7 @@ function plainDateToLocalDate(date) {
|
|
|
1339
1351
|
// ../commons/src/events/FieldValue.ts
|
|
1340
1352
|
var TextValue = z12.string();
|
|
1341
1353
|
var HiddenFieldValue = z12.string();
|
|
1342
|
-
var NonEmptyTextValue =
|
|
1354
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1343
1355
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1344
1356
|
var AgeValue = z12.object({
|
|
1345
1357
|
age: z12.number(),
|
|
@@ -2011,7 +2023,8 @@ var Range = import_v4.z.object({
|
|
|
2011
2023
|
});
|
|
2012
2024
|
var ContainsFlags = import_v4.z.object({
|
|
2013
2025
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2014
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2026
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2027
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2015
2028
|
}).meta({
|
|
2016
2029
|
id: "ContainsFlags"
|
|
2017
2030
|
});
|
|
@@ -2286,6 +2299,7 @@ var NumberField = BaseField.extend({
|
|
|
2286
2299
|
configuration: import_v43.default.object({
|
|
2287
2300
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2288
2301
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2302
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2289
2303
|
prefix: TranslationConfig.optional(),
|
|
2290
2304
|
postfix: TranslationConfig.optional()
|
|
2291
2305
|
}).optional()
|
|
@@ -3209,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3209
3223
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3210
3224
|
}).shape
|
|
3211
3225
|
);
|
|
3226
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3227
|
+
z24.object({
|
|
3228
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3229
|
+
}).shape
|
|
3230
|
+
);
|
|
3212
3231
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3213
3232
|
z24.object({
|
|
3214
3233
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3293,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3293
3312
|
id: "ReadActionConfig",
|
|
3294
3313
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3295
3314
|
}),
|
|
3315
|
+
NotifyConfig.meta({
|
|
3316
|
+
id: "NotifyActionConfig",
|
|
3317
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3318
|
+
}),
|
|
3296
3319
|
DeclareConfig.meta({
|
|
3297
3320
|
id: "DeclareActionConfig",
|
|
3298
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3321
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3299
3322
|
}),
|
|
3300
3323
|
RejectConfig.meta({
|
|
3301
3324
|
id: "RejectActionConfig",
|
|
@@ -3474,6 +3497,9 @@ var BaseField3 = z28.object({
|
|
|
3474
3497
|
),
|
|
3475
3498
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3476
3499
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3500
|
+
),
|
|
3501
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3502
|
+
`Override the allowedLocations for a location field in advanced search. Use this when the declaration form's allowedLocations references a scope (e.g. record.create) that search-only users don't have \u2014 specify record.search scope instead.`
|
|
3477
3503
|
)
|
|
3478
3504
|
});
|
|
3479
3505
|
var SearchQueryParams = z28.object({
|
|
@@ -3899,7 +3925,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3899
3925
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3900
3926
|
};
|
|
3901
3927
|
var isNonInteractiveFieldType = (field3) => {
|
|
3902
|
-
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.
|
|
3928
|
+
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;
|
|
3903
3929
|
};
|
|
3904
3930
|
|
|
3905
3931
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4461,13 +4487,13 @@ function getActionConfig({
|
|
|
4461
4487
|
actionType,
|
|
4462
4488
|
customActionType
|
|
4463
4489
|
}) {
|
|
4490
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4491
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4492
|
+
}
|
|
4464
4493
|
return eventConfiguration.actions.find((a) => {
|
|
4465
4494
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4466
4495
|
return a.customActionType === customActionType;
|
|
4467
4496
|
}
|
|
4468
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4469
|
-
return a.type === ActionType.DECLARE;
|
|
4470
|
-
}
|
|
4471
4497
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4472
4498
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4473
4499
|
}
|
|
@@ -4504,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4504
4530
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4505
4531
|
return actionConfig.form;
|
|
4506
4532
|
}
|
|
4507
|
-
if ("review" in actionConfig) {
|
|
4533
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4508
4534
|
return actionConfig.review.fields;
|
|
4509
4535
|
}
|
|
4510
4536
|
return [];
|
|
@@ -6476,6 +6502,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6476
6502
|
ActionType.ARCHIVE,
|
|
6477
6503
|
ActionType.PRINT_CERTIFICATE,
|
|
6478
6504
|
ActionType.REQUEST_CORRECTION,
|
|
6505
|
+
ActionType.APPROVE_CORRECTION,
|
|
6506
|
+
ActionType.REJECT_CORRECTION,
|
|
6479
6507
|
ActionType.CUSTOM
|
|
6480
6508
|
]);
|
|
6481
6509
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6490,7 +6518,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6490
6518
|
"createdAtLocation",
|
|
6491
6519
|
"createdByRole"
|
|
6492
6520
|
];
|
|
6493
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6521
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6494
6522
|
(_2, action) => {
|
|
6495
6523
|
if (action.originalActionId) {
|
|
6496
6524
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6517,9 +6545,6 @@ function getLegalStatuses(actions) {
|
|
|
6517
6545
|
// ../commons/src/events/state/flags.ts
|
|
6518
6546
|
var import_lodash3 = require("lodash");
|
|
6519
6547
|
var import_date_fns3 = require("date-fns");
|
|
6520
|
-
function isEditInProgress(actions) {
|
|
6521
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6522
|
-
}
|
|
6523
6548
|
function findPendingCorrectionAction(writeActions2) {
|
|
6524
6549
|
let correctionRequestAction;
|
|
6525
6550
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6534,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6534
6559
|
}
|
|
6535
6560
|
return correctionRequestAction;
|
|
6536
6561
|
}
|
|
6537
|
-
function isCorrectionRequested(actions) {
|
|
6538
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6539
|
-
}
|
|
6540
|
-
function isDeclarationIncomplete(actions) {
|
|
6541
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6542
|
-
}
|
|
6543
|
-
function isRejected(actions) {
|
|
6544
|
-
const resettingActionTypes = [
|
|
6545
|
-
ActionType.NOTIFY,
|
|
6546
|
-
ActionType.DECLARE,
|
|
6547
|
-
ActionType.EDIT,
|
|
6548
|
-
ActionType.REGISTER
|
|
6549
|
-
];
|
|
6550
|
-
return actions.reduce((prev, { type }) => {
|
|
6551
|
-
if (type === ActionType.REJECT) {
|
|
6552
|
-
return true;
|
|
6553
|
-
}
|
|
6554
|
-
if (resettingActionTypes.includes(type)) {
|
|
6555
|
-
return false;
|
|
6556
|
-
}
|
|
6557
|
-
return prev;
|
|
6558
|
-
}, false);
|
|
6559
|
-
}
|
|
6560
6562
|
function isPotentialDuplicate(actions) {
|
|
6561
6563
|
return actions.reduce((prev, { type }) => {
|
|
6562
6564
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6584,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6584
6586
|
}
|
|
6585
6587
|
});
|
|
6586
6588
|
}
|
|
6589
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6590
|
+
if (!isActionConfigType(action.type)) {
|
|
6591
|
+
return false;
|
|
6592
|
+
}
|
|
6593
|
+
const actionConfig = getActionConfig({
|
|
6594
|
+
eventConfiguration,
|
|
6595
|
+
actionType: action.type,
|
|
6596
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6597
|
+
});
|
|
6598
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6599
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6600
|
+
);
|
|
6601
|
+
if (removeOperations.length === 0) {
|
|
6602
|
+
return false;
|
|
6603
|
+
}
|
|
6604
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6605
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6606
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6607
|
+
const form = { ...declaration, ...annotation };
|
|
6608
|
+
return removeOperations.some(
|
|
6609
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6610
|
+
);
|
|
6611
|
+
}
|
|
6612
|
+
var INHERENT_FLAG_RULES = [
|
|
6613
|
+
{
|
|
6614
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6615
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6616
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6617
|
+
},
|
|
6618
|
+
{
|
|
6619
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6620
|
+
// other status-changing action (see getStatusFromActions).
|
|
6621
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6622
|
+
setOn: [ActionType.NOTIFY],
|
|
6623
|
+
resetOn: [
|
|
6624
|
+
ActionType.CREATE,
|
|
6625
|
+
ActionType.DECLARE,
|
|
6626
|
+
ActionType.REGISTER,
|
|
6627
|
+
ActionType.ARCHIVE
|
|
6628
|
+
]
|
|
6629
|
+
},
|
|
6630
|
+
{
|
|
6631
|
+
flag: InherentFlags.REJECTED,
|
|
6632
|
+
setOn: [ActionType.REJECT],
|
|
6633
|
+
resetOn: [
|
|
6634
|
+
ActionType.NOTIFY,
|
|
6635
|
+
ActionType.DECLARE,
|
|
6636
|
+
ActionType.EDIT,
|
|
6637
|
+
ActionType.REGISTER
|
|
6638
|
+
]
|
|
6639
|
+
},
|
|
6640
|
+
{
|
|
6641
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6642
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6643
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6644
|
+
},
|
|
6645
|
+
{
|
|
6646
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6647
|
+
setOn: [ActionType.EDIT],
|
|
6648
|
+
resetOnAnyOtherAction: true
|
|
6649
|
+
}
|
|
6650
|
+
];
|
|
6651
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6652
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6653
|
+
if (rule.setOn.includes(action.type)) {
|
|
6654
|
+
return true;
|
|
6655
|
+
}
|
|
6656
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6657
|
+
return false;
|
|
6658
|
+
}
|
|
6659
|
+
if (actionConfigRemovesFlag(
|
|
6660
|
+
action,
|
|
6661
|
+
rule.flag,
|
|
6662
|
+
acceptedActions.slice(0, idx + 1),
|
|
6663
|
+
event2,
|
|
6664
|
+
eventConfiguration
|
|
6665
|
+
)) {
|
|
6666
|
+
return false;
|
|
6667
|
+
}
|
|
6668
|
+
return present;
|
|
6669
|
+
}, false);
|
|
6670
|
+
}
|
|
6587
6671
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6588
6672
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6589
6673
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6632,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6632
6716
|
return flag2;
|
|
6633
6717
|
});
|
|
6634
6718
|
}
|
|
6635
|
-
function getInherentFlags(sortedActions) {
|
|
6719
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6636
6720
|
const acceptedActions = sortedActions.filter(
|
|
6637
6721
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6638
6722
|
);
|
|
6639
|
-
|
|
6640
|
-
|
|
6641
|
-
|
|
6642
|
-
}
|
|
6643
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6644
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6645
|
-
}
|
|
6646
|
-
if (isRejected(acceptedActions)) {
|
|
6647
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6648
|
-
}
|
|
6649
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6650
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6651
|
-
}
|
|
6652
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6654
|
-
}
|
|
6655
|
-
return inherentFlags;
|
|
6723
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6724
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6725
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6656
6726
|
}
|
|
6657
6727
|
function getEventFlags(event2, config) {
|
|
6658
6728
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6659
6729
|
return [
|
|
6660
6730
|
...getActionStatusFlags(sortedActions),
|
|
6661
|
-
...getInherentFlags(sortedActions),
|
|
6731
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6662
6732
|
...resolveEventCustomFlags(event2, config)
|
|
6663
6733
|
];
|
|
6664
6734
|
}
|
|
@@ -7663,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7663
7733
|
id: "signature.upload.modal.title",
|
|
7664
7734
|
defaultMessage: "Draw signature",
|
|
7665
7735
|
description: "Title for the modal to draw signature"
|
|
7736
|
+
},
|
|
7737
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7738
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7739
|
+
configuration: {
|
|
7740
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7666
7741
|
}
|
|
7667
7742
|
}
|
|
7668
7743
|
]
|
|
@@ -8219,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8219
8294
|
},
|
|
8220
8295
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8221
8296
|
},
|
|
8297
|
+
{
|
|
8298
|
+
type: ActionType.NOTIFY,
|
|
8299
|
+
label: {
|
|
8300
|
+
defaultMessage: "Notify health worker",
|
|
8301
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8302
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8303
|
+
},
|
|
8304
|
+
flags: [
|
|
8305
|
+
{
|
|
8306
|
+
id: "health-worker-notified",
|
|
8307
|
+
operation: "add"
|
|
8308
|
+
}
|
|
8309
|
+
]
|
|
8310
|
+
},
|
|
8222
8311
|
{
|
|
8223
8312
|
type: ActionType.REJECT,
|
|
8224
8313
|
label: {
|
|
@@ -8461,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8461
8550
|
}
|
|
8462
8551
|
}
|
|
8463
8552
|
],
|
|
8553
|
+
flags: [
|
|
8554
|
+
{
|
|
8555
|
+
id: "health-worker-notified",
|
|
8556
|
+
requiresAction: false,
|
|
8557
|
+
label: {
|
|
8558
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8559
|
+
defaultMessage: "Health worker notified",
|
|
8560
|
+
description: "Label for the health-worker-notified flag"
|
|
8561
|
+
}
|
|
8562
|
+
}
|
|
8563
|
+
],
|
|
8464
8564
|
advancedSearch: [
|
|
8465
8565
|
{
|
|
8466
8566
|
title: {
|
|
@@ -10219,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10219
10319
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10220
10320
|
}
|
|
10221
10321
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10222
|
-
return user2.administrativeAreaId
|
|
10322
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10223
10323
|
}
|
|
10224
10324
|
return true;
|
|
10225
10325
|
}
|
|
@@ -10308,7 +10408,7 @@ function canAccessUserWithScope({
|
|
|
10308
10408
|
}
|
|
10309
10409
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10310
10410
|
(id) => user2.administrativeAreaId === id
|
|
10311
|
-
) || user2.administrativeAreaId
|
|
10411
|
+
) || !user2.administrativeAreaId;
|
|
10312
10412
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10313
10413
|
return false;
|
|
10314
10414
|
}
|
|
@@ -10614,18 +10714,19 @@ var ACTION_FILTERS = {
|
|
|
10614
10714
|
function filterActionsByFlags(actions, flags) {
|
|
10615
10715
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10616
10716
|
}
|
|
10717
|
+
var REJECTED_ACTIONS = [
|
|
10718
|
+
ActionType.READ,
|
|
10719
|
+
ActionType.NOTIFY,
|
|
10720
|
+
ActionType.CUSTOM,
|
|
10721
|
+
ActionType.EDIT,
|
|
10722
|
+
ActionType.ARCHIVE
|
|
10723
|
+
];
|
|
10617
10724
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10618
10725
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10619
10726
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10620
10727
|
}
|
|
10621
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10622
|
-
return
|
|
10623
|
-
ActionType.READ,
|
|
10624
|
-
ActionType.NOTIFY,
|
|
10625
|
-
ActionType.CUSTOM,
|
|
10626
|
-
ActionType.EDIT,
|
|
10627
|
-
ActionType.ARCHIVE
|
|
10628
|
-
];
|
|
10728
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10729
|
+
return REJECTED_ACTIONS;
|
|
10629
10730
|
}
|
|
10630
10731
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10631
10732
|
}
|
|
@@ -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';
|
|
@@ -2394,14 +2394,20 @@ var encodeScope = (scope) => {
|
|
|
2394
2394
|
encode: false
|
|
2395
2395
|
});
|
|
2396
2396
|
};
|
|
2397
|
-
var
|
|
2398
|
-
|
|
2397
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2398
|
+
var decodeScope = (encodedScope) => {
|
|
2399
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2400
|
+
return decodedScopeCache.get(encodedScope);
|
|
2401
|
+
}
|
|
2402
|
+
const scope = qs.parse(encodedScope, {
|
|
2399
2403
|
ignoreQueryPrefix: true,
|
|
2400
2404
|
comma: true,
|
|
2401
2405
|
allowDots: true
|
|
2402
2406
|
});
|
|
2403
2407
|
const unflattenedScope = unflattenScope(scope);
|
|
2404
|
-
|
|
2408
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2409
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2410
|
+
return result;
|
|
2405
2411
|
};
|
|
2406
2412
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2407
2413
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -4306,7 +4312,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4306
4312
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4307
4313
|
var import_child_process = require("child_process");
|
|
4308
4314
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4309
|
-
var UPSTREAM_BRANCH = "release
|
|
4315
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4310
4316
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4311
4317
|
var FILES_TO_CHECKOUT = [
|
|
4312
4318
|
"src/analytics/analytics.ts",
|
|
@@ -770,6 +770,11 @@ var FieldTypesToHideInReview = [
|
|
|
770
770
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
771
771
|
FieldType.ALPHA_HIDDEN
|
|
772
772
|
];
|
|
773
|
+
var HiddenFieldTypes = [
|
|
774
|
+
FieldType.HTTP,
|
|
775
|
+
FieldType.QUERY_PARAM_READER,
|
|
776
|
+
FieldType.ALPHA_HIDDEN
|
|
777
|
+
];
|
|
773
778
|
|
|
774
779
|
// ../commons/src/events/FieldValue.ts
|
|
775
780
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -888,7 +893,7 @@ var PlainDate = import_zod.z.string().date().brand("PlainDate").describe("Date i
|
|
|
888
893
|
// ../commons/src/events/FieldValue.ts
|
|
889
894
|
var TextValue = z12.string();
|
|
890
895
|
var HiddenFieldValue = z12.string();
|
|
891
|
-
var NonEmptyTextValue =
|
|
896
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
892
897
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
893
898
|
var AgeValue = z12.object({
|
|
894
899
|
age: z12.number(),
|
|
@@ -1478,7 +1483,8 @@ var Range = import_v4.z.object({
|
|
|
1478
1483
|
});
|
|
1479
1484
|
var ContainsFlags = import_v4.z.object({
|
|
1480
1485
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
1481
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
1486
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
1487
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
1482
1488
|
}).meta({
|
|
1483
1489
|
id: "ContainsFlags"
|
|
1484
1490
|
});
|
|
@@ -1750,6 +1756,7 @@ var NumberField = BaseField.extend({
|
|
|
1750
1756
|
configuration: import_v43.default.object({
|
|
1751
1757
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
1752
1758
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
1759
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
1753
1760
|
prefix: TranslationConfig.optional(),
|
|
1754
1761
|
postfix: TranslationConfig.optional()
|
|
1755
1762
|
}).optional()
|
|
@@ -2673,6 +2680,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
2673
2680
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
2674
2681
|
}).shape
|
|
2675
2682
|
);
|
|
2683
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
2684
|
+
z24.object({
|
|
2685
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
2686
|
+
}).shape
|
|
2687
|
+
);
|
|
2676
2688
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
2677
2689
|
z24.object({
|
|
2678
2690
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -2757,9 +2769,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
2757
2769
|
id: "ReadActionConfig",
|
|
2758
2770
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
2759
2771
|
}),
|
|
2772
|
+
NotifyConfig.meta({
|
|
2773
|
+
id: "NotifyActionConfig",
|
|
2774
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
2775
|
+
}),
|
|
2760
2776
|
DeclareConfig.meta({
|
|
2761
2777
|
id: "DeclareActionConfig",
|
|
2762
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
2778
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
2763
2779
|
}),
|
|
2764
2780
|
RejectConfig.meta({
|
|
2765
2781
|
id: "RejectActionConfig",
|
|
@@ -2938,6 +2954,9 @@ var BaseField3 = z28.object({
|
|
|
2938
2954
|
),
|
|
2939
2955
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
2940
2956
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
2957
|
+
),
|
|
2958
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
2959
|
+
`Override the allowedLocations for a location field in advanced search. Use this when the declaration form's allowedLocations references a scope (e.g. record.create) that search-only users don't have \u2014 specify record.search scope instead.`
|
|
2941
2960
|
)
|
|
2942
2961
|
});
|
|
2943
2962
|
var SearchQueryParams = z28.object({
|
|
@@ -3190,7 +3209,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
3190
3209
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
3191
3210
|
return actionConfig.form;
|
|
3192
3211
|
}
|
|
3193
|
-
if ("review" in actionConfig) {
|
|
3212
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
3194
3213
|
return actionConfig.review.fields;
|
|
3195
3214
|
}
|
|
3196
3215
|
return [];
|
|
@@ -4694,12 +4713,53 @@ var updateActions = ActionTypes.extract([
|
|
|
4694
4713
|
ActionType.ARCHIVE,
|
|
4695
4714
|
ActionType.PRINT_CERTIFICATE,
|
|
4696
4715
|
ActionType.REQUEST_CORRECTION,
|
|
4716
|
+
ActionType.APPROVE_CORRECTION,
|
|
4717
|
+
ActionType.REJECT_CORRECTION,
|
|
4697
4718
|
ActionType.CUSTOM
|
|
4698
4719
|
]);
|
|
4699
4720
|
|
|
4700
4721
|
// ../commons/src/events/state/flags.ts
|
|
4701
4722
|
var import_lodash3 = require("lodash");
|
|
4702
4723
|
var import_date_fns3 = require("date-fns");
|
|
4724
|
+
var INHERENT_FLAG_RULES = [
|
|
4725
|
+
{
|
|
4726
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
4727
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
4728
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
4729
|
+
},
|
|
4730
|
+
{
|
|
4731
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
4732
|
+
// other status-changing action (see getStatusFromActions).
|
|
4733
|
+
flag: InherentFlags.INCOMPLETE,
|
|
4734
|
+
setOn: [ActionType.NOTIFY],
|
|
4735
|
+
resetOn: [
|
|
4736
|
+
ActionType.CREATE,
|
|
4737
|
+
ActionType.DECLARE,
|
|
4738
|
+
ActionType.REGISTER,
|
|
4739
|
+
ActionType.ARCHIVE
|
|
4740
|
+
]
|
|
4741
|
+
},
|
|
4742
|
+
{
|
|
4743
|
+
flag: InherentFlags.REJECTED,
|
|
4744
|
+
setOn: [ActionType.REJECT],
|
|
4745
|
+
resetOn: [
|
|
4746
|
+
ActionType.NOTIFY,
|
|
4747
|
+
ActionType.DECLARE,
|
|
4748
|
+
ActionType.EDIT,
|
|
4749
|
+
ActionType.REGISTER
|
|
4750
|
+
]
|
|
4751
|
+
},
|
|
4752
|
+
{
|
|
4753
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
4754
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
4755
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
4756
|
+
},
|
|
4757
|
+
{
|
|
4758
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
4759
|
+
setOn: [ActionType.EDIT],
|
|
4760
|
+
resetOnAnyOtherAction: true
|
|
4761
|
+
}
|
|
4762
|
+
];
|
|
4703
4763
|
|
|
4704
4764
|
// ../commons/src/events/defineConfig.ts
|
|
4705
4765
|
var IGNORED_EVENT_TYPES = [
|
|
@@ -5445,6 +5505,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
5445
5505
|
id: "signature.upload.modal.title",
|
|
5446
5506
|
defaultMessage: "Draw signature",
|
|
5447
5507
|
description: "Title for the modal to draw signature"
|
|
5508
|
+
},
|
|
5509
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
5510
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
5511
|
+
configuration: {
|
|
5512
|
+
maxFileSize: 5 * 1024 * 1024
|
|
5448
5513
|
}
|
|
5449
5514
|
}
|
|
5450
5515
|
]
|
|
@@ -6001,6 +6066,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6001
6066
|
},
|
|
6002
6067
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
6003
6068
|
},
|
|
6069
|
+
{
|
|
6070
|
+
type: ActionType.NOTIFY,
|
|
6071
|
+
label: {
|
|
6072
|
+
defaultMessage: "Notify health worker",
|
|
6073
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
6074
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
6075
|
+
},
|
|
6076
|
+
flags: [
|
|
6077
|
+
{
|
|
6078
|
+
id: "health-worker-notified",
|
|
6079
|
+
operation: "add"
|
|
6080
|
+
}
|
|
6081
|
+
]
|
|
6082
|
+
},
|
|
6004
6083
|
{
|
|
6005
6084
|
type: ActionType.REJECT,
|
|
6006
6085
|
label: {
|
|
@@ -6243,6 +6322,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6243
6322
|
}
|
|
6244
6323
|
}
|
|
6245
6324
|
],
|
|
6325
|
+
flags: [
|
|
6326
|
+
{
|
|
6327
|
+
id: "health-worker-notified",
|
|
6328
|
+
requiresAction: false,
|
|
6329
|
+
label: {
|
|
6330
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
6331
|
+
defaultMessage: "Health worker notified",
|
|
6332
|
+
description: "Label for the health-worker-notified flag"
|
|
6333
|
+
}
|
|
6334
|
+
}
|
|
6335
|
+
],
|
|
6246
6336
|
advancedSearch: [
|
|
6247
6337
|
{
|
|
6248
6338
|
title: {
|
|
@@ -7238,6 +7328,13 @@ var ACTION_FILTERS = {
|
|
|
7238
7328
|
[ActionType.UNASSIGN]: (flags) => !flags.some((flag) => flag.endsWith(":requested")),
|
|
7239
7329
|
[ActionType.CUSTOM]: (flags) => !flags.some((flag) => flag.endsWith(":requested"))
|
|
7240
7330
|
};
|
|
7331
|
+
var REJECTED_ACTIONS = [
|
|
7332
|
+
ActionType.READ,
|
|
7333
|
+
ActionType.NOTIFY,
|
|
7334
|
+
ActionType.CUSTOM,
|
|
7335
|
+
ActionType.EDIT,
|
|
7336
|
+
ActionType.ARCHIVE
|
|
7337
|
+
];
|
|
7241
7338
|
|
|
7242
7339
|
// ../commons/src/events/FileUtils.ts
|
|
7243
7340
|
var import_lodash7 = require("lodash");
|