@opencrvs/toolkit 2.0.0-rc.4f03e3a → 2.0.0-rc.4f04a0d

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 (82) hide show
  1. package/README.md +15 -0
  2. package/build.sh +3 -2
  3. package/dist/application-config/index.js +8 -1
  4. package/dist/cli.js +3243 -42
  5. package/dist/commons/api/router.d.ts +13 -2
  6. package/dist/commons/events/ActionConfig.d.ts +28 -2
  7. package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
  8. package/dist/commons/events/EventIndex.d.ts +14 -0
  9. package/dist/commons/events/FieldConfig.d.ts +1 -0
  10. package/dist/commons/events/FieldType.d.ts +1 -0
  11. package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
  12. package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
  13. package/dist/environment/custom-types.d.ts +33 -0
  14. package/dist/environment/custom-types.d.ts.map +1 -0
  15. package/dist/environment/custom-types.js +12 -0
  16. package/dist/environment/derived-variables.d.ts +134 -0
  17. package/dist/environment/derived-variables.d.ts.map +1 -0
  18. package/dist/environment/derived-variables.js +169 -0
  19. package/dist/environment/editor-questions.d.ts +4 -0
  20. package/dist/environment/editor-questions.d.ts.map +1 -0
  21. package/dist/environment/editor-questions.js +67 -0
  22. package/dist/environment/git.d.ts +5 -0
  23. package/dist/environment/git.d.ts.map +1 -0
  24. package/dist/environment/git.js +38 -0
  25. package/dist/environment/github.d.ts +26 -0
  26. package/dist/environment/github.d.ts.map +1 -0
  27. package/dist/environment/github.js +247 -0
  28. package/dist/environment/index.d.ts +5 -0
  29. package/dist/environment/index.d.ts.map +1 -0
  30. package/dist/environment/index.js +71 -0
  31. package/dist/environment/logger.d.ts +15 -0
  32. package/dist/environment/logger.d.ts.map +1 -0
  33. package/dist/environment/logger.js +25 -0
  34. package/dist/environment/manage-users.d.ts +11 -0
  35. package/dist/environment/manage-users.d.ts.map +1 -0
  36. package/dist/environment/manage-users.js +497 -0
  37. package/dist/environment/questions-helper.d.ts +15 -0
  38. package/dist/environment/questions-helper.d.ts.map +1 -0
  39. package/dist/environment/questions-helper.js +70 -0
  40. package/dist/environment/questions.d.ts +199 -0
  41. package/dist/environment/questions.d.ts.map +1 -0
  42. package/dist/environment/questions.js +412 -0
  43. package/dist/environment/setup-environment.d.ts +2 -0
  44. package/dist/environment/setup-environment.d.ts.map +1 -0
  45. package/dist/environment/setup-environment.js +794 -0
  46. package/dist/environment/ssh-keygen.d.ts +5 -0
  47. package/dist/environment/ssh-keygen.d.ts.map +1 -0
  48. package/dist/environment/ssh-keygen.js +21 -0
  49. package/dist/environment/swarm-to-k8s.d.ts +2 -0
  50. package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
  51. package/dist/environment/swarm-to-k8s.js +173 -0
  52. package/dist/environment/templates.d.ts +27 -0
  53. package/dist/environment/templates.d.ts.map +1 -0
  54. package/dist/environment/templates.js +163 -0
  55. package/dist/environment/update-workflows.d.ts +2 -0
  56. package/dist/environment/update-workflows.d.ts.map +1 -0
  57. package/dist/environment/update-workflows.js +169 -0
  58. package/dist/environment/users.d.ts +2 -0
  59. package/dist/environment/users.d.ts.map +1 -0
  60. package/dist/environment/users.js +112 -0
  61. package/dist/environment/utils.d.ts +18 -0
  62. package/dist/environment/utils.d.ts.map +1 -0
  63. package/dist/environment/utils.js +100 -0
  64. package/dist/events/index.js +154 -63
  65. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  66. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  67. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
  68. package/dist/migrations/v2.0/index.js +1 -1
  69. package/dist/notification/index.js +97 -3
  70. package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
  71. package/dist/templates/charts-values/dependencies/values.yaml +83 -0
  72. package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
  73. package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
  74. package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
  75. package/dist/templates/charts-values/traefik/values.yaml +115 -0
  76. package/dist/templates/inventory/inventory.template.yml +100 -0
  77. package/dist/templates/inventory/production.example.yml +77 -0
  78. package/dist/templates/inventory/qa.example.yml +48 -0
  79. package/opencrvs-toolkit-2.0.0-rc.4f04a0d.tgz +0 -0
  80. package/package.json +15 -1
  81. package/tsconfig.tsbuildinfo +1 -1
  82. package/opencrvs-toolkit-2.0.0-rc.4f03e3a.tgz +0 -0
