@opencrvs/toolkit 2.0.0 → 2.1.0-rc.b0003b1

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 (91) hide show
  1. package/README.md +15 -0
  2. package/build.sh +3 -2
  3. package/create-countryconfig/package.json +1 -1
  4. package/dist/application-config/index.js +17 -6
  5. package/dist/cli.js +3253 -47
  6. package/dist/commons/api/router.d.ts +10 -0
  7. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  8. package/dist/commons/events/ActionConfig.d.ts +28 -2
  9. package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
  10. package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
  11. package/dist/commons/events/EventConfig.d.ts +2 -0
  12. package/dist/commons/events/EventIndex.d.ts +25 -0
  13. package/dist/commons/events/EventMetadata.d.ts +26 -0
  14. package/dist/commons/events/FieldConfig.d.ts +10 -0
  15. package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
  16. package/dist/commons/events/locations.d.ts +1 -0
  17. package/dist/commons/events/state/index.d.ts +8 -0
  18. package/dist/commons/events/state/utils.d.ts +9 -0
  19. package/dist/conditionals/index.js +10 -5
  20. package/dist/environment/custom-types.d.ts +33 -0
  21. package/dist/environment/custom-types.d.ts.map +1 -0
  22. package/dist/environment/custom-types.js +12 -0
  23. package/dist/environment/derived-variables.d.ts +134 -0
  24. package/dist/environment/derived-variables.d.ts.map +1 -0
  25. package/dist/environment/derived-variables.js +169 -0
  26. package/dist/environment/editor-questions.d.ts +4 -0
  27. package/dist/environment/editor-questions.d.ts.map +1 -0
  28. package/dist/environment/editor-questions.js +67 -0
  29. package/dist/environment/git.d.ts +5 -0
  30. package/dist/environment/git.d.ts.map +1 -0
  31. package/dist/environment/git.js +38 -0
  32. package/dist/environment/github.d.ts +26 -0
  33. package/dist/environment/github.d.ts.map +1 -0
  34. package/dist/environment/github.js +247 -0
  35. package/dist/environment/index.d.ts +5 -0
  36. package/dist/environment/index.d.ts.map +1 -0
  37. package/dist/environment/index.js +71 -0
  38. package/dist/environment/logger.d.ts +15 -0
  39. package/dist/environment/logger.d.ts.map +1 -0
  40. package/dist/environment/logger.js +25 -0
  41. package/dist/environment/manage-users.d.ts +11 -0
  42. package/dist/environment/manage-users.d.ts.map +1 -0
  43. package/dist/environment/manage-users.js +497 -0
  44. package/dist/environment/questions-helper.d.ts +15 -0
  45. package/dist/environment/questions-helper.d.ts.map +1 -0
  46. package/dist/environment/questions-helper.js +70 -0
  47. package/dist/environment/questions.d.ts +199 -0
  48. package/dist/environment/questions.d.ts.map +1 -0
  49. package/dist/environment/questions.js +412 -0
  50. package/dist/environment/setup-environment.d.ts +2 -0
  51. package/dist/environment/setup-environment.d.ts.map +1 -0
  52. package/dist/environment/setup-environment.js +794 -0
  53. package/dist/environment/ssh-keygen.d.ts +5 -0
  54. package/dist/environment/ssh-keygen.d.ts.map +1 -0
  55. package/dist/environment/ssh-keygen.js +21 -0
  56. package/dist/environment/swarm-to-k8s.d.ts +2 -0
  57. package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
  58. package/dist/environment/swarm-to-k8s.js +173 -0
  59. package/dist/environment/templates.d.ts +27 -0
  60. package/dist/environment/templates.d.ts.map +1 -0
  61. package/dist/environment/templates.js +163 -0
  62. package/dist/environment/update-workflows.d.ts +2 -0
  63. package/dist/environment/update-workflows.d.ts.map +1 -0
  64. package/dist/environment/update-workflows.js +169 -0
  65. package/dist/environment/users.d.ts +2 -0
  66. package/dist/environment/users.d.ts.map +1 -0
  67. package/dist/environment/users.js +112 -0
  68. package/dist/environment/utils.d.ts +18 -0
  69. package/dist/environment/utils.d.ts.map +1 -0
  70. package/dist/environment/utils.js +100 -0
  71. package/dist/events/index.js +79 -11
  72. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  73. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  74. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
  75. package/dist/migrations/v2.0/index.js +11 -6
  76. package/dist/notification/index.js +53 -8
  77. package/dist/scopes/index.d.ts +89 -1
  78. package/dist/scopes/index.js +10 -5
  79. package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
  80. package/dist/templates/charts-values/dependencies/values.yaml +83 -0
  81. package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
  82. package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
  83. package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
  84. package/dist/templates/charts-values/traefik/values.yaml +115 -0
  85. package/dist/templates/inventory/inventory.template.yml +100 -0
  86. package/dist/templates/inventory/production.example.yml +77 -0
  87. package/dist/templates/inventory/qa.example.yml +48 -0
  88. package/opencrvs-toolkit-2.1.0-rc.b0003b1.tgz +0 -0
  89. package/package.json +15 -1
  90. package/tsconfig.tsbuildinfo +1 -1
  91. package/opencrvs-toolkit-2.0.0.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
