@puca/puca-core 11.8.10 → 11.8.12
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/email.service.d.ts +1 -1
- package/dist/core/services/email.service.js +6 -6
- package/dist/core/services/email.service.js.map +1 -1
- package/dist/core/services/eval.service.js +7 -0
- package/dist/core/services/eval.service.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.js +1 -3
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +9 -5
- package/dist/models/crud-controller-especification-environment.js.map +1 -1
- package/dist/orm/services/transaction.js +2 -2
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ElasticMailService = void 0;
|
|
4
4
|
const elasticemail_client_ts_axios_1 = require("@elasticemail/elasticemail-client-ts-axios");
|
|
5
|
+
const _ = require("lodash");
|
|
5
6
|
const logger_1 = require("./logger");
|
|
6
7
|
class ElasticMailService {
|
|
7
8
|
constructor(configService) {
|
|
@@ -33,13 +34,12 @@ class ElasticMailService {
|
|
|
33
34
|
this.logger.warn('Trying to send email without starting the service');
|
|
34
35
|
return;
|
|
35
36
|
}
|
|
36
|
-
const recipient = args.recipient.
|
|
37
|
+
const recipient = (_.isArray(args.recipient) ? args.recipient : [args.recipient]);
|
|
37
38
|
const emailMessageData = {
|
|
38
|
-
Recipients:
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
42
|
-
],
|
|
39
|
+
Recipients: recipient
|
|
40
|
+
.map((email) => email.trim())
|
|
41
|
+
.filter((email) => email)
|
|
42
|
+
.map((email) => ({ Email: email })),
|
|
43
43
|
Content: {
|
|
44
44
|
Body: [
|
|
45
45
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../src/core/services/email.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../src/core/services/email.service.ts"],"names":[],"mappings":";;;AAAA,6FAAwG;AACxG,4BAA4B;AAG5B,qCAAkC;AAelC,MAAa,kBAAkB;IAK7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJxC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAID,CAAC;IAE9D,KAAK,CAAC,oBAAoB;QACxB,MAAM,EAAE,YAAY,EAAG,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QAEnF,IAAI,CAAC,kBAAkB,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACnD,OAAO;SACR;QAED,MAAM,MAAM,GAAG,IAAI,4CAAa,CAAC;YAC/B,MAAM,EAAE,kBAAkB,CAAC,MAAM;SAClC,CAAC,CAAC;QAEH,IAAG,CAAC,kBAAkB,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAEzD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gDAAgD,EAChD,+EAA+E,CAChF,CAAC;SACH;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wCAAwC,EACxC,kEAAkE,CACnE,CAAC;SACH;QAED,IAAI,CAAC,YAAY,GAAG,kBAAkB,CAAC,YAAY,CAAA;QACnD,IAAI,CAAC,QAAQ,GAAG,IAAI,wCAAS,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAc;;QAC5B,IAAI;YACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;gBACtE,OAAO;aACR;YAED,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;YAEjF,MAAM,gBAAgB,GAAqB;gBACzC,UAAU,EAAE,SAAS;qBAClB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;qBAC5B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;qBACxB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ;4BACE,WAAW,EAAE,MAAM;4BACnB,OAAO,EAAE,OAAO;4BAChB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;yBAC3B;qBACF;oBACD,IAAI,EAAE,IAAI,CAAC,YAAY;oBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB;aACF,CAAA;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;YAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAEjC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,KAAI,CAAC,CAAC,CAAA;SACzC;IACH,CAAC;CACF;AAvED,gDAuEC"}
|
|
@@ -51,6 +51,13 @@ class EvalService extends eval_service_1.EvalService {
|
|
|
51
51
|
const columnCompare = args.query.fields[0];
|
|
52
52
|
const isValid = result.data.every((row) => row[columnCompare] !== null || row[columnCompare] !== '');
|
|
53
53
|
return isValid;
|
|
54
|
+
}, queryList: async (args) => {
|
|
55
|
+
const repository = repositoryFactory.getInstance({
|
|
56
|
+
tableName: args.tableName,
|
|
57
|
+
});
|
|
58
|
+
const { data: result } = await repository.findWhere(Object.assign(Object.assign({}, args.query), { user: opt.user, disablePermissionSystem: opt.disablePermissionSystem, totalizeMode: repository_1.TotalizeMode.never }));
|
|
59
|
+
const firstFieldName = Object.keys(result[0] || {})[0];
|
|
60
|
+
return result.map((row) => row[firstFieldName]);
|
|
54
61
|
}, query: async (args) => {
|
|
55
62
|
const repository = repositoryFactory.getInstance({
|
|
56
63
|
tableName: args.tableName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/core/services/eval.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/core/services/eval.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,7 +113,7 @@ class JobExecutor {
|
|
|
113
113
|
throw new Error('repeat jobs must have a key');
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
|
-
const bullAddOptions = Object.assign(Object.assign({}, JobExecutor.DEFAULT_OPT), { jobId: _.get(opts, 'key') || this.uuidService.v4(), timeout: _.get(opts, 'timeout', JobExecutor.DEFAULT_OPT.timeout), attempts: _.get(opts, 'attempts', JobExecutor.DEFAULT_OPT.attempts), removeOnFail: _.get(opts, 'removeOnFail',
|
|
116
|
+
const bullAddOptions = Object.assign(Object.assign({}, JobExecutor.DEFAULT_OPT), { jobId: _.get(opts, 'key') || this.uuidService.v4(), timeout: _.get(opts, 'timeout', JobExecutor.DEFAULT_OPT.timeout), attempts: _.get(opts, 'attempts', JobExecutor.DEFAULT_OPT.attempts), removeOnFail: _.get(opts, 'removeOnFail', environment !== 'PRODUCTION'), removeOnComplete: environment === 'PRODUCTION' || _.get(opts, 'removeOnComplete', false), repeat: _.get(opts, 'repeat'), backoff: Object.assign(Object.assign({}, JobExecutor.DEFAULT_OPT.backoff), _.get(opts, 'backoff')) });
|
|
117
117
|
await this.bull.add(data, bullAddOptions);
|
|
118
118
|
}
|
|
119
119
|
async shutdown(immediate) {
|
|
@@ -137,8 +137,6 @@ class JobExecutor {
|
|
|
137
137
|
exports.JobExecutor = JobExecutor;
|
|
138
138
|
JobExecutor.jobInstances = new JobInstances();
|
|
139
139
|
JobExecutor.DEFAULT_OPT = {
|
|
140
|
-
removeOnComplete: true,
|
|
141
|
-
removeOnFail: false,
|
|
142
140
|
backoff: {
|
|
143
141
|
type: 'exponential',
|
|
144
142
|
delay: 1000
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,6BAA8B;AAK9B,sCAAmC;AAGnC,MAAM,YAAY;IAAlB;QACmB,cAAS,GAAG,IAAI,GAAG,EAA8B,CAAA;IAqCpE,CAAC;IAnCC,MAAM,CAAC,MAAc,EAAE,CAAS,EAAE,IAAY;QAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC/B,OAAM;SACP;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;IAC5C,CAAC;IAED,IAAI,CAAC,MAAc,EAAE,EAAoB;QACvC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;SAC/B;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,EAAoB;QAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC/B,OAAO,CAAC,CAAC,CAAA;SACV;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC/C,CAAC;IAED,SAAS,CAAC,MAAM;QACd,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC/B,OAAO,CAAC,CAAA;SACT;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;IAC1C,CAAC;IAED,kBAAkB,CAAC,MAAc,EAAE,CAAS;QAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;CACF;AAGD,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,6 +118,14 @@ export interface CrudControllerEspecificationEnvironmentDetails {
|
|
|
118
118
|
disabled?: string;
|
|
119
119
|
name: string;
|
|
120
120
|
mode?: 'action' | 'link';
|
|
121
|
+
question?: {
|
|
122
|
+
message: string;
|
|
123
|
+
answers: {
|
|
124
|
+
key: string;
|
|
125
|
+
label: string;
|
|
126
|
+
color?: string;
|
|
127
|
+
}[];
|
|
128
|
+
};
|
|
121
129
|
}[];
|
|
122
130
|
buttons?: {
|
|
123
131
|
label: string;
|
|
@@ -133,11 +141,7 @@ export interface CrudControllerEspecificationEnvironmentDetails {
|
|
|
133
141
|
path: string;
|
|
134
142
|
label?: string;
|
|
135
143
|
}[];
|
|
136
|
-
quickSearchFields?: (string
|
|
137
|
-
name: string;
|
|
138
|
-
label: string;
|
|
139
|
-
fields: string[];
|
|
140
|
-
})[];
|
|
144
|
+
quickSearchFields?: (string)[];
|
|
141
145
|
};
|
|
142
146
|
}
|
|
143
147
|
export declare type AccessControl = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-controller-especification-environment.js","sourceRoot":"","sources":["../../src/models/crud-controller-especification-environment.ts"],"names":[],"mappings":";;;AAIA,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,yCAAa,CAAA;IACb,yCAAa,CAAA;AACf,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC;AAYA,CAAC;
|
|
1
|
+
{"version":3,"file":"crud-controller-especification-environment.js","sourceRoot":"","sources":["../../src/models/crud-controller-especification-environment.ts"],"names":[],"mappings":";;;AAIA,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,yCAAa,CAAA;IACb,yCAAa,CAAA;AACf,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC;AAYA,CAAC;AAuKF,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IACjC,gDAAqB,CAAA;IACrB,wCAAa,CAAA;IACb,wCAAa,CAAA;AACf,CAAC,EAJW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAIlC"}
|
|
@@ -111,7 +111,7 @@ class Transaction {
|
|
|
111
111
|
resolve();
|
|
112
112
|
}
|
|
113
113
|
catch (e) {
|
|
114
|
-
reject(e);
|
|
114
|
+
reject(new Error(`commit error on transaction ${this.name}: ${e.message}`));
|
|
115
115
|
}
|
|
116
116
|
});
|
|
117
117
|
});
|
|
@@ -124,7 +124,7 @@ class Transaction {
|
|
|
124
124
|
resolve();
|
|
125
125
|
}
|
|
126
126
|
catch (e) {
|
|
127
|
-
reject(e);
|
|
127
|
+
reject(new Error(`rollback error on transaction ${this.name}: ${e.message}`));
|
|
128
128
|
}
|
|
129
129
|
});
|
|
130
130
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":"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"}
|