@opencrvs/toolkit 2.0.0-rc.95d0463 → 2.0.0-rc.95de735

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.
@@ -1260,7 +1260,8 @@ var Range = import_v4.z.object({
1260
1260
  });
1261
1261
  var ContainsFlags = import_v4.z.object({
1262
1262
  anyOf: import_v4.z.array(Flag).optional(),
1263
- noneOf: import_v4.z.array(Flag).optional()
1263
+ noneOf: import_v4.z.array(Flag).optional(),
1264
+ allOf: import_v4.z.array(Flag).optional()
1264
1265
  }).meta({
1265
1266
  id: "ContainsFlags"
1266
1267
  });
package/dist/cli.js CHANGED
@@ -4300,7 +4300,7 @@ Saved ${handlerRelPath}.`);
4300
4300
  // src/migrations/v2.0/checkout-upstream-files.ts
4301
4301
  var import_child_process = require("child_process");
4302
4302
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4303
- var UPSTREAM_BRANCH = "release-v2.0.0";
4303
+ var UPSTREAM_BRANCH = "release/2.0.0";
4304
4304
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4305
4305
  var FILES_TO_CHECKOUT = [
4306
4306
  "src/analytics/analytics.ts",
@@ -8013,6 +8013,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
8013
8013
  flags?: {
8014
8014
  anyOf?: string[] | undefined;
8015
8015
  noneOf?: string[] | undefined;
8016
+ allOf?: string[] | undefined;
8016
8017
  } | undefined;
8017
8018
  data?: unknown;
8018
8019
  }[];
@@ -8151,6 +8152,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
8151
8152
  flags?: {
8152
8153
  anyOf?: string[] | undefined;
8153
8154
  noneOf?: string[] | undefined;
8155
+ allOf?: string[] | undefined;
8154
8156
  } | undefined;
8155
8157
  data?: unknown;
8156
8158
  }[];
@@ -85,6 +85,32 @@ export declare const ActionConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
85
85
  fields: z.ZodArray<z.ZodType<FieldConfig, import("./FieldConfig").FieldConfigInput, z.core.$ZodTypeInternals<FieldConfig, import("./FieldConfig").FieldConfigInput>>>;
86
86
  }, z.core.$strip>;
87
87
  conditionals: z.ZodOptional<z.ZodNever>;
88
+ }, z.core.$strip>, z.ZodObject<{
89
+ label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
90
+ flags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
91
+ id: z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
92
+ readonly INCOMPLETE: "incomplete";
93
+ readonly REJECTED: "rejected";
94
+ readonly CORRECTION_REQUESTED: "correction-requested";
95
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
96
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
97
+ }>]>, z.ZodString]>;
98
+ operation: z.ZodEnum<{
99
+ add: "add";
100
+ remove: "remove";
101
+ }>;
102
+ conditional: z.ZodOptional<z.ZodAny>;
103
+ }, z.core.$strip>>>>;
104
+ supportingCopy: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
105
+ icon: z.ZodOptional<z.ZodString>;
106
+ conditionals: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
107
+ type: z.ZodLiteral<"SHOW">;
108
+ conditional: z.ZodAny;
109
+ }, z.core.$strip>, z.ZodObject<{
110
+ type: z.ZodLiteral<"ENABLE">;
111
+ conditional: z.ZodAny;
112
+ }, z.core.$strip>], "type">>>;
113
+ type: z.ZodLiteral<"NOTIFY">;
88
114
  }, z.core.$strip>, z.ZodObject<{
89
115
  label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
90
116
  flags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -388,8 +414,8 @@ export declare const actionConfigTypes: Set<ActionConfigTypes>;
388
414
  *
389
415
  * These are not the same as the broader workflow `action.type` values.
390
416
  * `ActionConfigTypes` includes only the action kinds that can be defined
391
- * in the country configuration (e.g. DECLARE, VALIDATE, CUSTOM), and
392
- * excludes workflow-only types such as CREATE or NOTIFY.
417
+ * in the country configuration (e.g. NOTIFY, DECLARE, VALIDATE, CUSTOM), and
418
+ * excludes workflow-only types such as CREATE.
393
419
  */
394
420
  export type ActionConfigTypes = ActionConfig['type'];
395
421
  export declare const DeclarationActionConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -346,6 +346,13 @@ export declare const SerializedQueryExpression: z.ZodObject<{
346
346
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
347
347
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
348
348
  }>]>, z.ZodString]>>>;
349
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
350
+ readonly INCOMPLETE: "incomplete";
351
+ readonly REJECTED: "rejected";
352
+ readonly CORRECTION_REQUESTED: "correction-requested";
353
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
354
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
355
+ }>]>, z.ZodString]>>>;
349
356
  }, z.core.$strip>>>;
350
357
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
351
358
  }, z.core.$strip>;
@@ -657,6 +664,13 @@ export declare const CountryConfigQueryType: z.ZodDiscriminatedUnion<[z.ZodObjec
657
664
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
658
665
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
659
666
  }>]>, z.ZodString]>>>;
667
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
668
+ readonly INCOMPLETE: "incomplete";
669
+ readonly REJECTED: "rejected";
670
+ readonly CORRECTION_REQUESTED: "correction-requested";
671
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
672
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
673
+ }>]>, z.ZodString]>>>;
660
674
  }, z.core.$strip>>>;
661
675
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
662
676
  }, z.core.$strip>>;
@@ -967,6 +981,13 @@ export declare const CountryConfigQueryType: z.ZodDiscriminatedUnion<[z.ZodObjec
967
981
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
968
982
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
969
983
  }>]>, z.ZodString]>>>;
984
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
985
+ readonly INCOMPLETE: "incomplete";
986
+ readonly REJECTED: "rejected";
987
+ readonly CORRECTION_REQUESTED: "correction-requested";
988
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
989
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
990
+ }>]>, z.ZodString]>>>;
970
991
  }, z.core.$strip>>>;
971
992
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
972
993
  }, z.core.$strip>>;
@@ -1277,6 +1298,13 @@ export declare const CountryConfigQueryInputType: z.ZodUnion<readonly [z.ZodObje
1277
1298
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1278
1299
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
1279
1300
  }>]>, z.ZodString]>>>;
1301
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
1302
+ readonly INCOMPLETE: "incomplete";
1303
+ readonly REJECTED: "rejected";
1304
+ readonly CORRECTION_REQUESTED: "correction-requested";
1305
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1306
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
1307
+ }>]>, z.ZodString]>>>;
1280
1308
  }, z.core.$strip>>>;
1281
1309
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
1282
1310
  }, z.core.$strip>, z.ZodObject<{
@@ -1586,6 +1614,13 @@ export declare const CountryConfigQueryInputType: z.ZodUnion<readonly [z.ZodObje
1586
1614
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1587
1615
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
1588
1616
  }>]>, z.ZodString]>>>;
1617
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
1618
+ readonly INCOMPLETE: "incomplete";
1619
+ readonly REJECTED: "rejected";
1620
+ readonly CORRECTION_REQUESTED: "correction-requested";
1621
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1622
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
1623
+ }>]>, z.ZodString]>>>;
1589
1624
  }, z.core.$strip>>>;
1590
1625
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
1591
1626
  }, z.core.$strip>>;
@@ -1896,6 +1931,13 @@ export declare const CountryConfigQueryInputType: z.ZodUnion<readonly [z.ZodObje
1896
1931
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1897
1932
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
1898
1933
  }>]>, z.ZodString]>>>;
1934
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
1935
+ readonly INCOMPLETE: "incomplete";
1936
+ readonly REJECTED: "rejected";
1937
+ readonly CORRECTION_REQUESTED: "correction-requested";
1938
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1939
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
1940
+ }>]>, z.ZodString]>>>;
1899
1941
  }, z.core.$strip>>>;
1900
1942
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
1901
1943
  }, z.core.$strip>>;
@@ -127,6 +127,13 @@ export declare const ContainsFlags: z.ZodObject<{
127
127
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
128
128
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
129
129
  }>]>, z.ZodString]>>>;
130
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
131
+ readonly INCOMPLETE: "incomplete";
132
+ readonly REJECTED: "rejected";
133
+ readonly CORRECTION_REQUESTED: "correction-requested";
134
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
135
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
136
+ }>]>, z.ZodString]>>>;
130
137
  }, z.core.$strip>;
131
138
  export declare const Within: z.ZodObject<{
132
139
  type: z.ZodLiteral<"within">;
@@ -306,6 +313,13 @@ export declare const QueryExpression: z.ZodObject<{
306
313
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
307
314
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
308
315
  }>]>, z.ZodString]>>>;
316
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
317
+ readonly INCOMPLETE: "incomplete";
318
+ readonly REJECTED: "rejected";
319
+ readonly CORRECTION_REQUESTED: "correction-requested";
320
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
321
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
322
+ }>]>, z.ZodString]>>>;
309
323
  }, z.core.$strip>>>;
310
324
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
311
325
  }, z.core.$strip>;
@@ -322,6 +322,13 @@ export declare const WorkqueueConfig: z.ZodObject<{
322
322
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
323
323
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
324
324
  }>]>, z.ZodString]>>>;
325
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
326
+ readonly INCOMPLETE: "incomplete";
327
+ readonly REJECTED: "rejected";
328
+ readonly CORRECTION_REQUESTED: "correction-requested";
329
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
330
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
331
+ }>]>, z.ZodString]>>>;
325
332
  }, z.core.$strip>>>;
326
333
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
327
334
  }, z.core.$strip>>;
@@ -632,6 +639,13 @@ export declare const WorkqueueConfig: z.ZodObject<{
632
639
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
633
640
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
634
641
  }>]>, z.ZodString]>>>;
642
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
643
+ readonly INCOMPLETE: "incomplete";
644
+ readonly REJECTED: "rejected";
645
+ readonly CORRECTION_REQUESTED: "correction-requested";
646
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
647
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
648
+ }>]>, z.ZodString]>>>;
635
649
  }, z.core.$strip>>>;
636
650
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
637
651
  }, z.core.$strip>>;
@@ -1361,6 +1375,13 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
1361
1375
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1362
1376
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
1363
1377
  }>]>, z.ZodString]>>>;
1378
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
1379
+ readonly INCOMPLETE: "incomplete";
1380
+ readonly REJECTED: "rejected";
1381
+ readonly CORRECTION_REQUESTED: "correction-requested";
1382
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1383
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
1384
+ }>]>, z.ZodString]>>>;
1364
1385
  }, z.core.$strip>>>;
1365
1386
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
1366
1387
  }, z.core.$strip>, z.ZodObject<{
@@ -1670,6 +1691,13 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
1670
1691
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1671
1692
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
1672
1693
  }>]>, z.ZodString]>>>;
1694
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
1695
+ readonly INCOMPLETE: "incomplete";
1696
+ readonly REJECTED: "rejected";
1697
+ readonly CORRECTION_REQUESTED: "correction-requested";
1698
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1699
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
1700
+ }>]>, z.ZodString]>>>;
1673
1701
  }, z.core.$strip>>>;
1674
1702
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
1675
1703
  }, z.core.$strip>>;
@@ -1980,6 +2008,13 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
1980
2008
  readonly POTENTIAL_DUPLICATE: "potential-duplicate";
1981
2009
  readonly EDIT_IN_PROGRESS: "edit-in-progress";
1982
2010
  }>]>, z.ZodString]>>>;
2011
+ allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
2012
+ readonly INCOMPLETE: "incomplete";
2013
+ readonly REJECTED: "rejected";
2014
+ readonly CORRECTION_REQUESTED: "correction-requested";
2015
+ readonly POTENTIAL_DUPLICATE: "potential-duplicate";
2016
+ readonly EDIT_IN_PROGRESS: "edit-in-progress";
2017
+ }>]>, z.ZodString]>>>;
1983
2018
  }, z.core.$strip>>>;
1984
2019
  data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
1985
2020
  }, z.core.$strip>>;
@@ -2130,6 +2165,7 @@ export declare function defineWorkqueue(workqueueInput: WorkqueueConfigInput): {
2130
2165
  flags?: {
2131
2166
  anyOf?: string[] | undefined;
2132
2167
  noneOf?: string[] | undefined;
2168
+ allOf?: string[] | undefined;
2133
2169
  } | undefined;
2134
2170
  data?: unknown;
2135
2171
  }[];
@@ -2268,6 +2304,7 @@ export declare function defineWorkqueue(workqueueInput: WorkqueueConfigInput): {
2268
2304
  flags?: {
2269
2305
  anyOf?: string[] | undefined;
2270
2306
  noneOf?: string[] | undefined;
2307
+ allOf?: string[] | undefined;
2271
2308
  } | undefined;
2272
2309
  data?: unknown;
2273
2310
  }[];
@@ -2439,6 +2476,7 @@ export declare function defineWorkqueues(workqueues: WorkqueueConfigInputWithV19
2439
2476
  flags?: {
2440
2477
  anyOf?: string[] | undefined;
2441
2478
  noneOf?: string[] | undefined;
2479
+ allOf?: string[] | undefined;
2442
2480
  } | undefined;
2443
2481
  data?: unknown;
2444
2482
  }[];
@@ -2577,6 +2615,7 @@ export declare function defineWorkqueues(workqueues: WorkqueueConfigInputWithV19
2577
2615
  flags?: {
2578
2616
  anyOf?: string[] | undefined;
2579
2617
  noneOf?: string[] | undefined;
2618
+ allOf?: string[] | undefined;
2580
2619
  } | undefined;
2581
2620
  data?: unknown;
2582
2621
  }[];
@@ -2023,7 +2023,8 @@ var Range = import_v4.z.object({
2023
2023
  });
2024
2024
  var ContainsFlags = import_v4.z.object({
2025
2025
  anyOf: import_v4.z.array(Flag).optional(),
2026
- noneOf: import_v4.z.array(Flag).optional()
2026
+ noneOf: import_v4.z.array(Flag).optional(),
2027
+ allOf: import_v4.z.array(Flag).optional()
2027
2028
  }).meta({
2028
2029
  id: "ContainsFlags"
2029
2030
  });
@@ -3222,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
3222
3223
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
3223
3224
  }).shape
3224
3225
  );
3226
+ var NotifyConfig = ActionConfigBase.extend(
3227
+ z24.object({
3228
+ type: z24.literal(ActionType.NOTIFY)
3229
+ }).shape
3230
+ );
3225
3231
  var DeclareConfig = DeclarationActionBase.extend(
3226
3232
  z24.object({
3227
3233
  type: z24.literal(ActionType.DECLARE),
@@ -3306,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
3306
3312
  id: "ReadActionConfig",
3307
3313
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
3308
3314
  }),
3315
+ NotifyConfig.meta({
3316
+ id: "NotifyActionConfig",
3317
+ description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
3318
+ }),
3309
3319
  DeclareConfig.meta({
3310
3320
  id: "DeclareActionConfig",
3311
- description: "Configuration for the declare action. Includes review-page fields. Shared with the notify action (ActionType.NOTIFY)."
3321
+ description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
3312
3322
  }),
3313
3323
  RejectConfig.meta({
3314
3324
  id: "RejectActionConfig",
@@ -4477,13 +4487,13 @@ function getActionConfig({
4477
4487
  actionType,
4478
4488
  customActionType
4479
4489
  }) {
4490
+ if (actionType === ActionType.NOTIFY) {
4491
+ return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
4492
+ }
4480
4493
  return eventConfiguration.actions.find((a) => {
4481
4494
  if (a.type === ActionType.CUSTOM && customActionType) {
4482
4495
  return a.customActionType === customActionType;
4483
4496
  }
4484
- if (actionType === ActionType.NOTIFY) {
4485
- return a.type === ActionType.DECLARE;
4486
- }
4487
4497
  if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
4488
4498
  return a.type === ActionType.REQUEST_CORRECTION;
4489
4499
  }
@@ -4520,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
4520
4530
  if (actionConfig.type === ActionType.CUSTOM) {
4521
4531
  return actionConfig.form;
4522
4532
  }
4523
- if ("review" in actionConfig) {
4533
+ if ("review" in actionConfig && actionConfig.review != null) {
4524
4534
  return actionConfig.review.fields;
4525
4535
  }
4526
4536
  return [];
@@ -6535,9 +6545,6 @@ function getLegalStatuses(actions) {
6535
6545
  // ../commons/src/events/state/flags.ts
6536
6546
  var import_lodash3 = require("lodash");
6537
6547
  var import_date_fns3 = require("date-fns");
6538
- function isEditInProgress(actions) {
6539
- return actions.at(-1)?.type === ActionType.EDIT;
6540
- }
6541
6548
  function findPendingCorrectionAction(writeActions2) {
6542
6549
  let correctionRequestAction;
6543
6550
  for (let i = writeActions2.length - 1; i >= 0; i--) {
@@ -6552,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
6552
6559
  }
6553
6560
  return correctionRequestAction;
6554
6561
  }
6555
- function isCorrectionRequested(actions) {
6556
- return findPendingCorrectionAction(actions) !== void 0;
6557
- }
6558
- function isDeclarationIncomplete(actions) {
6559
- return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
6560
- }
6561
- function isRejected(actions) {
6562
- const resettingActionTypes = [
6563
- ActionType.NOTIFY,
6564
- ActionType.DECLARE,
6565
- ActionType.EDIT,
6566
- ActionType.REGISTER
6567
- ];
6568
- return actions.reduce((prev, { type }) => {
6569
- if (type === ActionType.REJECT) {
6570
- return true;
6571
- }
6572
- if (resettingActionTypes.includes(type)) {
6573
- return false;
6574
- }
6575
- return prev;
6576
- }, false);
6577
- }
6578
6562
  function isPotentialDuplicate(actions) {
6579
6563
  return actions.reduce((prev, { type }) => {
6580
6564
  if (type === ActionType.DUPLICATE_DETECTED) {
@@ -6602,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
6602
6586
  }
6603
6587
  });
6604
6588
  }
6589
+ function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
6590
+ if (!isActionConfigType(action.type)) {
6591
+ return false;
6592
+ }
6593
+ const actionConfig = getActionConfig({
6594
+ eventConfiguration,
6595
+ actionType: action.type,
6596
+ customActionType: "customActionType" in action ? action.customActionType : void 0
6597
+ });
6598
+ const removeOperations = (actionConfig?.flags ?? []).filter(
6599
+ ({ id, operation }) => id === flagId && operation === "remove"
6600
+ );
6601
+ if (removeOperations.length === 0) {
6602
+ return false;
6603
+ }
6604
+ const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
6605
+ const declaration = aggregateActionDeclarations(eventUpToThisAction);
6606
+ const annotation = aggregateActionAnnotations(eventUpToThisAction);
6607
+ const form = { ...declaration, ...annotation };
6608
+ return removeOperations.some(
6609
+ ({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
6610
+ );
6611
+ }
6612
+ var INHERENT_FLAG_RULES = [
6613
+ {
6614
+ flag: InherentFlags.CORRECTION_REQUESTED,
6615
+ setOn: [ActionType.REQUEST_CORRECTION],
6616
+ resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
6617
+ },
6618
+ {
6619
+ // INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
6620
+ // other status-changing action (see getStatusFromActions).
6621
+ flag: InherentFlags.INCOMPLETE,
6622
+ setOn: [ActionType.NOTIFY],
6623
+ resetOn: [
6624
+ ActionType.CREATE,
6625
+ ActionType.DECLARE,
6626
+ ActionType.REGISTER,
6627
+ ActionType.ARCHIVE
6628
+ ]
6629
+ },
6630
+ {
6631
+ flag: InherentFlags.REJECTED,
6632
+ setOn: [ActionType.REJECT],
6633
+ resetOn: [
6634
+ ActionType.NOTIFY,
6635
+ ActionType.DECLARE,
6636
+ ActionType.EDIT,
6637
+ ActionType.REGISTER
6638
+ ]
6639
+ },
6640
+ {
6641
+ flag: InherentFlags.POTENTIAL_DUPLICATE,
6642
+ setOn: [ActionType.DUPLICATE_DETECTED],
6643
+ resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
6644
+ },
6645
+ {
6646
+ flag: InherentFlags.EDIT_IN_PROGRESS,
6647
+ setOn: [ActionType.EDIT],
6648
+ resetOnAnyOtherAction: true
6649
+ }
6650
+ ];
6651
+ function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
6652
+ return acceptedActions.reduce((present, action, idx) => {
6653
+ if (rule.setOn.includes(action.type)) {
6654
+ return true;
6655
+ }
6656
+ if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
6657
+ return false;
6658
+ }
6659
+ if (actionConfigRemovesFlag(
6660
+ action,
6661
+ rule.flag,
6662
+ acceptedActions.slice(0, idx + 1),
6663
+ event2,
6664
+ eventConfiguration
6665
+ )) {
6666
+ return false;
6667
+ }
6668
+ return present;
6669
+ }, false);
6670
+ }
6605
6671
  function resolveEventCustomFlags(event2, eventConfiguration) {
6606
6672
  const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6607
6673
  return actions.reduce((acc, action, idx) => {
@@ -6650,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
6650
6716
  return flag2;
6651
6717
  });
6652
6718
  }
6653
- function getInherentFlags(sortedActions) {
6719
+ function getInherentFlags(sortedActions, event2, eventConfiguration) {
6654
6720
  const acceptedActions = sortedActions.filter(
6655
6721
  ({ status: status2 }) => status2 === ActionStatus.Accepted
6656
6722
  );
6657
- const inherentFlags = [];
6658
- if (isCorrectionRequested(acceptedActions)) {
6659
- inherentFlags.push(InherentFlags.CORRECTION_REQUESTED);
6660
- }
6661
- if (isDeclarationIncomplete(acceptedActions)) {
6662
- inherentFlags.push(InherentFlags.INCOMPLETE);
6663
- }
6664
- if (isRejected(acceptedActions)) {
6665
- inherentFlags.push(InherentFlags.REJECTED);
6666
- }
6667
- if (isPotentialDuplicate(acceptedActions)) {
6668
- inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
6669
- }
6670
- if (isEditInProgress(acceptedActions)) {
6671
- inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
6672
- }
6673
- return inherentFlags;
6723
+ return INHERENT_FLAG_RULES.filter(
6724
+ (rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
6725
+ ).map(({ flag: flag2 }) => flag2);
6674
6726
  }
6675
6727
  function getEventFlags(event2, config) {
6676
6728
  const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6677
6729
  return [
6678
6730
  ...getActionStatusFlags(sortedActions),
6679
- ...getInherentFlags(sortedActions),
6731
+ ...getInherentFlags(sortedActions, event2, config),
6680
6732
  ...resolveEventCustomFlags(event2, config)
6681
6733
  ];
6682
6734
  }
@@ -8242,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
8242
8294
  },
8243
8295
  review: TENNIS_CLUB_DECLARATION_REVIEW
8244
8296
  },
8297
+ {
8298
+ type: ActionType.NOTIFY,
8299
+ label: {
8300
+ defaultMessage: "Notify health worker",
8301
+ description: "This is shown as the action name anywhere the user can trigger the action from",
8302
+ id: "event.tennis-club-membership.action.notify.label"
8303
+ },
8304
+ flags: [
8305
+ {
8306
+ id: "health-worker-notified",
8307
+ operation: "add"
8308
+ }
8309
+ ]
8310
+ },
8245
8311
  {
8246
8312
  type: ActionType.REJECT,
8247
8313
  label: {
@@ -8484,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
8484
8550
  }
8485
8551
  }
8486
8552
  ],
8553
+ flags: [
8554
+ {
8555
+ id: "health-worker-notified",
8556
+ requiresAction: false,
8557
+ label: {
8558
+ id: "event.tennis-club-membership.flag.health-worker-notified.label",
8559
+ defaultMessage: "Health worker notified",
8560
+ description: "Label for the health-worker-notified flag"
8561
+ }
8562
+ }
8563
+ ],
8487
8564
  advancedSearch: [
8488
8565
  {
8489
8566
  title: {
@@ -10242,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
10242
10319
  return locationIds.some((id) => id === user2.primaryOfficeId);
10243
10320
  }
10244
10321
  if (filter === JurisdictionFilter.enum.administrativeArea) {
10245
- return user2.administrativeAreaId === null || locationIds.some((id) => id === user2.administrativeAreaId);
10322
+ return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
10246
10323
  }
10247
10324
  return true;
10248
10325
  }
@@ -10331,7 +10408,7 @@ function canAccessUserWithScope({
10331
10408
  }
10332
10409
  const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
10333
10410
  (id) => user2.administrativeAreaId === id
10334
- ) || user2.administrativeAreaId === null;
10411
+ ) || !user2.administrativeAreaId;
10335
10412
  if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
10336
10413
  return false;
10337
10414
  }
@@ -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';
@@ -4312,7 +4312,7 @@ Saved ${handlerRelPath}.`);
4312
4312
  // src/migrations/v2.0/checkout-upstream-files.ts
