From 4c3892b14e34c08ac26c61f7fecdb60f0fbf0043 Mon Sep 17 00:00:00 2001
From: weitong <weitong@cisco.com>
Date: Fri, 10 Nov 2023 15:09:49 +0800
Subject: [PATCH] sql UI change

---
 .../web-ui/src/locales/en_US/index.ts         |  8 +++---
 .../web-ui/src/locales/zh_CN/index.ts         |  8 +++---
 .../src/views/editor/components/Editor.vue    | 25 ++++++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/kyuubi-server/web-ui/src/locales/en_US/index.ts b/kyuubi-server/web-ui/src/locales/en_US/index.ts
index 326433f9fb2..6fadca7abe8 100644
--- a/kyuubi-server/web-ui/src/locales/en_US/index.ts
+++ b/kyuubi-server/web-ui/src/locales/en_US/index.ts
@@ -56,9 +56,9 @@ export default {
     close_failed: 'Close {name} Failed',
     cancel_succeeded: 'Cancel {name} Succeeded',
     cancel_failed: 'Cancel {name} Failed',
-    run_failed: 'Run Sql Failed',
-    get_sql_log_failed: 'Get Sql Log Failed',
-    get_sql_result_failed: 'Get Sql Result Failed',
-    get_sql_metadata_failed: 'Get Sql Metadata Failed'
+    run_sql_failed: 'Run SQL Failed',
+    get_sql_log_failed: 'Get SQL Log Failed',
+    get_sql_result_failed: 'Get SQL Result Failed',
+    get_sql_metadata_failed: 'Get SQL Metadata Failed'
   }
 }
diff --git a/kyuubi-server/web-ui/src/locales/zh_CN/index.ts b/kyuubi-server/web-ui/src/locales/zh_CN/index.ts
index 76eca134978..093cd37f9a8 100644
--- a/kyuubi-server/web-ui/src/locales/zh_CN/index.ts
+++ b/kyuubi-server/web-ui/src/locales/zh_CN/index.ts
@@ -56,9 +56,9 @@ export default {
     close_failed: '关闭 {name} 失败',
     cancel_succeeded: '取消 {name} 成功',
     cancel_failed: '取消 {name} 失败',
-    run_failed: '运行失败',
-    get_sql_log_failed: '获取sql日志失败',
-    get_sql_result_failed: '获取sql结果失败',
-    get_sql_metadata_failed: '获取sql元数据失败'
+    run_sql_failed: '运行SQL失败',
+    get_sql_log_failed: '获取SQL日志失败',
+    get_sql_result_failed: '获取SQL结果失败',
+    get_sql_metadata_failed: '获取SQL元数据失败'
   }
 }
diff --git a/kyuubi-server/web-ui/src/views/editor/components/Editor.vue b/kyuubi-server/web-ui/src/views/editor/components/Editor.vue
index 5f60f80be22..6ed89048384 100644
--- a/kyuubi-server/web-ui/src/views/editor/components/Editor.vue
+++ b/kyuubi-server/web-ui/src/views/editor/components/Editor.vue
@@ -19,20 +19,10 @@
 <template>
   <div class="editor">
     <el-space>
-      <el-select
-        v-model="param.engineType"
-        disabled
-        :placeholder="$t('engine_type')">
-        <el-option
-          v-for="item in getEngineType()"
-          :key="item"
-          :label="item"
-          :value="item" />
-      </el-select>
       <el-button
         :disabled="!param.engineType || !editorVariables.content"
         :loading="resultLoading"
-        type="primary"
+        type="success"
         icon="VideoPlay"
         @click="handleQuerySql">
         {{ $t('operation.run') }}
@@ -52,6 +42,16 @@
           </el-dropdown-menu>
         </template>
       </el-dropdown>
+      <el-select
+        v-model="param.engineType"
+        disabled
+        :placeholder="$t('engine_type')">
+        <el-option
+          v-for="item in getEngineType()"
+          :key="item"
+          :label="item"
+          :value="item" />
+      </el-select>
     </el-space>
     <section>
       <MonacoEditor
@@ -196,7 +196,7 @@
       })
   }
 
-  const postError = (err: any, title = t('message.run_failed')) => {
+  const postError = (err: any, title = t('message.run_sql_failed')) => {
     errorMessages.value.push({
       title,
       description: err?.response?.data?.message || err?.message || ''
@@ -266,6 +266,7 @@
       }
       .el-dropdown {
         margin-left: 4px;
+        margin-right: 8px;
       }
     }