Skip to content

Commit 0975e0e

Browse files
Merge pull request #1307 from RedisInsight/fe/feature/bugfixing
#RI-3690, #RI-3692, #RI-3693
2 parents 1513d57 + 35248aa commit 0975e0e

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import { isArray } from 'lodash'
55

66
import { CommandExecutionResult } from 'uiSrc/slices/interfaces'
77
import { ResultsMode } from 'uiSrc/slices/interfaces/workbench'
8-
import { formatToText, isGroupMode, Maybe } from 'uiSrc/utils'
8+
import { cliParseTextResponse, formatToText, isGroupMode, Maybe } from 'uiSrc/utils'
99

10+
import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli'
1011
import QueryCardCliDefaultResult from '../QueryCardCliDefaultResult'
1112
import QueryCardCliGroupResult from '../QueryCardCliGroupResult'
1213
import styles from './styles.module.scss'
@@ -27,7 +28,7 @@ const QueryCardCliResultWrapper = (props: Props) => {
2728
return (
2829
<div className={cx('queryResultsContainer', styles.container)}>
2930
{!loading && (
30-
<div data-testid="query-cli-result" style={{ height: '100%' }}>
31+
<div data-testid="query-cli-result" className={cx(styles.content)}>
3132
{isNotStored && (
3233
<EuiText className={styles.alert} data-testid="query-cli-warning">
3334
<EuiIcon type="alert" className={styles.alertIcon} />
@@ -39,7 +40,11 @@ const QueryCardCliResultWrapper = (props: Props) => {
3940
: (
4041
<QueryCardCliDefaultResult
4142
isFullScreen={isFullScreen}
42-
items={formatToText(result[0].response || '(nil)', query).split('\n')}
43+
items={
44+
result[0].status === CommandExecutionStatus.Success
45+
? formatToText(result[0].response || '(nil)', query).split('\n')
46+
: [cliParseTextResponse(result[0].response || '(nil)', '', result[0].status)]
47+
}
4348
/>
4449
)}
4550
</div>

redisinsight/ui/src/components/query-card/QueryCardCliResultWrapper/styles.module.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
}
2626
}
2727

28+
.content {
29+
display: flex;
30+
flex-direction: column;
31+
height: 100%;
32+
}
33+
2834
.loading {
2935
height: 17px;
3036
max-width: 600px;

redisinsight/ui/src/components/query-card/styles.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
}
6666

6767
:global(.fullscreen .query-card-output-response-success) {
68+
height: 100%;
6869
max-height: calc(100vh - 65px);
6970
display: flex;
7071
}

0 commit comments

Comments
 (0)