@opencrvs/toolkit 2.0.0-rc.295461c → 2.0.0-rc.29a4fa3
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/README.md +15 -0
- package/build.sh +5 -4
- package/dist/application-config/index.js +17 -6
- package/dist/cli.js +3186 -4921
- package/dist/commons/api/router.d.ts +19 -4
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +204 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventIndex.d.ts +25 -0
- package/dist/commons/events/EventMetadata.d.ts +26 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- 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 +10 -5
- package/dist/environment/custom-types.d.ts +33 -0
- package/dist/environment/custom-types.d.ts.map +1 -0
- package/dist/environment/custom-types.js +12 -0
- package/dist/environment/derived-variables.d.ts +134 -0
- package/dist/environment/derived-variables.d.ts.map +1 -0
- package/dist/environment/derived-variables.js +169 -0
- package/dist/environment/editor-questions.d.ts +4 -0
- package/dist/environment/editor-questions.d.ts.map +1 -0
- package/dist/environment/editor-questions.js +67 -0
- package/dist/environment/git.d.ts +5 -0
- package/dist/environment/git.d.ts.map +1 -0
- package/dist/environment/git.js +38 -0
- package/dist/environment/github.d.ts +26 -0
- package/dist/environment/github.d.ts.map +1 -0
- package/dist/environment/github.js +247 -0
- package/dist/environment/index.d.ts +5 -0
- package/dist/environment/index.d.ts.map +1 -0
- package/dist/environment/index.js +71 -0
- package/dist/environment/logger.d.ts +15 -0
- package/dist/environment/logger.d.ts.map +1 -0
- package/dist/environment/logger.js +25 -0
- package/dist/environment/manage-users.d.ts +11 -0
- package/dist/environment/manage-users.d.ts.map +1 -0
- package/dist/environment/manage-users.js +497 -0
- package/dist/environment/questions-helper.d.ts +15 -0
- package/dist/environment/questions-helper.d.ts.map +1 -0
- package/dist/environment/questions-helper.js +70 -0
- package/dist/environment/questions.d.ts +199 -0
- package/dist/environment/questions.d.ts.map +1 -0
- package/dist/environment/questions.js +412 -0
- package/dist/environment/setup-environment.d.ts +2 -0
- package/dist/environment/setup-environment.d.ts.map +1 -0
- package/dist/environment/setup-environment.js +794 -0
- package/dist/environment/ssh-keygen.d.ts +5 -0
- package/dist/environment/ssh-keygen.d.ts.map +1 -0
- package/dist/environment/ssh-keygen.js +21 -0
- package/dist/environment/swarm-to-k8s.d.ts +2 -0
- package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
- package/dist/environment/swarm-to-k8s.js +173 -0
- package/dist/environment/templates.d.ts +27 -0
- package/dist/environment/templates.d.ts.map +1 -0
- package/dist/environment/templates.js +163 -0
- package/dist/environment/update-workflows.d.ts +2 -0
- package/dist/environment/update-workflows.d.ts.map +1 -0
- package/dist/environment/update-workflows.js +169 -0
- package/dist/environment/users.d.ts +2 -0
- package/dist/environment/users.d.ts.map +1 -0
- package/dist/environment/users.js +112 -0
- package/dist/environment/utils.d.ts +18 -0
- package/dist/environment/utils.d.ts.map +1 -0
- package/dist/environment/utils.js +100 -0
- package/dist/events/index.js +268 -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 +88 -5139
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts +3 -0
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts.map +1 -0
- package/dist/migrations/v2.1/add-explicit-correction-flags.js +234 -0
- package/dist/migrations/v2.1/index.d.ts +6 -0
- package/dist/migrations/v2.1/index.d.ts.map +1 -0
- package/dist/migrations/v2.1/index.js +218 -0
- package/dist/notification/index.js +190 -11
- package/dist/scopes/index.d.ts +89 -1
- package/dist/scopes/index.js +10 -5
- package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
- package/dist/templates/charts-values/dependencies/values.yaml +83 -0
- package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
- package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
- package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
- package/dist/templates/charts-values/traefik/values.yaml +115 -0
- package/dist/templates/inventory/inventory.template.yml +100 -0
- package/dist/templates/inventory/production.example.yml +77 -0
- package/dist/templates/inventory/qa.example.yml +48 -0
- package/opencrvs-toolkit-2.0.0-rc.29a4fa3.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.295461c.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -520,11 +520,13 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
520
520
|
event: scopeByEvent,
|
|
521
521
|
placeOfEvent: JurisdictionFilter.optional()
|
|
522
522
|
}).describe("Options applicable to all record scopes.");
|
|
523
|
-
var
|
|
523
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
524
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
525
|
+
notifiedBy: UserFilter.optional(),
|
|
524
526
|
declaredIn: JurisdictionFilter.optional(),
|
|
525
527
|
declaredBy: UserFilter.optional()
|
|
526
528
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
527
|
-
var AllRecordScopeOptions =
|
|
529
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
528
530
|
registeredIn: JurisdictionFilter.optional(),
|
|
529
531
|
registeredBy: UserFilter.optional()
|
|
530
532
|
}).describe(
|
|
@@ -562,6 +564,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
562
564
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
563
565
|
);
|
|
564
566
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
567
|
+
notifiedIn: UUID.nullish(),
|
|
568
|
+
notifiedBy: z2.string().optional(),
|
|
565
569
|
declaredIn: UUID.nullish(),
|
|
566
570
|
declaredBy: z2.string().optional()
|
|
567
571
|
}).describe(
|
|
@@ -607,7 +611,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
607
611
|
}),
|
|
608
612
|
z2.object({
|
|
609
613
|
type: ScopesWithDeclaredOptions,
|
|
610
|
-
options:
|
|
614
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
611
615
|
}),
|
|
612
616
|
z2.object({
|
|
613
617
|
type: ScopesWithFullOptions,
|
|
@@ -730,8 +734,9 @@ var decodeScope = (encodedScope) => {
|
|
|
730
734
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
731
735
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
732
736
|
accessLevel: JurisdictionFilter.enum.all,
|
|
733
|
-
|
|
734
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
737
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
738
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
739
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
735
740
|
};
|
|
736
741
|
function getAcceptedScopesByType({
|
|
737
742
|
acceptedScopes,
|
|
@@ -1815,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1815
1820
|
)
|
|
1816
1821
|
});
|
|
1817
1822
|
var LegalStatuses = z16.object({
|
|
1823
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1818
1824
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1819
1825
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1820
1826
|
});
|
|
@@ -1956,6 +1962,8 @@ var eventMetadataLabelMap = {
|
|
|
1956
1962
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1957
1963
|
"createdAt",
|
|
1958
1964
|
"updatedAt",
|
|
1965
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1959
1967
|
"legalStatuses.DECLARED.createdAt",
|
|
1960
1968
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1961
1969
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1964,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1964
1972
|
var EventMetadataDateFieldId = z16.enum([
|
|
1965
1973
|
"event.createdAt",
|
|
1966
1974
|
"event.updatedAt",
|
|
1975
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1967
1977
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1968
1978
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1969
1979
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2023,7 +2033,8 @@ var Range = import_v4.z.object({
|
|
|
2023
2033
|
});
|
|
2024
2034
|
var ContainsFlags = import_v4.z.object({
|
|
2025
2035
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2026
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2036
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2037
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2027
2038
|
}).meta({
|
|
2028
2039
|
id: "ContainsFlags"
|
|
2029
2040
|
});
|
|
@@ -3222,6 +3233,57 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3222
3233
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3223
3234
|
}).shape
|
|
3224
3235
|
);
|
|
3236
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3237
|
+
z24.object({
|
|
3238
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3239
|
+
}).shape
|
|
3240
|
+
);
|
|
3241
|
+
var DuplicateDetectedConfig = ActionConfigBase.extend(
|
|
3242
|
+
z24.object({
|
|
3243
|
+
type: z24.literal(ActionType.DUPLICATE_DETECTED),
|
|
3244
|
+
label: z24.never().optional().describe(
|
|
3245
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no label."
|
|
3246
|
+
),
|
|
3247
|
+
supportingCopy: z24.never().optional(),
|
|
3248
|
+
icon: z24.never().optional().describe(
|
|
3249
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no icon."
|
|
3250
|
+
),
|
|
3251
|
+
conditionals: z24.never().optional().describe(
|
|
3252
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it cannot be disabled or hidden with conditionals."
|
|
3253
|
+
)
|
|
3254
|
+
}).shape
|
|
3255
|
+
);
|
|
3256
|
+
var MarkAsDuplicateConfig = ActionConfigBase.extend(
|
|
3257
|
+
z24.object({
|
|
3258
|
+
type: z24.literal(ActionType.MARK_AS_DUPLICATE)
|
|
3259
|
+
}).shape
|
|
3260
|
+
);
|
|
3261
|
+
var MarkAsNotDuplicateConfig = ActionConfigBase.extend(
|
|
3262
|
+
z24.object({
|
|
3263
|
+
type: z24.literal(ActionType.MARK_AS_NOT_DUPLICATE)
|
|
3264
|
+
}).shape
|
|
3265
|
+
);
|
|
3266
|
+
var AssignConfig = ActionConfigBase.extend(
|
|
3267
|
+
z24.object({
|
|
3268
|
+
type: z24.literal(ActionType.ASSIGN),
|
|
3269
|
+
flags: z24.never().optional().describe(
|
|
3270
|
+
"ASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3271
|
+
)
|
|
3272
|
+
}).shape
|
|
3273
|
+
);
|
|
3274
|
+
var UnassignConfig = ActionConfigBase.extend(
|
|
3275
|
+
z24.object({
|
|
3276
|
+
type: z24.literal(ActionType.UNASSIGN),
|
|
3277
|
+
flags: z24.never().optional().describe(
|
|
3278
|
+
"UNASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3279
|
+
)
|
|
3280
|
+
}).shape
|
|
3281
|
+
);
|
|
3282
|
+
var DeleteConfig = ActionConfigBase.extend(
|
|
3283
|
+
z24.object({
|
|
3284
|
+
type: z24.literal(ActionType.DELETE)
|
|
3285
|
+
}).shape
|
|
3286
|
+
);
|
|
3225
3287
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3226
3288
|
z24.object({
|
|
3227
3289
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3284,7 +3346,17 @@ var RequestCorrectionConfig = ActionConfigBase.extend(
|
|
|
3284
3346
|
correctionForm: ActionFormConfig
|
|
3285
3347
|
}).shape
|
|
3286
3348
|
);
|
|
3287
|
-
var
|
|
3349
|
+
var ApproveCorrectionConfig = ActionConfigBase.extend(
|
|
3350
|
+
z24.object({
|
|
3351
|
+
type: z24.literal(ActionType.APPROVE_CORRECTION)
|
|
3352
|
+
}).shape
|
|
3353
|
+
);
|
|
3354
|
+
var RejectCorrectionConfig = ActionConfigBase.extend(
|
|
3355
|
+
z24.object({
|
|
3356
|
+
type: z24.literal(ActionType.REJECT_CORRECTION)
|
|
3357
|
+
}).shape
|
|
3358
|
+
);
|
|
3359
|
+
var CustomActionConfig = ActionConfigBase.extend(
|
|
3288
3360
|
z24.object({
|
|
3289
3361
|
type: z24.literal(ActionType.CUSTOM),
|
|
3290
3362
|
customActionType: z24.string().describe("Type identifier of the custom action."),
|
|
@@ -3295,7 +3367,7 @@ var CustomActionConfig = ActionConfigBase.merge(
|
|
|
3295
3367
|
auditHistoryLabel: TranslationConfig.describe(
|
|
3296
3368
|
'The label to show in audit history for this action. For example "Approved".'
|
|
3297
3369
|
)
|
|
3298
|
-
})
|
|
3370
|
+
}).shape
|
|
3299
3371
|
);
|
|
3300
3372
|
var ActionConfig = z24.discriminatedUnion("type", [
|
|
3301
3373
|
/*
|
|
@@ -3306,9 +3378,37 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3306
3378
|
id: "ReadActionConfig",
|
|
3307
3379
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3308
3380
|
}),
|
|
3381
|
+
AssignConfig.meta({
|
|
3382
|
+
id: "AssignActionConfig",
|
|
3383
|
+
description: "Configuration for assigning a record to the current user."
|
|
3384
|
+
}),
|
|
3385
|
+
UnassignConfig.meta({
|
|
3386
|
+
id: "UnassignActionConfig",
|
|
3387
|
+
description: "Configuration for unassigning a record from its current assignee."
|
|
3388
|
+
}),
|
|
3389
|
+
DeleteConfig.meta({
|
|
3390
|
+
id: "DeleteActionConfig",
|
|
3391
|
+
description: "Configuration for deleting a draft record."
|
|
3392
|
+
}),
|
|
3393
|
+
NotifyConfig.meta({
|
|
3394
|
+
id: "NotifyActionConfig",
|
|
3395
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3396
|
+
}),
|
|
3309
3397
|
DeclareConfig.meta({
|
|
3310
3398
|
id: "DeclareActionConfig",
|
|
3311
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3399
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3400
|
+
}),
|
|
3401
|
+
DuplicateDetectedConfig.meta({
|
|
3402
|
+
id: "DuplicateDetectedActionConfig",
|
|
3403
|
+
description: "Configuration for the system-generated duplicate-detection action. Never shown as a button, so it only supports flags \u2014 not label, icon, or conditionals."
|
|
3404
|
+
}),
|
|
3405
|
+
MarkAsDuplicateConfig.meta({
|
|
3406
|
+
id: "MarkAsDuplicateActionConfig",
|
|
3407
|
+
description: "Configuration for marking a record as a duplicate."
|
|
3408
|
+
}),
|
|
3409
|
+
MarkAsNotDuplicateConfig.meta({
|
|
3410
|
+
id: "MarkAsNotDuplicateActionConfig",
|
|
3411
|
+
description: "Configuration for marking a record as not a duplicate, after it was previously flagged as one."
|
|
3312
3412
|
}),
|
|
3313
3413
|
RejectConfig.meta({
|
|
3314
3414
|
id: "RejectActionConfig",
|
|
@@ -3326,6 +3426,14 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3326
3426
|
id: "RequestCorrectionActionConfig",
|
|
3327
3427
|
description: "Configuration for requesting a correction on a registered record."
|
|
3328
3428
|
}),
|
|
3429
|
+
ApproveCorrectionConfig.meta({
|
|
3430
|
+
id: "ApproveCorrectionActionConfig",
|
|
3431
|
+
description: "Configuration for approving a requested correction."
|
|
3432
|
+
}),
|
|
3433
|
+
RejectCorrectionConfig.meta({
|
|
3434
|
+
id: "RejectCorrectionActionConfig",
|
|
3435
|
+
description: "Configuration for rejecting a requested correction."
|
|
3436
|
+
}),
|
|
3329
3437
|
EditActionConfig.meta({
|
|
3330
3438
|
id: "EditActionConfig",
|
|
3331
3439
|
description: "Configuration for editing a record before registration."
|
|
@@ -3915,7 +4023,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3915
4023
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3916
4024
|
};
|
|
3917
4025
|
var isNonInteractiveFieldType = (field3) => {
|
|
3918
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
4026
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3919
4027
|
};
|
|
3920
4028
|
|
|
3921
4029
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4477,16 +4585,13 @@ function getActionConfig({
|
|
|
4477
4585
|
actionType,
|
|
4478
4586
|
customActionType
|
|
4479
4587
|
}) {
|
|
4588
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4589
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4590
|
+
}
|
|
4480
4591
|
return eventConfiguration.actions.find((a) => {
|
|
4481
4592
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4482
4593
|
return a.customActionType === customActionType;
|
|
4483
4594
|
}
|
|
4484
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4485
|
-
return a.type === ActionType.DECLARE;
|
|
4486
|
-
}
|
|
4487
|
-
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4488
|
-
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4489
|
-
}
|
|
4490
4595
|
return a.type === actionType;
|
|
4491
4596
|
});
|
|
4492
4597
|
}
|
|
@@ -4520,7 +4625,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4520
4625
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4521
4626
|
return actionConfig.form;
|
|
4522
4627
|
}
|
|
4523
|
-
if ("review" in actionConfig) {
|
|
4628
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4524
4629
|
return actionConfig.review.fields;
|
|
4525
4630
|
}
|
|
4526
4631
|
return [];
|
|
@@ -5640,7 +5745,7 @@ function validateActionFlags(event2, ctx) {
|
|
|
5640
5745
|
const isInherentFlag = (value) => Object.values(InherentFlags).includes(value);
|
|
5641
5746
|
const configuredFlagIds = event2.flags.map((flag2) => flag2.id);
|
|
5642
5747
|
const actionFlagIds = event2.actions.flatMap(
|
|
5643
|
-
(action) => action.flags.map((flag2) => flag2.id)
|
|
5748
|
+
(action) => (action.flags ?? []).map((flag2) => flag2.id)
|
|
5644
5749
|
);
|
|
5645
5750
|
for (const actionFlagId of actionFlagIds) {
|
|
5646
5751
|
const isConfigured = configuredFlagIds.includes(actionFlagId);
|
|
@@ -6492,6 +6597,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6492
6597
|
ActionType.ARCHIVE,
|
|
6493
6598
|
ActionType.PRINT_CERTIFICATE,
|
|
6494
6599
|
ActionType.REQUEST_CORRECTION,
|
|
6600
|
+
ActionType.APPROVE_CORRECTION,
|
|
6601
|
+
ActionType.REJECT_CORRECTION,
|
|
6495
6602
|
ActionType.CUSTOM
|
|
6496
6603
|
]);
|
|
6497
6604
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6519,6 +6626,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6519
6626
|
}
|
|
6520
6627
|
function getLegalStatuses(actions) {
|
|
6521
6628
|
return {
|
|
6629
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6630
|
+
ActionType.NOTIFY,
|
|
6631
|
+
actions
|
|
6632
|
+
),
|
|
6522
6633
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6523
6634
|
ActionType.DECLARE,
|
|
6524
6635
|
actions
|
|
@@ -6533,9 +6644,6 @@ function getLegalStatuses(actions) {
|
|
|
6533
6644
|
// ../commons/src/events/state/flags.ts
|
|
6534
6645
|
var import_lodash3 = require("lodash");
|
|
6535
6646
|
var import_date_fns3 = require("date-fns");
|
|
6536
|
-
function isEditInProgress(actions) {
|
|
6537
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6538
|
-
}
|
|
6539
6647
|
function findPendingCorrectionAction(writeActions2) {
|
|
6540
6648
|
let correctionRequestAction;
|
|
6541
6649
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6550,29 +6658,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6550
6658
|
}
|
|
6551
6659
|
return correctionRequestAction;
|
|
6552
6660
|
}
|
|
6553
|
-
function isCorrectionRequested(actions) {
|
|
6554
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6555
|
-
}
|
|
6556
|
-
function isDeclarationIncomplete(actions) {
|
|
6557
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6558
|
-
}
|
|
6559
|
-
function isRejected(actions) {
|
|
6560
|
-
const resettingActionTypes = [
|
|
6561
|
-
ActionType.NOTIFY,
|
|
6562
|
-
ActionType.DECLARE,
|
|
6563
|
-
ActionType.EDIT,
|
|
6564
|
-
ActionType.REGISTER
|
|
6565
|
-
];
|
|
6566
|
-
return actions.reduce((prev, { type }) => {
|
|
6567
|
-
if (type === ActionType.REJECT) {
|
|
6568
|
-
return true;
|
|
6569
|
-
}
|
|
6570
|
-
if (resettingActionTypes.includes(type)) {
|
|
6571
|
-
return false;
|
|
6572
|
-
}
|
|
6573
|
-
return prev;
|
|
6574
|
-
}, false);
|
|
6575
|
-
}
|
|
6576
6661
|
function isPotentialDuplicate(actions) {
|
|
6577
6662
|
return actions.reduce((prev, { type }) => {
|
|
6578
6663
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6600,6 +6685,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6600
6685
|
}
|
|
6601
6686
|
});
|
|
6602
6687
|
}
|
|
6688
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6689
|
+
if (!isActionConfigType(action.type)) {
|
|
6690
|
+
return false;
|
|
6691
|
+
}
|
|
6692
|
+
const actionConfig = getActionConfig({
|
|
6693
|
+
eventConfiguration,
|
|
6694
|
+
actionType: action.type,
|
|
6695
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6696
|
+
});
|
|
6697
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6698
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6699
|
+
);
|
|
6700
|
+
if (removeOperations.length === 0) {
|
|
6701
|
+
return false;
|
|
6702
|
+
}
|
|
6703
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6704
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6705
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6706
|
+
const form = { ...declaration, ...annotation };
|
|
6707
|
+
return removeOperations.some(
|
|
6708
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6709
|
+
);
|
|
6710
|
+
}
|
|
6711
|
+
var INHERENT_FLAG_RULES = [
|
|
6712
|
+
{
|
|
6713
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6714
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6715
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6716
|
+
},
|
|
6717
|
+
{
|
|
6718
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6719
|
+
// other status-changing action (see getStatusFromActions).
|
|
6720
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6721
|
+
setOn: [ActionType.NOTIFY],
|
|
6722
|
+
resetOn: [
|
|
6723
|
+
ActionType.CREATE,
|
|
6724
|
+
ActionType.DECLARE,
|
|
6725
|
+
ActionType.REGISTER,
|
|
6726
|
+
ActionType.ARCHIVE
|
|
6727
|
+
]
|
|
6728
|
+
},
|
|
6729
|
+
{
|
|
6730
|
+
flag: InherentFlags.REJECTED,
|
|
6731
|
+
setOn: [ActionType.REJECT],
|
|
6732
|
+
resetOn: [
|
|
6733
|
+
ActionType.NOTIFY,
|
|
6734
|
+
ActionType.DECLARE,
|
|
6735
|
+
ActionType.EDIT,
|
|
6736
|
+
ActionType.REGISTER
|
|
6737
|
+
]
|
|
6738
|
+
},
|
|
6739
|
+
{
|
|
6740
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6741
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6742
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6743
|
+
},
|
|
6744
|
+
{
|
|
6745
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6746
|
+
setOn: [ActionType.EDIT],
|
|
6747
|
+
resetOnAnyOtherAction: true
|
|
6748
|
+
}
|
|
6749
|
+
];
|
|
6750
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6751
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6752
|
+
if (rule.setOn.includes(action.type)) {
|
|
6753
|
+
return true;
|
|
6754
|
+
}
|
|
6755
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6756
|
+
return false;
|
|
6757
|
+
}
|
|
6758
|
+
if (actionConfigRemovesFlag(
|
|
6759
|
+
action,
|
|
6760
|
+
rule.flag,
|
|
6761
|
+
acceptedActions.slice(0, idx + 1),
|
|
6762
|
+
event2,
|
|
6763
|
+
eventConfiguration
|
|
6764
|
+
)) {
|
|
6765
|
+
return false;
|
|
6766
|
+
}
|
|
6767
|
+
return present;
|
|
6768
|
+
}, false);
|
|
6769
|
+
}
|
|
6603
6770
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6604
6771
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6605
6772
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6621,7 +6788,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6621
6788
|
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6622
6789
|
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6623
6790
|
const form = { ...declaration, ...annotation };
|
|
6624
|
-
const flagsWithMetConditions = actionConfig.flags.filter(
|
|
6791
|
+
const flagsWithMetConditions = (actionConfig.flags ?? []).filter(
|
|
6625
6792
|
({ conditional }) => (
|
|
6626
6793
|
// If conditional is not provided, the flag is resolved
|
|
6627
6794
|
conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
@@ -6648,33 +6815,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6648
6815
|
return flag2;
|
|
6649
6816
|
});
|
|
6650
6817
|
}
|
|
6651
|
-
function getInherentFlags(sortedActions) {
|
|
6818
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6652
6819
|
const acceptedActions = sortedActions.filter(
|
|
6653
6820
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6654
6821
|
);
|
|
6655
|
-
|
|
6656
|
-
|
|
6657
|
-
|
|
6658
|
-
}
|
|
6659
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6660
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6661
|
-
}
|
|
6662
|
-
if (isRejected(acceptedActions)) {
|
|
6663
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6664
|
-
}
|
|
6665
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6666
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6667
|
-
}
|
|
6668
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6669
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6670
|
-
}
|
|
6671
|
-
return inherentFlags;
|
|
6822
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6823
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6824
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6672
6825
|
}
|
|
6673
6826
|
function getEventFlags(event2, config) {
|
|
6674
6827
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6675
6828
|
return [
|
|
6676
6829
|
...getActionStatusFlags(sortedActions),
|
|
6677
|
-
...getInherentFlags(sortedActions),
|
|
6830
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6678
6831
|
...resolveEventCustomFlags(event2, config)
|
|
6679
6832
|
];
|
|
6680
6833
|
}
|
|
@@ -7679,6 +7832,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7679
7832
|
id: "signature.upload.modal.title",
|
|
7680
7833
|
defaultMessage: "Draw signature",
|
|
7681
7834
|
description: "Title for the modal to draw signature"
|
|
7835
|
+
},
|
|
7836
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7837
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7838
|
+
configuration: {
|
|
7839
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7682
7840
|
}
|
|
7683
7841
|
}
|
|
7684
7842
|
]
|
|
@@ -8235,6 +8393,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8235
8393
|
},
|
|
8236
8394
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8237
8395
|
},
|
|
8396
|
+
{
|
|
8397
|
+
type: ActionType.NOTIFY,
|
|
8398
|
+
label: {
|
|
8399
|
+
defaultMessage: "Notify health worker",
|
|
8400
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8401
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8402
|
+
},
|
|
8403
|
+
flags: [
|
|
8404
|
+
{
|
|
8405
|
+
id: "health-worker-notified",
|
|
8406
|
+
operation: "add"
|
|
8407
|
+
}
|
|
8408
|
+
]
|
|
8409
|
+
},
|
|
8238
8410
|
{
|
|
8239
8411
|
type: ActionType.REJECT,
|
|
8240
8412
|
label: {
|
|
@@ -8477,6 +8649,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8477
8649
|
}
|
|
8478
8650
|
}
|
|
8479
8651
|
],
|
|
8652
|
+
flags: [
|
|
8653
|
+
{
|
|
8654
|
+
id: "health-worker-notified",
|
|
8655
|
+
requiresAction: false,
|
|
8656
|
+
label: {
|
|
8657
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8658
|
+
defaultMessage: "Health worker notified",
|
|
8659
|
+
description: "Label for the health-worker-notified flag"
|
|
8660
|
+
}
|
|
8661
|
+
}
|
|
8662
|
+
],
|
|
8480
8663
|
advancedSearch: [
|
|
8481
8664
|
{
|
|
8482
8665
|
title: {
|
|
@@ -10235,7 +10418,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10235
10418
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10236
10419
|
}
|
|
10237
10420
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10238
|
-
return user2.administrativeAreaId
|
|
10421
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10239
10422
|
}
|
|
10240
10423
|
return true;
|
|
10241
10424
|
}
|
|
@@ -10262,6 +10445,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10262
10445
|
}
|
|
10263
10446
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10264
10447
|
const { options } = scope;
|
|
10448
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10449
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10450
|
+
return false;
|
|
10451
|
+
}
|
|
10452
|
+
}
|
|
10453
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10454
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10455
|
+
JurisdictionFilter.enum.location,
|
|
10456
|
+
user2
|
|
10457
|
+
)) {
|
|
10458
|
+
return false;
|
|
10459
|
+
}
|
|
10460
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10461
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10462
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10463
|
+
user2
|
|
10464
|
+
)) {
|
|
10465
|
+
return false;
|
|
10466
|
+
}
|
|
10265
10467
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10266
10468
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10267
10469
|
return false;
|
|
@@ -10324,7 +10526,7 @@ function canAccessUserWithScope({
|
|
|
10324
10526
|
}
|
|
10325
10527
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10326
10528
|
(id) => user2.administrativeAreaId === id
|
|
10327
|
-
) || user2.administrativeAreaId
|
|
10529
|
+
) || !user2.administrativeAreaId;
|
|
10328
10530
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10329
10531
|
return false;
|
|
10330
10532
|
}
|
|
@@ -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';
|