@opencrvs/toolkit 2.0.0-rc.9734a92 → 2.0.0-rc.9744a94

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.
@@ -30,6 +30,15 @@ export declare function getActionUpdateMetadata(actions: Action[]): Pick<{
30
30
  * @see EventIndex for the description of the returned object.
31
31
  */
32
32
  export declare function getLegalStatuses(actions: Action[]): {
33
+ NOTIFIED: {
34
+ createdAt: string;
35
+ createdBy: string;
36
+ createdByUserType: "user" | "system";
37
+ createdAtLocation: (string & import("zod").$brand<"UUID">) | null | undefined;
38
+ acceptedAt: string;
39
+ createdByRole: string | undefined;
40
+ registrationNumber: string | null | undefined;
41
+ } | null;
33
42
  DECLARED: {
34
43
  createdAt: string;
35
44
  createdBy: string;
@@ -192,6 +192,8 @@ var scopeOptionsPlaceEvent = z6.object({
192
192
  placeOfEvent: JurisdictionFilter.optional()
193
193
  }).describe("Options applicable to all record scopes.");
194
194
  var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
195
+ notifiedIn: JurisdictionFilter.optional(),
196
+ notifiedBy: UserFilter.optional(),
195
197
  declaredIn: JurisdictionFilter.optional(),
196
198
  declaredBy: UserFilter.optional()
197
199
  }).describe("Options applicable to actions that may take place after DECLARE");
@@ -233,6 +235,8 @@ var ResolvedScopeOptionsPlaceEvent = z6.object({
233
235
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
234
236
  );
235
237
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
238
+ notifiedIn: UUID.nullish(),
239
+ notifiedBy: z6.string().optional(),
236
240
  declaredIn: UUID.nullish(),
237
241
  declaredBy: z6.string().optional()
238
242
  }).describe(
@@ -367,8 +371,9 @@ var EncodedScope2 = z6.string().brand("EncodedScope");
367
371
  var DEFAULT_SCOPE_OPTIONS = {
368
372
  placeOfEvent: JurisdictionFilter.enum.all,
369
373
  accessLevel: JurisdictionFilter.enum.all,
370
- registeredIn: JurisdictionFilter.enum.all,
371
- declaredIn: JurisdictionFilter.enum.all
374
+ notifiedIn: JurisdictionFilter.enum.all,
375
+ declaredIn: JurisdictionFilter.enum.all,
376
+ registeredIn: JurisdictionFilter.enum.all
372
377
  };
373
378
 
374
379
  // ../commons/src/users/userReferences.ts
@@ -151,6 +151,7 @@ __export(events_exports, {
151
151
  FormPageConfig: () => FormPageConfig,
152
152
  Fuzzy: () => Fuzzy,
153
153
  GeographicalArea: () => GeographicalArea,
154
+ HiddenFieldTypes: () => HiddenFieldTypes,
154
155
  HiddenFieldValue: () => HiddenFieldValue,
155
156
  HttpFieldUpdateValue: () => HttpFieldUpdateValue,
156
157
  HttpFieldValue: () => HttpFieldValue,
@@ -520,6 +521,8 @@ var scopeOptionsPlaceEvent = z2.object({
520
521
  placeOfEvent: JurisdictionFilter.optional()
521
522
  }).describe("Options applicable to all record scopes.");
522
523
  var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
524
+ notifiedIn: JurisdictionFilter.optional(),
525
+ notifiedBy: UserFilter.optional(),
523
526
  declaredIn: JurisdictionFilter.optional(),
524
527
  declaredBy: UserFilter.optional()
525
528
  }).describe("Options applicable to actions that may take place after DECLARE");
@@ -561,6 +564,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
561
564
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
562
565
  );
563
566
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
567
+ notifiedIn: UUID.nullish(),
568
+ notifiedBy: z2.string().optional(),
564
569
  declaredIn: UUID.nullish(),
565
570
  declaredBy: z2.string().optional()
