@opencrvs/toolkit 2.0.0-rc.e578b74 → 2.0.0-rc.e5a7b9a
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 +8 -1
- package/dist/cli.js +3243 -42
- package/dist/commons/api/router.d.ts +13 -2
- package/dist/commons/events/ActionConfig.d.ts +35 -2
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventIndex.d.ts +14 -0
- package/dist/commons/events/FieldConfig.d.ts +1 -0
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/utils.d.ts +8 -0
- package/dist/environment/custom-types.d.ts +33 -0
- package/dist/environment/custom-types.d.ts.map +1 -0
- package/dist/environment/custom-types.js +12 -0
- package/dist/environment/derived-variables.d.ts +134 -0
- package/dist/environment/derived-variables.d.ts.map +1 -0
- package/dist/environment/derived-variables.js +169 -0
- package/dist/environment/editor-questions.d.ts +4 -0
- package/dist/environment/editor-questions.d.ts.map +1 -0
- package/dist/environment/editor-questions.js +67 -0
- package/dist/environment/git.d.ts +5 -0
- package/dist/environment/git.d.ts.map +1 -0
- package/dist/environment/git.js +38 -0
- package/dist/environment/github.d.ts +26 -0
- package/dist/environment/github.d.ts.map +1 -0
- package/dist/environment/github.js +247 -0
- package/dist/environment/index.d.ts +5 -0
- package/dist/environment/index.d.ts.map +1 -0
- package/dist/environment/index.js +71 -0
- package/dist/environment/logger.d.ts +15 -0
- package/dist/environment/logger.d.ts.map +1 -0
- package/dist/environment/logger.js +25 -0
- package/dist/environment/manage-users.d.ts +11 -0
- package/dist/environment/manage-users.d.ts.map +1 -0
- package/dist/environment/manage-users.js +497 -0
- package/dist/environment/questions-helper.d.ts +15 -0
- package/dist/environment/questions-helper.d.ts.map +1 -0
- package/dist/environment/questions-helper.js +70 -0
- package/dist/environment/questions.d.ts +199 -0
- package/dist/environment/questions.d.ts.map +1 -0
- package/dist/environment/questions.js +412 -0
- package/dist/environment/setup-environment.d.ts +2 -0
- package/dist/environment/setup-environment.d.ts.map +1 -0
- package/dist/environment/setup-environment.js +794 -0
- package/dist/environment/ssh-keygen.d.ts +5 -0
- package/dist/environment/ssh-keygen.d.ts.map +1 -0
- package/dist/environment/ssh-keygen.js +21 -0
- package/dist/environment/swarm-to-k8s.d.ts +2 -0
- package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
- package/dist/environment/swarm-to-k8s.js +173 -0
- package/dist/environment/templates.d.ts +27 -0
- package/dist/environment/templates.d.ts.map +1 -0
- package/dist/environment/templates.js +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 +188 -72
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/index.js +1 -1
- package/dist/notification/index.js +117 -12
- 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.e5a7b9a.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.e578b74.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
|
@@ -151,6 +151,7 @@ __export(events_exports, {
|
|
|
151
151
|
FormPageConfig: () => FormPageConfig,
|
|
152
152
|
Fuzzy: () => Fuzzy,
|
|
153
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
154
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
155
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
156
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -311,6 +312,7 @@ __export(events_exports, {
|
|
|
311
312
|
getActionAnnotation: () => getActionAnnotation,
|
|
312
313
|
getActionAnnotationFields: () => getActionAnnotationFields,
|
|
313
314
|
getActionConfig: () => getActionConfig,
|
|
315
|
+
getActionFormFields: () => getActionFormFields,
|
|
314
316
|
getActionReview: () => getActionReview,
|
|
315
317
|
getActionReviewFields: () => getActionReviewFields,
|
|
316
318
|
getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
|
|
@@ -1219,6 +1221,11 @@ var FieldTypesToHideInReview = [
|
|
|
1219
1221
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1220
1222
|
FieldType.ALPHA_HIDDEN
|
|
1221
1223
|
];
|
|
1224
|
+
var HiddenFieldTypes = [
|
|
1225
|
+
FieldType.HTTP,
|
|
1226
|
+
FieldType.QUERY_PARAM_READER,
|
|
1227
|
+
FieldType.ALPHA_HIDDEN
|
|
1228
|
+
];
|
|
1222
1229
|
|
|
1223
1230
|
// ../commons/src/events/FieldValue.ts
|
|
1224
1231
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -2017,7 +2024,8 @@ var Range = import_v4.z.object({
|
|
|
2017
2024
|
});
|
|
2018
2025
|
var ContainsFlags = import_v4.z.object({
|
|
2019
2026
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2020
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2027
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2028
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2021
2029
|
}).meta({
|
|
2022
2030
|
id: "ContainsFlags"
|
|
2023
2031
|
});
|
|
@@ -2292,6 +2300,7 @@ var NumberField = BaseField.extend({
|
|
|
2292
2300
|
configuration: import_v43.default.object({
|
|
2293
2301
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2294
2302
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2303
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2295
2304
|
prefix: TranslationConfig.optional(),
|
|
2296
2305
|
postfix: TranslationConfig.optional()
|
|
2297
2306
|
}).optional()
|
|
@@ -3215,12 +3224,23 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3215
3224
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3216
3225
|
}).shape
|
|
3217
3226
|
);
|
|
3227
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3228
|
+
z24.object({
|
|
3229
|
+
type: z24.literal(ActionType.NOTIFY),
|
|
3230
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
3231
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3232
|
+
)
|
|
3233
|
+
}).shape
|
|
3234
|
+
);
|
|
3218
3235
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3219
3236
|
z24.object({
|
|
3220
3237
|
type: z24.literal(ActionType.DECLARE),
|
|
3221
3238
|
review: DeclarationReviewConfig.describe(
|
|
3222
3239
|
"Configuration of the review page fields."
|
|
3223
3240
|
),
|
|
3241
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
3242
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3243
|
+
),
|
|
3224
3244
|
dialogCopy: z24.object({
|
|
3225
3245
|
notify: TranslationConfig.describe(
|
|
3226
3246
|
"Confirmation text for the notify action"
|
|
@@ -3236,7 +3256,10 @@ var DeclareConfig = DeclarationActionBase.extend(
|
|
|
3236
3256
|
);
|
|
3237
3257
|
var ArchiveConfig = ActionConfigBase.extend(
|
|
3238
3258
|
z24.object({
|
|
3239
|
-
type: z24.literal(ActionType.ARCHIVE)
|
|
3259
|
+
type: z24.literal(ActionType.ARCHIVE),
|
|
3260
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
3261
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3262
|
+
)
|
|
3240
3263
|
}).shape
|
|
3241
3264
|
);
|
|
3242
3265
|
var EditActionConfig = ActionConfigBase.extend(
|
|
@@ -3257,12 +3280,18 @@ var EditActionConfig = ActionConfigBase.extend(
|
|
|
3257
3280
|
);
|
|
3258
3281
|
var RejectConfig = ActionConfigBase.extend(
|
|
3259
3282
|
z24.object({
|
|
3260
|
-
type: z24.literal(ActionType.REJECT)
|
|
3283
|
+
type: z24.literal(ActionType.REJECT),
|
|
3284
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
3285
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3286
|
+
)
|
|
3261
3287
|
}).shape
|
|
3262
3288
|
);
|
|
3263
3289
|
var RegisterConfig = DeclarationActionBase.extend(
|
|
3264
3290
|
z24.object({
|
|
3265
|
-
type: z24.literal(ActionType.REGISTER)
|
|
3291
|
+
type: z24.literal(ActionType.REGISTER),
|
|
3292
|
+
form: z24.array(FieldConfig).optional().describe(
|
|
3293
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3294
|
+
)
|
|
3266
3295
|
}).shape
|
|
3267
3296
|
);
|
|
3268
3297
|
var PrintCertificateActionConfig = ActionConfigBase.extend(
|
|
@@ -3299,9 +3328,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3299
3328
|
id: "ReadActionConfig",
|
|
3300
3329
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3301
3330
|
}),
|
|
3331
|
+
NotifyConfig.meta({
|
|
3332
|
+
id: "NotifyActionConfig",
|
|
3333
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3334
|
+
}),
|
|
3302
3335
|
DeclareConfig.meta({
|
|
3303
3336
|
id: "DeclareActionConfig",
|
|
3304
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3337
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3305
3338
|
}),
|
|
3306
3339
|
RejectConfig.meta({
|
|
3307
3340
|
id: "RejectActionConfig",
|
|
@@ -3908,7 +3941,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3908
3941
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3909
3942
|
};
|
|
3910
3943
|
var isNonInteractiveFieldType = (field3) => {
|
|
3911
|
-
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.
|
|
3944
|
+
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;
|
|
3912
3945
|
};
|
|
3913
3946
|
|
|
3914
3947
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4470,13 +4503,13 @@ function getActionConfig({
|
|
|
4470
4503
|
actionType,
|
|
4471
4504
|
customActionType
|
|
4472
4505
|
}) {
|
|
4506
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4507
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4508
|
+
}
|
|
4473
4509
|
return eventConfiguration.actions.find((a) => {
|
|
4474
4510
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4475
4511
|
return a.customActionType === customActionType;
|
|
4476
4512
|
}
|
|
4477
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4478
|
-
return a.type === ActionType.DECLARE;
|
|
4479
|
-
}
|
|
4480
4513
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4481
4514
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4482
4515
|
}
|
|
@@ -4489,7 +4522,19 @@ function getCustomActionFields(eventConfiguration, customActionType) {
|
|
|
4489
4522
|
customActionType,
|
|
4490
4523
|
actionType: ActionType.CUSTOM
|
|
4491
4524
|
});
|
|
4492
|
-
if (!actionConfig ||
|
|
4525
|
+
if (!actionConfig || actionConfig.type !== ActionType.CUSTOM) {
|
|
4526
|
+
return [];
|
|
4527
|
+
}
|
|
4528
|
+
return actionConfig.form;
|
|
4529
|
+
}
|
|
4530
|
+
function getActionFormFields(eventConfiguration, actionType, customActionType) {
|
|
4531
|
+
const actionConfig = eventConfiguration.actions.find((a) => {
|
|
4532
|
+
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4533
|
+
return a.customActionType === customActionType;
|
|
4534
|
+
}
|
|
4535
|
+
return a.type === actionType;
|
|
4536
|
+
});
|
|
4537
|
+
if (!actionConfig || !("form" in actionConfig) || actionConfig.form == null) {
|
|
4493
4538
|
return [];
|
|
4494
4539
|
}
|
|
4495
4540
|
return actionConfig.form;
|
|
@@ -4510,13 +4555,9 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4510
4555
|
if (actionConfig.type === ActionType.PRINT_CERTIFICATE) {
|
|
4511
4556
|
return actionConfig.printForm.pages.flatMap(({ fields }) => fields);
|
|
4512
4557
|
}
|
|
4513
|
-
|
|
4514
|
-
|
|
4515
|
-
|
|
4516
|
-
if ("review" in actionConfig) {
|
|
4517
|
-
return actionConfig.review.fields;
|
|
4518
|
-
}
|
|
4519
|
-
return [];
|
|
4558
|
+
const reviewFields = "review" in actionConfig && actionConfig.review != null ? actionConfig.review.fields : [];
|
|
4559
|
+
const formFields = "form" in actionConfig && actionConfig.form != null ? actionConfig.form : [];
|
|
4560
|
+
return [...reviewFields, ...formFields];
|
|
4520
4561
|
};
|
|
4521
4562
|
function getAllAnnotationFields(config) {
|
|
4522
4563
|
return (0, import_lodash.flattenDeep)(config.actions.map(getActionAnnotationFields));
|
|
@@ -6485,6 +6526,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6485
6526
|
ActionType.ARCHIVE,
|
|
6486
6527
|
ActionType.PRINT_CERTIFICATE,
|
|
6487
6528
|
ActionType.REQUEST_CORRECTION,
|
|
6529
|
+
ActionType.APPROVE_CORRECTION,
|
|
6530
|
+
ActionType.REJECT_CORRECTION,
|
|
6488
6531
|
ActionType.CUSTOM
|
|
6489
6532
|
]);
|
|
6490
6533
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6526,9 +6569,6 @@ function getLegalStatuses(actions) {
|
|
|
6526
6569
|
// ../commons/src/events/state/flags.ts
|
|
6527
6570
|
var import_lodash3 = require("lodash");
|
|
6528
6571
|
var import_date_fns3 = require("date-fns");
|
|
6529
|
-
function isEditInProgress(actions) {
|
|
6530
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6531
|
-
}
|
|
6532
6572
|
function findPendingCorrectionAction(writeActions2) {
|
|
6533
6573
|
let correctionRequestAction;
|
|
6534
6574
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6543,29 +6583,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6543
6583
|
}
|
|
6544
6584
|
return correctionRequestAction;
|
|
6545
6585
|
}
|
|
6546
|
-
function isCorrectionRequested(actions) {
|
|
6547
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6548
|
-
}
|
|
6549
|
-
function isDeclarationIncomplete(actions) {
|
|
6550
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6551
|
-
}
|
|
6552
|
-
function isRejected(actions) {
|
|
6553
|
-
const resettingActionTypes = [
|
|
6554
|
-
ActionType.NOTIFY,
|
|
6555
|
-
ActionType.DECLARE,
|
|
6556
|
-
ActionType.EDIT,
|
|
6557
|
-
ActionType.REGISTER
|
|
6558
|
-
];
|
|
6559
|
-
return actions.reduce((prev, { type }) => {
|
|
6560
|
-
if (type === ActionType.REJECT) {
|
|
6561
|
-
return true;
|
|
6562
|
-
}
|
|
6563
|
-
if (resettingActionTypes.includes(type)) {
|
|
6564
|
-
return false;
|
|
6565
|
-
}
|
|
6566
|
-
return prev;
|
|
6567
|
-
}, false);
|
|
6568
|
-
}
|
|
6569
6586
|
function isPotentialDuplicate(actions) {
|
|
6570
6587
|
return actions.reduce((prev, { type }) => {
|
|
6571
6588
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6593,6 +6610,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6593
6610
|
}
|
|
6594
6611
|
});
|
|
6595
6612
|
}
|
|
6613
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6614
|
+
if (!isActionConfigType(action.type)) {
|
|
6615
|
+
return false;
|
|
6616
|
+
}
|
|
6617
|
+
const actionConfig = getActionConfig({
|
|
6618
|
+
eventConfiguration,
|
|
6619
|
+
actionType: action.type,
|
|
6620
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6621
|
+
});
|
|
6622
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6623
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6624
|
+
);
|
|
6625
|
+
if (removeOperations.length === 0) {
|
|
6626
|
+
return false;
|
|
6627
|
+
}
|
|
6628
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6629
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6630
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6631
|
+
const form = { ...declaration, ...annotation };
|
|
6632
|
+
return removeOperations.some(
|
|
6633
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6634
|
+
);
|
|
6635
|
+
}
|
|
6636
|
+
var INHERENT_FLAG_RULES = [
|
|
6637
|
+
{
|
|
6638
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6639
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6640
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6641
|
+
},
|
|
6642
|
+
{
|
|
6643
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6644
|
+
// other status-changing action (see getStatusFromActions).
|
|
6645
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6646
|
+
setOn: [ActionType.NOTIFY],
|
|
6647
|
+
resetOn: [
|
|
6648
|
+
ActionType.CREATE,
|
|
6649
|
+
ActionType.DECLARE,
|
|
6650
|
+
ActionType.REGISTER,
|
|
6651
|
+
ActionType.ARCHIVE
|
|
6652
|
+
]
|
|
6653
|
+
},
|
|
6654
|
+
{
|
|
6655
|
+
flag: InherentFlags.REJECTED,
|
|
6656
|
+
setOn: [ActionType.REJECT],
|
|
6657
|
+
resetOn: [
|
|
6658
|
+
ActionType.NOTIFY,
|
|
6659
|
+
ActionType.DECLARE,
|
|
6660
|
+
ActionType.EDIT,
|
|
6661
|
+
ActionType.REGISTER
|
|
6662
|
+
]
|
|
6663
|
+
},
|
|
6664
|
+
{
|
|
6665
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6666
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6667
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6668
|
+
},
|
|
6669
|
+
{
|
|
6670
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6671
|
+
setOn: [ActionType.EDIT],
|
|
6672
|
+
resetOnAnyOtherAction: true
|
|
6673
|
+
}
|
|
6674
|
+
];
|
|
6675
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6676
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6677
|
+
if (rule.setOn.includes(action.type)) {
|
|
6678
|
+
return true;
|
|
6679
|
+
}
|
|
6680
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6681
|
+
return false;
|
|
6682
|
+
}
|
|
6683
|
+
if (actionConfigRemovesFlag(
|
|
6684
|
+
action,
|
|
6685
|
+
rule.flag,
|
|
6686
|
+
acceptedActions.slice(0, idx + 1),
|
|
6687
|
+
event2,
|
|
6688
|
+
eventConfiguration
|
|
6689
|
+
)) {
|
|
6690
|
+
return false;
|
|
6691
|
+
}
|
|
6692
|
+
return present;
|
|
6693
|
+
}, false);
|
|
6694
|
+
}
|
|
6596
6695
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6597
6696
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6598
6697
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6641,33 +6740,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6641
6740
|
return flag2;
|
|
6642
6741
|
});
|
|
6643
6742
|
}
|
|
6644
|
-
function getInherentFlags(sortedActions) {
|
|
6743
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6645
6744
|
const acceptedActions = sortedActions.filter(
|
|
6646
6745
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6647
6746
|
);
|
|
6648
|
-
|
|
6649
|
-
|
|
6650
|
-
|
|
6651
|
-
}
|
|
6652
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6654
|
-
}
|
|
6655
|
-
if (isRejected(acceptedActions)) {
|
|
6656
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6657
|
-
}
|
|
6658
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6659
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6660
|
-
}
|
|
6661
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6663
|
-
}
|
|
6664
|
-
return inherentFlags;
|
|
6747
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6748
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6749
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6665
6750
|
}
|
|
6666
6751
|
function getEventFlags(event2, config) {
|
|
6667
6752
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6668
6753
|
return [
|
|
6669
6754
|
...getActionStatusFlags(sortedActions),
|
|
6670
|
-
...getInherentFlags(sortedActions),
|
|
6755
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6671
6756
|
...resolveEventCustomFlags(event2, config)
|
|
6672
6757
|
];
|
|
6673
6758
|
}
|
|
@@ -7672,6 +7757,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7672
7757
|
id: "signature.upload.modal.title",
|
|
7673
7758
|
defaultMessage: "Draw signature",
|
|
7674
7759
|
description: "Title for the modal to draw signature"
|
|
7760
|
+
},
|
|
7761
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7762
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7763
|
+
configuration: {
|
|
7764
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7675
7765
|
}
|
|
7676
7766
|
}
|
|
7677
7767
|
]
|
|
@@ -8228,6 +8318,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8228
8318
|
},
|
|
8229
8319
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8230
8320
|
},
|
|
8321
|
+
{
|
|
8322
|
+
type: ActionType.NOTIFY,
|
|
8323
|
+
label: {
|
|
8324
|
+
defaultMessage: "Notify health worker",
|
|
8325
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8326
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8327
|
+
},
|
|
8328
|
+
flags: [
|
|
8329
|
+
{
|
|
8330
|
+
id: "health-worker-notified",
|
|
8331
|
+
operation: "add"
|
|
8332
|
+
}
|
|
8333
|
+
]
|
|
8334
|
+
},
|
|
8231
8335
|
{
|
|
8232
8336
|
type: ActionType.REJECT,
|
|
8233
8337
|
label: {
|
|
@@ -8470,6 +8574,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8470
8574
|
}
|
|
8471
8575
|
}
|
|
8472
8576
|
],
|
|
8577
|
+
flags: [
|
|
8578
|
+
{
|
|
8579
|
+
id: "health-worker-notified",
|
|
8580
|
+
requiresAction: false,
|
|
8581
|
+
label: {
|
|
8582
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8583
|
+
defaultMessage: "Health worker notified",
|
|
8584
|
+
description: "Label for the health-worker-notified flag"
|
|
8585
|
+
}
|
|
8586
|
+
}
|
|
8587
|
+
],
|
|
8473
8588
|
advancedSearch: [
|
|
8474
8589
|
{
|
|
8475
8590
|
title: {
|
|
@@ -10228,7 +10343,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10228
10343
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10229
10344
|
}
|
|
10230
10345
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10231
|
-
return user2.administrativeAreaId
|
|
10346
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10232
10347
|
}
|
|
10233
10348
|
return true;
|
|
10234
10349
|
}
|
|
@@ -10317,7 +10432,7 @@ function canAccessUserWithScope({
|
|
|
10317
10432
|
}
|
|
10318
10433
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10319
10434
|
(id) => user2.administrativeAreaId === id
|
|
10320
|
-
) || user2.administrativeAreaId
|
|
10435
|
+
) || !user2.administrativeAreaId;
|
|
10321
10436
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10322
10437
|
return false;
|
|
10323
10438
|
}
|
|
@@ -10623,18 +10738,19 @@ var ACTION_FILTERS = {
|
|
|
10623
10738
|
function filterActionsByFlags(actions, flags) {
|
|
10624
10739
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10625
10740
|
}
|
|
10741
|
+
var REJECTED_ACTIONS = [
|
|
10742
|
+
ActionType.READ,
|
|
10743
|
+
ActionType.NOTIFY,
|
|
10744
|
+
ActionType.CUSTOM,
|
|
10745
|
+
ActionType.EDIT,
|
|
10746
|
+
ActionType.ARCHIVE
|
|
10747
|
+
];
|
|
10626
10748
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10627
10749
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10628
10750
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10629
10751
|
}
|
|
10630
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10631
|
-
return
|
|
10632
|
-
ActionType.READ,
|
|
10633
|
-
ActionType.NOTIFY,
|
|
10634
|
-
ActionType.CUSTOM,
|
|
10635
|
-
ActionType.EDIT,
|
|
10636
|
-
ActionType.ARCHIVE
|
|
10637
|
-
];
|
|
10752
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10753
|
+
return REJECTED_ACTIONS;
|
|
10638
10754
|
}
|
|
10639
10755
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10640
10756
|
}
|