@opencrvs/toolkit 2.0.0-rc.3c7efd6 → 2.0.0-rc.3c82a4c
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/create-countryconfig/index.js +73 -0
- package/create-countryconfig/package.json +11 -0
- package/dist/application-config/index.js +28 -31
- package/dist/cli.js +499 -167
- package/dist/commons/api/router.d.ts +3336 -258
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +108 -0
- package/dist/commons/events/Draft.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +0 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/WorkqueueConfig.d.ts +146 -146
- package/dist/commons/events/locations.d.ts +21 -0
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/state/index.d.ts +0 -4
- package/dist/commons/events/state/utils.d.ts +0 -2
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/events/index.js +106 -75
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
- 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 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
- package/dist/migrations/v2.0/index.d.ts +5 -3
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +497 -165
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
- package/dist/notification/index.js +38 -45
- package/opencrvs-toolkit-2.0.0-rc.3c82a4c.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.3c7efd6.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -302,12 +302,13 @@ __export(events_exports, {
|
|
|
302
302
|
getActionConfig: () => getActionConfig,
|
|
303
303
|
getActionReview: () => getActionReview,
|
|
304
304
|
getActionReviewFields: () => getActionReviewFields,
|
|
305
|
+
getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
|
|
305
306
|
getAllUniqueFields: () => getAllUniqueFields,
|
|
306
307
|
getAnnotationFromDrafts: () => getAnnotationFromDrafts,
|
|
307
308
|
getAssignedUserFromActions: () => getAssignedUserFromActions,
|
|
308
|
-
getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
|
|
309
309
|
getAssignmentStatus: () => getAssignmentStatus,
|
|
310
310
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
311
|
+
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
311
312
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
312
313
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
313
314
|
getCurrentEventState: () => getCurrentEventState,
|
|
@@ -318,6 +319,7 @@ __export(events_exports, {
|
|
|
318
319
|
getDeclarationPages: () => getDeclarationPages,
|
|
319
320
|
getEventConfigById: () => getEventConfigById,
|
|
320
321
|
getFilePathsFromEvent: () => getFilePathsFromEvent,
|
|
322
|
+
getLocationHierarchy: () => getLocationHierarchy,
|
|
321
323
|
getMixedPath: () => getMixedPath,
|
|
322
324
|
getPendingAction: () => getPendingAction,
|
|
323
325
|
getPrintCertificatePages: () => getPrintCertificatePages,
|
|
@@ -1075,7 +1077,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
|
|
|
1075
1077
|
ShowConditional,
|
|
1076
1078
|
// Action can be shown to the user in the list but as disabled
|
|
1077
1079
|
EnableConditional
|
|
1078
|
-
])
|
|
1080
|
+
]).meta({
|
|
1081
|
+
description: "Action conditional configuration",
|
|
1082
|
+
id: "ActionConditional"
|
|
1083
|
+
});
|
|
1079
1084
|
var DisplayOnReviewConditional = z7.object({
|
|
1080
1085
|
type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
|
|
1081
1086
|
conditional: Conditional
|
|
@@ -1411,28 +1416,20 @@ function schemaPriority(schema) {
|
|
|
1411
1416
|
return idx === -1 ? 9999 : idx;
|
|
1412
1417
|
}
|
|
1413
1418
|
function safeUnion(schemas) {
|
|
1419
|
+
const sortedSchemas = [...schemas].sort(
|
|
1420
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
1421
|
+
);
|
|
1414
1422
|
return z12.any().superRefine((val, ctx) => {
|
|
1415
|
-
const
|
|
1416
|
-
|
|
1417
|
-
|
|
1418
|
-
|
|
1419
|
-
if (successful.length === 0) {
|
|
1420
|
-
ctx.addIssue({
|
|
1421
|
-
code: "invalid_type",
|
|
1422
|
-
expected: "custom",
|
|
1423
|
-
message: "Value does not match any schema"
|
|
1424
|
-
});
|
|
1425
|
-
return;
|
|
1426
|
-
}
|
|
1427
|
-
successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
|
|
1428
|
-
const best = successful[0];
|
|
1429
|
-
if (!best.safeParse(val).success) {
|
|
1430
|
-
ctx.addIssue({
|
|
1431
|
-
expected: "custom",
|
|
1432
|
-
code: "invalid_type",
|
|
1433
|
-
message: "Value did not match the best schema"
|
|
1434
|
-
});
|
|
1423
|
+
for (const schema of sortedSchemas) {
|
|
1424
|
+
if (schema.safeParse(val).success) {
|
|
1425
|
+
return;
|
|
1426
|
+
}
|
|
1435
1427
|
}
|
|
1428
|
+
ctx.addIssue({
|
|
1429
|
+
code: "invalid_type",
|
|
1430
|
+
expected: "custom",
|
|
1431
|
+
message: "Value does not match any schema"
|
|
1432
|
+
});
|
|
1436
1433
|
}).meta({
|
|
1437
1434
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1438
1435
|
});
|
|
@@ -1742,6 +1739,9 @@ var FlagConfig = z15.object({
|
|
|
1742
1739
|
"Indicates if this flag expects an action to be performed to be cleared."
|
|
1743
1740
|
),
|
|
1744
1741
|
label: TranslationConfig.describe("Human readable label of the flag.")
|
|
1742
|
+
}).meta({
|
|
1743
|
+
description: "Flag configuration",
|
|
1744
|
+
id: "FlagConfig"
|
|
1745
1745
|
});
|
|
1746
1746
|
var ActionFlagConfig = z15.object({
|
|
1747
1747
|
id: Flag,
|
|
@@ -1749,6 +1749,9 @@ var ActionFlagConfig = z15.object({
|
|
|
1749
1749
|
conditional: Conditional.optional().describe(
|
|
1750
1750
|
"When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
|
|
1751
1751
|
)
|
|
1752
|
+
}).meta({
|
|
1753
|
+
description: "Action flag configuration",
|
|
1754
|
+
id: "ActionFlagConfig"
|
|
1752
1755
|
});
|
|
1753
1756
|
|
|
1754
1757
|
// ../commons/src/events/EventMetadata.ts
|
|
@@ -1770,8 +1773,7 @@ var ActionCreationMetadata = z16.object({
|
|
|
1770
1773
|
),
|
|
1771
1774
|
createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
|
|
1772
1775
|
acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
|
|
1773
|
-
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1774
|
-
createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
|
|
1776
|
+
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1775
1777
|
});
|
|
1776
1778
|
var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
1777
1779
|
registrationNumber: z16.string().describe(
|
|
@@ -1799,9 +1801,6 @@ var EventMetadata = z16.object({
|
|
|
1799
1801
|
createdAtLocation: UUID.nullish().describe(
|
|
1800
1802
|
"Location of the user who created the event."
|
|
1801
1803
|
),
|
|
1802
|
-
createdBySignature: DocumentPath.nullish().describe(
|
|
1803
|
-
"Signature of the user who created the event."
|
|
1804
|
-
),
|
|
1805
1804
|
updatedAtLocation: UUID.nullish().describe(
|
|
1806
1805
|
"Location of the user who last changed the status."
|
|
1807
1806
|
),
|
|
@@ -2176,7 +2175,7 @@ var FieldId = import_v43.default.string().superRefine((val, ctx) => {
|
|
|
2176
2175
|
}
|
|
2177
2176
|
}).describe("Unique identifier for the field");
|
|
2178
2177
|
var FieldReference = import_v43.default.object({
|
|
2179
|
-
$$field: FieldId,
|
|
2178
|
+
$$field: FieldId.describe("Id of the field to reference"),
|
|
2180
2179
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2181
2180
|
'If the FieldValue is an object, subfield can be used to refer to e.g. `["foo", "bar"]` in `{ foo: { bar: 3 } }`'
|
|
2182
2181
|
)
|
|
@@ -2889,10 +2888,10 @@ var VerificationPageConfig = FormPageConfig.extend({
|
|
|
2889
2888
|
type: z21.literal(PageTypes.enum.VERIFICATION),
|
|
2890
2889
|
actions: VerificationActionConfig
|
|
2891
2890
|
});
|
|
2892
|
-
var PageConfig = z21.discriminatedUnion("type", [
|
|
2893
|
-
|
|
2894
|
-
|
|
2895
|
-
|
|
2891
|
+
var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
|
|
2892
|
+
description: "Page configuration",
|
|
2893
|
+
id: "PageConfig"
|
|
2894
|
+
});
|
|
2896
2895
|
|
|
2897
2896
|
// ../commons/src/events/FormConfig.ts
|
|
2898
2897
|
var DeclarationFormConfig = z22.object({
|
|
@@ -3801,6 +3800,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3801
3800
|
function isAgeValue(value) {
|
|
3802
3801
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3803
3802
|
}
|
|
3803
|
+
function mergeWithBaseFormState(values, context) {
|
|
3804
|
+
return { ...context.baseFormState, ...values };
|
|
3805
|
+
}
|
|
3804
3806
|
function validate(schema, data) {
|
|
3805
3807
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3806
3808
|
if ("$form" in data) {
|
|
@@ -3839,7 +3841,7 @@ function isOnline() {
|
|
|
3839
3841
|
}
|
|
3840
3842
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3841
3843
|
return validate(conditional, {
|
|
3842
|
-
$form: values,
|
|
3844
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3843
3845
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3844
3846
|
$online: isOnline(),
|
|
3845
3847
|
$user: context.user,
|
|
@@ -3868,7 +3870,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3868
3870
|
return true;
|
|
3869
3871
|
}
|
|
3870
3872
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3871
|
-
$form: form,
|
|
3873
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3872
3874
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3873
3875
|
$online: isOnline(),
|
|
3874
3876
|
$user: context.user,
|
|
@@ -4060,7 +4062,7 @@ function runFieldValidations({
|
|
|
4060
4062
|
return [];
|
|
4061
4063
|
}
|
|
4062
4064
|
const conditionalParameters = {
|
|
4063
|
-
$form: form,
|
|
4065
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4064
4066
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4065
4067
|
/**
|
|
4066
4068
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4304,17 +4306,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4304
4306
|
}
|
|
4305
4307
|
return isConditionMet(page.conditional, formValues, context);
|
|
4306
4308
|
}
|
|
4307
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4309
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4308
4310
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4309
4311
|
function fn(prevVisibilityContext) {
|
|
4310
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4311
4312
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4312
4313
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4313
4314
|
if (!fieldConfig.length) {
|
|
4314
4315
|
return false;
|
|
4315
4316
|
}
|
|
4316
4317
|
const isHidden = fieldConfig.every(
|
|
4317
|
-
(f) => !isFieldVisible(f,
|
|
4318
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4318
4319
|
);
|
|
4319
4320
|
if (!isHidden) {
|
|
4320
4321
|
return false;
|
|
@@ -4332,7 +4333,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4332
4333
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4333
4334
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4334
4335
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4335
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4336
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4336
4337
|
});
|
|
4337
4338
|
return omitHiddenFields(
|
|
4338
4339
|
visibleFields,
|
|
@@ -4379,13 +4380,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4379
4380
|
}
|
|
4380
4381
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4381
4382
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4382
|
-
return omitHiddenFields(
|
|
4383
|
-
|
|
4384
|
-
|
|
4385
|
-
|
|
4386
|
-
false,
|
|
4387
|
-
declaration
|
|
4388
|
-
);
|
|
4383
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4384
|
+
...context,
|
|
4385
|
+
baseFormState: declaration
|
|
4386
|
+
});
|
|
4389
4387
|
}
|
|
4390
4388
|
function deepMerge(currentDocument, actionDocument) {
|
|
4391
4389
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5374,7 +5372,7 @@ var _EventConfigBase = z33.object({
|
|
|
5374
5372
|
),
|
|
5375
5373
|
label: TranslationConfig.describe("Human-readable label for the event type."),
|
|
5376
5374
|
actions: z33.array(ActionConfig).describe(
|
|
5377
|
-
"Configuration of
|
|
5375
|
+
"Configuration of core and custom actions associated with the event."
|
|
5378
5376
|
),
|
|
5379
5377
|
actionOrder: z33.array(z33.string()).optional().describe(
|
|
5380
5378
|
"Order of actions in the action menu. Use either the action type for core actions or the customActionType for custom actions."
|
|
@@ -5386,7 +5384,7 @@ var _EventConfigBase = z33.object({
|
|
|
5386
5384
|
"Configuration of fields available in the advanced search feature."
|
|
5387
5385
|
),
|
|
5388
5386
|
flags: z33.array(FlagConfig).optional().default([]).describe(
|
|
5389
|
-
"Configuration of flags associated with the actions of this event type."
|
|
5387
|
+
"Configuration of custom flags associated with the actions of this event type."
|
|
5390
5388
|
),
|
|
5391
5389
|
analytics: z33.boolean().optional().default(true).describe(
|
|
5392
5390
|
"Indicates whether the records of this event type are included in analytics"
|
|
@@ -5825,18 +5823,11 @@ var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
|
|
|
5825
5823
|
query: true,
|
|
5826
5824
|
columns: true
|
|
5827
5825
|
});
|
|
5828
|
-
var WorkqueueConfigInput =
|
|
5829
|
-
|
|
5830
|
-
|
|
5831
|
-
|
|
5832
|
-
|
|
5833
|
-
query: CountryConfigQueryInputType,
|
|
5834
|
-
action: z37.object({ type: WorkqueueActionType }).optional().describe(
|
|
5835
|
-
"Workqueue call-to-action button configuration. This determines the quick action button shown on each event card and the action taken when the button is clicked."
|
|
5836
|
-
),
|
|
5837
|
-
columns: z37.array(WorkqueueColumn).default(mandatoryColumns),
|
|
5838
|
-
icon: AvailableIcons,
|
|
5839
|
-
emptyMessage: TranslationConfig.optional()
|
|
5826
|
+
var WorkqueueConfigInput = WorkqueueConfig.extend({
|
|
5827
|
+
query: CountryConfigQueryInputType
|
|
5828
|
+
}).meta({
|
|
5829
|
+
description: "Workqueue configuration",
|
|
5830
|
+
id: "WorkqueueConfig"
|
|
5840
5831
|
});
|
|
5841
5832
|
function defineWorkqueue(workqueueInput) {
|
|
5842
5833
|
const queryInput = workqueueInput.query;
|
|
@@ -5897,6 +5888,9 @@ var BaseActionInput = z38.object({
|
|
|
5897
5888
|
originalActionId: UUID.optional(),
|
|
5898
5889
|
// should not be part of base action.
|
|
5899
5890
|
keepAssignment: z38.boolean().optional(),
|
|
5891
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5892
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5893
|
+
waitFor: z38.boolean().optional(),
|
|
5900
5894
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5901
5895
|
// @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
|
|
5902
5896
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -6150,7 +6144,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
|
|
|
6150
6144
|
createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
|
|
6151
6145
|
acceptedAt: acceptAction.createdAt,
|
|
6152
6146
|
createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
|
|
6153
|
-
createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
|
|
6154
6147
|
registrationNumber
|
|
6155
6148
|
};
|
|
6156
6149
|
}
|
|
@@ -6364,17 +6357,6 @@ function getAssignedUserFromActions(actions) {
|
|
|
6364
6357
|
return user2;
|
|
6365
6358
|
}, null);
|
|
6366
6359
|
}
|
|
6367
|
-
function getAssignedUserSignatureFromActions(actions) {
|
|
6368
|
-
return actions.reduce((signature, action) => {
|
|
6369
|
-
if (action.type === ActionType.ASSIGN) {
|
|
6370
|
-
return action.createdBySignature || null;
|
|
6371
|
-
}
|
|
6372
|
-
if (action.type === ActionType.UNASSIGN) {
|
|
6373
|
-
return null;
|
|
6374
|
-
}
|
|
6375
|
-
return signature;
|
|
6376
|
-
}, null);
|
|
6377
|
-
}
|
|
6378
6360
|
function deepDropNulls(obj) {
|
|
6379
6361
|
if (Array.isArray(obj)) {
|
|
6380
6362
|
return obj.map(deepDropNulls);
|
|
@@ -6470,10 +6452,8 @@ function getCurrentEventState(event2, config) {
|
|
|
6470
6452
|
createdBy: creationAction.createdBy,
|
|
6471
6453
|
createdByUserType: creationAction.createdByUserType,
|
|
6472
6454
|
createdAtLocation: creationAction.createdAtLocation,
|
|
6473
|
-
createdBySignature: creationAction.createdBySignature,
|
|
6474
6455
|
updatedAt: acceptedActionMetadata.createdAt,
|
|
6475
6456
|
assignedTo: getAssignedUserFromActions(acceptedActions),
|
|
6476
|
-
assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
|
|
6477
6457
|
updatedBy: requestActionMetadata.createdBy,
|
|
6478
6458
|
updatedAtLocation: requestActionMetadata.createdAtLocation,
|
|
6479
6459
|
declaration,
|
|
@@ -9732,7 +9712,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
|
|
|
9732
9712
|
createdBy: overrides.createdBy ?? generateUuid(rng),
|
|
9733
9713
|
createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
|
|
9734
9714
|
updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
|
|
9735
|
-
createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
|
|
9736
9715
|
updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
|
|
9737
9716
|
assignedTo: overrides.assignedTo ?? null,
|
|
9738
9717
|
updatedBy: overrides.updatedBy ?? generateUuid(rng),
|
|
@@ -10003,6 +9982,39 @@ function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
|
|
|
10003
9982
|
(scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
|
|
10004
9983
|
);
|
|
10005
9984
|
}
|
|
9985
|
+
function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
|
|
9986
|
+
const collectedLocations = [];
|
|
9987
|
+
const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
|
|
9988
|
+
let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
|
|
9989
|
+
while (current) {
|
|
9990
|
+
collectedLocations.push(current);
|
|
9991
|
+
if (!current.parentId) {
|
|
9992
|
+
break;
|
|
9993
|
+
}
|
|
9994
|
+
const parentId = current.parentId;
|
|
9995
|
+
current = administrativeAreas.get(parentId);
|
|
9996
|
+
}
|
|
9997
|
+
return collectedLocations;
|
|
9998
|
+
}
|
|
9999
|
+
function getLocationHierarchy(selectedId, context) {
|
|
10000
|
+
const { administrativeAreas, locations } = context;
|
|
10001
|
+
const loc = locations.get(selectedId);
|
|
10002
|
+
if (loc) {
|
|
10003
|
+
if (loc.administrativeAreaId) {
|
|
10004
|
+
const hierarchy2 = getAdministrativeAreaHierarchy(
|
|
10005
|
+
loc.administrativeAreaId,
|
|
10006
|
+
administrativeAreas
|
|
10007
|
+
);
|
|
10008
|
+
return [...hierarchy2.reverse().map((area) => area.id), loc.id];
|
|
10009
|
+
}
|
|
10010
|
+
return [loc.id];
|
|
10011
|
+
}
|
|
10012
|
+
const hierarchy = getAdministrativeAreaHierarchy(
|
|
10013
|
+
selectedId,
|
|
10014
|
+
administrativeAreas
|
|
10015
|
+
);
|
|
10016
|
+
return hierarchy.reverse().map((area) => area.id);
|
|
10017
|
+
}
|
|
10006
10018
|
|
|
10007
10019
|
// ../commons/src/events/scopes.ts
|
|
10008
10020
|
var ACTION_SCOPE_MAP = {
|
|
@@ -10077,6 +10089,25 @@ function isActionInScope({
|
|
|
10077
10089
|
);
|
|
10078
10090
|
return canAccess;
|
|
10079
10091
|
}
|
|
10092
|
+
function getAvailableRolesForUserUpdatePayload({
|
|
10093
|
+
allRoles,
|
|
10094
|
+
userLocation,
|
|
10095
|
+
acceptedScopes,
|
|
10096
|
+
userRequesting
|
|
10097
|
+
}) {
|
|
10098
|
+
const availableRoles = allRoles.filter((role) => {
|
|
10099
|
+
const canAccess = canAccessOtherUserWithScopes({
|
|
10100
|
+
userToAccess: {
|
|
10101
|
+
...userLocation,
|
|
10102
|
+
role
|
|
10103
|
+
},
|
|
10104
|
+
user: userRequesting,
|
|
10105
|
+
scopes: acceptedScopes
|
|
10106
|
+
});
|
|
10107
|
+
return canAccess;
|
|
10108
|
+
});
|
|
10109
|
+
return availableRoles;
|
|
10110
|
+
}
|
|
10080
10111
|
|
|
10081
10112
|
// ../commons/src/events/serializers/user/deserializer.ts
|
|
10082
10113
|
function userDeserializer(serializedUserField, user2) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AAycA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -24,15 +24,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.main = main;
|
|
26
26
|
/**
|
|
27
|
-
* Codemod: Add `pending-first-certificate-issuance` flag to
|
|
27
|
+
* Codemod: Add `pending-first-certificate-issuance` flag to event configs and workqueues.
|
|
28
28
|
*
|
|
29
29
|
* Usage:
|
|
30
30
|
* ts-node -r tsconfig-paths/register src/migrations/v2.0/add-birth-certificate-issuance-flag.ts
|
|
31
31
|
*
|
|
32
32
|
* What it does:
|
|
33
|
-
* defineConfig (
|
|
33
|
+
* defineConfig (every event type — birth, death, marriage, custom, etc.):
|
|
34
34
|
* - Ensures the top-level `flags` array contains the `pending-first-certificate-issuance`
|
|
35
|
-
* flag definition
|
|
35
|
+
* flag definition. The flag's i18n `label.id` is event-specific, e.g.
|
|
36
|
+
* `event.birth.flag.pending-first-certificate-issuance`,
|
|
37
|
+
* `event.death.flag.pending-first-certificate-issuance`.
|
|
36
38
|
* - Ensures every `REGISTER` action has
|
|
37
39
|
* `flags: [{ id: 'pending-first-certificate-issuance', operation: 'add' }]`
|
|
38
40
|
* - Ensures every `PRINT_CERTIFICATE` action has
|
|
@@ -55,20 +57,27 @@ const ACTION_PROPERTY_NAME = 'action';
|
|
|
55
57
|
const FLAGS_PROPERTY_NAME = 'flags';
|
|
56
58
|
const QUERY_PROPERTY_NAME = 'query';
|
|
57
59
|
const TYPE_PROPERTY_NAME = 'type';
|
|
60
|
+
const ID_PROPERTY_NAME = 'id';
|
|
58
61
|
const CLAUSES_PROPERTY_NAME = 'clauses';
|
|
59
62
|
const ANY_OF_PROPERTY_NAME = 'anyOf';
|
|
60
63
|
const FLAG_ID = 'pending-first-certificate-issuance';
|
|
61
64
|
const REGISTER_TYPE = 'REGISTER';
|
|
62
65
|
const PRINT_CERTIFICATE_TYPE = 'PRINT_CERTIFICATE';
|
|
63
|
-
|
|
66
|
+
/**
|
|
67
|
+
* Builds the flag-definition object literal for a given event type so the i18n
|
|
68
|
+
* `label.id` is namespaced per event (e.g. `event.death.flag.…`).
|
|
69
|
+
*/
|
|
70
|
+
function flagDefinitionInitializer(eventType) {
|
|
71
|
+
return `{
|
|
64
72
|
id: '${FLAG_ID}',
|
|
65
73
|
label: {
|
|
66
|
-
id: 'event.
|
|
74
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
67
75
|
defaultMessage: 'Pending first certificate issuance',
|
|
68
76
|
description: 'Flag label for first certificate issuance'
|
|
69
77
|
},
|
|
70
78
|
requiresAction: true
|
|
71
79
|
}`;
|
|
80
|
+
}
|
|
72
81
|
// ─── Generic helpers ──────────────────────────────────────────────────────────
|
|
73
82
|
/**
|
|
74
83
|
* Returns true if the object's `type` property matches the given type name.
|
|
@@ -90,23 +99,36 @@ function isActionOfType(obj, typeName) {
|
|
|
90
99
|
return false;
|
|
91
100
|
}
|
|
92
101
|
/**
|
|
93
|
-
*
|
|
94
|
-
*
|
|
102
|
+
* Extracts the event type from a `defineConfig` root config object, using the
|
|
103
|
+
* (lower-cased) value of either the `type` or `id` property. Property name has
|
|
104
|
+
* shifted across core/country-config versions, so both are tried.
|
|
105
|
+
*
|
|
106
|
+
* Handles all known shapes:
|
|
107
|
+
* - `type: 'birth'` / `id: 'birth'`
|
|
108
|
+
* - `type: EventType.BIRTH` / `id: Event.Birth`
|
|
109
|
+
*
|
|
110
|
+
* For `PropertyAccessExpression` (enum access), the *member name* is returned
|
|
111
|
+
* lower-cased — this works for the conventional `EventType.BIRTH = 'birth'` and
|
|
112
|
+
* `Event.Birth = 'birth'` mappings used in core and country configs.
|
|
113
|
+
*
|
|
114
|
+
* Returns null when no event type can be determined.
|
|
95
115
|
*/
|
|
96
|
-
function
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
116
|
+
function getEventType(configArg) {
|
|
117
|
+
for (const propName of [TYPE_PROPERTY_NAME, ID_PROPERTY_NAME]) {
|
|
118
|
+
const prop = configArg.getProperty(propName);
|
|
119
|
+
if (!prop || !ts_morph_1.Node.isPropertyAssignment(prop))
|
|
120
|
+
continue;
|
|
121
|
+
const initializer = prop.getInitializer();
|
|
122
|
+
if (!initializer)
|
|
123
|
+
continue;
|
|
124
|
+
if (ts_morph_1.Node.isStringLiteral(initializer)) {
|
|
125
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
126
|
+
}
|
|
127
|
+
if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
|
|
128
|
+
return initializer.getName().toLowerCase();
|
|
129
|
+
}
|
|
108
130
|
}
|
|
109
|
-
return
|
|
131
|
+
return null;
|
|
110
132
|
}
|
|
111
133
|
/**
|
|
112
134
|
* Returns true if an array literal contains an object literal with `id: <id>`.
|
|
@@ -129,17 +151,19 @@ function hasElementWithId(array, id) {
|
|
|
129
151
|
}
|
|
130
152
|
// ─── defineConfig helpers ─────────────────────────────────────────────────────
|
|
131
153
|
/**
|
|
132
|
-
* Ensures the top-level `flags` array in a
|
|
133
|
-
* `pending-first-certificate-issuance` flag definition.
|
|
154
|
+
* Ensures the top-level `flags` array in a `defineConfig` contains the
|
|
155
|
+
* `pending-first-certificate-issuance` flag definition. The flag's i18n
|
|
156
|
+
* `label.id` is namespaced per event type (e.g. `event.death.flag.…`).
|
|
134
157
|
*/
|
|
135
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
158
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
159
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
136
160
|
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME);
|
|
137
161
|
if (flagsProp && ts_morph_1.Node.isPropertyAssignment(flagsProp)) {
|
|
138
162
|
const flagsInit = flagsProp.getInitializer();
|
|
139
163
|
if (flagsInit && ts_morph_1.Node.isArrayLiteralExpression(flagsInit)) {
|
|
140
164
|
if (hasElementWithId(flagsInit, FLAG_ID))
|
|
141
165
|
return false;
|
|
142
|
-
flagsInit.addElement(
|
|
166
|
+
flagsInit.addElement(initializer);
|
|
143
167
|
return true;
|
|
144
168
|
}
|
|
145
169
|
return false;
|
|
@@ -147,7 +171,7 @@ function ensureTopLevelFlagDefinition(configArg) {
|
|
|
147
171
|
// No `flags` property at all — create it
|
|
148
172
|
configArg.addPropertyAssignment({
|
|
149
173
|
name: FLAGS_PROPERTY_NAME,
|
|
150
|
-
initializer: `[\n ${
|
|
174
|
+
initializer: `[\n ${initializer}\n]`
|
|
151
175
|
});
|
|
152
176
|
return true;
|
|
153
177
|
}
|
|
@@ -174,15 +198,15 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
174
198
|
return true;
|
|
175
199
|
}
|
|
176
200
|
/**
|
|
177
|
-
* Processes a
|
|
201
|
+
* Processes a `defineConfig` object: ensures top-level flag definition,
|
|
178
202
|
* REGISTER action flags, and PRINT_CERTIFICATE action flags.
|
|
179
203
|
* Returns the number of changes made.
|
|
180
204
|
*/
|
|
181
|
-
function
|
|
205
|
+
function processConfig(configArg, eventType, relPath) {
|
|
182
206
|
let changes = 0;
|
|
183
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
207
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
184
208
|
changes++;
|
|
185
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
|
|
209
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`);
|
|
186
210
|
}
|
|
187
211
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME);
|
|
188
212
|
if (!actionsProp || !ts_morph_1.Node.isPropertyAssignment(actionsProp))
|
|
@@ -197,13 +221,13 @@ function processBirthConfig(configArg, relPath) {
|
|
|
197
221
|
if (isActionOfType(element, REGISTER_TYPE)) {
|
|
198
222
|
if (ensureActionOperationFlag(element, 'add')) {
|
|
199
223
|
changes++;
|
|
200
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`);
|
|
224
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`);
|
|
201
225
|
}
|
|
202
226
|
}
|
|
203
227
|
if (isActionOfType(element, PRINT_CERTIFICATE_TYPE)) {
|
|
204
228
|
if (ensureActionOperationFlag(element, 'remove')) {
|
|
205
229
|
changes++;
|
|
206
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
|
|
230
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
|
|
207
231
|
}
|
|
208
232
|
}
|
|
209
233
|
}
|
|
@@ -332,9 +356,10 @@ function processFile(filePath, project) {
|
|
|
332
356
|
const configArg = args[0];
|
|
333
357
|
if (!ts_morph_1.Node.isObjectLiteralExpression(configArg))
|
|
334
358
|
continue;
|
|
335
|
-
|
|
359
|
+
const eventType = getEventType(configArg);
|
|
360
|
+
if (!eventType)
|
|
336
361
|
continue;
|
|
337
|
-
totalChanges +=
|
|
362
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
338
363
|
}
|
|
339
364
|
// ── defineWorkqueues ──────────────────────────────────────────────────────
|
|
340
365
|
if (calleeName === DEFINE_WORKQUEUES_NAME) {
|
|
@@ -369,7 +394,7 @@ function processFile(filePath, project) {
|
|
|
369
394
|
function main() {
|
|
370
395
|
return __awaiter(this, void 0, void 0, function* () {
|
|
371
396
|
const srcDir = path_1.default.join(process.cwd(), 'src');
|
|
372
|
-
console.log(`Scanning for
|
|
397
|
+
console.log(`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
|
|
373
398
|
const project = new ts_morph_1.Project({
|
|
374
399
|
tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
|
|
375
400
|
skipAddingFilesFromTsConfig: false
|
|
@@ -390,7 +415,7 @@ function main() {
|
|
|
390
415
|
}
|
|
391
416
|
}
|
|
392
417
|
if (modifiedFiles.length === 0) {
|
|
393
|
-
console.log('No
|
|
418
|
+
console.log('No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
|
|
394
419
|
return;
|
|
395
420
|
}
|
|
396
421
|
console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release-v2.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;
|
|
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,mBAAmB,CAAA;AAc/C;;;;;;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,8 +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
|
-
|
|
63
|
-
exports.UPSTREAM_BRANCH = 'develop';
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release-v2.0.0';
|
|
64
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
65
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
66
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
interface DeleteInfrastructureOptions {
|
|
2
|
+
/**
|
|
3
|
+
* Top-level entries directly under `infrastructure/` to preserve. Names
|
|
4
|
+
* match against the basename of each entry (file or directory). When
|
|
5
|
+
* empty (the default), the whole `infrastructure/` directory is deleted.
|
|
6
|
+
*/
|
|
7
|
+
keep?: string[];
|
|
8
|
+
}
|
|
9
|
+
declare function main({ keep }?: DeleteInfrastructureOptions): Promise<void>;
|
|
2
10
|
export { main };
|
|
3
11
|
//# sourceMappingURL=delete-infrastructure-directory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/delete-infrastructure-directory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delete-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/delete-infrastructure-directory.ts"],"names":[],"mappings":"AAoDA,UAAU,2BAA2B;IACnC;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED,iBAAe,IAAI,CAAC,EAClB,IAAS,EACV,GAAE,2BAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,CA4FlD;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|