@opencrvs/toolkit 2.0.0-rc.6242d9d → 2.0.0-rc.62c571c
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 +24 -7
- package/dist/cli.js +3262 -50
- package/dist/commons/api/router.d.ts +36 -17
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +354 -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/field.d.ts +6 -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 +21 -290
- 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 +206 -72
- 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 +20 -9
- package/dist/notification/index.js +116 -9
- package/dist/scopes/index.d.ts +93 -7
- package/dist/scopes/index.js +19 -8
- 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.62c571c.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.6242d9d.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -151,6 +151,7 @@ __export(events_exports, {
|
|
|
151
151
|
FormPageConfig: () => FormPageConfig,
|
|
152
152
|
Fuzzy: () => Fuzzy,
|
|
153
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
154
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
155
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
156
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -519,11 +520,13 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
519
520
|
event: scopeByEvent,
|
|
520
521
|
placeOfEvent: JurisdictionFilter.optional()
|
|
521
522
|
}).describe("Options applicable to all record scopes.");
|
|
522
|
-
var
|
|
523
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
524
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
525
|
+
notifiedBy: UserFilter.optional(),
|
|
523
526
|
declaredIn: JurisdictionFilter.optional(),
|
|
524
527
|
declaredBy: UserFilter.optional()
|
|
525
528
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
526
|
-
var AllRecordScopeOptions =
|
|
529
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
527
530
|
registeredIn: JurisdictionFilter.optional(),
|
|
528
531
|
registeredBy: UserFilter.optional()
|
|
529
532
|
}).describe(
|
|
@@ -561,6 +564,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
561
564
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
562
565
|
);
|
|
563
566
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
567
|
+
notifiedIn: UUID.nullish(),
|
|
568
|
+
notifiedBy: z2.string().optional(),
|
|
564
569
|
declaredIn: UUID.nullish(),
|
|
565
570
|
declaredBy: z2.string().optional()
|
|
566
571
|
}).describe(
|
|
@@ -606,7 +611,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
606
611
|
}),
|
|
607
612
|
z2.object({
|
|
608
613
|
type: ScopesWithDeclaredOptions,
|
|
609
|
-
options:
|
|
614
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
610
615
|
}),
|
|
611
616
|
z2.object({
|
|
612
617
|
type: ScopesWithFullOptions,
|
|
@@ -711,20 +716,27 @@ var unflattenScope = (input) => {
|
|
|
711
716
|
return { type, options };
|
|
712
717
|
};
|
|
713
718
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
714
|
-
var
|
|
715
|
-
|
|
719
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
720
|
+
var decodeScope = (encodedScope) => {
|
|
721
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
722
|
+
return decodedScopeCache.get(encodedScope);
|
|
723
|
+
}
|
|
724
|
+
const scope = qs.parse(encodedScope, {
|
|
716
725
|
ignoreQueryPrefix: true,
|
|
717
726
|
comma: true,
|
|
718
727
|
allowDots: true
|
|
719
728
|
});
|
|
720
729
|
const unflattenedScope = unflattenScope(scope);
|
|
721
|
-
|
|
730
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
731
|
+
decodedScopeCache.set(encodedScope, result);
|
|
732
|
+
return result;
|
|
722
733
|
};
|
|
723
734
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
724
735
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
725
736
|
accessLevel: JurisdictionFilter.enum.all,
|
|
726
|
-
|
|
727
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
737
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
738
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
739
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
728
740
|
};
|
|
729
741
|
function getAcceptedScopesByType({
|
|
730
742
|
acceptedScopes,
|
|
@@ -1213,6 +1225,11 @@ var FieldTypesToHideInReview = [
|
|
|
1213
1225
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1214
1226
|
FieldType.ALPHA_HIDDEN
|
|
1215
1227
|
];
|
|
1228
|
+
var HiddenFieldTypes = [
|
|
1229
|
+
FieldType.HTTP,
|
|
1230
|
+
FieldType.QUERY_PARAM_READER,
|
|
1231
|
+
FieldType.ALPHA_HIDDEN
|
|
1232
|
+
];
|
|
1216
1233
|
|
|
1217
1234
|
// ../commons/src/events/FieldValue.ts
|
|
1218
1235
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1339,7 +1356,7 @@ function plainDateToLocalDate(date) {
|
|
|
1339
1356
|
// ../commons/src/events/FieldValue.ts
|
|
1340
1357
|
var TextValue = z12.string();
|
|
1341
1358
|
var HiddenFieldValue = z12.string();
|
|
1342
|
-
var NonEmptyTextValue =
|
|
1359
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1343
1360
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1344
1361
|
var AgeValue = z12.object({
|
|
1345
1362
|
age: z12.number(),
|
|
@@ -1803,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1803
1820
|
)
|
|
1804
1821
|
});
|
|
1805
1822
|
var LegalStatuses = z16.object({
|
|
1823
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1806
1824
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1807
1825
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1808
1826
|
});
|
|
@@ -1944,6 +1962,8 @@ var eventMetadataLabelMap = {
|
|
|
1944
1962
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1945
1963
|
"createdAt",
|
|
1946
1964
|
"updatedAt",
|
|
1965
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1947
1967
|
"legalStatuses.DECLARED.createdAt",
|
|
1948
1968
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1949
1969
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1952,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1952
1972
|
var EventMetadataDateFieldId = z16.enum([
|
|
1953
1973
|
"event.createdAt",
|
|
1954
1974
|
"event.updatedAt",
|
|
1975
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1955
1977
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1956
1978
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1957
1979
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2011,7 +2033,8 @@ var Range = import_v4.z.object({
|
|
|
2011
2033
|
});
|
|
2012
2034
|
var ContainsFlags = import_v4.z.object({
|
|
2013
2035
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2014
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2036
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2037
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2015
2038
|
}).meta({
|
|
2016
2039
|
id: "ContainsFlags"
|
|
2017
2040
|
});
|
|
@@ -2286,6 +2309,7 @@ var NumberField = BaseField.extend({
|
|
|
2286
2309
|
configuration: import_v43.default.object({
|
|
2287
2310
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2288
2311
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2312
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2289
2313
|
prefix: TranslationConfig.optional(),
|
|
2290
2314
|
postfix: TranslationConfig.optional()
|
|
2291
2315
|
}).optional()
|
|
@@ -3209,6 +3233,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3209
3233
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3210
3234
|
}).shape
|
|
3211
3235
|
);
|
|
3236
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3237
|
+
z24.object({
|
|
3238
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3239
|
+
}).shape
|
|
3240
|
+
);
|
|
3212
3241
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3213
3242
|
z24.object({
|
|
3214
3243
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3293,9 +3322,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3293
3322
|
id: "ReadActionConfig",
|
|
3294
3323
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3295
3324
|
}),
|
|
3325
|
+
NotifyConfig.meta({
|
|
3326
|
+
id: "NotifyActionConfig",
|
|
3327
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3328
|
+
}),
|
|
3296
3329
|
DeclareConfig.meta({
|
|
3297
3330
|
id: "DeclareActionConfig",
|
|
3298
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3331
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3299
3332
|
}),
|
|
3300
3333
|
RejectConfig.meta({
|
|
3301
3334
|
id: "RejectActionConfig",
|
|
@@ -3474,6 +3507,9 @@ var BaseField3 = z28.object({
|
|
|
3474
3507
|
),
|
|
3475
3508
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3476
3509
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3510
|
+
),
|
|
3511
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3512
|
+
`Override the allowedLocations for a location field in advanced search. Use this when the declaration form's allowedLocations references a scope (e.g. record.create) that search-only users don't have \u2014 specify record.search scope instead.`
|
|
3477
3513
|
)
|
|
3478
3514
|
});
|
|
3479
3515
|
var SearchQueryParams = z28.object({
|
|
@@ -3899,7 +3935,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3899
3935
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3900
3936
|
};
|
|
3901
3937
|
var isNonInteractiveFieldType = (field3) => {
|
|
3902
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
3938
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3903
3939
|
};
|
|
3904
3940
|
|
|
3905
3941
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4461,13 +4497,13 @@ function getActionConfig({
|
|
|
4461
4497
|
actionType,
|
|
4462
4498
|
customActionType
|
|
4463
4499
|
}) {
|
|
4500
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4501
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4502
|
+
}
|
|
4464
4503
|
return eventConfiguration.actions.find((a) => {
|
|
4465
4504
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4466
4505
|
return a.customActionType === customActionType;
|
|
4467
4506
|
}
|
|
4468
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4469
|
-
return a.type === ActionType.DECLARE;
|
|
4470
|
-
}
|
|
4471
4507
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4472
4508
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4473
4509
|
}
|
|
@@ -4504,7 +4540,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4504
4540
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4505
4541
|
return actionConfig.form;
|
|
4506
4542
|
}
|
|
4507
|
-
if ("review" in actionConfig) {
|
|
4543
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4508
4544
|
return actionConfig.review.fields;
|
|
4509
4545
|
}
|
|
4510
4546
|
return [];
|
|
@@ -6476,6 +6512,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6476
6512
|
ActionType.ARCHIVE,
|
|
6477
6513
|
ActionType.PRINT_CERTIFICATE,
|
|
6478
6514
|
ActionType.REQUEST_CORRECTION,
|
|
6515
|
+
ActionType.APPROVE_CORRECTION,
|
|
6516
|
+
ActionType.REJECT_CORRECTION,
|
|
6479
6517
|
ActionType.CUSTOM
|
|
6480
6518
|
]);
|
|
6481
6519
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6490,7 +6528,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6490
6528
|
"createdAtLocation",
|
|
6491
6529
|
"createdByRole"
|
|
6492
6530
|
];
|
|
6493
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6531
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6494
6532
|
(_2, action) => {
|
|
6495
6533
|
if (action.originalActionId) {
|
|
6496
6534
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6503,6 +6541,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6503
6541
|
}
|
|
6504
6542
|
function getLegalStatuses(actions) {
|
|
6505
6543
|
return {
|
|
6544
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6545
|
+
ActionType.NOTIFY,
|
|
6546
|
+
actions
|
|
6547
|
+
),
|
|
6506
6548
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6507
6549
|
ActionType.DECLARE,
|
|
6508
6550
|
actions
|
|
@@ -6517,9 +6559,6 @@ function getLegalStatuses(actions) {
|
|
|
6517
6559
|
// ../commons/src/events/state/flags.ts
|
|
6518
6560
|
var import_lodash3 = require("lodash");
|
|
6519
6561
|
var import_date_fns3 = require("date-fns");
|
|
6520
|
-
function isEditInProgress(actions) {
|
|
6521
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6522
|
-
}
|
|
6523
6562
|
function findPendingCorrectionAction(writeActions2) {
|
|
6524
6563
|
let correctionRequestAction;
|
|
6525
6564
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6534,29 +6573,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6534
6573
|
}
|
|
6535
6574
|
return correctionRequestAction;
|
|
6536
6575
|
}
|
|
6537
|
-
function isCorrectionRequested(actions) {
|
|
6538
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6539
|
-
}
|
|
6540
|
-
function isDeclarationIncomplete(actions) {
|
|
6541
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6542
|
-
}
|
|
6543
|
-
function isRejected(actions) {
|
|
6544
|
-
const resettingActionTypes = [
|
|
6545
|
-
ActionType.NOTIFY,
|
|
6546
|
-
ActionType.DECLARE,
|
|
6547
|
-
ActionType.EDIT,
|
|
6548
|
-
ActionType.REGISTER
|
|
6549
|
-
];
|
|
6550
|
-
return actions.reduce((prev, { type }) => {
|
|
6551
|
-
if (type === ActionType.REJECT) {
|
|
6552
|
-
return true;
|
|
6553
|
-
}
|
|
6554
|
-
if (resettingActionTypes.includes(type)) {
|
|
6555
|
-
return false;
|
|
6556
|
-
}
|
|
6557
|
-
return prev;
|
|
6558
|
-
}, false);
|
|
6559
|
-
}
|
|
6560
6576
|
function isPotentialDuplicate(actions) {
|
|
6561
6577
|
return actions.reduce((prev, { type }) => {
|
|
6562
6578
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6584,6 +6600,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6584
6600
|
}
|
|
6585
6601
|
});
|
|
6586
6602
|
}
|
|
6603
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6604
|
+
if (!isActionConfigType(action.type)) {
|
|
6605
|
+
return false;
|
|
6606
|
+
}
|
|
6607
|
+
const actionConfig = getActionConfig({
|
|
6608
|
+
eventConfiguration,
|
|
6609
|
+
actionType: action.type,
|
|
6610
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6611
|
+
});
|
|
6612
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6613
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6614
|
+
);
|
|
6615
|
+
if (removeOperations.length === 0) {
|
|
6616
|
+
return false;
|
|
6617
|
+
}
|
|
6618
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6619
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6620
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6621
|
+
const form = { ...declaration, ...annotation };
|
|
6622
|
+
return removeOperations.some(
|
|
6623
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6624
|
+
);
|
|
6625
|
+
}
|
|
6626
|
+
var INHERENT_FLAG_RULES = [
|
|
6627
|
+
{
|
|
6628
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6629
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6630
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6631
|
+
},
|
|
6632
|
+
{
|
|
6633
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6634
|
+
// other status-changing action (see getStatusFromActions).
|
|
6635
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6636
|
+
setOn: [ActionType.NOTIFY],
|
|
6637
|
+
resetOn: [
|
|
6638
|
+
ActionType.CREATE,
|
|
6639
|
+
ActionType.DECLARE,
|
|
6640
|
+
ActionType.REGISTER,
|
|
6641
|
+
ActionType.ARCHIVE
|
|
6642
|
+
]
|
|
6643
|
+
},
|
|
6644
|
+
{
|
|
6645
|
+
flag: InherentFlags.REJECTED,
|
|
6646
|
+
setOn: [ActionType.REJECT],
|
|
6647
|
+
resetOn: [
|
|
6648
|
+
ActionType.NOTIFY,
|
|
6649
|
+
ActionType.DECLARE,
|
|
6650
|
+
ActionType.EDIT,
|
|
6651
|
+
ActionType.REGISTER
|
|
6652
|
+
]
|
|
6653
|
+
},
|
|
6654
|
+
{
|
|
6655
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6656
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6657
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6658
|
+
},
|
|
6659
|
+
{
|
|
6660
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6661
|
+
setOn: [ActionType.EDIT],
|
|
6662
|
+
resetOnAnyOtherAction: true
|
|
6663
|
+
}
|
|
6664
|
+
];
|
|
6665
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6666
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6667
|
+
if (rule.setOn.includes(action.type)) {
|
|
6668
|
+
return true;
|
|
6669
|
+
}
|
|
6670
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6671
|
+
return false;
|
|
6672
|
+
}
|
|
6673
|
+
if (actionConfigRemovesFlag(
|
|
6674
|
+
action,
|
|
6675
|
+
rule.flag,
|
|
6676
|
+
acceptedActions.slice(0, idx + 1),
|
|
6677
|
+
event2,
|
|
6678
|
+
eventConfiguration
|
|
6679
|
+
)) {
|
|
6680
|
+
return false;
|
|
6681
|
+
}
|
|
6682
|
+
return present;
|
|
6683
|
+
}, false);
|
|
6684
|
+
}
|
|
6587
6685
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6588
6686
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6589
6687
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6632,33 +6730,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6632
6730
|
return flag2;
|
|
6633
6731
|
});
|
|
6634
6732
|
}
|
|
6635
|
-
function getInherentFlags(sortedActions) {
|
|
6733
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6636
6734
|
const acceptedActions = sortedActions.filter(
|
|
6637
6735
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6638
6736
|
);
|
|
6639
|
-
|
|
6640
|
-
|
|
6641
|
-
|
|
6642
|
-
}
|
|
6643
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6644
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6645
|
-
}
|
|
6646
|
-
if (isRejected(acceptedActions)) {
|
|
6647
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6648
|
-
}
|
|
6649
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6650
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6651
|
-
}
|
|
6652
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6654
|
-
}
|
|
6655
|
-
return inherentFlags;
|
|
6737
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6738
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6739
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6656
6740
|
}
|
|
6657
6741
|
function getEventFlags(event2, config) {
|
|
6658
6742
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6659
6743
|
return [
|
|
6660
6744
|
...getActionStatusFlags(sortedActions),
|
|
6661
|
-
...getInherentFlags(sortedActions),
|
|
6745
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6662
6746
|
...resolveEventCustomFlags(event2, config)
|
|
6663
6747
|
];
|
|
6664
6748
|
}
|
|
@@ -7663,6 +7747,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7663
7747
|
id: "signature.upload.modal.title",
|
|
7664
7748
|
defaultMessage: "Draw signature",
|
|
7665
7749
|
description: "Title for the modal to draw signature"
|
|
7750
|
+
},
|
|
7751
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7752
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7753
|
+
configuration: {
|
|
7754
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7666
7755
|
}
|
|
7667
7756
|
}
|
|
7668
7757
|
]
|
|
@@ -8219,6 +8308,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8219
8308
|
},
|
|
8220
8309
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8221
8310
|
},
|
|
8311
|
+
{
|
|
8312
|
+
type: ActionType.NOTIFY,
|
|
8313
|
+
label: {
|
|
8314
|
+
defaultMessage: "Notify health worker",
|
|
8315
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8316
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8317
|
+
},
|
|
8318
|
+
flags: [
|
|
8319
|
+
{
|
|
8320
|
+
id: "health-worker-notified",
|
|
8321
|
+
operation: "add"
|
|
8322
|
+
}
|
|
8323
|
+
]
|
|
8324
|
+
},
|
|
8222
8325
|
{
|
|
8223
8326
|
type: ActionType.REJECT,
|
|
8224
8327
|
label: {
|
|
@@ -8461,6 +8564,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8461
8564
|
}
|
|
8462
8565
|
}
|
|
8463
8566
|
],
|
|
8567
|
+
flags: [
|
|
8568
|
+
{
|
|
8569
|
+
id: "health-worker-notified",
|
|
8570
|
+
requiresAction: false,
|
|
8571
|
+
label: {
|
|
8572
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8573
|
+
defaultMessage: "Health worker notified",
|
|
8574
|
+
description: "Label for the health-worker-notified flag"
|
|
8575
|
+
}
|
|
8576
|
+
}
|
|
8577
|
+
],
|
|
8464
8578
|
advancedSearch: [
|
|
8465
8579
|
{
|
|
8466
8580
|
title: {
|
|
@@ -10219,7 +10333,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10219
10333
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10220
10334
|
}
|
|
10221
10335
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10222
|
-
return user2.administrativeAreaId
|
|
10336
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10223
10337
|
}
|
|
10224
10338
|
return true;
|
|
10225
10339
|
}
|
|
@@ -10246,6 +10360,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10246
10360
|
}
|
|
10247
10361
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10248
10362
|
const { options } = scope;
|
|
10363
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10364
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10365
|
+
return false;
|
|
10366
|
+
}
|
|
10367
|
+
}
|
|
10368
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10369
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10370
|
+
JurisdictionFilter.enum.location,
|
|
10371
|
+
user2
|
|
10372
|
+
)) {
|
|
10373
|
+
return false;
|
|
10374
|
+
}
|
|
10375
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10376
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10377
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10378
|
+
user2
|
|
10379
|
+
)) {
|
|
10380
|
+
return false;
|
|
10381
|
+
}
|
|
10249
10382
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10250
10383
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10251
10384
|
return false;
|
|
@@ -10308,7 +10441,7 @@ function canAccessUserWithScope({
|
|
|
10308
10441
|
}
|
|
10309
10442
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10310
10443
|
(id) => user2.administrativeAreaId === id
|
|
10311
|
-
) || user2.administrativeAreaId
|
|
10444
|
+
) || !user2.administrativeAreaId;
|
|
10312
10445
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10313
10446
|
return false;
|
|
10314
10447
|
}
|
|
@@ -10614,18 +10747,19 @@ var ACTION_FILTERS = {
|
|
|
10614
10747
|
function filterActionsByFlags(actions, flags) {
|
|
10615
10748
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10616
10749
|
}
|
|
10750
|
+
var REJECTED_ACTIONS = [
|
|
10751
|
+
ActionType.READ,
|
|
10752
|
+
ActionType.NOTIFY,
|
|
10753
|
+
ActionType.CUSTOM,
|
|
10754
|
+
ActionType.EDIT,
|
|
10755
|
+
ActionType.ARCHIVE
|
|
10756
|
+
];
|
|
10617
10757
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10618
10758
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10619
10759
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10620
10760
|
}
|
|
10621
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10622
|
-
return
|
|
10623
|
-
ActionType.READ,
|
|
10624
|
-
ActionType.NOTIFY,
|
|
10625
|
-
ActionType.CUSTOM,
|
|
10626
|
-
ActionType.EDIT,
|
|
10627
|
-
ActionType.ARCHIVE
|
|
10628
|
-
];
|
|
10761
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10762
|
+
return REJECTED_ACTIONS;
|
|
10629
10763
|
}
|
|
10630
10764
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10631
10765
|
}
|
|
@@ -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';
|
|
@@ -2204,11 +2204,13 @@ var scopeOptionsPlaceEvent = z3.object({
|
|
|
2204
2204
|
event: scopeByEvent,
|
|
2205
2205
|
placeOfEvent: JurisdictionFilter.optional()
|
|
2206
2206
|
}).describe("Options applicable to all record scopes.");
|
|
2207
|
-
var
|
|
2207
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
2208
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
2209
|
+
notifiedBy: UserFilter.optional(),
|
|
2208
2210
|
declaredIn: JurisdictionFilter.optional(),
|
|
2209
2211
|
declaredBy: UserFilter.optional()
|
|
2210
2212
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
2211
|
-
var AllRecordScopeOptions =
|
|
2213
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
2212
2214
|
registeredIn: JurisdictionFilter.optional(),
|
|
2213
2215
|
registeredBy: UserFilter.optional()
|
|
2214
2216
|
}).describe(
|
|
@@ -2246,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
|
|
|
2246
2248
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
2247
2249
|
);
|
|
2248
2250
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
2251
|
+
notifiedIn: UUID.nullish(),
|
|
2252
|
+
notifiedBy: z3.string().optional(),
|
|
2249
2253
|
declaredIn: UUID.nullish(),
|
|
2250
2254
|
declaredBy: z3.string().optional()
|
|
2251
2255
|
}).describe(
|
|
@@ -2291,7 +2295,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2291
2295
|
}),
|
|
2292
2296
|
z3.object({
|
|
2293
2297
|
type: ScopesWithDeclaredOptions,
|
|
2294
|
-
options:
|
|
2298
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
2295
2299
|
}),
|
|
2296
2300
|
z3.object({
|
|
2297
2301
|
type: ScopesWithFullOptions,
|
|
@@ -2394,20 +2398,27 @@ var encodeScope = (scope) => {
|
|
|
2394
2398
|
encode: false
|
|
2395
2399
|
});
|
|
2396
2400
|
};
|
|
2397
|
-
var
|
|
2398
|
-
|
|
2401
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2402
|
+
var decodeScope = (encodedScope) => {
|
|
2403
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2404
|
+
return decodedScopeCache.get(encodedScope);
|
|
2405
|
+
}
|
|
2406
|
+
const scope = qs.parse(encodedScope, {
|
|
2399
2407
|
ignoreQueryPrefix: true,
|
|
2400
2408
|
comma: true,
|
|
2401
2409
|
allowDots: true
|
|
2402
2410
|
});
|
|
2403
2411
|
const unflattenedScope = unflattenScope(scope);
|
|
2404
|
-
|
|
2412
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2413
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2414
|
+
return result;
|
|
2405
2415
|
};
|
|
2406
2416
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2407
2417
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2408
2418
|
accessLevel: JurisdictionFilter.enum.all,
|
|
2409
|
-
|
|
2410
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
2419
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
2420
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
2421
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
2411
2422
|
};
|
|
2412
2423
|
|
|
2413
2424
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
@@ -4306,7 +4317,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4306
4317
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4307
4318
|
var import_child_process = require("child_process");
|
|
4308
4319
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4309
|
-
var UPSTREAM_BRANCH = "release
|
|
4320
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4310
4321
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4311
4322
|
var FILES_TO_CHECKOUT = [
|
|
4312
4323
|
"src/analytics/analytics.ts",
|