Skip to content

Web console: fix NPE in number formatting #16760

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
vogievetsky merged 1 commit into from
Jul 19, 2024
Merged

Web console: fix NPE in number formatting #16760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion web-console/src/components/record-table-pane/record-table-pane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
columnToWidth,
formatNumber,
getNumericColumnBraces,
isNumberLike,
} from '../../utils';
import { BracedText } from '../braced-text/braced-text';
import { CellFilterMenu } from '../cell-filter-menu/cell-filter-menu';
Expand Down Expand Up @@ -157,7 +158,7 @@ export const RecordTablePane = React.memo(function RecordTablePane(props: Record
{numericColumnBraces[i] ? (
<BracedText
className="table-padding"
text={formatNumber(value)}
text={isNumberLike(value) ? formatNumber(value) : String(value)}
braces={numericColumnBraces[i]}
padFractionalPart
/>
Expand Down
10 changes: 10 additions & 0 deletions web-console/src/utils/general.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
formatInteger,
formatMegabytes,
formatMillions,
formatNumber,
formatPercent,
hashJoaat,
moveElement,
Expand Down Expand Up @@ -96,6 +97,15 @@ describe('general', () => {
});
});

describe('formatNumber', () => {
it('works', () => {
expect(formatNumber(null as any)).toEqual('0');
expect(formatNumber(0)).toEqual('0');
expect(formatNumber(5)).toEqual('5');
expect(formatNumber(5.1)).toEqual('5.1');
});
});

describe('formatInteger', () => {
it('works', () => {
expect(formatInteger(10000)).toEqual('10,000');
Expand Down
2 changes: 1 addition & 1 deletion web-console/src/utils/general.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export function formatInteger(n: NumberLike): string {
}

export function formatNumber(n: NumberLike): string {
return n.toLocaleString('en-US', { maximumFractionDigits: 20 });
return (n || 0).toLocaleString('en-US', { maximumFractionDigits: 20 });
}

export function formatRate(n: NumberLike) {
Expand Down
6 changes: 2 additions & 4 deletions web-console/src/utils/table-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import type { QueryResult } from '@druid-toolkit/query';
import { C } from '@druid-toolkit/query';
import type { Filter } from 'react-table';

import { filterMap, formatNumber, oneOf } from './general';
import { filterMap, formatNumber, isNumberLike, oneOf } from './general';
import { deepSet } from './object-change';

export interface Pagination {
Expand Down Expand Up @@ -55,9 +55,7 @@ export function getNumericColumnBraces(
queryResult.header.forEach((column, i) => {
if (!oneOf(column.nativeType, 'LONG', 'FLOAT', 'DOUBLE')) return;
const formatter = columnHints?.get(column.name)?.formatter || formatNumber;
const braces = filterMap(rows, row =>
oneOf(typeof row[i], 'number', 'bigint') ? formatter(row[i]) : undefined,
);
const braces = filterMap(rows, row => (isNumberLike(row[i]) ? formatter(row[i]) : undefined));
if (braces.length) {
numericColumnBraces[i] = braces;
}
Expand Down