@@ -0,0 +1,112 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
13
+ if (k2 === undefined) k2 = k;
14
+ var desc = Object.getOwnPropertyDescriptor(m, k);
15
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
16
+ desc = { enumerable: true, get: function() { return m[k]; } };
17
+ }
18
+ Object.defineProperty(o, k2, desc);
19
+ }) : (function(o, m, k, k2) {
20
+ if (k2 === undefined) k2 = k;
21
+ o[k2] = m[k];
22
+ }));
23
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
24
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
25
+ }) : function(o, v) {
26
+ o["default"] = v;
27
+ });
28
+ var __importStar = (this && this.__importStar) || function (mod) {
29
+ if (mod && mod.__esModule) return mod;
30
+ var result = {};
31
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32
+ __setModuleDefault(result, mod);
33
+ return result;
34
+ };
35
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
36
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
37
+ return new (P || (P = Promise))(function (resolve, reject) {
38
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
39
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
40
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
41
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
42
+ });
43
+ };
44
+ var __importDefault = (this && this.__importDefault) || function (mod) {
45
+ return (mod && mod.__esModule) ? mod : { "default": mod };
46
+ };
47
+ Object.defineProperty(exports, "__esModule", { value: true });
48
+ exports.manageEnvironmentUsers = manageEnvironmentUsers;
49
+ const fs = __importStar(require("fs"));
50
+ /* eslint-disable no-console */
51
+ const path = __importStar(require("path"));
52
+ const kleur_1 = __importDefault(require("kleur"));
53
+ const manage_users_1 = require("./manage-users");
54
+ const logger_1 = require("./logger");
55
+ function select(options) {
56
+ return __awaiter(this, void 0, void 0, function* () {
57
+ const inquirer = yield import('@inquirer/prompts');
58
+ return inquirer.select(options);
59
+ });
60
+ }
61
+ /**
62
+ * Allow user to select inventory file (environment from a list)
63
+ *
64
+ * @param {string} dirPath - Path to the inventory file
65
+ *
66
+ * * @returns {string} Inventory file
67
+ */
68
+ function selectInventoryFile() {
69
+ return __awaiter(this, arguments, void 0, function* (dirPath = './infrastructure/server-setup/inventory/') {
70
+ // Check if directory exists
71
+ if (!fs.existsSync(dirPath)) {
72
+ (0, logger_1.warn)(`⚠️ No environment configuration directory found at ${dirPath}`);
73
+ (0, logger_1.warn)('Hint: If this is a new infrastructure repository, run `opencrvs environment init` first.');
74
+ return null;
75
+ }
76
+ // Read and filter files
77
+ const files = fs
78
+ .readdirSync(dirPath)
79
+ .filter((file) => {
80
+ const filePath = path.join(dirPath, file);
81
+ const isFile = fs.statSync(filePath).isFile();
82
+ const ext = path.extname(file).slice(1).toLowerCase();
83
+ return isFile && (ext === 'yml' || ext === 'yaml');
84
+ })
85
+ .sort();
86
+ if (files.length === 0) {
87
+ (0, logger_1.warn)(`⚠️ No environment configuration files found at ${dirPath}`);
88
+ (0, logger_1.warn)('Hint: If this is a new infrastructure repository, run `opencrvs environment init` first.');
89
+ return null;
90
+ }
91
+ // Create choices - remove extension from display
92
+ const choices = files.map((file) => ({
93
+ name: path.basename(file, path.extname(file)),
94
+ value: path.join(dirPath, file)
95
+ }));
96
+ const selectedFile = yield select({
97
+ message: 'Select environment (inventory file) to load users:',
98
+ choices: choices
99
+ });
100
+ return selectedFile;
101
+ });
102
+ }
103
+ function manageEnvironmentUsers() {
104
+ return __awaiter(this, void 0, void 0, function* () {
105
+ console.log('\n', kleur_1.default.bold().underline('Manage users'), '\n');
106
+ const inventory_file = yield selectInventoryFile();
107
+ if (!inventory_file) {
108
+ return;
109
+ }
110
+ yield (0, manage_users_1.manageUsers)(inventory_file);
111
+ });
112
+ }
@@ -0,0 +1,18 @@
1
+ import { Secret, Variable } from './github';
2
+ import { Answers } from './custom-types';
3
+ export declare function generateLongPassword(): string;
4
+ export declare function findExistingValue<T extends string>(name: string, type: T, scope: 'ENVIRONMENT' | 'REPOSITORY', existingValues: Array<Secret | Variable>): (T extends "SECRET" ? Secret : T extends "VARIABLE" ? Variable : never) | undefined;
5
+ /**
6
+ * Merges and stores secrets in `.env.{environment}` file.
7
+ * Updates existing variables, preserves unchanged ones, adds new ones.
8
+ *
9
+ * @param environment - Environment name (e.g., 'production')
10
+ * @param answers - Variables to update: `[{ name: 'KEY', value: 'val' }]`
11
+ *
12
+ * @example
13
+ * storeSecrets('prod', [{ name: 'API_KEY', value: 'abc123' }]);
14
+ */
15
+ export declare function storeSecrets(environment: string, answers: Answers): void;
16
+ export declare function readYamlFile(filePath: any): any;
17
+ export declare function writeYamlFile(filePath: string, data: any): void;
18
+ //# sourceMappingURL=utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/environment/utils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC,wBAAgB,oBAAoB,WAMnC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAChD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,aAAa,GAAG,YAAY,EACnC,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,GAMpC,CAAC,CAAC,SAAS,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,UAAU,GAAG,QAAQ,GAAG,KAAK,CAAC,GACvE,SAAS,CACd;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,QAoBjE;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,CAG/C;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAcxD"}
@@ -0,0 +1,100 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
13
+ if (k2 === undefined) k2 = k;
14
+ var desc = Object.getOwnPropertyDescriptor(m, k);
15
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
16
+ desc = { enumerable: true, get: function() { return m[k]; } };
17
+ }
18
+ Object.defineProperty(o, k2, desc);
19
+ }) : (function(o, m, k, k2) {
20
+ if (k2 === undefined) k2 = k;
21
+ o[k2] = m[k];
22
+ }));
23
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
24
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
25
+ }) : function(o, v) {
26
+ o["default"] = v;
27
+ });
28
+ var __importStar = (this && this.__importStar) || function (mod) {
29
+ if (mod && mod.__esModule) return mod;
30
+ var result = {};
31
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32
+ __setModuleDefault(result, mod);
33
+ return result;
34
+ };
35
+ var __importDefault = (this && this.__importDefault) || function (mod) {
36
+ return (mod && mod.__esModule) ? mod : { "default": mod };
37
+ };
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.generateLongPassword = generateLongPassword;
40
+ exports.findExistingValue = findExistingValue;
41
+ exports.storeSecrets = storeSecrets;
42
+ exports.readYamlFile = readYamlFile;
43
+ exports.writeYamlFile = writeYamlFile;
44
+ const fs_1 = __importStar(require("fs"));
45
+ const yaml = __importStar(require("js-yaml"));
46
+ const dotenv_1 = __importDefault(require("dotenv"));
47
+ function generateLongPassword() {
48
+ const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
49
+ let result = '';
50
+ for (let i = 16; i > 0; --i)
51
+ result += chars[Math.floor(Math.random() * chars.length)];
52
+ return result;
53
+ }
54
+ function findExistingValue(name, type, scope, existingValues) {
55
+ return existingValues.find((value) => value.name === name && value.type === type && value.scope === scope);
56
+ }
57
+ /**
58
+ * Merges and stores secrets in `.env.{environment}` file.
59
+ * Updates existing variables, preserves unchanged ones, adds new ones.
60
+ *
61
+ * @param environment - Environment name (e.g., 'production')
62
+ * @param answers - Variables to update: `[{ name: 'KEY', value: 'val' }]`
63
+ *
64
+ * @example
65
+ * storeSecrets('prod', [{ name: 'API_KEY', value: 'abc123' }]);
66
+ */
67
+ function storeSecrets(environment, answers) {
68
+ let envConfig = {};
69
+ try {
70
+ envConfig = dotenv_1.default.parse((0, fs_1.readFileSync)(`${process.cwd()}/.env.${environment}`));
71
+ }
72
+ catch (error) {
73
+ envConfig = {};
74
+ }
75
+ const linesFromAnswers = answers.map((update) => `${update.name}="${update.value}"`);
76
+ const linesFromEnvConfig = Object.entries(envConfig)
77
+ .filter(([name]) => !answers.find((update) => update.name === name))
78
+ .map(([name, value]) => `${name}="${value}"`);
79
+ const allLines = [...linesFromEnvConfig, ...linesFromAnswers].sort();
80
+ (0, fs_1.writeFileSync)(`.env.${environment}`, allLines.join('\n'));
81
+ }
82
+ function readYamlFile(filePath) {
83
+ const fileContent = fs_1.default.readFileSync(filePath, 'utf8');
84
+ return yaml.load(fileContent);
85
+ }
86
+ function writeYamlFile(filePath, data) {
87
+ try {
88
+ const yamlContent = yaml.dump(data, {
89
+ indent: 2,
90
+ lineWidth: -1,
91
+ flowLevel: -1, // Prevent flow style for arrays/objects
92
+ noRefs: true,
93
+ sortKeys: false
94
+ });
95
+ fs_1.default.writeFileSync(filePath, yamlContent, 'utf8');
96
+ }
97
+ catch (error) {
98
+ throw new Error(`Failed to write inventory file: ${error}`);
99
+ }
100
+ }
@@ -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,
@@ -1219,6 +1220,11 @@ var FieldTypesToHideInReview = [
1219
1220
  FieldType.ALPHA_PRINT_BUTTON,
1220
1221
  FieldType.ALPHA_HIDDEN
1221
1222
  ];
