#RI-4608 - remove deprecated command groups

Author: AmirAllayarovSofteq

redisinsight/ui/src/slices/app/redis-commands.ts

@@ -2,7 +2,7 @@ import { createSlice } from '@reduxjs/toolkit'
 import { isString, uniqBy } from 'lodash'
 import { apiService } from 'uiSrc/services'
 import { ApiEndpoints, ICommand, ICommands } from 'uiSrc/constants'
-import { getApiErrorMessage, isStatusSuccessful } from 'uiSrc/utils'
+import { getApiErrorMessage, isStatusSuccessful, checkDeprecatedCommandGroup } from 'uiSrc/utils'
 import { GetServerInfoResponse } from 'apiSrc/modules/server/dto/server.dto'
 
 import { AppDispatch, RootState } from '../store'
@@ -31,6 +31,7 @@ const appRedisCommandsSlice = createSlice({
       state.commandGroups = uniqBy(Object.values(payload), 'group')
         .map((item: ICommand) => item.group)
         .filter((group: string) => isString(group))
+        .filter((group: string) => !checkDeprecatedCommandGroup(group))
     },
     getRedisCommandsFailure: (state, { payload }) => {
       state.loading = false

redisinsight/ui/src/utils/cliHelper.tsx

@@ -6,7 +6,7 @@ import { isUndefined } from 'lodash'
 import { localStorageService } from 'uiSrc/services'
 import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli'
 import { resetOutput, updateCliCommandHistory } from 'uiSrc/slices/cli/cli-output'
-import { BrowserStorageItem, ICommands } from 'uiSrc/constants'
+import { BrowserStorageItem, ICommands, CommandGroup } from 'uiSrc/constants'
 import { ModuleCommandPrefix } from 'uiSrc/pages/workbench/constants'
 import { SelectCommand } from 'uiSrc/constants/cliOutput'
 import {
@@ -218,12 +218,19 @@ const getCommandNameFromQuery = (
   }
 }
 
-const DEPRECATED_MODULES_PREFIXES = [
+const DEPRECATED_MODULE_PREFIXES = [
   ModuleCommandPrefix.Graph
 ]
 
+const DEPRECATED_MODULE_GROUPS = [
+  CommandGroup.Graph
+]
+
 const checkDeprecatedModuleCommand = (command: string) =>
-  DEPRECATED_MODULES_PREFIXES.some((prefix) => command.startsWith(prefix))
+  DEPRECATED_MODULE_PREFIXES.some((prefix) => command.startsWith(prefix))
+
+const checkDeprecatedCommandGroup = (item: string) =>
+  DEPRECATED_MODULE_GROUPS.some((group) => group === item)
 
 const removeDeprecatedModuleCommands = (commands: string[]) => commands
   .filter((command) => !checkDeprecatedModuleCommand(command))
@@ -248,4 +255,5 @@ export {
   replaceEmptyValue,
   removeDeprecatedModuleCommands,
   checkDeprecatedModuleCommand,
+  checkDeprecatedCommandGroup,
 }

redisinsight/ui/src/utils/tests/cliHelper.spec.ts

@@ -11,6 +11,7 @@ import {
   replaceEmptyValue,
   removeDeprecatedModuleCommands,
   checkDeprecatedModuleCommand,
+  checkDeprecatedCommandGroup,
 } from 'uiSrc/utils'
 import { MOCK_COMMANDS_SPEC } from 'uiSrc/constants'
 import { render, screen } from 'uiSrc/utils/test-utils'
@@ -124,6 +125,35 @@ const removeDeprecatedModuleCommandsTests = [
   { input: ['FOO', 'GRAPH.FOO', 'CF.FOO', 'GRAPH.BAR'], expected: ['FOO', 'CF.FOO'] },
 ]
 
+const checkDeprecatedCommandGroupTests = [
+  { input: 'cluster', expected: false },
+  { input: 'connection', expected: false },
+  { input: 'geo', expected: false },
+  { input: 'bitmap', expected: false },
+  { input: 'generic', expected: false },
+  { input: 'pubsub', expected: false },
+  { input: 'scripting', expected: false },
+  { input: 'transactions', expected: false },
+  { input: 'server', expected: false },
+  { input: 'sorted-set', expected: false },
+  { input: 'hyperloglog', expected: false },
+  { input: 'hash', expected: false },
+  { input: 'set', expected: false },
+  { input: 'stream', expected: false },
+  { input: 'list', expected: false },
+  { input: 'string', expected: false },
+  { input: 'search', expected: false },
+  { input: 'json', expected: false },
+  { input: 'timeseries', expected: false },
+  { input: 'graph', expected: true },
+  { input: 'ai', expected: false },
+  { input: 'tdigest', expected: false },
+  { input: 'cms', expected: false },
+  { input: 'topk', expected: false },
+  { input: 'bf', expected: false },
+  { input: 'cf', expected: false },
+]
+
 describe('getCommandNameFromQuery', () => {
   test.each(getCommandNameFromQueryTests)('%j', ({ input, expected }) => {
     // @ts-ignore
@@ -211,3 +241,9 @@ describe('removeDeprecatedModuleCommands', () => {
     expect(removeDeprecatedModuleCommands(input)).toEqual(expected)
   })
 })
+
+describe('checkDeprecatedCommandGroup', () => {
+  test.each(checkDeprecatedCommandGroupTests)('%j', ({ input, expected }) => {
+    expect(checkDeprecatedCommandGroup(input)).toEqual(expected)
+  })
+})