Skip to content

Commit 35340e9

Browse files
committed
add etcd and orm compitable
1 parent 001c3bb commit 35340e9

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const ormDataHandler = (data) => {
9090
9191
const keyValueDataHandler = (data) => {
9292
queryResult.value = []
93-
data.Pairs.forEach(e => {
93+
data.data.forEach(e => {
9494
const obj = {}
9595
obj['key'] = e.key
9696
obj['value'] = e.value
@@ -101,6 +101,12 @@ const keyValueDataHandler = (data) => {
101101
}
102102
103103
const executeQuery = async () => {
104+
switch (kind.value) {
105+
case 'atest-store-etcd':
106+
sqlQuery.value = '*'
107+
break;
108+
}
109+
104110
API.DataQuery(store.value, kind.value, currentDatabase.value, sqlQuery.value, (data) => {
105111
switch (kind.value) {
106112
case 'atest-store-orm':
@@ -129,7 +135,7 @@ const executeQuery = async () => {
129135
<template>
130136
<div>
131137
<el-container style="height: calc(100vh - 45px);">
132-
<el-aside>
138+
<el-aside v-if="kind === 'atest-store-orm'">
133139
<el-scrollbar>
134140
<el-select v-model="currentDatabase" placeholder="Select database" @change="queryTables" filterable>
135141
<el-option v-for="item in databases" :key="item" :label="item"

pkg/testing/remote/grpc_store.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,12 @@ func (g *gRPCLoader) Query(query map[string]string) (result testing.DataResult,
316316
for _, item := range dataResult.Items {
317317
result.Rows = append(result.Rows, pairToMap(item.Data))
318318
}
319-
result.Databases = dataResult.Meta.Databases
320-
result.Tables = dataResult.Meta.Tables
321-
result.CurrentDatabase = dataResult.Meta.CurrentDatabase
319+
320+
if dataResult.Meta != nil {
321+
result.Databases = dataResult.Meta.Databases
322+
result.Tables = dataResult.Meta.Tables
323+
result.CurrentDatabase = dataResult.Meta.CurrentDatabase
324+
}
322325
}
323326
return
324327
}

0 commit comments

Comments
 (0)