From 6138cfc2daaeabb51467466e7e4ad054be89d674 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 10 Mar 2022 17:54:57 +0100
Subject: [PATCH] redis add item prepare

---
 .../web/src/dbkeyvalue/DbKeyItemDetail.svelte | 32 +++++++++++
 .../web/src/modals/DbKeyAddItemModal.svelte   | 36 ++++++++++++
 packages/web/src/tabs/DbKeyDetailTab.svelte   | 57 +++++++++++--------
 .../dbgate-plugin-redis/src/backend/driver.js |  6 +-
 4 files changed, 106 insertions(+), 25 deletions(-)
 create mode 100644 packages/web/src/dbkeyvalue/DbKeyItemDetail.svelte
 create mode 100644 packages/web/src/modals/DbKeyAddItemModal.svelte

diff --git a/packages/web/src/dbkeyvalue/DbKeyItemDetail.svelte b/packages/web/src/dbkeyvalue/DbKeyItemDetail.svelte
new file mode 100644
index 00000000..8e927d97
--- /dev/null
+++ b/packages/web/src/dbkeyvalue/DbKeyItemDetail.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+  import AceEditor from '../query/AceEditor.svelte';
+
+  export let keyInfo;
+  export let item;
+</script>
+
+<div class="props">
+  {#each keyInfo.tableColumns as column}
+    <div class="colname">{column.name}</div>
+    <div class="colvalue">
+      <AceEditor readOnly value={item && item[column.name]} />
+    </div>
+  {/each}
+</div>
+
+<style>
+  .props {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .colname {
+    margin: 10px;
+  }
+
+  .colvalue {
+    position: relative;
+    flex: 1;
+  }
+</style>
diff --git a/packages/web/src/modals/DbKeyAddItemModal.svelte b/packages/web/src/modals/DbKeyAddItemModal.svelte
new file mode 100644
index 00000000..2bdab700
--- /dev/null
+++ b/packages/web/src/modals/DbKeyAddItemModal.svelte
@@ -0,0 +1,36 @@
+<script lang="ts">
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
+import DbKeyItemDetail from '../dbkeyvalue/DbKeyItemDetail.svelte';
+
+  import FormProvider from '../forms/FormProvider.svelte';
+  import FormSubmit from '../forms/FormSubmit.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import ModalBase from './ModalBase.svelte';
+  import { closeCurrentModal } from './modalTools';
+
+  export let keyInfo;
+  export let value;
+  export let label;
+  export let onConfirm;
+
+  const handleSubmit = async values => {
+    const { value } = values;
+    closeCurrentModal();
+    onConfirm(value);
+  };
+</script>
+
+<FormProvider initialValues={{ value }}>
+  <ModalBase {...$$restProps}>
+    <svelte:fragment slot="header">
+      Add item
+    </svelte:fragment>
+
+    <DbKeyItemDetail {keyInfo} />
+
+    <svelte:fragment slot="footer">
+      <FormSubmit value="OK" on:click={e => handleSubmit(e.detail)} />
+      <FormStyledButton type="button" value="Cancel" on:click={closeCurrentModal} />
+    </svelte:fragment>
+  </ModalBase>
+</FormProvider>
diff --git a/packages/web/src/tabs/DbKeyDetailTab.svelte b/packages/web/src/tabs/DbKeyDetailTab.svelte
index d112beab..31dda687 100644
--- a/packages/web/src/tabs/DbKeyDetailTab.svelte
+++ b/packages/web/src/tabs/DbKeyDetailTab.svelte
@@ -22,6 +22,8 @@
   import { showModal } from '../modals/modalTools';
   import InputTextModal from '../modals/InputTextModal.svelte';
   import _ from 'lodash';
+  import DbKeyItemDetail from '../dbkeyvalue/DbKeyItemDetail.svelte';
+  import DbKeyAddItemModal from '../modals/DbKeyAddItemModal.svelte';
 
   export let conid;
   export let database;
@@ -34,6 +36,7 @@
 
   $: key = $activeDbKeysStore[`${conid}:${database}`];
   let refreshToken = 0;
+  let editedValue = null;
 
   function handleChangeTtl(keyInfo) {
     showModal(InputTextModal, {
@@ -65,8 +68,23 @@
   }
 
   function refresh() {
+    editedValue = null;
     refreshToken += 1;
   }
+
+  async function saveString() {
+    await apiCall('database-connections/call-method', {
+      conid,
+      database,
+      method: 'set',
+      args: [key, editedValue],
+    });
+    refresh();
+  }
+
+  async function addItem(keyInfo) {
+    showModal(DbKeyAddItemModal, { keyInfo });
+  }
 </script>
 
 {#await apiCall('database-connections/load-key-info', { conid, database, key, refreshToken })}
@@ -82,6 +100,12 @@
         <TextField value={key} readOnly />
       </div>
       <FormStyledButton value={`TTL:${keyInfo.ttl}`} on:click={() => handleChangeTtl(keyInfo)} />
+      {#if keyInfo.type == 'string'}
+        <FormStyledButton value="Save" on:click={saveString} disabled={!editedValue} />
+      {/if}
+      {#if keyInfo.addMethod}
+        <FormStyledButton value="Add item" on:click={() => addItem(keyInfo)} />
+      {/if}
       <FormStyledButton value="Refresh" on:click={refresh} />
     </div>
 
@@ -98,17 +122,17 @@
               }}
             />
           </svelte:fragment>
-          <div slot="2" class="props">
-            {#each keyInfo.tableColumns as column}
-              <div class="colname">{column.name}</div>
-              <div class="colvalue">
-                <AceEditor readOnly value={currentRow && currentRow[column.name]} />
-              </div>
-            {/each}
-          </div>
+          <svelte:fragment slot="2">
+            <DbKeyItemDetail {keyInfo} item={currentRow} />
+          </svelte:fragment>
         </VerticalSplitter>
       {:else}
-        <AceEditor readOnly value={keyInfo.value} />
+        <AceEditor
+          value={editedValue || keyInfo.value}
+          on:input={e => {
+            editedValue = e.detail;
+          }}
+        />
       {/if}
     </div>
   </div>
@@ -137,21 +161,6 @@
     align-self: center;
   }
 
-  .props {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .colname {
-    margin: 10px;
-  }
-
-  .colvalue {
-    position: relative;
-    flex: 1;
-  }
-
   .key-name {
     flex-grow: 1;
     display: flex;
diff --git a/plugins/dbgate-plugin-redis/src/backend/driver.js b/plugins/dbgate-plugin-redis/src/backend/driver.js
index 399f5101..aa7b6829 100644
--- a/plugins/dbgate-plugin-redis/src/backend/driver.js
+++ b/plugins/dbgate-plugin-redis/src/backend/driver.js
@@ -163,18 +163,22 @@ const driver = {
         break;
       case 'list':
         res.tableColumns = [{ name: 'value' }];
+        res.addMethod = 'rpush';
         break;
       case 'set':
         res.tableColumns = [{ name: 'value' }];
         res.keyColumn = 'value';
+        res.addMethod = 'sadd';
         break;
       case 'zset':
-        res.tableColumns = [{ name: 'value' }, { name: 'score' }];
+        res.tableColumns = [{ name: 'score' }, { name: 'value' }];
         res.keyColumn = 'value';
+        res.addMethod = 'zadd';
         break;
       case 'hash':
         res.tableColumns = [{ name: 'key' }, { name: 'value' }];
         res.keyColumn = 'key';
+        res.addMethod = 'hset';
         break;
     }