@opencrvs/toolkit 2.0.0-rc.0fed5eb → 2.0.0-rc.1339e24

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.
Files changed (51) hide show
  1. package/create-countryconfig/index.js +73 -0
  2. package/create-countryconfig/package.json +11 -0
  3. package/dist/application-config/index.js +64 -37
  4. package/dist/cli.js +536 -174
  5. package/dist/commons/api/router.d.ts +3355 -299
  6. package/dist/commons/application-config/index.d.ts +16 -4
  7. package/dist/commons/conditionals/conditionals.d.ts +6 -6
  8. package/dist/commons/conditionals/validate.d.ts +1 -0
  9. package/dist/commons/events/ActionInput.d.ts +108 -0
  10. package/dist/commons/events/Draft.d.ts +3 -0
  11. package/dist/commons/events/EventIndex.d.ts +0 -3
  12. package/dist/commons/events/EventMetadata.d.ts +0 -7
  13. package/dist/commons/events/FieldConfig.d.ts +10 -0
  14. package/dist/commons/events/locations.d.ts +38 -1
  15. package/dist/commons/events/mocks.test.utils.d.ts +19 -0
  16. package/dist/commons/events/scopes.d.ts +24 -1
  17. package/dist/commons/events/state/index.d.ts +0 -4
  18. package/dist/commons/events/state/utils.d.ts +0 -2
  19. package/dist/commons/events/utils.d.ts +1 -1
  20. package/dist/conditionals/index.js +37 -7
  21. package/dist/events/index.js +173 -67
  22. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
  23. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
  24. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  25. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  26. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  27. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  28. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  29. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  30. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  31. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  32. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  33. package/dist/migrations/v2.0/index.d.ts +5 -3
  34. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  35. package/dist/migrations/v2.0/index.js +534 -172
  36. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  37. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
  38. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  39. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  40. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  41. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  42. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  43. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  44. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  45. package/dist/notification/index.js +67 -37
  46. package/dist/scopes/index.d.ts +87 -10
  47. package/dist/scopes/index.js +43 -8
  48. package/opencrvs-toolkit-2.0.0-rc.1339e24.tgz +0 -0
  49. package/package.json +1 -1
  50. package/tsconfig.tsbuildinfo +1 -1
  51. package/opencrvs-toolkit-2.0.0-rc.0fed5eb.tgz +0 -0
@@ -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,13 @@ __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
- getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
307
309
  getAssignmentStatus: () => getAssignmentStatus,
308
310
  getAvailableActionsForEvent: () => getAvailableActionsForEvent,
311
+ getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
309
312
  getCompleteActionAnnotation: () => getCompleteActionAnnotation,
310
313
  getCompleteActionDeclaration: () => getCompleteActionDeclaration,
311
314
  getCurrentEventState: () => getCurrentEventState,
