@opencrvs/toolkit 2.0.0-rc.93f39ac → 2.0.0-rc.93f7fcd
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 +211 -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/commons/events/utils.d.ts +8 -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 +200 -30
- 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 +157 -20
- 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.93f7fcd.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.93f39ac.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
|
@@ -312,6 +312,7 @@ __export(events_exports, {
|
|
|
312
312
|
getActionAnnotation: () => getActionAnnotation,
|
|
313
313
|
getActionAnnotationFields: () => getActionAnnotationFields,
|
|
314
314
|
getActionConfig: () => getActionConfig,
|
|
315
|
+
getActionFormFields: () => getActionFormFields,
|
|
315
316
|
getActionReview: () => getActionReview,
|
|
316
317
|
getActionReviewFields: () => getActionReviewFields,
|
|
317
318
|
getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
|
|
@@ -520,11 +521,13 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
520
521
|
event: scopeByEvent,
|
|
521
522
|
placeOfEvent: JurisdictionFilter.optional()
|
|
522
523
|
}).describe("Options applicable to all record scopes.");
|
|
523
|
-
var
|
|
524
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
525
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
526
|
+
notifiedBy: UserFilter.optional(),
|
|
524
527
|
declaredIn: JurisdictionFilter.optional(),
|
|
525
528
|
declaredBy: UserFilter.optional()
|
|
526
529
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
527
|
-
var AllRecordScopeOptions =
|
|
530
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
528
531
|
registeredIn: JurisdictionFilter.optional(),
|
|
529
532
|
registeredBy: UserFilter.optional()
|
|
530
533
|
}).describe(
|
|
@@ -562,6 +565,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
562
565
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
563
566
|
);
|
|
564
567
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
568
|
+
notifiedIn: UUID.nullish(),
|
|
569
|
+
notifiedBy: z2.string().optional(),
|
|
565
570
|
declaredIn: UUID.nullish(),
|
|
566
571
|
declaredBy: z2.string().optional()
|
|
567
572
|
}).describe(
|
|
@@ -607,7 +612,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
607
612
|
}),
|
|
608
613
|
z2.object({
|
|
609
614
|
type: ScopesWithDeclaredOptions,
|
|
610
|
-
options:
|
|
615
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
611
616
|
}),
|
|
612
617
|
z2.object({
|
|
613
618
|
type: ScopesWithFullOptions,
|
|
@@ -730,8 +735,9 @@ var decodeScope = (encodedScope) => {
|
|
|
730
735
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
731
736
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
732
737
|
accessLevel: JurisdictionFilter.enum.all,
|
|
733
|
-
|
|
734
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
738
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
739
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
740
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
735
741
|
};
|
|
736
742
|
function getAcceptedScopesByType({
|
|
737
743
|
acceptedScopes,
|
|
@@ -1815,6 +1821,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1815
1821
|
)
|
|
1816
1822
|
});
|
|
1817
1823
|
var LegalStatuses = z16.object({
|
|
1824
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1818
1825
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1819
1826
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1820
1827
|
});
|
|
@@ -1956,6 +1963,8 @@ var eventMetadataLabelMap = {
|
|
|
1956
1963
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1957
1964
|
"createdAt",
|
|
1958
1965
|
"updatedAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1967
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1959
1968
|
"legalStatuses.DECLARED.createdAt",
|
|
1960
1969
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1961
1970
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1964,6 +1973,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1964
1973
|
var EventMetadataDateFieldId = z16.enum([
|
|
1965
1974
|
"event.createdAt",
|
|
1966
1975
|
"event.updatedAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1977
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1967
1978
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1968
1979
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1969
1980
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2023,7 +2034,8 @@ var Range = import_v4.z.object({
|
|
|
2023
2034
|
});
|
|
2024
2035
|
var ContainsFlags = import_v4.z.object({
|
|
2025
2036
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2026
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2037
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2038
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2027
2039
|
}).meta({
|
|
2028
2040
|
id: "ContainsFlags"
|
|
2029
2041
|
});
|
|
@@ -3213,6 +3225,9 @@ var ActionConfigBase = z24.object({
|
|
|
3213
3225
|
var DeclarationActionBase = ActionConfigBase.extend({
|
|
3214
3226
|
deduplication: DeduplicationConfig.optional()
|
|
3215
3227
|
});
|
|
3228
|
+
var actionConfirmationForm = z24.array(FieldConfig).optional().describe(
|
|
3229
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3230
|
+
);
|
|
3216
3231
|
var ReadActionConfig = ActionConfigBase.extend(
|
|
3217
3232
|
z24.object({
|
|
3218
3233
|
type: z24.literal(ActionType.READ),
|
|
@@ -3222,12 +3237,65 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3222
3237
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3223
3238
|
}).shape
|
|
3224
3239
|
);
|
|
3240
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3241
|
+
z24.object({
|
|
3242
|
+
type: z24.literal(ActionType.NOTIFY),
|
|
3243
|
+
form: actionConfirmationForm
|
|
3244
|
+
}).shape
|
|
3245
|
+
);
|
|
3246
|
+
var DuplicateDetectedConfig = ActionConfigBase.extend(
|
|
3247
|
+
z24.object({
|
|
3248
|
+
type: z24.literal(ActionType.DUPLICATE_DETECTED),
|
|
3249
|
+
label: z24.never().optional().describe(
|
|
3250
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no label."
|
|
3251
|
+
),
|
|
3252
|
+
supportingCopy: z24.never().optional(),
|
|
3253
|
+
icon: z24.never().optional().describe(
|
|
3254
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no icon."
|
|
3255
|
+
),
|
|
3256
|
+
conditionals: z24.never().optional().describe(
|
|
3257
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it cannot be disabled or hidden with conditionals."
|
|
3258
|
+
)
|
|
3259
|
+
}).shape
|
|
3260
|
+
);
|
|
3261
|
+
var MarkAsDuplicateConfig = ActionConfigBase.extend(
|
|
3262
|
+
z24.object({
|
|
3263
|
+
type: z24.literal(ActionType.MARK_AS_DUPLICATE)
|
|
3264
|
+
}).shape
|
|
3265
|
+
);
|
|
3266
|
+
var MarkAsNotDuplicateConfig = ActionConfigBase.extend(
|
|
3267
|
+
z24.object({
|
|
3268
|
+
type: z24.literal(ActionType.MARK_AS_NOT_DUPLICATE)
|
|
3269
|
+
}).shape
|
|
3270
|
+
);
|
|
3271
|
+
var AssignConfig = ActionConfigBase.extend(
|
|
3272
|
+
z24.object({
|
|
3273
|
+
type: z24.literal(ActionType.ASSIGN),
|
|
3274
|
+
flags: z24.never().optional().describe(
|
|
3275
|
+
"ASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3276
|
+
)
|
|
3277
|
+
}).shape
|
|
3278
|
+
);
|
|
3279
|
+
var UnassignConfig = ActionConfigBase.extend(
|
|
3280
|
+
z24.object({
|
|
3281
|
+
type: z24.literal(ActionType.UNASSIGN),
|
|
3282
|
+
flags: z24.never().optional().describe(
|
|
3283
|
+
"UNASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3284
|
+
)
|
|
3285
|
+
}).shape
|
|
3286
|
+
);
|
|
3287
|
+
var DeleteConfig = ActionConfigBase.extend(
|
|
3288
|
+
z24.object({
|
|
3289
|
+
type: z24.literal(ActionType.DELETE)
|
|
3290
|
+
}).shape
|
|
3291
|
+
);
|
|
3225
3292
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3226
3293
|
z24.object({
|
|
3227
3294
|
type: z24.literal(ActionType.DECLARE),
|
|
3228
3295
|
review: DeclarationReviewConfig.describe(
|
|
3229
3296
|
"Configuration of the review page fields."
|
|
3230
3297
|
),
|
|
3298
|
+
form: actionConfirmationForm,
|
|
3231
3299
|
dialogCopy: z24.object({
|
|
3232
3300
|
notify: TranslationConfig.describe(
|
|
3233
3301
|
"Confirmation text for the notify action"
|
|
@@ -3243,7 +3311,8 @@ var DeclareConfig = DeclarationActionBase.extend(
|
|
|
3243
3311
|
);
|
|
3244
3312
|
var ArchiveConfig = ActionConfigBase.extend(
|
|
3245
3313
|
z24.object({
|
|
3246
|
-
type: z24.literal(ActionType.ARCHIVE)
|
|
3314
|
+
type: z24.literal(ActionType.ARCHIVE),
|
|
3315
|
+
form: actionConfirmationForm
|
|
3247
3316
|
}).shape
|
|
3248
3317
|
);
|
|
3249
3318
|
var EditActionConfig = ActionConfigBase.extend(
|
|
@@ -3264,12 +3333,14 @@ var EditActionConfig = ActionConfigBase.extend(
|
|
|
3264
3333
|
);
|
|
3265
3334
|
var RejectConfig = ActionConfigBase.extend(
|
|
3266
3335
|
z24.object({
|
|
3267
|
-
type: z24.literal(ActionType.REJECT)
|
|
3336
|
+
type: z24.literal(ActionType.REJECT),
|
|
3337
|
+
form: actionConfirmationForm
|
|
3268
3338
|
}).shape
|
|
3269
3339
|
);
|
|
3270
3340
|
var RegisterConfig = DeclarationActionBase.extend(
|
|
3271
3341
|
z24.object({
|
|
3272
|
-
type: z24.literal(ActionType.REGISTER)
|
|
3342
|
+
type: z24.literal(ActionType.REGISTER),
|
|
3343
|
+
form: actionConfirmationForm
|
|
3273
3344
|
}).shape
|
|
3274
3345
|
);
|
|
3275
3346
|
var PrintCertificateActionConfig = ActionConfigBase.extend(
|
|
@@ -3284,7 +3355,17 @@ var RequestCorrectionConfig = ActionConfigBase.extend(
|
|
|
3284
3355
|
correctionForm: ActionFormConfig
|
|
3285
3356
|
}).shape
|
|
3286
3357
|
);
|
|
3287
|
-
var
|
|
3358
|
+
var ApproveCorrectionConfig = ActionConfigBase.extend(
|
|
3359
|
+
z24.object({
|
|
3360
|
+
type: z24.literal(ActionType.APPROVE_CORRECTION)
|
|
3361
|
+
}).shape
|
|
3362
|
+
);
|
|
3363
|
+
var RejectCorrectionConfig = ActionConfigBase.extend(
|
|
3364
|
+
z24.object({
|
|
3365
|
+
type: z24.literal(ActionType.REJECT_CORRECTION)
|
|
3366
|
+
}).shape
|
|
3367
|
+
);
|
|
3368
|
+
var CustomActionConfig = ActionConfigBase.extend(
|
|
3288
3369
|
z24.object({
|
|
3289
3370
|
type: z24.literal(ActionType.CUSTOM),
|
|
3290
3371
|
customActionType: z24.string().describe("Type identifier of the custom action."),
|
|
@@ -3295,7 +3376,7 @@ var CustomActionConfig = ActionConfigBase.merge(
|
|
|
3295
3376
|
auditHistoryLabel: TranslationConfig.describe(
|
|
3296
3377
|
'The label to show in audit history for this action. For example "Approved".'
|
|
3297
3378
|
)
|
|
3298
|
-
})
|
|
3379
|
+
}).shape
|
|
3299
3380
|
);
|
|
3300
3381
|
var ActionConfig = z24.discriminatedUnion("type", [
|
|
3301
3382
|
/*
|
|
@@ -3306,9 +3387,37 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3306
3387
|
id: "ReadActionConfig",
|
|
3307
3388
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3308
3389
|
}),
|
|
3390
|
+
AssignConfig.meta({
|
|
3391
|
+
id: "AssignActionConfig",
|
|
3392
|
+
description: "Configuration for assigning a record to the current user."
|
|
3393
|
+
}),
|
|
3394
|
+
UnassignConfig.meta({
|
|
3395
|
+
id: "UnassignActionConfig",
|
|
3396
|
+
description: "Configuration for unassigning a record from its current assignee."
|
|
3397
|
+
}),
|
|
3398
|
+
DeleteConfig.meta({
|
|
3399
|
+
id: "DeleteActionConfig",
|
|
3400
|
+
description: "Configuration for deleting a draft record."
|
|
3401
|
+
}),
|
|
3402
|
+
NotifyConfig.meta({
|
|
3403
|
+
id: "NotifyActionConfig",
|
|
3404
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3405
|
+
}),
|
|
3309
3406
|
DeclareConfig.meta({
|
|
3310
3407
|
id: "DeclareActionConfig",
|
|
3311
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3408
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3409
|
+
}),
|
|
3410
|
+
DuplicateDetectedConfig.meta({
|
|
3411
|
+
id: "DuplicateDetectedActionConfig",
|
|
3412
|
+
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."
|
|
3413
|
+
}),
|
|
3414
|
+
MarkAsDuplicateConfig.meta({
|
|
3415
|
+
id: "MarkAsDuplicateActionConfig",
|
|
3416
|
+
description: "Configuration for marking a record as a duplicate."
|
|
3417
|
+
}),
|
|
3418
|
+
MarkAsNotDuplicateConfig.meta({
|
|
3419
|
+
id: "MarkAsNotDuplicateActionConfig",
|
|
3420
|
+
description: "Configuration for marking a record as not a duplicate, after it was previously flagged as one."
|
|
3312
3421
|
}),
|
|
3313
3422
|
RejectConfig.meta({
|
|
3314
3423
|
id: "RejectActionConfig",
|
|
@@ -3326,6 +3435,14 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3326
3435
|
id: "RequestCorrectionActionConfig",
|
|
3327
3436
|
description: "Configuration for requesting a correction on a registered record."
|
|
3328
3437
|
}),
|
|
3438
|
+
ApproveCorrectionConfig.meta({
|
|
3439
|
+
id: "ApproveCorrectionActionConfig",
|
|
3440
|
+
description: "Configuration for approving a requested correction."
|
|
3441
|
+
}),
|
|
3442
|
+
RejectCorrectionConfig.meta({
|
|
3443
|
+
id: "RejectCorrectionActionConfig",
|
|
3444
|
+
description: "Configuration for rejecting a requested correction."
|
|
3445
|
+
}),
|
|
3329
3446
|
EditActionConfig.meta({
|
|
3330
3447
|
id: "EditActionConfig",
|
|
3331
3448
|
description: "Configuration for editing a record before registration."
|
|
@@ -4477,16 +4594,13 @@ function getActionConfig({
|
|
|
4477
4594
|
actionType,
|
|
4478
4595
|
customActionType
|
|
4479
4596
|
}) {
|
|
4597
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4598
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4599
|
+
}
|
|
4480
4600
|
return eventConfiguration.actions.find((a) => {
|
|
4481
4601
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4482
4602
|
return a.customActionType === customActionType;
|
|
4483
4603
|
}
|
|
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
4604
|
return a.type === actionType;
|
|
4491
4605
|
});
|
|
4492
4606
|
}
|
|
@@ -4496,7 +4610,19 @@ function getCustomActionFields(eventConfiguration, customActionType) {
|
|
|
4496
4610
|
customActionType,
|
|
4497
4611
|
actionType: ActionType.CUSTOM
|
|
4498
4612
|
});
|
|
4499
|
-
if (!actionConfig ||
|
|
4613
|
+
if (!actionConfig || actionConfig.type !== ActionType.CUSTOM) {
|
|
4614
|
+
return [];
|
|
4615
|
+
}
|
|
4616
|
+
return actionConfig.form;
|
|
4617
|
+
}
|
|
4618
|
+
function getActionFormFields(eventConfiguration, actionType, customActionType) {
|
|
4619
|
+
const actionConfig = eventConfiguration.actions.find((a) => {
|
|
4620
|
+
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4621
|
+
return a.customActionType === customActionType;
|
|
4622
|
+
}
|
|
4623
|
+
return a.type === actionType;
|
|
4624
|
+
});
|
|
4625
|
+
if (!actionConfig || !("form" in actionConfig) || actionConfig.form == null) {
|
|
4500
4626
|
return [];
|
|
4501
4627
|
}
|
|
4502
4628
|
return actionConfig.form;
|
|
@@ -4517,13 +4643,9 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4517
4643
|
if (actionConfig.type === ActionType.PRINT_CERTIFICATE) {
|
|
4518
4644
|
return actionConfig.printForm.pages.flatMap(({ fields }) => fields);
|
|
4519
4645
|
}
|
|
4520
|
-
|
|
4521
|
-
|
|
4522
|
-
|
|
4523
|
-
if ("review" in actionConfig) {
|
|
4524
|
-
return actionConfig.review.fields;
|
|
4525
|
-
}
|
|
4526
|
-
return [];
|
|
4646
|
+
const reviewFields = "review" in actionConfig && actionConfig.review != null ? actionConfig.review.fields : [];
|
|
4647
|
+
const formFields = "form" in actionConfig && actionConfig.form != null ? actionConfig.form : [];
|
|
4648
|
+
return [...reviewFields, ...formFields];
|
|
4527
4649
|
};
|
|
4528
4650
|
function getAllAnnotationFields(config) {
|
|
4529
4651
|
return (0, import_lodash.flattenDeep)(config.actions.map(getActionAnnotationFields));
|
|
@@ -5640,7 +5762,7 @@ function validateActionFlags(event2, ctx) {
|
|
|
5640
5762
|
const isInherentFlag = (value) => Object.values(InherentFlags).includes(value);
|
|
5641
5763
|
const configuredFlagIds = event2.flags.map((flag2) => flag2.id);
|
|
5642
5764
|
const actionFlagIds = event2.actions.flatMap(
|
|
5643
|
-
(action) => action.flags.map((flag2) => flag2.id)
|
|
5765
|
+
(action) => (action.flags ?? []).map((flag2) => flag2.id)
|
|
5644
5766
|
);
|
|
5645
5767
|
for (const actionFlagId of actionFlagIds) {
|
|
5646
5768
|
const isConfigured = configuredFlagIds.includes(actionFlagId);
|
|
@@ -6521,6 +6643,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6521
6643
|
}
|
|
6522
6644
|
function getLegalStatuses(actions) {
|
|
6523
6645
|
return {
|
|
6646
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6647
|
+
ActionType.NOTIFY,
|
|
6648
|
+
actions
|
|
6649
|
+
),
|
|
6524
6650
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6525
6651
|
ActionType.DECLARE,
|
|
6526
6652
|
actions
|
|
@@ -6679,7 +6805,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6679
6805
|
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6680
6806
|
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6681
6807
|
const form = { ...declaration, ...annotation };
|
|
6682
|
-
const flagsWithMetConditions = actionConfig.flags.filter(
|
|
6808
|
+
const flagsWithMetConditions = (actionConfig.flags ?? []).filter(
|
|
6683
6809
|
({ conditional }) => (
|
|
6684
6810
|
// If conditional is not provided, the flag is resolved
|
|
6685
6811
|
conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
@@ -8284,6 +8410,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8284
8410
|
},
|
|
8285
8411
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8286
8412
|
},
|
|
8413
|
+
{
|
|
8414
|
+
type: ActionType.NOTIFY,
|
|
8415
|
+
label: {
|
|
8416
|
+
defaultMessage: "Notify health worker",
|
|
8417
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8418
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8419
|
+
},
|
|
8420
|
+
flags: [
|
|
8421
|
+
{
|
|
8422
|
+
id: "health-worker-notified",
|
|
8423
|
+
operation: "add"
|
|
8424
|
+
}
|
|
8425
|
+
]
|
|
8426
|
+
},
|
|
8287
8427
|
{
|
|
8288
8428
|
type: ActionType.REJECT,
|
|
8289
8429
|
label: {
|
|
@@ -8526,6 +8666,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8526
8666
|
}
|
|
8527
8667
|
}
|
|
8528
8668
|
],
|
|
8669
|
+
flags: [
|
|
8670
|
+
{
|
|
8671
|
+
id: "health-worker-notified",
|
|
8672
|
+
requiresAction: false,
|
|
8673
|
+
label: {
|
|
8674
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8675
|
+
defaultMessage: "Health worker notified",
|
|
8676
|
+
description: "Label for the health-worker-notified flag"
|
|
8677
|
+
}
|
|
8678
|
+
}
|
|
8679
|
+
],
|
|
8529
8680
|
advancedSearch: [
|
|
8530
8681
|
{
|
|
8531
8682
|
title: {
|
|
@@ -10284,7 +10435,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10284
10435
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10285
10436
|
}
|
|
10286
10437
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10287
|
-
return user2.administrativeAreaId
|
|
10438
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10288
10439
|
}
|
|
10289
10440
|
return true;
|
|
10290
10441
|
}
|
|
@@ -10311,6 +10462,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10311
10462
|
}
|
|
10312
10463
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10313
10464
|
const { options } = scope;
|
|
10465
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10466
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10467
|
+
return false;
|
|
10468
|
+
}
|
|
10469
|
+
}
|
|
10470
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10471
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10472
|
+
JurisdictionFilter.enum.location,
|
|
10473
|
+
user2
|
|
10474
|
+
)) {
|
|
10475
|
+
return false;
|
|
10476
|
+
}
|
|
10477
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10478
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10479
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10480
|
+
user2
|
|
10481
|
+
)) {
|
|
10482
|
+
return false;
|
|
10483
|
+
}
|
|
10314
10484
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10315
10485
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10316
10486
|
return false;
|
|
@@ -10373,7 +10543,7 @@ function canAccessUserWithScope({
|
|
|
10373
10543
|
}
|
|
10374
10544
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10375
10545
|
(id) => user2.administrativeAreaId === id
|
|
10376
|
-
) || user2.administrativeAreaId
|
|
10546
|
+
) || !user2.administrativeAreaId;
|
|
10377
10547
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10378
10548
|
return false;
|
|
10379
10549
|
}
|
|
@@ -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
|
*
|