fix pr comments

Author: egor-zalenski

.circleci/config.yml

@@ -35,6 +35,22 @@ aliases:
     when:
       not: *manual-build-conditions
 
+  licenses-generate: &licensesGenerate
+    run:
+      name: Generate license file for all vscode dependencies
+      command:
+        npm i -g license-checker
+        license-checker --json --out licenses.json
+      shell: /bin/bash
+
+  licenses-generate-windows: &licensesGenerateWindows
+    run:
+      name: Generate license file for all vscode dependencies
+      command:
+        npm i -g license-checker
+        license-checker --json --out licenses.json
+      shell: powershell.exe
+
 orbs:
   node: circleci/node@5.3.0
   win: circleci/windows@5.0.0
@@ -179,6 +195,7 @@ jobs:
           name: Install dependencies
           command: |
             yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - <<: *licensesGenerate
       - run:
           name: Build .vsix package
           command: |
@@ -228,6 +245,7 @@ jobs:
           command: |
             yarn install
           no_output_timeout: 15m
+      - <<: *licensesGenerate
       - run:
           name: Build .vsix package
           command: |
@@ -292,6 +310,7 @@ jobs:
             yarn install
           shell: bash.exe
           no_output_timeout: 15m
+      - <<: *licensesGenerateWindows
       - run:
           name: Build .vsix package
           command: |

src/extension.ts

@@ -168,18 +168,18 @@ export async function activate(context: vscode.ExtensionContext) {
 
       const keyDetailsWebview = WebviewPanel.instances[ViewId.Key]
       if (keyDetailsWebview) {
-        keyDetailsWebview.postMessage({ action: 'RefreshKey', data: args })
+        keyDetailsWebview.postMessage({ action: 'SetDatabase', data: args })
       }
     }),
 
     vscode.commands.registerCommand('RedisForVSCode.closeAddKeyAndRefresh', (args) => {
       WebviewPanel.getInstance({ viewId: ViewId.AddKey })?.dispose()
-      sidebarProvider.view?.webview.postMessage({ action: 'RefreshTree', data: args })
+      sidebarProvider.view?.webview.postMessage({ action: 'SetSelectedKeyAction', data: args })
       vscode.commands.executeCommand('RedisForVSCode.openKey', { action: 'SelectKey', data: args })
     }),
 
     vscode.commands.registerCommand('RedisForVSCode.closeKeyAndRefresh', (args) => {
-      sidebarProvider.view?.webview.postMessage({ action: 'RefreshTree', data: args })
+      sidebarProvider.view?.webview.postMessage({ action: 'SetSelectedKeyAction', data: args })
       WebviewPanel.getInstance({ viewId: ViewId.Key })?.dispose()
     }),
 
@@ -188,7 +188,7 @@ export async function activate(context: vscode.ExtensionContext) {
     }),
 
     vscode.commands.registerCommand('RedisForVSCode.editKeyName', (args) => {
-      sidebarProvider.view?.webview.postMessage({ action: 'RefreshTree', data: args })
+      sidebarProvider.view?.webview.postMessage({ action: 'SetSelectedKeyAction', data: args })
       const title = getTitleForKey(args.keyInfo?.displayedKeyType, args.keyInfo?.newKeyString)
       WebviewPanel.getInstance({ viewId: ViewId.Key }).setTitle(title)
     }),

src/webviews/src/actions/addKeyAction.ts

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

src/webviews/src/actions/index.ts

@@ -1,15 +1,8 @@
-import { VscodeMessageAction } from 'uiSrc/constants'
-import { PostMessage } from 'uiSrc/interfaces'
+import { CliAction } from 'uiSrc/interfaces'
 import { addCli } from 'uiSrc/modules/cli/hooks/cli-settings/useCliSettingsThunks'
 import { useDatabasesStore } from 'uiSrc/store'
 
