IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Table: JSON Cell should try to convert strings to JSON (#26024)

Browse Source
This commit is contained in:
Ryan McKinley 2020-07-03 01:23:32 -07:00 committed by GitHub
parent 634d8d60d6
commit 3acc2a6ac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/grafana-ui/src/components/Table/JSONViewCell.tsx
View File

@ -3,6 +3,7 @@ import { css, cx } from 'emotion';
import { TableCellProps } from './types'; import { TableCellProps } from './types';
import { Tooltip } from '../Tooltip/Tooltip'; import { Tooltip } from '../Tooltip/Tooltip';
import { JSONFormatter } from '../JSONFormatter/JSONFormatter'; import { JSONFormatter } from '../JSONFormatter/JSONFormatter';
import { isString } from 'lodash';
export const JSONViewCell: FC<TableCellProps> = props => { export const JSONViewCell: FC<TableCellProps> = props => {
const { field, cell, tableStyles } = props; const { field, cell, tableStyles } = props;
@ -16,8 +17,16 @@ export const JSONViewCell: FC<TableCellProps> = props => {
font-family: monospace; font-family: monospace;
`; `;
const displayValue = JSON.stringify(cell.value); let value = cell.value;
const content = <JSONTooltip value={cell.value} />; let displayValue = value;
if (isString(value)) {
try {
value = JSON.parse(value);
} catch {} // ignore errors
} else {
displayValue = JSON.stringify(value);
}
const content = <JSONTooltip value={value} />;
return ( return (
<div className={cx(txt, tableStyles.tableCell)}> <div className={cx(txt, tableStyles.tableCell)}>
<Tooltip placement="auto" content={content} theme={'info'}> <Tooltip placement="auto" content={content} theme={'info'}>