@puca/puca-core 9.10.0 → 9.12.0
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/dist/core/services/comunication/comunication.service.js +34 -1
- package/dist/core/services/comunication/comunication.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +1 -0
- package/dist/core/services/crud-base-testable.service.js +4 -0
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.js +3 -3
- package/dist/core/services/incremental-search.service.d.ts +30 -9
- package/dist/core/services/incremental-search.service.js +42 -17
- package/dist/core/services/incremental-search.service.js.map +1 -1
- package/dist/core/services/install.service.js +1 -17
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/report.service.js +1 -1
- package/dist/core/services/select-many-data.service.js +1 -1
- package/dist/core/services/source/application.interface.d.ts +1 -0
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.d.ts +1 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js +5 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js.map +1 -1
- package/dist/core/services/source/javascript/v1/application.service.js.map +1 -1
- package/dist/core/services/source/source.service.d.ts +2 -1
- package/dist/core/services/source/source.service.js +5 -1
- package/dist/core/services/source/source.service.js.map +1 -1
- package/dist/core/services/table-permission.service.js +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +7 -0
- package/dist/orm/cases/bo/ddl.service.js +1 -0
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/vanilla/interfaces.d.ts +1 -0
- package/dist/orm/cases/vanilla/sql-builder/mutation.service.js +2 -1
- package/dist/orm/cases/vanilla/sql-builder/mutation.service.js.map +1 -1
- package/dist/orm/cases/vanilla/sql-builder/select.service.js +2 -2
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/services/repository.d.ts +13 -5
- package/dist/orm/services/repository.js +15 -8
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/sql-layer.service.js +1 -0
- package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
- package/dist/orm/services/sql/sql-security-layer.service.js +1 -0
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -1
- package/dist/orm/services/sql-parser/sql-parser.service.js +2 -1
- package/dist/orm/services/sql-parser/sql-parser.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -19,7 +19,40 @@ class ComunicationService {
|
|
|
19
19
|
args.headers['Authorization'] = await this.computeToken({
|
|
20
20
|
user: args.user
|
|
21
21
|
});
|
|
22
|
-
|
|
22
|
+
try {
|
|
23
|
+
return await this.comunicationHttpService.call(Object.assign(Object.assign({}, args), { method: args.method || 'post' }));
|
|
24
|
+
}
|
|
25
|
+
catch (e) {
|
|
26
|
+
const isJSON = (str) => {
|
|
27
|
+
try {
|
|
28
|
+
JSON.parse(str);
|
|
29
|
+
}
|
|
30
|
+
catch (e) {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
return true;
|
|
34
|
+
};
|
|
35
|
+
const estrategies = [
|
|
36
|
+
{
|
|
37
|
+
apply: () => { var _a; return ((_a = e.response) === null || _a === void 0 ? void 0 : _a.data) && typeof e.response.data === 'string' && isJSON(e.response.data); },
|
|
38
|
+
message: () => JSON.parse(e.response.data).message || e.response.data
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
apply: () => { var _a; return ((_a = e.response) === null || _a === void 0 ? void 0 : _a.data) && typeof e.response.data === 'object'; },
|
|
42
|
+
message: () => e.response.data.message || JSON.stringify(e.response.data)
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
apply: () => { var _a; return ((_a = e.response) === null || _a === void 0 ? void 0 : _a.data) && typeof e.response.data === 'string'; },
|
|
46
|
+
message: () => e.response.data
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
apply: () => { var _a; return !((_a = e.response) === null || _a === void 0 ? void 0 : _a.data); },
|
|
50
|
+
message: () => e.message || e
|
|
51
|
+
}
|
|
52
|
+
];
|
|
53
|
+
const errorMessage = estrategies.find(s => s.apply()).message();
|
|
54
|
+
throw new Error(errorMessage);
|
|
55
|
+
}
|
|
23
56
|
}
|
|
24
57
|
async computeToken({ user }) {
|
|
25
58
|
const { privateKey } = await this.configService.getSecret();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../../src/core/services/comunication/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,4BAA4B;AAC5B,+CAAoC;AAUpC,MAAa,mBAAmB;IAC9B,YACmB,uBAAgD,EAChD,mBAAwC,EACxC,aAA4B,EAC5B,WAAwB;QAHxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAI,IASb;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACnB;QAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAC/E,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACtD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,iCACzC,IAAI,KACP,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,MAAM,IAC7B,CAAA;
|
|
1
|
+
{"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../../src/core/services/comunication/comunication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,7 @@ class CrudBaseService {
|
|
|
70
70
|
pageSize: 1,
|
|
71
71
|
totalizeMode: repository_1.TotalizeMode.never,
|
|
72
72
|
transaction: originalArgs.transaction,
|
|
73
|
+
forUpdate: originalArgs.forUpdate
|
|
73
74
|
});
|
|
74
75
|
return _.get(result, ['data', 0]);
|
|
75
76
|
}
|
|
@@ -104,6 +105,7 @@ class CrudBaseService {
|
|
|
104
105
|
page: args.page,
|
|
105
106
|
orderBy: args.orderBy,
|
|
106
107
|
totalizeMode: args.totalizeMode,
|
|
108
|
+
forUpdate: args.forUpdate
|
|
107
109
|
});
|
|
108
110
|
if (this.afterFind) {
|
|
109
111
|
await this.afterFind({
|
|
@@ -131,6 +133,7 @@ class CrudBaseService {
|
|
|
131
133
|
user: args.user,
|
|
132
134
|
groupBy: args.groupBy,
|
|
133
135
|
totalizeMode: args.totalizeMode,
|
|
136
|
+
forUpdate: args.forUpdate
|
|
134
137
|
});
|
|
135
138
|
if (this.afterFind) {
|
|
136
139
|
await this.afterFind({
|
|
@@ -149,6 +152,7 @@ class CrudBaseService {
|
|
|
149
152
|
value: args.pucaPid,
|
|
150
153
|
user: args.user,
|
|
151
154
|
transaction: args.transaction,
|
|
155
|
+
forUpdate: args.forUpdate
|
|
152
156
|
});
|
|
153
157
|
}
|
|
154
158
|
unregister() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-base-testable.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-base-testable.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAI5B,8DAA6G;AAC7G,8DAA2E;
|
|
1
|
+
{"version":3,"file":"crud-base-testable.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-base-testable.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ class CrudFrontBaseService extends crud_base_service_1.CrudBaseService {
|
|
|
104
104
|
fields: ['puca_pid'],
|
|
105
105
|
pucaPid: originalArgs.entity.puca_pid,
|
|
106
106
|
user: originalArgs.user,
|
|
107
|
-
transaction: originalArgs.transaction
|
|
107
|
+
transaction: originalArgs.transaction,
|
|
108
108
|
}) ? 'edit' : 'new';
|
|
109
109
|
}
|
|
110
110
|
}
|
|
@@ -179,14 +179,14 @@ class CrudFrontBaseService extends crud_base_service_1.CrudBaseService {
|
|
|
179
179
|
fields: dictionaryFields,
|
|
180
180
|
key: 'entity',
|
|
181
181
|
value: this.getTableName(),
|
|
182
|
-
user
|
|
182
|
+
user,
|
|
183
183
|
});
|
|
184
184
|
const joinDictionary = await repository.findByIn({
|
|
185
185
|
fields: dictionaryFields,
|
|
186
186
|
key: 'entity',
|
|
187
187
|
values: join
|
|
188
188
|
.map(j => j.tableName),
|
|
189
|
-
user
|
|
189
|
+
user,
|
|
190
190
|
});
|
|
191
191
|
const fieldDictionary = [...rootDictionary, ...joinDictionary];
|
|
192
192
|
const fields = oFields.map(field => {
|
|
@@ -5,17 +5,28 @@ export interface IncrementalSearchSearchArgs {
|
|
|
5
5
|
query: string;
|
|
6
6
|
page: number;
|
|
7
7
|
perPage: number;
|
|
8
|
+
facets: string[];
|
|
9
|
+
filters: string;
|
|
8
10
|
}
|
|
9
11
|
export interface IncrementalSearchService {
|
|
10
12
|
prepare(): Promise<void>;
|
|
11
13
|
search<T extends {
|
|
12
14
|
puca_pid: string;
|
|
13
15
|
}>(args: IncrementalSearchSearchArgs): Promise<{
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
result: {
|
|
17
|
+
data: T;
|
|
18
|
+
tableName: string;
|
|
19
|
+
}[];
|
|
20
|
+
facetsResult: {
|
|
21
|
+
count: number;
|
|
22
|
+
value: string;
|
|
23
|
+
}[];
|
|
24
|
+
}>;
|
|
17
25
|
update(tableName: string, entity: any, extraData?: any): Promise<void>;
|
|
18
|
-
enforceFields(
|
|
26
|
+
enforceFields(options: {
|
|
27
|
+
fields: string[];
|
|
28
|
+
hard?: boolean;
|
|
29
|
+
}): Promise<void>;
|
|
19
30
|
}
|
|
20
31
|
export declare class TypeSenseService implements IncrementalSearchService {
|
|
21
32
|
private readonly configService;
|
|
@@ -28,14 +39,24 @@ export declare class TypeSenseService implements IncrementalSearchService {
|
|
|
28
39
|
private jobExecutorEnforceFields;
|
|
29
40
|
constructor(configService: ConfigService, jobExecutorFactory: JobExecutorFactory);
|
|
30
41
|
prepare(): Promise<void>;
|
|
31
|
-
enforceFields(
|
|
42
|
+
enforceFields(options: {
|
|
43
|
+
hard?: boolean;
|
|
44
|
+
fields: string[];
|
|
45
|
+
}): Promise<void>;
|
|
32
46
|
search<T extends {
|
|
33
47
|
puca_pid: string;
|
|
34
|
-
}>({ fields, query, page, perPage, }: IncrementalSearchSearchArgs): Promise<{
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
48
|
+
}>({ fields, query, page, perPage, facets, filters }: IncrementalSearchSearchArgs): Promise<{
|
|
49
|
+
result: {
|
|
50
|
+
data: T;
|
|
51
|
+
tableName: string;
|
|
52
|
+
}[];
|
|
53
|
+
facetsResult: {
|
|
54
|
+
count: number;
|
|
55
|
+
value: string;
|
|
56
|
+
}[];
|
|
57
|
+
}>;
|
|
38
58
|
update<T extends {
|
|
39
59
|
puca_pid: any;
|
|
40
60
|
}>(tableName: string, entity: T, extraData?: any): Promise<void>;
|
|
61
|
+
createCollectionDefaultFields(): Promise<void>;
|
|
41
62
|
}
|
|
@@ -18,8 +18,11 @@ class TypeSenseService {
|
|
|
18
18
|
type: 'string',
|
|
19
19
|
},
|
|
20
20
|
{
|
|
21
|
+
facet: true,
|
|
21
22
|
name: '_table_label',
|
|
22
23
|
type: 'string',
|
|
24
|
+
optional: true,
|
|
25
|
+
index: true
|
|
23
26
|
},
|
|
24
27
|
{
|
|
25
28
|
name: 'id',
|
|
@@ -48,27 +51,22 @@ class TypeSenseService {
|
|
|
48
51
|
await this.client.collections(this.COLLECTION_NAME).retrieve();
|
|
49
52
|
}
|
|
50
53
|
catch (e) {
|
|
51
|
-
await this.
|
|
52
|
-
name: this.COLLECTION_NAME,
|
|
53
|
-
fields: [
|
|
54
|
-
...this.DEFAULT_FIELDS,
|
|
55
|
-
{
|
|
56
|
-
name: '.*',
|
|
57
|
-
type: 'string',
|
|
58
|
-
optional: true
|
|
59
|
-
}
|
|
60
|
-
],
|
|
61
|
-
});
|
|
54
|
+
await this.createCollectionDefaultFields();
|
|
62
55
|
}
|
|
63
56
|
this.jobExecutorEnforceFields.process(1, async (job) => {
|
|
57
|
+
var _a;
|
|
64
58
|
if (!this.client) {
|
|
65
59
|
return;
|
|
66
60
|
}
|
|
61
|
+
if (job.data.hard) {
|
|
62
|
+
await this.client.collections(this.COLLECTION_NAME).delete();
|
|
63
|
+
await this.createCollectionDefaultFields();
|
|
64
|
+
}
|
|
67
65
|
const collection = await this.client.collections(this.COLLECTION_NAME).retrieve();
|
|
68
66
|
const collectionFields = collection.fields.map(f => f.name);
|
|
69
67
|
const fields = [
|
|
70
68
|
...this.DEFAULT_FIELDS.map(f => f.name),
|
|
71
|
-
...job.data
|
|
69
|
+
...((_a = job.data) === null || _a === void 0 ? void 0 : _a.fields) || job.data
|
|
72
70
|
];
|
|
73
71
|
const newFields = fields.filter(f => !collectionFields.includes(f) && f !== 'id');
|
|
74
72
|
if (newFields.length === 0) {
|
|
@@ -94,10 +92,10 @@ class TypeSenseService {
|
|
|
94
92
|
}));
|
|
95
93
|
});
|
|
96
94
|
}
|
|
97
|
-
async enforceFields(
|
|
98
|
-
await this.jobExecutorEnforceFields.add(
|
|
95
|
+
async enforceFields(options) {
|
|
96
|
+
await this.jobExecutorEnforceFields.add(options);
|
|
99
97
|
}
|
|
100
|
-
async search({ fields, query, page, perPage, }) {
|
|
98
|
+
async search({ fields, query, page, perPage, facets, filters }) {
|
|
101
99
|
if (!this.client) {
|
|
102
100
|
return;
|
|
103
101
|
}
|
|
@@ -108,8 +106,15 @@ class TypeSenseService {
|
|
|
108
106
|
num_typos: 2,
|
|
109
107
|
per_page: perPage,
|
|
110
108
|
page,
|
|
109
|
+
facet_by: facets.join(','),
|
|
110
|
+
max_facet_values: 10,
|
|
111
|
+
filter_by: filters
|
|
111
112
|
});
|
|
112
|
-
|
|
113
|
+
const facetsResult = response.facet_counts[0].counts.map(f => ({
|
|
114
|
+
count: f.count,
|
|
115
|
+
value: f.value,
|
|
116
|
+
}));
|
|
117
|
+
const resultMapped = response.hits.map(({ document }) => {
|
|
113
118
|
const normalizedDocument = _.chain(document)
|
|
114
119
|
.omit('id')
|
|
115
120
|
.omit('_table_name')
|
|
@@ -118,10 +123,17 @@ class TypeSenseService {
|
|
|
118
123
|
const returnValue = Object.assign(Object.assign({}, normalizedDocument), { puca_pid });
|
|
119
124
|
return { data: returnValue, tableName: document._table_name };
|
|
120
125
|
});
|
|
126
|
+
return {
|
|
127
|
+
result: resultMapped,
|
|
128
|
+
facetsResult
|
|
129
|
+
};
|
|
121
130
|
}
|
|
122
131
|
catch (e) {
|
|
123
132
|
this.logger.error(e);
|
|
124
|
-
return
|
|
133
|
+
return {
|
|
134
|
+
result: [],
|
|
135
|
+
facetsResult: []
|
|
136
|
+
};
|
|
125
137
|
}
|
|
126
138
|
}
|
|
127
139
|
async update(tableName, entity, extraData) {
|
|
@@ -130,6 +142,19 @@ class TypeSenseService {
|
|
|
130
142
|
data: Object.assign(Object.assign({}, entity), extraData)
|
|
131
143
|
});
|
|
132
144
|
}
|
|
145
|
+
async createCollectionDefaultFields() {
|
|
146
|
+
await this.client.collections().create({
|
|
147
|
+
name: this.COLLECTION_NAME,
|
|
148
|
+
fields: [
|
|
149
|
+
...this.DEFAULT_FIELDS,
|
|
150
|
+
{
|
|
151
|
+
name: '.*',
|
|
152
|
+
type: 'string',
|
|
153
|
+
optional: true
|
|
154
|
+
}
|
|
155
|
+
],
|
|
156
|
+
});
|
|
157
|
+
}
|
|
133
158
|
}
|
|
134
159
|
exports.TypeSenseService = TypeSenseService;
|
|
135
160
|
//# sourceMappingURL=incremental-search.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incremental-search.service.js","sourceRoot":"","sources":["../../../src/core/services/incremental-search.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,yCAA6C;AAI7C,qCAAkC;AAGlC,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,EAAE;IAE9B,OAAO,GAAG,KAAK,EAAE,CAAA;AACnB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"incremental-search.service.js","sourceRoot":"","sources":["../../../src/core/services/incremental-search.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,7 +165,7 @@ class InstallService {
|
|
|
165
165
|
fields: ce.incrementalSearchConfig.fields
|
|
166
166
|
}));
|
|
167
167
|
for (const { fields } of incrementalSearchSchema) {
|
|
168
|
-
await this.incrementalSearchService.enforceFields(fields);
|
|
168
|
+
await this.incrementalSearchService.enforceFields({ fields, hard: false });
|
|
169
169
|
}
|
|
170
170
|
for (const crudEspecification of crudEspecificationList) {
|
|
171
171
|
const incrementalSearchConfig = incrementalSearchConfigList.find(isc => isc.table_name === crudEspecification.table.tableName);
|
|
@@ -179,22 +179,6 @@ class InstallService {
|
|
|
179
179
|
if (!_.get(crudEspecification, 'incrementalSearchConfig.fields.length')) {
|
|
180
180
|
continue;
|
|
181
181
|
}
|
|
182
|
-
if (!_.chain(incrementalSearchConfig)
|
|
183
|
-
.get(['fields', 'items'], [])
|
|
184
|
-
.orderBy()
|
|
185
|
-
.isEqual(_.orderBy(crudEspecification.incrementalSearchConfig.fields))
|
|
186
|
-
.value()) {
|
|
187
|
-
const tableRepository = this.repositoryFactory.getInstance({
|
|
188
|
-
tableName: crudEspecification.table.tableName
|
|
189
|
-
});
|
|
190
|
-
const { data: rows } = await tableRepository.findAll({
|
|
191
|
-
fields: ['puca_pid', ...crudEspecification.incrementalSearchConfig.fields],
|
|
192
|
-
user: { username: 'puca-user' }
|
|
193
|
-
});
|
|
194
|
-
rows.forEach(row => {
|
|
195
|
-
this.incrementalSearchService.update(crudEspecification.table.tableName, row);
|
|
196
|
-
});
|
|
197
|
-
}
|
|
198
182
|
await repository.save({
|
|
199
183
|
entity: {
|
|
200
184
|
puca_pid: incrementalSearchConfig === null || incrementalSearchConfig === void 0 ? void 0 : incrementalSearchConfig.puca_pid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.service.js","sourceRoot":"","sources":["../../../src/core/services/install.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,4CAAqE;AACrE,8DAAmE;AAInE,uEAAkI;AAGlI,oFAA8E;AAC9E,qCAAkC;AAUlC,MAAa,cAAc;IAEzB,YACmB,gBAAkC,EAClC,iBAAoC,EACpC,iBAAoC,EACpC,2BAAwD,EACxD,UAAsB,EACtB,sBAA8C,EAC9C,wBAAkD;QANlD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,eAAU,GAAV,UAAU,CAAY;QACtB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,6BAAwB,GAAxB,wBAAwB,CAA0B;QARpD,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAgB,CAAC,CAAA;IASlD,CAAC;IAEG,KAAK,CAAC,uCAAuC,CAAC,EACpD,IAAI,EACJ,kBAAkB,GAInB;QACC,MAAM,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAEjE;YACA,SAAS,EAAE,kBAAkB;YAC7B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC;YACjE,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,CAAC;YAC7C,GAAG,EAAE,MAAM;YACX,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;YACxD,IAAI,EAAE,IAAI;SAEX,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAEjE;YACA,SAAS,EAAE,kBAAkB;YAC7B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC;YACjE,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC;YACvD,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;YACxD,IAAI,EAAE,IAAI;SAEX,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAChC,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,OAAO,CAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC1C,IAAI;wBACF,MAAM,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAChC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,SAAS,CACrC,CAAC;wBACF,IAAI,CAAC,EAAE,EAAE;4BACP,OAAO,OAAO,EAAE,CAAC;yBAClB;wBAED,MAAM,wBAAwB,CAAC,IAAI,CAAC;4BAClC,MAAM,EAAE;gCACN,QAAQ,EAAE,EAAE,CAAC,QAAQ;gCACrB,aAAa,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY;gCACpC,KAAK,EAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gCAClG,kBAAkB,EAAE,EAAE,CAAC,gBAAgB;gCACvC,UAAU,EAAE,EAAE,CAAC,SAAS,IAAI,UAAU;6BACvC;4BACD,IAAI;yBACL,CAAC,CAAC;wBAEH,OAAO,OAAO,EAAE,CAAC;qBAClB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;qBAClB;gBACH,CAAC,CAAC;gBACF,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;oBACzB,MAAM,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;wBACtC,OAAO,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC;oBAChE,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,EAAE,EAAE;wBACP,OAAO;qBACR;oBACD,IAAI,EAAE,CAAC,aAAa,EAAE;wBACpB,OAAO;qBACR;oBACD,IAAI,EAAE,CAAC,aAAa,KAAK,CAAC,CAAC,YAAY,EAAE;wBACvC,EAAE,CAAC,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC;qBACnC;oBACD,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE;wBACrB,OAAO;qBACR;oBACD,MAAM,wBAAwB,CAAC,IAAI,CAAC;wBAClC,MAAM,EAAE,EAAE;wBACV,IAAI;qBACL,CAAC,CAAC;gBACL,CAAC,CAAC;aACH,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,IAGlC;QACC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,oCAAoC,CAAC;YAC9C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,kBAAkB,EAAE,CAAC,MAAM,+GAAqF,EAAE,CAAC;iBAChH,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC;YACpD,8BAA8B,EAAE,KAAK;SACtC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5C,MAAM,IAAI,CAAC,eAAe,CAAC;YACzB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,EAAE;YAC1B,kBAAkB,EAAE,MAAM,+GAAqF,EAAE;YACjH,WAAW,EAAE,MAAM,OAAO,CAAC,WAAW,EAAE;SACzC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO;YAC1D,SAAS,EAAE,2BAA2B;YACtC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;YACtC,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;YAChC,GAAG,EAAE,UAAU;YACf,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,IAAI;SAEX,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC7B,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACrD,aAAa,EACb;gBACE,WAAW,EAAE,KAAK;aACnB,CACF,CAAC,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;QAED,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,EAC5B,IAAI,EACJ,kBAAkB,EAClB,WAAW,EAKZ;QACC,MAAM,IAAI,CAAC,WAAW,CAAC;YACrB,IAAI;SACL,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,WAAW,CAAC;YACrB,kBAAkB;YAClB,IAAI;SACL,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,oCAAoC,CAAC;YAC9C,IAAI;YACJ,kBAAkB,EAAE,kBAAkB,CAAC,MAAM,CAC3C,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,SAAS,CAC3C;YACD,8BAA8B,EAAE,IAAI;SACrC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,uCAAuC,CAAC;YACjD,IAAI;YACJ,kBAAkB,EAAE,kBAAkB,CAAC,MAAM,CAC3C,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,SAAS,CAC3C;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,WAAW,CAAC;YACrB,WAAW;SACZ,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,8BAA8B,CAAC;YACxC,IAAI;YACJ,sBAAsB,EAAE,kBAAkB,CAAC,MAAM,CAC/C,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,SAAS,CAC3C;SACF,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAA2E;QACpJ,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAA0B;YAC7E,SAAS,EAAE,yCAAyC;SACrD,CAAC,CAAA;QACF,MAAM,2BAA2B,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC;YAC5D,MAAM,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAC;YAC5C,GAAG,EAAE,YAAY;YACjB,MAAM,EAAE,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;YAC5D,IAAI;SACL,CAAC,CAAA;QAEF,MAAM,uBAAuB,GAAG,sBAAsB;aACnD,MAAM,CAAC,EAAE,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,EAAE,CAAC,uBAAuB,0CAAE,MAAM,0CAAE,MAAM,CAAA,EAAA,CAAC;aACxD,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACV,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS;YAC7B,MAAM,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM;SAC1C,CAAC,CAAC,CAAA;QAEL,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,uBAAuB,EAAE;YAChD,MAAM,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SAC3D;QAGD,KAAK,MAAM,kBAAkB,IAAI,sBAAsB,EAAE;YACvD,MAAM,uBAAuB,GAAG,2BAA2B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,KAAK,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;YAC9H,IAAI,uBAAuB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,EAAE,gCAAgC,CAAC,EAAE;gBAC3F,MAAM,UAAU,CAAC,MAAM,CAAC;oBACtB,QAAQ,EAAE,uBAAuB,CAAC,QAAQ;oBAC1C,IAAI;iBACL,CAAC,CAAA;gBAEF,SAAQ;aACT;YAED,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,EAAE,uCAAuC,CAAC,EAAE;gBACvE,SAAQ;aACT;YAED,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC;iBAClC,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;iBAC5B,OAAO,EAAE;iBACT,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;iBACrE,KAAK,EAAE,EACR;gBACA,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAuB;oBAC/E,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,SAAS;iBAC9C,CAAC,CAAA;gBAEF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;oBACnD,MAAM,EAAE,CAAC,UAAU,EAAE,GAAG,kBAAkB,CAAC,uBAAuB,CAAC,MAAM,CAAC;oBAC1E,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;iBAChC,CAAC,CAAA;gBAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACjB,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;gBAC/E,CAAC,CAAC,CAAA;aACH;YAED,MAAM,UAAU,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE;oBACN,QAAQ,EAAE,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,QAAQ;oBAC3C,UAAU,EAAE,kBAAkB,CAAC,KAAK,CAAC,SAAS;oBAC9C,MAAM,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,MAAM,EAAE;oBACpE,eAAe,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,cAAc;oBAC1E,YAAY,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,WAAW;iBACrE;gBACD,IAAI;aACL,CAAC,CAAA;SAEH;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,EACxB,WAAW,EAGZ;QACC,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1B,OAAM;SACP;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;YACtC,IAAI;gBACF,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAA;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAA;aACjC;SACF;IACH,CAAC;IAEO,KAAK,CAAC,oCAAoC,CAAC,EACjD,IAAI,EACJ,8BAA8B,EAC9B,kBAAkB,GAKnB;QAEC,MAAM,oBAAoB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAE7D;YACA,SAAS,EAAE,6CAA6C;YACxD,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAA;QAEzE,MAAM,cAAc,GAAG,CAAC,MAAM,oBAAoB,CAAC,MAAM,CAAC;YACxD,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC;YACvC,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,oBAAoB,CAAC,WAAW;YACvC,IAAI;SAEL,CAAC,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC5D,oBAAoB,EACpB;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,MAAM,wBAAwB,GAA2B;YACvD,GAAG,CAAC,CAAC,8BAA8B,IAAI,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvJ;oBACE,WAAW,EAAE,qBAAqB,oBAAoB,CAAC,KAAK,GAAG;oBAC/D,MAAM,EAAE,oBAAoB,CAAC,WAAW;oBACxC,IAAI,EAAE,GAAG,oBAAoB,CAAC,WAAW,SAAS;oBAClD,IAAI,EAAE,+BAAkB,CAAC,OAAO;iBACjC;gBACD;oBACE,WAAW,EAAE,8BAA8B,oBAAoB,CAAC,KAAK,GAAG;oBACxE,MAAM,EAAE,oBAAoB,CAAC,WAAW;oBACxC,IAAI,EAAE,GAAG,oBAAoB,CAAC,WAAW,cAAc;oBACvD,IAAI,EAAE,+BAAkB,CAAC,OAAO;iBACjC;aAEF,CAAC,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;gBAChC,MAAM,aAAa,qBAAQ,UAAU,CAAE,CAAA;gBACvC,aAAa,CAAC,MAAM,GAAG,oBAAoB,CAAC,WAAW,CAAA;gBACvD,aAAa,CAAC,IAAI,GAAG,+BAAkB,CAAC,OAAO,CAAA;gBAC/C,OAAO,aAAa,CAAA;YACtB,CAAC,CAAC;YACF,GAAG,kBAAkB;iBAClB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC;iBAC9H,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,CAAC,CAAC,IAAI,CAAC;oBACL,WAAW,EAAE,yBAAyB,CAAC,CAAC,KAAK,CAAC,YAAY,GAAG;oBAC7D,MAAM,EAAE,oBAAoB,CAAC,WAAW;oBACxC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,MAAM;oBAChC,IAAI,EAAE,+BAAkB,CAAC,OAAO;iBACjC,CAAC,CAAC;gBACH,OAAO,CAAC,CAAC;YACX,CAAC,EACD,EAA4B,CAC7B;YACH,GAAG,kBAAkB;iBAClB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC;iBAC9H,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,CAAC,CAAC,IAAI,CAAC;oBACL,WAAW,EAAE,wBAAwB,CAAC,CAAC,KAAK,CAAC,YAAY,GAAG;oBAC5D,MAAM,EAAE,oBAAoB,CAAC,WAAW;oBACxC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,OAAO;oBACjC,IAAI,EAAE,+BAAkB,CAAC,OAAO;iBACjC,CAAC,CAAC;gBACH,OAAO,CAAC,CAAC;YACX,CAAC,EACD,EAA4B,CAC7B;YACH,GAAG,kBAAkB;iBAClB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC;iBAC9H,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,CAAC,CAAC,IAAI,CAAC;oBACL,WAAW,EAAE,yBAAyB,CAAC,CAAC,KAAK,CAAC,YAAY,GAAG;oBAC7D,MAAM,EAAE,oBAAoB,CAAC,WAAW;oBACxC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,SAAS;oBACnC,IAAI,EAAE,+BAAkB,CAAC,OAAO;iBACjC,CAAC,CAAC;gBACH,OAAO,CAAC,CAAC;YACX,CAAC,EACD,EAA4B,CAC7B;YACH,GAAG,kBAAkB;iBAClB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC;iBAC9H,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,CAAC,CAAC,IAAI,CAAC;oBACL,WAAW,EAAE,sBAAsB,CAAC,CAAC,KAAK,CAAC,YAAY,GAAG;oBAC1D,MAAM,EAAE,oBAAoB,CAAC,WAAW;oBACxC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,OAAO;oBACjC,IAAI,EAAE,+BAAkB,CAAC,OAAO;iBACjC,CAAC,CAAC;gBACH,OAAO,CAAC,CAAC;YACX,CAAC,EACD,EAA4B,CAC7B;SACJ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxD,MAAM,EAAE,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,oBAAoB,CAAC,IAAI,CAAC;gBAC9B,IAAI;gBACJ,MAAM,gDACD,GAAG,GACH,EAAE,KACL,OAAO,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EACzD,UAAU,EAAE,KAAK,GAClB;aACF,CAAC,CAAC;SACJ;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAExC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBAC9C,OAAO,UAAU,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,CAAA;YAC/C,CAAC,CAAC,EAAE;gBACF,MAAM,oBAAoB,CAAC,IAAI,CAAC;oBAC9B,IAAI;oBACJ,MAAM,kCACD,aAAa,KAChB,UAAU,EAAE,IAAI,GACjB;iBACF,CAAC,CAAC;aACJ;SACF;IAEH,CAAC;IAEO,iBAAiB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAW;YAClD,SAAS,EAAE,oBAAoB;YAC/B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,EACxB,IAAI,EACJ,kBAAkB,GAInB;QACC,IAAI,CAAC,kBAAkB,EAAE;YACvB,kBAAkB,GAAG,EAAE,CAAC;SACzB;QAED,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAA;QAEzE,MAAM,YAAY,GAAG,GAAG,oBAAoB,CAAC,WAAW,OAAO,CAAC;QAChE,MAAM,kBAAkB,GAAG,oBAAoB,oBAAoB,CAAC,WAAW,EAAE,CAAC;QAClF,MAAM,SAAS,GAAG,SAAS,oBAAoB,CAAC,WAAW,EAAE,CAAC;QAE9D,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,MAAM,CACxD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAClB,CAAC;QAEF,MAAM,YAAY,GAAG,oBAAoB,CAAC,SAAS,IAAI,oBAAoB,CAAC,WAAW,CAAA;QAEvF,MAAM,SAAS,GAAe,oBAAoB,CAAC,UAAU;YAC3D,CAAC,CAAC;gBACA;oBACE,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,oBAAoB,CAAC,KAAK;oBACjC,IAAI,EAAE,mBAAY,CAAC,GAAG;oBACtB,IAAI,EAAE,YAAY;oBAClB,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;oBACZ,YAAY,EAAE,oBAAoB,CAAC,WAAW;oBAC9C,gBAAgB,EACd,CAAC,oBAAoB,CAAC,gBAAgB,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC,CAAC;wBAC5G,GAAG,oBAAoB,CAAC,WAAW,cAAc;wBACjD,CAAC,CAAC,IAAI;iBACX;gBACD,wBAAwB,CAAC,MAAM;oBAC7B,wBAAwB,CAAC,IAAI,CAC3B,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC;wBAC5B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,KAAK,SAAS;wBAC7C,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;wBACjB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC;4BAC1C,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,CACnD;oBACD,CAAC,CAAC;wBACA,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,WAAW;wBAClB,IAAI,EAAE,mBAAY,CAAC,GAAG;wBACtB,IAAI,EAAE,sBAAsB;wBAC5B,MAAM,EAAE,YAAY;wBACpB,MAAM,EAAE,IAAI;wBACZ,MAAM,EAAE,IAAI;qBACb;oBACD,CAAC,CAAC,IAAI;gBACR,GAAG,wBAAwB;qBACxB,GAAG,CAAC,CAAC,CAAC,EAAE;oBACP,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI;wBACxD,SAAS,EAAE,CAAC;oBACd,OAAO;wBACL,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC;4BACzC,CAAC,CAAE;gCACD,IAAI,EAAE,QAAQ;gCACd,KAAK,EACH,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC;oCAC5B,CAAC,CAAC,KAAK,CAAC,YAAY;oCACpB,CAAC,CAAC,KAAK,CAAC,SAAS;gCACnB,IAAI,EAAE,mBAAY,CAAC,GAAG;gCACtB,IAAI,EACF,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC;oCAC3B,wBAAwB,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE;gCAC7C,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,SAAS;gCAClD,MAAM,EAAE,IAAI;gCACZ,MAAM,EAAE,IAAI;gCACZ,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,aAAa,CAAC;gCAC1C,gBAAgB,EACd,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,gDAAqB,CAAC,QAAQ,CAAC,KAAK,gDAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;oCACjI,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,OAAO;oCAC3B,CAAC,CAAC,IAAI;6BACE;4BACd,CAAC,CAAC,IAAI;wBACR,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,SAAS;4BACtF,CAAC,CAAC;gCACA,IAAI,EAAE,oBAAoB,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI;oCACnD,SAAS,EAAE;gCACb,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS;gCAChD,IAAI,EAAE,mBAAY,CAAC,GAAG;gCACtB,IAAI,EAAE,8BAA8B,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE;gCACvD,MAAM,EAAE,kBAAkB;gCAC1B,MAAM,EAAE,IAAI;gCACZ,MAAM,EAAE,IAAI;6BACb;4BACD,CAAC,CAAC,IAAI;qBACT,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,CAAC;qBACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;aACrC;YACD,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC,MAAM,CAC1E,CAAC,CAAC,EAAE,CAAC,CAAC,CACP,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC/C,MAAM,QAAQ,GAAG,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC;YAC9C,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC;YACnD,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,CAAC,oBAAoB,CAAC,WAAW,CAAC;YAC1C,IAAI;SAEL,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,KAAK,eAAQ,CAAC,QAAQ,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG;YACZ,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACnB,MAAM,CAAC,iDACF,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,GACxC,EAAE,KACL,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,oBAAoB,CAAC,WAAW,EACrD,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,oBAAoB,CAAC,OAAO,GACtC,CAAC;gBACF,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;YACF,GAAG,QAAQ;iBACR,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;iBAC5D,GAAG,CACF,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjB,CAAC;gBACC,QAAQ;gBACR,MAAM,EAAE,KAAK;aACD,CAAA,CACf;SACJ,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAErC,MAAM,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;SACvD;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,EACxB,IAAI,GAGL;QACC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAA;QAEzE,MAAM,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;QAC7C,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBAClC,WAAW;gBACX,IAAI;gBACJ,UAAU,EAAE,oBAAoB,CAAC,WAAW;gBAC5C,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;SACJ;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,EACtB,IAAI,EACJ,IAAI,GAIL;QACC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC/C,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC;YAC7C,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,IAAI;SAEL,CAAC,CAAC;QACH,MAAM,cAAc,CAAC,IAAI,CAAC;YACxB,MAAM,kCACD,OAAO,GACP,IAAI,CACR;YACD,IAAI;SACL,CAAC,CAAC;IACL,CAAC;CACF;AA9mBD,wCA8mBC"}
|
|
1
|
+
{"version":3,"file":"install.service.js","sourceRoot":"","sources":["../../../src/core/services/install.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,7 @@ class ReportService {
|
|
|
132
132
|
fields: ['shortid', 'config'],
|
|
133
133
|
key: 'shortid',
|
|
134
134
|
values: reportTemplateList.map(t => t.shortid),
|
|
135
|
-
user
|
|
135
|
+
user,
|
|
136
136
|
});
|
|
137
137
|
return reportTemplateList.map(template => {
|
|
138
138
|
return Object.assign(Object.assign({}, template), databaseReports.find(r => r.shortid === template.shortid));
|
|
@@ -12,5 +12,5 @@ export declare class ApplicationService implements ApplicationInterface<Request>
|
|
|
12
12
|
constructor(comunicationService: ComunicationService);
|
|
13
13
|
getEngine(): string;
|
|
14
14
|
getVersion(): string;
|
|
15
|
-
exec<U>({ root, request: { method, path, query, body, headers }, user, }: ApplicationServiceExec<Request>): Promise<U>;
|
|
15
|
+
exec<U>({ root, request: { method, path, query, body, headers }, user, timeout }: ApplicationServiceExec<Request>): Promise<U>;
|
|
16
16
|
}
|
|
@@ -13,7 +13,10 @@ class ApplicationService {
|
|
|
13
13
|
getVersion() {
|
|
14
14
|
return 'v1';
|
|
15
15
|
}
|
|
16
|
-
async exec({ root, request: { method, path = '', query = {}, body = null, headers = {} }, user, }) {
|
|
16
|
+
async exec({ root, request: { method, path = '', query = {}, body = null, headers = {} }, user, timeout }) {
|
|
17
|
+
if (!timeout) {
|
|
18
|
+
timeout = 5000;
|
|
19
|
+
}
|
|
17
20
|
const supportsBody = method.toLowerCase() !== 'get';
|
|
18
21
|
const url = [root, path].filter(i => i).join('/');
|
|
19
22
|
const h = Object.assign(Object.assign({}, _.chain(headers)
|
|
@@ -30,6 +33,7 @@ class ApplicationService {
|
|
|
30
33
|
params: query,
|
|
31
34
|
url,
|
|
32
35
|
data: supportsBody ? body : null,
|
|
36
|
+
timeout,
|
|
33
37
|
};
|
|
34
38
|
const response = await axios_1.default.request(request);
|
|
35
39
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAAgE;AAahE,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,IAAI,EACJ,OAAO,EAAE,EACP,MAAM,EACN,IAAI,GAAG,EAAE,EACT,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,EAAE,EACb,EACD,IAAI,EACJ,OAAO,EACyB;QAChC,IAAG,CAAC,OAAO,EAAE;YACX,OAAO,GAAG,IAAI,CAAA;SACf;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,CAAA;QACnD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjD,MAAM,CAAC,GAAG,gCACL,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;aAChB,IAAI,CAAC,MAAM,CAAC;aACZ,KAAK,EAAE,KACV,eAAe,EAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC;gBAC3D,IAAI;aACL,CAAC,GACI,CAAA;QAER,IAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAC,MAAM,CAAC,EAAE;YACxB,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAA;SACxB;QAED,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,CAAC;YACV,MAAM;YACN,MAAM,EAAE,KAAK;YACb,GAAG;YACH,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;YAChC,OAAO;SACc,CAAC;QACxB,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAsB,OAAO,CAAC,CAAA;QAClE,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACR,CAAA;IACf,CAAC;CACF;AAzDD,gDAyDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/javascript/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,iDAAkD;AAMlD,4CAAwC;AA+CxC,MAAM,WAAW;IAIf,YAAY,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAiE;QAF9F,WAAM,GAAG,IAAI,eAAM,CAAC,aAAa,CAAC,CAAA;QAGjD,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,IAAI,CAAC,YAAY,GAAG,oBAAI,CAAC,gBAAgB,EAAE;YACzC,QAAQ;YACR,GAAG;YACH,GAAG,EAAE;gBACH,SAAS,EAAE,GAAG;aACf;YACD,MAAM,EAAE,IAAI;SACN,CAAC,CAAA;QAET,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;YACpB,IAAI,IAAI,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;aAC5D;iBAAM,IAAI,IAAI,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,GAAG,CAAC,CAAA;aAC5C;QACH,CAAC,CAAA;QAED,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACnC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAElC,MAAM,KAAK,GAAG,CAAC,GAAU,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnC,CAAC,CAAA;QAED,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACpC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACnD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;YAC3B,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;aACrB;iBAAM;gBACL,KAAK,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,SAAS,CAAW,QAAuD;QACzE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC3C,CAAC;IAED,OAAO,CAAC,QAAgC;QACtC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACzC,CAAC;IAED,IAAI,CAAI,OAA0B;QAChC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChC,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACnC,CAAC,EAAE,KAAK,CAAC,CAAA;IACX,CAAC;CACF;AAKD,MAAa,kBAAkB;IAC7B,YACmB,gBAAwB,EACxB,iBAAoC,EACpC,mBAAwC,EACxC,WAAwB,EAExB,qBAA4C;QAL5C,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;QAExB,0BAAqB,GAArB,qBAAqB,CAAuB;IAC/D,CAAC;IAED,SAAS;QACP,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,IAAqC;
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/javascript/v1/application.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export interface CallArgs<T extends Request> {
|
|
|
5
5
|
user: User;
|
|
6
6
|
request: T;
|
|
7
7
|
sourcePid: string;
|
|
8
|
+
timeout?: number;
|
|
8
9
|
}
|
|
9
10
|
export interface Source {
|
|
10
11
|
puca_pid?: string;
|
|
@@ -18,5 +19,5 @@ export declare class SourceService {
|
|
|
18
19
|
private readonly repositoryFactory;
|
|
19
20
|
private readonly applicationServiceList;
|
|
20
21
|
constructor(repositoryFactory: RepositoryFactory, applicationServiceList: ApplicationInterface<unknown>[]);
|
|
21
|
-
call<T, U>({ sourcePid, user, request, }: CallArgs<T>): Promise<U>;
|
|
22
|
+
call<T, U>({ sourcePid, user, request, timeout }: CallArgs<T>): Promise<U>;
|
|
22
23
|
}
|
|
@@ -6,7 +6,10 @@ class SourceService {
|
|
|
6
6
|
this.repositoryFactory = repositoryFactory;
|
|
7
7
|
this.applicationServiceList = applicationServiceList;
|
|
8
8
|
}
|
|
9
|
-
async call({ sourcePid, user, request, }) {
|
|
9
|
+
async call({ sourcePid, user, request, timeout }) {
|
|
10
|
+
if (!timeout) {
|
|
11
|
+
timeout = 1000 * 5;
|
|
12
|
+
}
|
|
10
13
|
const source = await this.repositoryFactory.getInstance({
|
|
11
14
|
tableName: 'puca_base_api_source',
|
|
12
15
|
transaction: null
|
|
@@ -32,6 +35,7 @@ class SourceService {
|
|
|
32
35
|
user,
|
|
33
36
|
request,
|
|
34
37
|
root: source.root,
|
|
38
|
+
timeout
|
|
35
39
|
});
|
|
36
40
|
}
|
|
37
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.service.js","sourceRoot":"","sources":["../../../../src/core/services/source/source.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"source.service.js","sourceRoot":"","sources":["../../../../src/core/services/source/source.service.ts"],"names":[],"mappings":";;;AAkBA,MAAa,aAAa;IACxB,YACmB,iBAAoC,EACpC,sBAAuD;QADvD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,2BAAsB,GAAtB,sBAAsB,CAAiC;IAC1E,CAAC;IAED,KAAK,CAAC,IAAI,CAAO,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,OAAO,EACK;QACZ,IAAG,CAAC,OAAO,EAAE;YACX,OAAO,GAAG,IAAI,GAAG,CAAC,CAAA;SACnB;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAS;YAC9D,SAAS,EAAE,sBAAsB;YACjC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,aAAa,CAAC;YACf,MAAM,EAAE;gBACN,MAAM;gBACN,SAAS;gBACT,MAAM;gBACN,QAAQ;gBACR,gBAAgB;aACjB;YACD,OAAO,EAAE,SAAS;YAClB,IAAI;SAEL,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;SACpC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,UAAU,EAAE,IAAI,MAAM,CAAC,cAAc,CAA4B,CAAA;QAEzK,IAAG,CAAC,kBAAkB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;SAChD;QAED,OAAO,MAAM,kBAAkB,CAAC,IAAI,CAAI;YACtC,IAAI;YACJ,OAAO;YACP,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAjDD,sCAiDC"}
|
|
@@ -88,6 +88,13 @@ export interface CrudControllerEspecificationEnvironmentDetails {
|
|
|
88
88
|
list?: {
|
|
89
89
|
showEditButton?: boolean;
|
|
90
90
|
showNewButton?: boolean;
|
|
91
|
+
headerButtons?: {
|
|
92
|
+
label: string;
|
|
93
|
+
link: string;
|
|
94
|
+
name: string;
|
|
95
|
+
color?: string;
|
|
96
|
+
disabled?: string;
|
|
97
|
+
}[];
|
|
91
98
|
afterNewItemCreated?: {
|
|
92
99
|
link: string;
|
|
93
100
|
};
|