@opencrvs/toolkit 2.0.0-rc.622827a → 2.0.0-rc.63084a1
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 +18 -28
- package/dist/cli.js +300 -125
- package/dist/commons/api/router.d.ts +2981 -266
- 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/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 +89 -58
- 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/index.d.ts +5 -3
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +300 -125
- 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 +21 -28
- package/dist/scopes/index.d.ts +6 -1
- package/dist/scopes/index.js +5 -3
- package/opencrvs-toolkit-2.0.0-rc.63084a1.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.622827a.tgz +0 -0
|
@@ -9,7 +9,6 @@ import { UUID } from '../../uuid';
|
|
|
9
9
|
import { DocumentPath } from '../../documents';
|
|
10
10
|
export declare function getStatusFromActions(actions: Array<Action>): "CREATED" | "NOTIFIED" | "DECLARED" | "REGISTERED" | "ARCHIVED";
|
|
11
11
|
export declare function getAssignedUserFromActions(actions: Array<ActionDocument>): string | null;
|
|
12
|
-
export declare function getAssignedUserSignatureFromActions(actions: Array<ActionDocument>): string | null;
|
|
13
12
|
type NonNullableDeep<T> = T extends [unknown, ...unknown[]] ? {
|
|
14
13
|
[K in keyof T]: NonNullableDeep<NonNullable<T[K]>>;
|
|
15
14
|
} : T extends UUID ? T : T extends DocumentPath ? T : T extends string ? NonNullable<T> : T extends (infer U)[] ? NonNullableDeep<U>[] : T extends object ? {
|
|
@@ -73,7 +72,6 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
|
|
|
73
72
|
createdAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
74
73
|
createdByUserType?: "user" | "system" | null | undefined;
|
|
75
74
|
createdByRole?: string | undefined;
|
|
76
|
-
createdBySignature?: string | null | undefined;
|
|
77
75
|
} | null | undefined;
|
|
78
76
|
REGISTERED?: {
|
|
79
77
|
createdAt: string;
|
|
@@ -83,7 +81,6 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
|
|
|
83
81
|
createdAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
84
82
|
createdByUserType?: "user" | "system" | null | undefined;
|
|
85
83
|
createdByRole?: string | undefined;
|
|
86
|
-
createdBySignature?: string | null | undefined;
|
|
87
84
|
} | null | undefined;
|
|
88
85
|
};
|
|
89
86
|
createdAt: string;
|
|
@@ -101,7 +98,6 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
|
|
|
101
98
|
createdByUserType?: "user" | "system" | null | undefined;
|
|
102
99
|
updatedByUserRole?: string | null | undefined;
|
|
103
100
|
createdAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
104
|
-
createdBySignature?: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
|
|
105
101
|
updatedAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
106
102
|
assignedTo?: string | null | undefined;
|
|
107
103
|
updatedBy?: string | null | undefined;
|
|
@@ -312,7 +312,6 @@ export declare function getLegalStatuses(actions: Action[]): {
|
|
|
312
312
|
createdAtLocation: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
313
313
|
acceptedAt: string;
|
|
314
314
|
createdByRole: string | undefined;
|
|
315
|
-
createdBySignature: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
|
|
316
315
|
registrationNumber: string | null | undefined;
|
|
317
316
|
} | null;
|
|
318
317
|
REGISTERED: {
|
|
@@ -322,7 +321,6 @@ export declare function getLegalStatuses(actions: Action[]): {
|
|
|
322
321
|
createdAtLocation: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
323
322
|
acceptedAt: string;
|
|
324
323
|
createdByRole: string | undefined;
|
|
325
|
-
createdBySignature: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
|
|
326
324
|
registrationNumber: string | null | undefined;
|
|
327
325
|
} | null;
|
|
328
326
|
};
|
|
@@ -131,7 +131,7 @@ export declare function isPageVisible(page: PageConfig, formValues: ActionUpdate
|
|
|
131
131
|
* * @param validatorContext - custom validation context
|
|
132
132
|
* @returns {Partial<T>} A new object containing only the values for visible fields
|
|
133
133
|
*/
|
|
134
|
-
export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean
|
|
134
|
+
export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<T>;
|
|
135
135
|
export declare function omitHiddenPaginatedFields<T extends EventState | ActionUpdate>(formConfig: FormConfig, values: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<Partial<T>>;
|
|
136
136
|
/**
|
|
137
137
|
*
|
|
@@ -298,12 +298,14 @@ var SystemScopeType = z6.enum([
|
|
|
298
298
|
"organisation.read-locations",
|
|
299
299
|
"user.read",
|
|
300
300
|
"user.create",
|
|
301
|
-
"user.edit"
|
|
301
|
+
"user.edit",
|
|
302
|
+
"user.search"
|
|
302
303
|
]);
|
|
303
304
|
var UserScopeType = SystemScopeType.extract([
|
|
304
305
|
"user.read",
|
|
305
306
|
"user.create",
|
|
306
|
-
"user.edit"
|
|
307
|
+
"user.edit",
|
|
308
|
+
"user.search"
|
|
307
309
|
]);
|
|
308
310
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
309
311
|
var UserScopeV2 = z6.discriminatedUnion("type", [
|
|
@@ -312,7 +314,7 @@ var UserScopeV2 = z6.discriminatedUnion("type", [
|
|
|
312
314
|
options: AllUserScopeOptions.optional()
|
|
313
315
|
}),
|
|
314
316
|
z6.object({
|
|
315
|
-
type: UserScopeType.extract(["user.read"]),
|
|
317
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
316
318
|
options: AccessLevelOptions.optional()
|
|
317
319
|
})
|
|
318
320
|
]);
|
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
|
]);
|
|
@@ -1409,28 +1413,20 @@ function schemaPriority(schema) {
|
|
|
1409
1413
|
return idx === -1 ? 9999 : idx;
|
|
1410
1414
|
}
|
|
1411
1415
|
function safeUnion(schemas) {
|
|
1416
|
+
const sortedSchemas = [...schemas].sort(
|
|
1417
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
1418
|
+
);
|
|
1412
1419
|
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
|
-
});
|
|
1420
|
+
for (const schema of sortedSchemas) {
|
|
1421
|
+
if (schema.safeParse(val).success) {
|
|
1422
|
+
return;
|
|
1423
|
+
}
|
|
1433
1424
|
}
|
|
1425
|
+
ctx.addIssue({
|
|
1426
|
+
code: "invalid_type",
|
|
1427
|
+
expected: "custom",
|
|
1428
|
+
message: "Value does not match any schema"
|
|
1429
|
+
});
|
|
1434
1430
|
}).meta({
|
|
1435
1431
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1436
1432
|
});
|
|
@@ -1768,8 +1764,7 @@ var ActionCreationMetadata = z16.object({
|
|
|
1768
1764
|
),
|
|
1769
1765
|
createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
|
|
1770
1766
|
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.")
|
|
1767
|
+
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1773
1768
|
});
|
|
1774
1769
|
var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
1775
1770
|
registrationNumber: z16.string().describe(
|
|
@@ -1797,9 +1792,6 @@ var EventMetadata = z16.object({
|
|
|
1797
1792
|
createdAtLocation: UUID.nullish().describe(
|
|
1798
1793
|
"Location of the user who created the event."
|
|
1799
1794
|
),
|
|
1800
|
-
createdBySignature: DocumentPath.nullish().describe(
|
|
1801
|
-
"Signature of the user who created the event."
|
|
1802
|
-
),
|
|
1803
1795
|
updatedAtLocation: UUID.nullish().describe(
|
|
1804
1796
|
"Location of the user who last changed the status."
|
|
1805
1797
|
),
|
|
@@ -3799,6 +3791,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3799
3791
|
function isAgeValue(value) {
|
|
3800
3792
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3801
3793
|
}
|
|
3794
|
+
function mergeWithBaseFormState(values, context) {
|
|
3795
|
+
return { ...context.baseFormState, ...values };
|
|
3796
|
+
}
|
|
3802
3797
|
function validate(schema, data) {
|
|
3803
3798
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3804
3799
|
if ("$form" in data) {
|
|
@@ -3837,7 +3832,7 @@ function isOnline() {
|
|
|
3837
3832
|
}
|
|
3838
3833
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3839
3834
|
return validate(conditional, {
|
|
3840
|
-
$form: values,
|
|
3835
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3841
3836
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3842
3837
|
$online: isOnline(),
|
|
3843
3838
|
$user: context.user,
|
|
@@ -3866,7 +3861,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3866
3861
|
return true;
|
|
3867
3862
|
}
|
|
3868
3863
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3869
|
-
$form: form,
|
|
3864
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3870
3865
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3871
3866
|
$online: isOnline(),
|
|
3872
3867
|
$user: context.user,
|
|
@@ -4058,7 +4053,7 @@ function runFieldValidations({
|
|
|
4058
4053
|
return [];
|
|
4059
4054
|
}
|
|
4060
4055
|
const conditionalParameters = {
|
|
4061
|
-
$form: form,
|
|
4056
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4062
4057
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4063
4058
|
/**
|
|
4064
4059
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4302,17 +4297,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4302
4297
|
}
|
|
4303
4298
|
return isConditionMet(page.conditional, formValues, context);
|
|
4304
4299
|
}
|
|
4305
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4300
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4306
4301
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4307
4302
|
function fn(prevVisibilityContext) {
|
|
4308
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4309
4303
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4310
4304
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4311
4305
|
if (!fieldConfig.length) {
|
|
4312
4306
|
return false;
|
|
4313
4307
|
}
|
|
4314
4308
|
const isHidden = fieldConfig.every(
|
|
4315
|
-
(f) => !isFieldVisible(f,
|
|
4309
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4316
4310
|
);
|
|
4317
4311
|
if (!isHidden) {
|
|
4318
4312
|
return false;
|
|
@@ -4330,7 +4324,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4330
4324
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4331
4325
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4332
4326
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4333
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4327
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4334
4328
|
});
|
|
4335
4329
|
return omitHiddenFields(
|
|
4336
4330
|
visibleFields,
|
|
@@ -4377,13 +4371,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4377
4371
|
}
|
|
4378
4372
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4379
4373
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4380
|
-
return omitHiddenFields(
|
|
4381
|
-
|
|
4382
|
-
|
|
4383
|
-
|
|
4384
|
-
false,
|
|
4385
|
-
declaration
|
|
4386
|
-
);
|
|
4374
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4375
|
+
...context,
|
|
4376
|
+
baseFormState: declaration
|
|
4377
|
+
});
|
|
4387
4378
|
}
|
|
4388
4379
|
function deepMerge(currentDocument, actionDocument) {
|
|
4389
4380
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5895,6 +5886,9 @@ var BaseActionInput = z38.object({
|
|
|
5895
5886
|
originalActionId: UUID.optional(),
|
|
5896
5887
|
// should not be part of base action.
|
|
5897
5888
|
keepAssignment: z38.boolean().optional(),
|
|
5889
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5890
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5891
|
+
waitFor: z38.boolean().optional(),
|
|
5898
5892
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5899
5893
|
// @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
5894
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -6148,7 +6142,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
|
|
|
6148
6142
|
createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
|
|
6149
6143
|
acceptedAt: acceptAction.createdAt,
|
|
6150
6144
|
createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
|
|
6151
|
-
createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
|
|
6152
6145
|
registrationNumber
|
|
6153
6146
|
};
|
|
6154
6147
|
}
|
|
@@ -6362,17 +6355,6 @@ function getAssignedUserFromActions(actions) {
|
|
|
6362
6355
|
return user2;
|
|
6363
6356
|
}, null);
|
|
6364
6357
|
}
|
|
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
6358
|
function deepDropNulls(obj) {
|
|
6377
6359
|
if (Array.isArray(obj)) {
|
|
6378
6360
|
return obj.map(deepDropNulls);
|
|
@@ -6468,10 +6450,8 @@ function getCurrentEventState(event2, config) {
|
|
|
6468
6450
|
createdBy: creationAction.createdBy,
|
|
6469
6451
|
createdByUserType: creationAction.createdByUserType,
|
|
6470
6452
|
createdAtLocation: creationAction.createdAtLocation,
|
|
6471
|
-
createdBySignature: creationAction.createdBySignature,
|
|
6472
6453
|
updatedAt: acceptedActionMetadata.createdAt,
|
|
6473
6454
|
assignedTo: getAssignedUserFromActions(acceptedActions),
|
|
6474
|
-
assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
|
|
6475
6455
|
updatedBy: requestActionMetadata.createdBy,
|
|
6476
6456
|
updatedAtLocation: requestActionMetadata.createdAtLocation,
|
|
6477
6457
|
declaration,
|
|
@@ -9730,7 +9710,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
|
|
|
9730
9710
|
createdBy: overrides.createdBy ?? generateUuid(rng),
|
|
9731
9711
|
createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
|
|
9732
9712
|
updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
|
|
9733
|
-
createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
|
|
9734
9713
|
updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
|
|
9735
9714
|
assignedTo: overrides.assignedTo ?? null,
|
|
9736
9715
|
updatedBy: overrides.updatedBy ?? generateUuid(rng),
|
|
@@ -10001,6 +9980,39 @@ function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
|
|
|
10001
9980
|
(scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
|
|
10002
9981
|
);
|
|
10003
9982
|
}
|
|
9983
|
+
function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
|
|
9984
|
+
const collectedLocations = [];
|
|
9985
|
+
const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
|
|
9986
|
+
let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
|
|
9987
|
+
while (current) {
|
|
9988
|
+
collectedLocations.push(current);
|
|
9989
|
+
if (!current.parentId) {
|
|
9990
|
+
break;
|
|
9991
|
+
}
|
|
9992
|
+
const parentId = current.parentId;
|
|
9993
|
+
current = administrativeAreas.get(parentId);
|
|
9994
|
+
}
|
|
9995
|
+
return collectedLocations;
|
|
9996
|
+
}
|
|
9997
|
+
function getLocationHierarchy(selectedId, context) {
|
|
9998
|
+
const { administrativeAreas, locations } = context;
|
|
9999
|
+
const loc = locations.get(selectedId);
|
|
10000
|
+
if (loc) {
|
|
10001
|
+
if (loc.administrativeAreaId) {
|
|
10002
|
+
const hierarchy2 = getAdministrativeAreaHierarchy(
|
|
10003
|
+
loc.administrativeAreaId,
|
|
10004
|
+
administrativeAreas
|
|
10005
|
+
);
|
|
10006
|
+
return [...hierarchy2.reverse().map((area) => area.id), loc.id];
|
|
10007
|
+
}
|
|
10008
|
+
return [loc.id];
|
|
10009
|
+
}
|
|
10010
|
+
const hierarchy = getAdministrativeAreaHierarchy(
|
|
10011
|
+
selectedId,
|
|
10012
|
+
administrativeAreas
|
|
10013
|
+
);
|
|
10014
|
+
return hierarchy.reverse().map((area) => area.id);
|
|
10015
|
+
}
|
|
10004
10016
|
|
|
10005
10017
|
// ../commons/src/events/scopes.ts
|
|
10006
10018
|
var ACTION_SCOPE_MAP = {
|
|
@@ -10075,6 +10087,25 @@ function isActionInScope({
|
|
|
10075
10087
|
);
|
|
10076
10088
|
return canAccess;
|
|
10077
10089
|
}
|
|
10090
|
+
function getAvailableRolesForUserUpdatePayload({
|
|
10091
|
+
allRoles,
|
|
10092
|
+
userLocation,
|
|
10093
|
+
acceptedScopes,
|
|
10094
|
+
userRequesting
|
|
10095
|
+
}) {
|
|
10096
|
+
const availableRoles = allRoles.filter((role) => {
|
|
10097
|
+
const canAccess = canAccessOtherUserWithScopes({
|
|
10098
|
+
userToAccess: {
|
|
10099
|
+
...userLocation,
|
|
10100
|
+
role
|
|
10101
|
+
},
|
|
10102
|
+
user: userRequesting,
|
|
10103
|
+
scopes: acceptedScopes
|
|
10104
|
+
});
|
|
10105
|
+
return canAccess;
|
|
10106
|
+
});
|
|
10107
|
+
return availableRoles;
|
|
10108
|
+
}
|
|
10078
10109
|
|
|
10079
10110
|
// ../commons/src/events/serializers/user/deserializer.ts
|
|
10080
10111
|
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
|
}
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
* directory.
|
|
4
4
|
*
|
|
5
5
|
* @param dockerSwarm - When true, the local `infrastructure/` directory is
|
|
6
|
-
* merged with upstream changes (Docker Swarm deployments
|
|
7
|
-
* When false (the default),
|
|
8
|
-
*
|
|
6
|
+
* merged with upstream changes in its entirety (Docker Swarm deployments
|
|
7
|
+
* still need it all). When false (the default), everything under
|
|
8
|
+
* `infrastructure/` is deleted EXCEPT the subdirectories listed in
|
|
9
|
+
* `NON_SWARM_INFRA_SUBDIRS`, and those preserved subdirectories are then
|
|
10
|
+
* merged with upstream.
|
|
9
11
|
*/
|
|
10
12
|
export declare function runUpgrade(dockerSwarm: boolean): Promise<void>;
|
|
11
13
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AA6CA;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAgCpD"}
|