Merge pull request #1451 from RedisInsight/fe/bugfix/pika_db

fix pika db black screen

Author: AlenaSY

redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx

@@ -7,7 +7,7 @@ import {
   PropertySort
 } from '@elastic/eui'
 import cx from 'classnames'
-import { isNull } from 'lodash'
+import { isNil } from 'lodash'
 import React, { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory, useParams } from 'react-router-dom'
@@ -138,6 +138,13 @@ const Table = (props: Props) => {
       sortable: true,
       align: 'left',
       render: (value: number, { name }) => {
+        if (isNil(value)) {
+          return (
+            <EuiTextColor color="subdued" style={{ maxWidth: '100%' }} data-testid={`ttl-empty-${value}`}>
+              -
+            </EuiTextColor>
+          )
+        }
         if (value === -1) {
           return (
             <EuiTextColor color="subdued" data-testid={`ttl-no-limit-${name}`}>
@@ -174,6 +181,13 @@ const Table = (props: Props) => {
       sortable: true,
       align: 'right',
       render: (value: number, { type }) => {
+        if (isNil(value)) {
+          return (
+            <EuiTextColor color="subdued" style={{ maxWidth: '100%' }} data-testid={`size-empty-${value}`}>
+              -
+            </EuiTextColor>
+          )
+        }
         const [number, size] = formatBytes(value, 3, true)
         const isHighlight = isBigKey(type, HighlightType.Memory, value)
         return (
@@ -207,7 +221,7 @@ const Table = (props: Props) => {
       sortable: ({ length }) => length ?? -1,
       align: 'right',
       render: (value: number, { name, type }) => {
-        if (isNull(value)) {
+        if (isNil(value)) {
           return (
             <EuiTextColor color="subdued" style={{ maxWidth: '100%' }} data-testid={`length-empty-${name}`}>
               -

redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx

@@ -66,7 +66,7 @@ const NameSpacesTable = (props: Props) => {
     dispatch(setBrowserTreeDelimiter(delimiter))
     dispatch(setFilter(filter))
     dispatch(setSearchMatch(`${nsp}${delimiter}*`, SearchMode.Pattern))
-    dispatch(resetKeysData())
+    dispatch(resetKeysData(SearchMode.Pattern))
     dispatch(fetchKeys(
       SearchMode.Pattern,
       '0',

redisinsight/ui/src/slices/instances/instances.ts

@@ -126,8 +126,8 @@ const instancesSlice = createSlice({
     getDatabaseConfigInfoSuccess: (state, { payload }) => {
       state.loading = false
       state.instanceOverview = {
-        version: state.instanceOverview.version,
-        ...payload
+        ...payload,
+        version: payload?.version || state.instanceOverview.version || '',
       }
     },
     getDatabaseConfigInfoFailure: (state, { payload }) => {

redisinsight/ui/src/utils/comparisons/compareVersions.ts

@@ -1,4 +1,4 @@
-export const isVersionHigherOrEquals = (sourceVersion: string, comparableVersion: string) => {
+export const isVersionHigherOrEquals = (sourceVersion: string = '', comparableVersion: string = '') => {
   const sourceVersionArray = sourceVersion.split('.')
   const comparableVersionArray = comparableVersion.split('.')