1223
+ var HiddenFieldTypes = [
1224
+ FieldType.HTTP,
1225
+ FieldType.QUERY_PARAM_READER,
1226
+ FieldType.ALPHA_HIDDEN
1227
+ ];
1222
1228
 
1223
1229
  // ../commons/src/events/FieldValue.ts
1224
1230
  var z12 = __toESM(require("zod/v4"));
@@ -2017,7 +2023,8 @@ var Range = import_v4.z.object({
2017
2023
  });
2018
2024
  var ContainsFlags = import_v4.z.object({
2019
2025
  anyOf: import_v4.z.array(Flag).optional(),
2020
- noneOf: import_v4.z.array(Flag).optional()
2026
+ noneOf: import_v4.z.array(Flag).optional(),
2027
+ allOf: import_v4.z.array(Flag).optional()
2021
2028
  }).meta({
2022
2029
  id: "ContainsFlags"
2023
2030
  });
@@ -2292,6 +2299,7 @@ var NumberField = BaseField.extend({
2292
2299
  configuration: import_v43.default.object({
2293
2300
  min: import_v43.default.number().optional().describe("Minimum value"),
2294
2301
  max: import_v43.default.number().optional().describe("Maximum value"),
2302
+ integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
2295
2303
  prefix: TranslationConfig.optional(),
2296
2304
  postfix: TranslationConfig.optional()
2297
2305
  }).optional()
@@ -3215,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
3215
3223
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
3216
3224
  }).shape