+ }
@@ -520,11 +520,13 @@ var scopeOptionsPlaceEvent = z2.object({
520
520
  event: scopeByEvent,
521
521
  placeOfEvent: JurisdictionFilter.optional()
522
522
  }).describe("Options applicable to all record scopes.");
523
- var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
523
+ var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
524
+ notifiedIn: JurisdictionFilter.optional(),
525
+ notifiedBy: UserFilter.optional(),
524
526
  declaredIn: JurisdictionFilter.optional(),
525
527
  declaredBy: UserFilter.optional()
526
528
  }).describe("Options applicable to actions that may take place after DECLARE");
527
- var AllRecordScopeOptions = scopeOptionsDeclared.extend({
529
+ var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
528
530
  registeredIn: JurisdictionFilter.optional(),
529
531
  registeredBy: UserFilter.optional()
530
532
  }).describe(
@@ -562,6 +564,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
562
564
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
563
565
  );
564
566
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
567
+ notifiedIn: UUID.nullish(),
568
+ notifiedBy: z2.string().optional(),
565
569
  declaredIn: UUID.nullish(),
566
570
  declaredBy: z2.string().optional()
567
571
  }).describe(
@@ -607,7 +611,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
607
611
  }),
608
612
  z2.object({
609
613
  type: ScopesWithDeclaredOptions,
610
- options: scopeOptionsDeclared.optional()
614
+ options: scopeOptionsDeclaredOrNotified.optional()
611
615
  }),
