@opencrvs/toolkit 2.0.0-rc.f1dacdc → 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 +18 -2
- package/dist/cli.js +8 -3
- package/dist/commons/api/router.d.ts +19 -2
- 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 +11 -0
- package/dist/commons/events/FieldType.d.ts +1 -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 +187 -63
- 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 +107 -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.f1dacdc.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,
|
|
@@ -520,6 +521,8 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
520
521
|
placeOfEvent: JurisdictionFilter.optional()
|
|
521
522
|
}).describe("Options applicable to all record scopes.");
|
|
522
523
|
var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
|
|
524
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
525
|
+
notifiedBy: UserFilter.optional(),
|
|
523
526
|
declaredIn: JurisdictionFilter.optional(),
|
|
524
527
|
declaredBy: UserFilter.optional()
|
|
525
528
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
@@ -561,6 +564,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
561
564
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
562
565
|
);
|
|
563
566
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
567
|
+
notifiedIn: UUID.nullish(),
|
|
568
|
+
notifiedBy: z2.string().optional(),
|
|
564
569
|
declaredIn: UUID.nullish(),
|
|
565
570
|
declaredBy: z2.string().optional()
|
|
566
571
|
}).describe(
|
|
@@ -729,8 +734,9 @@ var decodeScope = (encodedScope) => {
|
|
|
729
734
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
730
735
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
731
736
|
accessLevel: JurisdictionFilter.enum.all,
|
|
732
|
-
|
|
733
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
737
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
738
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
739
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
734
740
|
};
|
|
735
741
|
function getAcceptedScopesByType({
|
|
736
742
|
acceptedScopes,
|
|
@@ -1219,6 +1225,11 @@ var FieldTypesToHideInReview = [
|
|
|
1219
1225
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1220
1226
|
FieldType.ALPHA_HIDDEN
|
|
1221
1227
|
];
|
|
1228
|
+
var HiddenFieldTypes = [
|
|
1229
|
+
FieldType.HTTP,
|
|
1230
|
+
FieldType.QUERY_PARAM_READER,
|
|
1231
|
+
FieldType.ALPHA_HIDDEN
|
|
1232
|
+
];
|
|
1222
1233
|
|
|
1223
1234
|
// ../commons/src/events/FieldValue.ts
|
|
1224
1235
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1809,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1809
1820
|
)
|
|
1810
1821
|
});
|
|
1811
1822
|
var LegalStatuses = z16.object({
|
|
1823
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1812
1824
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1813
1825
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1814
1826
|
});
|
|
@@ -1950,6 +1962,8 @@ var eventMetadataLabelMap = {
|
|
|
1950
1962
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1951
1963
|
"createdAt",
|
|
1952
1964
|
"updatedAt",
|
|
1965
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1953
1967
|
"legalStatuses.DECLARED.createdAt",
|
|
1954
1968
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1955
1969
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1958,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1958
1972
|
var EventMetadataDateFieldId = z16.enum([
|
|
1959
1973
|
"event.createdAt",
|
|
1960
1974
|
"event.updatedAt",
|
|
1975
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1961
1977
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1962
1978
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1963
1979
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2292,6 +2308,7 @@ var NumberField = BaseField.extend({
|
|
|
2292
2308
|
configuration: import_v43.default.object({
|
|
2293
2309
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2294
2310
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2311
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2295
2312
|
prefix: TranslationConfig.optional(),
|
|
2296
2313
|
postfix: TranslationConfig.optional()
|
|
2297
2314
|
}).optional()
|
|
@@ -3215,6 +3232,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3215
3232
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3216
3233
|
}).shape
|
|
3217
3234
|
);
|
|
3235
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3236
|
+
z24.object({
|
|
3237
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3238
|
+
}).shape
|
|
3239
|
+
);
|
|
3218
3240
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3219
3241
|
z24.object({
|
|
3220
3242
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3299,9 +3321,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3299
3321
|
id: "ReadActionConfig",
|
|
3300
3322
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3301
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
|
+
}),
|
|
3302
3328
|
DeclareConfig.meta({
|
|
3303
3329
|
id: "DeclareActionConfig",
|
|
3304
|
-
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."
|
|
3305
3331
|
}),
|
|
3306
3332
|
RejectConfig.meta({
|
|
3307
3333
|
id: "RejectActionConfig",
|
|
@@ -3908,7 +3934,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3908
3934
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3909
3935
|
};
|
|
3910
3936
|
var isNonInteractiveFieldType = (field3) => {
|
|
3911
|
-
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;
|
|
3912
3938
|
};
|
|
3913
3939
|
|
|
3914
3940
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4470,13 +4496,13 @@ function getActionConfig({
|
|
|
4470
4496
|
actionType,
|
|
4471
4497
|
customActionType
|
|
4472
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
|
+
}
|
|
4473
4502
|
return eventConfiguration.actions.find((a) => {
|
|
4474
4503
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4475
4504
|
return a.customActionType === customActionType;
|
|
4476
4505
|
}
|
|
4477
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4478
|
-
return a.type === ActionType.DECLARE;
|
|
4479
|
-
}
|
|
4480
4506
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4481
4507
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4482
4508
|
}
|
|
@@ -4513,7 +4539,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4513
4539
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4514
4540
|
return actionConfig.form;
|
|
4515
4541
|
}
|
|
4516
|
-
if ("review" in actionConfig) {
|
|
4542
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4517
4543
|
return actionConfig.review.fields;
|
|
4518
4544
|
}
|
|
4519
4545
|
return [];
|
|
@@ -6485,6 +6511,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6485
6511
|
ActionType.ARCHIVE,
|
|
6486
6512
|
ActionType.PRINT_CERTIFICATE,
|
|
6487
6513
|
ActionType.REQUEST_CORRECTION,
|
|
6514
|
+
ActionType.APPROVE_CORRECTION,
|
|
6515
|
+
ActionType.REJECT_CORRECTION,
|
|
6488
6516
|
ActionType.CUSTOM
|
|
6489
6517
|
]);
|
|
6490
6518
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6512,6 +6540,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6512
6540
|
}
|
|
6513
6541
|
function getLegalStatuses(actions) {
|
|
6514
6542
|
return {
|
|
6543
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6544
|
+
ActionType.NOTIFY,
|
|
6545
|
+
actions
|
|
6546
|
+
),
|
|
6515
6547
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6516
6548
|
ActionType.DECLARE,
|
|
6517
6549
|
actions
|
|
@@ -6526,9 +6558,6 @@ function getLegalStatuses(actions) {
|
|
|
6526
6558
|
// ../commons/src/events/state/flags.ts
|
|
6527
6559
|
var import_lodash3 = require("lodash");
|
|
6528
6560
|
var import_date_fns3 = require("date-fns");
|
|
6529
|
-
function isEditInProgress(actions) {
|
|
6530
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6531
|
-
}
|
|
6532
6561
|
function findPendingCorrectionAction(writeActions2) {
|
|
6533
6562
|
let correctionRequestAction;
|
|
6534
6563
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6543,29 +6572,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6543
6572
|
}
|
|
6544
6573
|
return correctionRequestAction;
|
|
6545
6574
|
}
|
|
6546
|
-
function isCorrectionRequested(actions) {
|
|
6547
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6548
|
-
}
|
|
6549
|
-
function isDeclarationIncomplete(actions) {
|
|
6550
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6551
|
-
}
|
|
6552
|
-
function isRejected(actions) {
|
|
6553
|
-
const resettingActionTypes = [
|
|
6554
|
-
ActionType.NOTIFY,
|
|
6555
|
-
ActionType.DECLARE,
|
|
6556
|
-
ActionType.EDIT,
|
|
6557
|
-
ActionType.REGISTER
|
|
6558
|
-
];
|
|
6559
|
-
return actions.reduce((prev, { type }) => {
|
|
6560
|
-
if (type === ActionType.REJECT) {
|
|
6561
|
-
return true;
|
|
6562
|
-
}
|
|
6563
|
-
if (resettingActionTypes.includes(type)) {
|
|
6564
|
-
return false;
|
|
6565
|
-
}
|
|
6566
|
-
return prev;
|
|
6567
|
-
}, false);
|
|
6568
|
-
}
|
|
6569
6575
|
function isPotentialDuplicate(actions) {
|
|
6570
6576
|
return actions.reduce((prev, { type }) => {
|
|
6571
6577
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6593,6 +6599,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6593
6599
|
}
|
|
6594
6600
|
});
|
|
6595
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
|
+
}
|
|
6596
6684
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6597
6685
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6598
6686
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6641,33 +6729,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6641
6729
|
return flag2;
|
|
6642
6730
|
});
|
|
6643
6731
|
}
|
|
6644
|
-
function getInherentFlags(sortedActions) {
|
|
6732
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6645
6733
|
const acceptedActions = sortedActions.filter(
|
|
6646
6734
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6647
6735
|
);
|
|
6648
|
-
|
|
6649
|
-
|
|
6650
|
-
|
|
6651
|
-
}
|
|
6652
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6654
|
-
}
|
|
6655
|
-
if (isRejected(acceptedActions)) {
|
|
6656
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6657
|
-
}
|
|
6658
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6659
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6660
|
-
}
|
|
6661
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6663
|
-
}
|
|
6664
|
-
return inherentFlags;
|
|
6736
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6737
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6738
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6665
6739
|
}
|
|
6666
6740
|
function getEventFlags(event2, config) {
|
|
6667
6741
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6668
6742
|
return [
|
|
6669
6743
|
...getActionStatusFlags(sortedActions),
|
|
6670
|
-
...getInherentFlags(sortedActions),
|
|
6744
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6671
6745
|
...resolveEventCustomFlags(event2, config)
|
|
6672
6746
|
];
|
|
6673
6747
|
}
|
|
@@ -7672,6 +7746,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7672
7746
|
id: "signature.upload.modal.title",
|
|
7673
7747
|
defaultMessage: "Draw signature",
|
|
7674
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
|
|
7675
7754
|
}
|
|
7676
7755
|
}
|
|
7677
7756
|
]
|
|
@@ -8228,6 +8307,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8228
8307
|
},
|
|
8229
8308
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8230
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
|
+
},
|
|
8231
8324
|
{
|
|
8232
8325
|
type: ActionType.REJECT,
|
|
8233
8326
|
label: {
|
|
@@ -8470,6 +8563,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8470
8563
|
}
|
|
8471
8564
|
}
|
|
8472
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
|
+
],
|
|
8473
8577
|
advancedSearch: [
|
|
8474
8578
|
{
|
|
8475
8579
|
title: {
|
|
@@ -10228,7 +10332,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10228
10332
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10229
10333
|
}
|
|
10230
10334
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10231
|
-
return user2.administrativeAreaId
|
|
10335
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10232
10336
|
}
|
|
10233
10337
|
return true;
|
|
10234
10338
|
}
|
|
@@ -10255,6 +10359,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10255
10359
|
}
|
|
10256
10360
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10257
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
|
+
}
|
|
10258
10381
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10259
10382
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10260
10383
|
return false;
|
|
@@ -10317,7 +10440,7 @@ function canAccessUserWithScope({
|
|
|
10317
10440
|
}
|
|
10318
10441
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10319
10442
|
(id) => user2.administrativeAreaId === id
|
|
10320
|
-
) || user2.administrativeAreaId
|
|
10443
|
+
) || !user2.administrativeAreaId;
|
|
10321
10444
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10322
10445
|
return false;
|
|
10323
10446
|
}
|
|
@@ -10623,18 +10746,19 @@ var ACTION_FILTERS = {
|
|
|
10623
10746
|
function filterActionsByFlags(actions, flags) {
|
|
10624
10747
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10625
10748
|
}
|
|
10749
|
+
var REJECTED_ACTIONS = [
|
|
10750
|
+
ActionType.READ,
|
|
10751
|
+
ActionType.NOTIFY,
|
|
10752
|
+
ActionType.CUSTOM,
|
|
10753
|
+
ActionType.EDIT,
|
|
10754
|
+
ActionType.ARCHIVE
|
|
10755
|
+
];
|
|
10626
10756
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10627
10757
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10628
10758
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10629
10759
|
}
|
|
10630
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10631
|
-
return
|
|
10632
|
-
ActionType.READ,
|
|
10633
|
-
ActionType.NOTIFY,
|
|
10634
|
-
ActionType.CUSTOM,
|
|
10635
|
-
ActionType.EDIT,
|
|
10636
|
-
ActionType.ARCHIVE
|
|
10637
|
-
];
|
|
10760
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10761
|
+
return REJECTED_ACTIONS;
|
|
10638
10762
|
}
|
|
10639
10763
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10640
10764
|
}
|
|
@@ -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",
|