4313
4313
  var import_child_process = require("child_process");
4314
4314
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4315
- var UPSTREAM_BRANCH = "release-v2.0.0";
4315
+ var UPSTREAM_BRANCH = "release/2.0.0";
4316
4316
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4317
4317
  var FILES_TO_CHECKOUT = [
4318
4318
  "src/analytics/analytics.ts",
@@ -1483,7 +1483,8 @@ var Range = import_v4.z.object({
1483
1483
  });
1484
1484
  var ContainsFlags = import_v4.z.object({
1485
1485
  anyOf: import_v4.z.array(Flag).optional(),
1486
- noneOf: import_v4.z.array(Flag).optional()
1486
+ noneOf: import_v4.z.array(Flag).optional(),
1487
+ allOf: import_v4.z.array(Flag).optional()
1487
1488
  }).meta({
1488
1489
  id: "ContainsFlags"
1489
1490
  });
@@ -2679,6 +2680,11 @@ var ReadActionConfig = ActionConfigBase.extend(
2679
2680
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
2680
2681
  }).shape
2681
2682
  );
2683
+ var NotifyConfig = ActionConfigBase.extend(
2684
+ z24.object({
2685
+ type: z24.literal(ActionType.NOTIFY)
2686
+ }).shape
2687
+ );
2682
2688
  var DeclareConfig = DeclarationActionBase.extend(
2683
2689
  z24.object({
2684
2690
  type: z24.literal(ActionType.DECLARE),
@@ -2763,9 +2769,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
2763
2769
  id: "ReadActionConfig",
2764
2770
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
2765
2771
  }),
2772
+ NotifyConfig.meta({
2773
+ id: "NotifyActionConfig",
2774
+ description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
2775
+ }),
2766
2776
  DeclareConfig.meta({
2767
2777
  id: "DeclareActionConfig",
2768
- description: "Configuration for the declare action. Includes review-page fields. Shared with the notify action (ActionType.NOTIFY)."
2778
+ description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
2769
2779
  }),
2770
2780
  RejectConfig.meta({
2771
2781
  id: "RejectActionConfig",
@@ -3199,7 +3209,7 @@ var getActionAnnotationFields = (actionConfig) => {
3199
3209
  if (actionConfig.type === ActionType.CUSTOM) {
3200
3210
  return actionConfig.form;
3201
3211
  }
3202
- if ("review" in actionConfig) {
3212
+ if ("review" in actionConfig && actionConfig.review != null) {
3203
3213
  return actionConfig.review.fields;
3204
3214
  }
3205
3215
  return [];
@@ -4711,6 +4721,45 @@ var updateActions = ActionTypes.extract([
4711
4721
  // ../commons/src/events/state/flags.ts
4712
4722
  var import_lodash3 = require("lodash");
4713
4723
  var import_date_fns3 = require("date-fns");
4724
+ var INHERENT_FLAG_RULES = [
4725
+ {
4726
+ flag: InherentFlags.CORRECTION_REQUESTED,
4727
+ setOn: [ActionType.REQUEST_CORRECTION],
4728
+ resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
4729
+ },
4730
+ {
4731
+ // INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
4732
+ // other status-changing action (see getStatusFromActions).
4733
+ flag: InherentFlags.INCOMPLETE,
4734
+ setOn: [ActionType.NOTIFY],
4735
+ resetOn: [
4736
+ ActionType.CREATE,
4737
+ ActionType.DECLARE,
4738
+ ActionType.REGISTER,
4739
+ ActionType.ARCHIVE
4740
+ ]
4741
+ },
4742
+ {
4743
+ flag: InherentFlags.REJECTED,
4744
+ setOn: [ActionType.REJECT],
4745
+ resetOn: [
4746
+ ActionType.NOTIFY,
4747
+ ActionType.DECLARE,
4748
+ ActionType.EDIT,
4749
+ ActionType.REGISTER
4750
+ ]
4751
+ },
4752
+ {
4753
+ flag: InherentFlags.POTENTIAL_DUPLICATE,
4754
+ setOn: [ActionType.DUPLICATE_DETECTED],
4755
+ resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
4756
+ },
4757
+ {
4758
+ flag: InherentFlags.EDIT_IN_PROGRESS,
4759
+ setOn: [ActionType.EDIT],
4760
+ resetOnAnyOtherAction: true
4761
+ }
4762
+ ];
4714
4763
 
4715
4764
  // ../commons/src/events/defineConfig.ts
4716
4765
  var IGNORED_EVENT_TYPES = [
@@ -6017,6 +6066,20 @@ var tennisClubMembershipEvent = defineConfig({
6017
6066
  },
6018
6067
  review: TENNIS_CLUB_DECLARATION_REVIEW
6019
6068
  },
6069
+ {
6070
+ type: ActionType.NOTIFY,
6071
+ label: {
6072
+ defaultMessage: "Notify health worker",
6073
+ description: "This is shown as the action name anywhere the user can trigger the action from",
6074
+ id: "event.tennis-club-membership.action.notify.label"
6075
+ },
6076
+ flags: [
6077
+ {
6078
+ id: "health-worker-notified",
6079
+ operation: "add"
6080
+ }
6081
+ ]
6082
+ },
6020
6083
  {
6021
6084
  type: ActionType.REJECT,
6022
6085
  label: {
@@ -6259,6 +6322,17 @@ var tennisClubMembershipEvent = defineConfig({
6259
6322
  }
6260
6323
  }
6261
6324
  ],
6325
+ flags: [
6326
+ {
6327
+ id: "health-worker-notified",
6328
+ requiresAction: false,
6329
+ label: {
6330
+ id: "event.tennis-club-membership.flag.health-worker-notified.label",
6331
+ defaultMessage: "Health worker notified",
6332
+ description: "Label for the health-worker-notified flag"
6333
+ }
6334
+ }
6335
+ ],
6262
6336
  advancedSearch: [
6263
6337
  {
6264
6338
  title: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opencrvs/toolkit",
3
- "version": "2.0.0-rc.95d0463",
3
+ "version": "2.0.0-rc.95de735",
4
4
  "description": "OpenCRVS toolkit for building country configurations",
5
5
  "license": "MPL-2.0",
6
6
  "bin": {