@opencrvs/toolkit 2.0.0-rc.4bc5daa → 2.0.0-rc.4cb7860
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 +5 -4
- package/dist/application-config/index.js +17 -6
- package/dist/cli.js +3186 -4921
- package/dist/commons/api/router.d.ts +10 -0
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +204 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventIndex.d.ts +25 -0
- package/dist/commons/events/EventMetadata.d.ts +26 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/locations.d.ts +1 -0
- package/dist/commons/events/state/index.d.ts +8 -0
- package/dist/commons/events/state/utils.d.ts +9 -0
- package/dist/conditionals/index.js +10 -5
- 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 +163 -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 +171 -18
- 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 +88 -5139
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts +3 -0
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts.map +1 -0
- package/dist/migrations/v2.1/add-explicit-correction-flags.js +234 -0
- package/dist/migrations/v2.1/index.d.ts +6 -0
- package/dist/migrations/v2.1/index.d.ts.map +1 -0
- package/dist/migrations/v2.1/index.js +218 -0
- package/dist/notification/index.js +144 -11
- package/dist/scopes/index.d.ts +89 -1
- package/dist/scopes/index.js +10 -5
- 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 +81 -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.4cb7860.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.4bc5daa.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
|
@@ -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
|
|
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 =
|
|
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:
|
|
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
|
-
|
|
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,57 @@ 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
|
+
);
|
|
3241
|
+
var DuplicateDetectedConfig = ActionConfigBase.extend(
|
|
3242
|
+
z24.object({
|
|
3243
|
+
type: z24.literal(ActionType.DUPLICATE_DETECTED),
|
|
3244
|
+
label: z24.never().optional().describe(
|
|
3245
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no label."
|
|
3246
|
+
),
|
|
3247
|
+
supportingCopy: z24.never().optional(),
|
|
3248
|
+
icon: z24.never().optional().describe(
|
|
3249
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no icon."
|
|
3250
|
+
),
|
|
3251
|
+
conditionals: z24.never().optional().describe(
|
|
3252
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it cannot be disabled or hidden with conditionals."
|
|
3253
|
+
)
|
|
3254
|
+
}).shape
|
|
3255
|
+
);
|
|
3256
|
+
var MarkAsDuplicateConfig = ActionConfigBase.extend(
|
|
3257
|
+
z24.object({
|
|
3258
|
+
type: z24.literal(ActionType.MARK_AS_DUPLICATE)
|
|
3259
|
+
}).shape
|
|
3260
|
+
);
|
|
3261
|
+
var MarkAsNotDuplicateConfig = ActionConfigBase.extend(
|
|
3262
|
+
z24.object({
|
|
3263
|
+
type: z24.literal(ActionType.MARK_AS_NOT_DUPLICATE)
|
|
3264
|
+
}).shape
|
|
3265
|
+
);
|
|
3266
|
+
var AssignConfig = ActionConfigBase.extend(
|
|
3267
|
+
z24.object({
|
|
3268
|
+
type: z24.literal(ActionType.ASSIGN),
|
|
3269
|
+
flags: z24.never().optional().describe(
|
|
3270
|
+
"ASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3271
|
+
)
|
|
3272
|
+
}).shape
|
|
3273
|
+
);
|
|
3274
|
+
var UnassignConfig = ActionConfigBase.extend(
|
|
3275
|
+
z24.object({
|
|
3276
|
+
type: z24.literal(ActionType.UNASSIGN),
|
|
3277
|
+
flags: z24.never().optional().describe(
|
|
3278
|
+
"UNASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3279
|
+
)
|
|
3280
|
+
}).shape
|
|
3281
|
+
);
|
|
3282
|
+
var DeleteConfig = ActionConfigBase.extend(
|
|
3283
|
+
z24.object({
|
|
3284
|
+
type: z24.literal(ActionType.DELETE)
|
|
3285
|
+
}).shape
|
|
3286
|
+
);
|
|
3225
3287
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3226
3288
|
z24.object({
|
|
3227
3289
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3284,7 +3346,17 @@ var RequestCorrectionConfig = ActionConfigBase.extend(
|
|
|
3284
3346
|
correctionForm: ActionFormConfig
|
|
3285
3347
|
}).shape
|
|
3286
3348
|
);
|
|
3287
|
-
var
|
|
3349
|
+
var ApproveCorrectionConfig = ActionConfigBase.extend(
|
|
3350
|
+
z24.object({
|
|
3351
|
+
type: z24.literal(ActionType.APPROVE_CORRECTION)
|
|
3352
|
+
}).shape
|
|
3353
|
+
);
|
|
3354
|
+
var RejectCorrectionConfig = ActionConfigBase.extend(
|
|
3355
|
+
z24.object({
|
|
3356
|
+
type: z24.literal(ActionType.REJECT_CORRECTION)
|
|
3357
|
+
}).shape
|
|
3358
|
+
);
|
|
3359
|
+
var CustomActionConfig = ActionConfigBase.extend(
|
|
3288
3360
|
z24.object({
|
|
3289
3361
|
type: z24.literal(ActionType.CUSTOM),
|
|
3290
3362
|
customActionType: z24.string().describe("Type identifier of the custom action."),
|
|
@@ -3295,7 +3367,7 @@ var CustomActionConfig = ActionConfigBase.merge(
|
|
|
3295
3367
|
auditHistoryLabel: TranslationConfig.describe(
|
|
3296
3368
|
'The label to show in audit history for this action. For example "Approved".'
|
|
3297
3369
|
)
|
|
3298
|
-
})
|
|
3370
|
+
}).shape
|
|
3299
3371
|
);
|
|
3300
3372
|
var ActionConfig = z24.discriminatedUnion("type", [
|
|
3301
3373
|
/*
|
|
@@ -3306,9 +3378,37 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3306
3378
|
id: "ReadActionConfig",
|
|
3307
3379
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3308
3380
|
}),
|
|
3381
|
+
AssignConfig.meta({
|
|
3382
|
+
id: "AssignActionConfig",
|
|
3383
|
+
description: "Configuration for assigning a record to the current user."
|
|
3384
|
+
}),
|
|
3385
|
+
UnassignConfig.meta({
|
|
3386
|
+
id: "UnassignActionConfig",
|
|
3387
|
+
description: "Configuration for unassigning a record from its current assignee."
|
|
3388
|
+
}),
|
|
3389
|
+
DeleteConfig.meta({
|
|
3390
|
+
id: "DeleteActionConfig",
|
|
3391
|
+
description: "Configuration for deleting a draft record."
|
|
3392
|
+
}),
|
|
3393
|
+
NotifyConfig.meta({
|
|
3394
|
+
id: "NotifyActionConfig",
|
|
3395
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3396
|
+
}),
|
|
3309
3397
|
DeclareConfig.meta({
|
|
3310
3398
|
id: "DeclareActionConfig",
|
|
3311
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3399
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3400
|
+
}),
|
|
3401
|
+
DuplicateDetectedConfig.meta({
|
|
3402
|
+
id: "DuplicateDetectedActionConfig",
|
|
3403
|
+
description: "Configuration for the system-generated duplicate-detection action. Never shown as a button, so it only supports flags \u2014 not label, icon, or conditionals."
|
|
3404
|
+
}),
|
|
3405
|
+
MarkAsDuplicateConfig.meta({
|
|
3406
|
+
id: "MarkAsDuplicateActionConfig",
|
|
3407
|
+
description: "Configuration for marking a record as a duplicate."
|
|
3408
|
+
}),
|
|
3409
|
+
MarkAsNotDuplicateConfig.meta({
|
|
3410
|
+
id: "MarkAsNotDuplicateActionConfig",
|
|
3411
|
+
description: "Configuration for marking a record as not a duplicate, after it was previously flagged as one."
|
|
3312
3412
|
}),
|
|
3313
3413
|
RejectConfig.meta({
|
|
3314
3414
|
id: "RejectActionConfig",
|
|
@@ -3326,6 +3426,14 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3326
3426
|
id: "RequestCorrectionActionConfig",
|
|
3327
3427
|
description: "Configuration for requesting a correction on a registered record."
|
|
3328
3428
|
}),
|
|
3429
|
+
ApproveCorrectionConfig.meta({
|
|
3430
|
+
id: "ApproveCorrectionActionConfig",
|
|
3431
|
+
description: "Configuration for approving a requested correction."
|
|
3432
|
+
}),
|
|
3433
|
+
RejectCorrectionConfig.meta({
|
|
3434
|
+
id: "RejectCorrectionActionConfig",
|
|
3435
|
+
description: "Configuration for rejecting a requested correction."
|
|
3436
|
+
}),
|
|
3329
3437
|
EditActionConfig.meta({
|
|
3330
3438
|
id: "EditActionConfig",
|
|
3331
3439
|
description: "Configuration for editing a record before registration."
|
|
@@ -4477,16 +4585,13 @@ function getActionConfig({
|
|
|
4477
4585
|
actionType,
|
|
4478
4586
|
customActionType
|
|
4479
4587
|
}) {
|
|
4588
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4589
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4590
|
+
}
|
|
4480
4591
|
return eventConfiguration.actions.find((a) => {
|
|
4481
4592
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4482
4593
|
return a.customActionType === customActionType;
|
|
4483
4594
|
}
|
|
4484
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4485
|
-
return a.type === ActionType.DECLARE;
|
|
4486
|
-
}
|
|
4487
|
-
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4488
|
-
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4489
|
-
}
|
|
4490
4595
|
return a.type === actionType;
|
|
4491
4596
|
});
|
|
4492
4597
|
}
|
|
@@ -4520,7 +4625,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4520
4625
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4521
4626
|
return actionConfig.form;
|
|
4522
4627
|
}
|
|
4523
|
-
if ("review" in actionConfig) {
|
|
4628
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4524
4629
|
return actionConfig.review.fields;
|
|
4525
4630
|
}
|
|
4526
4631
|
return [];
|
|
@@ -5640,7 +5745,7 @@ function validateActionFlags(event2, ctx) {
|
|
|
5640
5745
|
const isInherentFlag = (value) => Object.values(InherentFlags).includes(value);
|
|
5641
5746
|
const configuredFlagIds = event2.flags.map((flag2) => flag2.id);
|
|
5642
5747
|
const actionFlagIds = event2.actions.flatMap(
|
|
5643
|
-
(action) => action.flags.map((flag2) => flag2.id)
|
|
5748
|
+
(action) => (action.flags ?? []).map((flag2) => flag2.id)
|
|
5644
5749
|
);
|
|
5645
5750
|
for (const actionFlagId of actionFlagIds) {
|
|
5646
5751
|
const isConfigured = configuredFlagIds.includes(actionFlagId);
|
|
@@ -6521,6 +6626,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6521
6626
|
}
|
|
6522
6627
|
function getLegalStatuses(actions) {
|
|
6523
6628
|
return {
|
|
6629
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6630
|
+
ActionType.NOTIFY,
|
|
6631
|
+
actions
|
|
6632
|
+
),
|
|
6524
6633
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6525
6634
|
ActionType.DECLARE,
|
|
6526
6635
|
actions
|
|
@@ -6679,7 +6788,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6679
6788
|
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6680
6789
|
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6681
6790
|
const form = { ...declaration, ...annotation };
|
|
6682
|
-
const flagsWithMetConditions = actionConfig.flags.filter(
|
|
6791
|
+
const flagsWithMetConditions = (actionConfig.flags ?? []).filter(
|
|
6683
6792
|
({ conditional }) => (
|
|
6684
6793
|
// If conditional is not provided, the flag is resolved
|
|
6685
6794
|
conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
@@ -8284,6 +8393,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8284
8393
|
},
|
|
8285
8394
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8286
8395
|
},
|
|
8396
|
+
{
|
|
8397
|
+
type: ActionType.NOTIFY,
|
|
8398
|
+
label: {
|
|
8399
|
+
defaultMessage: "Notify health worker",
|
|
8400
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8401
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8402
|
+
},
|
|
8403
|
+
flags: [
|
|
8404
|
+
{
|
|
8405
|
+
id: "health-worker-notified",
|
|
8406
|
+
operation: "add"
|
|
8407
|
+
}
|
|
8408
|
+
]
|
|
8409
|
+
},
|
|
8287
8410
|
{
|
|
8288
8411
|
type: ActionType.REJECT,
|
|
8289
8412
|
label: {
|
|
@@ -8526,6 +8649,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8526
8649
|
}
|
|
8527
8650
|
}
|
|
8528
8651
|
],
|
|
8652
|
+
flags: [
|
|
8653
|
+
{
|
|
8654
|
+
id: "health-worker-notified",
|
|
8655
|
+
requiresAction: false,
|
|
8656
|
+
label: {
|
|
8657
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8658
|
+
defaultMessage: "Health worker notified",
|
|
8659
|
+
description: "Label for the health-worker-notified flag"
|
|
8660
|
+
}
|
|
8661
|
+
}
|
|
8662
|
+
],
|
|
8529
8663
|
advancedSearch: [
|
|
8530
8664
|
{
|
|
8531
8665
|
title: {
|
|
@@ -10311,6 +10445,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10311
10445
|
}
|
|
10312
10446
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10313
10447
|
const { options } = scope;
|
|
10448
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10449
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10450
|
+
return false;
|
|
10451
|
+
}
|
|
10452
|
+
}
|
|
10453
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10454
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10455
|
+
JurisdictionFilter.enum.location,
|
|
10456
|
+
user2
|
|
10457
|
+
)) {
|
|
10458
|
+
return false;
|
|
10459
|
+
}
|
|
10460
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10461
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10462
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10463
|
+
user2
|
|
10464
|
+
)) {
|
|
10465
|
+
return false;
|
|
10466
|
+
}
|
|
10314
10467
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10315
10468
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10316
10469
|
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
|
|
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';
|