@opencrvs/toolkit 2.0.0-rc.2fe708f → 2.0.0-rc.2ff15cf
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 +7 -1
- package/dist/cli.js +10 -4
- package/dist/commons/api/router.d.ts +26 -17
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -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/field.d.ts +6 -0
- package/dist/commons/events/state/utils.d.ts +12 -290
- package/dist/events/index.js +166 -66
- 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 +99 -3
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.2ff15cf.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.2fe708f.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(),
|
|
@@ -2286,6 +2298,7 @@ var NumberField = BaseField.extend({
|
|
|
2286
2298
|
configuration: import_v43.default.object({
|
|
2287
2299
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2288
2300
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2301
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2289
2302
|
prefix: TranslationConfig.optional(),
|
|
2290
2303
|
postfix: TranslationConfig.optional()
|
|
2291
2304
|
}).optional()
|
|
@@ -3209,6 +3222,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3209
3222
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3210
3223
|
}).shape
|
|
3211
3224
|
);
|
|
3225
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3226
|
+
z24.object({
|
|
3227
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3228
|
+
}).shape
|
|
3229
|
+
);
|
|
3212
3230
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3213
3231
|
z24.object({
|
|
3214
3232
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3293,9 +3311,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3293
3311
|
id: "ReadActionConfig",
|
|
3294
3312
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3295
3313
|
}),
|
|
3314
|
+
NotifyConfig.meta({
|
|
3315
|
+
id: "NotifyActionConfig",
|
|
3316
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3317
|
+
}),
|
|
3296
3318
|
DeclareConfig.meta({
|
|
3297
3319
|
id: "DeclareActionConfig",
|
|
3298
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3320
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3299
3321
|
}),
|
|
3300
3322
|
RejectConfig.meta({
|
|
3301
3323
|
id: "RejectActionConfig",
|
|
@@ -3474,6 +3496,9 @@ var BaseField3 = z28.object({
|
|
|
3474
3496
|
),
|
|
3475
3497
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3476
3498
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3499
|
+
),
|
|
3500
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3501
|
+
`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
3502
|
)
|
|
3478
3503
|
});
|
|
3479
3504
|
var SearchQueryParams = z28.object({
|
|
@@ -3899,7 +3924,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3899
3924
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3900
3925
|
};
|
|
3901
3926
|
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.
|
|
3927
|
+
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
3928
|
};
|
|
3904
3929
|
|
|
3905
3930
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4461,13 +4486,13 @@ function getActionConfig({
|
|
|
4461
4486
|
actionType,
|
|
4462
4487
|
customActionType
|
|
4463
4488
|
}) {
|
|
4489
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4490
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4491
|
+
}
|
|
4464
4492
|
return eventConfiguration.actions.find((a) => {
|
|
4465
4493
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4466
4494
|
return a.customActionType === customActionType;
|
|
4467
4495
|
}
|
|
4468
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4469
|
-
return a.type === ActionType.DECLARE;
|
|
4470
|
-
}
|
|
4471
4496
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4472
4497
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4473
4498
|
}
|
|
@@ -4504,7 +4529,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4504
4529
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4505
4530
|
return actionConfig.form;
|
|
4506
4531
|
}
|
|
4507
|
-
if ("review" in actionConfig) {
|
|
4532
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4508
4533
|
return actionConfig.review.fields;
|
|
4509
4534
|
}
|
|
4510
4535
|
return [];
|
|
@@ -6476,6 +6501,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6476
6501
|
ActionType.ARCHIVE,
|
|
6477
6502
|
ActionType.PRINT_CERTIFICATE,
|
|
6478
6503
|
ActionType.REQUEST_CORRECTION,
|
|
6504
|
+
ActionType.APPROVE_CORRECTION,
|
|
6505
|
+
ActionType.REJECT_CORRECTION,
|
|
6479
6506
|
ActionType.CUSTOM
|
|
6480
6507
|
]);
|
|
6481
6508
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6490,7 +6517,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6490
6517
|
"createdAtLocation",
|
|
6491
6518
|
"createdByRole"
|
|
6492
6519
|
];
|
|
6493
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6520
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6494
6521
|
(_2, action) => {
|
|
6495
6522
|
if (action.originalActionId) {
|
|
6496
6523
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6517,9 +6544,6 @@ function getLegalStatuses(actions) {
|
|
|
6517
6544
|
// ../commons/src/events/state/flags.ts
|
|
6518
6545
|
var import_lodash3 = require("lodash");
|
|
6519
6546
|
var import_date_fns3 = require("date-fns");
|
|
6520
|
-
function isEditInProgress(actions) {
|
|
6521
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6522
|
-
}
|
|
6523
6547
|
function findPendingCorrectionAction(writeActions2) {
|
|
6524
6548
|
let correctionRequestAction;
|
|
6525
6549
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6534,29 +6558,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6534
6558
|
}
|
|
6535
6559
|
return correctionRequestAction;
|
|
6536
6560
|
}
|
|
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
6561
|
function isPotentialDuplicate(actions) {
|
|
6561
6562
|
return actions.reduce((prev, { type }) => {
|
|
6562
6563
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6584,6 +6585,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6584
6585
|
}
|
|
6585
6586
|
});
|
|
6586
6587
|
}
|
|
6588
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6589
|
+
if (!isActionConfigType(action.type)) {
|
|
6590
|
+
return false;
|
|
6591
|
+
}
|
|
6592
|
+
const actionConfig = getActionConfig({
|
|
6593
|
+
eventConfiguration,
|
|
6594
|
+
actionType: action.type,
|
|
6595
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6596
|
+
});
|
|
6597
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6598
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6599
|
+
);
|
|
6600
|
+
if (removeOperations.length === 0) {
|
|
6601
|
+
return false;
|
|
6602
|
+
}
|
|
6603
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6604
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6605
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6606
|
+
const form = { ...declaration, ...annotation };
|
|
6607
|
+
return removeOperations.some(
|
|
6608
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6609
|
+
);
|
|
6610
|
+
}
|
|
6611
|
+
var INHERENT_FLAG_RULES = [
|
|
6612
|
+
{
|
|
6613
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6614
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6615
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6616
|
+
},
|
|
6617
|
+
{
|
|
6618
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6619
|
+
// other status-changing action (see getStatusFromActions).
|
|
6620
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6621
|
+
setOn: [ActionType.NOTIFY],
|
|
6622
|
+
resetOn: [
|
|
6623
|
+
ActionType.CREATE,
|
|
6624
|
+
ActionType.DECLARE,
|
|
6625
|
+
ActionType.REGISTER,
|
|
6626
|
+
ActionType.ARCHIVE
|
|
6627
|
+
]
|
|
6628
|
+
},
|
|
6629
|
+
{
|
|
6630
|
+
flag: InherentFlags.REJECTED,
|
|
6631
|
+
setOn: [ActionType.REJECT],
|
|
6632
|
+
resetOn: [
|
|
6633
|
+
ActionType.NOTIFY,
|
|
6634
|
+
ActionType.DECLARE,
|
|
6635
|
+
ActionType.EDIT,
|
|
6636
|
+
ActionType.REGISTER
|
|
6637
|
+
]
|
|
6638
|
+
},
|
|
6639
|
+
{
|
|
6640
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6641
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6642
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6643
|
+
},
|
|
6644
|
+
{
|
|
6645
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6646
|
+
setOn: [ActionType.EDIT],
|
|
6647
|
+
resetOnAnyOtherAction: true
|
|
6648
|
+
}
|
|
6649
|
+
];
|
|
6650
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6651
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6652
|
+
if (rule.setOn.includes(action.type)) {
|
|
6653
|
+
return true;
|
|
6654
|
+
}
|
|
6655
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6656
|
+
return false;
|
|
6657
|
+
}
|
|
6658
|
+
if (actionConfigRemovesFlag(
|
|
6659
|
+
action,
|
|
6660
|
+
rule.flag,
|
|
6661
|
+
acceptedActions.slice(0, idx + 1),
|
|
6662
|
+
event2,
|
|
6663
|
+
eventConfiguration
|
|
6664
|
+
)) {
|
|
6665
|
+
return false;
|
|
6666
|
+
}
|
|
6667
|
+
return present;
|
|
6668
|
+
}, false);
|
|
6669
|
+
}
|
|
6587
6670
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6588
6671
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6589
6672
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6632,33 +6715,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6632
6715
|
return flag2;
|
|
6633
6716
|
});
|
|
6634
6717
|
}
|
|
6635
|
-
function getInherentFlags(sortedActions) {
|
|
6718
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6636
6719
|
const acceptedActions = sortedActions.filter(
|
|
6637
6720
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6638
6721
|
);
|
|
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;
|
|
6722
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6723
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6724
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6656
6725
|
}
|
|
6657
6726
|
function getEventFlags(event2, config) {
|
|
6658
6727
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6659
6728
|
return [
|
|
6660
6729
|
...getActionStatusFlags(sortedActions),
|
|
6661
|
-
...getInherentFlags(sortedActions),
|
|
6730
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6662
6731
|
...resolveEventCustomFlags(event2, config)
|
|
6663
6732
|
];
|
|
6664
6733
|
}
|
|
@@ -7663,6 +7732,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7663
7732
|
id: "signature.upload.modal.title",
|
|
7664
7733
|
defaultMessage: "Draw signature",
|
|
7665
7734
|
description: "Title for the modal to draw signature"
|
|
7735
|
+
},
|
|
7736
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7737
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7738
|
+
configuration: {
|
|
7739
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7666
7740
|
}
|
|
7667
7741
|
}
|
|
7668
7742
|
]
|
|
@@ -8219,6 +8293,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8219
8293
|
},
|
|
8220
8294
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8221
8295
|
},
|
|
8296
|
+
{
|
|
8297
|
+
type: ActionType.NOTIFY,
|
|
8298
|
+
label: {
|
|
8299
|
+
defaultMessage: "Notify health worker",
|
|
8300
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8301
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8302
|
+
},
|
|
8303
|
+
flags: [
|
|
8304
|
+
{
|
|
8305
|
+
id: "health-worker-notified",
|
|
8306
|
+
operation: "add"
|
|
8307
|
+
}
|
|
8308
|
+
]
|
|
8309
|
+
},
|
|
8222
8310
|
{
|
|
8223
8311
|
type: ActionType.REJECT,
|
|
8224
8312
|
label: {
|
|
@@ -8461,6 +8549,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8461
8549
|
}
|
|
8462
8550
|
}
|
|
8463
8551
|
],
|
|
8552
|
+
flags: [
|
|
8553
|
+
{
|
|
8554
|
+
id: "health-worker-notified",
|
|
8555
|
+
requiresAction: false,
|
|
8556
|
+
label: {
|
|
8557
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8558
|
+
defaultMessage: "Health worker notified",
|
|
8559
|
+
description: "Label for the health-worker-notified flag"
|
|
8560
|
+
}
|
|
8561
|
+
}
|
|
8562
|
+
],
|
|
8464
8563
|
advancedSearch: [
|
|
8465
8564
|
{
|
|
8466
8565
|
title: {
|
|
@@ -10219,7 +10318,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10219
10318
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10220
10319
|
}
|
|
10221
10320
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10222
|
-
return user2.administrativeAreaId
|
|
10321
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10223
10322
|
}
|
|
10224
10323
|
return true;
|
|
10225
10324
|
}
|
|
@@ -10308,7 +10407,7 @@ function canAccessUserWithScope({
|
|
|
10308
10407
|
}
|
|
10309
10408
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10310
10409
|
(id) => user2.administrativeAreaId === id
|
|
10311
|
-
) || user2.administrativeAreaId
|
|
10410
|
+
) || !user2.administrativeAreaId;
|
|
10312
10411
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10313
10412
|
return false;
|
|
10314
10413
|
}
|
|
@@ -10614,18 +10713,19 @@ var ACTION_FILTERS = {
|
|
|
10614
10713
|
function filterActionsByFlags(actions, flags) {
|
|
10615
10714
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10616
10715
|
}
|
|
10716
|
+
var REJECTED_ACTIONS = [
|
|
10717
|
+
ActionType.READ,
|
|
10718
|
+
ActionType.NOTIFY,
|
|
10719
|
+
ActionType.CUSTOM,
|
|
10720
|
+
ActionType.EDIT,
|
|
10721
|
+
ActionType.ARCHIVE
|
|
10722
|
+
];
|
|
10617
10723
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10618
10724
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10619
10725
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10620
10726
|
}
|
|
10621
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10622
|
-
return
|
|
10623
|
-
ActionType.READ,
|
|
10624
|
-
ActionType.NOTIFY,
|
|
10625
|
-
ActionType.CUSTOM,
|
|
10626
|
-
ActionType.EDIT,
|
|
10627
|
-
ActionType.ARCHIVE
|
|
10628
|
-
];
|
|
10727
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10728
|
+
return REJECTED_ACTIONS;
|
|
10629
10729
|
}
|
|
10630
10730
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10631
10731
|
}
|
|
@@ -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(),
|
|
@@ -1750,6 +1755,7 @@ var NumberField = BaseField.extend({
|
|
|
1750
1755
|
configuration: import_v43.default.object({
|
|
1751
1756
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
1752
1757
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
1758
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
1753
1759
|
prefix: TranslationConfig.optional(),
|
|
1754
1760
|
postfix: TranslationConfig.optional()
|
|
1755
1761
|
}).optional()
|
|
@@ -2673,6 +2679,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
2673
2679
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
2674
2680
|
}).shape
|
|
2675
2681
|
);
|
|
2682
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
2683
|
+
z24.object({
|
|
2684
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
2685
|
+
}).shape
|
|
2686
|
+
);
|
|
2676
2687
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
2677
2688
|
z24.object({
|
|
2678
2689
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -2757,9 +2768,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
2757
2768
|
id: "ReadActionConfig",
|
|
2758
2769
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
2759
2770
|
}),
|
|
2771
|
+
NotifyConfig.meta({
|
|
2772
|
+
id: "NotifyActionConfig",
|
|
2773
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
2774
|
+
}),
|
|
2760
2775
|
DeclareConfig.meta({
|
|
2761
2776
|
id: "DeclareActionConfig",
|
|
2762
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
2777
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
2763
2778
|
}),
|
|
2764
2779
|
RejectConfig.meta({
|
|
2765
2780
|
id: "RejectActionConfig",
|
|
@@ -2938,6 +2953,9 @@ var BaseField3 = z28.object({
|
|
|
2938
2953
|
),
|
|
2939
2954
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
2940
2955
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
2956
|
+
),
|
|
2957
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
2958
|
+
`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
2959
|
)
|
|
2942
2960
|
});
|
|
2943
2961
|
var SearchQueryParams = z28.object({
|
|
@@ -3190,7 +3208,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
3190
3208
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
3191
3209
|
return actionConfig.form;
|
|
3192
3210
|
}
|
|
3193
|
-
if ("review" in actionConfig) {
|
|
3211
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
3194
3212
|
return actionConfig.review.fields;
|
|
3195
3213
|
}
|
|
3196
3214
|
return [];
|
|
@@ -4694,12 +4712,53 @@ var updateActions = ActionTypes.extract([
|
|
|
4694
4712
|
ActionType.ARCHIVE,
|
|
4695
4713
|
ActionType.PRINT_CERTIFICATE,
|
|
4696
4714
|
ActionType.REQUEST_CORRECTION,
|
|
4715
|
+
ActionType.APPROVE_CORRECTION,
|
|
4716
|
+
ActionType.REJECT_CORRECTION,
|
|
4697
4717
|
ActionType.CUSTOM
|
|
4698
4718
|
]);
|
|
4699
4719
|
|
|
4700
4720
|
// ../commons/src/events/state/flags.ts
|
|
4701
4721
|
var import_lodash3 = require("lodash");
|
|
4702
4722
|
var import_date_fns3 = require("date-fns");
|
|
4723
|
+
var INHERENT_FLAG_RULES = [
|
|
4724
|
+
{
|
|
4725
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
4726
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
4727
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
4728
|
+
},
|
|
4729
|
+
{
|
|
4730
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
4731
|
+
// other status-changing action (see getStatusFromActions).
|
|
4732
|
+
flag: InherentFlags.INCOMPLETE,
|
|
4733
|
+
setOn: [ActionType.NOTIFY],
|
|
4734
|
+
resetOn: [
|
|
4735
|
+
ActionType.CREATE,
|
|
4736
|
+
ActionType.DECLARE,
|
|
4737
|
+
ActionType.REGISTER,
|
|
4738
|
+
ActionType.ARCHIVE
|
|
4739
|
+
]
|
|
4740
|
+
},
|
|
4741
|
+
{
|
|
4742
|
+
flag: InherentFlags.REJECTED,
|
|
4743
|
+
setOn: [ActionType.REJECT],
|
|
4744
|
+
resetOn: [
|
|
4745
|
+
ActionType.NOTIFY,
|
|
4746
|
+
ActionType.DECLARE,
|
|
4747
|
+
ActionType.EDIT,
|
|
4748
|
+
ActionType.REGISTER
|
|
4749
|
+
]
|
|
4750
|
+
},
|
|
4751
|
+
{
|
|
4752
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
4753
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
4754
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
4755
|
+
},
|
|
4756
|
+
{
|
|
4757
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
4758
|
+
setOn: [ActionType.EDIT],
|
|
4759
|
+
resetOnAnyOtherAction: true
|
|
4760
|
+
}
|
|
4761
|
+
];
|
|
4703
4762
|
|
|
4704
4763
|
// ../commons/src/events/defineConfig.ts
|
|
4705
4764
|
var IGNORED_EVENT_TYPES = [
|
|
@@ -5445,6 +5504,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
5445
5504
|
id: "signature.upload.modal.title",
|
|
5446
5505
|
defaultMessage: "Draw signature",
|
|
5447
5506
|
description: "Title for the modal to draw signature"
|
|
5507
|
+
},
|
|
5508
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
5509
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
5510
|
+
configuration: {
|
|
5511
|
+
maxFileSize: 5 * 1024 * 1024
|
|
5448
5512
|
}
|
|
5449
5513
|
}
|
|
5450
5514
|
]
|
|
@@ -6001,6 +6065,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6001
6065
|
},
|
|
6002
6066
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
6003
6067
|
},
|
|
6068
|
+
{
|
|
6069
|
+
type: ActionType.NOTIFY,
|
|
6070
|
+
label: {
|
|
6071
|
+
defaultMessage: "Notify health worker",
|
|
6072
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
6073
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
6074
|
+
},
|
|
6075
|
+
flags: [
|
|
6076
|
+
{
|
|
6077
|
+
id: "health-worker-notified",
|
|
6078
|
+
operation: "add"
|
|
6079
|
+
}
|
|
6080
|
+
]
|
|
6081
|
+
},
|
|
6004
6082
|
{
|
|
6005
6083
|
type: ActionType.REJECT,
|
|
6006
6084
|
label: {
|
|
@@ -6243,6 +6321,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6243
6321
|
}
|
|
6244
6322
|
}
|
|
6245
6323
|
],
|
|
6324
|
+
flags: [
|
|
6325
|
+
{
|
|
6326
|
+
id: "health-worker-notified",
|
|
6327
|
+
requiresAction: false,
|
|
6328
|
+
label: {
|
|
6329
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
6330
|
+
defaultMessage: "Health worker notified",
|
|
6331
|
+
description: "Label for the health-worker-notified flag"
|
|
6332
|
+
}
|
|
6333
|
+
}
|
|
6334
|
+
],
|
|
6246
6335
|
advancedSearch: [
|
|
6247
6336
|
{
|
|
6248
6337
|
title: {
|
|
@@ -7238,6 +7327,13 @@ var ACTION_FILTERS = {
|
|
|
7238
7327
|
[ActionType.UNASSIGN]: (flags) => !flags.some((flag) => flag.endsWith(":requested")),
|
|
7239
7328
|
[ActionType.CUSTOM]: (flags) => !flags.some((flag) => flag.endsWith(":requested"))
|
|
7240
7329
|
};
|
|
7330
|
+
var REJECTED_ACTIONS = [
|
|
7331
|
+
ActionType.READ,
|
|
7332
|
+
ActionType.NOTIFY,
|
|
7333
|
+
ActionType.CUSTOM,
|
|
7334
|
+
ActionType.EDIT,
|
|
7335
|
+
ActionType.ARCHIVE
|
|
7336
|
+
];
|
|
7241
7337
|
|
|
7242
7338
|
// ../commons/src/events/FileUtils.ts
|
|
7243
7339
|
var import_lodash7 = require("lodash");
|
package/dist/scopes/index.d.ts
CHANGED
|
@@ -580,14 +580,12 @@ export type EncodedScope = z.infer<typeof EncodedScope>;
|
|
|
580
580
|
*/
|
|
581
581
|
export declare const encodeScope: (scope: Scope) => EncodedScope;
|
|
582
582
|
/**
|
|
583
|
-
* Converts
|
|
583
|
+
* Converts an encoded scope string into a scope object.
|
|
584
584
|
*
|
|
585
|
-
* @
|
|
586
|
-
*
|
|
587
|
-
* @param scope - The scope object to encode.
|
|
588
|
-
* @returns The encoded scope as a branded string (`EncodedScope`).
|
|
585
|
+
* @param scope - The encoded scope string to decode.
|
|
586
|
+
* @returns The decoded scope object.
|
|
589
587
|
*/
|
|
590
|
-
export declare const decodeScope: (
|
|
588
|
+
export declare const decodeScope: (encodedScope: EncodedScope) => {
|
|
591
589
|
type: "record.create" | "record.declare" | "record.notify";
|
|
592
590
|
options?: {
|
|
593
591
|
event?: string[] | undefined;
|