@opencrvs/toolkit 2.0.0-rc.07776ed → 2.0.0-rc.078e42f
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 +18 -6
- package/dist/cli.js +3253 -47
- package/dist/commons/api/router.d.ts +131 -116
- package/dist/commons/conditionals/conditionals.d.ts +1589 -37
- package/dist/commons/events/ActionConfig.d.ts +28 -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 +11 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/field.d.ts +722 -34
- 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 +6 -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 +507 -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 +183 -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 +179 -0
- package/dist/environment/users.d.ts +2 -0
- package/dist/environment/users.d.ts.map +1 -0
- package/dist/environment/users.js +122 -0
- package/dist/environment/utils.d.ts +18 -0
- package/dist/environment/utils.d.ts.map +1 -0
- package/dist/environment/utils.js +110 -0
- package/dist/events/index.js +177 -59
- 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/convert-config-files-to-ts.js +17 -7
- package/dist/migrations/v2.0/index.js +11 -6
- package/dist/migrations/v2.0/remove-hearth-migrations.js +17 -7
- package/dist/notification/index.js +100 -8
- 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.078e42f.tgz +0 -0
- package/package.json +16 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.07776ed.tgz +0 -0
|
@@ -0,0 +1,122 @@
|
|
|
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 () {
|
|
29
|
+
var ownKeys = function(o) {
|
|
30
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
31
|
+
var ar = [];
|
|
32
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
33
|
+
return ar;
|
|
34
|
+
};
|
|
35
|
+
return ownKeys(o);
|
|
36
|
+
};
|
|
37
|
+
return function (mod) {
|
|
38
|
+
if (mod && mod.__esModule) return mod;
|
|
39
|
+
var result = {};
|
|
40
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
41
|
+
__setModuleDefault(result, mod);
|
|
42
|
+
return result;
|
|
43
|
+
};
|
|
44
|
+
})();
|
|
45
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
46
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
47
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
48
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
49
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
50
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
51
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
52
|
+
});
|
|
53
|
+
};
|
|
54
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
55
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
56
|
+
};
|
|
57
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
58
|
+
exports.manageEnvironmentUsers = manageEnvironmentUsers;
|
|
59
|
+
const fs = __importStar(require("fs"));
|
|
60
|
+
/* eslint-disable no-console */
|
|
61
|
+
const path = __importStar(require("path"));
|
|
62
|
+
const kleur_1 = __importDefault(require("kleur"));
|
|
63
|
+
const manage_users_1 = require("./manage-users");
|
|
64
|
+
const logger_1 = require("./logger");
|
|
65
|
+
function select(options) {
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
const inquirer = yield import('@inquirer/prompts');
|
|
68
|
+
return inquirer.select(options);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Allow user to select inventory file (environment from a list)
|
|
73
|
+
*
|
|
74
|
+
* @param {string} dirPath - Path to the inventory file
|
|
75
|
+
*
|
|
76
|
+
* * @returns {string} Inventory file
|
|
77
|
+
*/
|
|
78
|
+
function selectInventoryFile() {
|
|
79
|
+
return __awaiter(this, arguments, void 0, function* (dirPath = './infrastructure/server-setup/inventory/') {
|
|
80
|
+
// Check if directory exists
|
|
81
|
+
if (!fs.existsSync(dirPath)) {
|
|
82
|
+
(0, logger_1.warn)(`⚠️ No environment configuration directory found at ${dirPath}`);
|
|
83
|
+
(0, logger_1.warn)('Hint: If this is a new infrastructure repository, run `opencrvs environment init` first.');
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
// Read and filter files
|
|
87
|
+
const files = fs
|
|
88
|
+
.readdirSync(dirPath)
|
|
89
|
+
.filter((file) => {
|
|
90
|
+
const filePath = path.join(dirPath, file);
|
|
91
|
+
const isFile = fs.statSync(filePath).isFile();
|
|
92
|
+
const ext = path.extname(file).slice(1).toLowerCase();
|
|
93
|
+
return isFile && (ext === 'yml' || ext === 'yaml');
|
|
94
|
+
})
|
|
95
|
+
.sort();
|
|
96
|
+
if (files.length === 0) {
|
|
97
|
+
(0, logger_1.warn)(`⚠️ No environment configuration files found at ${dirPath}`);
|
|
98
|
+
(0, logger_1.warn)('Hint: If this is a new infrastructure repository, run `opencrvs environment init` first.');
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
// Create choices - remove extension from display
|
|
102
|
+
const choices = files.map((file) => ({
|
|
103
|
+
name: path.basename(file, path.extname(file)),
|
|
104
|
+
value: path.join(dirPath, file)
|
|
105
|
+
}));
|
|
106
|
+
const selectedFile = yield select({
|
|
107
|
+
message: 'Select environment (inventory file) to load users:',
|
|
108
|
+
choices: choices
|
|
109
|
+
});
|
|
110
|
+
return selectedFile;
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
function manageEnvironmentUsers() {
|
|
114
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
115
|
+
console.log('\n', kleur_1.default.bold().underline('Manage users'), '\n');
|
|
116
|
+
const inventory_file = yield selectInventoryFile();
|
|
117
|
+
if (!inventory_file) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
yield (0, manage_users_1.manageUsers)(inventory_file);
|
|
121
|
+
});
|
|
122
|
+
}
|
|
@@ -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,110 @@
|
|
|
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 () {
|
|
29
|
+
var ownKeys = function(o) {
|
|
30
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
31
|
+
var ar = [];
|
|
32
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
33
|
+
return ar;
|
|
34
|
+
};
|
|
35
|
+
return ownKeys(o);
|
|
36
|
+
};
|
|
37
|
+
return function (mod) {
|
|
38
|
+
if (mod && mod.__esModule) return mod;
|
|
39
|
+
var result = {};
|
|
40
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
41
|
+
__setModuleDefault(result, mod);
|
|
42
|
+
return result;
|
|
43
|
+
};
|
|
44
|
+
})();
|
|
45
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
46
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
47
|
+
};
|
|
48
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
49
|
+
exports.generateLongPassword = generateLongPassword;
|
|
50
|
+
exports.findExistingValue = findExistingValue;
|
|
51
|
+
exports.storeSecrets = storeSecrets;
|
|
52
|
+
exports.readYamlFile = readYamlFile;
|
|
53
|
+
exports.writeYamlFile = writeYamlFile;
|
|
54
|
+
const fs_1 = __importStar(require("fs"));
|
|
55
|
+
const yaml = __importStar(require("js-yaml"));
|
|
56
|
+
const dotenv_1 = __importDefault(require("dotenv"));
|
|
57
|
+
function generateLongPassword() {
|
|
58
|
+
const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
|
59
|
+
let result = '';
|
|
60
|
+
for (let i = 16; i > 0; --i)
|
|
61
|
+
result += chars[Math.floor(Math.random() * chars.length)];
|
|
62
|
+
return result;
|
|
63
|
+
}
|
|
64
|
+
function findExistingValue(name, type, scope, existingValues) {
|
|
65
|
+
return existingValues.find((value) => value.name === name && value.type === type && value.scope === scope);
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Merges and stores secrets in `.env.{environment}` file.
|
|
69
|
+
* Updates existing variables, preserves unchanged ones, adds new ones.
|
|
70
|
+
*
|
|
71
|
+
* @param environment - Environment name (e.g., 'production')
|
|
72
|
+
* @param answers - Variables to update: `[{ name: 'KEY', value: 'val' }]`
|
|
73
|
+
*
|
|
74
|
+
* @example
|
|
75
|
+
* storeSecrets('prod', [{ name: 'API_KEY', value: 'abc123' }]);
|
|
76
|
+
*/
|
|
77
|
+
function storeSecrets(environment, answers) {
|
|
78
|
+
let envConfig = {};
|
|
79
|
+
try {
|
|
80
|
+
envConfig = dotenv_1.default.parse((0, fs_1.readFileSync)(`${process.cwd()}/.env.${environment}`));
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
envConfig = {};
|
|
84
|
+
}
|
|
85
|
+
const linesFromAnswers = answers.map((update) => `${update.name}="${update.value}"`);
|
|
86
|
+
const linesFromEnvConfig = Object.entries(envConfig)
|
|
87
|
+
.filter(([name]) => !answers.find((update) => update.name === name))
|
|
88
|
+
.map(([name, value]) => `${name}="${value}"`);
|
|
89
|
+
const allLines = [...linesFromEnvConfig, ...linesFromAnswers].sort();
|
|
90
|
+
(0, fs_1.writeFileSync)(`.env.${environment}`, allLines.join('\n'));
|
|
91
|
+
}
|
|
92
|
+
function readYamlFile(filePath) {
|
|
93
|
+
const fileContent = fs_1.default.readFileSync(filePath, 'utf8');
|
|
94
|
+
return yaml.load(fileContent);
|
|
95
|
+
}
|
|
96
|
+
function writeYamlFile(filePath, data) {
|
|
97
|
+
try {
|
|
98
|
+
const yamlContent = yaml.dump(data, {
|
|
99
|
+
indent: 2,
|
|
100
|
+
lineWidth: -1,
|
|
101
|
+
flowLevel: -1, // Prevent flow style for arrays/objects
|
|
102
|
+
noRefs: true,
|
|
103
|
+
sortKeys: false
|
|
104
|
+
});
|
|
105
|
+
fs_1.default.writeFileSync(filePath, yamlContent, 'utf8');
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
throw new Error(`Failed to write inventory file: ${error}`);
|
|
109
|
+
}
|
|
110
|
+
}
|
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
|
});
|
|
@@ -2298,6 +2309,7 @@ var NumberField = BaseField.extend({
|
|
|
2298
2309
|
configuration: import_v43.default.object({
|
|
2299
2310
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2300
2311
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2312
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2301
2313
|
prefix: TranslationConfig.optional(),
|
|
2302
2314
|
postfix: TranslationConfig.optional()
|
|
2303
2315
|
}).optional()
|
|
@@ -3221,6 +3233,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3221
3233
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3222
3234
|
}).shape
|
|
3223
3235
|
);
|
|
3236
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3237
|
+
z24.object({
|
|
3238
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3239
|
+
}).shape
|
|
3240
|
+
);
|
|
3224
3241
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3225
3242
|
z24.object({
|
|
3226
3243
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3305,9 +3322,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3305
3322
|
id: "ReadActionConfig",
|
|
3306
3323
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3307
3324
|
}),
|
|
3325
|
+
NotifyConfig.meta({
|
|
3326
|
+
id: "NotifyActionConfig",
|
|
3327
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3328
|
+
}),
|
|
3308
3329
|
DeclareConfig.meta({
|
|
3309
3330
|
id: "DeclareActionConfig",
|
|
3310
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3331
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3311
3332
|
}),
|
|
3312
3333
|
RejectConfig.meta({
|
|
3313
3334
|
id: "RejectActionConfig",
|
|
@@ -3914,7 +3935,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3914
3935
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3915
3936
|
};
|
|
3916
3937
|
var isNonInteractiveFieldType = (field3) => {
|
|
3917
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
3938
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3918
3939
|
};
|
|
3919
3940
|
|
|
3920
3941
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4476,13 +4497,13 @@ function getActionConfig({
|
|
|
4476
4497
|
actionType,
|
|
4477
4498
|
customActionType
|
|
4478
4499
|
}) {
|
|
4500
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4501
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4502
|
+
}
|
|
4479
4503
|
return eventConfiguration.actions.find((a) => {
|
|
4480
4504
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4481
4505
|
return a.customActionType === customActionType;
|
|
4482
4506
|
}
|
|
4483
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4484
|
-
return a.type === ActionType.DECLARE;
|
|
4485
|
-
}
|
|
4486
4507
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4487
4508
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4488
4509
|
}
|
|
@@ -4519,7 +4540,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4519
4540
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4520
4541
|
return actionConfig.form;
|
|
4521
4542
|
}
|
|
4522
|
-
if ("review" in actionConfig) {
|
|
4543
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4523
4544
|
return actionConfig.review.fields;
|
|
4524
4545
|
}
|
|
4525
4546
|
return [];
|
|
@@ -6491,6 +6512,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6491
6512
|
ActionType.ARCHIVE,
|
|
6492
6513
|
ActionType.PRINT_CERTIFICATE,
|
|
6493
6514
|
ActionType.REQUEST_CORRECTION,
|
|
6515
|
+
ActionType.APPROVE_CORRECTION,
|
|
6516
|
+
ActionType.REJECT_CORRECTION,
|
|
6494
6517
|
ActionType.CUSTOM
|
|
6495
6518
|
]);
|
|
6496
6519
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6518,6 +6541,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6518
6541
|
}
|
|
6519
6542
|
function getLegalStatuses(actions) {
|
|
6520
6543
|
return {
|
|
6544
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6545
|
+
ActionType.NOTIFY,
|
|
6546
|
+
actions
|
|
6547
|
+
),
|
|
6521
6548
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6522
6549
|
ActionType.DECLARE,
|
|
6523
6550
|
actions
|
|
@@ -6532,9 +6559,6 @@ function getLegalStatuses(actions) {
|
|
|
6532
6559
|
// ../commons/src/events/state/flags.ts
|
|
6533
6560
|
var import_lodash3 = require("lodash");
|
|
6534
6561
|
var import_date_fns3 = require("date-fns");
|
|
6535
|
-
function isEditInProgress(actions) {
|
|
6536
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6537
|
-
}
|
|
6538
6562
|
function findPendingCorrectionAction(writeActions2) {
|
|
6539
6563
|
let correctionRequestAction;
|
|
6540
6564
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6549,29 +6573,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6549
6573
|
}
|
|
6550
6574
|
return correctionRequestAction;
|
|
6551
6575
|
}
|
|
6552
|
-
function isCorrectionRequested(actions) {
|
|
6553
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6554
|
-
}
|
|
6555
|
-
function isDeclarationIncomplete(actions) {
|
|
6556
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6557
|
-
}
|
|
6558
|
-
function isRejected(actions) {
|
|
6559
|
-
const resettingActionTypes = [
|
|
6560
|
-
ActionType.NOTIFY,
|
|
6561
|
-
ActionType.DECLARE,
|
|
6562
|
-
ActionType.EDIT,
|
|
6563
|
-
ActionType.REGISTER
|
|
6564
|
-
];
|
|
6565
|
-
return actions.reduce((prev, { type }) => {
|
|
6566
|
-
if (type === ActionType.REJECT) {
|
|
6567
|
-
return true;
|
|
6568
|
-
}
|
|
6569
|
-
if (resettingActionTypes.includes(type)) {
|
|
6570
|
-
return false;
|
|
6571
|
-
}
|
|
6572
|
-
return prev;
|
|
6573
|
-
}, false);
|
|
6574
|
-
}
|
|
6575
6576
|
function isPotentialDuplicate(actions) {
|
|
6576
6577
|
return actions.reduce((prev, { type }) => {
|
|
6577
6578
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6599,6 +6600,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6599
6600
|
}
|
|
6600
6601
|
});
|
|
6601
6602
|
}
|
|
6603
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6604
|
+
if (!isActionConfigType(action.type)) {
|
|
6605
|
+
return false;
|
|
6606
|
+
}
|
|
6607
|
+
const actionConfig = getActionConfig({
|
|
6608
|
+
eventConfiguration,
|
|
6609
|
+
actionType: action.type,
|
|
6610
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6611
|
+
});
|
|
6612
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6613
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6614
|
+
);
|
|
6615
|
+
if (removeOperations.length === 0) {
|
|
6616
|
+
return false;
|
|
6617
|
+
}
|
|
6618
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6619
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6620
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6621
|
+
const form = { ...declaration, ...annotation };
|
|
6622
|
+
return removeOperations.some(
|
|
6623
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6624
|
+
);
|
|
6625
|
+
}
|
|
6626
|
+
var INHERENT_FLAG_RULES = [
|
|
6627
|
+
{
|
|
6628
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6629
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6630
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6631
|
+
},
|
|
6632
|
+
{
|
|
6633
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6634
|
+
// other status-changing action (see getStatusFromActions).
|
|
6635
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6636
|
+
setOn: [ActionType.NOTIFY],
|
|
6637
|
+
resetOn: [
|
|
6638
|
+
ActionType.CREATE,
|
|
6639
|
+
ActionType.DECLARE,
|
|
6640
|
+
ActionType.REGISTER,
|
|
6641
|
+
ActionType.ARCHIVE
|
|
6642
|
+
]
|
|
6643
|
+
},
|
|
6644
|
+
{
|
|
6645
|
+
flag: InherentFlags.REJECTED,
|
|
6646
|
+
setOn: [ActionType.REJECT],
|
|
6647
|
+
resetOn: [
|
|
6648
|
+
ActionType.NOTIFY,
|
|
6649
|
+
ActionType.DECLARE,
|
|
6650
|
+
ActionType.EDIT,
|
|
6651
|
+
ActionType.REGISTER
|
|
6652
|
+
]
|
|
6653
|
+
},
|
|
6654
|
+
{
|
|
6655
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6656
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6657
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6658
|
+
},
|
|
6659
|
+
{
|
|
6660
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6661
|
+
setOn: [ActionType.EDIT],
|
|
6662
|
+
resetOnAnyOtherAction: true
|
|
6663
|
+
}
|
|
6664
|
+
];
|
|
6665
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6666
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6667
|
+
if (rule.setOn.includes(action.type)) {
|
|
6668
|
+
return true;
|
|
6669
|
+
}
|
|
6670
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6671
|
+
return false;
|
|
6672
|
+
}
|
|
6673
|
+
if (actionConfigRemovesFlag(
|
|
6674
|
+
action,
|
|
6675
|
+
rule.flag,
|
|
6676
|
+
acceptedActions.slice(0, idx + 1),
|
|
6677
|
+
event2,
|
|
6678
|
+
eventConfiguration
|
|
6679
|
+
)) {
|
|
6680
|
+
return false;
|
|
6681
|
+
}
|
|
6682
|
+
return present;
|
|
6683
|
+
}, false);
|
|
6684
|
+
}
|
|
6602
6685
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6603
6686
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6604
6687
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6647,33 +6730,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6647
6730
|
return flag2;
|
|
6648
6731
|
});
|
|
6649
6732
|
}
|
|
6650
|
-
function getInherentFlags(sortedActions) {
|
|
6733
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6651
6734
|
const acceptedActions = sortedActions.filter(
|
|
6652
6735
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6653
6736
|
);
|
|
6654
|
-
|
|
6655
|
-
|
|
6656
|
-
|
|
6657
|
-
}
|
|
6658
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6659
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6660
|
-
}
|
|
6661
|
-
if (isRejected(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6663
|
-
}
|
|
6664
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6665
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6666
|
-
}
|
|
6667
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6668
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6669
|
-
}
|
|
6670
|
-
return inherentFlags;
|
|
6737
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6738
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6739
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6671
6740
|
}
|
|
6672
6741
|
function getEventFlags(event2, config) {
|
|
6673
6742
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6674
6743
|
return [
|
|
6675
6744
|
...getActionStatusFlags(sortedActions),
|
|
6676
|
-
...getInherentFlags(sortedActions),
|
|
6745
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6677
6746
|
...resolveEventCustomFlags(event2, config)
|
|
6678
6747
|
];
|
|
6679
6748
|
}
|
|
@@ -7678,6 +7747,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7678
7747
|
id: "signature.upload.modal.title",
|
|
7679
7748
|
defaultMessage: "Draw signature",
|
|
7680
7749
|
description: "Title for the modal to draw signature"
|
|
7750
|
+
},
|
|
7751
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7752
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7753
|
+
configuration: {
|
|
7754
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7681
7755
|
}
|
|
7682
7756
|
}
|
|
7683
7757
|
]
|
|
@@ -8234,6 +8308,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8234
8308
|
},
|
|
8235
8309
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8236
8310
|
},
|
|
8311
|
+
{
|
|
8312
|
+
type: ActionType.NOTIFY,
|
|
8313
|
+
label: {
|
|
8314
|
+
defaultMessage: "Notify health worker",
|
|
8315
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8316
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8317
|
+
},
|
|
8318
|
+
flags: [
|
|
8319
|
+
{
|
|
8320
|
+
id: "health-worker-notified",
|
|
8321
|
+
operation: "add"
|
|
8322
|
+
}
|
|
8323
|
+
]
|
|
8324
|
+
},
|
|
8237
8325
|
{
|
|
8238
8326
|
type: ActionType.REJECT,
|
|
8239
8327
|
label: {
|
|
@@ -8476,6 +8564,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8476
8564
|
}
|
|
8477
8565
|
}
|
|
8478
8566
|
],
|
|
8567
|
+
flags: [
|
|
8568
|
+
{
|
|
8569
|
+
id: "health-worker-notified",
|
|
8570
|
+
requiresAction: false,
|
|
8571
|
+
label: {
|
|
8572
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8573
|
+
defaultMessage: "Health worker notified",
|
|
8574
|
+
description: "Label for the health-worker-notified flag"
|
|
8575
|
+
}
|
|
8576
|
+
}
|
|
8577
|
+
],
|
|
8479
8578
|
advancedSearch: [
|
|
8480
8579
|
{
|
|
8481
8580
|
title: {
|
|
@@ -10234,7 +10333,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10234
10333
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10235
10334
|
}
|
|
10236
10335
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10237
|
-
return user2.administrativeAreaId
|
|
10336
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10238
10337
|
}
|
|
10239
10338
|
return true;
|
|
10240
10339
|
}
|
|
@@ -10261,6 +10360,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10261
10360
|
}
|
|
10262
10361
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10263
10362
|
const { options } = scope;
|
|
10363
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10364
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10365
|
+
return false;
|
|
10366
|
+
}
|
|
10367
|
+
}
|
|
10368
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10369
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10370
|
+
JurisdictionFilter.enum.location,
|
|
10371
|
+
user2
|
|
10372
|
+
)) {
|
|
10373
|
+
return false;
|
|
10374
|
+
}
|
|
10375
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10376
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10377
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10378
|
+
user2
|
|
10379
|
+
)) {
|
|
10380
|
+
return false;
|
|
10381
|
+
}
|
|
10264
10382
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10265
10383
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10266
10384
|
return false;
|
|
@@ -10323,7 +10441,7 @@ function canAccessUserWithScope({
|
|
|
10323
10441
|
}
|
|
10324
10442
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10325
10443
|
(id) => user2.administrativeAreaId === id
|
|
10326
|
-
) || user2.administrativeAreaId
|
|
10444
|
+
) || !user2.administrativeAreaId;
|
|
10327
10445
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10328
10446
|
return false;
|
|
10329
10447
|
}
|
|
@@ -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
|
*
|