From 57434e2ef7ffedfca8bda019560b5a9836779362 Mon Sep 17 00:00:00 2001 From: LautaroCesso <59095036+LautaroCesso@users.noreply.github.com> Date: Mon, 6 Jul 2020 12:16:44 -0300 Subject: [PATCH] Fix loading in AreYouSure component. (#826) * Fix loading in AreYouSure component. * Fix are you sure loading in some panels and components. * Delete ticket admin panel custom tags. --- client/src/app-components/ticket-viewer.js | 14 +++++++------- client/src/app-components/topic-viewer.js | 2 +- .../panel/articles/admin-panel-view-article.js | 2 +- .../settings/admin-panel-advanced-settings.js | 14 +++++++------- .../panel/settings/admin-panel-custom-tags.js | 2 +- .../panel/settings/admin-panel-email-settings.js | 4 ++-- .../admin/panel/staff/admin-panel-departments.js | 2 +- client/src/app/admin/panel/staff/staff-editor.js | 2 +- .../panel/tickets/admin-panel-custom-responses.js | 2 +- .../admin/panel/users/admin-panel-custom-fields.js | 2 +- .../app/admin/panel/users/admin-panel-view-user.js | 4 ++-- .../dashboard-edit-profile-page.js | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index c48866d9..5b82b568 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -432,14 +432,14 @@ class TicketViewer extends React.Component { let APICallPromise = new Promise(resolve => resolve()); if(owner) { - APICallPromise.then(() => API.call({ + APICallPromise = APICallPromise.then(() => API.call({ path: '/staff/un-assign-ticket', data: { ticketNumber } })); } if(id !== 0) { - APICallPromise.then(() => API.call({ + APICallPromise = APICallPromise.then(() => API.call({ path: '/staff/assign-ticket', data: { ticketNumber, staffId: id } })); @@ -483,7 +483,7 @@ class TicketViewer extends React.Component { } reopenTicket() { - API.call({ + return API.call({ path: '/ticket/re-open', data: { ticketNumber: this.props.ticket.ticketNumber @@ -492,7 +492,7 @@ class TicketViewer extends React.Component { } closeTicket() { - API.call({ + return API.call({ path: '/ticket/close', data: { ticketNumber: this.props.ticket.ticketNumber @@ -501,7 +501,7 @@ class TicketViewer extends React.Component { } deleteTicket() { - API.call({ + return API.call({ path: '/ticket/delete', data: { ticketNumber: this.props.ticket.ticketNumber @@ -513,7 +513,7 @@ class TicketViewer extends React.Component { } changeDepartment(index) { - API.call({ + return API.call({ path: '/ticket/change-department', data: { ticketNumber: this.props.ticket.ticketNumber, @@ -529,7 +529,7 @@ class TicketViewer extends React.Component { 'high' ]; - API.call({ + return API.call({ path: '/ticket/change-priority', data: { ticketNumber: this.props.ticket.ticketNumber, diff --git a/client/src/app-components/topic-viewer.js b/client/src/app-components/topic-viewer.js index c6395491..8bdc9276 100644 --- a/client/src/app-components/topic-viewer.js +++ b/client/src/app-components/topic-viewer.js @@ -166,7 +166,7 @@ class TopicViewer extends React.Component { } onDeleteClick() { - API.call({ + return API.call({ path: '/article/delete-topic', data: { topicId: this.props.id diff --git a/client/src/app/admin/panel/articles/admin-panel-view-article.js b/client/src/app/admin/panel/articles/admin-panel-view-article.js index 1dfd394e..cad751dd 100644 --- a/client/src/app/admin/panel/articles/admin-panel-view-article.js +++ b/client/src/app/admin/panel/articles/admin-panel-view-article.js @@ -153,7 +153,7 @@ class AdminPanelViewArticle extends React.Component { } onArticleDeleted(article) { - API.call({ + return API.call({ path: '/article/delete', data: { articleId: article.id diff --git a/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js b/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js index 4f2ff813..6a31872e 100644 --- a/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js +++ b/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js @@ -178,7 +178,7 @@ class AdminPanelAdvancedSettings extends React.Component { onDeleteKeyClick() { AreYouSure.openModal(null, () => { - API.call({ + return API.call({ path: '/system/delete-api-key', data: { name: this.state.APIKeys[this.state.selectedAPIKey].name @@ -195,19 +195,19 @@ class AdminPanelAdvancedSettings extends React.Component { } onCheckboxMandatoryLoginChange() { - AreYouSure.openModal(null, this.onAreYouSureUserSystemOk.bind(this), 'secure'); + AreYouSure.openModal(null, this.onAreYouSureMandatoryLoginOk.bind(this), 'secure'); } onCheckboxRegistrationChange() { AreYouSure.openModal(null, this.onAreYouSureRegistrationOk.bind(this), 'secure'); } - onAreYouSureUserSystemOk(password) { + onAreYouSureMandatoryLoginOk(password) { const { config, dispatch } = this.props; - API.call({ + return API.call({ path: config['mandatory-login'] ? '/system/disable-mandatory-login' : '/system/enable-mandatory-login', data: { password: password @@ -227,7 +227,7 @@ class AdminPanelAdvancedSettings extends React.Component { config, dispatch } = this.props; - API.call({ + return API.call({ path: config['registration'] ? '/system/disable-registration' : '/system/enable-registration', data: { password: password @@ -247,7 +247,7 @@ class AdminPanelAdvancedSettings extends React.Component { } onAreYouSureCSVOk(file, password) { - API.call({ + return API.call({ path: '/system/csv-import', dataAsForm: true, data: { @@ -290,7 +290,7 @@ class AdminPanelAdvancedSettings extends React.Component { } onAreYouSureDeleteAllUsersOk(password) { - API.call({ + return API.call({ path: '/system/delete-all-users', data: { password: password diff --git a/client/src/app/admin/panel/settings/admin-panel-custom-tags.js b/client/src/app/admin/panel/settings/admin-panel-custom-tags.js index a51992f6..9f008fcb 100644 --- a/client/src/app/admin/panel/settings/admin-panel-custom-tags.js +++ b/client/src/app/admin/panel/settings/admin-panel-custom-tags.js @@ -80,7 +80,7 @@ class AdminPanelCustomTags extends React.Component { } deleteCustomTag(tagId) { - API.call({ + return API.call({ path: '/ticket/delete-tag', data: { tagId, diff --git a/client/src/app/admin/panel/settings/admin-panel-email-settings.js b/client/src/app/admin/panel/settings/admin-panel-email-settings.js index e46424d2..5ef95514 100644 --- a/client/src/app/admin/panel/settings/admin-panel-email-settings.js +++ b/client/src/app/admin/panel/settings/admin-panel-email-settings.js @@ -442,7 +442,7 @@ class AdminPanelEmailSettings extends React.Component { recoverEmailTemplate() { const {selectedIndex, language, templates} = this.state; - API.call({ + return API.call({ path: '/system/recover-mail-template', data: { template: templates[selectedIndex], @@ -458,7 +458,7 @@ class AdminPanelEmailSettings extends React.Component { loadingForm: true, }); - API.call({ + return API.call({ path: '/system/get-mail-template', data: {template: this.state.templates[index], language} }).then((result) => this.setState({ diff --git a/client/src/app/admin/panel/staff/admin-panel-departments.js b/client/src/app/admin/panel/staff/admin-panel-departments.js index 6b71b253..2b77d1fa 100644 --- a/client/src/app/admin/panel/staff/admin-panel-departments.js +++ b/client/src/app/admin/panel/staff/admin-panel-departments.js @@ -315,7 +315,7 @@ class AdminPanelDepartments extends React.Component { } deleteDepartment() { - API.call({ + return API.call({ path: '/system/delete-department', data: { departmentId: this.getCurrentDepartment(this.props.departments).id, diff --git a/client/src/app/admin/panel/staff/staff-editor.js b/client/src/app/admin/panel/staff/staff-editor.js index 733a5686..db7da8b4 100644 --- a/client/src/app/admin/panel/staff/staff-editor.js +++ b/client/src/app/admin/panel/staff/staff-editor.js @@ -325,7 +325,7 @@ class StaffEditor extends React.Component { } onDeleteClick() { - API.call({ + return API.call({ path: '/staff/delete', data: { staffId: this.props.staffId diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js index 35801d70..09294196 100644 --- a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js +++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js @@ -203,7 +203,7 @@ class AdminPanelCustomResponses extends React.Component { } deleteCustomResponse() { - API.call({ + return API.call({ path: '/ticket/delete-custom-response', data: { id: this.props.items[this.state.selectedIndex].id diff --git a/client/src/app/admin/panel/users/admin-panel-custom-fields.js b/client/src/app/admin/panel/users/admin-panel-custom-fields.js index c93b0195..1fbbf43d 100644 --- a/client/src/app/admin/panel/users/admin-panel-custom-fields.js +++ b/client/src/app/admin/panel/users/admin-panel-custom-fields.js @@ -85,7 +85,7 @@ class AdminPanelCustomFields extends React.Component { } deleteCustomField(id) { - API.call({ + return API.call({ path: '/system/delete-custom-field', data: {id} }) diff --git a/client/src/app/admin/panel/users/admin-panel-view-user.js b/client/src/app/admin/panel/users/admin-panel-view-user.js index 6a843bec..f149d4f2 100644 --- a/client/src/app/admin/panel/users/admin-panel-view-user.js +++ b/client/src/app/admin/panel/users/admin-panel-view-user.js @@ -145,7 +145,7 @@ class AdminPanelViewUser extends React.Component { } disableUser() { - API.call({ + return API.call({ path: this.state.disabled ? '/user/enable' : '/user/disable', data: { userId: this.props.params.userId @@ -154,7 +154,7 @@ class AdminPanelViewUser extends React.Component { } deleteUser() { - API.call({ + return API.call({ path: '/user/delete', data: { userId: this.props.params.userId diff --git a/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js b/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js index 75fbd39b..88cb27e1 100644 --- a/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js +++ b/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js @@ -157,7 +157,7 @@ class DashboardEditProfilePage extends React.Component { this.setState({ loadingEmail: true }); - API.call({ + return API.call({ path: "/user/edit-email", data: { newEmail: formState.newEmail @@ -179,7 +179,7 @@ class DashboardEditProfilePage extends React.Component { this.setState({ loadingPass: true }); - API.call({ + return API.call({ path: "/user/edit-password", data: { oldPassword: formState.oldPassword,