612
616
  z2.object({
613
617
  type: ScopesWithFullOptions,
@@ -730,8 +734,9 @@ var decodeScope = (encodedScope) => {
730
734
  var DEFAULT_SCOPE_OPTIONS = {
731
735
  placeOfEvent: JurisdictionFilter.enum.all,
732
736
  accessLevel: JurisdictionFilter.enum.all,
733
- registeredIn: JurisdictionFilter.enum.all,
734
- declaredIn: JurisdictionFilter.enum.all
737
+ notifiedIn: JurisdictionFilter.enum.all,
738
+ declaredIn: JurisdictionFilter.enum.all,
739
+ registeredIn: JurisdictionFilter.enum.all
735
740
  };
736
741
  function getAcceptedScopesByType({
737
742
  acceptedScopes,
@@ -1815,6 +1820,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1815
1820
  )
1816
1821
  });
1817
1822
  var LegalStatuses = z16.object({
1823
+ [EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
1818
1824
  [EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
1819
1825
  [EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
1820
1826
  });
@@ -1956,6 +1962,8 @@ var eventMetadataLabelMap = {
1956
1962
  var EventMetadataDateFieldIdInput = z16.enum([
1957
1963
  "createdAt",
1958
1964
  "updatedAt",
1965
+ "legalStatuses.NOTIFIED.createdAt",
1966
+ "legalStatuses.NOTIFIED.acceptedAt",
1959
1967
  "legalStatuses.DECLARED.createdAt",
1960
1968
  "legalStatuses.DECLARED.acceptedAt",
1961
1969
  "legalStatuses.REGISTERED.createdAt",
@@ -1964,6 +1972,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
1964
1972
  var EventMetadataDateFieldId = z16.enum([
1965
1973
  "event.createdAt",
1966
1974
  "event.updatedAt",
1975
+ "event.legalStatuses.NOTIFIED.createdAt",
1976
+ "event.legalStatuses.NOTIFIED.acceptedAt",
1967
1977
  "event.legalStatuses.DECLARED.createdAt",
1968
1978
  "event.legalStatuses.DECLARED.acceptedAt",
1969
1979
  "event.legalStatuses.REGISTERED.createdAt",
@@ -2023,7 +2033,8 @@ var Range = import_v4.z.object({
2023
2033
  });
2024
2034
  var ContainsFlags = import_v4.z.object({
2025
2035
  anyOf: import_v4.z.array(Flag).optional(),
2026
- noneOf: import_v4.z.array(Flag).optional()
2036
+ noneOf: import_v4.z.array(Flag).optional(),
2037
+ allOf: import_v4.z.array(Flag).optional()
2027
2038
  }).meta({
2028
2039
  id: "ContainsFlags"
2029
2040
  });
@@ -3222,6 +3233,11 @@ var ReadActionConfig = ActionConfigBase.extend(
3222
3233
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
3223
3234
  }).shape
3224
3235
  );
3236
+ var NotifyConfig = ActionConfigBase.extend(
3237
+ z24.object({
3238
+ type: z24.literal(ActionType.NOTIFY)
3239
+ }).shape
3240
+ );
3225
3241
  var DeclareConfig = DeclarationActionBase.extend(
3226
3242
  z24.object({
3227
3243
  type: z24.literal(ActionType.DECLARE),
@@ -3306,9 +3322,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
3306
3322
  id: "ReadActionConfig",
3307
3323
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
3308
3324
  }),
3325
+ NotifyConfig.meta({
3326
+ id: "NotifyActionConfig",
3327
+ description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
3328
+ }),
3309
3329
  DeclareConfig.meta({
3310
3330
  id: "DeclareActionConfig",
3311
- description: "Configuration for the declare action. Includes review-page fields. Shared with the notify action (ActionType.NOTIFY)."
3331
+ description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
3312
3332
  }),
3313
3333
  RejectConfig.meta({
3314
3334
  id: "RejectActionConfig",
@@ -4477,13 +4497,13 @@ function getActionConfig({
4477
4497
  actionType,
4478
4498
  customActionType
4479
4499
  }) {
4500
+ if (actionType === ActionType.NOTIFY) {
4501
+ return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
4502
+ }
4480
4503
  return eventConfiguration.actions.find((a) => {
4481
4504
  if (a.type === ActionType.CUSTOM && customActionType) {
4482
4505
  return a.customActionType === customActionType;
4483
4506
  }
4484
- if (actionType === ActionType.NOTIFY) {
4485
- return a.type === ActionType.DECLARE;
4486
- }
4487
4507
  if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
4488
4508
  return a.type === ActionType.REQUEST_CORRECTION;
4489
4509
  }
@@ -4520,7 +4540,7 @@ var getActionAnnotationFields = (actionConfig) => {
4520
4540
  if (actionConfig.type === ActionType.CUSTOM) {
4521
4541
  return actionConfig.form;
4522
4542
  }
4523
- if ("review" in actionConfig) {
4543
+ if ("review" in actionConfig && actionConfig.review != null) {
4524
4544
  return actionConfig.review.fields;
4525
4545
  }
4526
4546
  return [];
@@ -6521,6 +6541,10 @@ function getActionUpdateMetadata(actions) {
6521
6541
  }
6522
6542
  function getLegalStatuses(actions) {
6523
6543
  return {
6544
+ [EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
6545
+ ActionType.NOTIFY,
6546
+ actions
6547
+ ),
6524
6548
  [EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
6525
6549
  ActionType.DECLARE,
6526
6550
  actions
@@ -8284,6 +8308,20 @@ var tennisClubMembershipEvent = defineConfig({
8284
8308
  },
8285
8309
  review: TENNIS_CLUB_DECLARATION_REVIEW
8286
8310
  },
8311
+ {
8312
+ type: ActionType.NOTIFY,
8313
+ label: {
8314
+ defaultMessage: "Notify health worker",
8315
+ description: "This is shown as the action name anywhere the user can trigger the action from",
8316
+ id: "event.tennis-club-membership.action.notify.label"
8317
+ },
8318
+ flags: [
8319
+ {
8320
+ id: "health-worker-notified",
8321
+ operation: "add"
8322
+ }
8323
+ ]
8324
+ },
8287
8325
  {
8288
8326
  type: ActionType.REJECT,
8289
8327
  label: {
@@ -8526,6 +8564,17 @@ var tennisClubMembershipEvent = defineConfig({
8526
8564
  }
8527
8565
  }
8528
8566
  ],
8567
+ flags: [
8568
+ {
8569
+ id: "health-worker-notified",
8570
+ requiresAction: false,
8571
+ label: {
8572
+ id: "event.tennis-club-membership.flag.health-worker-notified.label",
8573
+ defaultMessage: "Health worker notified",
8574
+ description: "Label for the health-worker-notified flag"
8575
+ }
8576
+ }
8577
+ ],
8529
8578
  advancedSearch: [
8530
8579
  {
8531
8580
  title: {
@@ -10311,6 +10360,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
10311
10360
  }
10312
10361
  if (scopeUsesDeclaredOptions(scope)) {
10313
10362
  const { options } = scope;
10363
+ if (options?.notifiedBy === UserFilter.enum.user) {
10364
+ if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
10365
+ return false;
10366
+ }
10367
+ }
10368
+ if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
10369
+ event2.legalStatuses?.NOTIFIED?.createdAtLocation,
10370
+ JurisdictionFilter.enum.location,
10371
+ user2
10372
+ )) {
10373
+ return false;
10374
+ }
10375
+ if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
10376
+ event2.legalStatuses?.NOTIFIED?.createdAtLocation,
10377
+ JurisdictionFilter.enum.administrativeArea,
10378
+ user2
10379
+ )) {
10380
+ return false;
10381
+ }
10314
10382
  if (options?.declaredBy === UserFilter.enum.user) {
10315
10383
  if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
10316
10384
  return false;
@@ -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';
@@ -2204,11 +2204,13 @@ var scopeOptionsPlaceEvent = z3.object({
2204
2204
  event: scopeByEvent,
2205
2205
  placeOfEvent: JurisdictionFilter.optional()
2206
2206
  }).describe("Options applicable to all record scopes.");
2207
- var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
2207
+ var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
2208
+ notifiedIn: JurisdictionFilter.optional(),
2209
+ notifiedBy: UserFilter.optional(),
2208
2210
  declaredIn: JurisdictionFilter.optional(),
2209
2211
  declaredBy: UserFilter.optional()
2210
2212
  }).describe("Options applicable to actions that may take place after DECLARE");
2211
- var AllRecordScopeOptions = scopeOptionsDeclared.extend({
2213
+ var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
2212
2214
  registeredIn: JurisdictionFilter.optional(),
2213
2215
  registeredBy: UserFilter.optional()
2214
2216
  }).describe(
@@ -2246,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
2246
2248
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
2247
2249
  );
2248
2250
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
2251
+ notifiedIn: UUID.nullish(),
2252
+ notifiedBy: z3.string().optional(),
2249
2253
  declaredIn: UUID.nullish(),
2250
2254
  declaredBy: z3.string().optional()
2251
2255
  }).describe(
@@ -2291,7 +2295,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
2291
2295
  }),
2292
2296
  z3.object({
2293
2297
  type: ScopesWithDeclaredOptions,
2294
- options: scopeOptionsDeclared.optional()
2298
+ options: scopeOptionsDeclaredOrNotified.optional()
2295
2299
  }),
2296
2300
  z3.object({
2297
2301
  type: ScopesWithFullOptions,
@@ -2412,8 +2416,9 @@ var decodeScope = (encodedScope) => {
2412
2416
  var DEFAULT_SCOPE_OPTIONS = {
2413
2417
  placeOfEvent: JurisdictionFilter.enum.all,
2414
2418
  accessLevel: JurisdictionFilter.enum.all,
2415
- registeredIn: JurisdictionFilter.enum.all,
2416
- declaredIn: JurisdictionFilter.enum.all
2419
+ notifiedIn: JurisdictionFilter.enum.all,
2420
+ declaredIn: JurisdictionFilter.enum.all,
2421
+ registeredIn: JurisdictionFilter.enum.all
2417
2422
  };
2418
2423
 
2419
2424
  // ../commons/src/scopes.deprecated.do-not-use.ts
@@ -4312,7 +4317,7 @@ Saved ${handlerRelPath}.`);
4312
4317
  // src/migrations/v2.0/checkout-upstream-files.ts
4313
4318
  var import_child_process = require("child_process");
4314
4319
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4315
- var UPSTREAM_BRANCH = "release-v2.0.0";
4320
+ var UPSTREAM_BRANCH = "release/2.0.0";
4316
4321
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4317
4322
  var FILES_TO_CHECKOUT = [
4318
4323
  "src/analytics/analytics.ts",
@@ -118,11 +118,13 @@ var scopeOptionsPlaceEvent = z2.object({
118
118
  event: scopeByEvent,
119
119
  placeOfEvent: JurisdictionFilter.optional()
120
120
  }).describe("Options applicable to all record scopes.");
121
- var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
121
+ var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
122
+ notifiedIn: JurisdictionFilter.optional(),
123
+ notifiedBy: UserFilter.optional(),
122
124
  declaredIn: JurisdictionFilter.optional(),
123
125
  declaredBy: UserFilter.optional()
124
126
  }).describe("Options applicable to actions that may take place after DECLARE");
125
- var AllRecordScopeOptions = scopeOptionsDeclared.extend({
127
+ var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
126
128
  registeredIn: JurisdictionFilter.optional(),
127
129
  registeredBy: UserFilter.optional()
128
130
  }).describe(
@@ -160,6 +162,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
160
162
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
161
163
  );
162
164
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
165
+ notifiedIn: UUID.nullish(),
166
+ notifiedBy: z2.string().optional(),
163
167
  declaredIn: UUID.nullish(),
164
168
  declaredBy: z2.string().optional()
165
169
  }).describe(
@@ -205,7 +209,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
205
209
  }),
206
210
  z2.object({
207
211
  type: ScopesWithDeclaredOptions,
208
- options: scopeOptionsDeclared.optional()
212
+ options: scopeOptionsDeclaredOrNotified.optional()
209
213
  }),
210
214
  z2.object({
211
215
  type: ScopesWithFullOptions,
@@ -294,8 +298,9 @@ var EncodedScope = z2.string().brand("EncodedScope");
294
298
  var DEFAULT_SCOPE_OPTIONS = {
295
299
  placeOfEvent: JurisdictionFilter.enum.all,
296
300
  accessLevel: JurisdictionFilter.enum.all,
297
- registeredIn: JurisdictionFilter.enum.all,
298
- declaredIn: JurisdictionFilter.enum.all
301
+ notifiedIn: JurisdictionFilter.enum.all,
302
+ declaredIn: JurisdictionFilter.enum.all,
303
+ registeredIn: JurisdictionFilter.enum.all
299
304
  };
300
305
 
301
306
  // ../commons/src/authentication.ts
@@ -1357,6 +1362,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1357
1362
  )
1358
1363
  });
1359
1364
  var LegalStatuses = z16.object({
1365
+ [EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
1360
1366
  [EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
1361
1367
  [EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
1362
1368
  });
@@ -1416,6 +1422,8 @@ var EventMetadataKeys = z16.enum(EventMetadataKeysArray);
1416
1422
  var EventMetadataDateFieldIdInput = z16.enum([
1417
1423
  "createdAt",
1418
1424
  "updatedAt",
1425
+ "legalStatuses.NOTIFIED.createdAt",
1426
+ "legalStatuses.NOTIFIED.acceptedAt",
1419
1427
  "legalStatuses.DECLARED.createdAt",
1420
1428
  "legalStatuses.DECLARED.acceptedAt",
1421
1429
  "legalStatuses.REGISTERED.createdAt",
@@ -1424,6 +1432,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
1424
1432
  var EventMetadataDateFieldId = z16.enum([
1425
1433
  "event.createdAt",
1426
1434
  "event.updatedAt",
1435
+ "event.legalStatuses.NOTIFIED.createdAt",
1436
+ "event.legalStatuses.NOTIFIED.acceptedAt",
1427
1437
  "event.legalStatuses.DECLARED.createdAt",
1428
1438
  "event.legalStatuses.DECLARED.acceptedAt",
1429
1439
  "event.legalStatuses.REGISTERED.createdAt",
@@ -1483,7 +1493,8 @@ var Range = import_v4.z.object({
1483
1493
  });
1484
1494
  var ContainsFlags = import_v4.z.object({
1485
1495
  anyOf: import_v4.z.array(Flag).optional(),
1486
- noneOf: import_v4.z.array(Flag).optional()
1496
+ noneOf: import_v4.z.array(Flag).optional(),
1497
+ allOf: import_v4.z.array(Flag).optional()
1487
1498
  }).meta({
1488
1499
  id: "ContainsFlags"
1489
1500
  });
@@ -2679,6 +2690,11 @@ var ReadActionConfig = ActionConfigBase.extend(
2679
2690
  conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
2680
2691
  }).shape
2681
2692
  );
2693
+ var NotifyConfig = ActionConfigBase.extend(
2694
+ z24.object({
2695
+ type: z24.literal(ActionType.NOTIFY)
2696
+ }).shape
2697
+ );
2682
2698
  var DeclareConfig = DeclarationActionBase.extend(
2683
2699
  z24.object({
2684
2700
  type: z24.literal(ActionType.DECLARE),
@@ -2763,9 +2779,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
2763
2779
  id: "ReadActionConfig",
2764
2780
  description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
2765
2781
  }),
2782
+ NotifyConfig.meta({
2783
+ id: "NotifyActionConfig",
2784
+ description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
2785
+ }),
2766
2786
  DeclareConfig.meta({
2767
2787
  id: "DeclareActionConfig",
2768
- description: "Configuration for the declare action. Includes review-page fields. Shared with the notify action (ActionType.NOTIFY)."
2788
+ description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
2769
2789
  }),
2770
2790
  RejectConfig.meta({
2771
2791
  id: "RejectActionConfig",
@@ -3199,7 +3219,7 @@ var getActionAnnotationFields = (actionConfig) => {
3199
3219
  if (actionConfig.type === ActionType.CUSTOM) {
3200
3220
  return actionConfig.form;
3201
3221
  }
3202
- if ("review" in actionConfig) {
3222
+ if ("review" in actionConfig && actionConfig.review != null) {
3203
3223
  return actionConfig.review.fields;
3204
3224
  }
3205
3225
  return [];
@@ -6056,6 +6076,20 @@ var tennisClubMembershipEvent = defineConfig({
6056
6076
  },
6057
6077
  review: TENNIS_CLUB_DECLARATION_REVIEW
6058
6078
  },
6079
+ {
6080
+ type: ActionType.NOTIFY,
6081
+ label: {
6082
+ defaultMessage: "Notify health worker",
6083
+ description: "This is shown as the action name anywhere the user can trigger the action from",
6084
+ id: "event.tennis-club-membership.action.notify.label"
6085
+ },
6086
+ flags: [
6087
+ {
6088
+ id: "health-worker-notified",
6089
+ operation: "add"
6090
+ }
6091
+ ]
6092
+ },
6059
6093
  {
6060
6094
  type: ActionType.REJECT,
6061
6095
  label: {
@@ -6298,6 +6332,17 @@ var tennisClubMembershipEvent = defineConfig({
6298
6332
  }
6299
6333
  }
6300
6334
  ],
6335
+ flags: [
6336
+ {
6337
+ id: "health-worker-notified",
6338
+ requiresAction: false,
6339
+ label: {
6340
+ id: "event.tennis-club-membership.flag.health-worker-notified.label",
6341
+ defaultMessage: "Health worker notified",
6342
+ description: "Label for the health-worker-notified flag"
6343
+ }
6344
+ }
6345
+ ],
6301
6346
  advancedSearch: [
6302
6347
  {
6303
6348
  title: {