Skip to content

fix(pivot-table): apply safeHtmlSpan for cells in the pivot table chart #33452

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

Closed
richardfogaca wants to merge 1 commit into from
Closed

fix(pivot-table): apply safeHtmlSpan for cells in the pivot table chart #33452

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
16 changes: 12 additions & 4 deletions superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ function displayHeaderCell(
);
}

function renderFormattedValue(formattedValue, allowRenderHtml) {
if (allowRenderHtml && typeof formattedValue === 'string') {
return safeHtmlSpan(formattedValue);
}
return formattedValue;
}

export class TableRenderer extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -742,7 +749,7 @@ export class TableRenderer extends Component {
onContextMenu={e => this.props.onContextMenu(e, colKey, rowKey)}
style={style}
>
{agg.format(aggValue)}
{renderFormattedValue(agg.format(aggValue), allowRenderHtml)}
</td>
);
});
Expand All @@ -759,7 +766,7 @@ export class TableRenderer extends Component {
onClick={rowTotalCallbacks[flatRowKey]}
onContextMenu={e => this.props.onContextMenu(e, undefined, rowKey)}
>
{agg.format(aggValue)}
{renderFormattedValue(agg.format(aggValue), allowRenderHtml)}
</td>
);
}
Expand All @@ -785,6 +792,7 @@ export class TableRenderer extends Component {
pivotData,
colTotalCallbacks,
grandTotalCallback,
allowRenderHtml,
} = pivotSettings;

const totalLabelCell = (
Expand Down Expand Up @@ -823,7 +831,7 @@ export class TableRenderer extends Component {
onContextMenu={e => this.props.onContextMenu(e, colKey, undefined)}
style={{ padding: '5px' }}
>
{agg.format(aggValue)}
{renderFormattedValue(agg.format(aggValue), allowRenderHtml)}
</td>
);
});
Expand All @@ -840,7 +848,7 @@ export class TableRenderer extends Component {
onClick={grandTotalCallback}
onContextMenu={e => this.props.onContextMenu(e, undefined, undefined)}
>
{agg.format(aggValue)}
{renderFormattedValue(agg.format(aggValue), allowRenderHtml)}
</td>
);
}
Expand Down