Merge pull request #573 from RedisInsight/feature/bugfix

#RI-2660, #RI-2698

Author: egor-zalenski

redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx

@@ -71,7 +71,7 @@ const CliBodyWrapper = () => {
   const handleSubmit = () => {
     const [commandLine, countRepeat] = getCommandRepeat(decode(command).trim())
     const unsupportedCommand = checkUnsupportedCommand(unsupportedCommands, commandLine)
-    dispatch(concatToOutput(cliCommandOutput(command, currentDbIndex)))
+    dispatch(concatToOutput(cliCommandOutput(decode(command), currentDbIndex)))
 
     if (!isRepeatCountCorrect(countRepeat)) {
       dispatch(processUnrepeatableNumber(commandLine, resetCommand))

redisinsight/ui/src/pages/browser/components/key-tree/KeyTree.tsx

@@ -69,19 +69,14 @@ const KeyTree = (props: Props) => {
   }, [keysState.keys])
 
   useEffect(() => {
-    // select default leaf "Keys" after each change delimiter
+    // select default leaf "Keys" after each change delimiter, filter or search
     setItems([])
     setTimeout(() => {
       setStatusSelected({})
       setSelectDefaultLeaf(true)
       setItems(keysState.keys)
     }, 0)
-  }, [delimiter])
-
-  useEffect(() => {
-    // select default leaf "Keys" after each search or filter
-    setSelectDefaultLeaf(true)
-  }, [filter, search])
+  }, [delimiter, filter, search])
 
   const updateKeysList = (items:any = {}) => {
     const newState:IKeyListPropTypes = {