Merge pull request #648 from LinuxSuRen/feat/data-query-labels

feat: add more data as lables for the data query

Author: LinuxSuRen

console/atest-ui/src/views/DataManager.vue

@@ -29,7 +29,7 @@ watch(store, (s) => {
             return
         }
     })
-    queryDataMeta.currentDatabase = ''
+    queryDataMeta.value.currentDatabase = ''
     sqlQuery.value = ''
     executeQuery()
 })
@@ -38,7 +38,8 @@ interface QueryDataMeta {
     databases: string[]
     tables: string[]
     currentDatabase: string
-    duration: string    
+    duration: string
+    labels: Pair[]
 }
 
 interface QueryData {
@@ -49,7 +50,7 @@ interface QueryData {
 }
 
 const queryDataFromTable = (data: QueryData) => {
-    sqlQuery.value = `select * from ${data.label} limit 100`
+    sqlQuery.value = `@selectTableLImit100_${data.label}`
     executeQuery()
 }
 const queryTables = () => {
@@ -83,7 +84,7 @@ API.GetStores((data) => {
 
 const ormDataHandler = (data: QueryData) => {
     const result = [] as any[]
-    const cols = new Set()
+    const cols = new Set<string>()
 
     data.items.forEach(e => {
         const obj = {}
@@ -94,6 +95,14 @@ const ormDataHandler = (data: QueryData) => {
         result.push(obj)
     })
 
+    data.meta.labels = data.meta.labels.filter((item) => {
+        if (item.key === '_native_sql') {
+            sqlQuery.value = item.value
+            return false
+        }
+        return !item.key.startsWith('_')
+    })
+
     queryDataMeta.value = data.meta
     queryResult.value = result
     queryResultAsJSON.value = JSON.stringify(result, null, 2)
@@ -208,6 +217,7 @@ const executeQuery = async () => {
               <div style="display: flex; gap: 8px;">
                 <el-tag type="primary" v-if="queryResult.length > 0">{{ queryResult.length }} rows</el-tag>
                 <el-tag type="primary" v-if="queryDataMeta.duration">{{  queryDataMeta.duration }}</el-tag>
+                <el-tag type="primary" v-for="label in queryDataMeta.labels">{{  label.value }}</el-tag>
               </div>
               <el-table :data="queryResult" stripe v-if="dataFormat === 'table'">
                   <el-table-column v-for="col in columns" :key="col" :prop="col" :label="col" sortable/>

pkg/server/remote_server.go

@@ -1262,6 +1262,7 @@ func (s *server) Query(ctx context.Context, query *DataQuery) (result *DataQuery
 			Databases:       dataResult.Databases,
 			Tables:          dataResult.Tables,
 			Duration:        dataResult.Duration,
+			Labels:          mapToPair(dataResult.Labels),
 		}
 	}
 	return

pkg/server/server.pb.go

@@ -671,4 +671,5 @@ message DataMeta {
     repeated string tables = 2;
     string currentDatabase = 3;
     string duration = 4;
+    repeated Pair labels = 5;
 }

pkg/server/server.proto

@@ -2839,6 +2839,13 @@
         },
         "duration": {
           "type": "string"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/serverPair"
+          }
         }
       }
     },

pkg/server/server.swagger.json

@@ -37,6 +37,7 @@ type DataResult struct {
 	Tables          []string
 	CurrentDatabase string
 	Duration        string
+	Labels          map[string]string
 }
 
 type Writer interface {

pkg/testing/loader.go

@@ -322,6 +322,7 @@ func (g *gRPCLoader) Query(query map[string]string) (result testing.DataResult,
 			result.Tables = dataResult.Meta.Tables
 			result.CurrentDatabase = dataResult.Meta.CurrentDatabase
 			result.Duration = dataResult.Meta.Duration
+			result.Labels = pairToMap(dataResult.Meta.Labels)
 		}
 	}
 	return