Merge pull request #225 from RedisInsight/feature/bugfix

#RIVS-313, #RIVS-314

Author: vlad-dargel

src/webviews/src/modules/keys-tree/components/keys-summary/KeysSummary.tsx

@@ -90,7 +90,7 @@ export const KeysSummary = (props: Props) => {
     if (!isMultiDbIndex) return null
     return (
       <>
-        <VscDatabase />
+        <VscDatabase className="sidebar-icon" />
         <span className="px-1">{dbIndex}</span>
       </>
     )
@@ -108,7 +108,7 @@ export const KeysSummary = (props: Props) => {
     }
 
     return (
-      <span>
+      <span className="truncate">
         {'('}
         <span data-testid="keys-number-of-results">{numberWithSpaces(resultsLength)}</span>
         {' / '}

src/webviews/src/modules/keys-tree/components/keys-summary/styles.module.scss

@@ -6,5 +6,5 @@
 }
 
 .content {
-  @apply flex flex-row items-center flex-grow text-vscode-foreground opacity-80 pl-1;
+  @apply flex flex-row items-center flex-grow text-vscode-foreground opacity-80 pl-1 truncate;
 }

src/webviews/src/modules/keys-tree/components/keys-tree-header/KeysTreeHeader.tsx

@@ -72,7 +72,7 @@ export const KeysTreeHeader = ({ database, open, dbTotal, children }: Props) =>
         showTree={showTree}
         toggleShowTree={handleToggleShowTree}
       />
-      {isShowScanMore(scanned, total, nextCursor) && (
+      {isShowScanMore(scanned, total, nextCursor) && showTree && (
         <ScanMore
           loading={loading}
           disabled={isDisableScanMore(scanned, total, nextCursor)}