#RIVS-273 - [Regression] Cli stopes working after running command with enter

Author: egor-zalenski

.env

@@ -16,5 +16,6 @@ RI_AUTO_BOOTSTRAP=false
 RI_MIGRATE_OLD_FOLDERS=false
 RI_BUILD_TYPE='VS_CODE'
 RI_ENCRYPTION_KEYTAR=false
+RI_ANALYTICS_START_EVENTS=true
 RI_AGREEMENTS_PATH='../../webviews/resources/agreements-spec.json'
 # RI_SEGMENT_WRITE_KEY='SEGMENT_WRITE_KEY'

src/webviews/src/components/popover-delete/PopoverDelete.tsx

@@ -68,7 +68,7 @@ const PopoverDelete = (props: Props) => {
       closeOnEscape
       closeOnDocumentClick
       repositionOnResize
-      keepTooltipInside
+      keepTooltipInside={false}
       position={position}
       onClose={() => closePopover?.()}
       onOpen={() => {

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

@@ -41,7 +41,7 @@ export const CliBodyWrapper = () => {
     resetCliSettings: state.resetCliSettings,
   }))
   const database = useDatabasesStore(useShallow((state) => state.connectedDatabase))
-  const { id, host, port, connectionType } = database || {}
+  const { id, connectionType } = database || {}
 
   const data = useCliOutputStore((state) => state.data || [])
 
@@ -62,7 +62,7 @@ export const CliBodyWrapper = () => {
   }
 
   useEffect(() => {
-    !cliClientUuid && host && createCliClientAction(database!)
+    !cliClientUuid && createCliClientAction(database!)
     resetCommand()
     return () => {
       removeCliClient()
@@ -143,24 +143,19 @@ export const CliBodyWrapper = () => {
       return
     }
 
-    const options: any = {
-      command,
-      nodeOptions: {
-        host,
-        port,
-        enableRedirection: true,
-      },
-      role: ClusterNodeRole.All,
-    }
-    sendCliClusterCommandAction(command, options, resetCommand)
+    sendCliClusterCommandAction(command, resetCommand)
   }
 
   const resetCommand = () => {
     setCommand('')
   }
 
   return (
-    <section ref={refHotkeys} className={styles.section}>
+    <section
+      ref={refHotkeys}
+      className={styles.section}
+      onContextMenu={(e) => e.preventDefault()}
+    >
       <CliBody
         data={data}
         command={command}

src/webviews/src/modules/cli/hooks/cli-output/tests/useCliOutput.spec.tsx

@@ -216,17 +216,7 @@ describe('thunks', () => {
   })
 
   describe('Single Node Cluster Cli command', () => {
-    const options: any = {
-      command: constants.COMMAND,
-      nodeOptions: {
-        host: 'localhost',
-        port: 7000,
-        enableRedirection: true,
-      },
-      role: ClusterNodeRole.All,
-    }
-
-    it('call both sendCliClusterCommandAction and sendCliCommandSuccess when response status is successed', async () => {
+    it.only('call both sendCliClusterCommandAction and sendCliCommandSuccess when response status is successed', async () => {
       // Arrange
       const command = constants.COMMAND
       const data: any[] = [
@@ -241,13 +231,13 @@ describe('thunks', () => {
       apiService.post = vi.fn().mockResolvedValue(responsePayload)
 
       // Act
-      sendCliClusterCommandAction(command, options)
+      sendCliClusterCommandAction(command)
       await waitForStack()
 
+      console.log(useCliOutputStore.getState().data[0])
+
       // Assert
-      expect(useCliOutputStore.getState().data[0].toString()).toEqual(
-        '-> Redirected to slot [6918] located at 127.0.0.1:7002'
-      )
+      expect(useCliOutputStore.getState().data[0]).toContain('(nil)')
     })
 
     it('call both sendCliClusterCommandAction and sendCliCommandSuccess when response status is fail', async () => {
@@ -265,7 +255,7 @@ describe('thunks', () => {
       apiService.post = vi.fn().mockResolvedValue(responsePayload)
 
       // Act
-      sendCliClusterCommandAction(command, options)
+      sendCliClusterCommandAction(command)
       await waitForStack()
 
       // Assert
@@ -287,7 +277,7 @@ describe('thunks', () => {
       apiService.post = vi.fn().mockRejectedValueOnce(responsePayload)
 
       // Act
-      sendCliClusterCommandAction(command, options)
+      sendCliClusterCommandAction(command)
       await waitForStack()
 
       // Assert

src/webviews/src/modules/cli/hooks/cli-output/useCliOutputThunks.ts

@@ -14,7 +14,6 @@ import { useCliSettingsStore } from '../cli-settings/useCliSettingsStore'
 import { updateCliClientAction } from '../cli-settings/useCliSettingsThunks'
 import {
   cliParseTextResponseWithOffset,
-  cliParseTextResponseWithRedirect,
   getDbIndexFromSelectQuery,
 } from '../../utils'
 
@@ -80,7 +79,6 @@ export function sendCliCommandAction(
 // Asynchronous thunk action
 export function sendCliClusterCommandAction(
   command: string = '',
-  options: any,
   onSuccessAction?: () => void,
   onFailAction?: () => void,
 ) {
@@ -99,7 +97,7 @@ export function sendCliClusterCommandAction(
 
       const {
         data: [
-          { response, status: dataStatus, node: nodeOptionsResponse },
+          { response, status: dataStatus },
         ] = [],
         status,
       } = await apiService.post<any[]>(
@@ -108,22 +106,12 @@ export function sendCliClusterCommandAction(
           cliClientUuid,
           ApiEndpoints.SEND_CLUSTER_COMMAND,
         ),
-        { ...options, command, outputFormat },
+        { command, outputFormat },
       )
 
       if (isStatusSuccessful(status)) {
-        let isRedirected = false
-        if (options.nodeOptions && nodeOptionsResponse) {
-          const requestNodeAddress = `${options.nodeOptions.host}:${options.nodeOptions.port}`
-          const responseNodeAddress = `${nodeOptionsResponse.host}:${nodeOptionsResponse.port}`
-          isRedirected = requestNodeAddress !== responseNodeAddress
-        }
         onSuccessAction?.()
-        const result = outputFormat === CliOutputFormatterType.Raw && isRedirected
-          ? cliParseTextResponseWithRedirect(response, command, dataStatus, nodeOptionsResponse)
-          : cliParseTextResponseWithOffset(response, command, dataStatus)
-
-        state.concatToOutput(result)
+        state.concatToOutput(cliParseTextResponseWithOffset(response, command, dataStatus))
       }
     } catch (error) {
       const errorMessage = getApiErrorMessage(error as AxiosError)

src/webviews/src/modules/cli/utils/cliHelper.tsx

@@ -34,20 +34,6 @@ export enum CliPrefix {
 //   // status: CommandExecutionStatus
 // }
 
-const cliParseTextResponseWithRedirect = (
-  text: string = '',
-  command: string = '',
-  status: CommandExecutionStatus = CommandExecutionStatus.Success,
-  redirectTo: ClusterNode | undefined,
-) => {
-  let redirectMessage = ''
-  if (redirectTo) {
-    const { host, port, slot } = redirectTo
-    redirectMessage = `-> Redirected to slot [${slot}] located at ${host}:${port}`
-  }
-  return [redirectMessage, '\n', cliParseTextResponse(text, command, status), '\n']
-}
-
 const cliParseTextResponseWithOffset = (
   text: string = '',
   command: string = '',
@@ -244,7 +230,6 @@ const checkDeprecatedCommandGroup = (item: string) =>
 export {
   // cliParseTextResponse,
   cliParseTextResponseWithOffset,
-  cliParseTextResponseWithRedirect,
   // cliParseCommandsGroupResult,
   cliCommandOutput,
   // bashTextValue,

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

@@ -167,6 +167,7 @@ export const DatabaseWrapper = ({ children, database }: Props) => {
             header={formatLongName(name, 50, 10, '...')}
             text={l10n.t('will be deleted from Redis for VS Code.')}
             item={id}
+            position="bottom right"
             maxWidth={window.innerWidth - POPOVER_WINDOW_BORDER_WIDTH}
             disabled={false}
             triggerClassName={cx('hidden h-[22px] group-hover:!flex', { '!flex': showTree })}