@opencrvs/toolkit 2.0.0-rc.15555da → 2.0.0-rc.157566a
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/cli.js +1 -1
- package/dist/commons/api/router.d.ts +9 -4
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/events/index.js +133 -52
- 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 +1 -1
- package/dist/notification/index.js +80 -2
- package/opencrvs-toolkit-2.0.0-rc.157566a.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.15555da.tgz +0 -0
package/dist/cli.js
CHANGED
|
@@ -4300,7 +4300,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4300
4300
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4301
4301
|
var import_child_process = require("child_process");
|
|
4302
4302
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4303
|
-
var UPSTREAM_BRANCH = "release
|
|
4303
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4304
4304
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4305
4305
|
var FILES_TO_CHECKOUT = [
|
|
4306
4306
|
"src/analytics/analytics.ts",
|
|
@@ -7374,12 +7374,17 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
7374
7374
|
output: void;
|
|
7375
7375
|
meta: import("trpc-to-openapi").OpenApiMeta;
|
|
7376
7376
|
}>;
|
|
7377
|
-
|
|
7377
|
+
requestEmailChange: import("@trpc/server").TRPCMutationProcedure<{
|
|
7378
7378
|
input: {
|
|
7379
|
-
notificationEvent: "change-email-address";
|
|
7380
7379
|
email: string;
|
|
7381
|
-
}
|
|
7382
|
-
|
|
7380
|
+
};
|
|
7381
|
+
output: {
|
|
7382
|
+
nonce: string;
|
|
7383
|
+
};
|
|
7384
|
+
meta: import("trpc-to-openapi").OpenApiMeta;
|
|
7385
|
+
}>;
|
|
7386
|
+
requestPhoneChange: import("@trpc/server").TRPCMutationProcedure<{
|
|
7387
|
+
input: {
|
|
7383
7388
|
phoneNumber: string;
|
|
7384
7389
|
};
|
|
7385
7390
|
output: {
|
|
@@ -85,6 +85,32 @@ export declare const ActionConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
85
85
|
fields: z.ZodArray<z.ZodType<FieldConfig, import("./FieldConfig").FieldConfigInput, z.core.$ZodTypeInternals<FieldConfig, import("./FieldConfig").FieldConfigInput>>>;
|
|
86
86
|
}, z.core.$strip>;
|
|
87
87
|
conditionals: z.ZodOptional<z.ZodNever>;
|
|
88
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
89
|
+
label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
|
|
90
|
+
flags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
91
|
+
id: z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
92
|
+
readonly INCOMPLETE: "incomplete";
|
|
93
|
+
readonly REJECTED: "rejected";
|
|
94
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
95
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
96
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
97
|
+
}>]>, z.ZodString]>;
|
|
98
|
+
operation: z.ZodEnum<{
|
|
99
|
+
add: "add";
|
|
100
|
+
remove: "remove";
|
|
101
|
+
}>;
|
|
102
|
+
conditional: z.ZodOptional<z.ZodAny>;
|
|
103
|
+
}, z.core.$strip>>>>;
|
|
104
|
+
supportingCopy: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
|
|
105
|
+
icon: z.ZodOptional<z.ZodString>;
|
|
106
|
+
conditionals: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
107
|
+
type: z.ZodLiteral<"SHOW">;
|
|
108
|
+
conditional: z.ZodAny;
|
|
109
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
110
|
+
type: z.ZodLiteral<"ENABLE">;
|
|
111
|
+
conditional: z.ZodAny;
|
|
112
|
+
}, z.core.$strip>], "type">>>;
|
|
113
|
+
type: z.ZodLiteral<"NOTIFY">;
|
|
88
114
|
}, z.core.$strip>, z.ZodObject<{
|
|
89
115
|
label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
|
|
90
116
|
flags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
@@ -388,8 +414,8 @@ export declare const actionConfigTypes: Set<ActionConfigTypes>;
|
|
|
388
414
|
*
|
|
389
415
|
* These are not the same as the broader workflow `action.type` values.
|
|
390
416
|
* `ActionConfigTypes` includes only the action kinds that can be defined
|
|
391
|
-
* in the country configuration (e.g. DECLARE, VALIDATE, CUSTOM), and
|
|
392
|
-
* excludes workflow-only types such as CREATE
|
|
417
|
+
* in the country configuration (e.g. NOTIFY, DECLARE, VALIDATE, CUSTOM), and
|
|
418
|
+
* excludes workflow-only types such as CREATE.
|
|
393
419
|
*/
|
|
394
420
|
export type ActionConfigTypes = ActionConfig['type'];
|
|
395
421
|
export declare const DeclarationActionConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
package/dist/events/index.js
CHANGED
|
@@ -3222,6 +3222,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3222
3222
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3223
3223
|
}).shape
|
|
3224
3224
|
);
|
|
3225
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3226
|
+
z24.object({
|
|
3227
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3228
|
+
}).shape
|
|
3229
|
+
);
|
|
3225
3230
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3226
3231
|
z24.object({
|
|
3227
3232
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3306,9 +3311,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3306
3311
|
id: "ReadActionConfig",
|
|
3307
3312
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3308
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
|
+
}),
|
|
3309
3318
|
DeclareConfig.meta({
|
|
3310
3319
|
id: "DeclareActionConfig",
|
|
3311
|
-
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."
|
|
3312
3321
|
}),
|
|
3313
3322
|
RejectConfig.meta({
|
|
3314
3323
|
id: "RejectActionConfig",
|
|
@@ -4477,13 +4486,13 @@ function getActionConfig({
|
|
|
4477
4486
|
actionType,
|
|
4478
4487
|
customActionType
|
|
4479
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
|
+
}
|
|
4480
4492
|
return eventConfiguration.actions.find((a) => {
|
|
4481
4493
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4482
4494
|
return a.customActionType === customActionType;
|
|
4483
4495
|
}
|
|
4484
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4485
|
-
return a.type === ActionType.DECLARE;
|
|
4486
|
-
}
|
|
4487
4496
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4488
4497
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4489
4498
|
}
|
|
@@ -4520,7 +4529,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4520
4529
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4521
4530
|
return actionConfig.form;
|
|
4522
4531
|
}
|
|
4523
|
-
if ("review" in actionConfig) {
|
|
4532
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4524
4533
|
return actionConfig.review.fields;
|
|
4525
4534
|
}
|
|
4526
4535
|
return [];
|
|
@@ -6535,9 +6544,6 @@ function getLegalStatuses(actions) {
|
|
|
6535
6544
|
// ../commons/src/events/state/flags.ts
|
|
6536
6545
|
var import_lodash3 = require("lodash");
|
|
6537
6546
|
var import_date_fns3 = require("date-fns");
|
|
6538
|
-
function isEditInProgress(actions) {
|
|
6539
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6540
|
-
}
|
|
6541
6547
|
function findPendingCorrectionAction(writeActions2) {
|
|
6542
6548
|
let correctionRequestAction;
|
|
6543
6549
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6552,29 +6558,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6552
6558
|
}
|
|
6553
6559
|
return correctionRequestAction;
|
|
6554
6560
|
}
|
|
6555
|
-
function isCorrectionRequested(actions) {
|
|
6556
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6557
|
-
}
|
|
6558
|
-
function isDeclarationIncomplete(actions) {
|
|
6559
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6560
|
-
}
|
|
6561
|
-
function isRejected(actions) {
|
|
6562
|
-
const resettingActionTypes = [
|
|
6563
|
-
ActionType.NOTIFY,
|
|
6564
|
-
ActionType.DECLARE,
|
|
6565
|
-
ActionType.EDIT,
|
|
6566
|
-
ActionType.REGISTER
|
|
6567
|
-
];
|
|
6568
|
-
return actions.reduce((prev, { type }) => {
|
|
6569
|
-
if (type === ActionType.REJECT) {
|
|
6570
|
-
return true;
|
|
6571
|
-
}
|
|
6572
|
-
if (resettingActionTypes.includes(type)) {
|
|
6573
|
-
return false;
|
|
6574
|
-
}
|
|
6575
|
-
return prev;
|
|
6576
|
-
}, false);
|
|
6577
|
-
}
|
|
6578
6561
|
function isPotentialDuplicate(actions) {
|
|
6579
6562
|
return actions.reduce((prev, { type }) => {
|
|
6580
6563
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6602,6 +6585,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6602
6585
|
}
|
|
6603
6586
|
});
|
|
6604
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
|
+
}
|
|
6605
6670
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6606
6671
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6607
6672
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6650,33 +6715,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6650
6715
|
return flag2;
|
|
6651
6716
|
});
|
|
6652
6717
|
}
|
|
6653
|
-
function getInherentFlags(sortedActions) {
|
|
6718
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6654
6719
|
const acceptedActions = sortedActions.filter(
|
|
6655
6720
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6656
6721
|
);
|
|
6657
|
-
|
|
6658
|
-
|
|
6659
|
-
|
|
6660
|
-
}
|
|
6661
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6663
|
-
}
|
|
6664
|
-
if (isRejected(acceptedActions)) {
|
|
6665
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6666
|
-
}
|
|
6667
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6668
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6669
|
-
}
|
|
6670
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6671
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6672
|
-
}
|
|
6673
|
-
return inherentFlags;
|
|
6722
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6723
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6724
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6674
6725
|
}
|
|
6675
6726
|
function getEventFlags(event2, config) {
|
|
6676
6727
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6677
6728
|
return [
|
|
6678
6729
|
...getActionStatusFlags(sortedActions),
|
|
6679
|
-
...getInherentFlags(sortedActions),
|
|
6730
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6680
6731
|
...resolveEventCustomFlags(event2, config)
|
|
6681
6732
|
];
|
|
6682
6733
|
}
|
|
@@ -7681,6 +7732,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7681
7732
|
id: "signature.upload.modal.title",
|
|
7682
7733
|
defaultMessage: "Draw signature",
|
|
7683
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
|
|
7684
7740
|
}
|
|
7685
7741
|
}
|
|
7686
7742
|
]
|
|
@@ -8237,6 +8293,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8237
8293
|
},
|
|
8238
8294
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8239
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
|
+
},
|
|
8240
8310
|
{
|
|
8241
8311
|
type: ActionType.REJECT,
|
|
8242
8312
|
label: {
|
|
@@ -8479,6 +8549,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8479
8549
|
}
|
|
8480
8550
|
}
|
|
8481
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
|
+
],
|
|
8482
8563
|
advancedSearch: [
|
|
8483
8564
|
{
|
|
8484
8565
|
title: {
|
|
@@ -10237,7 +10318,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10237
10318
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10238
10319
|
}
|
|
10239
10320
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10240
|
-
return user2.administrativeAreaId
|
|
10321
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10241
10322
|
}
|
|
10242
10323
|
return true;
|
|
10243
10324
|
}
|
|
@@ -10326,7 +10407,7 @@ function canAccessUserWithScope({
|
|
|
10326
10407
|
}
|
|
10327
10408
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10328
10409
|
(id) => user2.administrativeAreaId === id
|
|
10329
|
-
) || user2.administrativeAreaId
|
|
10410
|
+
) || !user2.administrativeAreaId;
|
|
10330
10411
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10331
10412
|
return false;
|
|
10332
10413
|
}
|
|
@@ -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';
|
|
@@ -4312,7 +4312,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4312
4312
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4313
4313
|
var import_child_process = require("child_process");
|
|
4314
4314
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4315
|
-
var UPSTREAM_BRANCH = "release
|
|
4315
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4316
4316
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4317
4317
|
var FILES_TO_CHECKOUT = [
|
|
4318
4318
|
"src/analytics/analytics.ts",
|
|
@@ -2679,6 +2679,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
2679
2679
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
2680
2680
|
}).shape
|
|
2681
2681
|
);
|
|
2682
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
2683
|
+
z24.object({
|
|
2684
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
2685
|
+
}).shape
|
|
2686
|
+
);
|
|
2682
2687
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
2683
2688
|
z24.object({
|
|
2684
2689
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -2763,9 +2768,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
2763
2768
|
id: "ReadActionConfig",
|
|
2764
2769
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
2765
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
|
+
}),
|
|
2766
2775
|
DeclareConfig.meta({
|
|
2767
2776
|
id: "DeclareActionConfig",
|
|
2768
|
-
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."
|
|
2769
2778
|
}),
|
|
2770
2779
|
RejectConfig.meta({
|
|
2771
2780
|
id: "RejectActionConfig",
|
|
@@ -3199,7 +3208,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
3199
3208
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
3200
3209
|
return actionConfig.form;
|
|
3201
3210
|
}
|
|
3202
|
-
if ("review" in actionConfig) {
|
|
3211
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
3203
3212
|
return actionConfig.review.fields;
|
|
3204
3213
|
}
|
|
3205
3214
|
return [];
|
|
@@ -4711,6 +4720,45 @@ var updateActions = ActionTypes.extract([
|
|
|
4711
4720
|
// ../commons/src/events/state/flags.ts
|
|
4712
4721
|
var import_lodash3 = require("lodash");
|
|
4713
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
|
+
];
|
|
4714
4762
|
|
|
4715
4763
|
// ../commons/src/events/defineConfig.ts
|
|
4716
4764
|
var IGNORED_EVENT_TYPES = [
|
|
@@ -5456,6 +5504,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
5456
5504
|
id: "signature.upload.modal.title",
|
|
5457
5505
|
defaultMessage: "Draw signature",
|
|
5458
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
|
|
5459
5512
|
}
|
|
5460
5513
|
}
|
|
5461
5514
|
]
|
|
@@ -6012,6 +6065,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6012
6065
|
},
|
|
6013
6066
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
6014
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
|
+
},
|
|
6015
6082
|
{
|
|
6016
6083
|
type: ActionType.REJECT,
|
|
6017
6084
|
label: {
|
|
@@ -6254,6 +6321,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6254
6321
|
}
|
|
6255
6322
|
}
|
|
6256
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
|
+
],
|
|
6257
6335
|
advancedSearch: [
|
|
6258
6336
|
{
|
|
6259
6337
|
title: {
|
|
Binary file
|
package/package.json
CHANGED
|
Binary file
|