@opencrvs/toolkit 2.0.0-rc.d5a5acd → 2.0.0-rc.d5e21da
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 +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 +28 -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 +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 +194 -69
- 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 +113 -9
- 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.d5e21da.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.d5a5acd.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,
|
|
@@ -729,8 +734,9 @@ var decodeScope = (encodedScope) => {
|
|
|
729
734
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
730
735
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
731
736
|
accessLevel: JurisdictionFilter.enum.all,
|
|
732
|
-
|
|
733
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
737
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
738
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
739
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
734
740
|
};
|
|
735
741
|
function getAcceptedScopesByType({
|
|
736
742
|
acceptedScopes,
|
|
@@ -1219,6 +1225,11 @@ var FieldTypesToHideInReview = [
|
|
|
1219
1225
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1220
1226
|
FieldType.ALPHA_HIDDEN
|
|
1221
1227
|
];
|
|
1228
|
+
var HiddenFieldTypes = [
|
|
1229
|
+
FieldType.HTTP,
|
|
1230
|
+
FieldType.QUERY_PARAM_READER,
|
|
1231
|
+
FieldType.ALPHA_HIDDEN
|
|
1232
|
+
];
|
|
1222
1233
|
|
|
1223
1234
|
// ../commons/src/events/FieldValue.ts
|
|
1224
1235
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1345,7 +1356,7 @@ function plainDateToLocalDate(date) {
|
|
|
1345
1356
|
// ../commons/src/events/FieldValue.ts
|
|
1346
1357
|
var TextValue = z12.string();
|
|
1347
1358
|
var HiddenFieldValue = z12.string();
|
|
1348
|
-
var NonEmptyTextValue =
|
|
1359
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1349
1360
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1350
1361
|
var AgeValue = z12.object({
|
|
1351
1362
|
age: z12.number(),
|
|
@@ -1809,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1809
1820
|
)
|
|
1810
1821
|
});
|
|
1811
1822
|
var LegalStatuses = z16.object({
|
|
1823
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1812
1824
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1813
1825
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1814
1826
|
});
|
|
@@ -1950,6 +1962,8 @@ var eventMetadataLabelMap = {
|
|
|
1950
1962
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1951
1963
|
"createdAt",
|
|
1952
1964
|
"updatedAt",
|
|
1965
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1953
1967
|
"legalStatuses.DECLARED.createdAt",
|
|
1954
1968
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1955
1969
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1958,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1958
1972
|
var EventMetadataDateFieldId = z16.enum([
|
|
1959
1973
|
"event.createdAt",
|
|
1960
1974
|
"event.updatedAt",
|
|
1975
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1961
1977
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1962
1978
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1963
1979
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2017,7 +2033,8 @@ var Range = import_v4.z.object({
|
|
|
2017
2033
|
});
|
|
2018
2034
|
var ContainsFlags = import_v4.z.object({
|
|
2019
2035
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2020
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2036
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2037
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2021
2038
|
}).meta({
|
|
2022
2039
|
id: "ContainsFlags"
|
|
2023
2040
|
});
|
|
@@ -2292,6 +2309,7 @@ var NumberField = BaseField.extend({
|
|
|
2292
2309
|
configuration: import_v43.default.object({
|
|
2293
2310
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2294
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"),
|
|
2295
2313
|
prefix: TranslationConfig.optional(),
|
|
2296
2314
|
postfix: TranslationConfig.optional()
|
|
2297
2315
|
}).optional()
|
|
@@ -3215,6 +3233,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3215
3233
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3216
3234
|
}).shape
|
|
3217
3235
|
);
|
|
3236
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3237
|
+
z24.object({
|
|
3238
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3239
|
+
}).shape
|
|
3240
|
+
);
|
|
3218
3241
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3219
3242
|
z24.object({
|
|
3220
3243
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3299,9 +3322,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3299
3322
|
id: "ReadActionConfig",
|
|
3300
3323
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3301
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
|
+
}),
|
|
3302
3329
|
DeclareConfig.meta({
|
|
3303
3330
|
id: "DeclareActionConfig",
|
|
3304
|
-
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."
|
|
3305
3332
|
}),
|
|
3306
3333
|
RejectConfig.meta({
|
|
3307
3334
|
id: "RejectActionConfig",
|
|
@@ -3908,7 +3935,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3908
3935
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3909
3936
|
};
|
|
3910
3937
|
var isNonInteractiveFieldType = (field3) => {
|
|
3911
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
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;
|
|
3912
3939
|
};
|
|
3913
3940
|
|
|
3914
3941
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4470,13 +4497,13 @@ function getActionConfig({
|
|
|
4470
4497
|
actionType,
|
|
4471
4498
|
customActionType
|
|
4472
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
|
+
}
|
|
4473
4503
|
return eventConfiguration.actions.find((a) => {
|
|
4474
4504
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4475
4505
|
return a.customActionType === customActionType;
|
|
4476
4506
|
}
|
|
4477
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4478
|
-
return a.type === ActionType.DECLARE;
|
|
4479
|
-
}
|
|
4480
4507
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4481
4508
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4482
4509
|
}
|
|
@@ -4513,7 +4540,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4513
4540
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4514
4541
|
return actionConfig.form;
|
|
4515
4542
|
}
|
|
4516
|
-
if ("review" in actionConfig) {
|
|
4543
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4517
4544
|
return actionConfig.review.fields;
|
|
4518
4545
|
}
|
|
4519
4546
|
return [];
|
|
@@ -6485,6 +6512,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6485
6512
|
ActionType.ARCHIVE,
|
|
6486
6513
|
ActionType.PRINT_CERTIFICATE,
|
|
6487
6514
|
ActionType.REQUEST_CORRECTION,
|
|
6515
|
+
ActionType.APPROVE_CORRECTION,
|
|
6516
|
+
ActionType.REJECT_CORRECTION,
|
|
6488
6517
|
ActionType.CUSTOM
|
|
6489
6518
|
]);
|
|
6490
6519
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6499,7 +6528,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6499
6528
|
"createdAtLocation",
|
|
6500
6529
|
"createdByRole"
|
|
6501
6530
|
];
|
|
6502
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6531
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6503
6532
|
(_2, action) => {
|
|
6504
6533
|
if (action.originalActionId) {
|
|
6505
6534
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6512,6 +6541,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6512
6541
|
}
|
|
6513
6542
|
function getLegalStatuses(actions) {
|
|
6514
6543
|
return {
|
|
6544
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6545
|
+
ActionType.NOTIFY,
|
|
6546
|
+
actions
|
|
6547
|
+
),
|
|
6515
6548
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6516
6549
|
ActionType.DECLARE,
|
|
6517
6550
|
actions
|
|
@@ -6526,9 +6559,6 @@ function getLegalStatuses(actions) {
|
|
|
6526
6559
|
// ../commons/src/events/state/flags.ts
|
|
6527
6560
|
var import_lodash3 = require("lodash");
|
|
6528
6561
|
var import_date_fns3 = require("date-fns");
|
|
6529
|
-
function isEditInProgress(actions) {
|
|
6530
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6531
|
-
}
|
|
6532
6562
|
function findPendingCorrectionAction(writeActions2) {
|
|
6533
6563
|
let correctionRequestAction;
|
|
6534
6564
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6543,29 +6573,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6543
6573
|
}
|
|
6544
6574
|
return correctionRequestAction;
|
|
6545
6575
|
}
|
|
6546
|
-
function isCorrectionRequested(actions) {
|
|
6547
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6548
|
-
}
|
|
6549
|
-
function isDeclarationIncomplete(actions) {
|
|
6550
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6551
|
-
}
|
|
6552
|
-
function isRejected(actions) {
|
|
6553
|
-
const resettingActionTypes = [
|
|
6554
|
-
ActionType.NOTIFY,
|
|
6555
|
-
ActionType.DECLARE,
|
|
6556
|
-
ActionType.EDIT,
|
|
6557
|
-
ActionType.REGISTER
|
|
6558
|
-
];
|
|
6559
|
-
return actions.reduce((prev, { type }) => {
|
|
6560
|
-
if (type === ActionType.REJECT) {
|
|
6561
|
-
return true;
|
|
6562
|
-
}
|
|
6563
|
-
if (resettingActionTypes.includes(type)) {
|
|
6564
|
-
return false;
|
|
6565
|
-
}
|
|
6566
|
-
return prev;
|
|
6567
|
-
}, false);
|
|
6568
|
-
}
|
|
6569
6576
|
function isPotentialDuplicate(actions) {
|
|
6570
6577
|
return actions.reduce((prev, { type }) => {
|
|
6571
6578
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6593,6 +6600,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6593
6600
|
}
|
|
6594
6601
|
});
|
|
6595
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
|
+
}
|
|
6596
6685
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6597
6686
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6598
6687
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6641,33 +6730,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6641
6730
|
return flag2;
|
|
6642
6731
|
});
|
|
6643
6732
|
}
|
|
6644
|
-
function getInherentFlags(sortedActions) {
|
|
6733
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6645
6734
|
const acceptedActions = sortedActions.filter(
|
|
6646
6735
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6647
6736
|
);
|
|
6648
|
-
|
|
6649
|
-
|
|
6650
|
-
|
|
6651
|
-
}
|
|
6652
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6654
|
-
}
|
|
6655
|
-
if (isRejected(acceptedActions)) {
|
|
6656
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6657
|
-
}
|
|
6658
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6659
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6660
|
-
}
|
|
6661
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6663
|
-
}
|
|
6664
|
-
return inherentFlags;
|
|
6737
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6738
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6739
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6665
6740
|
}
|
|
6666
6741
|
function getEventFlags(event2, config) {
|
|
6667
6742
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6668
6743
|
return [
|
|
6669
6744
|
...getActionStatusFlags(sortedActions),
|
|
6670
|
-
...getInherentFlags(sortedActions),
|
|
6745
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6671
6746
|
...resolveEventCustomFlags(event2, config)
|
|
6672
6747
|
];
|
|
6673
6748
|
}
|
|
@@ -7672,6 +7747,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7672
7747
|
id: "signature.upload.modal.title",
|
|
7673
7748
|
defaultMessage: "Draw signature",
|
|
7674
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
|
|
7675
7755
|
}
|
|
7676
7756
|
}
|
|
7677
7757
|
]
|
|
@@ -8228,6 +8308,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8228
8308
|
},
|
|
8229
8309
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8230
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
|
+
},
|
|
8231
8325
|
{
|
|
8232
8326
|
type: ActionType.REJECT,
|
|
8233
8327
|
label: {
|
|
@@ -8470,6 +8564,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8470
8564
|
}
|
|
8471
8565
|
}
|
|
8472
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
|
+
],
|
|
8473
8578
|
advancedSearch: [
|
|
8474
8579
|
{
|
|
8475
8580
|
title: {
|
|
@@ -10228,7 +10333,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10228
10333
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10229
10334
|
}
|
|
10230
10335
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10231
|
-
return user2.administrativeAreaId
|
|
10336
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10232
10337
|
}
|
|
10233
10338
|
return true;
|
|
10234
10339
|
}
|
|
@@ -10255,6 +10360,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10255
10360
|
}
|
|
10256
10361
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10257
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
|
+
}
|
|
10258
10382
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10259
10383
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10260
10384
|
return false;
|
|
@@ -10317,7 +10441,7 @@ function canAccessUserWithScope({
|
|
|
10317
10441
|
}
|
|
10318
10442
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10319
10443
|
(id) => user2.administrativeAreaId === id
|
|
10320
|
-
) || user2.administrativeAreaId
|
|
10444
|
+
) || !user2.administrativeAreaId;
|
|
10321
10445
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10322
10446
|
return false;
|
|
10323
10447
|
}
|
|
@@ -10623,18 +10747,19 @@ var ACTION_FILTERS = {
|
|
|
10623
10747
|
function filterActionsByFlags(actions, flags) {
|
|
10624
10748
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10625
10749
|
}
|
|
10750
|
+
var REJECTED_ACTIONS = [
|
|
10751
|
+
ActionType.READ,
|
|
10752
|
+
ActionType.NOTIFY,
|
|
10753
|
+
ActionType.CUSTOM,
|
|
10754
|
+
ActionType.EDIT,
|
|
10755
|
+
ActionType.ARCHIVE
|
|
10756
|
+
];
|
|
10626
10757
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10627
10758
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10628
10759
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10629
10760
|
}
|
|
10630
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10631
|
-
return
|
|
10632
|
-
ActionType.READ,
|
|
10633
|
-
ActionType.NOTIFY,
|
|
10634
|
-
ActionType.CUSTOM,
|
|
10635
|
-
ActionType.EDIT,
|
|
10636
|
-
ActionType.ARCHIVE
|
|
10637
|
-
];
|
|
10761
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10762
|
+
return REJECTED_ACTIONS;
|
|
10638
10763
|
}
|
|
10639
10764
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10640
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,
|
|
@@ -2412,8 +2416,9 @@ var decodeScope = (encodedScope) => {
|
|
|
2412
2416
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2413
2417
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2414
2418
|
accessLevel: JurisdictionFilter.enum.all,
|
|
2415
|
-
|
|
2416
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
2419
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
2420
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
2421
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
2417
2422
|
};
|
|
2418
2423
|
|
|
2419
2424
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
@@ -4312,7 +4317,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4312
4317
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4313
4318
|
var import_child_process = require("child_process");
|
|
4314
4319
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4315
|
-
var UPSTREAM_BRANCH = "release
|
|
4320
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4316
4321
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4317
4322
|
var FILES_TO_CHECKOUT = [
|
|
4318
4323
|
"src/analytics/analytics.ts",
|