@opencrvs/toolkit 2.0.0-rc.db7e47e → 2.0.0-rc.dd09a6d

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 +22 -32
  4. package/dist/cli.js +504 -170
  5. package/dist/commons/api/router.d.ts +3321 -267
  6. package/dist/commons/application-config/index.d.ts +16 -4
  7. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  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 +5 -0
  14. package/dist/commons/events/locations.d.ts +21 -0
  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 +5 -3
  21. package/dist/events/index.js +89 -58
  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 +502 -168
  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 +21 -28
  46. package/dist/scopes/index.d.ts +6 -1
  47. package/dist/scopes/index.js +5 -3
  48. package/opencrvs-toolkit-2.0.0-rc.dd09a6d.tgz +0 -0
  49. package/package.json +1 -1
  50. package/tsconfig.tsbuildinfo +1 -1
  51. package/opencrvs-toolkit-2.0.0-rc.db7e47e.tgz +0 -0
@@ -1,8 +1,9 @@
1
1
  import { DisplayableAction } from './ActionType';
2
- import { EncodedScope } from '../scopes';
2
+ import { EncodedScope, UserScopeV2 } from '../scopes';
3
3
  import { EventIndexWithAdministrativeHierarchy } from './locations';
4
4
  import { UserContext } from '../users/User';
5
5
  import { EventIndex } from './EventIndex';
6
+ import { UUID } from 'src/uuid';
6
7
  export declare const ACTION_SCOPE_MAP: {
7
8
  READ: "record.read"[];
8
9
  CREATE: "record.create"[];
@@ -53,4 +54,26 @@ export declare function isActionInScope({ scopes, action, event, currentUser }:
53
54
  event: EventIndexWithAdministrativeHierarchy;
54
55
  currentUser: UserContext;
55
56
  }): boolean;
57
+ /**
58
+ *
59
+ *
60
+ * @param allRoles - All possible roles in the system
61
+ * @param userLocation - The location and role information of the user whose role options are being determined
62
+ * @param acceptedScopes - The scopes of the user requesting the role update, used to determine which roles they can assign.
63
+ * @param userRequesting - The user context of the user requesting the role update, used to check location-based access to the target user's location.
64
+ *
65
+ * @returns An array of roles that the requesting user is allowed to assign to the target user based on their scopes and location
66
+ *
67
+ * 1) Used to determine which roles should be available in the dropdown when a user is editing another user's role in the user management interface.
68
+ * 2) Used to check if payload includes valid role.
69
+ */
70
+ export declare function getAvailableRolesForUserUpdatePayload({ allRoles, userLocation, acceptedScopes, userRequesting }: {
71
+ allRoles: string[];
72
+ userRequesting: UserContext;
73
+ acceptedScopes: UserScopeV2[];
74
+ userLocation: {
75
+ administrativeHierarchy: UUID[];
76
+ primaryOfficeId: UUID;
77
+ };
78
+ }): string[];
56
79
  //# sourceMappingURL=scopes.d.ts.map
@@ -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, declarationContext?: EventState): Partial<T>;
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
  ]);
@@ -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 successful = schemas.filter((s) => s.safeParse(val).success);
1414
- if (successful.length === 1) {
1415
- return;
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, declarationContext) {
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, visibilityForm, validatorContext)
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
- annotationFields,
4382
- annotation,
4383
- context,
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 +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"}
@@ -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
- // @TODO: This needs to be changed to 'release-v2.0.0' once the branch is created
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';