@opencrvs/toolkit 2.0.0-rc.df1ed4f → 2.0.0-rc.e008ebf

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 (42) 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 +49 -27
  4. package/dist/cli.js +442 -169
  5. package/dist/commons/api/router.d.ts +3008 -268
  6. package/dist/commons/conditionals/conditionals.d.ts +6 -6
  7. package/dist/commons/conditionals/validate.d.ts +1 -0
  8. package/dist/commons/events/ActionInput.d.ts +108 -0
  9. package/dist/commons/events/Draft.d.ts +3 -0
  10. package/dist/commons/events/FieldConfig.d.ts +10 -0
  11. package/dist/commons/events/locations.d.ts +38 -1
  12. package/dist/commons/events/mocks.test.utils.d.ts +19 -0
  13. package/dist/commons/events/scopes.d.ts +24 -1
  14. package/dist/commons/events/utils.d.ts +1 -1
  15. package/dist/conditionals/index.js +37 -7
  16. package/dist/events/index.js +158 -41
  17. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
  18. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
  19. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  20. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  21. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  22. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  23. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  24. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  25. package/dist/migrations/v2.0/index.d.ts +5 -3
  26. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  27. package/dist/migrations/v2.0/index.js +442 -169
  28. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  29. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
  30. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  31. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  32. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  33. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  34. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  35. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  36. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  37. package/dist/notification/index.js +52 -27
  38. package/dist/scopes/index.d.ts +87 -10
  39. package/dist/scopes/index.js +43 -8
  40. package/opencrvs-toolkit-2.0.0-rc.e008ebf.tgz +0 -0
  41. package/package.json +1 -1
  42. package/opencrvs-toolkit-2.0.0-rc.df1ed4f.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
- z6.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
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
@@ -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
- z2.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
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
@@ -1376,28 +1414,20 @@ function schemaPriority(schema) {
1376
1414
  return idx === -1 ? 9999 : idx;
1377
1415
  }
1378
1416
  function safeUnion(schemas) {
1417
+ const sortedSchemas = [...schemas].sort(
1418
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1419
+ );
1379
1420
  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
- });
1421
+ for (const schema of sortedSchemas) {
1422
+ if (schema.safeParse(val).success) {
1423
+ return;
1424
+ }
1400
1425
  }
1426
+ ctx.addIssue({
1427
+ code: "invalid_type",
1428
+ expected: "custom",
1429
+ message: "Value does not match any schema"
1430
+ });
1401
1431
  }).meta({
1402
1432
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1403
1433
  });
