Skip to content

RI-5523: Fallback to non-native big integers for JSON formatting #3231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 6, 2024
Merged

RI-5523: Fallback to non-native big integers for JSON formatting #3231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75d1b2e
Add fallback to non big int option to cover large floats
GnaneshKunal May 15, 2024
ff88105
Merge remote-tracking branch 'origin/main' into bugfix/RI-5523-allow-…
GnaneshKunal May 25, 2024
0141a32
On JSON Big number detection, show it as primitive
GnaneshKunal May 25, 2024
a748971
Remove falling back and use the exposed useNativeInt var
GnaneshKunal May 26, 2024
a3eb706
Remove unnecessay fallback prop
GnaneshKunal May 26, 2024
ef60b6b
Add unit tests for jsonpretty big number rendering
GnaneshKunal May 26, 2024
ebb3b8c
Remove '}' character
GnaneshKunal May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions redisinsight/ui/src/components/json-viewer/components/json-pretty/JsonPretty.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import JSONBigInt from 'json-bigint'
import { render, screen } from 'uiSrc/utils/test-utils'

import JsonPretty from './JsonPretty'
Expand All @@ -24,4 +25,16 @@ describe('JsonPretty', () => {

expect(screen.getByTestId('json-primitive-component')).toBeInTheDocument()
})

it('should render json primitive component with big number', () => {
const json = JSONBigInt({ useNativeBigInt: true }).parse('1234567890123456789012345678901234567890')
render(<JsonPretty data={json} />)
expect(screen.getByTestId('json-primitive-component')).toBeInTheDocument()
})

it('should render json primitive component with big float', () => {
const json = JSONBigInt({ useNativeBigInt: false }).parse('1234567890123456789012345678901234567890.1234567890123456789012345678901234567890')
render(<JsonPretty data={json} />)
expect(screen.getByTestId('json-primitive-component')).toBeInTheDocument()
})
})
4 changes: 4 additions & 0 deletions redisinsight/ui/src/components/json-viewer/components/json-pretty/JsonPretty.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ import { isArray, isObject } from 'uiSrc/components/json-viewer/utils'
import { IDefaultProps } from 'uiSrc/components/json-viewer/interfaces'

const JsonPretty = ({ data, ...props }: IDefaultProps) => {
if (data?._isBigNumber) {
return <JsonPrimitive data={data} {...props} />
}

if (isArray(data)) {
return <JsonArray data={data} {...props} />
}
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/utils/formatters/valueFormatters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const bufferToJSON = (
reply: RedisResponseBuffer,
props: FormattingProps
): { value: JSX.Element | string, isValid: boolean } =>
JSONViewer({ value: bufferToUTF8(reply), ...props })
JSONViewer({ value: bufferToUTF8(reply), useNativeBigInt: false, ...props })

const formattingBuffer = (
reply: RedisResponseBuffer,
Expand Down