From 6d3526c765d4385765739a880365cf98e78e4fd9 Mon Sep 17 00:00:00 2001
From: Lykin <137850705+tiny-craft@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:15:34 +0800
Subject: [PATCH] feat: support database alias

---
 backend/services/browser_service.go           |  5 ++
 backend/types/connection.go                   |  2 +
 .../components/dialogs/ConnectionDialog.vue   | 85 +++++++++++++++++--
 .../src/components/new_value/AddZSetValue.vue |  5 --
 .../src/components/sidebar/BrowserPane.vue    | 24 ++++--
 frontend/src/langs/en-us.json                 |  5 ++
 frontend/src/langs/zh-cn.json                 |  5 ++
 frontend/src/objects/redisDatabaseItem.js     |  3 +-
 frontend/src/stores/browser.js                |  1 +
 frontend/src/stores/connections.js            |  1 +
 10 files changed, 114 insertions(+), 22 deletions(-)

diff --git a/backend/services/browser_service.go b/backend/services/browser_service.go
index 0edce5a..b5220f8 100644
--- a/backend/services/browser_service.go
+++ b/backend/services/browser_service.go
@@ -179,8 +179,13 @@ func (b *browserService) OpenConnection(name string) (resp types.JSResp) {
 			dbInfoStr := info["Keyspace"][dbName]
 			if len(dbInfoStr) > 0 {
 				dbInfo := b.parseDBItemInfo(dbInfoStr)
+				var alias string
+				if selConn.Alias != nil {
+					alias = selConn.Alias[idx]
+				}
 				return types.ConnectionDB{
 					Name:    dbName,
+					Alias:   alias,
 					Index:   idx,
 					MaxKeys: dbInfo["keys"],
 					Expires: dbInfo["expires"],
diff --git a/backend/types/connection.go b/backend/types/connection.go
index dbebb3a..dcdfb37 100644
--- a/backend/types/connection.go
+++ b/backend/types/connection.go
@@ -20,6 +20,7 @@ type ConnectionConfig struct {
 	LoadSize        int                `json:"loadSize,omitempty" yaml:"load_size,omitempty"`
 	MarkColor       string             `json:"markColor,omitempty" yaml:"mark_color,omitempty"`
 	RefreshInterval int                `json:"refreshInterval,omitempty" yaml:"refreshInterval,omitempty"`
+	Alias           map[int]string     `json:"alias,omitempty" yaml:"alias,omitempty"`
 	SSL             ConnectionSSL      `json:"ssl,omitempty" yaml:"ssl,omitempty"`
 	SSH             ConnectionSSH      `json:"ssh,omitempty" yaml:"ssh,omitempty"`
 	Sentinel        ConnectionSentinel `json:"sentinel,omitempty" yaml:"sentinel,omitempty"`
@@ -36,6 +37,7 @@ type Connections []Connection
 
 type ConnectionDB struct {
 	Name    string `json:"name"`
+	Alias   string `json:"alias,omitempty"`
 	Index   int    `json:"index"`
 	MaxKeys int    `json:"maxKeys"`
 	Expires int    `json:"expires,omitempty"`
diff --git a/frontend/src/components/dialogs/ConnectionDialog.vue b/frontend/src/components/dialogs/ConnectionDialog.vue
index 511f93e..a4aad56 100644
--- a/frontend/src/components/dialogs/ConnectionDialog.vue
+++ b/frontend/src/components/dialogs/ConnectionDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { every, get, includes, isEmpty, map, sortBy, toNumber } from 'lodash'
+import { every, get, includes, isEmpty, map, reject, sortBy, toNumber } from 'lodash'
 import { computed, nextTick, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { ListSentinelMasters, TestConnection } from 'wailsjs/go/services/connectionService.js'
@@ -10,6 +10,9 @@ import FileOpenInput from '@/components/common/FileOpenInput.vue'
 import { KeyViewType } from '@/consts/key_view_type.js'
 import { useThemeVars } from 'naive-ui'
 import useBrowserStore from 'stores/browser.js'
+import Delete from '@/components/icons/Delete.vue'
+import Add from '@/components/icons/Add.vue'
+import IconButton from '@/components/common/IconButton.vue'
 
 /**
  * Dialog for new or edit connection
@@ -72,6 +75,24 @@ const onUpdateDBFilterType = (t) => {
     }
 }
 
+const aliasPair = ref([
+    /*{ db: 0, alias: '' }*/
+])
+const onCreateAlias = () => {
+    return {
+        db: 0,
+        alias: '',
+    }
+}
+const onUpdateAlias = () => {
+    const val = reject(aliasPair.value, (v) => v == null || isEmpty(v.alias))
+    const result = {}
+    for (const elem of val) {
+        result[elem.db] = elem.alias
+    }
+    generalForm.value.alias = result
+}
+
 watch(
     () => dbFilterList.value,
     (list) => {
@@ -210,6 +231,13 @@ watch(
             generalForm.value = dialogStore.connParam || connectionStore.newDefaultConnection()
             dbFilterList.value = map(generalForm.value.dbFilterList, (item) => item + '')
             generalForm.value.ssh.loginType = generalForm.value.ssh.loginType || 'pwd'
+            // update alias display
+            const alias = get(generalForm.value, 'alias', {})
+            const pairs = []
+            for (const db in alias) {
+                pairs.push({ db: parseInt(db), alias: alias[db] })
+            }
+            aliasPair.value = pairs
         }
     },
 )
@@ -254,9 +282,15 @@ const onClose = () => {
         style="width: 600px"
         transform-origin="center">
         <n-spin :show="closingConnection">
-            <n-tabs v-model:value="tab" animated type="line">
+            <n-tabs
+                v-model:value="tab"
+                animated
+                pane-style="min-height: 50vh;"
+                placement="left"
+                tab-style="justify-content: right;"
+                type="line">
                 <!-- General pane -->
-                <n-tab-pane :tab="$t('dialogue.connection.general')" display-directive="show" name="general">
+                <n-tab-pane :tab="$t('dialogue.connection.general')" display-directive="show:lazy" name="general">
                     <n-form
                         ref="generalFormRef"
                         :model="generalForm"
@@ -434,8 +468,42 @@ const onClose = () => {
                     </n-form>
                 </n-tab-pane>
 
+                <n-tab-pane :tab="$t('dialogue.connection.alias.title')" display-directive="show:lazy" name="alias">
+                    <n-form
+                        :model="generalForm.alias"
+                        :show-label="false"
+                        :show-require-mark="false"
+                        label-placement="top">
+                        <n-form-item required>
+                            <n-dynamic-input
+                                v-model:value="aliasPair"
+                                @create="onCreateAlias"
+                                @update:value="onUpdateAlias">
+                                <template #default="{ value }">
+                                    <n-input-number
+                                        v-model:value="value.db"
+                                        :min="0"
+                                        :placeholder="$t('dialogue.connection.alias.db')"
+                                        :show-button="false"
+                                        @update:value="onUpdateAlias" />
+                                    <n-text>:</n-text>
+                                    <n-input
+                                        v-model:value="value.alias"
+                                        :placeholder="$t('dialogue.connection.alias.value')"
+                                        type="text"
+                                        @update:value="onUpdateAlias" />
+                                </template>
+                                <template #action="{ index, create, remove, move }">
+                                    <icon-button :icon="Delete" size="18" @click="() => remove(index)" />
+                                    <icon-button :icon="Add" size="18" @click="() => create(index)" />
+                                </template>
+                            </n-dynamic-input>
+                        </n-form-item>
+                    </n-form>
+                </n-tab-pane>
+
                 <!-- SSL pane -->
-                <n-tab-pane :tab="$t('dialogue.connection.ssl.title')" display-directive="show" name="ssl">
+                <n-tab-pane :tab="$t('dialogue.connection.ssl.title')" display-directive="show:lazy" name="ssl">
                     <n-form-item label-placement="left">
                         <n-checkbox v-model:checked="generalForm.ssl.enable" size="medium">
                             {{ $t('dialogue.connection.ssl.enable') }}
@@ -478,7 +546,7 @@ const onClose = () => {
                 </n-tab-pane>
 
                 <!-- SSH pane -->
-                <n-tab-pane :tab="$t('dialogue.connection.ssh.title')" display-directive="show" name="ssh">
+                <n-tab-pane :tab="$t('dialogue.connection.ssh.title')" display-directive="show:lazy" name="ssh">
                     <n-form-item label-placement="left">
                         <n-checkbox v-model:checked="generalForm.ssh.enable" size="medium">
                             {{ $t('dialogue.connection.ssh.enable') }}
@@ -538,7 +606,10 @@ const onClose = () => {
                 </n-tab-pane>
 
                 <!-- Sentinel pane -->
-                <n-tab-pane :tab="$t('dialogue.connection.sentinel.title')" display-directive="show" name="sentinel">
+                <n-tab-pane
+                    :tab="$t('dialogue.connection.sentinel.title')"
+                    display-directive="show:lazy"
+                    name="sentinel">
                     <n-form-item label-placement="left">
                         <n-checkbox v-model:checked="generalForm.sentinel.enable" size="medium">
                             {{ $t('dialogue.connection.sentinel.enable') }}
@@ -580,7 +651,7 @@ const onClose = () => {
                 </n-tab-pane>
 
                 <!-- Cluster pane -->
-                <n-tab-pane :tab="$t('dialogue.connection.cluster.title')" display-directive="show" name="cluster">
+                <n-tab-pane :tab="$t('dialogue.connection.cluster.title')" display-directive="show:lazy" name="cluster">
                     <n-form-item label-placement="left">
                         <n-checkbox v-model:checked="generalForm.cluster.enable" size="medium">
                             {{ $t('dialogue.connection.cluster.enable') }}
diff --git a/frontend/src/components/new_value/AddZSetValue.vue b/frontend/src/components/new_value/AddZSetValue.vue
index 7727c45..29e36ec 100644
--- a/frontend/src/components/new_value/AddZSetValue.vue
+++ b/frontend/src/components/new_value/AddZSetValue.vue
@@ -25,11 +25,6 @@ const updateOption = [
     },
 ]
 
-/**
- * @typedef ZSetItem
- * @property {string} value
- * @property {string} score
- */
 const zset = ref([{ value: '', score: 0 }])
 const onCreate = () => {
     return {
diff --git a/frontend/src/components/sidebar/BrowserPane.vue b/frontend/src/components/sidebar/BrowserPane.vue
index a75215d..a4f85d2 100644
--- a/frontend/src/components/sidebar/BrowserPane.vue
+++ b/frontend/src/components/sidebar/BrowserPane.vue
@@ -4,7 +4,7 @@ import BrowserTree from './BrowserTree.vue'
 import IconButton from '@/components/common/IconButton.vue'
 import useTabStore from 'stores/tab.js'
 import { computed, nextTick, onMounted, reactive, ref, unref, watch } from 'vue'
-import { find, get, map, size } from 'lodash'
+import { find, get, isEmpty, map, size } from 'lodash'
 import Refresh from '@/components/icons/Refresh.vue'
 import useDialogStore from 'stores/dialog.js'
 import { useI18n } from 'vue-i18n'
@@ -50,16 +50,22 @@ const inCheckState = ref(false)
 
 const dbSelectOptions = computed(() => {
     const dblist = browserStore.getDBList(props.server)
-    return map(dblist, (db) => {
-        if (props.db === db.db) {
-            return {
-                value: db.db,
-                label: `db${db.db} (${db.keyCount}/${db.maxKeys})`,
-            }
+    return map(dblist, ({ db, alias, keyCount, maxKeys }) => {
+        let label
+        if (!isEmpty(alias)) {
+            // has alias
+            label = `${alias}[${db}]`
+        } else {
+            label = `db${db}`
+        }
+        if (props.db === db) {
+            label += ` (${keyCount}/${maxKeys})`
+        } else {
+            label += ` (${maxKeys})`
         }
         return {
-            value: db.db,
-            label: `db${db.db} (${db.maxKeys})`,
+            value: db,
+            label: label,
         }
     })
 })
diff --git a/frontend/src/langs/en-us.json b/frontend/src/langs/en-us.json
index 5e1a443..0af82c2 100644
--- a/frontend/src/langs/en-us.json
+++ b/frontend/src/langs/en-us.json
@@ -201,6 +201,11 @@
         "load_size": "Size of Keys Per Load",
         "mark_color": "Mark Color"
       },
+      "alias": {
+        "title": "Database Alias",
+        "db": "Input Database Index",
+        "value": "Input Database Alias"
+      },
       "ssl": {
         "title": "SSL/TLS",
         "enable": "Enable SSL/TLS",
diff --git a/frontend/src/langs/zh-cn.json b/frontend/src/langs/zh-cn.json
index 0d990b1..fd00283 100644
--- a/frontend/src/langs/zh-cn.json
+++ b/frontend/src/langs/zh-cn.json
@@ -201,6 +201,11 @@
         "load_size": "单次加载键数量",
         "mark_color": "标记颜色"
       },
+      "alias": {
+        "title": "数据库别名",
+        "db": "输入数据库索引",
+        "value": "输入别名"
+      },
       "ssl": {
         "title": "SSL/TLS",
         "enable": "启用SSL",
diff --git a/frontend/src/objects/redisDatabaseItem.js b/frontend/src/objects/redisDatabaseItem.js
index df7c56f..10743ee 100644
--- a/frontend/src/objects/redisDatabaseItem.js
+++ b/frontend/src/objects/redisDatabaseItem.js
@@ -2,8 +2,9 @@
  * redis database item
  */
 export class RedisDatabaseItem {
-    constructor({ db = 0, keyCount = 0, maxKeys = 0 }) {
+    constructor({ db = 0, alias = '', keyCount = 0, maxKeys = 0 }) {
         this.db = db
+        this.alias = alias
         this.keyCount = keyCount
         this.maxKeys = maxKeys
     }
diff --git a/frontend/src/stores/browser.js b/frontend/src/stores/browser.js
index 00ff360..d18a1c3 100644
--- a/frontend/src/stores/browser.js
+++ b/frontend/src/stores/browser.js
@@ -252,6 +252,7 @@ const useBrowserStore = defineStore('browser', {
             for (const dbItem of db) {
                 databases[dbItem.index] = new RedisDatabaseItem({
                     db: dbItem.index,
+                    alias: dbItem.alias,
                     maxKeys: dbItem.maxKeys,
                 })
                 if (dbItem.index === lastDB) {
diff --git a/frontend/src/stores/connections.js b/frontend/src/stores/connections.js
index 2cd9540..0e36bb2 100644
--- a/frontend/src/stores/connections.js
+++ b/frontend/src/stores/connections.js
@@ -164,6 +164,7 @@ const useConnectionStore = defineStore('connections', {
                 keyView: KeyViewType.Tree,
                 loadSize: 10000,
                 markColor: '',
+                alias: {},
                 ssl: {
                     enable: false,
                     allowInsecure: true,