back merge

redisinsight/package.json

@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.10.0",
+  "version": "2.14.0",
   "description": "RedisInsight",
   "main": "./main.prod.js",
   "author": {

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

@@ -144,15 +144,25 @@ const KeyList = forwardRef((props: Props, ref) => {
     if (isNotRendered.current) {
       return ''
     }
-    if (searchMode === SearchMode.Redisearch && !selectedIndex) {
-      return NoSelectedIndexText
+
+    if (searchMode === SearchMode.Redisearch) {
+      if (!selectedIndex) {
+        return NoSelectedIndexText
+      }
+
+      if (total === 0) {
+        return NoResultsFoundText
+      }
+
+      if (isSearched) {
+        return keysState.scanned < total ? NoResultsFoundText : FullScanNoResultsFoundText
+      }
     }
+
     if (total === 0) {
       return NoKeysToDisplayText(Pages.workbench(instanceId), onNoKeysLinkClick)
     }
-    if (isSearched && searchMode === SearchMode.Redisearch) {
-      return keysState.scanned < total ? NoResultsFoundText : FullScanNoResultsFoundText
-    }
+
     if (isSearched) {
       return keysState.scanned < total ? ScanNoResultsFoundText : FullScanNoResultsFoundText
     }