diff --git a/client/src/app/admin/panel/staff/staff-editor.js b/client/src/app/admin/panel/staff/staff-editor.js index 60d27eb9..a60da57c 100644 --- a/client/src/app/admin/panel/staff/staff-editor.js +++ b/client/src/app/admin/panel/staff/staff-editor.js @@ -64,7 +64,8 @@ class StaffEditor extends React.Component { owners: [], tags: [] }, - ticketData: {} + ticketData: {}, + ticketListLoading: false }; componentDidMount() { @@ -301,7 +302,7 @@ class StaffEditor extends React.Component { renderDepartmentsInfo() { const { departments } = this.state; - const departmentsAssigned = this.getDepartments().filter((_department, index) => departments.includes(index)) + const departmentsAssigned = this.getDepartments().filter((_department, index) => departments.includes(index)); return (
index)}}> @@ -330,7 +331,10 @@ class StaffEditor extends React.Component {
{i18n('TICKETS_ASSIGNED')}
- + {this.state.ticketListLoading ? + : + + }
); @@ -423,7 +427,10 @@ class StaffEditor extends React.Component { } onSubmit(eventType, form) { - this.setState({loadingStats: true}); + this.setState({ + loadingStats: true, + ticketListLoading: true + }); const { myAccount, staffId, onChange } = this.props; let departments; @@ -447,7 +454,11 @@ class StaffEditor extends React.Component { }).then(() => { this.retrieveStaffMembers(); window.scrollTo(0,250); - this.setState({message: eventType, showMessage: true}); + this.setState({ + message: eventType, + showMessage: true, + ticketListLoading: false + }); const departmentsAssigned = SessionStore.getDepartments().filter((_department, index) => this.state.departments.includes(index)); const departmentsAssignedId = departmentsAssigned.map(department => department.id); @@ -462,6 +473,7 @@ class StaffEditor extends React.Component { this.setState({loadingStats: false}); }); + this.retrieveTicketsAssigned({page: 1}); onChange && onChange(); }).catch(() => { window.scrollTo(0,250); diff --git a/client/src/app/admin/panel/staff/staff-editor.scss b/client/src/app/admin/panel/staff/staff-editor.scss index 0782f0aa..4ef8836c 100644 --- a/client/src/app/admin/panel/staff/staff-editor.scss +++ b/client/src/app/admin/panel/staff/staff-editor.scss @@ -174,6 +174,15 @@ margin-bottom: 20px; } + &__ticketlist-loading { + min-height: 361px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + background-color: $grey; + } + &__separator { margin: 3px 0; }