@opencrvs/toolkit 2.0.0-rc.6bd1e6b → 2.0.0-rc.6bedc29

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 (87) hide show
  1. package/README.md +15 -0
  2. package/build.sh +3 -2
  3. package/dist/application-config/index.js +9 -2
  4. package/dist/cli.js +3252 -45
  5. package/dist/commons/api/router.d.ts +28 -17
  6. package/dist/commons/events/ActionConfig.d.ts +28 -2
  7. package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
  8. package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
  9. package/dist/commons/events/EventIndex.d.ts +14 -0
  10. package/dist/commons/events/FieldConfig.d.ts +1 -0
  11. package/dist/commons/events/FieldType.d.ts +1 -0
  12. package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
  13. package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
  14. package/dist/commons/events/field.d.ts +6 -0
  15. package/dist/commons/events/state/utils.d.ts +12 -290
  16. package/dist/environment/custom-types.d.ts +33 -0
  17. package/dist/environment/custom-types.d.ts.map +1 -0
  18. package/dist/environment/custom-types.js +12 -0
  19. package/dist/environment/derived-variables.d.ts +134 -0
  20. package/dist/environment/derived-variables.d.ts.map +1 -0
  21. package/dist/environment/derived-variables.js +169 -0
  22. package/dist/environment/editor-questions.d.ts +4 -0
  23. package/dist/environment/editor-questions.d.ts.map +1 -0
  24. package/dist/environment/editor-questions.js +67 -0
  25. package/dist/environment/git.d.ts +5 -0
  26. package/dist/environment/git.d.ts.map +1 -0
  27. package/dist/environment/git.js +38 -0
  28. package/dist/environment/github.d.ts +26 -0
  29. package/dist/environment/github.d.ts.map +1 -0
  30. package/dist/environment/github.js +247 -0
  31. package/dist/environment/index.d.ts +5 -0
  32. package/dist/environment/index.d.ts.map +1 -0
  33. package/dist/environment/index.js +71 -0
  34. package/dist/environment/logger.d.ts +15 -0
  35. package/dist/environment/logger.d.ts.map +1 -0
  36. package/dist/environment/logger.js +25 -0
  37. package/dist/environment/manage-users.d.ts +11 -0
  38. package/dist/environment/manage-users.d.ts.map +1 -0
  39. package/dist/environment/manage-users.js +497 -0
  40. package/dist/environment/questions-helper.d.ts +15 -0
  41. package/dist/environment/questions-helper.d.ts.map +1 -0
  42. package/dist/environment/questions-helper.js +70 -0
  43. package/dist/environment/questions.d.ts +199 -0
  44. package/dist/environment/questions.d.ts.map +1 -0
  45. package/dist/environment/questions.js +412 -0
  46. package/dist/environment/setup-environment.d.ts +2 -0
  47. package/dist/environment/setup-environment.d.ts.map +1 -0
  48. package/dist/environment/setup-environment.js +794 -0
  49. package/dist/environment/ssh-keygen.d.ts +5 -0
  50. package/dist/environment/ssh-keygen.d.ts.map +1 -0
  51. package/dist/environment/ssh-keygen.js +21 -0
  52. package/dist/environment/swarm-to-k8s.d.ts +2 -0
  53. package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
  54. package/dist/environment/swarm-to-k8s.js +173 -0
  55. package/dist/environment/templates.d.ts +27 -0
  56. package/dist/environment/templates.d.ts.map +1 -0
  57. package/dist/environment/templates.js +163 -0
  58. package/dist/environment/update-workflows.d.ts +2 -0
  59. package/dist/environment/update-workflows.d.ts.map +1 -0
  60. package/dist/environment/update-workflows.js +169 -0
  61. package/dist/environment/users.d.ts +2 -0
  62. package/dist/environment/users.d.ts.map +1 -0
  63. package/dist/environment/users.js +112 -0
  64. package/dist/environment/utils.d.ts +18 -0
  65. package/dist/environment/utils.d.ts.map +1 -0
  66. package/dist/environment/utils.js +100 -0
  67. package/dist/events/index.js +172 -69
  68. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  69. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  70. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
  71. package/dist/migrations/v2.0/index.js +10 -4
  72. package/dist/notification/index.js +101 -4
  73. package/dist/scopes/index.d.ts +4 -6
  74. package/dist/scopes/index.js +9 -3
  75. package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
  76. package/dist/templates/charts-values/dependencies/values.yaml +83 -0
  77. package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
  78. package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
  79. package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
  80. package/dist/templates/charts-values/traefik/values.yaml +115 -0
  81. package/dist/templates/inventory/inventory.template.yml +100 -0
  82. package/dist/templates/inventory/production.example.yml +77 -0
  83. package/dist/templates/inventory/qa.example.yml +48 -0
  84. package/opencrvs-toolkit-2.0.0-rc.6bedc29.tgz +0 -0
  85. package/package.json +15 -1
  86. package/tsconfig.tsbuildinfo +1 -1
  87. package/opencrvs-toolkit-2.0.0-rc.6bd1e6b.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,
