From ed88baa84b1953ba5368b1c929b96da8b560ff77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E4=BA=91=E9=87=91YunjinXu?= <xuyunjin@foxmail.com>
Date: Wed, 14 Jun 2023 09:34:28 +0800
Subject: [PATCH] Move the force stop function from the All Trans page to the
 Detail page.

---
 .../GlobalTransactions/AllTransactions.vue    | 26 +++----------------
 .../DialogTransactionDetail.vue               | 23 +++++++++++++++-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue b/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue
index c5e0c87..9cbc212 100644
--- a/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue
+++ b/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue
@@ -66,23 +66,9 @@
                     </span>
                 </template>
                 <template v-else-if="column.key === 'action'">
-                    <span style="width: 190px; display: block;">
+                    <span style="width: 90px; display: block;">
                         <a class="mr-2 font-medium" @click="handleTransactionDetail(record.gid)">Dialog</a>
-                        <a class="mr-2 font-medium" target="_blank" :href="'./detail/'+record.gid">Page</a>
-                        <a-popconfirm
-                            title="Force stop it?"
-                            ok-text="Yes, stop it"
-                            ok-type="danger"
-                            cancel-text="No"
-                            @confirm="handleTransactionStop(record.gid)"                            
-                        >
-                            <a-button
-                                danger
-                                type="link"
-                                :disabled="record.status==='failed' || record.status==='succeed'"                                
-                            >ForceStop</a-button>
-                        </a-popconfirm>                        
-                        <!-- <a class="font-medium text-red-400"  @click="handleTransactionStop(record.gid)">ForceStop</a> -->
+                        <a class="mr-2 font-medium" target="_blank" :href="'./detail/'+record.gid">Page</a>                        
                     </span>
                 </template>
             </template>
@@ -96,7 +82,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { forceStopTransaction, IListAllTransactionsReq, listAllTransactions } from '/@/api/api_dtm'
+import { IListAllTransactionsReq, listAllTransactions } from '/@/api/api_dtm'
 import { computed, ref } from 'vue-demi'
 import { usePagination } from 'vue-request'
 import DialogTransactionDetail from './DialogTransactionDetail.vue'
@@ -231,12 +217,6 @@ const handleTransactionDetail = (gid: string) => {
     transactionDetail.value?.open(gid)
 }
 
-const handleTransactionStop = async(gid: string) => {
-    await forceStopTransaction(gid)
-    let position = data.value?.data.next_position || '';
-    innerSearch(position);  
-}
-
 </script>
 
 <style lang="postcss" scoped>
diff --git a/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue b/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue
index 1d19fd5..4816ced 100644
--- a/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue
+++ b/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue
@@ -5,7 +5,19 @@
                 <a-button type="primary" @click="close" v-if="closeable">Close</a-button>
             </template>            
             <h2>Transaction Info</h2> 
-            <a-button type="primary" @click="refresh" :loading="loading" >Refresh</a-button>      
+            <a-button type="primary" @click="refresh" :loading="loading" class="action-button">Refresh</a-button>      
+            <a-popconfirm
+                title="Force stop it?"
+                ok-text="Yes, stop it"
+                ok-type="danger"
+                cancel-text="No"
+                class="action-button"
+                :disabled="transaction?.status==='failed' || transaction?.status==='succeed'"     
+                @confirm="handleTransactionStop(<string>transaction?.gid)"                            
+            >
+                <a-button danger type="default" :disabled="transaction?.status==='failed' || transaction?.status==='succeed'"                                          
+                >ForceStop</a-button>
+            </a-popconfirm>                        
             <a-descriptions bordered size="small" :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }">
                 <a-descriptions-item label="Status">                          
                     <a-tag :color="transaction?.status === 'succeed' ? 'green' : 'volcano'">{{ transaction?.status }}</a-tag>
@@ -39,6 +51,7 @@ import { getTransaction } from '/@/api/api_dtm'
 import screenfull from '/@/components/Screenfull/index.vue'
 import { useRoute } from 'vue-router';
 import { string } from 'vue-types';
+import { forceStopTransaction} from '/@/api/api_dtm'
 // import VueJsonPretty from 'vue-json-pretty';
 // import 'vue-json-pretty/lib/styles.css'
 const route = useRoute();
@@ -103,6 +116,11 @@ const columns = [
     }
 ]
 
+const handleTransactionStop = async(gid: string) => {
+    await forceStopTransaction(gid);
+    refresh();
+}
+
 type Data = {
     branches: {
         gid: string
@@ -179,4 +197,7 @@ defineExpose({
   .ant-modal {
     height: 100%;
   }
+.action-button {
+    margin-right: 10px;
+}
 </style>