@opencrvs/toolkit 2.0.0-rc.ec87222 → 2.0.0-rc.ed0aa22
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 +3 -2
- package/dist/application-config/index.js +23 -6
- package/dist/cli.js +3253 -47
- package/dist/commons/api/router.d.ts +21 -2
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +35 -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 +11 -0
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/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/commons/events/utils.d.ts +8 -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 +226 -77
- 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 +11 -6
- package/dist/notification/index.js +132 -17
- 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.ed0aa22.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.ec87222.tgz +0 -0
|
@@ -118,11 +118,13 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
118
118
|
event: scopeByEvent,
|
|
119
119
|
placeOfEvent: JurisdictionFilter.optional()
|
|
120
120
|
}).describe("Options applicable to all record scopes.");
|
|
121
|
-
var
|
|
121
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
122
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
123
|
+
notifiedBy: UserFilter.optional(),
|
|
122
124
|
declaredIn: JurisdictionFilter.optional(),
|
|
123
125
|
declaredBy: UserFilter.optional()
|
|
124
126
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
125
|
-
var AllRecordScopeOptions =
|
|
127
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
126
128
|
registeredIn: JurisdictionFilter.optional(),
|
|
127
129
|
registeredBy: UserFilter.optional()
|
|
128
130
|
}).describe(
|
|
@@ -160,6 +162,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
160
162
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
161
163
|
);
|
|
162
164
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
165
|
+
notifiedIn: UUID.nullish(),
|
|
166
|
+
notifiedBy: z2.string().optional(),
|
|
163
167
|
declaredIn: UUID.nullish(),
|
|
164
168
|
declaredBy: z2.string().optional()
|
|
165
169
|
}).describe(
|
|
@@ -205,7 +209,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
205
209
|
}),
|
|
206
210
|
z2.object({
|
|
207
211
|
type: ScopesWithDeclaredOptions,
|
|
208
|
-
options:
|
|
212
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
209
213
|
}),
|
|
210
214
|
z2.object({
|
|
211
215
|
type: ScopesWithFullOptions,
|
|
@@ -294,8 +298,9 @@ var EncodedScope = z2.string().brand("EncodedScope");
|
|
|
294
298
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
295
299
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
296
300
|
accessLevel: JurisdictionFilter.enum.all,
|
|
297
|
-
|
|
298
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
301
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
302
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
303
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
299
304
|
};
|
|
300
305
|
|
|
301
306
|
// ../commons/src/authentication.ts
|
|
@@ -770,6 +775,11 @@ var FieldTypesToHideInReview = [
|
|
|
770
775
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
771
776
|
FieldType.ALPHA_HIDDEN
|
|
772
777
|
];
|
|
778
|
+
var HiddenFieldTypes = [
|
|
779
|
+
FieldType.HTTP,
|
|
780
|
+
FieldType.QUERY_PARAM_READER,
|
|
781
|
+
FieldType.ALPHA_HIDDEN
|
|
782
|
+
];
|
|
773
783
|
|
|
774
784
|
// ../commons/src/events/FieldValue.ts
|
|
775
785
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1352,6 +1362,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1352
1362
|
)
|
|
1353
1363
|
});
|
|
1354
1364
|
var LegalStatuses = z16.object({
|
|
1365
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1355
1366
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1356
1367
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1357
1368
|
});
|
|
@@ -1411,6 +1422,8 @@ var EventMetadataKeys = z16.enum(EventMetadataKeysArray);
|
|
|
1411
1422
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1412
1423
|
"createdAt",
|
|
1413
1424
|
"updatedAt",
|
|
1425
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1426
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1414
1427
|
"legalStatuses.DECLARED.createdAt",
|
|
1415
1428
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1416
1429
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1419,6 +1432,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1419
1432
|
var EventMetadataDateFieldId = z16.enum([
|
|
1420
1433
|
"event.createdAt",
|
|
1421
1434
|
"event.updatedAt",
|
|
1435
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1436
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1422
1437
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1423
1438
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1424
1439
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -1478,7 +1493,8 @@ var Range = import_v4.z.object({
|
|
|
1478
1493
|
});
|
|
1479
1494
|
var ContainsFlags = import_v4.z.object({
|
|
1480
1495
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
1481
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
1496
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
1497
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
1482
1498
|
}).meta({
|
|
1483
1499
|
id: "ContainsFlags"
|
|
1484
1500
|
});
|
|
@@ -1750,6 +1766,7 @@ var NumberField = BaseField.extend({
|
|
|
1750
1766
|
configuration: import_v43.default.object({
|
|
1751
1767
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
1752
1768
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
1769
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
1753
1770
|
prefix: TranslationConfig.optional(),
|
|
1754
1771
|
postfix: TranslationConfig.optional()
|
|
1755
1772
|
}).optional()
|
|
@@ -2673,12 +2690,23 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
2673
2690
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
2674
2691
|
}).shape
|
|
2675
2692
|
);
|
|
2693
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
2694
|
+
z24.object({
|
|
2695
|
+
type: z24.literal(ActionType.NOTIFY),
|
|
2696
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
2697
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
2698
|
+
)
|
|
2699
|
+
}).shape
|
|
2700
|
+
);
|
|
2676
2701
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
2677
2702
|
z24.object({
|
|
2678
2703
|
type: z24.literal(ActionType.DECLARE),
|
|
2679
2704
|
review: DeclarationReviewConfig.describe(
|
|
2680
2705
|
"Configuration of the review page fields."
|
|
2681
2706
|
),
|
|
2707
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
2708
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
2709
|
+
),
|
|
2682
2710
|
dialogCopy: z24.object({
|
|
2683
2711
|
notify: TranslationConfig.describe(
|
|
2684
2712
|
"Confirmation text for the notify action"
|
|
@@ -2694,7 +2722,10 @@ var DeclareConfig = DeclarationActionBase.extend(
|
|
|
2694
2722
|
);
|
|
2695
2723
|
var ArchiveConfig = ActionConfigBase.extend(
|
|
2696
2724
|
z24.object({
|
|
2697
|
-
type: z24.literal(ActionType.ARCHIVE)
|
|
2725
|
+
type: z24.literal(ActionType.ARCHIVE),
|
|
2726
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
2727
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
2728
|
+
)
|
|
2698
2729
|
}).shape
|
|
2699
2730
|
);
|
|
2700
2731
|
var EditActionConfig = ActionConfigBase.extend(
|
|
@@ -2715,12 +2746,18 @@ var EditActionConfig = ActionConfigBase.extend(
|
|
|
2715
2746
|
);
|
|
2716
2747
|
var RejectConfig = ActionConfigBase.extend(
|
|
2717
2748
|
z24.object({
|
|
2718
|
-
type: z24.literal(ActionType.REJECT)
|
|
2749
|
+
type: z24.literal(ActionType.REJECT),
|
|
2750
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
2751
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
2752
|
+
)
|
|
2719
2753
|
}).shape
|
|
2720
2754
|
);
|
|
2721
2755
|
var RegisterConfig = DeclarationActionBase.extend(
|
|
2722
2756
|
z24.object({
|
|
2723
|
-
type: z24.literal(ActionType.REGISTER)
|
|
2757
|
+
type: z24.literal(ActionType.REGISTER),
|
|
2758
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
2759
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
2760
|
+
)
|
|
2724
2761
|
}).shape
|
|
2725
2762
|
);
|
|
2726
2763
|
var PrintCertificateActionConfig = ActionConfigBase.extend(
|
|
@@ -2757,9 +2794,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
2757
2794
|
id: "ReadActionConfig",
|
|
2758
2795
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
2759
2796
|
}),
|
|
2797
|
+
NotifyConfig.meta({
|
|
2798
|
+
id: "NotifyActionConfig",
|
|
2799
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
2800
|
+
}),
|
|
2760
2801
|
DeclareConfig.meta({
|
|
2761
2802
|
id: "DeclareActionConfig",
|
|
2762
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
2803
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
2763
2804
|
}),
|
|
2764
2805
|
RejectConfig.meta({
|
|
2765
2806
|
id: "RejectActionConfig",
|
|
@@ -3190,13 +3231,9 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
3190
3231
|
if (actionConfig.type === ActionType.PRINT_CERTIFICATE) {
|
|
3191
3232
|
return actionConfig.printForm.pages.flatMap(({ fields }) => fields);
|
|
3192
3233
|
}
|
|
3193
|
-
|
|
3194
|
-
|
|
3195
|
-
|
|
3196
|
-
if ("review" in actionConfig) {
|
|
3197
|
-
return actionConfig.review.fields;
|
|
3198
|
-
}
|
|
3199
|
-
return [];
|
|
3234
|
+
const reviewFields = "review" in actionConfig && actionConfig.review != null ? actionConfig.review.fields : [];
|
|
3235
|
+
const formFields = "form" in actionConfig && actionConfig.form != null ? actionConfig.form : [];
|
|
3236
|
+
return [...reviewFields, ...formFields];
|
|
3200
3237
|
};
|
|
3201
3238
|
function getAllAnnotationFields(config) {
|
|
3202
3239
|
return (0, import_lodash.flattenDeep)(config.actions.map(getActionAnnotationFields));
|
|
@@ -4697,12 +4734,53 @@ var updateActions = ActionTypes.extract([
|
|
|
4697
4734
|
ActionType.ARCHIVE,
|
|
4698
4735
|
ActionType.PRINT_CERTIFICATE,
|
|
4699
4736
|
ActionType.REQUEST_CORRECTION,
|
|
4737
|
+
ActionType.APPROVE_CORRECTION,
|
|
4738
|
+
ActionType.REJECT_CORRECTION,
|
|
4700
4739
|
ActionType.CUSTOM
|
|
4701
4740
|
]);
|
|
4702
4741
|
|
|
4703
4742
|
// ../commons/src/events/state/flags.ts
|
|
4704
4743
|
var import_lodash3 = require("lodash");
|
|
4705
4744
|
var import_date_fns3 = require("date-fns");
|
|
4745
|
+
var INHERENT_FLAG_RULES = [
|
|
4746
|
+
{
|
|
4747
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
4748
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
4749
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
4750
|
+
},
|
|
4751
|
+
{
|
|
4752
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
4753
|
+
// other status-changing action (see getStatusFromActions).
|
|
4754
|
+
flag: InherentFlags.INCOMPLETE,
|
|
4755
|
+
setOn: [ActionType.NOTIFY],
|
|
4756
|
+
resetOn: [
|
|
4757
|
+
ActionType.CREATE,
|
|
4758
|
+
ActionType.DECLARE,
|
|
4759
|
+
ActionType.REGISTER,
|
|
4760
|
+
ActionType.ARCHIVE
|
|
4761
|
+
]
|
|
4762
|
+
},
|
|
4763
|
+
{
|
|
4764
|
+
flag: InherentFlags.REJECTED,
|
|
4765
|
+
setOn: [ActionType.REJECT],
|
|
4766
|
+
resetOn: [
|
|
4767
|
+
ActionType.NOTIFY,
|
|
4768
|
+
ActionType.DECLARE,
|
|
4769
|
+
ActionType.EDIT,
|
|
4770
|
+
ActionType.REGISTER
|
|
4771
|
+
]
|
|
4772
|
+
},
|
|
4773
|
+
{
|
|
4774
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
4775
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
4776
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
4777
|
+
},
|
|
4778
|
+
{
|
|
4779
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
4780
|
+
setOn: [ActionType.EDIT],
|
|
4781
|
+
resetOnAnyOtherAction: true
|
|
4782
|
+
}
|
|
4783
|
+
];
|
|
4706
4784
|
|
|
4707
4785
|
// ../commons/src/events/defineConfig.ts
|
|
4708
4786
|
var IGNORED_EVENT_TYPES = [
|
|
@@ -5448,6 +5526,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
5448
5526
|
id: "signature.upload.modal.title",
|
|
5449
5527
|
defaultMessage: "Draw signature",
|
|
5450
5528
|
description: "Title for the modal to draw signature"
|
|
5529
|
+
},
|
|
5530
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
5531
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
5532
|
+
configuration: {
|
|
5533
|
+
maxFileSize: 5 * 1024 * 1024
|
|
5451
5534
|
}
|
|
5452
5535
|
}
|
|
5453
5536
|
]
|
|
@@ -6004,6 +6087,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6004
6087
|
},
|
|
6005
6088
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
6006
6089
|
},
|
|
6090
|
+
{
|
|
6091
|
+
type: ActionType.NOTIFY,
|
|
6092
|
+
label: {
|
|
6093
|
+
defaultMessage: "Notify health worker",
|
|
6094
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
6095
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
6096
|
+
},
|
|
6097
|
+
flags: [
|
|
6098
|
+
{
|
|
6099
|
+
id: "health-worker-notified",
|
|
6100
|
+
operation: "add"
|
|
6101
|
+
}
|
|
6102
|
+
]
|
|
6103
|
+
},
|
|
6007
6104
|
{
|
|
6008
6105
|
type: ActionType.REJECT,
|
|
6009
6106
|
label: {
|
|
@@ -6246,6 +6343,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6246
6343
|
}
|
|
6247
6344
|
}
|
|
6248
6345
|
],
|
|
6346
|
+
flags: [
|
|
6347
|
+
{
|
|
6348
|
+
id: "health-worker-notified",
|
|
6349
|
+
requiresAction: false,
|
|
6350
|
+
label: {
|
|
6351
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
6352
|
+
defaultMessage: "Health worker notified",
|
|
6353
|
+
description: "Label for the health-worker-notified flag"
|
|
6354
|
+
}
|
|
6355
|
+
}
|
|
6356
|
+
],
|
|
6249
6357
|
advancedSearch: [
|
|
6250
6358
|
{
|
|
6251
6359
|
title: {
|
|
@@ -7241,6 +7349,13 @@ var ACTION_FILTERS = {
|
|
|
7241
7349
|
[ActionType.UNASSIGN]: (flags) => !flags.some((flag) => flag.endsWith(":requested")),
|
|
7242
7350
|
[ActionType.CUSTOM]: (flags) => !flags.some((flag) => flag.endsWith(":requested"))
|
|
7243
7351
|
};
|
|
7352
|
+
var REJECTED_ACTIONS = [
|
|
7353
|
+
ActionType.READ,
|
|
7354
|
+
ActionType.NOTIFY,
|
|
7355
|
+
ActionType.CUSTOM,
|
|
7356
|
+
ActionType.EDIT,
|
|
7357
|
+
ActionType.ARCHIVE
|
|
7358
|
+
];
|
|
7244
7359
|
|
|
7245
7360
|
// ../commons/src/events/FileUtils.ts
|
|
7246
7361
|
var import_lodash7 = require("lodash");
|
package/dist/scopes/index.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export type UserFilter = z.infer<typeof UserFilter>;
|
|
|
14
14
|
* The different types of scopes that can be used to control access to records. Each type has different options that can be used to further filter the records that the scope applies to.
|
|
15
15
|
* When adding new scope types, they should be added to the appropriate section based on the options they require.
|
|
16
16
|
*
|
|
17
|
-
* @see scopeOptionsPlaceEvent @see
|
|
17
|
+
* @see scopeOptionsPlaceEvent @see scopeOptionsDeclaredOrNotified @see scopeOptionsFull
|
|
18
18
|
*/
|
|
19
19
|
export declare const RecordScopeTypeV2: z.ZodEnum<{
|
|
20
20
|
"record.search": "record.search";
|
|
@@ -48,6 +48,14 @@ declare const AllScopeOptions: z.ZodObject<{
|
|
|
48
48
|
location: "location";
|
|
49
49
|
all: "all";
|
|
50
50
|
}>>;
|
|
51
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
52
|
+
administrativeArea: "administrativeArea";
|
|
53
|
+
location: "location";
|
|
54
|
+
all: "all";
|
|
55
|
+
}>>;
|
|
56
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
57
|
+
user: "user";
|
|
58
|
+
}>>;
|
|
51
59
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
52
60
|
administrativeArea: "administrativeArea";
|
|
53
61
|
location: "location";
|
|
@@ -70,6 +78,8 @@ export declare const ScopeOptionKey: z.ZodEnum<{
|
|
|
70
78
|
role: "role";
|
|
71
79
|
event: "event";
|
|
72
80
|
placeOfEvent: "placeOfEvent";
|
|
81
|
+
notifiedIn: "notifiedIn";
|
|
82
|
+
notifiedBy: "notifiedBy";
|
|
73
83
|
declaredIn: "declaredIn";
|
|
74
84
|
declaredBy: "declaredBy";
|
|
75
85
|
registeredIn: "registeredIn";
|
|
@@ -126,6 +136,14 @@ export declare const RecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
126
136
|
location: "location";
|
|
127
137
|
all: "all";
|
|
128
138
|
}>>;
|
|
139
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
140
|
+
administrativeArea: "administrativeArea";
|
|
141
|
+
location: "location";
|
|
142
|
+
all: "all";
|
|
143
|
+
}>>;
|
|
144
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
145
|
+
user: "user";
|
|
146
|
+
}>>;
|
|
129
147
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
130
148
|
administrativeArea: "administrativeArea";
|
|
131
149
|
location: "location";
|
|
@@ -150,6 +168,14 @@ export declare const RecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
150
168
|
location: "location";
|
|
151
169
|
all: "all";
|
|
152
170
|
}>>;
|
|
171
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
172
|
+
administrativeArea: "administrativeArea";
|
|
173
|
+
location: "location";
|
|
174
|
+
all: "all";
|
|
175
|
+
}>>;
|
|
176
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
177
|
+
user: "user";
|
|
178
|
+
}>>;
|
|
153
179
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
154
180
|
administrativeArea: "administrativeArea";
|
|
155
181
|
location: "location";
|
|
@@ -176,6 +202,14 @@ export declare const RecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
176
202
|
location: "location";
|
|
177
203
|
all: "all";
|
|
178
204
|
}>>;
|
|
205
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
206
|
+
administrativeArea: "administrativeArea";
|
|
207
|
+
location: "location";
|
|
208
|
+
all: "all";
|
|
209
|
+
}>>;
|
|
210
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
211
|
+
user: "user";
|
|
212
|
+
}>>;
|
|
179
213
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
180
214
|
administrativeArea: "administrativeArea";
|
|
181
215
|
location: "location";
|
|
@@ -203,6 +237,14 @@ export declare const RecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
203
237
|
location: "location";
|
|
204
238
|
all: "all";
|
|
205
239
|
}>>;
|
|
240
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
241
|
+
administrativeArea: "administrativeArea";
|
|
242
|
+
location: "location";
|
|
243
|
+
all: "all";
|
|
244
|
+
}>>;
|
|
245
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
246
|
+
user: "user";
|
|
247
|
+
}>>;
|
|
206
248
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
207
249
|
administrativeArea: "administrativeArea";
|
|
208
250
|
location: "location";
|
|
@@ -305,6 +347,8 @@ export declare const ResolvedRecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject
|
|
|
305
347
|
options: z.ZodOptional<z.ZodObject<{
|
|
306
348
|
event: z.ZodPipe<z.ZodTransform<({} | null)[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
307
349
|
placeOfEvent: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
350
|
+
notifiedIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
351
|
+
notifiedBy: z.ZodOptional<z.ZodString>;
|
|
308
352
|
declaredIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
309
353
|
declaredBy: z.ZodOptional<z.ZodString>;
|
|
310
354
|
}, z.core.$strip>>;
|
|
@@ -319,6 +363,8 @@ export declare const ResolvedRecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject
|
|
|
319
363
|
options: z.ZodOptional<z.ZodObject<{
|
|
320
364
|
event: z.ZodPipe<z.ZodTransform<({} | null)[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
321
365
|
placeOfEvent: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
366
|
+
notifiedIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
367
|
+
notifiedBy: z.ZodOptional<z.ZodString>;
|
|
322
368
|
declaredIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
323
369
|
declaredBy: z.ZodOptional<z.ZodString>;
|
|
324
370
|
registeredIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
@@ -329,6 +375,8 @@ export declare const ResolvedRecordScopeV2: z.ZodDiscriminatedUnion<[z.ZodObject
|
|
|
329
375
|
options: z.ZodOptional<z.ZodObject<{
|
|
330
376
|
event: z.ZodPipe<z.ZodTransform<({} | null)[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
331
377
|
placeOfEvent: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
378
|
+
notifiedIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
379
|
+
notifiedBy: z.ZodOptional<z.ZodString>;
|
|
332
380
|
declaredIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
333
381
|
declaredBy: z.ZodOptional<z.ZodString>;
|
|
334
382
|
registeredIn: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
|
|
@@ -385,6 +433,14 @@ export declare const Scope: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
385
433
|
location: "location";
|
|
386
434
|
all: "all";
|
|
387
435
|
}>>;
|
|
436
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
437
|
+
administrativeArea: "administrativeArea";
|
|
438
|
+
location: "location";
|
|
439
|
+
all: "all";
|
|
440
|
+
}>>;
|
|
441
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
442
|
+
user: "user";
|
|
443
|
+
}>>;
|
|
388
444
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
389
445
|
administrativeArea: "administrativeArea";
|
|
390
446
|
location: "location";
|
|
@@ -409,6 +465,14 @@ export declare const Scope: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
409
465
|
location: "location";
|
|
410
466
|
all: "all";
|
|
411
467
|
}>>;
|
|
468
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
469
|
+
administrativeArea: "administrativeArea";
|
|
470
|
+
location: "location";
|
|
471
|
+
all: "all";
|
|
472
|
+
}>>;
|
|
473
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
474
|
+
user: "user";
|
|
475
|
+
}>>;
|
|
412
476
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
413
477
|
administrativeArea: "administrativeArea";
|
|
414
478
|
location: "location";
|
|
@@ -435,6 +499,14 @@ export declare const Scope: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
435
499
|
location: "location";
|
|
436
500
|
all: "all";
|
|
437
501
|
}>>;
|
|
502
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
503
|
+
administrativeArea: "administrativeArea";
|
|
504
|
+
location: "location";
|
|
505
|
+
all: "all";
|
|
506
|
+
}>>;
|
|
507
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
508
|
+
user: "user";
|
|
509
|
+
}>>;
|
|
438
510
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
439
511
|
administrativeArea: "administrativeArea";
|
|
440
512
|
location: "location";
|
|
@@ -462,6 +534,14 @@ export declare const Scope: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
462
534
|
location: "location";
|
|
463
535
|
all: "all";
|
|
464
536
|
}>>;
|
|
537
|
+
notifiedIn: z.ZodOptional<z.ZodEnum<{
|
|
538
|
+
administrativeArea: "administrativeArea";
|
|
539
|
+
location: "location";
|
|
540
|
+
all: "all";
|
|
541
|
+
}>>;
|
|
542
|
+
notifiedBy: z.ZodOptional<z.ZodEnum<{
|
|
543
|
+
user: "user";
|
|
544
|
+
}>>;
|
|
465
545
|
declaredIn: z.ZodOptional<z.ZodEnum<{
|
|
466
546
|
administrativeArea: "administrativeArea";
|
|
467
547
|
location: "location";
|
|
@@ -596,6 +676,8 @@ export declare const decodeScope: (encodedScope: EncodedScope) => {
|
|
|
596
676
|
options?: {
|
|
597
677
|
event?: string[] | undefined;
|
|
598
678
|
placeOfEvent?: "administrativeArea" | "location" | "all" | undefined;
|
|
679
|
+
notifiedIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
680
|
+
notifiedBy?: "user" | undefined;
|
|
599
681
|
declaredIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
600
682
|
declaredBy?: "user" | undefined;
|
|
601
683
|
} | undefined;
|
|
@@ -604,6 +686,8 @@ export declare const decodeScope: (encodedScope: EncodedScope) => {
|
|
|
604
686
|
options?: {
|
|
605
687
|
event?: string[] | undefined;
|
|
606
688
|
placeOfEvent?: "administrativeArea" | "location" | "all" | undefined;
|
|
689
|
+
notifiedIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
690
|
+
notifiedBy?: "user" | undefined;
|
|
607
691
|
declaredIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
608
692
|
declaredBy?: "user" | undefined;
|
|
609
693
|
registeredIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
@@ -614,6 +698,8 @@ export declare const decodeScope: (encodedScope: EncodedScope) => {
|
|
|
614
698
|
options?: {
|
|
615
699
|
event?: string[] | undefined;
|
|
616
700
|
placeOfEvent?: "administrativeArea" | "location" | "all" | undefined;
|
|
701
|
+
notifiedIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
702
|
+
notifiedBy?: "user" | undefined;
|
|
617
703
|
declaredIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
618
704
|
declaredBy?: "user" | undefined;
|
|
619
705
|
registeredIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
@@ -625,6 +711,8 @@ export declare const decodeScope: (encodedScope: EncodedScope) => {
|
|
|
625
711
|
options?: {
|
|
626
712
|
event?: string[] | undefined;
|
|
627
713
|
placeOfEvent?: "administrativeArea" | "location" | "all" | undefined;
|
|
714
|
+
notifiedIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
715
|
+
notifiedBy?: "user" | undefined;
|
|
628
716
|
declaredIn?: "administrativeArea" | "location" | "all" | undefined;
|
|
629
717
|
declaredBy?: "user" | undefined;
|
|
630
718
|
registeredIn?: "administrativeArea" | "location" | "all" | undefined;
|
package/dist/scopes/index.js
CHANGED
|
@@ -149,11 +149,13 @@ var scopeOptionsPlaceEvent = z3.object({
|
|
|
149
149
|
event: scopeByEvent,
|
|
150
150
|
placeOfEvent: JurisdictionFilter.optional()
|
|
151
151
|
}).describe("Options applicable to all record scopes.");
|
|
152
|
-
var
|
|
152
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
153
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
154
|
+
notifiedBy: UserFilter.optional(),
|
|
153
155
|
declaredIn: JurisdictionFilter.optional(),
|
|
154
156
|
declaredBy: UserFilter.optional()
|
|
155
157
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
156
|
-
var AllRecordScopeOptions =
|
|
158
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
157
159
|
registeredIn: JurisdictionFilter.optional(),
|
|
158
160
|
registeredBy: UserFilter.optional()
|
|
159
161
|
}).describe(
|
|
@@ -191,6 +193,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
|
|
|
191
193
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
192
194
|
);
|
|
193
195
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
196
|
+
notifiedIn: UUID.nullish(),
|
|
197
|
+
notifiedBy: z3.string().optional(),
|
|
194
198
|
declaredIn: UUID.nullish(),
|
|
195
199
|
declaredBy: z3.string().optional()
|
|
196
200
|
}).describe(
|
|
@@ -236,7 +240,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
236
240
|
}),
|
|
237
241
|
z3.object({
|
|
238
242
|
type: ScopesWithDeclaredOptions,
|
|
239
|
-
options:
|
|
243
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
240
244
|
}),
|
|
241
245
|
z3.object({
|
|
242
246
|
type: ScopesWithFullOptions,
|
|
@@ -372,8 +376,9 @@ var decodeScope = (encodedScope) => {
|
|
|
372
376
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
373
377
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
374
378
|
accessLevel: JurisdictionFilter.enum.all,
|
|
375
|
-
|
|
376
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
379
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
380
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
381
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
377
382
|
};
|
|
378
383
|
function getScopeOptionValue(scope, option) {
|
|
379
384
|
const options = "options" in scope ? scope.options : void 0;
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
##################################################################################
|
|
2
|
+
# Use this file to customize helm chart behavior
|
|
3
|
+
# Please make sure your custom changes doesn't conflict with values.yaml
|
|
4
|
+
##################################################################################
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
##################################################################################
|
|
2
|
+
# GENERATED FILE — DO NOT EDIT
|
|
3
|
+
#
|
|
4
|
+
# This file is managed by `opencrvs environment init` and may be overwritten.
|
|
5
|
+
# Put all custom Helm values in values.override.yaml, preserving the same YAML
|
|
6
|
+
# hierarchy used here. To remove a generated section, set its top-level key to
|
|
7
|
+
# null in values.override.yaml.
|
|
8
|
+
##################################################################################
|
|
9
|
+
|
|
10
|
+
# Default: storage_type: host_path
|
|
11
|
+
# host_path option is backward compatible with Docker Swarm,
|
|
12
|
+
# configured to use sub-directories within /data folder
|
|
13
|
+
# For new installations feel free to remove storage_type
|
|
14
|
+
storage_type: host_path
|
|
15
|
+
|
|
16
|
+
# All datastores are placed on first node (master1) for backward compatibility
|
|
17
|
+
# with Docker Swarm.
|
|
18
|
+
# For new installations feel free to remove node_selector
|
|
19
|
+
node_selector:
|
|
20
|
+
role: data1
|
|
21
|
+
|
|
22
|
+
minio:
|
|
23
|
+
use_default_credentials: false
|
|
24
|
+
{{#if restore_enabled}}
|
|
25
|
+
restore:
|
|
26
|
+
type: {{restore_type}}
|
|
27
|
+
{{/if}}
|
|
28
|
+
{{#if backup_enabled}}
|
|
29
|
+
backup:
|
|
30
|
+
type: {{backup_type}}
|
|
31
|
+
{{/if}}
|
|
32
|
+
|
|
33
|
+
elasticsearch:
|
|
34
|
+
use_default_credentials: false
|
|
35
|
+
|
|
36
|
+
mongodb:
|
|
37
|
+
use_default_credentials: false
|
|
38
|
+
|
|
39
|
+
postgres:
|
|
40
|
+
use_default_credentials: false
|
|
41
|
+
{{#if restore_enabled}}
|
|
42
|
+
restore:
|
|
43
|
+
type: {{restore_type}}
|
|
44
|
+
{{/if}}
|
|
45
|
+
{{#if backup_enabled}}
|
|
46
|
+
backup:
|
|
47
|
+
type: {{backup_type}}
|
|
48
|
+
{{/if}}
|
|
49
|
+
|
|
50
|
+
redis:
|
|
51
|
+
auth_mode: acl
|
|
52
|
+
|
|
53
|
+
monitoring:
|
|
54
|
+
enabled: true
|
|
55
|
+
|
|
56
|
+
elastalert:
|
|
57
|
+
env:
|
|
58
|
+
NOTIFICATION_TYPE: email
|
|
59
|
+
secrets:
|
|
60
|
+
smtp-config:
|
|
61
|
+
- ALERT_EMAIL
|
|
62
|
+
- SENDER_EMAIL_ADDRESS
|
|
63
|
+
- SMTP_HOST
|
|
64
|
+
- SMTP_PASSWORD
|
|
65
|
+
- SMTP_PORT
|
|
66
|
+
- SMTP_SECURE
|
|
67
|
+
- SMTP_USERNAME
|
|
68
|
+
|
|
69
|
+
# Backup configuration
|
|
70
|
+
backup:
|
|
71
|
+
enabled: {{backup_enabled}}
|
|
72
|
+
schedule: "0 1 * * *"
|
|
73
|
+
backup_server_secret: backup-server-ssh-credentials
|
|
74
|
+
backup_server_dir: /home/backup/{{env}}
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
# Restore configuration
|
|
78
|
+
restore:
|
|
79
|
+
enabled: {{restore_enabled}}
|
|
80
|
+
schedule: "0 0 * * *"
|
|
81
|
+
backup_server_secret: backup-server-ssh-credentials
|
|
82
|
+
backup_server_dir: /home/backup/{{restore_environment_name}}
|
|
83
|
+
backup_encryption_secret: restore-encryption-secret
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
##################################################################################
|
|
2
|
+
# Use this file to customize helm chart behavior
|
|
3
|
+
# Please make sure your custom changes doesn't conflict with values.yaml
|
|
4
|
+
##################################################################################
|