Skip to content

Commit 92e85fb

Browse files
#RI-3644-add encrypted data message
1 parent a5c1f73 commit 92e85fb

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

redisinsight/ui/src/pages/databaseAnalysis/components/analysis-data-view/AnalysisDataView.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react'
22
import cx from 'classnames'
3+
import { isNull } from 'lodash'
34
import { Nullable } from 'uiSrc/utils'
45
import { EmptyMessage } from 'uiSrc/pages/databaseAnalysis/constants'
56
import {
@@ -30,6 +31,9 @@ const AnalysisDataView = (props: Props) => {
3031
{!loading && !!reports.length && data?.totalKeys?.total === 0 && (
3132
<EmptyAnalysisMessage name={EmptyMessage.Keys} />
3233
)}
34+
{!loading && !!reports.length && isNull(data?.totalKeys) && (
35+
<EmptyAnalysisMessage name={EmptyMessage.Encrypt} />
36+
)}
3337
<div className={cx(styles.grid, styles.content)}>
3438
<SummaryPerData data={data} loading={loading} />
3539
<ExpirationGroupsView data={data} loading={loading} />

redisinsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/EmptyAnalysisMessage.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ const emptyMessageContent: { [key in EmptyMessage]: Content } = {
3131
{' to quickly load the data.'}
3232
</>
3333
)
34+
},
35+
[EmptyMessage.Encrypt]: {
36+
title: 'Encrypted data',
37+
text: () => 'Unable to decrypt. Check the system keychain or re-run the report generation.'
3438
}
3539
}
3640

redisinsight/ui/src/pages/databaseAnalysis/components/summary-per-data/SummaryPerData.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ const SummaryPerData = ({ data, loading }: Props) => {
3232

3333
useEffect(() => {
3434
if (data && totalMemory && totalKeys) {
35-
setMemoryData(totalMemory?.types?.map(getChartData) as ChartData[])
36-
setKeysData(totalKeys?.types?.map(getChartData) as ChartData[])
35+
setMemoryData(totalMemory.types?.map(getChartData) as ChartData[])
36+
setKeysData(totalKeys.types?.map(getChartData) as ChartData[])
3737
}
3838
}, [data])
3939

@@ -45,8 +45,7 @@ const SummaryPerData = ({ data, loading }: Props) => {
4545
</div>
4646
)
4747
}
48-
49-
if ((!totalMemory || memoryData?.length === 0) && (!totalKeys || keysData?.length === 0)) {
48+
if ((!totalMemory || memoryData.length === 0) && (!totalKeys || keysData.length === 0)) {
5049
return null
5150
}
5251

redisinsight/ui/src/pages/databaseAnalysis/constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ export enum TableView {
77

88
export enum EmptyMessage {
99
Reports = 'reports',
10-
Keys = 'keys'
10+
Keys = 'keys',
11+
Encrypt = 'encrypt'
1112
}
1213

1314
export type Content = {

0 commit comments

Comments
 (0)