#RIVS-287 - Decompressor not applied to opened connection

Author: egor-zalenski

.vscode/settings.json

@@ -41,7 +41,8 @@
     "**/yarn.lock": true,
     "*.{css,sass,scss}.d.ts": true,
     "pnpm-lock.yaml": true,
-    "**/pnpm-lock.yaml": true
+    "**/pnpm-lock.yaml": true,
+    "**/test-extensions": true
   },
   "cSpell.words": ["githubocto", "tailwindcss", "webviews", "zustand"],
   "testing.automaticallyOpenPeekView": "never",

src/Webview.ts

@@ -11,6 +11,7 @@ type WebviewOptions = {
   styleUri?: vscode.Uri
   nonce?: string
   message?: {
+    action?: string
     data: object
   }
   column?: vscode.ViewColumn
@@ -113,6 +114,7 @@ abstract class Webview {
 
   public abstract update(opts?: WebviewOptions): void
   public abstract setTitle(title: string): void
+  public abstract postMessage(message: any): void
 }
 
 export class WebviewPanel extends Webview implements vscode.Disposable {
@@ -211,6 +213,10 @@ export class WebviewPanel extends Webview implements vscode.Disposable {
     this.panel.title = title
   }
 
+  public postMessage(message: any) {
+    this.panel.webview.postMessage(message)
+  }
+
   public dispose() {
     // Disposes of this instance
     // Next time getInstance() is called, it will construct a new instance

src/extension.ts

@@ -165,6 +165,11 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand('RedisForVSCode.editDatabaseClose', (args) => {
       WebviewPanel.getInstance({ viewId: ViewId.EditDatabase }).dispose()
       sidebarProvider.view?.webview.postMessage({ action: 'RefreshTree', data: args })
+
+      const keyDetailsWebview = WebviewPanel.instances[ViewId.Key]
+      if (keyDetailsWebview) {
+        keyDetailsWebview.postMessage({ action: 'RefreshKey', data: args })
+      }
     }),
 
     vscode.commands.registerCommand('RedisForVSCode.closeAddKeyAndRefresh', (args) => {

src/utils.ts

@@ -56,7 +56,7 @@ export const handleMessage = async (message: any = {}) => {
       vscode.commands.executeCommand('RedisForVSCode.addDatabaseClose')
       break
     case 'CloseEditDatabase':
-      vscode.commands.executeCommand('RedisForVSCode.editDatabaseClose', message)
+      vscode.commands.executeCommand('RedisForVSCode.editDatabaseClose', message.data)
       break
     case 'UpdateSettings':
       await setUIStorageField('appInfo', {

src/webviews/src/actions/index.ts

@@ -1,4 +1,5 @@
 export { selectKeyAction } from './selectKeyAction'
 export { addKeyAction } from './addKeyAction'
 export { refreshTreeAction } from './refreshTreeAction'
+export { refreshKeyAction } from './refreshKeyAction'
 export { processCliAction } from './processCliAction'

src/webviews/src/actions/refreshKeyAction.ts

@@ -0,0 +1,13 @@
+import { VscodeMessageAction } from 'uiSrc/constants'
+import { PostMessage } from 'uiSrc/interfaces'
+import { useDatabasesStore } from 'uiSrc/store'
+
+export const refreshKeyAction = (message: PostMessage) => {
+  if (message.action !== VscodeMessageAction.RefreshKey) {
+    return
+  }
+
+  if (message.data?.database?.id) {
+    useDatabasesStore.getState().setConnectedDatabase(message.data.database)
+  }
+}

src/webviews/src/actions/refreshTreeAction.ts

@@ -1,14 +1,18 @@
 import { VscodeMessageAction } from 'uiSrc/constants'
 import { PostMessage } from 'uiSrc/interfaces'
-import { fetchDatabases, useSelectedKeyStore } from 'uiSrc/store'
+import { fetchDatabases, useDatabasesStore, useSelectedKeyStore } from 'uiSrc/store'
 
 export const refreshTreeAction = (message: PostMessage) => {
   if (message.action !== VscodeMessageAction.RefreshTree) {
     return
   }
   if (message.data?.keyInfo?.key) {
     useSelectedKeyStore.getState().setSelectedKeyAction(message.data)
-  } else {
-    fetchDatabases()
   }
+
+  fetchDatabases(() => {
+    if (message.data.database?.id) {
+      useDatabasesStore.getState().setDatabaseToList(message.data?.database!)
+    }
+  })
 }

src/webviews/src/constants/vscode/vscode.ts

@@ -11,6 +11,7 @@ export enum VscodeMessageAction {
   SelectKey = 'SelectKey',
   OpenCli = 'OpenCli',
   RefreshTree = 'RefreshTree',
+  RefreshKey = 'RefreshKey',
   CloseKey = 'CloseKey',
   CloseKeyAndRefresh = 'CloseKeyAndRefresh',
   EditKeyName = 'EditKeyName',

src/webviews/src/index.tsx

@@ -18,6 +18,7 @@ import {
   processCliAction,
   refreshTreeAction,
   selectKeyAction,
+  refreshKeyAction,
 } from './actions'
 import { MonacoLanguages } from './components'
 
@@ -46,6 +47,9 @@ document.addEventListener('DOMContentLoaded', () => {
       case VscodeMessageAction.CloseEula:
         useAppInfoStore.getState().setIsShowConcepts(false)
         break
+      case VscodeMessageAction.RefreshKey:
+        refreshKeyAction(message)
+        break
       case VscodeMessageAction.RefreshTree:
         refreshTreeAction(message)
         break

src/webviews/src/interfaces/vscode/api.ts

@@ -26,13 +26,12 @@ export interface SelectKeyAction {
   }
 }
 
-export interface RefreshTreeAction {
-  action: VscodeMessageAction.RefreshTree
-  data: { key?: RedisString, type: SelectedKeyActionType, databaseId: string }
-}
-
 export interface DatabaseAction {
-  action: VscodeMessageAction.EditDatabase | VscodeMessageAction.AddKey | VscodeMessageAction.AddCli | VscodeMessageAction.OpenCli
+  action: VscodeMessageAction.EditDatabase
+  | VscodeMessageAction.AddKey
+  | VscodeMessageAction.AddCli
+  | VscodeMessageAction.OpenCli
+  | VscodeMessageAction.CloseEditDatabase
   data: {
     database: Database
   }
@@ -50,27 +49,33 @@ export interface SelectedKeyAction {
   VscodeMessageAction.RefreshTree |
   VscodeMessageAction.EditKeyName
   data: {
-    database: Database,
-    type: SelectedKeyActionType,
+    database: Database
+    type: SelectedKeyActionType
     keyInfo: {
-      key?: RedisString,
-      keyType?: KeyTypes,
-      newKey?: RedisString,
-      newKeyString?: string,
+      key?: RedisString
+      keyType?: KeyTypes
+      newKey?: RedisString
+      newKeyString?: string
       keyString?: string
       displayedKeyType?: string
     }
   }
 }
 
+export interface RefreshAction {
+  action: VscodeMessageAction.RefreshKey
+  data: {
+    database?: Database
+  }
+}
+
 export interface SelectedKeyCloseAction {
   action: VscodeMessageAction.CloseKey
 }
 
 export interface NoDataAction {
   action: VscodeMessageAction.CloseAddDatabase
   | VscodeMessageAction.OpenAddDatabase
-  | VscodeMessageAction.CloseEditDatabase
 }
 
 export interface CloseAddKeyAction {
@@ -89,12 +94,12 @@ export interface UpdateSettingsDelimiterAction {
 }
 
 export interface SaveAppInfoAction {
-  action: VscodeMessageAction.SaveAppInfo,
+  action: VscodeMessageAction.SaveAppInfo
   data: Partial<AppInfoStore>
 }
 
 export interface ShowEulaAction {
-  action: VscodeMessageAction.ShowEula,
+  action: VscodeMessageAction.ShowEula
 }
 
 export interface CloseEulaAction {
@@ -114,4 +119,5 @@ export type PostMessage =
   SaveAppInfoAction |
   ShowEulaAction |
   CloseEulaAction |
-  ResetSelectedKeyAction
+  ResetSelectedKeyAction |
+  RefreshAction