@opencrvs/toolkit 2.0.0-rc.277586b → 2.0.0-rc.27a1e03
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.
- package/README.md +15 -0
- package/build.sh +3 -2
- package/dist/application-config/index.js +2 -1
- package/dist/cli.js +3242 -42
- package/dist/commons/api/router.d.ts +2 -0
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventIndex.d.ts +14 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/environment/custom-types.d.ts +33 -0
- package/dist/environment/custom-types.d.ts.map +1 -0
- package/dist/environment/custom-types.js +12 -0
- package/dist/environment/derived-variables.d.ts +134 -0
- package/dist/environment/derived-variables.d.ts.map +1 -0
- package/dist/environment/derived-variables.js +169 -0
- package/dist/environment/editor-questions.d.ts +4 -0
- package/dist/environment/editor-questions.d.ts.map +1 -0
- package/dist/environment/editor-questions.js +67 -0
- package/dist/environment/git.d.ts +5 -0
- package/dist/environment/git.d.ts.map +1 -0
- package/dist/environment/git.js +38 -0
- package/dist/environment/github.d.ts +26 -0
- package/dist/environment/github.d.ts.map +1 -0
- package/dist/environment/github.js +247 -0
- package/dist/environment/index.d.ts +5 -0
- package/dist/environment/index.d.ts.map +1 -0
- package/dist/environment/index.js +71 -0
- package/dist/environment/logger.d.ts +15 -0
- package/dist/environment/logger.d.ts.map +1 -0
- package/dist/environment/logger.js +25 -0
- package/dist/environment/manage-users.d.ts +11 -0
- package/dist/environment/manage-users.d.ts.map +1 -0
- package/dist/environment/manage-users.js +497 -0
- package/dist/environment/questions-helper.d.ts +15 -0
- package/dist/environment/questions-helper.d.ts.map +1 -0
- package/dist/environment/questions-helper.js +70 -0
- package/dist/environment/questions.d.ts +199 -0
- package/dist/environment/questions.d.ts.map +1 -0
- package/dist/environment/questions.js +412 -0
- package/dist/environment/setup-environment.d.ts +2 -0
- package/dist/environment/setup-environment.d.ts.map +1 -0
- package/dist/environment/setup-environment.js +794 -0
- package/dist/environment/ssh-keygen.d.ts +5 -0
- package/dist/environment/ssh-keygen.d.ts.map +1 -0
- package/dist/environment/ssh-keygen.js +21 -0
- package/dist/environment/swarm-to-k8s.d.ts +2 -0
- package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
- package/dist/environment/swarm-to-k8s.js +173 -0
- package/dist/environment/templates.d.ts +27 -0
- package/dist/environment/templates.d.ts.map +1 -0
- package/dist/environment/templates.js +162 -0
- package/dist/environment/update-workflows.d.ts +2 -0
- package/dist/environment/update-workflows.d.ts.map +1 -0
- package/dist/environment/update-workflows.js +169 -0
- package/dist/environment/users.d.ts +2 -0
- package/dist/environment/users.d.ts.map +1 -0
- package/dist/environment/users.js +112 -0
- package/dist/environment/utils.d.ts +18 -0
- package/dist/environment/utils.d.ts.map +1 -0
- package/dist/environment/utils.js +100 -0
- package/dist/events/index.js +134 -52
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/index.js +1 -1
- package/dist/notification/index.js +82 -3
- package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
- package/dist/templates/charts-values/dependencies/values.yaml +83 -0
- package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
- package/dist/templates/charts-values/opencrvs-services/values.yaml +80 -0
- package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
- package/dist/templates/charts-values/traefik/values.yaml +115 -0
- package/dist/templates/inventory/inventory.template.yml +100 -0
- package/dist/templates/inventory/production.example.yml +77 -0
- package/dist/templates/inventory/qa.example.yml +48 -0
- package/opencrvs-toolkit-2.0.0-rc.27a1e03.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.277586b.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
|
+
}
|
package/dist/events/index.js
CHANGED
|
@@ -2023,7 +2023,8 @@ var Range = import_v4.z.object({
|
|
|
2023
2023
|
});
|
|
2024
2024
|
var ContainsFlags = import_v4.z.object({
|
|
2025
2025
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2026
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2026
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2027
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2027
2028
|
}).meta({
|
|
2028
2029
|
id: "ContainsFlags"
|
|
2029
2030
|
});
|
|
@@ -3222,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3222
3223
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3223
3224
|
}).shape
|
|
3224
3225
|
);
|
|
3226
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3227
|
+
z24.object({
|
|
3228
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3229
|
+
}).shape
|
|
3230
|
+
);
|
|
3225
3231
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3226
3232
|
z24.object({
|
|
3227
3233
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3306,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3306
3312
|
id: "ReadActionConfig",
|
|
3307
3313
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3308
3314
|
}),
|
|
3315
|
+
NotifyConfig.meta({
|
|
3316
|
+
id: "NotifyActionConfig",
|
|
3317
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3318
|
+
}),
|
|
3309
3319
|
DeclareConfig.meta({
|
|
3310
3320
|
id: "DeclareActionConfig",
|
|
3311
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3321
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3312
3322
|
}),
|
|
3313
3323
|
RejectConfig.meta({
|
|
3314
3324
|
id: "RejectActionConfig",
|
|
@@ -4477,13 +4487,13 @@ function getActionConfig({
|
|
|
4477
4487
|
actionType,
|
|
4478
4488
|
customActionType
|
|
4479
4489
|
}) {
|
|
4490
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4491
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4492
|
+
}
|
|
4480
4493
|
return eventConfiguration.actions.find((a) => {
|
|
4481
4494
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4482
4495
|
return a.customActionType === customActionType;
|
|
4483
4496
|
}
|
|
4484
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4485
|
-
return a.type === ActionType.DECLARE;
|
|
4486
|
-
}
|
|
4487
4497
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4488
4498
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4489
4499
|
}
|
|
@@ -4520,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4520
4530
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4521
4531
|
return actionConfig.form;
|
|
4522
4532
|
}
|
|
4523
|
-
if ("review" in actionConfig) {
|
|
4533
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4524
4534
|
return actionConfig.review.fields;
|
|
4525
4535
|
}
|
|
4526
4536
|
return [];
|
|
@@ -6535,9 +6545,6 @@ function getLegalStatuses(actions) {
|
|
|
6535
6545
|
// ../commons/src/events/state/flags.ts
|
|
6536
6546
|
var import_lodash3 = require("lodash");
|
|
6537
6547
|
var import_date_fns3 = require("date-fns");
|
|
6538
|
-
function isEditInProgress(actions) {
|
|
6539
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6540
|
-
}
|
|
6541
6548
|
function findPendingCorrectionAction(writeActions2) {
|
|
6542
6549
|
let correctionRequestAction;
|
|
6543
6550
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6552,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6552
6559
|
}
|
|
6553
6560
|
return correctionRequestAction;
|
|
6554
6561
|
}
|
|
6555
|
-
function isCorrectionRequested(actions) {
|
|
6556
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6557
|
-
}
|
|
6558
|
-
function isDeclarationIncomplete(actions) {
|
|
6559
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6560
|
-
}
|
|
6561
|
-
function isRejected(actions) {
|
|
6562
|
-
const resettingActionTypes = [
|
|
6563
|
-
ActionType.NOTIFY,
|
|
6564
|
-
ActionType.DECLARE,
|
|
6565
|
-
ActionType.EDIT,
|
|
6566
|
-
ActionType.REGISTER
|
|
6567
|
-
];
|
|
6568
|
-
return actions.reduce((prev, { type }) => {
|
|
6569
|
-
if (type === ActionType.REJECT) {
|
|
6570
|
-
return true;
|
|
6571
|
-
}
|
|
6572
|
-
if (resettingActionTypes.includes(type)) {
|
|
6573
|
-
return false;
|
|
6574
|
-
}
|
|
6575
|
-
return prev;
|
|
6576
|
-
}, false);
|
|
6577
|
-
}
|
|
6578
6562
|
function isPotentialDuplicate(actions) {
|
|
6579
6563
|
return actions.reduce((prev, { type }) => {
|
|
6580
6564
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6602,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6602
6586
|
}
|
|
6603
6587
|
});
|
|
6604
6588
|
}
|
|
6589
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6590
|
+
if (!isActionConfigType(action.type)) {
|
|
6591
|
+
return false;
|
|
6592
|
+
}
|
|
6593
|
+
const actionConfig = getActionConfig({
|
|
6594
|
+
eventConfiguration,
|
|
6595
|
+
actionType: action.type,
|
|
6596
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6597
|
+
});
|
|
6598
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6599
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6600
|
+
);
|
|
6601
|
+
if (removeOperations.length === 0) {
|
|
6602
|
+
return false;
|
|
6603
|
+
}
|
|
6604
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6605
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6606
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6607
|
+
const form = { ...declaration, ...annotation };
|
|
6608
|
+
return removeOperations.some(
|
|
6609
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6610
|
+
);
|
|
6611
|
+
}
|
|
6612
|
+
var INHERENT_FLAG_RULES = [
|
|
6613
|
+
{
|
|
6614
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6615
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6616
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6617
|
+
},
|
|
6618
|
+
{
|
|
6619
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6620
|
+
// other status-changing action (see getStatusFromActions).
|
|
6621
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6622
|
+
setOn: [ActionType.NOTIFY],
|
|
6623
|
+
resetOn: [
|
|
6624
|
+
ActionType.CREATE,
|
|
6625
|
+
ActionType.DECLARE,
|
|
6626
|
+
ActionType.REGISTER,
|
|
6627
|
+
ActionType.ARCHIVE
|
|
6628
|
+
]
|
|
6629
|
+
},
|
|
6630
|
+
{
|
|
6631
|
+
flag: InherentFlags.REJECTED,
|
|
6632
|
+
setOn: [ActionType.REJECT],
|
|
6633
|
+
resetOn: [
|
|
6634
|
+
ActionType.NOTIFY,
|
|
6635
|
+
ActionType.DECLARE,
|
|
6636
|
+
ActionType.EDIT,
|
|
6637
|
+
ActionType.REGISTER
|
|
6638
|
+
]
|
|
6639
|
+
},
|
|
6640
|
+
{
|
|
6641
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6642
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6643
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6644
|
+
},
|
|
6645
|
+
{
|
|
6646
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6647
|
+
setOn: [ActionType.EDIT],
|
|
6648
|
+
resetOnAnyOtherAction: true
|
|
6649
|
+
}
|
|
6650
|
+
];
|
|
6651
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6652
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6653
|
+
if (rule.setOn.includes(action.type)) {
|
|
6654
|
+
return true;
|
|
6655
|
+
}
|
|
6656
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6657
|
+
return false;
|
|
6658
|
+
}
|
|
6659
|
+
if (actionConfigRemovesFlag(
|
|
6660
|
+
action,
|
|
6661
|
+
rule.flag,
|
|
6662
|
+
acceptedActions.slice(0, idx + 1),
|
|
6663
|
+
event2,
|
|
6664
|
+
eventConfiguration
|
|
6665
|
+
)) {
|
|
6666
|
+
return false;
|
|
6667
|
+
}
|
|
6668
|
+
return present;
|
|
6669
|
+
}, false);
|
|
6670
|
+
}
|
|
6605
6671
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6606
6672
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6607
6673
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6650,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6650
6716
|
return flag2;
|
|
6651
6717
|
});
|
|
6652
6718
|
}
|
|
6653
|
-
function getInherentFlags(sortedActions) {
|
|
6719
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6654
6720
|
const acceptedActions = sortedActions.filter(
|
|
6655
6721
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6656
6722
|
);
|
|
6657
|
-
|
|
6658
|
-
|
|
6659
|
-
|
|
6660
|
-
}
|
|
6661
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6663
|
-
}
|
|
6664
|
-
if (isRejected(acceptedActions)) {
|
|
6665
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6666
|
-
}
|
|
6667
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6668
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6669
|
-
}
|
|
6670
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6671
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6672
|
-
}
|
|
6673
|
-
return inherentFlags;
|
|
6723
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6724
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6725
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6674
6726
|
}
|
|
6675
6727
|
function getEventFlags(event2, config) {
|
|
6676
6728
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6677
6729
|
return [
|
|
6678
6730
|
...getActionStatusFlags(sortedActions),
|
|
6679
|
-
...getInherentFlags(sortedActions),
|
|
6731
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6680
6732
|
...resolveEventCustomFlags(event2, config)
|
|
6681
6733
|
];
|
|
6682
6734
|
}
|
|
@@ -7681,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7681
7733
|
id: "signature.upload.modal.title",
|
|
7682
7734
|
defaultMessage: "Draw signature",
|
|
7683
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
|
|
7684
7741
|
}
|
|
7685
7742
|
}
|
|
7686
7743
|
]
|
|
@@ -8237,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8237
8294
|
},
|
|
8238
8295
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8239
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
|
+
},
|
|
8240
8311
|
{
|
|
8241
8312
|
type: ActionType.REJECT,
|
|
8242
8313
|
label: {
|
|
@@ -8479,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8479
8550
|
}
|
|
8480
8551
|
}
|
|
8481
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
|
+
],
|
|
8482
8564
|
advancedSearch: [
|
|
8483
8565
|
{
|
|
8484
8566
|
title: {
|
|
@@ -10326,7 +10408,7 @@ function canAccessUserWithScope({
|
|
|
10326
10408
|
}
|
|
10327
10409
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10328
10410
|
(id) => user2.administrativeAreaId === id
|
|
10329
|
-
) || user2.administrativeAreaId
|
|
10411
|
+
) || !user2.administrativeAreaId;
|
|
10330
10412
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10331
10413
|
return false;
|
|
10332
10414
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "release
|
|
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,
|
|
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
|
|
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
|
|
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",
|