3217
3225
  );
3226
+ var NotifyConfig = ActionConfigBase.extend(
3227
+ z24.object({
3228
+ type: z24.literal(ActionType.NOTIFY)
3229
+ }).shape
3230
+ );
3218
3231
  var DeclareConfig = DeclarationActionBase.extend(
3219
3232
  z24.object({
3220
3233
  type: z24.literal(ActionType.DECLARE),
@@ -3299,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
3299
3312
  id: "ReadActionConfig",
3300
3313
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
3301
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
+ }),
3302
3319
  DeclareConfig.meta({
3303
3320
  id: "DeclareActionConfig",
3304
- 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."
3305
3322
  }),
3306
3323
  RejectConfig.meta({
3307
3324
  id: "RejectActionConfig",
@@ -3908,7 +3925,7 @@ var isHiddenFieldType = (field3) => {
3908
3925
  return field3.config.type === FieldType.ALPHA_HIDDEN;
3909
3926
  };
3910
3927
  var isNonInteractiveFieldType = (field3) => {
3911
- 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;
3928
+ 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;
3912
3929
  };
3913
3930
 
3914
3931
  // ../commons/src/conditionals/validate.ts
@@ -4470,13 +4487,13 @@ function getActionConfig({
4470
4487
  actionType,
4471
4488
  customActionType
4472
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
+ }
4473
4493
  return eventConfiguration.actions.find((a) => {
4474
4494
  if (a.type === ActionType.CUSTOM && customActionType) {
4475
4495
  return a.customActionType === customActionType;
4476
4496
  }
4477
- if (actionType === ActionType.NOTIFY) {
4478
- return a.type === ActionType.DECLARE;
4479
- }
4480
4497
  if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
4481
4498
  return a.type === ActionType.REQUEST_CORRECTION;
4482
4499
  }
@@ -4513,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
4513
4530
  if (actionConfig.type === ActionType.CUSTOM) {
4514
4531
  return actionConfig.form;
4515
4532
  }
4516
- if ("review" in actionConfig) {
4533
+ if ("review" in actionConfig && actionConfig.review != null) {
4517
4534
  return actionConfig.review.fields;
4518
4535
  }
4519
4536
  return [];
@@ -6485,6 +6502,8 @@ var updateActions = ActionTypes.extract([
6485
6502
  ActionType.ARCHIVE,
6486
6503
  ActionType.PRINT_CERTIFICATE,
6487
6504
  ActionType.REQUEST_CORRECTION,
6505
+ ActionType.APPROVE_CORRECTION,
6506
+ ActionType.REJECT_CORRECTION,
6488
6507
  ActionType.CUSTOM
6489
6508
  ]);
6490
6509
  function getActionUpdateMetadata(actions) {
@@ -6526,9 +6545,6 @@ function getLegalStatuses(actions) {
6526
6545
  // ../commons/src/events/state/flags.ts
6527
6546
  var import_lodash3 = require("lodash");
6528
6547
  var import_date_fns3 = require("date-fns");
6529
- function isEditInProgress(actions) {
6530
- return actions.at(-1)?.type === ActionType.EDIT;
6531
- }
6532
6548
  function findPendingCorrectionAction(writeActions2) {
6533
6549
  let correctionRequestAction;
6534
6550
  for (let i = writeActions2.length - 1; i >= 0; i--) {
@@ -6543,30 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
6543
6559
  }
6544
6560
  return correctionRequestAction;
6545
6561
  }
6546
- function isCorrectionRequested(actions) {
6547
- return findPendingCorrectionAction(actions) !== void 0;
6548
- }
6549
- function isDeclarationIncomplete(actions) {
6550
- return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
6551
- }
6552
- function isRejected(actions) {
6553
- const resettingActionTypes = [
6554
- ActionType.NOTIFY,
6555
- ActionType.DECLARE,
6556
- ActionType.EDIT,
6557
- ActionType.REGISTER,
6558
- ActionType.ARCHIVE
6559
- ];
6560
- return actions.reduce((prev, { type }) => {
6561
- if (type === ActionType.REJECT) {
6562
- return true;
6563
- }
6564
- if (resettingActionTypes.includes(type)) {
6565
- return false;
6566
- }
6567
- return prev;
6568
- }, false);
6569
- }
6570
6562
  function isPotentialDuplicate(actions) {
6571
6563
  return actions.reduce((prev, { type }) => {
6572
6564
  if (type === ActionType.DUPLICATE_DETECTED) {
@@ -6594,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
6594
6586
  }
6595
6587
  });
6596
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
+ }
6597
6671
  function resolveEventCustomFlags(event2, eventConfiguration) {
6598
6672
  const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6599
6673
  return actions.reduce((acc, action, idx) => {
@@ -6642,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
6642
6716
  return flag2;
6643
6717
  });
6644
6718
  }
6645
- function getInherentFlags(sortedActions) {
6719
+ function getInherentFlags(sortedActions, event2, eventConfiguration) {
6646
6720
  const acceptedActions = sortedActions.filter(
6647
6721
  ({ status: status2 }) => status2 === ActionStatus.Accepted
6648
6722
  );
6649
- const inherentFlags = [];
6650
- if (isCorrectionRequested(acceptedActions)) {
6651
- inherentFlags.push(InherentFlags.CORRECTION_REQUESTED);
6652
- }
6653
- if (isDeclarationIncomplete(acceptedActions)) {
6654
- inherentFlags.push(InherentFlags.INCOMPLETE);
6655
- }
6656
- if (isRejected(acceptedActions)) {
6657
- inherentFlags.push(InherentFlags.REJECTED);
6658
- }
6659
- if (isPotentialDuplicate(acceptedActions)) {
6660
- inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
6661
- }
6662
- if (isEditInProgress(acceptedActions)) {
6663
- inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
6664
- }
6665
- return inherentFlags;
6723
+ return INHERENT_FLAG_RULES.filter(
6724
+ (rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
6725
+ ).map(({ flag: flag2 }) => flag2);
6666
6726
  }
6667
6727
  function getEventFlags(event2, config) {
6668
6728
  const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6669
6729
  return [
6670
6730
  ...getActionStatusFlags(sortedActions),
6671
- ...getInherentFlags(sortedActions),
6731
+ ...getInherentFlags(sortedActions, event2, config),
6672
6732
  ...resolveEventCustomFlags(event2, config)
6673
6733
  ];
6674
6734
  }
@@ -7673,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
7673
7733
  id: "signature.upload.modal.title",
7674
7734
  defaultMessage: "Draw signature",
7675
7735
  description: "Title for the modal to draw signature"
7736
+ },
7737
+ // Zod applies the schema default at parse time, but this fixture bypasses
7738
+ // parsing — GeneratedInputField accesses configuration.maxFileSize directly.
7739
+ configuration: {
7740
+ maxFileSize: 5 * 1024 * 1024
7676
7741
  }
7677
7742
  }
7678
7743
  ]
@@ -8229,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
8229
8294
  },
8230
8295
  review: TENNIS_CLUB_DECLARATION_REVIEW
8231
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
+ },
8232
8311
  {
8233
8312
  type: ActionType.REJECT,
8234
8313
  label: {
@@ -8471,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
8471
8550
  }
8472
8551
  }
8473
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
+ ],
8474
8564
  advancedSearch: [
8475
8565
  {
8476
8566
  title: {
@@ -10229,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
10229
10319
  return locationIds.some((id) => id === user2.primaryOfficeId);
10230
10320
  }
10231
10321
  if (filter === JurisdictionFilter.enum.administrativeArea) {
10232
- return user2.administrativeAreaId === null || locationIds.some((id) => id === user2.administrativeAreaId);
10322
+ return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
10233
10323
  }
10234
10324
  return true;
10235
10325
  }
@@ -10318,7 +10408,7 @@ function canAccessUserWithScope({
10318
10408
  }
10319
10409
  const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
10320
10410
  (id) => user2.administrativeAreaId === id
10321
- ) || user2.administrativeAreaId === null;
10411
+ ) || !user2.administrativeAreaId;
10322
10412
  if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
10323
10413
  return false;
10324
10414
  }
@@ -10624,18 +10714,19 @@ var ACTION_FILTERS = {
10624
10714
  function filterActionsByFlags(actions, flags) {
10625
10715
  return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
10626
10716
  }
10717
+ var REJECTED_ACTIONS = [
10718
+ ActionType.READ,
10719
+ ActionType.NOTIFY,
10720
+ ActionType.CUSTOM,
10721
+ ActionType.EDIT,
10722
+ ActionType.ARCHIVE
10723
+ ];
10627
10724
  function getAvailableActionsWithoutFlagFilters(status2, flags) {
10628
10725
  if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
10629
10726
  return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
10630
10727
  }
10631
- if (flags.includes(InherentFlags.REJECTED)) {
10632
- return [
10633
- ActionType.READ,
10634
- ActionType.NOTIFY,
10635
- ActionType.CUSTOM,
10636
- ActionType.EDIT,
10637
- ActionType.ARCHIVE
10638
- ];
10728
+ if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
10729
+ return REJECTED_ACTIONS;
10639
10730
  }
10640
10731
  return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
10641
10732
  }
@@ -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",