@@ -711,14 +712,20 @@ var unflattenScope = (input) => {
711
712
  return { type, options };
712
713
  };
713
714
  var EncodedScope = z2.string().brand("EncodedScope");
714
- var decodeScope = (query) => {
715
- const scope = qs.parse(query, {
715
+ var decodedScopeCache = /* @__PURE__ */ new Map();
716
+ var decodeScope = (encodedScope) => {
717
+ if (decodedScopeCache.has(encodedScope)) {
718
+ return decodedScopeCache.get(encodedScope);
719
+ }
720
+ const scope = qs.parse(encodedScope, {
716
721
  ignoreQueryPrefix: true,
717
722
  comma: true,
718
723
  allowDots: true
719
724
  });
720
725
  const unflattenedScope = unflattenScope(scope);
721
- return Scope.safeParse(unflattenedScope)?.data;
726
+ const result = Scope.safeParse(unflattenedScope)?.data;
727
+ decodedScopeCache.set(encodedScope, result);
728
+ return result;
722
729
  };
723
730
  var DEFAULT_SCOPE_OPTIONS = {
724
731
  placeOfEvent: JurisdictionFilter.enum.all,
@@ -1213,6 +1220,11 @@ var FieldTypesToHideInReview = [
1213
1220
  FieldType.ALPHA_PRINT_BUTTON,
1214
1221
  FieldType.ALPHA_HIDDEN
1215
1222
  ];
1223
+ var HiddenFieldTypes = [
1224
+ FieldType.HTTP,
1225
+ FieldType.QUERY_PARAM_READER,
1226
+ FieldType.ALPHA_HIDDEN
1227
+ ];
1216
1228
 
1217
1229
  // ../commons/src/events/FieldValue.ts
1218
1230
  var z12 = __toESM(require("zod/v4"));
@@ -1339,7 +1351,7 @@ function plainDateToLocalDate(date) {
1339
1351
  // ../commons/src/events/FieldValue.ts
1340
1352
  var TextValue = z12.string();
1341
1353
  var HiddenFieldValue = z12.string();
1342
- var NonEmptyTextValue = TextValue.min(1);
1354
+ var NonEmptyTextValue = z12.string().trim().min(1);
1343
1355
  var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
1344
1356
  var AgeValue = z12.object({
1345
1357
  age: z12.number(),
@@ -2011,7 +2023,8 @@ var Range = import_v4.z.object({
2011
2023
  });
2012
2024
  var ContainsFlags = import_v4.z.object({
2013
2025
  anyOf: import_v4.z.array(Flag).optional(),
2014
- noneOf: import_v4.z.array(Flag).optional()
2026
+ noneOf: import_v4.z.array(Flag).optional(),
2027
+ allOf: import_v4.z.array(Flag).optional()
2015
2028
  }).meta({
2016
2029
  id: "ContainsFlags"
2017
2030
  });
@@ -2286,6 +2299,7 @@ var NumberField = BaseField.extend({
2286
2299
  configuration: import_v43.default.object({
2287
2300
  min: import_v43.default.number().optional().describe("Minimum value"),
2288
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"),
2289
2303
  prefix: TranslationConfig.optional(),
2290
2304
  postfix: TranslationConfig.optional()
2291
2305
  }).optional()
@@ -3209,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
3209
3223
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
3210
3224
  }).shape
3211
3225
  );
3226
+ var NotifyConfig = ActionConfigBase.extend(
3227
+ z24.object({
3228
+ type: z24.literal(ActionType.NOTIFY)
3229
+ }).shape
3230
+ );
3212
3231
  var DeclareConfig = DeclarationActionBase.extend(
3213
3232
  z24.object({
3214
3233
  type: z24.literal(ActionType.DECLARE),
@@ -3293,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
3293
3312
  id: "ReadActionConfig",
3294
3313
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
3295
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
+ }),
3296
3319
  DeclareConfig.meta({
3297
3320
  id: "DeclareActionConfig",
3298
- 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."
3299
3322
  }),
3300
3323
  RejectConfig.meta({
3301
3324
  id: "RejectActionConfig",
@@ -3474,6 +3497,9 @@ var BaseField3 = z28.object({
3474
3497
  ),
3475
3498
  validations: z28.array(ValidationConfig).optional().describe(
3476
3499
  `Option for overriding the field validations specifically for advanced search form.`
3500
+ ),
3501
+ allowedLocations: JurisdictionReference.optional().describe(
3502
+ `Override the allowedLocations for a location field in advanced search. Use this when the declaration form's allowedLocations references a scope (e.g. record.create) that search-only users don't have \u2014 specify record.search scope instead.`
3477
3503
  )
3478
3504
  });
3479
3505
  var SearchQueryParams = z28.object({
@@ -3548,9 +3574,11 @@ var z30 = __toESM(require("zod/v4"));
3548
3574
  var z29 = __toESM(require("zod/v4"));
3549
3575
  function getDynamicNameValue(field3) {
3550
3576
  const nameConfiguration = field3.configuration?.name;
3577
+ const firstnameRequired = nameConfiguration?.firstname?.required ?? field3.required;
3578
+ const surnameRequired = nameConfiguration?.surname?.required ?? field3.required;
3551
3579
  return z29.object({
3552
- firstname: nameConfiguration?.firstname?.required ? NonEmptyTextValue : TextValue,
3553
- surname: nameConfiguration?.surname?.required ? NonEmptyTextValue : TextValue,
3580
+ firstname: firstnameRequired ? NonEmptyTextValue : TextValue,
3581
+ surname: surnameRequired ? NonEmptyTextValue : TextValue,
3554
3582
  middlename: nameConfiguration?.middlename?.required ? NonEmptyTextValue : TextValue.optional()
3555
3583
  });
3556
3584
  }
@@ -3897,7 +3925,7 @@ var isHiddenFieldType = (field3) => {
3897
3925
  return field3.config.type === FieldType.ALPHA_HIDDEN;
3898
3926
  };
3899
3927
  var isNonInteractiveFieldType = (field3) => {
3900
- 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;
3901
3929
  };
3902
3930
 
3903
3931
  // ../commons/src/conditionals/validate.ts
@@ -4459,13 +4487,13 @@ function getActionConfig({
4459
4487
  actionType,
4460
4488
  customActionType
4461
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
+ }
4462
4493
  return eventConfiguration.actions.find((a) => {
4463
4494
  if (a.type === ActionType.CUSTOM && customActionType) {
4464
4495
  return a.customActionType === customActionType;
4465
4496
  }
4466
- if (actionType === ActionType.NOTIFY) {
4467
- return a.type === ActionType.DECLARE;
4468
- }
4469
4497
  if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
4470
4498
  return a.type === ActionType.REQUEST_CORRECTION;
4471
4499
  }
@@ -4502,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
4502
4530
  if (actionConfig.type === ActionType.CUSTOM) {
4503
4531
  return actionConfig.form;
4504
4532
  }
4505
- if ("review" in actionConfig) {
4533
+ if ("review" in actionConfig && actionConfig.review != null) {
4506
4534
  return actionConfig.review.fields;
4507
4535
  }
4508
4536
  return [];
@@ -6474,6 +6502,8 @@ var updateActions = ActionTypes.extract([
6474
6502
  ActionType.ARCHIVE,
6475
6503
  ActionType.PRINT_CERTIFICATE,
6476
6504
  ActionType.REQUEST_CORRECTION,
6505
+ ActionType.APPROVE_CORRECTION,
6506
+ ActionType.REJECT_CORRECTION,
6477
6507
  ActionType.CUSTOM
6478
6508
  ]);
6479
6509
  function getActionUpdateMetadata(actions) {
@@ -6488,7 +6518,7 @@ function getActionUpdateMetadata(actions) {
6488
6518
  "createdAtLocation",
6489
6519
  "createdByRole"
6490
6520
  ];
6491
- return actions.filter(({ type }) => updateActions.safeParse(type).success).filter(({ status: status2 }) => status2 === ActionStatus.Accepted).reduce(
6521
+ return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
6492
6522
  (_2, action) => {
6493
6523
  if (action.originalActionId) {
6494
6524
  const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
@@ -6515,9 +6545,6 @@ function getLegalStatuses(actions) {
6515
6545
  // ../commons/src/events/state/flags.ts
6516
6546
  var import_lodash3 = require("lodash");
6517
6547
  var import_date_fns3 = require("date-fns");
6518
- function isEditInProgress(actions) {
6519
- return actions.at(-1)?.type === ActionType.EDIT;
6520
- }
6521
6548
  function findPendingCorrectionAction(writeActions2) {
6522
6549
  let correctionRequestAction;
6523
6550
  for (let i = writeActions2.length - 1; i >= 0; i--) {
@@ -6532,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
6532
6559
  }
6533
6560
  return correctionRequestAction;
6534
6561
  }
6535
- function isCorrectionRequested(actions) {
6536
- return findPendingCorrectionAction(actions) !== void 0;
6537
- }
6538
- function isDeclarationIncomplete(actions) {
6539
- return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
6540
- }
6541
- function isRejected(actions) {
6542
- const resettingActionTypes = [
6543
- ActionType.NOTIFY,
6544
- ActionType.DECLARE,
6545
- ActionType.EDIT,
6546
- ActionType.REGISTER
6547
- ];
6548
- return actions.reduce((prev, { type }) => {
6549
- if (type === ActionType.REJECT) {
6550
- return true;
6551
- }
6552
- if (resettingActionTypes.includes(type)) {
6553
- return false;
6554
- }
6555
- return prev;
6556
- }, false);
6557
- }
6558
6562
  function isPotentialDuplicate(actions) {
6559
6563
  return actions.reduce((prev, { type }) => {
6560
6564
  if (type === ActionType.DUPLICATE_DETECTED) {
@@ -6582,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
6582
6586
  }
6583
6587
  });
6584
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
+ }
6585
6671
  function resolveEventCustomFlags(event2, eventConfiguration) {
6586
6672
  const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6587
6673
  return actions.reduce((acc, action, idx) => {
@@ -6630,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
6630
6716
  return flag2;
6631
6717
  });
6632
6718
  }
6633
- function getInherentFlags(sortedActions) {
6719
+ function getInherentFlags(sortedActions, event2, eventConfiguration) {
6634
6720
  const acceptedActions = sortedActions.filter(
6635
6721
  ({ status: status2 }) => status2 === ActionStatus.Accepted
6636
6722
  );
6637
- const inherentFlags = [];
6638
- if (isCorrectionRequested(acceptedActions)) {
6639
- inherentFlags.push(InherentFlags.CORRECTION_REQUESTED);
6640
- }
6641
- if (isDeclarationIncomplete(acceptedActions)) {
6642
- inherentFlags.push(InherentFlags.INCOMPLETE);
6643
- }
6644
- if (isRejected(acceptedActions)) {
6645
- inherentFlags.push(InherentFlags.REJECTED);
6646
- }
6647
- if (isPotentialDuplicate(acceptedActions)) {
6648
- inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
6649
- }
6650
- if (isEditInProgress(acceptedActions)) {
6651
- inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
6652
- }
6653
- return inherentFlags;
6723
+ return INHERENT_FLAG_RULES.filter(
6724
+ (rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
6725
+ ).map(({ flag: flag2 }) => flag2);
6654
6726
  }
6655
6727
  function getEventFlags(event2, config) {
6656
6728
  const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
6657
6729
  return [
6658
6730
  ...getActionStatusFlags(sortedActions),
6659
- ...getInherentFlags(sortedActions),
6731
+ ...getInherentFlags(sortedActions, event2, config),
6660
6732
  ...resolveEventCustomFlags(event2, config)
6661
6733
  ];
6662
6734
  }
@@ -7661,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
7661
7733
  id: "signature.upload.modal.title",
7662
7734
  defaultMessage: "Draw signature",
7663
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
7664
7741
  }
7665
7742
  }
7666
7743
  ]
@@ -8217,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
8217
8294
  },
8218
8295
  review: TENNIS_CLUB_DECLARATION_REVIEW
8219
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
+ },
8220
8311
  {
8221
8312
  type: ActionType.REJECT,
8222
8313
  label: {
@@ -8459,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
8459
8550
  }
8460
8551
  }
8461
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
+ ],
8462
8564
  advancedSearch: [
8463
8565
  {
8464
8566
  title: {
@@ -10217,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
10217
10319
  return locationIds.some((id) => id === user2.primaryOfficeId);
10218
10320
  }
10219
10321
  if (filter === JurisdictionFilter.enum.administrativeArea) {
10220
- return user2.administrativeAreaId === null || locationIds.some((id) => id === user2.administrativeAreaId);
10322
+ return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
10221
10323
  }
10222
10324
  return true;
10223
10325
  }
@@ -10306,7 +10408,7 @@ function canAccessUserWithScope({
10306
10408
  }
10307
10409
  const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
10308
10410
  (id) => user2.administrativeAreaId === id
10309
- ) || user2.administrativeAreaId === null;
10411
+ ) || !user2.administrativeAreaId;
10310
10412
  if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
10311
10413
  return false;
10312
10414
  }
@@ -10612,18 +10714,19 @@ var ACTION_FILTERS = {
10612
10714
  function filterActionsByFlags(actions, flags) {
10613
10715
  return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
10614
10716
  }
10717
+ var REJECTED_ACTIONS = [
10718
+ ActionType.READ,
10719
+ ActionType.NOTIFY,
10720
+ ActionType.CUSTOM,
10721
+ ActionType.EDIT,
10722
+ ActionType.ARCHIVE
10723
+ ];
10615
10724
  function getAvailableActionsWithoutFlagFilters(status2, flags) {
10616
10725
  if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
10617
10726
  return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
10618
10727
  }
10619
- if (flags.includes(InherentFlags.REJECTED)) {
10620
- return [
10621
- ActionType.READ,
10622
- ActionType.NOTIFY,
10623
- ActionType.CUSTOM,
10624
- ActionType.EDIT,
10625
- ActionType.ARCHIVE
10626
- ];
10728
+ if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
10729
+ return REJECTED_ACTIONS;
10627
10730
  }
10628
10731
  return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
10629
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"}