From de84102e11cb33b7e23741790ba7a50a1e189b04 Mon Sep 17 00:00:00 2001
From: vnmedeiros <vnicius.nm.ba@gmail.com>
Date: Fri, 10 Sep 2021 16:41:14 -0300
Subject: [PATCH] feat: add option to  remove a background process of queue
 while it is not started #538

---
 .../admin/components/lists/processes-list.vue | 44 ++++++++-----------
 .../js/store/modules/bgprocess/actions.js     |  2 +-
 .../js/store/modules/bgprocess/mutations.js   |  8 +++-
 src/views/tainacan-admin-i18n.php             |  5 ++-
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/views/admin/components/lists/processes-list.vue b/src/views/admin/components/lists/processes-list.vue
index 8e46ba605..1aa4aae04 100644
--- a/src/views/admin/components/lists/processes-list.vue
+++ b/src/views/admin/components/lists/processes-list.vue
@@ -215,6 +215,21 @@
                                     class="icon has-text-gray">
                                 <i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-waiting"/>
                             </span>
+                            <span
+                                    v-tooltip="{
+                                            delay: {
+                                                show: 500,
+                                                hide: 300,
+                                            },
+                                            content: $i18n.get('label_delete_process'),
+                                            autoHide: false, classes: ['tooltip', 'repository-tooltip'],
+                                            placement: 'auto-start'
+                                        }"
+                                    v-if=" bgProcess.status === 'waiting' "
+                                    class="icon has-text-gray"
+                                    @click.prevent.stop="deleteOneProcess(index)">
+                                <i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-delete"/>
+                            </span>
                             <span
                                     v-tooltip="{
                                             delay: {
@@ -386,38 +401,17 @@
                 for (let i = 0; i < this.selected.length; i++) 
                     this.selected.splice(i, 1, !this.allOnPageSelected);
             },
-            deleteOneProcess(processId) {
+            deleteOneProcess(index) {
                 this.$buefy.modal.open({
                     parent: this,
                     component: CustomDialog,
                     props: {
                         icon: 'alert',
                         title: this.$i18n.get('label_warning'),
-                        message: this.$i18n.get('info_warning_Process_delete'),
+                        message: this.$i18n.get('info_warning_process_delete'),
                         onConfirm: () => {
-                            this.deleteProcess({ processId: processId })
-                                .then(() => {
-                                    // this.$buefy.toast.open({
-                                    //     duration: 3000,
-                                    //     message: this.$i18n.get('info_taxonomy_deleted'),
-                                    //     position: 'is-bottom',
-                                    //     type: 'is-secondary',
-                                    //     queue: true
-                                    // });
-                                    for (let i = 0; i < this.selected.length; i++) {
-                                        if (this.selected[i].id === this.taxonomyId)
-                                            this.selected.splice(i, 1);
-                                    }
-                                })
-                                .catch(() => {
-                                    // this.$buefy.toast.open({
-                                    //     duration: 3000,
-                                    //     message: this.$i18n.get('info_error_deleting_taxonomy'),
-                                    //     position: 'is-bottom',
-                                    //     type: 'is-danger',
-                                    //     queue: true
-                                    // });
-                                });
+                            const processId = this.processes[index].ID;
+                            this.deleteProcess(processId);
                         }
                     },
                     trapFocus: true,
diff --git a/src/views/admin/js/store/modules/bgprocess/actions.js b/src/views/admin/js/store/modules/bgprocess/actions.js
index 2d370a230..fcbf85671 100644
--- a/src/views/admin/js/store/modules/bgprocess/actions.js
+++ b/src/views/admin/js/store/modules/bgprocess/actions.js
@@ -99,7 +99,7 @@ export const cleanProcesses = ({ commit }) => {
 
 export const deleteProcess = ({ commit }, id) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.delete('/bg-process/' + id).then( res => {
+        axios.tainacan.delete('/bg-processes/' + id).then( res => {
             commit('deleteProcess', { id: id });
             resolve( res );
         }).catch((error) => { 
diff --git a/src/views/admin/js/store/modules/bgprocess/mutations.js b/src/views/admin/js/store/modules/bgprocess/mutations.js
index 71d0f4bef..448b3fccb 100644
--- a/src/views/admin/js/store/modules/bgprocess/mutations.js
+++ b/src/views/admin/js/store/modules/bgprocess/mutations.js
@@ -18,6 +18,13 @@ export const setProcess = ( state, bgProcess ) => {
     state.bg_process = bgProcess;
 }
 
+export const deleteProcess = ( state, bgProcess ) => {
+    let index = state.bg_processes.findIndex(newProcess => newProcess.ID == bgProcess.id);
+    if ( index >= 0){
+        state.bg_processes.splice(index, 1);
+    }
+}
+
 export const setProcessLog = ( state, log ) => {
     state.log = log;
 }
@@ -25,4 +32,3 @@ export const setProcessLog = ( state, log ) => {
 export const setProcessErrorLog = ( state, errorLog ) => {
     state.error_log = errorLog;
 }
-
diff --git a/src/views/tainacan-admin-i18n.php b/src/views/tainacan-admin-i18n.php
index fd9c962c0..59b9202dd 100644
--- a/src/views/tainacan-admin-i18n.php
+++ b/src/views/tainacan-admin-i18n.php
@@ -380,7 +380,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_process_paused'            		 		 => __( 'Process paused', 'tainacan' ),
 	'label_process_waiting'            		 		 => __( 'Process waiting', 'tainacan' ),
 	'label_stop_process'                             => __( 'Stop process', 'tainacan' ),
-	'label_stop_process'                             => __( 'Stop process', 'tainacan' ),
+	'label_delete_process'                           => __( 'Delete process', 'tainacan' ),
 	'label_process_failed'                           => __( 'Process failed', 'tainacan' ),
 	'label_max_options_to_show'                      => __( 'Max options to show', 'tainacan' ),
 	'label_unamed_process'                           => __( 'Unamed process', 'tainacan' ),
@@ -834,7 +834,8 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_process_status_cancelled' 				 => __( 'Cancelled', 'tainacan'),
 	'info_process_status_paused' 				 	 => __( 'Paused', 'tainacan'),
 	'info_process_status_running' 				 	 => __( 'Running', 'tainacan'),
-  	'info_warning_process_cancelled'                 => __( 'Are you sure? This process will be cancelled', 'tainacan' ),
+	'info_warning_process_delete' 				 	 => __( 'Are you sure? This process will be deleted.', 'tainacan'),
+  	'info_warning_process_cancelled'                 => __( 'Are you sure? This process will be cancelled.', 'tainacan' ),
 	'info_empty'                                     => __( 'empty', 'tainacan' ),
 	'info_url_copied'	         	    	    	 => __( 'URL link copied', 'tainacan' ),
 	'info_other_options'				 			 => __( 'Other options: ', 'tainacan'),