Merge branch 'main' into e2e/bugfix/3532-fix-unstable-e2e

Author: vlad-dargel

redisinsight/ui/src/components/inline-item-editor/InlineItemEditor.tsx

@@ -140,7 +140,7 @@ const InlineItemEditor = (props: Props) => {
   const isDisabledApply = (): boolean =>
     !!(isLoading || isError || isDisabled || (disableEmpty && !value.length))
 
-  const ApplyBtn = () => (
+  const ApplyBtn = (
     <EuiToolTip
       anchorClassName={styles.tooltip}
       position="bottom"
@@ -218,7 +218,7 @@ const InlineItemEditor = (props: Props) => {
                       isDisabled={isLoading}
                       data-testid="cancel-btn"
                     />
-                    <ApplyBtn />
+                    {ApplyBtn}
                   </div>
                 </EuiForm>
               </EuiFocusTrap>

redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.tsx

@@ -33,4 +33,4 @@ const QueryCardCliResult = (props: Props) => {
   )
 }
 
-export default QueryCardCliResult
+export default React.memo(QueryCardCliResult)

redisinsight/ui/src/pages/browser/components/auto-refresh/AutoRefresh.tsx

@@ -244,4 +244,4 @@ const AutoRefresh = ({
   )
 }
 
-export default AutoRefresh
+export default React.memo(AutoRefresh)

redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx

@@ -209,8 +209,8 @@ const KeyList = forwardRef((props: Props, ref) => {
     {
       id: 'ttl',
       label: 'TTL',
-      absoluteWidth: 70,
-      minWidth: 70,
+      absoluteWidth: 86,
+      minWidth: 86,
       truncateText: true,
       alignment: TableCellAlignment.Right,
       render: (cellData: number, { nameString: name }: GetKeyInfoResponse) => {
@@ -247,8 +247,8 @@ const KeyList = forwardRef((props: Props, ref) => {
     {
       id: 'size',
       label: 'Size',
-      absoluteWidth: 100,
-      minWidth: 100,
+      absoluteWidth: 84,
+      minWidth: 84,
       alignment: TableCellAlignment.Right,
       textAlignment: TableCellTextAlignment.Right,
       render: (cellData: number, { nameString: name }: GetKeyInfoResponse) => {

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

@@ -93,4 +93,4 @@ const KeyTreeDelimiter = ({ loading }: Props) => {
   )
 }
 
-export default KeyTreeDelimiter
+export default React.memo(KeyTreeDelimiter)

redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.tsx

@@ -145,11 +145,16 @@ const WBViewWrapper = () => {
   ) => {
     const { loading, batchSize } = state
     const isNewCommand = () => !commandId
-    const commandsForExecuting = splitMonacoValuePerLines(removeMonacoComments(commandInit))
-      .map((command) => removeMonacoComments(decode(command).trim()))
+    const commandsForExecuting = without(
+      splitMonacoValuePerLines(commandInit)
+        .map((command) => removeMonacoComments(decode(command).trim())),
+      ''
+    )
+
     const [commands, ...rest] = chunk(commandsForExecuting, batchSize > 1 ? batchSize : 1)
     const multiCommands = rest.map((command) => getMultiCommands(command))
-    if (!commands.length || loading) {
+
+    if (!commands?.length || loading) {
       setMultiCommands(multiCommands)
       return
     }