#RIVS-231 - Rename application

Author: egor-zalenski

src/webviews/src/modules/key-details/KeyDetails.tsx

@@ -5,11 +5,11 @@ import { useShallow } from 'zustand/react/shallow'
 import { KeyTypes, SelectedKeyActionType, StorageItem, VscodeMessageAction } from 'uiSrc/constants'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/utils'
 import { RedisString } from 'uiSrc/interfaces'
-import { useSelectedKeyStore } from 'uiSrc/store'
+import { useDatabasesStore, useSelectedKeyStore } from 'uiSrc/store'
 import { sessionStorageService, vscodeApi } from 'uiSrc/services'
 import { DynamicTypeDetails } from './components/dynamic-type-details'
 
-import { useKeysApi, useKeysInContext } from '../keys-tree/hooks/useKeys'
+import { useKeysApi } from '../keys-tree/hooks/useKeys'
 import styles from './styles.module.scss'
 
 export interface Props {}
@@ -21,7 +21,8 @@ const KeyDetails = () => {
     loading: state.loading,
   })))
 
-  const databaseId = useKeysInContext((state) => state.databaseId)
+  const database = useDatabasesStore((state) => state.connectedDatabase)
+  const databaseId = database?.id
 
   const keysApi = useKeysApi()
 
@@ -54,14 +55,14 @@ const KeyDetails = () => {
   const onRemoveKey = () => {
     vscodeApi.postMessage({
       action: VscodeMessageAction.CloseKeyAndRefresh,
-      data: { key: keyName, type: SelectedKeyActionType.Removed, databaseId: databaseId! },
+      data: { key: keyName, type: SelectedKeyActionType.Removed, database: database! },
     })
   }
 
   const onEditKey = (key: RedisString, newKey: RedisString) => {
     vscodeApi.postMessage({
       action: VscodeMessageAction.EditKeyName,
-      data: { key, newKey, type: SelectedKeyActionType.Renamed, databaseId: databaseId! },
+      data: { key, newKey, type: SelectedKeyActionType.Renamed, database: database! },
     })
   }
 

src/webviews/src/modules/keys-tree/components/database-wrapper/DatabaseWrapper.tsx

@@ -43,7 +43,8 @@ export const DatabaseWrapper = ({ children, database }: Props) => {
   const keysApi = useKeysApi()
 
   useEffect(() => {
-    const { type, key, keyType, databaseId, newKey } = selectedKeyAction || {}
+    const { type, key, keyType, database: databaseAction, newKey } = selectedKeyAction || {}
+    const { id: databaseId } = databaseAction || {}
 
     if (!type || databaseId !== database.id) {
       return

src/webviews/src/store/hooks/use-selected-key-store/interface.ts

@@ -1,5 +1,6 @@
 import { KeyTypes, KeyValueCompressor, SelectedKeyActionType } from 'uiSrc/constants'
 import { KeyInfo, Nullable, RedisString } from 'uiSrc/interfaces'
+import { Database } from '../use-databases-store/interface'
 
 export interface SelectedKeyStore {
   loading: boolean
@@ -13,7 +14,7 @@ export interface SelectedKeyStore {
 }
 
 interface SelectedKeyAction {
-  databaseId: string
+  database: Database
   key?: RedisString
   newKey?: RedisString
   type: SelectedKeyActionType