diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index 4b69e7cb..919ad429 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -242,7 +242,9 @@ class TicketViewer extends React.Component { loading: false }); - store.dispatch(SessionActions.getUserData()); + if(this.props.onComment) { + this.props.onComment(); + } } onCommentFail() { diff --git a/client/src/app/Routes.js b/client/src/app/Routes.js index 0470cd27..f0fc358a 100644 --- a/client/src/app/Routes.js +++ b/client/src/app/Routes.js @@ -84,7 +84,7 @@ export default ( - + diff --git a/client/src/app/admin/panel/tickets/admin-panel-view-ticket.js b/client/src/app/admin/panel/tickets/admin-panel-view-ticket.js index 620324bb..a1b2b2bc 100644 --- a/client/src/app/admin/panel/tickets/admin-panel-view-ticket.js +++ b/client/src/app/admin/panel/tickets/admin-panel-view-ticket.js @@ -1,14 +1,68 @@ import React from 'react'; +import API from 'lib-app/api-call'; +import TicketViewer from 'app-components/ticket-viewer'; +import Loading from 'core-components/loading'; + class AdminPanelViewTicket extends React.Component { + state = { + loading: true, + ticket: {} + }; + render() { return (
- /admin/panel/tickets/view-ticket + {(this.state.loading) ? this.renderLoading() : this.renderView()}
); } + + renderLoading() { + + }; + + renderView() { + return (this.props.ticket) ? this.renderNotFoundError() : this.renderTicketView(); + } + + renderNotFoundError() { + return ( +
+ +
+ ); + } + + renderTicketView() { + return ( +
+ +
+ ); + } + + retrieveTicket() { + this.setState({ + loading: true, + ticket: {} + }); + + API.call({ + path: '/ticket/get', + date: { + ticketNumber: this.props.params.ticketNumber + } + }).then(this.onRetrieveSuccess.bind(this)) + } + + onRetrieveSuccess(result) { + this.setState({ + loading: false, + ticket: result.data + }); + } } export default AdminPanelViewTicket; \ No newline at end of file diff --git a/client/src/app/main/dashboard/dashboard-ticket/dashboard-ticket-page.js b/client/src/app/main/dashboard/dashboard-ticket/dashboard-ticket-page.js index 602b4e05..57faa0d2 100644 --- a/client/src/app/main/dashboard/dashboard-ticket/dashboard-ticket-page.js +++ b/client/src/app/main/dashboard/dashboard-ticket/dashboard-ticket-page.js @@ -2,6 +2,7 @@ import React from 'react'; import _ from 'lodash'; import {connect} from 'react-redux'; +import SessionActions from 'actions/session-actions'; import TicketViewer from 'app-components/ticket-viewer'; class DashboardTicketPage extends React.Component { @@ -13,7 +14,7 @@ class DashboardTicketPage extends React.Component { render() { return (
- +
); } @@ -21,6 +22,10 @@ class DashboardTicketPage extends React.Component { getTicketData() { return _.find(this.props.tickets, {ticketNumber: this.props.params.ticketNumber}); } + + retrieveUserData() { + this.props.dispatch(SessionActions.getUserData()); + } } export default connect((store) => { diff --git a/client/src/data/fixtures/user-fixtures.js b/client/src/data/fixtures/user-fixtures.js index ead1820c..5411a94d 100644 --- a/client/src/data/fixtures/user-fixtures.js +++ b/client/src/data/fixtures/user-fixtures.js @@ -43,7 +43,7 @@ module.exports = [ return { status: 'success', data: { - sessionActive: false + sessionActive: true } }; }