Skip to content

Commit f30f7be

Browse files
Merge branch 'main' into fe/bugfix/RI-6547-table-result-tooltip-text-ellipsis
2 parents 0ae7a26 + 5110c8d commit f30f7be

File tree

4 files changed

+24
-6
lines changed

4 files changed

+24
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
"tsconfig-paths-webpack-plugin": "^4.1.0",
208208
"typescript": "^4.0.5",
209209
"url-loader": "^4.1.0",
210-
"vite": "^5.4.9",
210+
"vite": "^5.4.12",
211211
"vite-bundle-visualizer": "1.0.1",
212212
"vite-plugin-compression2": "^1.1.0",
213213
"vite-plugin-ejs": "^1.7.0",

redisinsight/ui/src/components/query/query-card/QueryCard.spec.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,24 @@ describe('QueryCard', () => {
158158
expect(queryCliResultEl).toBeInTheDocument()
159159
})
160160

161+
it('should render properly result when it has pure number', () => {
162+
const { getByTestId } = render(
163+
<QueryCard
164+
{...instance(mockedProps)}
165+
resultsMode={ResultsMode.GroupMode}
166+
result={[{
167+
status: CommandExecutionStatus.Success,
168+
response: 1,
169+
}]}
170+
isOpen
171+
command="del key"
172+
/>
173+
)
174+
const queryCliResultEl = getByTestId('query-cli-result')
175+
176+
expect(queryCliResultEl.textContent).toBe('(integer) 1')
177+
})
178+
161179
it('should render QueryCardCliResult when result reached response size threshold even w/o flag', () => {
162180
const { queryByTestId } = render(
163181
<QueryCard

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const QueryCard = (props: Props) => {
155155
const isSizeLimitExceededResponse = (result: Maybe<CommandExecutionResult[]>) => {
156156
const resultObj = result?.[0]
157157
// response.includes - to be backward compatible with responses which don't include sizeLimitExceeded flag
158-
return resultObj?.sizeLimitExceeded === true || resultObj?.response?.includes('Results have been deleted')
158+
return resultObj?.sizeLimitExceeded === true || resultObj?.response?.includes?.('Results have been deleted')
159159
}
160160

161161
return (

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13756,10 +13756,10 @@ vite-plugin-svgr@^4.2.0:
1375613756
"@svgr/core" "^8.1.0"
1375713757
"@svgr/plugin-jsx" "^8.1.0"
1375813758

13759-
vite@^5.4.9:
13760-
version "5.4.9"
13761-
resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.9.tgz#215c80cbebfd09ccbb9ceb8c0621391c9abdc19c"
13762-
integrity sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==
13759+
vite@^5.4.12:
13760+
version "5.4.12"
13761+
resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.12.tgz#627d12ff06de3942557dfe8632fd712a12a072c7"
13762+
integrity sha512-KwUaKB27TvWwDJr1GjjWthLMATbGEbeWYZIbGZ5qFIsgPP3vWzLu4cVooqhm5/Z2SPDUMjyPVjTztm5tYKwQxA==
1376313763
dependencies:
1376413764
esbuild "^0.21.3"
1376513765
postcss "^8.4.43"

0 commit comments

Comments
 (0)