@@ -316,6 +319,7 @@ __export(events_exports, {
316
319
  getDeclarationPages: () => getDeclarationPages,
317
320
  getEventConfigById: () => getEventConfigById,
318
321
  getFilePathsFromEvent: () => getFilePathsFromEvent,
322
+ getLocationHierarchy: () => getLocationHierarchy,
319
323
  getMixedPath: () => getMixedPath,
320
324
  getPendingAction: () => getPendingAction,
321
325
  getPrintCertificatePages: () => getPrintCertificatePages,
@@ -489,6 +493,10 @@ var scopeByEvent = z2.preprocess(
489
493
  (val) => val === void 0 ? void 0 : [val].flat(),
490
494
  z2.array(z2.string()).optional()
491
495
  ).describe("Event type, e.g. birth, death");
496
+ var userRole = z2.preprocess(
497
+ (val) => val === void 0 ? void 0 : [val].flat(),
498
+ z2.array(z2.string()).optional()
499
+ ).describe("User role, e.g. admin, field agent");
492
500
  var scopeOptionsPlaceEvent = z2.object({
493
501
  event: scopeByEvent,
494
502
  placeOfEvent: JurisdictionFilter.optional()
@@ -512,6 +520,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
512
520
  var AccessLevelOptions = z2.object({
513
521
  accessLevel: JurisdictionFilter.optional()
514
522
  });
523
+ var AllUserScopeOptions = AccessLevelOptions.extend({
524
+ role: userRole.optional()
525
+ });
515
526
  var WorkqueueOrDashboardOptions = z2.object({
516
527
  ids: z2.preprocess(
517
528
  (val) => val === void 0 ? void 0 : [val].flat(),
@@ -521,6 +532,7 @@ var WorkqueueOrDashboardOptions = z2.object({
521
532
  var AllScopeOptions = z2.object({
522
533
  ...AllRecordScopeOptions.shape,
523
534
  ...AccessLevelOptions.shape,
535
+ ...AllUserScopeOptions.shape,
524
536
  ...WorkqueueOrDashboardOptions.shape
525
537
  });
526
538
  var ScopeOptionKey = AllScopeOptions.keyof();
@@ -593,6 +605,33 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
593
605
  ]).describe(
594
606
  "Scopes used to check user's permission to perform actions on a record."
595
607
  );
608
+ var SystemScopeType = z2.enum([
609
+ "organisation.read-locations",
610
+ "user.read",
611
+ "user.create",
612
+ "user.edit",
613
+ "user.search"
614
+ ]);
615
+ var UserScopeType = SystemScopeType.extract([
616
+ "user.read",
617
+ "user.create",
618
+ "user.edit",
619
+ "user.search"
620
+ ]);
621
+ var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
622
+ var UserScopeV2 = z2.discriminatedUnion("type", [
623
+ z2.object({
624
+ type: ScopesWithRoleOption,
625
+ options: AllUserScopeOptions.optional()
626
+ }),
627
+ z2.object({
628
+ type: UserScopeType.extract(["user.read", "user.search"]),
629
+ options: AccessLevelOptions.optional()
630
+ })
631
+ ]);
632
+ function scopeUsesRoleOptions(scope) {
633
+ return ScopesWithRoleOption?.options.some((opt) => opt === scope.type);
634
+ }
596
635
  function scopeUsesDeclaredOptions(scope) {
597
636
  return !ScopesWithPlaceEventOptions.options.some((opt) => opt === scope.type);
598
637
  }
@@ -625,16 +664,14 @@ var ResolvedRecordScopeV2 = z2.discriminatedUnion("type", [
625
664
  }).optional()
626
665
  })
627
666
  ]).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
667
  var Scope = z2.discriminatedUnion("type", [
635
668
  z2.object({ type: PlainScopeType }),
636
669
  ...RecordScopeV2.options,
637
- z2.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
670
+ ...UserScopeV2.options,
671
+ z2.object({
672
+ type: z2.literal("organisation.read-locations"),
673
+ options: AccessLevelOptions.optional()
674
+ }),
638
675
  z2.object({
639
676
  type: z2.literal("workqueue"),
640
677
  options: WorkqueueOrDashboardOptions
@@ -1040,7 +1077,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
1040
1077
  ShowConditional,
1041
1078
  // Action can be shown to the user in the list but as disabled
1042
1079
  EnableConditional
1043
- ]);
1080
+ ]).meta({
1081
+ description: "Action conditional configuration",
1082
+ id: "ActionConditional"
1083
+ });
1044
1084
  var DisplayOnReviewConditional = z7.object({
1045
1085
  type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
1046
1086
  conditional: Conditional
@@ -1376,28 +1416,20 @@ function schemaPriority(schema) {
1376
1416
  return idx === -1 ? 9999 : idx;
1377
1417
  }
1378
1418
  function safeUnion(schemas) {
1419
+ const sortedSchemas = [...schemas].sort(
1420
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1421
+ );
1379
1422
  return z12.any().superRefine((val, ctx) => {
1380
- const successful = schemas.filter((s) => s.safeParse(val).success);
1381
- if (successful.length === 1) {
1382
- return;
1383
- }
1384
- if (successful.length === 0) {
1385
- ctx.addIssue({
1386
- code: "invalid_type",
1387
- expected: "custom",
1388
- message: "Value does not match any schema"
1389
- });
1390
- return;
1391
- }
1392
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
1393
- const best = successful[0];
1394
- if (!best.safeParse(val).success) {
1395
- ctx.addIssue({
1396
- expected: "custom",
1397
- code: "invalid_type",
1398
- message: "Value did not match the best schema"
1399
- });
1423
+ for (const schema of sortedSchemas) {
1424
+ if (schema.safeParse(val).success) {
1425
+ return;
1426
+ }
1400
1427
  }
1428
+ ctx.addIssue({
1429
+ code: "invalid_type",
1430
+ expected: "custom",
1431
+ message: "Value does not match any schema"
1432
+ });
1401
1433
  }).meta({
1402
1434
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1403
1435
  });
@@ -1707,6 +1739,9 @@ var FlagConfig = z15.object({
1707
1739
  "Indicates if this flag expects an action to be performed to be cleared."
1708
1740
  ),
1709
1741
  label: TranslationConfig.describe("Human readable label of the flag.")
1742
+ }).meta({
1743
+ description: "Flag configuration",
1744
+ id: "FlagConfig"
1710
1745
  });
1711
1746
  var ActionFlagConfig = z15.object({
1712
1747
  id: Flag,
@@ -1714,6 +1749,9 @@ var ActionFlagConfig = z15.object({
1714
1749
  conditional: Conditional.optional().describe(
1715
1750
  "When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
1716
1751
  )
1752
+ }).meta({
1753
+ description: "Action flag configuration",
1754
+ id: "ActionFlagConfig"
1717
1755
  });
1718
1756
 
1719
1757
  // ../commons/src/events/EventMetadata.ts
@@ -1735,8 +1773,7 @@ var ActionCreationMetadata = z16.object({
1735
1773
  ),
1736
1774
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1737
1775
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1738
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1739
- 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.")
1740
1777
  });
1741
1778
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1742
1779
  registrationNumber: z16.string().describe(
@@ -1764,9 +1801,6 @@ var EventMetadata = z16.object({
1764
1801
  createdAtLocation: UUID.nullish().describe(
1765
1802
  "Location of the user who created the event."
1766
1803
  ),
1767
- createdBySignature: DocumentPath.nullish().describe(
1768
- "Signature of the user who created the event."
1769
- ),
1770
1804
  updatedAtLocation: UUID.nullish().describe(
1771
1805
  "Location of the user who last changed the status."
1772
1806
  ),
@@ -2854,10 +2888,10 @@ var VerificationPageConfig = FormPageConfig.extend({
2854
2888
  type: z21.literal(PageTypes.enum.VERIFICATION),
2855
2889
  actions: VerificationActionConfig
2856
2890
  });
2857
- var PageConfig = z21.discriminatedUnion("type", [
2858
- FormPageConfig,
2859
- VerificationPageConfig
2860
- ]);
2891
+ var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
2892
+ description: "Page configuration",
2893
+ id: "PageConfig"
2894
+ });
2861
2895
 
2862
2896
  // ../commons/src/events/FormConfig.ts
2863
2897
  var DeclarationFormConfig = z22.object({
@@ -3766,6 +3800,9 @@ function precompileActionSchemas(eventConfigurations) {
3766
3800
  function isAgeValue(value) {
3767
3801
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3768
3802
  }
3803
+ function mergeWithBaseFormState(values, context) {
3804
+ return { ...context.baseFormState, ...values };
3805
+ }
3769
3806
  function validate(schema, data) {
3770
3807
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3771
3808
  if ("$form" in data) {
@@ -3804,7 +3841,7 @@ function isOnline() {
3804
3841
  }
3805
3842
  function isConditionMet(conditional, values, context, eventIndex) {
3806
3843
  return validate(conditional, {
3807
- $form: values,
3844
+ $form: mergeWithBaseFormState(values, context),
3808
3845
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3809
3846
  $online: isOnline(),
3810
3847
  $user: context.user,
@@ -3833,7 +3870,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3833
3870
  return true;
3834
3871
  }
3835
3872
  const validConditionals = getConditionalActionsForField(field3, {
3836
- $form: form,
3873
+ $form: mergeWithBaseFormState(form, context),
3837
3874
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3838
3875
  $online: isOnline(),
3839
3876
  $user: context.user,
@@ -4025,7 +4062,7 @@ function runFieldValidations({
4025
4062
  return [];
4026
4063
  }
4027
4064
  const conditionalParameters = {
4028
- $form: form,
4065
+ $form: mergeWithBaseFormState(form, context),
4029
4066
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4030
4067
  /**
4031
4068
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4269,17 +4306,16 @@ function isPageVisible(page, formValues, context) {
4269
4306
  }
4270
4307
  return isConditionMet(page.conditional, formValues, context);
4271
4308
  }
4272
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4309
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4273
4310
  const base = (0, import_lodash.cloneDeep)(formValues);
4274
4311
  function fn(prevVisibilityContext) {
4275
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4276
4312
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4277
4313
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4278
4314
  if (!fieldConfig.length) {
4279
4315
  return false;
4280
4316
  }
4281
4317
  const isHidden = fieldConfig.every(
4282
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4318
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4283
4319
  );
4284
4320
  if (!isHidden) {
4285
4321
  return false;
@@ -4297,7 +4333,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4297
4333
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4298
4334
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4299
4335
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4300
- return hiddenFields.some((f) => f.id === fieldId);
4336
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4301
4337
  });
4302
4338
  return omitHiddenFields(
4303
4339
  visibleFields,
@@ -4344,13 +4380,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4344
4380
  }
4345
4381
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4346
4382
  const annotationFields = getActionAnnotationFields(actionConfig);
4347
- return omitHiddenFields(
4348
- annotationFields,
4349
- annotation,
4350
- context,
4351
- false,
4352
- declaration
4353
- );
4383
+ return omitHiddenFields(annotationFields, annotation, {
4384
+ ...context,
4385
+ baseFormState: declaration
4386
+ });
4354
4387
  }
4355
4388
  function deepMerge(currentDocument, actionDocument) {
4356
4389
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5862,6 +5895,9 @@ var BaseActionInput = z38.object({
5862
5895
  originalActionId: UUID.optional(),
5863
5896
  // should not be part of base action.
5864
5897
  keepAssignment: z38.boolean().optional(),
5898
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5899
+ keepAssignmentIfRejected: z38.boolean().optional(),
5900
+ waitFor: z38.boolean().optional(),
5865
5901
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5866
5902
  // @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
5903
  createdAtLocation: UUID.nullish().describe(
@@ -6115,7 +6151,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
6115
6151
  createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
6116
6152
  acceptedAt: acceptAction.createdAt,
6117
6153
  createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
6118
- createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
6119
6154
  registrationNumber
6120
6155
  };
6121
6156
  }
@@ -6329,17 +6364,6 @@ function getAssignedUserFromActions(actions) {
6329
6364
  return user2;
6330
6365
  }, null);
6331
6366
  }
6332
- function getAssignedUserSignatureFromActions(actions) {
6333
- return actions.reduce((signature, action) => {
6334
- if (action.type === ActionType.ASSIGN) {
6335
- return action.createdBySignature || null;
6336
- }
6337
- if (action.type === ActionType.UNASSIGN) {
6338
- return null;
6339
- }
6340
- return signature;
6341
- }, null);
6342
- }
6343
6367
  function deepDropNulls(obj) {
6344
6368
  if (Array.isArray(obj)) {
6345
6369
  return obj.map(deepDropNulls);
@@ -6435,10 +6459,8 @@ function getCurrentEventState(event2, config) {
6435
6459
  createdBy: creationAction.createdBy,
6436
6460
  createdByUserType: creationAction.createdByUserType,
6437
6461
  createdAtLocation: creationAction.createdAtLocation,
6438
- createdBySignature: creationAction.createdBySignature,
6439
6462
  updatedAt: acceptedActionMetadata.createdAt,
6440
6463
  assignedTo: getAssignedUserFromActions(acceptedActions),
6441
- assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
6442
6464
  updatedBy: requestActionMetadata.createdBy,
6443
6465
  updatedAtLocation: requestActionMetadata.createdAtLocation,
6444
6466
  declaration,
@@ -9697,7 +9719,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
9697
9719
  createdBy: overrides.createdBy ?? generateUuid(rng),
9698
9720
  createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
9699
9721
  updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
9700
- createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
9701
9722
  updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
9702
9723
  assignedTo: overrides.assignedTo ?? null,
9703
9724
  updatedBy: overrides.updatedBy ?? generateUuid(rng),
@@ -9930,11 +9951,77 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
9930
9951
  }
9931
9952
  return true;
9932
9953
  }
9954
+ function canAccessUserWithScope({
9955
+ userToAccess,
9956
+ scope,
9957
+ user: user2
9958
+ }) {
9959
+ const opts = scope.options;
9960
+ const hasSameOffice = user2.primaryOfficeId === userToAccess.primaryOfficeId;
9961
+ if (opts?.accessLevel === JurisdictionFilter.enum.location && !hasSameOffice) {
9962
+ return false;
9963
+ }
9964
+ const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
9965
+ (id) => user2.administrativeAreaId === id
9966
+ ) || user2.administrativeAreaId === null;
9967
+ if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
9968
+ return false;
9969
+ }
9970
+ if (scopeUsesRoleOptions(scope)) {
9971
+ const { options } = scope;
9972
+ if (options?.role && !options.role.includes(userToAccess.role)) {
9973
+ return false;
9974
+ }
9975
+ }
9976
+ return true;
9977
+ }
9978
+ function canAccessOtherUserWithScopes({
9979
+ scopes,
9980
+ userToAccess,
9981
+ user: user2
9982
+ }) {
9983
+ return scopes.some(
9984
+ (scope) => canAccessUserWithScope({ userToAccess, scope, user: user2 })
9985
+ );
9986
+ }
9933
9987
  function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
9934
9988
  return scopes.some(
9935
9989
  (scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
9936
9990
  );
9937
9991
  }
9992
+ function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
9993
+ const collectedLocations = [];
9994
+ const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
9995
+ let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
9996
+ while (current) {
9997
+ collectedLocations.push(current);
9998
+ if (!current.parentId) {
9999
+ break;
10000
+ }
10001
+ const parentId = current.parentId;
10002
+ current = administrativeAreas.get(parentId);
10003
+ }
10004
+ return collectedLocations;
10005
+ }
10006
+ function getLocationHierarchy(selectedId, context) {
10007
+ const { administrativeAreas, locations } = context;
10008
+ const loc = locations.get(selectedId);
10009
+ if (loc) {
10010
+ if (loc.administrativeAreaId) {
10011
+ const hierarchy2 = getAdministrativeAreaHierarchy(
10012
+ loc.administrativeAreaId,
10013
+ administrativeAreas
10014
+ );
10015
+ return [...hierarchy2.reverse().map((area) => area.id), loc.id];
10016
+ }
10017
+ return [loc.id];
10018
+ }
10019
+ const hierarchy = getAdministrativeAreaHierarchy(
10020
+ selectedId,
10021
+ administrativeAreas
10022
+ );
10023
+ return hierarchy.reverse().map((area) => area.id);
10024
+ }
9938
10025
 
9939
10026
  // ../commons/src/events/scopes.ts
9940
10027
  var ACTION_SCOPE_MAP = {
@@ -10009,6 +10096,25 @@ function isActionInScope({
10009
10096
  );
10010
10097
  return canAccess;
10011
10098
  }
10099
+ function getAvailableRolesForUserUpdatePayload({
10100
+ allRoles,
10101
+ userLocation,
10102
+ acceptedScopes,
10103
+ userRequesting
10104
+ }) {
10105
+ const availableRoles = allRoles.filter((role) => {
10106
+ const canAccess = canAccessOtherUserWithScopes({
10107
+ userToAccess: {
10108
+ ...userLocation,
10109
+ role
10110
+ },
10111
+ user: userRequesting,
10112
+ scopes: acceptedScopes
10113
+ });
10114
+ return canAccess;
10115
+ });
10116
+ return availableRoles;
10117
+ }
10012
10118
 
10013
10119
  // ../commons/src/events/serializers/user/deserializer.ts
10014
10120
  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":"AA2aA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
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 birth event configs and workqueues.
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 (birth type only):
33
+ * defineConfig (every event type — birth, death, marriage, custom, etc.):
34
34
  * - Ensures the top-level `flags` array contains the `pending-first-certificate-issuance`
35
- * flag definition
35
+ * flag definition. The flag's i18n `label.id` is event-specific, e.g.
36
+ * `event.birth.flag.pending-first-certificate-issuance`,
37
+ * `event.death.flag.pending-first-certificate-issuance`.
36
38
  * - Ensures every `REGISTER` action has
37
39
  * `flags: [{ id: 'pending-first-certificate-issuance', operation: 'add' }]`
38
40
  * - Ensures every `PRINT_CERTIFICATE` action has
@@ -55,20 +57,27 @@ const ACTION_PROPERTY_NAME = 'action';
55
57
  const FLAGS_PROPERTY_NAME = 'flags';
56
58
  const QUERY_PROPERTY_NAME = 'query';
57
59
  const TYPE_PROPERTY_NAME = 'type';
60
+ const ID_PROPERTY_NAME = 'id';
58
61
  const CLAUSES_PROPERTY_NAME = 'clauses';
59
62
  const ANY_OF_PROPERTY_NAME = 'anyOf';
60
63
  const FLAG_ID = 'pending-first-certificate-issuance';
61
64
  const REGISTER_TYPE = 'REGISTER';
62
65
  const PRINT_CERTIFICATE_TYPE = 'PRINT_CERTIFICATE';
63
- const FLAG_DEFINITION_INITIALIZER = `{
66
+ /**
67
+ * Builds the flag-definition object literal for a given event type so the i18n
68
+ * `label.id` is namespaced per event (e.g. `event.death.flag.…`).
69
+ */
70
+ function flagDefinitionInitializer(eventType) {
71
+ return `{
64
72
  id: '${FLAG_ID}',
65
73
  label: {
66
- id: 'event.birth.flag.${FLAG_ID}',
74
+ id: 'event.${eventType}.flag.${FLAG_ID}',
67
75
  defaultMessage: 'Pending first certificate issuance',
68
76
  description: 'Flag label for first certificate issuance'
69
77
  },
70
78
  requiresAction: true
71
79
  }`;
80
+ }
72
81
  // ─── Generic helpers ──────────────────────────────────────────────────────────
73
82
  /**
74
83
  * Returns true if the object's `type` property matches the given type name.
@@ -90,23 +99,36 @@ function isActionOfType(obj, typeName) {
90
99
  return false;
91
100
  }
92
101
  /**
93
- * Returns true when the `defineConfig` root config object describes a birth event.
94
- * Handles both `'birth'` string literal and `EventType.BIRTH` enum access.
102
+ * Extracts the event type from a `defineConfig` root config object, using the
103
+ * (lower-cased) value of either the `type` or `id` property. Property name has
104
+ * shifted across core/country-config versions, so both are tried.
105
+ *
106
+ * Handles all known shapes:
107
+ * - `type: 'birth'` / `id: 'birth'`
108
+ * - `type: EventType.BIRTH` / `id: Event.Birth`
109
+ *
110
+ * For `PropertyAccessExpression` (enum access), the *member name* is returned
111
+ * lower-cased — this works for the conventional `EventType.BIRTH = 'birth'` and
112
+ * `Event.Birth = 'birth'` mappings used in core and country configs.
113
+ *
114
+ * Returns null when no event type can be determined.
95
115
  */
96
- function isBirthConfig(configArg) {
97
- const typeProperty = configArg.getProperty(TYPE_PROPERTY_NAME);
98
- if (!typeProperty || !ts_morph_1.Node.isPropertyAssignment(typeProperty))
99
- return false;
100
- const initializer = typeProperty.getInitializer();
101
- if (!initializer)
102
- return false;
103
- if (ts_morph_1.Node.isStringLiteral(initializer)) {
104
- return initializer.getLiteralValue().toLowerCase() === 'birth';
105
- }
106
- if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
107
- return initializer.getName().toLowerCase() === 'birth';
116
+ function getEventType(configArg) {
117
+ for (const propName of [TYPE_PROPERTY_NAME, ID_PROPERTY_NAME]) {
118
+ const prop = configArg.getProperty(propName);
119
+ if (!prop || !ts_morph_1.Node.isPropertyAssignment(prop))
120
+ continue;
121
+ const initializer = prop.getInitializer();
122
+ if (!initializer)
123
+ continue;
124
+ if (ts_morph_1.Node.isStringLiteral(initializer)) {
125
+ return initializer.getLiteralValue().toLowerCase();
126
+ }
127
+ if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
128
+ return initializer.getName().toLowerCase();
129
+ }
108
130
  }
109
- return false;
131
+ return null;
110
132
  }
111
133
  /**
112
134
  * Returns true if an array literal contains an object literal with `id: <id>`.
@@ -129,17 +151,19 @@ function hasElementWithId(array, id) {
129
151
  }
130
152
  // ─── defineConfig helpers ─────────────────────────────────────────────────────
131
153
  /**
132
- * Ensures the top-level `flags` array in a birth `defineConfig` contains the
133
- * `pending-first-certificate-issuance` flag definition.
154
+ * Ensures the top-level `flags` array in a `defineConfig` contains the
155
+ * `pending-first-certificate-issuance` flag definition. The flag's i18n
156
+ * `label.id` is namespaced per event type (e.g. `event.death.flag.…`).
134
157
  */
135
- function ensureTopLevelFlagDefinition(configArg) {
158
+ function ensureTopLevelFlagDefinition(configArg, eventType) {
159
+ const initializer = flagDefinitionInitializer(eventType);
136
160
  const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME);
137
161
  if (flagsProp && ts_morph_1.Node.isPropertyAssignment(flagsProp)) {
138
162
  const flagsInit = flagsProp.getInitializer();
139
163
  if (flagsInit && ts_morph_1.Node.isArrayLiteralExpression(flagsInit)) {
140
164
  if (hasElementWithId(flagsInit, FLAG_ID))
141
165
  return false;
142
- flagsInit.addElement(FLAG_DEFINITION_INITIALIZER);
166
+ flagsInit.addElement(initializer);
143
167
  return true;
144
168
  }
145
169
  return false;
@@ -147,7 +171,7 @@ function ensureTopLevelFlagDefinition(configArg) {
147
171
  // No `flags` property at all — create it
148
172
  configArg.addPropertyAssignment({
149
173
  name: FLAGS_PROPERTY_NAME,
150
- initializer: `[\n ${FLAG_DEFINITION_INITIALIZER}\n]`
174
+ initializer: `[\n ${initializer}\n]`
151
175
  });
152
176
  return true;
153
177
  }
@@ -174,15 +198,15 @@ function ensureActionOperationFlag(action, operation) {
174
198
  return true;
175
199
  }
176
200
  /**
177
- * Processes a birth defineConfig object: ensures top-level flag definition,
201
+ * Processes a `defineConfig` object: ensures top-level flag definition,
178
202
  * REGISTER action flags, and PRINT_CERTIFICATE action flags.
179
203
  * Returns the number of changes made.
180
204
  */
181
- function processBirthConfig(configArg, relPath) {
205
+ function processConfig(configArg, eventType, relPath) {
182
206
  let changes = 0;
183
- if (ensureTopLevelFlagDefinition(configArg)) {
207
+ if (ensureTopLevelFlagDefinition(configArg, eventType)) {
184
208
  changes++;
185
- console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
209
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`);
186
210
  }
187
211
  const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME);
188
212
  if (!actionsProp || !ts_morph_1.Node.isPropertyAssignment(actionsProp))
@@ -197,13 +221,13 @@ function processBirthConfig(configArg, relPath) {
197
221
  if (isActionOfType(element, REGISTER_TYPE)) {
198
222
  if (ensureActionOperationFlag(element, 'add')) {
199
223
  changes++;
200
- console.log(` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`);
224
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`);
201
225
  }
202
226
  }
203
227
  if (isActionOfType(element, PRINT_CERTIFICATE_TYPE)) {
204
228
  if (ensureActionOperationFlag(element, 'remove')) {
205
229
  changes++;
206
- console.log(` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
230
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
207
231
  }
208
232
  }
209
233
  }
@@ -332,9 +356,10 @@ function processFile(filePath, project) {
332
356
  const configArg = args[0];
333
357
  if (!ts_morph_1.Node.isObjectLiteralExpression(configArg))
334
358
  continue;
335
- if (!isBirthConfig(configArg))
359
+ const eventType = getEventType(configArg);
360
+ if (!eventType)
336
361
  continue;
337
- totalChanges += processBirthConfig(configArg, relPath);
362
+ totalChanges += processConfig(configArg, eventType, relPath);
338
363
  }
339
364
  // ── defineWorkqueues ──────────────────────────────────────────────────────
340
365
  if (calleeName === DEFINE_WORKQUEUES_NAME) {
@@ -369,7 +394,7 @@ function processFile(filePath, project) {
369
394
  function main() {
370
395
  return __awaiter(this, void 0, void 0, function* () {
371
396
  const srcDir = path_1.default.join(process.cwd(), 'src');
372
- console.log(`Scanning for birth defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
397
+ console.log(`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
373
398
  const project = new ts_morph_1.Project({
374
399
  tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
375
400
  skipAddingFilesFromTsConfig: false
@@ -390,7 +415,7 @@ function main() {
390
415
  }
391
416
  }
392
417
  if (modifiedFiles.length === 0) {
393
- console.log('No birth configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
418
+ console.log('No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
394
419
  return;
395
420
  }
396
421
  console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
@@ -1,5 +1,5 @@
1
1
  export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
2
- export declare const UPSTREAM_BRANCH = "develop";
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;AAG1D,eAAO,MAAM,eAAe,YAAY,CAAA;AAcxC;;;;;;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"}
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"}