From 3dab88880819125a4ab448714aa518e47d4ae84c Mon Sep 17 00:00:00 2001
From: Zalenski Egor <63463140+zalenskiSofteq@users.noreply.github.com>
Date: Thu, 17 Mar 2022 11:04:30 +0300
Subject: [PATCH] #RI-2457 - Update message in Browser for TimeSeries and Graph
data types
---
redisinsight/ui/src/constants/keys.ts | 22 ++++++---
.../ui/src/constants/prop-types/keys.ts | 20 ++++----
.../components/filter-key-type/constants.ts | 9 ++--
.../key-details/KeyDetails/KeyDetails.tsx | 11 ++++-
.../ModulesTypeDetails.spec.tsx | 11 +++++
.../ModulesTypeDetails.tsx | 47 +++++++++++++++++++
.../UnsupportedTypeDetails.tsx | 2 +-
.../styles.module.scss | 4 +-
8 files changed, 101 insertions(+), 25 deletions(-)
create mode 100644 redisinsight/ui/src/pages/browser/components/modules-type-details/ModulesTypeDetails.spec.tsx
create mode 100644 redisinsight/ui/src/pages/browser/components/modules-type-details/ModulesTypeDetails.tsx
diff --git a/redisinsight/ui/src/constants/keys.ts b/redisinsight/ui/src/constants/keys.ts
index 9696a10d0f..86995fa182 100644
--- a/redisinsight/ui/src/constants/keys.ts
+++ b/redisinsight/ui/src/constants/keys.ts
@@ -11,8 +11,11 @@ export enum KeyTypes {
}
export enum UnsupportedKeyTypes {
- Graph = 'graphdata',
Stream = 'stream',
+}
+
+export enum ModulesKeyTypes {
+ Graph = 'graphdata',
TimeSeries = 'TSDB-TYPE',
}
@@ -25,8 +28,8 @@ export const GROUP_TYPES_DISPLAY = Object.freeze({
[KeyTypes.ReJSON]: 'JSON',
[KeyTypes.JSON]: 'JSON',
[UnsupportedKeyTypes.Stream]: 'Stream',
- [UnsupportedKeyTypes.Graph]: 'GRAPH',
- [UnsupportedKeyTypes.TimeSeries]: 'TS',
+ [ModulesKeyTypes.Graph]: 'GRAPH',
+ [ModulesKeyTypes.TimeSeries]: 'TS',
[CommandGroup.Bitmap]: 'Bitmap',
[CommandGroup.Cluster]: 'Cluster',
[CommandGroup.Connection]: 'Connection',
@@ -54,8 +57,8 @@ export const GROUP_TYPES_COLORS = Object.freeze({
[KeyTypes.ReJSON]: 'var(--typeReJSONColor)',
[KeyTypes.JSON]: 'var(--typeReJSONColor)',
[UnsupportedKeyTypes.Stream]: 'var(--typeStreamColor)',
- [UnsupportedKeyTypes.Graph]: 'var(--typeGraphColor)',
- [UnsupportedKeyTypes.TimeSeries]: 'var(--typeTimeSeriesColor)',
+ [ModulesKeyTypes.Graph]: 'var(--typeGraphColor)',
+ [ModulesKeyTypes.TimeSeries]: 'var(--typeTimeSeriesColor)',
[CommandGroup.SortedSet]: 'var(--groupSortedSetColor)',
[CommandGroup.Bitmap]: 'var(--groupBitmapColor)',
[CommandGroup.Cluster]: 'var(--groupClusterColor)',
@@ -107,7 +110,12 @@ export enum SortOrder {
}
export const LENGTH_NAMING_BY_TYPE = Object.freeze({
- [UnsupportedKeyTypes.Graph]: 'Nodes',
- [UnsupportedKeyTypes.TimeSeries]: 'Samples',
+ [ModulesKeyTypes.Graph]: 'Nodes',
+ [ModulesKeyTypes.TimeSeries]: 'Samples',
[UnsupportedKeyTypes.Stream]: 'Entries'
})
+
+export const MODULES_KEY_TYPES_NAMES = Object.freeze({
+ [ModulesKeyTypes.Graph]: 'RedisGraph',
+ [ModulesKeyTypes.TimeSeries]: 'RedisTimeSeries',
+})
diff --git a/redisinsight/ui/src/constants/prop-types/keys.ts b/redisinsight/ui/src/constants/prop-types/keys.ts
index aca0ea971d..228e908a80 100644
--- a/redisinsight/ui/src/constants/prop-types/keys.ts
+++ b/redisinsight/ui/src/constants/prop-types/keys.ts
@@ -1,16 +1,16 @@
-import { KeyTypes } from '../keys'
+import { KeyTypes, ModulesKeyTypes } from '../keys'
export interface IKeyPropTypes {
- name: string;
- type: KeyTypes;
- ttl: number;
- size: number;
- length: number;
+ name: string
+ type: KeyTypes | ModulesKeyTypes
+ ttl: number
+ size: number
+ length: number
}
export interface IKeyListPropTypes {
- nextCursor: string;
- total: number;
- scanned: number;
- keys: IKeyPropTypes[];
+ nextCursor: string
+ total: number
+ scanned: number
+ keys: IKeyPropTypes[]
}
diff --git a/redisinsight/ui/src/pages/browser/components/filter-key-type/constants.ts b/redisinsight/ui/src/pages/browser/components/filter-key-type/constants.ts
index b9334e48bf..a3c20249ee 100644
--- a/redisinsight/ui/src/pages/browser/components/filter-key-type/constants.ts
+++ b/redisinsight/ui/src/pages/browser/components/filter-key-type/constants.ts
@@ -1,6 +1,7 @@
import {
GROUP_TYPES_COLORS,
KeyTypes,
+ ModulesKeyTypes,
UnsupportedKeyTypes,
} from 'uiSrc/constants'
@@ -42,12 +43,12 @@ export const FILTER_KEY_TYPE_OPTIONS = [
},
{
text: 'GRAPH',
- value: UnsupportedKeyTypes.Graph,
- color: GROUP_TYPES_COLORS[UnsupportedKeyTypes.Graph],
+ value: ModulesKeyTypes.Graph,
+ color: GROUP_TYPES_COLORS[ModulesKeyTypes.Graph],
},
{
text: 'TS',
- value: UnsupportedKeyTypes.TimeSeries,
- color: GROUP_TYPES_COLORS[UnsupportedKeyTypes.TimeSeries],
+ value: ModulesKeyTypes.TimeSeries,
+ color: GROUP_TYPES_COLORS[ModulesKeyTypes.TimeSeries],
},
]
diff --git a/redisinsight/ui/src/pages/browser/components/key-details/KeyDetails/KeyDetails.tsx b/redisinsight/ui/src/pages/browser/components/key-details/KeyDetails/KeyDetails.tsx
index dd96d8d081..fe11be94be 100644
--- a/redisinsight/ui/src/pages/browser/components/key-details/KeyDetails/KeyDetails.tsx
+++ b/redisinsight/ui/src/pages/browser/components/key-details/KeyDetails/KeyDetails.tsx
@@ -6,11 +6,12 @@ import {
import { isNull } from 'lodash'
import { useSelector } from 'react-redux'
import cx from 'classnames'
-import { KeyTypes } from 'uiSrc/constants'
+
import {
selectedKeyDataSelector,
selectedKeySelector,
} from 'uiSrc/slices/keys'
+import { KeyTypes, ModulesKeyTypes, MODULES_KEY_TYPES_NAMES } from 'uiSrc/constants'
import { connectedInstanceSelector } from 'uiSrc/slices/instances'
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import AddHashFields from '../../key-details-add-items/add-hash-fields/AddHashFields'
@@ -26,6 +27,7 @@ import ListDetails from '../../list-details/ListDetails'
import RejsonDetailsWrapper from '../../rejson-details/RejsonDetailsWrapper'
import RemoveListElements from '../../key-details-remove-items/remove-list-elements/RemoveListElements'
import UnsupportedTypeDetails from '../../unsupported-type-details/UnsupportedTypeDetails'
+import ModulesTypeDetails from '../../modules-type-details/ModulesTypeDetails'
import styles from '../styles.module.scss'
@@ -149,7 +151,12 @@ const KeyDetails = ({ ...props }: Props) => {