Merge branch 'feature/bugfix' into e2e/bugfix/feature-bugfix

Author: vlad-dargel

src/webviews/src/actions/processCliAction.ts

@@ -10,9 +10,14 @@ export const processCliAction = (message: PostMessage) => {
     return
   }
 
+  const prevDatabaseId = useDatabasesStore.getState().connectedDatabase?.id
   const database = message?.data?.database
+
+  if (prevDatabaseId === database?.id) {
+    return
+  }
   window.ri.database = database
+  addCli()
 
   useDatabasesStore.getState().setConnectedDatabase(database)
-  addCli(database)
 }

src/webviews/src/modules/cli/components/cli-body/CliBodyWrapper.tsx

@@ -63,6 +63,7 @@ export const CliBodyWrapper = () => {
 
   useEffect(() => {
     !cliClientUuid && host && createCliClientAction(database!)
+    resetCommand()
     return () => {
       removeCliClient()
     }

src/webviews/src/modules/cli/hooks/cli-settings/useCliSettingsThunks.ts

@@ -185,10 +185,10 @@ function updateCliHistory() {
 }
 
 // async thunk function
-export function addCli(database: Database) {
+export function addCli() {
   updateCliHistory()
   useCliOutputStore.getState().resetOutput()
-  createCliClientAction(database)
+  useCliSettingsStore.getState().resetCliClientUuid()
 }
 
 // async thunk function