Merge pull request #724 from LautaroCesso/lautaro

Add ticket create message.
This commit is contained in:
Ivan Diaz 2020-04-20 08:41:44 -03:00 committed by GitHub
commit 482167f765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 4 deletions

View File

@ -12,6 +12,7 @@ import Button from 'core-components/button';
import Tooltip from 'core-components/tooltip';
import Checkbox from 'core-components/checkbox';
import Tag from 'core-components/tag';
import Message from 'core-components/message';
class TicketList extends React.Component {
static propTypes = {
@ -48,6 +49,7 @@ class TicketList extends React.Component {
return (
<div className="ticket-list">
<div className="ticket-list__filters">
{this.props.type === 'primary' ? this.renderMessage() : null}
{(this.props.type === 'secondary' && this.props.showDepartmentDropdown) ? this.renderDepartmentsDropDown() : null}
{this.props.onClosedTicketsShownChange ? this.renderFilterCheckbox() : null}
</div>
@ -69,6 +71,17 @@ class TicketList extends React.Component {
);
}
renderMessage() {
switch (this.getQueryVariable('message')) {
case 'success':
return <Message className="create-ticket-form__message" type="success">{i18n('TICKET_SENT')}</Message>
case 'fail':
return <Message className="create-ticket-form__message" type="error">{i18n('TICKET_SENT_ERROR')}</Message>;
default:
return null;
}
}
getDepartmentDropdownProps() {
return {
departments: this.getDepartments(),
@ -108,6 +121,20 @@ class TicketList extends React.Component {
return departments;
}
getQueryVariable(variable) {
let query = window.location.search.substring(1);
let vars = query.split("&");
for (let i=0; i < vars.length; i++) {
let pair = vars[i].split("=");
if(pair[0] == variable) {
return pair[1];
}
}
return false;
}
getTableHeaders() {
if (this.props.type == 'primary' ) {
return [

View File

@ -141,12 +141,13 @@ class CreateTicketForm extends React.Component {
}
onTicketSuccess(email, result) {
let message = 'success'
this.setState({
loading: false,
message: 'success'
message: message
}, () => {
if(this.props.onSuccess) {
this.props.onSuccess(result, email);
this.props.onSuccess(result, email, message);
}
});
}

View File

@ -32,9 +32,9 @@ class DashboardCreateTicketPage extends React.Component {
);
}
onCreateTicketSuccess(result, email) {
onCreateTicketSuccess(result, email, message) {
if((this.props.location.pathname !== '/create-ticket')) {
setTimeout(() => {history.push('/dashboard')}, 2000);
history.push(`/dashboard?message=${message}`);
} else {
setTimeout(() => {history.push('/check-ticket/' + result.data.ticketNumber + '/' + email)}, 1000);
}