Skip to content

Commit dedcfbd

Browse files
committed
sort the stores by name
1 parent 26ea058 commit dedcfbd

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

console/atest-ui/src/components/EditButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const handleInputConfirm = () => {
4040
@keyup.enter="handleInputConfirm"
4141
@blur="handleInputConfirm"
4242
/>
43-
<el-button v-else class="button-new-tag" size="small edit-button" @click="showInput">
43+
<el-button v-else class="button-new-tag edit-button" size="small" @click="showInput">
4444
{{ value }}
4545
</el-button>
4646
</span>

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,12 @@ watch(sqlQuery, (sql: string) => {
156156
})
157157
158158
API.GetStores((data) => {
159+
data.data.forEach((e: Store) => {
160+
if (e.name === 'local') {
161+
data.data.splice(data.data.indexOf(e), 1)
162+
return
163+
}
164+
})
159165
stores.value = data.data
160166
161167
sqlQuery.value = GetDataManagerPreference().query
@@ -370,7 +376,7 @@ Magic.LoadMagicKeys(import.meta.url, new Map([
370376
<el-splitter layout="vertical">
371377
<el-splitter-panel size="30%">
372378
<el-form @submit.prevent="executeQuery">
373-
<el-row :gutter="10" justify="center" style="margin-left: 0!important; margin-right: 0!important;">
379+
<el-row :gutter=10 justify="center" style="margin-left: 0!important; margin-right: 0!important;">
374380
<el-col :span="4">
375381
<el-form-item>
376382
<el-select v-model="store" placeholder="Select store" filterable
@@ -398,7 +404,7 @@ Magic.LoadMagicKeys(import.meta.url, new Map([
398404
</el-select>
399405
</el-col>
400406
</el-row>
401-
<el-row :gutter="10" v-if="kind === 'atest-store-elasticsearch' || kind === 'atest-store-redis'">
407+
<el-row :gutter=10 v-if="kind === 'atest-store-elasticsearch' || kind === 'atest-store-redis'">
402408
<el-col :span="10">
403409
<el-input type="number" v-model="query.offset">
404410
<template #prepend>Offset</template>
@@ -422,7 +428,7 @@ Magic.LoadMagicKeys(import.meta.url, new Map([
422428
:extensions="[sql(sqlConfig)]"
423429
/>
424430
</el-splitter-panel>
425-
<el-splitter-panel>
431+
<el-splitter-panel v-if="store !== ''">
426432
<div style="display: flex; gap: 8px;">
427433
<el-tag type="primary" v-if="queryResult.length > 0">{{ queryResult.length }} rows</el-tag>
428434
<el-tag type="primary" v-if="queryDataMeta.duration">{{ queryDataMeta.duration }}</el-tag>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ Magic.LoadMagicKeys(import.meta.url), {
963963
<EditButton :value="props.name" @changed="renameTestCase"/>
964964
</div>
965965
<div>
966-
<el-row justify="space-between" gutter="10">
966+
<el-row justify="space-between" gutter=10>
967967
<el-col :span="3">
968968
<el-select
969969
v-if="props.kindName !== 'tRPC' && props.kindName !== 'gRPC'"
@@ -1282,7 +1282,7 @@ Magic.LoadMagicKeys(import.meta.url), {
12821282
:rules="rules"
12831283
>
12841284
<el-form-item :label="t('title.history')" prop="selectedID">
1285-
<el-row :gutter="20">
1285+
<el-row :gutter=20>
12861286
<el-col :span="20">
12871287
<el-select class="m-2"
12881288
filterable

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ API.SBOM((d) => {
4646
<el-divider border-style="dashed" />
4747

4848
<div class="dependency-section">
49-
<el-row :gutter="20">
49+
<el-row :gutter=20>
5050
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
5151
<el-card class="dependency-card">
5252
<template #header>
@@ -242,4 +242,4 @@ export default {
242242
}
243243
}
244244
}
245-
</script>
245+
</script>

pkg/server/remote_server.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"path/filepath"
2929
reflect "reflect"
3030
"regexp"
31+
"slices"
3132
"strconv"
3233
"strings"
3334
"sync"
@@ -1195,6 +1196,9 @@ func (s *server) GetStores(ctx context.Context, in *Empty) (reply *Stores, err e
11951196
}()
11961197
}
11971198
wg.Wait()
1199+
slices.SortFunc(reply.Data, func(a, b *Store) int {
1200+
return strings.Compare(a.Name, b.Name)
1201+
})
11981202
reply.Data = append(reply.Data, &Store{
11991203
Name: "local",
12001204
Kind: &StoreKind{},

0 commit comments

Comments
 (0)