refs #5941 feat: when error can send email to support
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2023-06-30 14:24:50 +02:00
parent f636c3b1ab
commit 467c4e997c
9 changed files with 148 additions and 13 deletions

View File

@ -0,0 +1,63 @@
const smtp = require('vn-print/core/smtp');
const config = require('vn-print/core/config');
module.exports = Self => {
Self.remoteMethodCtx('sendToSupport', {
description: 'Send mail to support',
accessType: 'WRITE',
accepts: [
{
arg: 'subject',
type: 'string',
required: true,
description: 'The subject'
},
{
arg: 'reason',
type: 'string',
description: 'The reason'
},
{
arg: 'additionalData',
type: 'object',
required: true,
description: 'The additional data'
}
],
returns: {
type: 'object',
root: true
},
http: {
path: `/send-to-support`,
verb: 'POST'
}
});
Self.sendToSupport = async(ctx, subject, reason, additionalData) => {
const emailUser =
await Self.app.models.EmailUser.findById(ctx.req.accessToken.userId, {fields: ['email']});
let html = `<strong>Motivo</strong>:<br/>${reason}<br/>`;
for (const data in additionalData) {
tryJson(additionalData[data]);
html += `<strong>${data}</strong>:<br/>${tryJson(additionalData[data])}<br/>`;
}
console.log(subject, reason, additionalData);
console.log(html);
smtp.send({
to: config.app.reportEmail,
replyTo: emailUser.email,
subject: '[Support-Salix] ' + subject,
html
});
};
function tryJson(value) {
try {
return JSON.parse(value);
} catch (e) {
return value;
}
}
};

View File

@ -1,4 +1,5 @@
module.exports = Self => {
require('../methods/osticket/osTicketReportEmail')(Self);
require('../methods/osticket/closeTicket')(Self);
require('../methods/osticket/sendToSupport')(Self);
};

View File

@ -1 +1,35 @@
<div id="shapes"></div>
<div id="shapes"></div>
<vn-dialog
vn-id="supportDialog"
on-accept="$ctrl.sendToSupport()">
<tpl-body>
<section>
<h5 class="vn-py-sm" translate>Open CAU</h5>
<vn-horizontal>
<vn-textfield
vn-one
label="Subject"
ng-model="supportDialog.subject"
required="true">
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textarea vn-one
label="Reason"
ng-model="supportDialog.reason"
rows="2"
required="true">
</vn-textarea>
</vn-horizontal>
<vn-horizontal>
<span>
{{'Este cau contiene más información relevante para el equipo de informática' | translate}}:
</span>
</vn-horizontal>
</section>
</tpl-body>
<tpl-buttons>
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
<button response="accept" translate>Send</button>
</tpl-buttons>
</vn-dialog>

View File

@ -27,6 +27,18 @@ export default class Controller extends Component {
setTimeout(() => element.classList.add('shown'), 30);
shape.element = element;
if (data.additionalData) {
let supportButton = document.createElement('i');
supportButton.setAttribute('class', 'material-icons');
supportButton.addEventListener('click', () => this.onButtonClick(this.$.supportDialog.show()));
element.appendChild(supportButton);
let buttonIcon = 'support_agent';
buttonIcon = document.createTextNode(buttonIcon);
supportButton.appendChild(buttonIcon);
this.$.supportDialog.additionalData = data.additionalData;
}
if (shape.type)
element.classList.add(shape.type);
@ -95,7 +107,7 @@ export default class Controller extends Component {
clearTimeout(shape.hideTimeout);
shape.hideTimeout = setTimeout(
() => this.hide(shape), shape.timeout || 3000);
() => this.hide(shape), shape.timeout || 5000);
this.lastShape = shape;
}
@ -142,6 +154,23 @@ export default class Controller extends Component {
else
this.hide(shape);
}
sendToSupport() {
const supportDialog = this.$.supportDialog;
console.log(this.$.supportDialog.subject);
console.log(this.$.supportDialog.reason);
console.log(this.$.supportDialog.additionalData);
console.log({
subject: supportDialog.subject,
reason: supportDialog.reason,
additionalData: supportDialog.additionalData
});
this.$http.post('Ostickets/send-to-support', {
subject: supportDialog.subject,
reason: supportDialog.reason,
additionalData: supportDialog.additionalData
});
}
}
ngModule.vnComponent('vnSnackbar', {

View File

@ -20,11 +20,11 @@ vn-snackbar .shape {
margin-bottom: 15px;
color: white;
padding: 12px 25px 12px 12px;
& > .text {
text-align: center;
vn-chip {
vn-chip {
position: absolute;
left: -16px;
top: -16px;
@ -64,4 +64,4 @@ vn-snackbar .shape {
top: 0;
right: 0
}
}
}

View File

@ -23,9 +23,9 @@ export default class App {
this.logger.showSuccess(message);
}
showError(message) {
showError(message, additionalData) {
if (this.logger)
this.logger.showError(message);
this.logger.showError(message, additionalData);
}
pushLoader() {

View File

@ -25,15 +25,15 @@ export default class App extends Component {
}
showMessage(message) {
this.$.snackbar.show({message: message});
this.$.snackbar.show({message});
}
showSuccess(message) {
this.$.snackbar.showSuccess({message: message});
this.$.snackbar.showSuccess({message});
}
showError(message) {
this.$.snackbar.showError({message: message});
showError(message, additionalData) {
this.$.snackbar.showError({message, additionalData});
}
}

View File

@ -148,7 +148,13 @@ function $exceptionHandler(vnApp, $window, $state, $injector) {
if (messageT)
message = $translate.instant(messageT);
vnApp.showError(message);
const additonalData = {
frontPath: $state.current.name,
httpRequest: cause.replace('Possibly unhandled rejection: ', ''),
backError: JSON.stringify(exception)
};
vnApp.showError(message, additonalData);
};
}
ngModule.factory('$exceptionHandler', $exceptionHandler);

View File

@ -2,6 +2,7 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('filter', {
@ -88,6 +89,7 @@ module.exports = Self => {
const conn = Self.dataSource.connector;
const models = Self.app.models;
const myOptions = {};
throw new UserError(`You don't have enough privileges`);
if (typeof options == 'object')
Object.assign(myOptions, options);
@ -145,7 +147,7 @@ module.exports = Self => {
const stmts = [];
const stmt = new ParameterizedSQL(
`SELECT
`SELECT
i.id,
i.image,
i.name,