From 0bebf44a13cea4c2bf66c932f4eec71b491b5517 Mon Sep 17 00:00:00 2001
From: rick <LinuxSuRen@users.noreply.github.com>
Date: Tue, 13 May 2025 10:28:52 +0000
Subject: [PATCH 1/2] feat: using code editor instead of input for sql editing

---
 console/atest-ui/src/views/DataManager.vue | 8 ++++++--
 e2e/code-generator/Dockerfile              | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/console/atest-ui/src/views/DataManager.vue b/console/atest-ui/src/views/DataManager.vue
index 8e40d94e..f1af63b0 100644
--- a/console/atest-ui/src/views/DataManager.vue
+++ b/console/atest-ui/src/views/DataManager.vue
@@ -25,6 +25,7 @@ const columns = ref([] as string[])
 const queryTip = ref('')
 const loadingStores = ref(true)
 const showOverflowTooltip = ref(true)
+const complexEditor = ref(false)
 const dataFormat = ref('table')
 const dataFormatOptions = ['table', 'json']
 const queryDataMeta = ref({} as QueryDataMeta)
@@ -48,8 +49,10 @@ watch(store, (s) => {
         case 'atest-store-elasticsearch':
         case 'atest-store-etcd':
             sqlQuery.value = '*'
+            complexEditor.value = false
             break
         default:
+            complexEditor.value = true
             queryDataMeta.value.currentDatabase = ''
             sqlQuery.value = ''
     }
@@ -296,7 +299,7 @@ watch(largeContent, (e) => {
                                 </el-form-item>
                             </el-col>
                             <el-col :span="16">
-                                <el-form-item>
+                                <el-form-item v-if="!complexEditor">
                                     <HistoryInput :placeholder="queryTip" :callback="executeQuery" v-model="sqlQuery" />
                                 </el-form-item>
                             </el-col>
@@ -328,6 +331,7 @@ watch(largeContent, (e) => {
                             </el-col>
                         </el-row>
                     </el-form>
+                    <Codemirror v-model="sqlQuery" v-if="complexEditor" style="height: 180px"/>
                 </el-header>
                 <el-main>
                     <div style="display: flex; gap: 8px;">
@@ -336,7 +340,7 @@ watch(largeContent, (e) => {
                         <el-tag type="primary" v-for="label in queryDataMeta.labels">{{ label.value }}</el-tag>
                         <el-check-tag type="primary" :checked="showOverflowTooltip" @change="overflowChange" v-if="queryResult.length > 0">overflow</el-check-tag>
                     </div>
-                    <el-table :data="queryResult" stripe v-if="dataFormat === 'table'" height="calc(100vh - 200px)" @cell-dblclick="tryShowPrettyJSON">
+                    <el-table :data="queryResult" stripe v-if="dataFormat === 'table'" height="calc(100vh - 380px)" @cell-dblclick="tryShowPrettyJSON">
                         <el-table-column v-for="col in columns" :key="col" :prop="col" :label="col" sortable :show-overflow-tooltip="showOverflowTooltip" />
                     </el-table>
                     <Codemirror v-else-if="dataFormat === 'json'" v-model="queryResultAsJSON" />
diff --git a/e2e/code-generator/Dockerfile b/e2e/code-generator/Dockerfile
index c315dbd4..463d2897 100644
--- a/e2e/code-generator/Dockerfile
+++ b/e2e/code-generator/Dockerfile
@@ -1,7 +1,7 @@
 ARG LAN_ENV=docker.io/library/golang:1.21
 
 FROM ghcr.io/linuxsuren/api-testing:master AS atest
-FROM docker.io/stedolan/jq AS jq
+FROM docker.io/demisto/jq:1.0.0.117497 AS jq
 FROM $LAN_ENV
 
 WORKDIR /workspace

From 283a7219c425b55722e5b37805d0363e9fdd0320 Mon Sep 17 00:00:00 2001
From: rick <LinuxSuRen@users.noreply.github.com>
Date: Wed, 14 May 2025 00:43:04 +0000
Subject: [PATCH 2/2] update jq

---
 e2e/code-generator/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/e2e/code-generator/Dockerfile b/e2e/code-generator/Dockerfile
index 463d2897..7ec2ea37 100644
--- a/e2e/code-generator/Dockerfile
+++ b/e2e/code-generator/Dockerfile
@@ -1,12 +1,13 @@
 ARG LAN_ENV=docker.io/library/golang:1.21
 
 FROM ghcr.io/linuxsuren/api-testing:master AS atest
-FROM docker.io/demisto/jq:1.0.0.117497 AS jq
+FROM ghcr.io/linuxsuren/hd:v0.0.42 as downloader
+RUN hd install jq
 FROM $LAN_ENV
 
 WORKDIR /workspace
 COPY . .
-COPY --from=jq /usr/local/bin/jq /usr/local/bin/jq
+COPY --from=downloader /usr/local/bin/jq /usr/local/bin/jq
 COPY --from=atest /usr/local/bin/atest /usr/local/bin/atest
 
 CMD [ "/workspace/entrypoint.sh" ]