-export const processCliAction = (message: PostMessage) => {
-  if (
-    message.action !== VscodeMessageAction.AddCli
-    && message.action !== VscodeMessageAction.OpenCli) {
-    return
-  }
-
+export const processCliAction = (message: CliAction) => {
   const prevDatabaseId = useDatabasesStore.getState().connectedDatabase?.id
   const database = message?.data?.database
 

src/webviews/src/actions/processCliAction.ts

@@ -1,17 +1,8 @@
-import { VscodeMessageAction } from 'uiSrc/constants'
-import { PostMessage } from 'uiSrc/interfaces'
-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)
-  }
+import { fetchDatabases, useDatabasesStore } from 'uiSrc/store'
 
+export const refreshTreeAction = (message: any) => {
   fetchDatabases(() => {
-    if (message.data.database?.id) {
+    if (message.data?.database?.id) {
       useDatabasesStore.getState().setDatabaseToList(message.data?.database!)
     }
   })

src/webviews/src/actions/refreshKeyAction.ts

@@ -1,13 +1,14 @@
-import { VscodeMessageAction } from 'uiSrc/constants'
-import { PostMessage } from 'uiSrc/interfaces'
-import { fetchDatabaseOverview, fetchKeyInfo, setInitialStateByType, useDatabasesStore, useSelectedKeyStore } from 'uiSrc/store'
+import { SelectKeyAction } from 'uiSrc/interfaces'
+import {
+  fetchDatabaseOverview,
+  fetchKeyInfo,
+  setInitialStateByType,
+  useDatabasesStore,
+  useSelectedKeyStore,
+} from 'uiSrc/store'
 import { TelemetryEvent, isEqualBuffers, sendEventTelemetry } from 'uiSrc/utils'
 
-export const selectKeyAction = (message: PostMessage) => {
-  if (message.action !== VscodeMessageAction.SelectKey) {
-    return
-  }
-
+export const selectKeyAction = (message: SelectKeyAction) => {
   const { keyInfo, database } = message?.data
   const { key } = keyInfo || {}
   const prevKey = useSelectedKeyStore.getState().data?.name

src/webviews/src/actions/refreshTreeAction.ts

@@ -0,0 +1,9 @@
+import { SetDatabaseAction } from 'uiSrc/interfaces'
+import { useDatabasesStore } from 'uiSrc/store'
+
+export const setDatabaseAction = (message: SetDatabaseAction) => {
+  if (message.data?.database?.id) {
+    window.ri.database = message.data.database
+    useDatabasesStore.getState().setConnectedDatabase(message.data.database)
+  }
+}

src/webviews/src/actions/selectKeyAction.ts

@@ -0,0 +1,8 @@
+import { SelectedKeyAction } from 'uiSrc/interfaces'
+import { useSelectedKeyStore } from 'uiSrc/store'
+
+export const setSelectedKeyAction = (message: SelectedKeyAction) => {
+  if (message.data?.keyInfo?.key) {
+    useSelectedKeyStore.getState().setSelectedKeyAction(message.data)
+  }
+}

src/webviews/src/actions/setDatabaseAction.ts

@@ -9,15 +9,15 @@ export enum VscodeMessageAction {
   ErrorMessage = 'ErrorMessage',
   AddCli = 'AddCli',
   SelectKey = 'SelectKey',
-  OpenCli = 'OpenCli',
   RefreshTree = 'RefreshTree',
-  RefreshKey = 'RefreshKey',
   CloseKey = 'CloseKey',
   CloseKeyAndRefresh = 'CloseKeyAndRefresh',
   EditKeyName = 'EditKeyName',
   OpenAddDatabase = 'OpenAddDatabase',
   CloseAddDatabase = 'CloseAddDatabase',
   CloseEditDatabase = 'CloseEditDatabase',
+  SetSelectedKeyAction = 'SetSelectedKeyAction',
+  SetDatabase = 'SetDatabase',
   CloseAddKey = 'CloseAddKey',
   CloseAddKeyAndRefresh = 'CloseAddKeyAndRefresh',
   ResetSelectedKey = 'ResetSelectedKey',

src/webviews/src/actions/setSelectedKeyAction.ts

@@ -5,20 +5,19 @@ import { MemoryRouter as Router } from 'react-router-dom'
 import {
   useSelectedKeyStore,
   fetchEditedDatabase,
-  Database,
   fetchCerts,
 } from 'uiSrc/store'
 import { Config } from 'uiSrc/modules'
 import { AppRoutes } from 'uiSrc/Routes'
-import { PostMessage } from 'uiSrc/interfaces'
+import { PostMessage, SelectKeyAction, SetDatabaseAction } from 'uiSrc/interfaces'
 import { VscodeMessageAction } from 'uiSrc/constants'
 import { useAppInfoStore } from './store/hooks/use-app-info-store/useAppInfoStore'
 import {
-  addKeyAction,
   processCliAction,
-  refreshTreeAction,
+  setSelectedKeyAction,
   selectKeyAction,
-  refreshKeyAction,
+  setDatabaseAction,
+  refreshTreeAction,
 } from './actions'
 import { MonacoLanguages } from './components'
 
@@ -34,10 +33,7 @@ document.addEventListener('DOMContentLoaded', () => {
     switch (message.action) {
       // Key details
       case VscodeMessageAction.SelectKey:
-        selectKeyAction(message)
-        break
-      case VscodeMessageAction.AddKey:
-        addKeyAction(message)
+        selectKeyAction(message as SelectKeyAction)
         break
       case VscodeMessageAction.ResetSelectedKey:
         useSelectedKeyStore.getState().resetSelectedKeyStore()
@@ -47,15 +43,18 @@ document.addEventListener('DOMContentLoaded', () => {
       case VscodeMessageAction.CloseEula:
         useAppInfoStore.getState().setIsShowConcepts(false)
         break
-      case VscodeMessageAction.RefreshKey:
-        refreshKeyAction(message)
+      case VscodeMessageAction.SetDatabase:
+        setDatabaseAction(message as SetDatabaseAction)
+        break
+      case VscodeMessageAction.SetSelectedKeyAction:
+        setSelectedKeyAction(message)
         break
       case VscodeMessageAction.RefreshTree:
         refreshTreeAction(message)
         break
       case VscodeMessageAction.EditDatabase:
         fetchCerts(() => {
-          fetchEditedDatabase(message?.data?.database)
+          fetchEditedDatabase(message?.data?.database as SetDatabaseAction['data']['database'])
         })
         break
 
@@ -69,7 +68,6 @@ document.addEventListener('DOMContentLoaded', () => {
 
       // CLI
       case VscodeMessageAction.AddCli:
-      case VscodeMessageAction.OpenCli:
         processCliAction(message)
         break
       default:

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

@@ -26,12 +26,18 @@ export interface SelectKeyAction {
   }
 }
 
-export interface DatabaseAction {
+export interface SetDatabaseAction {
   action: VscodeMessageAction.EditDatabase
   | VscodeMessageAction.AddKey
-  | VscodeMessageAction.AddCli
-  | VscodeMessageAction.OpenCli
   | VscodeMessageAction.CloseEditDatabase
+  | VscodeMessageAction.RefreshTree
+  | VscodeMessageAction.SetDatabase
+  data: {
+    database: Database
+  }
+}
+export interface CliAction {
+  action: VscodeMessageAction.AddCli
   data: {
     database: Database
   }
@@ -46,7 +52,7 @@ export interface SelectedKeyAction {
   action:
   VscodeMessageAction.CloseKeyAndRefresh |
   VscodeMessageAction.CloseAddKeyAndRefresh |
-  VscodeMessageAction.RefreshTree |
+  VscodeMessageAction.SetSelectedKeyAction |
   VscodeMessageAction.EditKeyName
   data: {
     database: Database
@@ -62,13 +68,6 @@ export interface SelectedKeyAction {
   }
 }
 
-export interface RefreshAction {
-  action: VscodeMessageAction.RefreshKey
-  data: {
-    database?: Database
-  }
-}
-
 export interface SelectedKeyCloseAction {
   action: VscodeMessageAction.CloseKey
 }
@@ -108,7 +107,7 @@ export interface CloseEulaAction {
 
 export type PostMessage =
   SelectKeyAction |
-  DatabaseAction |
+  SetDatabaseAction |
   InformationMessageAction |
   SelectedKeyAction |
   NoDataAction |
@@ -120,4 +119,4 @@ export type PostMessage =
   ShowEulaAction |
   CloseEulaAction |
   ResetSelectedKeyAction |
-  RefreshAction
+  CliAction