@@ -3766,6 +3796,9 @@ function precompileActionSchemas(eventConfigurations) {
3766
3796
  function isAgeValue(value) {
3767
3797
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3768
3798
  }
3799
+ function mergeWithBaseFormState(values, context) {
3800
+ return { ...context.baseFormState, ...values };
3801
+ }
3769
3802
  function validate(schema, data) {
3770
3803
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3771
3804
  if ("$form" in data) {
@@ -3804,7 +3837,7 @@ function isOnline() {
3804
3837
  }
3805
3838
  function isConditionMet(conditional, values, context, eventIndex) {
3806
3839
  return validate(conditional, {
3807
- $form: values,
3840
+ $form: mergeWithBaseFormState(values, context),
3808
3841
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3809
3842
  $online: isOnline(),
3810
3843
  $user: context.user,
@@ -3833,7 +3866,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3833
3866
  return true;
3834
3867
  }
3835
3868
  const validConditionals = getConditionalActionsForField(field3, {
3836
- $form: form,
3869
+ $form: mergeWithBaseFormState(form, context),
3837
3870
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3838
3871
  $online: isOnline(),
3839
3872
  $user: context.user,
@@ -4025,7 +4058,7 @@ function runFieldValidations({
4025
4058
  return [];
4026
4059
  }
4027
4060
  const conditionalParameters = {
4028
- $form: form,
4061
+ $form: mergeWithBaseFormState(form, context),
4029
4062
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4030
4063
  /**
4031
4064
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4269,17 +4302,16 @@ function isPageVisible(page, formValues, context) {
4269
4302
  }
4270
4303
  return isConditionMet(page.conditional, formValues, context);
4271
4304
  }
4272
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4305
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4273
4306
  const base = (0, import_lodash.cloneDeep)(formValues);
4274
4307
  function fn(prevVisibilityContext) {
4275
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4276
4308
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4277
4309
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4278
4310
  if (!fieldConfig.length) {
4279
4311
  return false;
4280
4312
  }
4281
4313
  const isHidden = fieldConfig.every(
4282
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4314
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4283
4315
  );
4284
4316
  if (!isHidden) {
4285
4317
  return false;
@@ -4297,7 +4329,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4297
4329
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4298
4330
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4299
4331
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4300
- return hiddenFields.some((f) => f.id === fieldId);
4332
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4301
4333
  });
4302
4334
  return omitHiddenFields(
4303
4335
  visibleFields,
@@ -4344,13 +4376,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4344
4376
  }
4345
4377
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4346
4378
  const annotationFields = getActionAnnotationFields(actionConfig);
4347
- return omitHiddenFields(
4348
- annotationFields,
4349
- annotation,
4350
- context,
4351
- false,
4352
- declaration
4353
- );
4379
+ return omitHiddenFields(annotationFields, annotation, {
4380
+ ...context,
4381
+ baseFormState: declaration
4382
+ });
4354
4383
  }
4355
4384
  function deepMerge(currentDocument, actionDocument) {
4356
4385
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5862,6 +5891,9 @@ var BaseActionInput = z38.object({
5862
5891
  originalActionId: UUID.optional(),
5863
5892
  // should not be part of base action.
5864
5893
  keepAssignment: z38.boolean().optional(),
5894
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5895
+ keepAssignmentIfRejected: z38.boolean().optional(),
5896
+ waitFor: z38.boolean().optional(),
5865
5897
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5866
5898
  // @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
5899
  createdAtLocation: UUID.nullish().describe(
@@ -9930,11 +9962,77 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
9930
9962
  }
9931
9963
  return true;
9932
9964
  }
9965
+ function canAccessUserWithScope({
9966
+ userToAccess,
9967
+ scope,
9968
+ user: user2
9969
+ }) {
9970
+ const opts = scope.options;
9971
+ const hasSameOffice = user2.primaryOfficeId === userToAccess.primaryOfficeId;
9972
+ if (opts?.accessLevel === JurisdictionFilter.enum.location && !hasSameOffice) {
9973
+ return false;
9974
+ }
9975
+ const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
9976
+ (id) => user2.administrativeAreaId === id
9977
+ ) || user2.administrativeAreaId === null;
9978
+ if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
9979
+ return false;
9980
+ }
9981
+ if (scopeUsesRoleOptions(scope)) {
9982
+ const { options } = scope;
9983
+ if (options?.role && !options.role.includes(userToAccess.role)) {
9984
+ return false;
9985
+ }
9986
+ }
9987
+ return true;
9988
+ }
9989
+ function canAccessOtherUserWithScopes({
9990
+ scopes,
9991
+ userToAccess,
9992
+ user: user2
9993
+ }) {
9994
+ return scopes.some(
9995
+ (scope) => canAccessUserWithScope({ userToAccess, scope, user: user2 })
9996
+ );
9997
+ }
9933
9998
  function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
9934
9999
  return scopes.some(
9935
10000
  (scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
9936
10001
  );
9937
10002
  }
10003
+ function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
10004
+ const collectedLocations = [];
10005
+ const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
10006
+ let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
10007
+ while (current) {
10008
+ collectedLocations.push(current);
10009
+ if (!current.parentId) {
10010
+ break;
10011
+ }
10012
+ const parentId = current.parentId;
10013
+ current = administrativeAreas.get(parentId);
10014
+ }
10015
+ return collectedLocations;
10016
+ }
10017
+ function getLocationHierarchy(selectedId, context) {
10018
+ const { administrativeAreas, locations } = context;
10019
+ const loc = locations.get(selectedId);
10020
+ if (loc) {
10021
+ if (loc.administrativeAreaId) {
10022
+ const hierarchy2 = getAdministrativeAreaHierarchy(
10023
+ loc.administrativeAreaId,
10024
+ administrativeAreas
10025
+ );
10026
+ return [...hierarchy2.reverse().map((area) => area.id), loc.id];
10027
+ }
10028
+ return [loc.id];
10029
+ }
10030
+ const hierarchy = getAdministrativeAreaHierarchy(
10031
+ selectedId,
10032
+ administrativeAreas
10033
+ );
10034
+ return hierarchy.reverse().map((area) => area.id);
10035
+ }
9938
10036
 
9939
10037
  // ../commons/src/events/scopes.ts
9940
10038
  var ACTION_SCOPE_MAP = {
@@ -10009,6 +10107,25 @@ function isActionInScope({
10009
10107
  );
10010
10108
  return canAccess;
10011
10109
  }
10110
+ function getAvailableRolesForUserUpdatePayload({
10111
+ allRoles,
10112
+ userLocation,
10113
+ acceptedScopes,
10114
+ userRequesting
10115
+ }) {
10116
+ const availableRoles = allRoles.filter((role) => {
10117
+ const canAccess = canAccessOtherUserWithScopes({
10118
+ userToAccess: {
10119
+ ...userLocation,
10120
+ role
10121
+ },
10122
+ user: userRequesting,
10123
+ scopes: acceptedScopes
10124
+ });
10125
+ return canAccess;
10126
+ });
10127
+ return availableRoles;
10128
+ }
10012
10129
 
10013
10130
  // ../commons/src/events/serializers/user/deserializer.ts
10014
10131
  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';
@@ -1,3 +1,11 @@
1
- declare function main(): Promise<void>;
1
+ interface DeleteInfrastructureOptions {
2
+ /**
3
+ * Top-level entries directly under `infrastructure/` to preserve. Names
4
+ * match against the basename of each entry (file or directory). When
5
+ * empty (the default), the whole `infrastructure/` directory is deleted.
6
+ */
7
+ keep?: string[];
8
+ }
9
+ declare function main({ keep }?: DeleteInfrastructureOptions): Promise<void>;
2
10
  export { main };
3
11
  //# sourceMappingURL=delete-infrastructure-directory.d.ts.map