@opencrvs/toolkit 2.0.0-rc.71d2a40 → 2.0.0-rc.7209e96
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 +41 -11
- package/dist/cli.js +1784 -349
- package/dist/commons/api/router.d.ts +2803 -268
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +6 -6
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +72 -0
- package/dist/commons/events/Draft.d.ts +2 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/locations.d.ts +38 -1
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/conditionals/index.js +37 -7
- package/dist/events/index.js +145 -21
- 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 +63 -39
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts +3 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +19 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +17 -14
- package/dist/migrations/v2.0/convert-config-files-to-ts.d.ts.map +1 -1
- package/dist/migrations/v2.0/convert-config-files-to-ts.js +4 -5
- package/dist/migrations/v2.0/convert-paragraph-to-heading.d.ts.map +1 -1
- package/dist/migrations/v2.0/convert-paragraph-to-heading.js +4 -5
- package/dist/migrations/v2.0/create-events-index.d.ts.map +1 -1
- package/dist/migrations/v2.0/create-events-index.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +11 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +123 -0
- package/dist/migrations/v2.0/index.d.ts +10 -4
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +1752 -346
- 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 +95 -7
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +13 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +222 -0
- package/dist/migrations/v2.0/migrate-application-config-url.d.ts +3 -0
- package/dist/migrations/v2.0/migrate-application-config-url.d.ts.map +1 -0
- package/dist/migrations/v2.0/migrate-application-config-url.js +342 -0
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +6 -7
- package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.js +3 -4
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +143 -63
- package/dist/migrations/v2.0/remove-delete-actions.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-delete-actions.js +3 -4
- package/dist/migrations/v2.0/remove-demo-scope.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-demo-scope.js +2 -3
- package/dist/migrations/v2.0/remove-deprecated-imports.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-deprecated-imports.js +3 -4
- package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts +3 -0
- package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-fhir-url-helpers.js +163 -0
- package/dist/migrations/v2.0/remove-hearth-migrations.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-hearth-migrations.js +1 -2
- package/dist/migrations/v2.0/remove-old-statistics-service.d.ts +3 -0
- package/dist/migrations/v2.0/remove-old-statistics-service.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-old-statistics-service.js +356 -0
- package/dist/migrations/v2.0/remove-pending-certification-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-pending-certification-flag.js +3 -4
- package/dist/migrations/v2.0/remove-review-from-register-action.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-review-from-register-action.js +3 -4
- package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts +3 -0
- package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-unused-environment-variables.js +186 -0
- package/dist/migrations/v2.0/rename-api-paths.d.ts.map +1 -1
- package/dist/migrations/v2.0/rename-api-paths.js +3 -4
- package/dist/migrations/v2.0/rename-location-parent-id.d.ts.map +1 -1
- package/dist/migrations/v2.0/rename-location-parent-id.js +3 -4
- package/dist/migrations/v2.0/simplify-analytics-precalculations.d.ts.map +1 -1
- package/dist/migrations/v2.0/simplify-analytics-precalculations.js +1 -2
- package/dist/migrations/v2.0/update-package-json.d.ts +3 -0
- package/dist/migrations/v2.0/update-package-json.d.ts.map +1 -0
- package/dist/migrations/v2.0/update-package-json.js +105 -0
- package/dist/notification/index.js +39 -7
- package/dist/scopes/index.d.ts +87 -10
- package/dist/scopes/index.js +43 -8
- package/opencrvs-toolkit-2.0.0-rc.7209e96.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.71d2a40.tgz +0 -0
|
@@ -182,6 +182,10 @@ var scopeByEvent = z6.preprocess(
|
|
|
182
182
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
183
183
|
z6.array(z6.string()).optional()
|
|
184
184
|
).describe("Event type, e.g. birth, death");
|
|
185
|
+
var userRole = z6.preprocess(
|
|
186
|
+
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
187
|
+
z6.array(z6.string()).optional()
|
|
188
|
+
).describe("User role, e.g. admin, field agent");
|
|
185
189
|
var scopeOptionsPlaceEvent = z6.object({
|
|
186
190
|
event: scopeByEvent,
|
|
187
191
|
placeOfEvent: JurisdictionFilter.optional()
|
|
@@ -205,6 +209,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
205
209
|
var AccessLevelOptions = z6.object({
|
|
206
210
|
accessLevel: JurisdictionFilter.optional()
|
|
207
211
|
});
|
|
212
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
213
|
+
role: userRole.optional()
|
|
214
|
+
});
|
|
208
215
|
var WorkqueueOrDashboardOptions = z6.object({
|
|
209
216
|
ids: z6.preprocess(
|
|
210
217
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -214,6 +221,7 @@ var WorkqueueOrDashboardOptions = z6.object({
|
|
|
214
221
|
var AllScopeOptions = z6.object({
|
|
215
222
|
...AllRecordScopeOptions.shape,
|
|
216
223
|
...AccessLevelOptions.shape,
|
|
224
|
+
...AllUserScopeOptions.shape,
|
|
217
225
|
...WorkqueueOrDashboardOptions.shape
|
|
218
226
|
});
|
|
219
227
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -286,6 +294,30 @@ var RecordScopeV2 = z6.discriminatedUnion("type", [
|
|
|
286
294
|
]).describe(
|
|
287
295
|
"Scopes used to check user's permission to perform actions on a record."
|
|
288
296
|
);
|
|
297
|
+
var SystemScopeType = z6.enum([
|
|
298
|
+
"organisation.read-locations",
|
|
299
|
+
"user.read",
|
|
300
|
+
"user.create",
|
|
301
|
+
"user.edit",
|
|
302
|
+
"user.search"
|
|
303
|
+
]);
|
|
304
|
+
var UserScopeType = SystemScopeType.extract([
|
|
305
|
+
"user.read",
|
|
306
|
+
"user.create",
|
|
307
|
+
"user.edit",
|
|
308
|
+
"user.search"
|
|
309
|
+
]);
|
|
310
|
+
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
311
|
+
var UserScopeV2 = z6.discriminatedUnion("type", [
|
|
312
|
+
z6.object({
|
|
313
|
+
type: ScopesWithRoleOption,
|
|
314
|
+
options: AllUserScopeOptions.optional()
|
|
315
|
+
}),
|
|
316
|
+
z6.object({
|
|
317
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
318
|
+
options: AccessLevelOptions.optional()
|
|
319
|
+
})
|
|
320
|
+
]);
|
|
289
321
|
var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
|
|
290
322
|
z6.object({
|
|
291
323
|
type: ScopesWithPlaceEventOptions,
|
|
@@ -306,16 +338,14 @@ var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
|
|
|
306
338
|
}).optional()
|
|
307
339
|
})
|
|
308
340
|
]).describe("Resolved scope with location/user IDs instead of filters.");
|
|
309
|
-
var SystemScopeType = z6.enum([
|
|
310
|
-
"organisation.read-locations",
|
|
311
|
-
"user.read",
|
|
312
|
-
"user.create",
|
|
313
|
-
"user.edit"
|
|
314
|
-
]);
|
|
315
341
|
var Scope2 = z6.discriminatedUnion("type", [
|
|
316
342
|
z6.object({ type: PlainScopeType }),
|
|
317
343
|
...RecordScopeV2.options,
|
|
318
|
-
|
|
344
|
+
...UserScopeV2.options,
|
|
345
|
+
z6.object({
|
|
346
|
+
type: z6.literal("organisation.read-locations"),
|
|
347
|
+
options: AccessLevelOptions.optional()
|
|
348
|
+
}),
|
|
319
349
|
z6.object({
|
|
320
350
|
type: z6.literal("workqueue"),
|
|
321
351
|
options: WorkqueueOrDashboardOptions
|
package/dist/events/index.js
CHANGED
|
@@ -243,6 +243,8 @@ __export(events_exports, {
|
|
|
243
243
|
areConditionsMet: () => areConditionsMet,
|
|
244
244
|
buildFormState: () => buildFormState,
|
|
245
245
|
canAccessEventWithScope: () => canAccessEventWithScope,
|
|
246
|
+
canAccessOtherUserWithScopes: () => canAccessOtherUserWithScopes,
|
|
247
|
+
canAccessUserWithScope: () => canAccessUserWithScope,
|
|
246
248
|
compositeFieldTypes: () => compositeFieldTypes,
|
|
247
249
|
createEmptyDraft: () => createEmptyDraft,
|
|
248
250
|
createFieldConditionals: () => createFieldConditionals,
|
|
@@ -300,12 +302,14 @@ __export(events_exports, {
|
|
|
300
302
|
getActionConfig: () => getActionConfig,
|
|
301
303
|
getActionReview: () => getActionReview,
|
|
302
304
|
getActionReviewFields: () => getActionReviewFields,
|
|
305
|
+
getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
|
|
303
306
|
getAllUniqueFields: () => getAllUniqueFields,
|
|
304
307
|
getAnnotationFromDrafts: () => getAnnotationFromDrafts,
|
|
305
308
|
getAssignedUserFromActions: () => getAssignedUserFromActions,
|
|
306
309
|
getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
|
|
307
310
|
getAssignmentStatus: () => getAssignmentStatus,
|
|
308
311
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
312
|
+
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
309
313
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
310
314
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
311
315
|
getCurrentEventState: () => getCurrentEventState,
|
|
@@ -316,6 +320,7 @@ __export(events_exports, {
|
|
|
316
320
|
getDeclarationPages: () => getDeclarationPages,
|
|
317
321
|
getEventConfigById: () => getEventConfigById,
|
|
318
322
|
getFilePathsFromEvent: () => getFilePathsFromEvent,
|
|
323
|
+
getLocationHierarchy: () => getLocationHierarchy,
|
|
319
324
|
getMixedPath: () => getMixedPath,
|
|
320
325
|
getPendingAction: () => getPendingAction,
|
|
321
326
|
getPrintCertificatePages: () => getPrintCertificatePages,
|
|
@@ -489,6 +494,10 @@ var scopeByEvent = z2.preprocess(
|
|
|
489
494
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
490
495
|
z2.array(z2.string()).optional()
|
|
491
496
|
).describe("Event type, e.g. birth, death");
|
|
497
|
+
var userRole = z2.preprocess(
|
|
498
|
+
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
499
|
+
z2.array(z2.string()).optional()
|
|
500
|
+
).describe("User role, e.g. admin, field agent");
|
|
492
501
|
var scopeOptionsPlaceEvent = z2.object({
|
|
493
502
|
event: scopeByEvent,
|
|
494
503
|
placeOfEvent: JurisdictionFilter.optional()
|
|
@@ -512,6 +521,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
512
521
|
var AccessLevelOptions = z2.object({
|
|
513
522
|
accessLevel: JurisdictionFilter.optional()
|
|
514
523
|
});
|
|
524
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
525
|
+
role: userRole.optional()
|
|
526
|
+
});
|
|
515
527
|
var WorkqueueOrDashboardOptions = z2.object({
|
|
516
528
|
ids: z2.preprocess(
|
|
517
529
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -521,6 +533,7 @@ var WorkqueueOrDashboardOptions = z2.object({
|
|
|
521
533
|
var AllScopeOptions = z2.object({
|
|
522
534
|
...AllRecordScopeOptions.shape,
|
|
523
535
|
...AccessLevelOptions.shape,
|
|
536
|
+
...AllUserScopeOptions.shape,
|
|
524
537
|
...WorkqueueOrDashboardOptions.shape
|
|
525
538
|
});
|
|
526
539
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -593,6 +606,33 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
593
606
|
]).describe(
|
|
594
607
|
"Scopes used to check user's permission to perform actions on a record."
|
|
595
608
|
);
|
|
609
|
+
var SystemScopeType = z2.enum([
|
|
610
|
+
"organisation.read-locations",
|
|
611
|
+
"user.read",
|
|
612
|
+
"user.create",
|
|
613
|
+
"user.edit",
|
|
614
|
+
"user.search"
|
|
615
|
+
]);
|
|
616
|
+
var UserScopeType = SystemScopeType.extract([
|
|
617
|
+
"user.read",
|
|
618
|
+
"user.create",
|
|
619
|
+
"user.edit",
|
|
620
|
+
"user.search"
|
|
621
|
+
]);
|
|
622
|
+
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
623
|
+
var UserScopeV2 = z2.discriminatedUnion("type", [
|
|
624
|
+
z2.object({
|
|
625
|
+
type: ScopesWithRoleOption,
|
|
626
|
+
options: AllUserScopeOptions.optional()
|
|
627
|
+
}),
|
|
628
|
+
z2.object({
|
|
629
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
630
|
+
options: AccessLevelOptions.optional()
|
|
631
|
+
})
|
|
632
|
+
]);
|
|
633
|
+
function scopeUsesRoleOptions(scope) {
|
|
634
|
+
return ScopesWithRoleOption?.options.some((opt) => opt === scope.type);
|
|
635
|
+
}
|
|
596
636
|
function scopeUsesDeclaredOptions(scope) {
|
|
597
637
|
return !ScopesWithPlaceEventOptions.options.some((opt) => opt === scope.type);
|
|
598
638
|
}
|
|
@@ -625,16 +665,14 @@ var ResolvedRecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
625
665
|
}).optional()
|
|
626
666
|
})
|
|
627
667
|
]).describe("Resolved scope with location/user IDs instead of filters.");
|
|
628
|
-
var SystemScopeType = z2.enum([
|
|
629
|
-
"organisation.read-locations",
|
|
630
|
-
"user.read",
|
|
631
|
-
"user.create",
|
|
632
|
-
"user.edit"
|
|
633
|
-
]);
|
|
634
668
|
var Scope = z2.discriminatedUnion("type", [
|
|
635
669
|
z2.object({ type: PlainScopeType }),
|
|
636
670
|
...RecordScopeV2.options,
|
|
637
|
-
|
|
671
|
+
...UserScopeV2.options,
|
|
672
|
+
z2.object({
|
|
673
|
+
type: z2.literal("organisation.read-locations"),
|
|
674
|
+
options: AccessLevelOptions.optional()
|
|
675
|
+
}),
|
|
638
676
|
z2.object({
|
|
639
677
|
type: z2.literal("workqueue"),
|
|
640
678
|
options: WorkqueueOrDashboardOptions
|
|
@@ -3766,6 +3804,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3766
3804
|
function isAgeValue(value) {
|
|
3767
3805
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3768
3806
|
}
|
|
3807
|
+
function mergeWithBaseFormState(values, context) {
|
|
3808
|
+
return { ...context.baseFormState, ...values };
|
|
3809
|
+
}
|
|
3769
3810
|
function validate(schema, data) {
|
|
3770
3811
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3771
3812
|
if ("$form" in data) {
|
|
@@ -3804,7 +3845,7 @@ function isOnline() {
|
|
|
3804
3845
|
}
|
|
3805
3846
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3806
3847
|
return validate(conditional, {
|
|
3807
|
-
$form: values,
|
|
3848
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3808
3849
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3809
3850
|
$online: isOnline(),
|
|
3810
3851
|
$user: context.user,
|
|
@@ -3833,7 +3874,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3833
3874
|
return true;
|
|
3834
3875
|
}
|
|
3835
3876
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3836
|
-
$form: form,
|
|
3877
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3837
3878
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3838
3879
|
$online: isOnline(),
|
|
3839
3880
|
$user: context.user,
|
|
@@ -4025,7 +4066,7 @@ function runFieldValidations({
|
|
|
4025
4066
|
return [];
|
|
4026
4067
|
}
|
|
4027
4068
|
const conditionalParameters = {
|
|
4028
|
-
$form: form,
|
|
4069
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4029
4070
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4030
4071
|
/**
|
|
4031
4072
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4269,17 +4310,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4269
4310
|
}
|
|
4270
4311
|
return isConditionMet(page.conditional, formValues, context);
|
|
4271
4312
|
}
|
|
4272
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4313
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4273
4314
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4274
4315
|
function fn(prevVisibilityContext) {
|
|
4275
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4276
4316
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4277
4317
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4278
4318
|
if (!fieldConfig.length) {
|
|
4279
4319
|
return false;
|
|
4280
4320
|
}
|
|
4281
4321
|
const isHidden = fieldConfig.every(
|
|
4282
|
-
(f) => !isFieldVisible(f,
|
|
4322
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4283
4323
|
);
|
|
4284
4324
|
if (!isHidden) {
|
|
4285
4325
|
return false;
|
|
@@ -4297,7 +4337,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4297
4337
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4298
4338
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4299
4339
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4300
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4340
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4301
4341
|
});
|
|
4302
4342
|
return omitHiddenFields(
|
|
4303
4343
|
visibleFields,
|
|
@@ -4344,13 +4384,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4344
4384
|
}
|
|
4345
4385
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4346
4386
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4347
|
-
return omitHiddenFields(
|
|
4348
|
-
|
|
4349
|
-
|
|
4350
|
-
|
|
4351
|
-
false,
|
|
4352
|
-
declaration
|
|
4353
|
-
);
|
|
4387
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4388
|
+
...context,
|
|
4389
|
+
baseFormState: declaration
|
|
4390
|
+
});
|
|
4354
4391
|
}
|
|
4355
4392
|
function deepMerge(currentDocument, actionDocument) {
|
|
4356
4393
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5862,6 +5899,8 @@ var BaseActionInput = z38.object({
|
|
|
5862
5899
|
originalActionId: UUID.optional(),
|
|
5863
5900
|
// should not be part of base action.
|
|
5864
5901
|
keepAssignment: z38.boolean().optional(),
|
|
5902
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5903
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5865
5904
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5866
5905
|
// @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
|
|
5867
5906
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -9930,11 +9969,77 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
9930
9969
|
}
|
|
9931
9970
|
return true;
|
|
9932
9971
|
}
|
|
9972
|
+
function canAccessUserWithScope({
|
|
9973
|
+
userToAccess,
|
|
9974
|
+
scope,
|
|
9975
|
+
user: user2
|
|
9976
|
+
}) {
|
|
9977
|
+
const opts = scope.options;
|
|
9978
|
+
const hasSameOffice = user2.primaryOfficeId === userToAccess.primaryOfficeId;
|
|
9979
|
+
if (opts?.accessLevel === JurisdictionFilter.enum.location && !hasSameOffice) {
|
|
9980
|
+
return false;
|
|
9981
|
+
}
|
|
9982
|
+
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
9983
|
+
(id) => user2.administrativeAreaId === id
|
|
9984
|
+
) || user2.administrativeAreaId === null;
|
|
9985
|
+
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
9986
|
+
return false;
|
|
9987
|
+
}
|
|
9988
|
+
if (scopeUsesRoleOptions(scope)) {
|
|
9989
|
+
const { options } = scope;
|
|
9990
|
+
if (options?.role && !options.role.includes(userToAccess.role)) {
|
|
9991
|
+
return false;
|
|
9992
|
+
}
|
|
9993
|
+
}
|
|
9994
|
+
return true;
|
|
9995
|
+
}
|
|
9996
|
+
function canAccessOtherUserWithScopes({
|
|
9997
|
+
scopes,
|
|
9998
|
+
userToAccess,
|
|
9999
|
+
user: user2
|
|
10000
|
+
}) {
|
|
10001
|
+
return scopes.some(
|
|
10002
|
+
(scope) => canAccessUserWithScope({ userToAccess, scope, user: user2 })
|
|
10003
|
+
);
|
|
10004
|
+
}
|
|
9933
10005
|
function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
|
|
9934
10006
|
return scopes.some(
|
|
9935
10007
|
(scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
|
|
9936
10008
|
);
|
|
9937
10009
|
}
|
|
10010
|
+
function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
|
|
10011
|
+
const collectedLocations = [];
|
|
10012
|
+
const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
|
|
10013
|
+
let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
|
|
10014
|
+
while (current) {
|
|
10015
|
+
collectedLocations.push(current);
|
|
10016
|
+
if (!current.parentId) {
|
|
10017
|
+
break;
|
|
10018
|
+
}
|
|
10019
|
+
const parentId = current.parentId;
|
|
10020
|
+
current = administrativeAreas.get(parentId);
|
|
10021
|
+
}
|
|
10022
|
+
return collectedLocations;
|
|
10023
|
+
}
|
|
10024
|
+
function getLocationHierarchy(selectedId, context) {
|
|
10025
|
+
const { administrativeAreas, locations } = context;
|
|
10026
|
+
const loc = locations.get(selectedId);
|
|
10027
|
+
if (loc) {
|
|
10028
|
+
if (loc.administrativeAreaId) {
|
|
10029
|
+
const hierarchy2 = getAdministrativeAreaHierarchy(
|
|
10030
|
+
loc.administrativeAreaId,
|
|
10031
|
+
administrativeAreas
|
|
10032
|
+
);
|
|
10033
|
+
return [...hierarchy2.reverse().map((area) => area.id), loc.id];
|
|
10034
|
+
}
|
|
10035
|
+
return [loc.id];
|
|
10036
|
+
}
|
|
10037
|
+
const hierarchy = getAdministrativeAreaHierarchy(
|
|
10038
|
+
selectedId,
|
|
10039
|
+
administrativeAreas
|
|
10040
|
+
);
|
|
10041
|
+
return hierarchy.reverse().map((area) => area.id);
|
|
10042
|
+
}
|
|
9938
10043
|
|
|
9939
10044
|
// ../commons/src/events/scopes.ts
|
|
9940
10045
|
var ACTION_SCOPE_MAP = {
|
|
@@ -10009,6 +10114,25 @@ function isActionInScope({
|
|
|
10009
10114
|
);
|
|
10010
10115
|
return canAccess;
|
|
10011
10116
|
}
|
|
10117
|
+
function getAvailableRolesForUserUpdatePayload({
|
|
10118
|
+
allRoles,
|
|
10119
|
+
userLocation,
|
|
10120
|
+
acceptedScopes,
|
|
10121
|
+
userRequesting
|
|
10122
|
+
}) {
|
|
10123
|
+
const availableRoles = allRoles.filter((role) => {
|
|
10124
|
+
const canAccess = canAccessOtherUserWithScopes({
|
|
10125
|
+
userToAccess: {
|
|
10126
|
+
...userLocation,
|
|
10127
|
+
role
|
|
10128
|
+
},
|
|
10129
|
+
user: userRequesting,
|
|
10130
|
+
scopes: acceptedScopes
|
|
10131
|
+
});
|
|
10132
|
+
return canAccess;
|
|
10133
|
+
});
|
|
10134
|
+
return availableRoles;
|
|
10135
|
+
}
|
|
10012
10136
|
|
|
10013
10137
|
// ../commons/src/events/serializers/user/deserializer.ts
|
|
10014
10138
|
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
|
|
@@ -48,7 +50,6 @@ exports.main = main;
|
|
|
48
50
|
*/
|
|
49
51
|
const ts_morph_1 = require("ts-morph");
|
|
50
52
|
const path_1 = __importDefault(require("path"));
|
|
51
|
-
const _1 = require(".");
|
|
52
53
|
const DEFINE_CONFIG_NAME = 'defineConfig';
|
|
53
54
|
const DEFINE_WORKQUEUES_NAME = 'defineWorkqueues';
|
|
54
55
|
const ACTIONS_PROPERTY_NAME = 'actions';
|
|
@@ -56,20 +57,27 @@ const ACTION_PROPERTY_NAME = 'action';
|
|
|
56
57
|
const FLAGS_PROPERTY_NAME = 'flags';
|
|
57
58
|
const QUERY_PROPERTY_NAME = 'query';
|
|
58
59
|
const TYPE_PROPERTY_NAME = 'type';
|
|
60
|
+
const ID_PROPERTY_NAME = 'id';
|
|
59
61
|
const CLAUSES_PROPERTY_NAME = 'clauses';
|
|
60
62
|
const ANY_OF_PROPERTY_NAME = 'anyOf';
|
|
61
63
|
const FLAG_ID = 'pending-first-certificate-issuance';
|
|
62
64
|
const REGISTER_TYPE = 'REGISTER';
|
|
63
65
|
const PRINT_CERTIFICATE_TYPE = 'PRINT_CERTIFICATE';
|
|
64
|
-
|
|
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 `{
|
|
65
72
|
id: '${FLAG_ID}',
|
|
66
73
|
label: {
|
|
67
|
-
id: 'event.
|
|
74
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
68
75
|
defaultMessage: 'Pending first certificate issuance',
|
|
69
76
|
description: 'Flag label for first certificate issuance'
|
|
70
77
|
},
|
|
71
78
|
requiresAction: true
|
|
72
79
|
}`;
|
|
80
|
+
}
|
|
73
81
|
// ─── Generic helpers ──────────────────────────────────────────────────────────
|
|
74
82
|
/**
|
|
75
83
|
* Returns true if the object's `type` property matches the given type name.
|
|
@@ -91,23 +99,36 @@ function isActionOfType(obj, typeName) {
|
|
|
91
99
|
return false;
|
|
92
100
|
}
|
|
93
101
|
/**
|
|
94
|
-
*
|
|
95
|
-
*
|
|
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.
|
|
96
115
|
*/
|
|
97
|
-
function
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
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
|
+
}
|
|
109
130
|
}
|
|
110
|
-
return
|
|
131
|
+
return null;
|
|
111
132
|
}
|
|
112
133
|
/**
|
|
113
134
|
* Returns true if an array literal contains an object literal with `id: <id>`.
|
|
@@ -130,17 +151,19 @@ function hasElementWithId(array, id) {
|
|
|
130
151
|
}
|
|
131
152
|
// ─── defineConfig helpers ─────────────────────────────────────────────────────
|
|
132
153
|
/**
|
|
133
|
-
* Ensures the top-level `flags` array in a
|
|
134
|
-
* `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.…`).
|
|
135
157
|
*/
|
|
136
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
158
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
159
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
137
160
|
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME);
|
|
138
161
|
if (flagsProp && ts_morph_1.Node.isPropertyAssignment(flagsProp)) {
|
|
139
162
|
const flagsInit = flagsProp.getInitializer();
|
|
140
163
|
if (flagsInit && ts_morph_1.Node.isArrayLiteralExpression(flagsInit)) {
|
|
141
164
|
if (hasElementWithId(flagsInit, FLAG_ID))
|
|
142
165
|
return false;
|
|
143
|
-
flagsInit.addElement(
|
|
166
|
+
flagsInit.addElement(initializer);
|
|
144
167
|
return true;
|
|
145
168
|
}
|
|
146
169
|
return false;
|
|
@@ -148,7 +171,7 @@ function ensureTopLevelFlagDefinition(configArg) {
|
|
|
148
171
|
// No `flags` property at all — create it
|
|
149
172
|
configArg.addPropertyAssignment({
|
|
150
173
|
name: FLAGS_PROPERTY_NAME,
|
|
151
|
-
initializer: `[\n ${
|
|
174
|
+
initializer: `[\n ${initializer}\n]`
|
|
152
175
|
});
|
|
153
176
|
return true;
|
|
154
177
|
}
|
|
@@ -175,15 +198,15 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
175
198
|
return true;
|
|
176
199
|
}
|
|
177
200
|
/**
|
|
178
|
-
* Processes a
|
|
201
|
+
* Processes a `defineConfig` object: ensures top-level flag definition,
|
|
179
202
|
* REGISTER action flags, and PRINT_CERTIFICATE action flags.
|
|
180
203
|
* Returns the number of changes made.
|
|
181
204
|
*/
|
|
182
|
-
function
|
|
205
|
+
function processConfig(configArg, eventType, relPath) {
|
|
183
206
|
let changes = 0;
|
|
184
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
207
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
185
208
|
changes++;
|
|
186
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
|
|
209
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`);
|
|
187
210
|
}
|
|
188
211
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME);
|
|
189
212
|
if (!actionsProp || !ts_morph_1.Node.isPropertyAssignment(actionsProp))
|
|
@@ -198,13 +221,13 @@ function processBirthConfig(configArg, relPath) {
|
|
|
198
221
|
if (isActionOfType(element, REGISTER_TYPE)) {
|
|
199
222
|
if (ensureActionOperationFlag(element, 'add')) {
|
|
200
223
|
changes++;
|
|
201
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`);
|
|
224
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`);
|
|
202
225
|
}
|
|
203
226
|
}
|
|
204
227
|
if (isActionOfType(element, PRINT_CERTIFICATE_TYPE)) {
|
|
205
228
|
if (ensureActionOperationFlag(element, 'remove')) {
|
|
206
229
|
changes++;
|
|
207
|
-
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`);
|
|
208
231
|
}
|
|
209
232
|
}
|
|
210
233
|
}
|
|
@@ -318,7 +341,7 @@ function processFile(filePath, project) {
|
|
|
318
341
|
if (!sourceFile)
|
|
319
342
|
return 0;
|
|
320
343
|
let totalChanges = 0;
|
|
321
|
-
const relPath = path_1.default.relative(
|
|
344
|
+
const relPath = path_1.default.relative(process.cwd(), filePath);
|
|
322
345
|
const callExpressions = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression);
|
|
323
346
|
for (const call of callExpressions) {
|
|
324
347
|
const expression = call.getExpression();
|
|
@@ -333,9 +356,10 @@ function processFile(filePath, project) {
|
|
|
333
356
|
const configArg = args[0];
|
|
334
357
|
if (!ts_morph_1.Node.isObjectLiteralExpression(configArg))
|
|
335
358
|
continue;
|
|
336
|
-
|
|
359
|
+
const eventType = getEventType(configArg);
|
|
360
|
+
if (!eventType)
|
|
337
361
|
continue;
|
|
338
|
-
totalChanges +=
|
|
362
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
339
363
|
}
|
|
340
364
|
// ── defineWorkqueues ──────────────────────────────────────────────────────
|
|
341
365
|
if (calleeName === DEFINE_WORKQUEUES_NAME) {
|
|
@@ -369,8 +393,8 @@ function processFile(filePath, project) {
|
|
|
369
393
|
// ─── Entry point ─────────────────────────────────────────────────────────────
|
|
370
394
|
function main() {
|
|
371
395
|
return __awaiter(this, void 0, void 0, function* () {
|
|
372
|
-
const srcDir = path_1.default.join(
|
|
373
|
-
console.log(`Scanning for
|
|
396
|
+
const srcDir = path_1.default.join(process.cwd(), 'src');
|
|
397
|
+
console.log(`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
|
|
374
398
|
const project = new ts_morph_1.Project({
|
|
375
399
|
tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
|
|
376
400
|
skipAddingFilesFromTsConfig: false
|
|
@@ -391,14 +415,14 @@ function main() {
|
|
|
391
415
|
}
|
|
392
416
|
}
|
|
393
417
|
if (modifiedFiles.length === 0) {
|
|
394
|
-
console.log('No
|
|
418
|
+
console.log('No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
|
|
395
419
|
return;
|
|
396
420
|
}
|
|
397
421
|
console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
|
|
398
422
|
for (const filePath of modifiedFiles) {
|
|
399
423
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
400
424
|
yield sourceFile.save();
|
|
401
|
-
console.log(` Saved: ${path_1.default.relative(
|
|
425
|
+
console.log(` Saved: ${path_1.default.relative(process.cwd(), filePath)}`);
|
|
402
426
|
}
|
|
403
427
|
console.log(`\nDone. Applied ${totalChanges} change(s) across ${modifiedFiles.length} file(s).`);
|
|
404
428
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-resend-invite-notification.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-resend-invite-notification.ts"],"names":[],"mappings":"AA8ZA,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuCnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|