Skip to content

Commit 1aa596f

Browse files
#RI-3788-fix monitor command in group mode
1 parent 92e2785 commit 1aa596f

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

redisinsight/ui/src/components/query-card/QueryCardCliGroupResult/QueryCardCliGroupResult.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import { flatten } from 'lodash'
22
import React from 'react'
33

44
import { CommandExecutionResult } from 'uiSrc/slices/interfaces'
5-
import { cliParseCommandsGroupResult, Maybe } from 'uiSrc/utils'
5+
import { cliParseCommandsGroupResult, wbSummaryCommand, Maybe } from 'uiSrc/utils'
66
import QueryCardCliDefaultResult from '../QueryCardCliDefaultResult'
7+
import { CommonErrorResponse } from '../QueryCardCommonResult'
78

89
export interface Props {
910
result?: Maybe<CommandExecutionResult[]>
@@ -12,12 +13,18 @@ export interface Props {
1213

1314
const QueryCardCliGroupResult = (props: Props) => {
1415
const { result = [], isFullScreen } = props
16+
1517
return (
1618
<div data-testid="query-cli-default-result" className="query-card-output-response-success">
1719
<QueryCardCliDefaultResult
1820
isFullScreen={isFullScreen}
19-
items={flatten(result?.[0]?.response.map((item: any) =>
20-
flatten(cliParseCommandsGroupResult(item))))}
21+
items={flatten(result?.[0]?.response.map((item: any) => {
22+
const commonError = CommonErrorResponse(item.command, item.response)
23+
if (React.isValidElement(commonError)) {
24+
return ([wbSummaryCommand(item.command), commonError])
25+
}
26+
return flatten(cliParseCommandsGroupResult(item))
27+
}))}
2128
/>
2229
</div>
2330
)

redisinsight/ui/src/utils/cliHelper.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,6 @@ export {
197197
checkBlockingCommand,
198198
checkUnsupportedModuleCommand,
199199
getDbIndexFromSelectQuery,
200-
getCommandNameFromQuery
200+
getCommandNameFromQuery,
201+
wbSummaryCommand
201202
}

0 commit comments

Comments
 (0)