@opencrvs/toolkit 2.0.0-rc.1d9a00b → 2.0.0-rc.1f6b78f
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 +29 -30
- package/dist/cli.js +394 -130
- package/dist/commons/api/router.d.ts +3321 -267
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- 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/FieldConfig.d.ts +5 -0
- 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/conditionals/index.js +5 -3
- package/dist/events/index.js +111 -78
- 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 +392 -128
- 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 +43 -48
- package/dist/scopes/index.d.ts +6 -1
- package/dist/scopes/index.js +5 -3
- package/opencrvs-toolkit-2.0.0-rc.1f6b78f.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.1d9a00b.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,
|
|
@@ -607,12 +609,14 @@ var SystemScopeType = z2.enum([
|
|
|
607
609
|
"organisation.read-locations",
|
|
608
610
|
"user.read",
|
|
609
611
|
"user.create",
|
|
610
|
-
"user.edit"
|
|
612
|
+
"user.edit",
|
|
613
|
+
"user.search"
|
|
611
614
|
]);
|
|
612
615
|
var UserScopeType = SystemScopeType.extract([
|
|
613
616
|
"user.read",
|
|
614
617
|
"user.create",
|
|
615
|
-
"user.edit"
|
|
618
|
+
"user.edit",
|
|
619
|
+
"user.search"
|
|
616
620
|
]);
|
|
617
621
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
618
622
|
var UserScopeV2 = z2.discriminatedUnion("type", [
|
|
@@ -621,7 +625,7 @@ var UserScopeV2 = z2.discriminatedUnion("type", [
|
|
|
621
625
|
options: AllUserScopeOptions.optional()
|
|
622
626
|
}),
|
|
623
627
|
z2.object({
|
|
624
|
-
type: UserScopeType.extract(["user.read"]),
|
|
628
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
625
629
|
options: AccessLevelOptions.optional()
|
|
626
630
|
})
|
|
627
631
|
]);
|
|
@@ -1073,7 +1077,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
|
|
|
1073
1077
|
ShowConditional,
|
|
1074
1078
|
// Action can be shown to the user in the list but as disabled
|
|
1075
1079
|
EnableConditional
|
|
1076
|
-
])
|
|
1080
|
+
]).meta({
|
|
1081
|
+
description: "Action conditional configuration",
|
|
1082
|
+
id: "ActionConditional"
|
|
1083
|
+
});
|
|
1077
1084
|
var DisplayOnReviewConditional = z7.object({
|
|
1078
1085
|
type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
|
|
1079
1086
|
conditional: Conditional
|
|
@@ -1409,28 +1416,20 @@ function schemaPriority(schema) {
|
|
|
1409
1416
|
return idx === -1 ? 9999 : idx;
|
|
1410
1417
|
}
|
|
1411
1418
|
function safeUnion(schemas) {
|
|
1419
|
+
const sortedSchemas = [...schemas].sort(
|
|
1420
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
1421
|
+
);
|
|
1412
1422
|
return z12.any().superRefine((val, ctx) => {
|
|
1413
|
-
const
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
|
|
1417
|
-
if (successful.length === 0) {
|
|
1418
|
-
ctx.addIssue({
|
|
1419
|
-
code: "invalid_type",
|
|
1420
|
-
expected: "custom",
|
|
1421
|
-
message: "Value does not match any schema"
|
|
1422
|
-
});
|
|
1423
|
-
return;
|
|
1424
|
-
}
|
|
1425
|
-
successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
|
|
1426
|
-
const best = successful[0];
|
|
1427
|
-
if (!best.safeParse(val).success) {
|
|
1428
|
-
ctx.addIssue({
|
|
1429
|
-
expected: "custom",
|
|
1430
|
-
code: "invalid_type",
|
|
1431
|
-
message: "Value did not match the best schema"
|
|
1432
|
-
});
|
|
1423
|
+
for (const schema of sortedSchemas) {
|
|
1424
|
+
if (schema.safeParse(val).success) {
|
|
1425
|
+
return;
|
|
1426
|
+
}
|
|
1433
1427
|
}
|
|
1428
|
+
ctx.addIssue({
|
|
1429
|
+
code: "invalid_type",
|
|
1430
|
+
expected: "custom",
|
|
1431
|
+
message: "Value does not match any schema"
|
|
1432
|
+
});
|
|
1434
1433
|
}).meta({
|
|
1435
1434
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1436
1435
|
});
|
|
@@ -1740,6 +1739,9 @@ var FlagConfig = z15.object({
|
|
|
1740
1739
|
"Indicates if this flag expects an action to be performed to be cleared."
|
|
1741
1740
|
),
|
|
1742
1741
|
label: TranslationConfig.describe("Human readable label of the flag.")
|
|
1742
|
+
}).meta({
|
|
1743
|
+
description: "Flag configuration",
|
|
1744
|
+
id: "FlagConfig"
|
|
1743
1745
|
});
|
|
1744
1746
|
var ActionFlagConfig = z15.object({
|
|
1745
1747
|
id: Flag,
|
|
@@ -1747,6 +1749,9 @@ var ActionFlagConfig = z15.object({
|
|
|
1747
1749
|
conditional: Conditional.optional().describe(
|
|
1748
1750
|
"When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
|
|
1749
1751
|
)
|
|
1752
|
+
}).meta({
|
|
1753
|
+
description: "Action flag configuration",
|
|
1754
|
+
id: "ActionFlagConfig"
|
|
1750
1755
|
});
|
|
1751
1756
|
|
|
1752
1757
|
// ../commons/src/events/EventMetadata.ts
|
|
@@ -1768,8 +1773,7 @@ var ActionCreationMetadata = z16.object({
|
|
|
1768
1773
|
),
|
|
1769
1774
|
createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
|
|
1770
1775
|
acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
|
|
1771
|
-
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1772
|
-
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.")
|
|
1773
1777
|
});
|
|
1774
1778
|
var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
1775
1779
|
registrationNumber: z16.string().describe(
|
|
@@ -1797,9 +1801,6 @@ var EventMetadata = z16.object({
|
|
|
1797
1801
|
createdAtLocation: UUID.nullish().describe(
|
|
1798
1802
|
"Location of the user who created the event."
|
|
1799
1803
|
),
|
|
1800
|
-
createdBySignature: DocumentPath.nullish().describe(
|
|
1801
|
-
"Signature of the user who created the event."
|
|
1802
|
-
),
|
|
1803
1804
|
updatedAtLocation: UUID.nullish().describe(
|
|
1804
1805
|
"Location of the user who last changed the status."
|
|
1805
1806
|
),
|
|
@@ -2174,7 +2175,7 @@ var FieldId = import_v43.default.string().superRefine((val, ctx) => {
|
|
|
2174
2175
|
}
|
|
2175
2176
|
}).describe("Unique identifier for the field");
|
|
2176
2177
|
var FieldReference = import_v43.default.object({
|
|
2177
|
-
$$field: FieldId,
|
|
2178
|
+
$$field: FieldId.describe("Id of the field to reference"),
|
|
2178
2179
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2179
2180
|
'If the FieldValue is an object, subfield can be used to refer to e.g. `["foo", "bar"]` in `{ foo: { bar: 3 } }`'
|
|
2180
2181
|
)
|
|
@@ -2887,10 +2888,10 @@ var VerificationPageConfig = FormPageConfig.extend({
|
|
|
2887
2888
|
type: z21.literal(PageTypes.enum.VERIFICATION),
|
|
2888
2889
|
actions: VerificationActionConfig
|
|
2889
2890
|
});
|
|
2890
|
-
var PageConfig = z21.discriminatedUnion("type", [
|
|
2891
|
-
|
|
2892
|
-
|
|
2893
|
-
|
|
2891
|
+
var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
|
|
2892
|
+
description: "Page configuration",
|
|
2893
|
+
id: "PageConfig"
|
|
2894
|
+
});
|
|
2894
2895
|
|
|
2895
2896
|
// ../commons/src/events/FormConfig.ts
|
|
2896
2897
|
var DeclarationFormConfig = z22.object({
|
|
@@ -3799,6 +3800,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3799
3800
|
function isAgeValue(value) {
|
|
3800
3801
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3801
3802
|
}
|
|
3803
|
+
function mergeWithBaseFormState(values, context) {
|
|
3804
|
+
return { ...context.baseFormState, ...values };
|
|
3805
|
+
}
|
|
3802
3806
|
function validate(schema, data) {
|
|
3803
3807
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3804
3808
|
if ("$form" in data) {
|
|
@@ -3837,7 +3841,7 @@ function isOnline() {
|
|
|
3837
3841
|
}
|
|
3838
3842
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3839
3843
|
return validate(conditional, {
|
|
3840
|
-
$form: values,
|
|
3844
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3841
3845
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3842
3846
|
$online: isOnline(),
|
|
3843
3847
|
$user: context.user,
|
|
@@ -3866,7 +3870,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3866
3870
|
return true;
|
|
3867
3871
|
}
|
|
3868
3872
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3869
|
-
$form: form,
|
|
3873
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3870
3874
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3871
3875
|
$online: isOnline(),
|
|
3872
3876
|
$user: context.user,
|
|
@@ -4058,7 +4062,7 @@ function runFieldValidations({
|
|
|
4058
4062
|
return [];
|
|
4059
4063
|
}
|
|
4060
4064
|
const conditionalParameters = {
|
|
4061
|
-
$form: form,
|
|
4065
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4062
4066
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4063
4067
|
/**
|
|
4064
4068
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4302,17 +4306,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4302
4306
|
}
|
|
4303
4307
|
return isConditionMet(page.conditional, formValues, context);
|
|
4304
4308
|
}
|
|
4305
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4309
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4306
4310
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4307
4311
|
function fn(prevVisibilityContext) {
|
|
4308
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4309
4312
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4310
4313
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4311
4314
|
if (!fieldConfig.length) {
|
|
4312
4315
|
return false;
|
|
4313
4316
|
}
|
|
4314
4317
|
const isHidden = fieldConfig.every(
|
|
4315
|
-
(f) => !isFieldVisible(f,
|
|
4318
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4316
4319
|
);
|
|
4317
4320
|
if (!isHidden) {
|
|
4318
4321
|
return false;
|
|
@@ -4330,7 +4333,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4330
4333
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4331
4334
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4332
4335
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4333
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4336
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4334
4337
|
});
|
|
4335
4338
|
return omitHiddenFields(
|
|
4336
4339
|
visibleFields,
|
|
@@ -4377,13 +4380,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4377
4380
|
}
|
|
4378
4381
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4379
4382
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4380
|
-
return omitHiddenFields(
|
|
4381
|
-
|
|
4382
|
-
|
|
4383
|
-
|
|
4384
|
-
false,
|
|
4385
|
-
declaration
|
|
4386
|
-
);
|
|
4383
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4384
|
+
...context,
|
|
4385
|
+
baseFormState: declaration
|
|
4386
|
+
});
|
|
4387
4387
|
}
|
|
4388
4388
|
function deepMerge(currentDocument, actionDocument) {
|
|
4389
4389
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5372,7 +5372,7 @@ var _EventConfigBase = z33.object({
|
|
|
5372
5372
|
),
|
|
5373
5373
|
label: TranslationConfig.describe("Human-readable label for the event type."),
|
|
5374
5374
|
actions: z33.array(ActionConfig).describe(
|
|
5375
|
-
"Configuration of
|
|
5375
|
+
"Configuration of core and custom actions associated with the event."
|
|
5376
5376
|
),
|
|
5377
5377
|
actionOrder: z33.array(z33.string()).optional().describe(
|
|
5378
5378
|
"Order of actions in the action menu. Use either the action type for core actions or the customActionType for custom actions."
|
|
@@ -5384,7 +5384,7 @@ var _EventConfigBase = z33.object({
|
|
|
5384
5384
|
"Configuration of fields available in the advanced search feature."
|
|
5385
5385
|
),
|
|
5386
5386
|
flags: z33.array(FlagConfig).optional().default([]).describe(
|
|
5387
|
-
"Configuration of flags associated with the actions of this event type."
|
|
5387
|
+
"Configuration of custom flags associated with the actions of this event type."
|
|
5388
5388
|
),
|
|
5389
5389
|
analytics: z33.boolean().optional().default(true).describe(
|
|
5390
5390
|
"Indicates whether the records of this event type are included in analytics"
|
|
@@ -5823,18 +5823,11 @@ var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
|
|
|
5823
5823
|
query: true,
|
|
5824
5824
|
columns: true
|
|
5825
5825
|
});
|
|
5826
|
-
var WorkqueueConfigInput =
|
|
5827
|
-
|
|
5828
|
-
|
|
5829
|
-
|
|
5830
|
-
|
|
5831
|
-
query: CountryConfigQueryInputType,
|
|
5832
|
-
action: z37.object({ type: WorkqueueActionType }).optional().describe(
|
|
5833
|
-
"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."
|
|
5834
|
-
),
|
|
5835
|
-
columns: z37.array(WorkqueueColumn).default(mandatoryColumns),
|
|
5836
|
-
icon: AvailableIcons,
|
|
5837
|
-
emptyMessage: TranslationConfig.optional()
|
|
5826
|
+
var WorkqueueConfigInput = WorkqueueConfig.extend({
|
|
5827
|
+
query: CountryConfigQueryInputType
|
|
5828
|
+
}).meta({
|
|
5829
|
+
description: "Workqueue configuration",
|
|
5830
|
+
id: "WorkqueueConfig"
|
|
5838
5831
|
});
|
|
5839
5832
|
function defineWorkqueue(workqueueInput) {
|
|
5840
5833
|
const queryInput = workqueueInput.query;
|
|
@@ -5895,6 +5888,9 @@ var BaseActionInput = z38.object({
|
|
|
5895
5888
|
originalActionId: UUID.optional(),
|
|
5896
5889
|
// should not be part of base action.
|
|
5897
5890
|
keepAssignment: z38.boolean().optional(),
|
|
5891
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5892
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5893
|
+
waitFor: z38.boolean().optional(),
|
|
5898
5894
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5899
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.
|
|
5900
5896
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -6148,7 +6144,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
|
|
|
6148
6144
|
createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
|
|
6149
6145
|
acceptedAt: acceptAction.createdAt,
|
|
6150
6146
|
createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
|
|
6151
|
-
createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
|
|
6152
6147
|
registrationNumber
|
|
6153
6148
|
};
|
|
6154
6149
|
}
|
|
@@ -6362,17 +6357,6 @@ function getAssignedUserFromActions(actions) {
|
|
|
6362
6357
|
return user2;
|
|
6363
6358
|
}, null);
|
|
6364
6359
|
}
|
|
6365
|
-
function getAssignedUserSignatureFromActions(actions) {
|
|
6366
|
-
return actions.reduce((signature, action) => {
|
|
6367
|
-
if (action.type === ActionType.ASSIGN) {
|
|
6368
|
-
return action.createdBySignature || null;
|
|
6369
|
-
}
|
|
6370
|
-
if (action.type === ActionType.UNASSIGN) {
|
|
6371
|
-
return null;
|
|
6372
|
-
}
|
|
6373
|
-
return signature;
|
|
6374
|
-
}, null);
|
|
6375
|
-
}
|
|
6376
6360
|
function deepDropNulls(obj) {
|
|
6377
6361
|
if (Array.isArray(obj)) {
|
|
6378
6362
|
return obj.map(deepDropNulls);
|
|
@@ -6468,10 +6452,8 @@ function getCurrentEventState(event2, config) {
|
|
|
6468
6452
|
createdBy: creationAction.createdBy,
|
|
6469
6453
|
createdByUserType: creationAction.createdByUserType,
|
|
6470
6454
|
createdAtLocation: creationAction.createdAtLocation,
|
|
6471
|
-
createdBySignature: creationAction.createdBySignature,
|
|
6472
6455
|
updatedAt: acceptedActionMetadata.createdAt,
|
|
6473
6456
|
assignedTo: getAssignedUserFromActions(acceptedActions),
|
|
6474
|
-
assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
|
|
6475
6457
|
updatedBy: requestActionMetadata.createdBy,
|
|
6476
6458
|
updatedAtLocation: requestActionMetadata.createdAtLocation,
|
|
6477
6459
|
declaration,
|
|
@@ -9730,7 +9712,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
|
|
|
9730
9712
|
createdBy: overrides.createdBy ?? generateUuid(rng),
|
|
9731
9713
|
createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
|
|
9732
9714
|
updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
|
|
9733
|
-
createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
|
|
9734
9715
|
updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
|
|
9735
9716
|
assignedTo: overrides.assignedTo ?? null,
|
|
9736
9717
|
updatedBy: overrides.updatedBy ?? generateUuid(rng),
|
|
@@ -10001,6 +9982,39 @@ function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
|
|
|
10001
9982
|
(scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
|
|
10002
9983
|
);
|
|
10003
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
|
+
}
|
|
10004
10018
|
|
|
10005
10019
|
// ../commons/src/events/scopes.ts
|
|
10006
10020
|
var ACTION_SCOPE_MAP = {
|
|
@@ -10075,6 +10089,25 @@ function isActionInScope({
|
|
|
10075
10089
|
);
|
|
10076
10090
|
return canAccess;
|
|
10077
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
|
+
}
|
|
10078
10111
|
|
|
10079
10112
|
// ../commons/src/events/serializers/user/deserializer.ts
|
|
10080
10113
|
function userDeserializer(serializedUserField, user2) {
|
|
@@ -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"}
|
|
@@ -27,20 +27,28 @@ exports.main = main;
|
|
|
27
27
|
* via Docker Swarm. In that case the `infrastructure/` directory shipped
|
|
28
28
|
* with opencrvs-countryconfig is no longer needed and can be removed.
|
|
29
29
|
*
|
|
30
|
+
* Some non-Swarm deployments still need a small subset of
|
|
31
|
+
* `infrastructure/` (e.g. `postgres/` and `metabase/`). Pass `keep` to
|
|
32
|
+
* preserve those top-level subdirectories — everything else under
|
|
33
|
+
* `infrastructure/` is deleted, and the kept subdirectories can then be
|
|
34
|
+
* refreshed from upstream by `merge-infrastructure-directory.ts` with the
|
|
35
|
+
* matching `subdirs` option.
|
|
36
|
+
*
|
|
30
37
|
* Usage:
|
|
31
38
|
* ts-node -r tsconfig-paths/register src/migrations/v2.0/delete-infrastructure-directory.ts
|
|
32
39
|
*
|
|
33
40
|
* What it does:
|
|
34
41
|
* 1. Stages deletion of all tracked files under `infrastructure/` via
|
|
35
|
-
* `git rm -rf --ignore-unmatch --
|
|
36
|
-
*
|
|
42
|
+
* `git rm -rf --ignore-unmatch -- <path>`. This both removes the
|
|
43
|
+
* files from the working tree and records the deletion in the
|
|
37
44
|
* index, so it shows up in the upgrade commit alongside the other
|
|
38
|
-
* codemod changes.
|
|
45
|
+
* codemod changes. When `keep` is provided, deletion is scoped to
|
|
46
|
+
* the top-level entries that are NOT in `keep`.
|
|
39
47
|
* 2. Cleans up any untracked files / empty directory that `git rm` left
|
|
40
|
-
* behind, so the
|
|
48
|
+
* behind, so the deleted paths are fully gone from the working tree.
|
|
41
49
|
*
|
|
42
50
|
* Caveats:
|
|
43
|
-
* - Destructive: any local edits to
|
|
51
|
+
* - Destructive: any local edits to deleted paths are lost. Run on a
|
|
44
52
|
* clean working tree (or after committing your local changes).
|
|
45
53
|
* - If `infrastructure/` doesn't exist, this codemod is a no-op.
|
|
46
54
|
* - Requires git to be installed and the country config working directory
|
|
@@ -51,27 +59,65 @@ const path_1 = require("path");
|
|
|
51
59
|
const checkout_upstream_files_1 = require("./checkout-upstream-files");
|
|
52
60
|
const INFRASTRUCTURE_DIR = 'infrastructure';
|
|
53
61
|
function main() {
|
|
54
|
-
return __awaiter(this,
|
|
62
|
+
return __awaiter(this, arguments, void 0, function* ({ keep = [] } = {}) {
|
|
55
63
|
const fullPath = (0, path_1.join)(process.cwd(), INFRASTRUCTURE_DIR);
|
|
56
64
|
if (!(0, fs_1.existsSync)(fullPath)) {
|
|
57
65
|
console.log(`'${INFRASTRUCTURE_DIR}/' not found in ${process.cwd()} — nothing to delete.`);
|
|
58
66
|
return;
|
|
59
67
|
}
|
|
60
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
|
|
61
68
|
(0, checkout_upstream_files_1.assertIsGitRepo)();
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
69
|
+
// ─── Whole-directory delete (legacy behavior) ────────────────────────
|
|
70
|
+
if (keep.length === 0) {
|
|
71
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
|
|
72
|
+
// `git rm -rf --ignore-unmatch` removes tracked files (working tree +
|
|
73
|
+
// index) and is a no-op for paths with no tracked entries, so it's
|
|
74
|
+
// safe to run even when `infrastructure/` exists only as untracked
|
|
75
|
+
// files.
|
|
76
|
+
(0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', `${INFRASTRUCTURE_DIR}/`], {
|
|
77
|
+
silent: true
|
|
78
|
+
});
|
|
79
|
+
console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR}/'.`);
|
|
80
|
+
// `git rm` leaves untracked files (and any now-empty directory) on
|
|
81
|
+
// disk; remove whatever's left so the path is fully gone.
|
|
82
|
+
if ((0, fs_1.existsSync)(fullPath)) {
|
|
83
|
+
(0, fs_1.rmSync)(fullPath, { recursive: true, force: true });
|
|
84
|
+
console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR}/'.`);
|
|
85
|
+
}
|
|
86
|
+
console.log(`\n Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
// ─── Selective delete: keep listed top-level entries ─────────────────
|
|
90
|
+
const keepSet = new Set(keep);
|
|
91
|
+
console.log(`Deleting contents of '${INFRASTRUCTURE_DIR}/' except: ${[...keepSet]
|
|
92
|
+
.map((name) => `'${name}'`)
|
|
93
|
+
.join(', ')}\n`);
|
|
94
|
+
const topLevelEntries = (0, fs_1.readdirSync)(fullPath, { withFileTypes: true });
|
|
95
|
+
let deleted = 0;
|
|
96
|
+
for (const entry of topLevelEntries) {
|
|
97
|
+
if (keepSet.has(entry.name)) {
|
|
98
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR}/${entry.name}'.`);
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
// Append a trailing slash for directories so git treats it as a tree
|
|
102
|
+
// pathspec (matches the recursive behavior of `git rm -rf`).
|
|
103
|
+
const relPath = `${INFRASTRUCTURE_DIR}/${entry.name}${entry.isDirectory() ? '/' : ''}`;
|
|
104
|
+
(0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', relPath], { silent: true });
|
|
105
|
+
const fullEntryPath = (0, path_1.join)(fullPath, entry.name);
|
|
106
|
+
if ((0, fs_1.existsSync)(fullEntryPath)) {
|
|
107
|
+
(0, fs_1.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
108
|
+
}
|
|
109
|
+
console.log(` Deleted '${relPath}'.`);
|
|
110
|
+
deleted++;
|
|
111
|
+
}
|
|
112
|
+
// Note any requested keeps that weren't actually present, so the dev
|
|
113
|
+
// notices typos / missing directories.
|
|
114
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
115
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
116
|
+
if (missingKeeps.length > 0) {
|
|
117
|
+
console.warn(` [warn] Requested to keep ${missingKeeps
|
|
118
|
+
.map((n) => `'${n}'`)
|
|
119
|
+
.join(', ')} but they don't exist under '${INFRASTRUCTURE_DIR}/'.`);
|
|
74
120
|
}
|
|
75
|
-
console.log(`\n Done. Review the staged
|
|
121
|
+
console.log(`\n Done. Deleted ${deleted} top-level entr${deleted === 1 ? 'y' : 'ies'}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
|
|
76
122
|
});
|
|
77
123
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-accept-requested-registration-function-type.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/fix-accept-requested-registration-function-type.ts"],"names":[],"mappings":"AAuFA,iBAAe,IAAI,kBA6ClB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|