566
571
  }).describe(
@@ -711,20 +716,27 @@ var unflattenScope = (input) => {
711
716
  return { type, options };
712
717
  };
713
718
  var EncodedScope = z2.string().brand("EncodedScope");
714
- var decodeScope = (query) => {
715
- const scope = qs.parse(query, {
719
+ var decodedScopeCache = /* @__PURE__ */ new Map();
720
+ var decodeScope = (encodedScope) => {
721
+ if (decodedScopeCache.has(encodedScope)) {
722
+ return decodedScopeCache.get(encodedScope);
723
+ }
724
+ const scope = qs.parse(encodedScope, {
716
725
  ignoreQueryPrefix: true,
717
726
  comma: true,
718
727
  allowDots: true
719
728
  });
720
729
  const unflattenedScope = unflattenScope(scope);
721
- return Scope.safeParse(unflattenedScope)?.data;
730
+ const result = Scope.safeParse(unflattenedScope)?.data;
731
+ decodedScopeCache.set(encodedScope, result);
732
+ return result;
722
733
  };
723
734
  var DEFAULT_SCOPE_OPTIONS = {
724
735
  placeOfEvent: JurisdictionFilter.enum.all,
725
736
  accessLevel: JurisdictionFilter.enum.all,
726
- registeredIn: JurisdictionFilter.enum.all,
727
- declaredIn: JurisdictionFilter.enum.all
737
+ notifiedIn: JurisdictionFilter.enum.all,
738
+ declaredIn: JurisdictionFilter.enum.all,
739
+ registeredIn: JurisdictionFilter.enum.all
728
740
  };
729
741
  function getAcceptedScopesByType({
730
742
  acceptedScopes,
@@ -1213,6 +1225,11 @@ var FieldTypesToHideInReview = [
1213
1225
  FieldType.ALPHA_PRINT_BUTTON,
1214
1226
  FieldType.ALPHA_HIDDEN
1215
1227
  ];
1228
+ var HiddenFieldTypes = [
1229
+ FieldType.HTTP,
1230
+ FieldType.QUERY_PARAM_READER,
1231
+ FieldType.ALPHA_HIDDEN
1232
+ ];
1216
1233
 
1217
1234
  // ../commons/src/events/FieldValue.ts
1218
1235
  var z12 = __toESM(require("zod/v4"));
@@ -1339,7 +1356,7 @@ function plainDateToLocalDate(date) {
1339
1356
  // ../commons/src/events/FieldValue.ts
1340
1357
  var TextValue = z12.string();
1341
1358
  var HiddenFieldValue = z12.string();
1342
- var NonEmptyTextValue = TextValue.min(1);
1359
+ var NonEmptyTextValue = z12.string().trim().min(1);
1343
1360
  var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
1344
1361
  var AgeValue = z12.object({
1345
1362
  age: z12.number(),
@@ -1803,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1803
1820
  )
1804
1821
  });
1805
1822
  var LegalStatuses = z16.object({
1823
+ [EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
1806
1824
  [EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
1807
1825
  [EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
1808
1826
  });
@@ -1944,6 +1962,8 @@ var eventMetadataLabelMap = {
1944
1962
  var EventMetadataDateFieldIdInput = z16.enum([
1945
1963
  "createdAt",
1946
1964
  "updatedAt",
1965
+ "legalStatuses.NOTIFIED.createdAt",
1966
+ "legalStatuses.NOTIFIED.acceptedAt",
1947
1967
  "legalStatuses.DECLARED.createdAt",
1948
1968
  "legalStatuses.DECLARED.acceptedAt",
1949
1969
  "legalStatuses.REGISTERED.createdAt",
@@ -1952,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
1952
1972
  var EventMetadataDateFieldId = z16.enum([
1953
1973
  "event.createdAt",
1954
1974
  "event.updatedAt",
1975
+ "event.legalStatuses.NOTIFIED.createdAt",
1976
+ "event.legalStatuses.NOTIFIED.acceptedAt",
1955
1977
  "event.legalStatuses.DECLARED.createdAt",
1956
1978
  "event.legalStatuses.DECLARED.acceptedAt",
1957
1979
  "event.legalStatuses.REGISTERED.createdAt",
@@ -2286,6 +2308,7 @@ var NumberField = BaseField.extend({
2286
2308
  configuration: import_v43.default.object({
2287
2309
  min: import_v43.default.number().optional().describe("Minimum value"),
2288
2310
  max: import_v43.default.number().optional().describe("Maximum value"),
2311
+ integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
2289
2312
  prefix: TranslationConfig.optional(),
2290
2313
  postfix: TranslationConfig.optional()
2291
2314
  }).optional()
@@ -3209,6 +3232,11 @@ var ReadActionConfig = ActionConfigBase.extend(
3209
3232
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
3210
3233
  }).shape
3211
3234
  );
3235
+ var NotifyConfig = ActionConfigBase.extend(
3236
+ z24.object({
3237
+ type: z24.literal(ActionType.NOTIFY)
3238
+ }).shape
3239
+ );
3212
3240
  var DeclareConfig = DeclarationActionBase.extend(
3213
3241
  z24.object({
3214
3242
  type: z24.literal(ActionType.DECLARE),
@@ -3293,9 +3321,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
3293
3321
  id: "ReadActionConfig",
3294
3322
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
3295
3323
  }),
3324
+ NotifyConfig.meta({
3325
+ id: "NotifyActionConfig",
3326
+ description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
3327
+ }),
3296
3328
  DeclareConfig.meta({
3297
3329
  id: "DeclareActionConfig",
3298
- description: "Configuration for the declare action. Includes review-page fields. Shared with the notify action (ActionType.NOTIFY)."
3330
+ description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
3299
3331
  }),
3300
3332
  RejectConfig.meta({
3301
3333
  id: "RejectActionConfig",
@@ -3902,7 +3934,7 @@ var isHiddenFieldType = (field3) => {
3902
3934
  return field3.config.type === FieldType.ALPHA_HIDDEN;
3903
3935
  };
3904
3936
  var isNonInteractiveFieldType = (field3) => {
3905
- return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.HTTP || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.QUERY_PARAM_READER || field3.type === FieldType.LOADER;
3937
+ return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
3906
3938
  };
3907
3939
 
3908
3940
  // ../commons/src/conditionals/validate.ts
@@ -4464,13 +4496,13 @@ function getActionConfig({
4464
4496
  actionType,
4465
4497
  customActionType
4466
4498
  }) {
4499
+ if (actionType === ActionType.NOTIFY) {
4500
+ return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
4501
+ }
4467
4502
  return eventConfiguration.actions.find((a) => {
4468
4503
  if (a.type === ActionType.CUSTOM && customActionType) {
4469
4504
  return a.customActionType === customActionType;
4470
4505
  }
4471
- if (actionType === ActionType.NOTIFY) {
4472
- return a.type === ActionType.DECLARE;
4473
- }
4474
4506
  if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
4475
4507
  return a.type === ActionType.REQUEST_CORRECTION;
4476
4508
  }
@@ -4507,7 +4539,7 @@ var getActionAnnotationFields = (actionConfig) => {
4507
4539
  if (actionConfig.type === ActionType.CUSTOM) {
4508
4540
  return actionConfig.form;
4509
4541
  }
4510
- if ("review" in actionConfig) {
4542
+ if ("review" in actionConfig && actionConfig.review != null) {
4511
4543
  return actionConfig.review.fields;
4512
4544
  }
4513
4545
  return [];
@@ -6479,6 +6511,8 @@ var updateActions = ActionTypes.extract([
6479
6511
  ActionType.ARCHIVE,
6480
6512
  ActionType.PRINT_CERTIFICATE,
6481
6513
  ActionType.REQUEST_CORRECTION,
6514
+ ActionType.APPROVE_CORRECTION,
6515
+ ActionType.REJECT_CORRECTION,
6482
6516
  ActionType.CUSTOM
6483
6517
  ]);
6484
6518
  function getActionUpdateMetadata(actions) {
@@ -6506,6 +6540,10 @@ function getActionUpdateMetadata(actions) {
6506
6540
  }
6507
6541
  function getLegalStatuses(actions) {
6508
6542
  return {
6543
+ [EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
6544
+ ActionType.NOTIFY,
6545
+ actions
6546
+ ),
6509
6547
  [EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
6510
6548
  ActionType.DECLARE,
6511
6549
  actions
@@ -6520,9 +6558,6 @@ function getLegalStatuses(actions) {
6520
6558
  // ../commons/src/events/state/flags.ts
6521
6559
  var import_lodash3 = require("lodash");
6522
6560
  var import_date_fns3 = require("date-fns");
6523
- function isEditInProgress(actions) {
6524
- return actions.at(-1)?.type === ActionType.EDIT;
6525
- }
6526
6561
  function findPendingCorrectionAction(writeActions2) {
6527
6562
  let correctionRequestAction;
6528
6563
  for (let i = writeActions2.length - 1; i >= 0; i--) {
@@ -6537,29 +6572,6 @@ function findPendingCorrectionAction(writeActions2) {
6537
6572
  }
6538
6573
  return correctionRequestAction;
6539
6574
  }
6540
- function isCorrectionRequested(actions) {
6541
- return findPendingCorrectionAction(actions) !== void 0;
6542
- }
6543
- function isDeclarationIncomplete(actions) {
6544
- return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
6545
- }
6546
- function isRejected(actions) {
6547
- const resettingActionTypes = [
6548
- ActionType.NOTIFY,
6549
- ActionType.DECLARE,
6550
- ActionType.EDIT,
6551
- ActionType.REGISTER
6552
- ];
6553
- return actions.reduce((prev, { type }) => {
6554
- if (type === ActionType.REJECT) {
6555
- return true;
6556
- }
6557
- if (resettingActionTypes.includes(type)) {
6558
- return false;
6559
- }
6560
- return prev;
6561
- }, false);
6562
- }
6563
6575
  function isPotentialDuplicate(actions) {
6564
6576
  return actions.reduce((prev, { type }) => {
6565
6577
  if (type === ActionType.DUPLICATE_DETECTED) {
@@ -6587,6 +6599,88 @@ function isFlagConditionMet(conditional, form, action) {
6587
6599
  }
6588
6600
  });
6589
6601
  }
6602
+ function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
6603
+ if (!isActionConfigType(action.type)) {
6604
+ return false;
6605
+ }
6606
+ const actionConfig = getActionConfig({
6607
+ eventConfiguration,
6608
+ actionType: action.type,
6609
+ customActionType: "customActionType" in action ? action.customActionType : void 0
6610
+ });
6611
+ const removeOperations = (actionConfig?.flags ?? []).filter(
6612
+ ({ id, operation }) => id === flagId && operation === "remove"
6613
+ );
6614
+ if (removeOperations.length === 0) {
6615
+ return false;
6616
+ }
6617
+ const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
6618
+ const declaration = aggregateActionDeclarations(eventUpToThisAction);
6619
+ const annotation = aggregateActionAnnotations(eventUpToThisAction);
6620
+ const form = { ...declaration, ...annotation };
6621
+ return removeOperations.some(
6622
+ ({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
6623
+ );
6624
+ }
6625
+ var INHERENT_FLAG_RULES = [
6626
+ {
6627
+ flag: InherentFlags.CORRECTION_REQUESTED,
6628
+ setOn: [ActionType.REQUEST_CORRECTION],
6629
+ resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
6630
+ },
6631
+ {
6632
+ // INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
6633
+ // other status-changing action (see getStatusFromActions).
6634
+ flag: InherentFlags.INCOMPLETE,
6635
+ setOn: [ActionType.NOTIFY],
6636
+ resetOn: [
6637
+ ActionType.CREATE,
6638
+ ActionType.DECLARE,
6639
+ ActionType.REGISTER,
6640
+ ActionType.ARCHIVE
6641
+ ]
6642
+ },
6643
+ {
6644
+ flag: InherentFlags.REJECTED,
6645
+ setOn: [ActionType.REJECT],
6646
+ resetOn: [
6647
+ ActionType.NOTIFY,
6648
+ ActionType.DECLARE,
6649
+ ActionType.EDIT,
6650
+ ActionType.REGISTER
6651
+ ]
6652
+ },
6653
+ {
6654
+ flag: InherentFlags.POTENTIAL_DUPLICATE,
6655
+ setOn: [ActionType.DUPLICATE_DETECTED],
6656
+ resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
6657
+ },
6658
+ {
6659
+ flag: InherentFlags.EDIT_IN_PROGRESS,
6660
+ setOn: [ActionType.EDIT],
6661
+ resetOnAnyOtherAction: true
6662
+ }
6663
+ ];
6664
+ function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
6665
+ return acceptedActions.reduce((present, action, idx) => {
6666
+ if (rule.setOn.includes(action.type)) {
6667
+ return true;
6668
+ }
6669
+ if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
6670
+ return false;
6671
+ }
6672
+ if (actionConfigRemovesFlag(
6673
+ action,
6674
+ rule.flag,
6675
+ acceptedActions.slice(0, idx + 1),
6676
+ event2,
6677
+ eventConfiguration
6678
+ )) {
6679
+ return false;
6680
+ }
6681
+ return present;
6682
+ }, false);
6683
+ }
6590
6684
  function resolveEventCustomFlags(event2, eventConfiguration) {
6591
6685
  const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6592
6686
  return actions.reduce((acc, action, idx) => {
@@ -6635,33 +6729,19 @@ function getActionStatusFlags(sortedActions) {
6635
6729
  return flag2;
6636
6730
  });
6637
6731
  }
6638
- function getInherentFlags(sortedActions) {
6732
+ function getInherentFlags(sortedActions, event2, eventConfiguration) {
6639
6733
  const acceptedActions = sortedActions.filter(
6640
6734
  ({ status: status2 }) => status2 === ActionStatus.Accepted
6641
6735
  );
6642
- const inherentFlags = [];
6643
- if (isCorrectionRequested(acceptedActions)) {
6644
- inherentFlags.push(InherentFlags.CORRECTION_REQUESTED);
6645
- }
6646
- if (isDeclarationIncomplete(acceptedActions)) {
6647
- inherentFlags.push(InherentFlags.INCOMPLETE);
6648
- }
6649
- if (isRejected(acceptedActions)) {
6650
- inherentFlags.push(InherentFlags.REJECTED);
6651
- }
6652
- if (isPotentialDuplicate(acceptedActions)) {
6653
- inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
6654
- }
6655
- if (isEditInProgress(acceptedActions)) {
6656
- inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
6657
- }
6658
- return inherentFlags;
6736
+ return INHERENT_FLAG_RULES.filter(
6737
+ (rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
6738
+ ).map(({ flag: flag2 }) => flag2);
6659
6739
  }
6660
6740
  function getEventFlags(event2, config) {
6661
6741
  const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6662
6742
  return [
6663
6743
  ...getActionStatusFlags(sortedActions),
6664
- ...getInherentFlags(sortedActions),
6744
+ ...getInherentFlags(sortedActions, event2, config),
6665
6745
  ...resolveEventCustomFlags(event2, config)
6666
6746
  ];
6667
6747
  }
@@ -7666,6 +7746,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
7666
7746
  id: "signature.upload.modal.title",
7667
7747
  defaultMessage: "Draw signature",
7668
7748
  description: "Title for the modal to draw signature"
7749
+ },
7750
+ // Zod applies the schema default at parse time, but this fixture bypasses
7751
+ // parsing — GeneratedInputField accesses configuration.maxFileSize directly.
7752
+ configuration: {
7753
+ maxFileSize: 5 * 1024 * 1024
7669
7754
  }
7670
7755
  }
7671
7756
  ]
@@ -8222,6 +8307,20 @@ var tennisClubMembershipEvent = defineConfig({
8222
8307
  },
8223
8308
  review: TENNIS_CLUB_DECLARATION_REVIEW
8224
8309
  },
8310
+ {
8311
+ type: ActionType.NOTIFY,
8312
+ label: {
8313
+ defaultMessage: "Notify health worker",
8314
+ description: "This is shown as the action name anywhere the user can trigger the action from",
8315
+ id: "event.tennis-club-membership.action.notify.label"
8316
+ },
8317
+ flags: [
8318
+ {
8319
+ id: "health-worker-notified",
8320
+ operation: "add"
8321
+ }
8322
+ ]
8323
+ },
8225
8324
  {
8226
8325
  type: ActionType.REJECT,
8227
8326
  label: {
@@ -8464,6 +8563,17 @@ var tennisClubMembershipEvent = defineConfig({
8464
8563
  }
8465
8564
  }
8466
8565
  ],
8566
+ flags: [
8567
+ {
8568
+ id: "health-worker-notified",
8569
+ requiresAction: false,
8570
+ label: {
8571
+ id: "event.tennis-club-membership.flag.health-worker-notified.label",
8572
+ defaultMessage: "Health worker notified",
8573
+ description: "Label for the health-worker-notified flag"
8574
+ }
8575
+ }
8576
+ ],
8467
8577
  advancedSearch: [
8468
8578
  {
8469
8579
  title: {
@@ -10222,7 +10332,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
10222
10332
  return locationIds.some((id) => id === user2.primaryOfficeId);
10223
10333
  }
10224
10334
  if (filter === JurisdictionFilter.enum.administrativeArea) {
10225
- return user2.administrativeAreaId === null || locationIds.some((id) => id === user2.administrativeAreaId);
10335
+ return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
10226
10336
  }
10227
10337
  return true;
10228
10338
  }
@@ -10249,6 +10359,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
10249
10359
  }
10250
10360
  if (scopeUsesDeclaredOptions(scope)) {
10251
10361
  const { options } = scope;
10362
+ if (options?.notifiedBy === UserFilter.enum.user) {
10363
+ if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
10364
+ return false;
10365
+ }
10366
+ }
10367
+ if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
10368
+ event2.legalStatuses?.NOTIFIED?.createdAtLocation,
10369
+ JurisdictionFilter.enum.location,
10370
+ user2
10371
+ )) {
10372
+ return false;
10373
+ }
10374
+ if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
10375
+ event2.legalStatuses?.NOTIFIED?.createdAtLocation,
10376
+ JurisdictionFilter.enum.administrativeArea,
10377
+ user2
10378
+ )) {
10379
+ return false;
10380
+ }
10252
10381
  if (options?.declaredBy === UserFilter.enum.user) {
10253
10382
  if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
10254
10383
  return false;
@@ -10311,7 +10440,7 @@ function canAccessUserWithScope({
10311
10440
  }
10312
10441
  const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
10313
10442
  (id) => user2.administrativeAreaId === id
10314
- ) || user2.administrativeAreaId === null;
10443
+ ) || !user2.administrativeAreaId;
10315
10444
  if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
10316
10445
  return false;
10317
10446
  }
@@ -10617,18 +10746,19 @@ var ACTION_FILTERS = {
10617
10746
  function filterActionsByFlags(actions, flags) {
10618
10747
  return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
10619
10748
  }
10749
+ var REJECTED_ACTIONS = [
10750
+ ActionType.READ,
10751
+ ActionType.NOTIFY,
10752
+ ActionType.CUSTOM,
10753
+ ActionType.EDIT,
10754
+ ActionType.ARCHIVE
10755
+ ];
10620
10756
  function getAvailableActionsWithoutFlagFilters(status2, flags) {
10621
10757
  if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
10622
10758
  return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
10623
10759
  }
10624
- if (flags.includes(InherentFlags.REJECTED)) {
10625
- return [
10626
- ActionType.READ,
10627
- ActionType.NOTIFY,
10628
- ActionType.CUSTOM,
10629
- ActionType.EDIT,
10630
- ActionType.ARCHIVE
10631
- ];
10760
+ if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
10761
+ return REJECTED_ACTIONS;
10632
10762
  }
10633
10763
  return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
10634
10764
  }
@@ -1,5 +1,5 @@
1
1
  export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
2
- export declare const UPSTREAM_BRANCH = "release-v2.0.0";
2
+ export declare const UPSTREAM_BRANCH = "release/2.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;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"}
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,kBAAkB,CAAA;AAc9C;;;;;;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,7 +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
- exports.UPSTREAM_BRANCH = 'release-v2.0.0';
62
+ exports.UPSTREAM_BRANCH = 'release/2.0.0';
63
63
  // Remote name used only for the duration of this codemod. Prefixed to avoid
64
64
  // clashing with remotes the user may have (origin, upstream, etc.).
65
65
  const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
@@ -2205,6 +2205,8 @@ var scopeOptionsPlaceEvent = z3.object({
2205
2205
  placeOfEvent: JurisdictionFilter.optional()
2206
2206
  }).describe("Options applicable to all record scopes.");
2207
2207
  var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
2208
+ notifiedIn: JurisdictionFilter.optional(),
2209
+ notifiedBy: UserFilter.optional(),
2208
2210
  declaredIn: JurisdictionFilter.optional(),
2209
2211
  declaredBy: UserFilter.optional()
2210
2212
  }).describe("Options applicable to actions that may take place after DECLARE");
@@ -2246,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
2246
2248
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
2247
2249
  );
2248
2250
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
2251
+ notifiedIn: UUID.nullish(),
2252
+ notifiedBy: z3.string().optional(),
2249
2253
  declaredIn: UUID.nullish(),
2250
2254
  declaredBy: z3.string().optional()
2251
2255
  }).describe(
@@ -2394,20 +2398,27 @@ var encodeScope = (scope) => {
2394
2398
  encode: false
2395
2399
  });
2396
2400
  };
2397
- var decodeScope = (query) => {
2398
- const scope = qs.parse(query, {
2401
+ var decodedScopeCache = /* @__PURE__ */ new Map();
2402
+ var decodeScope = (encodedScope) => {
2403
+ if (decodedScopeCache.has(encodedScope)) {
2404
+ return decodedScopeCache.get(encodedScope);
2405
+ }
2406
+ const scope = qs.parse(encodedScope, {
2399
2407
  ignoreQueryPrefix: true,
2400
2408
  comma: true,
2401
2409
  allowDots: true
2402
2410
  });
2403
2411
  const unflattenedScope = unflattenScope(scope);
2404
- return Scope2.safeParse(unflattenedScope)?.data;
2412
+ const result = Scope2.safeParse(unflattenedScope)?.data;
2413
+ decodedScopeCache.set(encodedScope, result);
2414
+ return result;
2405
2415
  };
2406
2416
  var DEFAULT_SCOPE_OPTIONS = {
2407
2417
  placeOfEvent: JurisdictionFilter.enum.all,
2408
2418
  accessLevel: JurisdictionFilter.enum.all,
2409
- registeredIn: JurisdictionFilter.enum.all,
2410
- declaredIn: JurisdictionFilter.enum.all
2419
+ notifiedIn: JurisdictionFilter.enum.all,
2420
+ declaredIn: JurisdictionFilter.enum.all,
2421
+ registeredIn: JurisdictionFilter.enum.all
2411
2422
  };
2412
2423
 
2413
2424
  // ../commons/src/scopes.deprecated.do-not-use.ts
@@ -4306,7 +4317,7 @@ Saved ${handlerRelPath}.`);
4306
4317
  // src/migrations/v2.0/checkout-upstream-files.ts
4307
4318
  var import_child_process = require("child_process");
4308
4319
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4309
- var UPSTREAM_BRANCH = "release-v2.0.0";
4320
+ var UPSTREAM_BRANCH = "release/2.0.0";
4310
4321
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4311
4322
  var FILES_TO_CHECKOUT = [
4312
4323
  "src/analytics/analytics.ts",