Skip to content
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

Hotfix array columns not working properly in TableWidget #802

Merged
merged 3 commits into from
Nov 23, 2023
Merged

Hotfix array columns not working properly in TableWidget #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
587254a
Hotfix Parse array columns properly
Josmorsot Nov 23, 2023
06cf5d4
update CHANGELOG
Josmorsot Nov 23, 2023
79d500c
Merge branch 'master' into bug/sc-365844/eqt-partners-carto-3-account…
VictorVelarde Nov 23, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Not released

- Fix TableWidget cannot render columns when it contains an array [#802](https://github.com/CartoDB/carto-react/pull/802)
- Allow server-side table widget without hard limit [#798](https://github.com/CartoDB/carto-react/pull/798)

## 2.2
Expand Down
4 changes: 4 additions & 0 deletions packages/react-ui/src/widgets/TableWidgetUI/TableWidgetUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ function TableBodyComponent({ columns, rows, onRowClick }) {
})?.[1];
if (typeof cellValue === 'bigint') {
cellValue = cellValue.toString(); // otherwise TableCell will fail for displaying it
} else if (Array.isArray(cellValue)) {
cellValue = `[${cellValue
.map((c) => (typeof c === 'string' ? `"${c}"` : c))
.join(', ')}]`;
}
return (
(headerName || field) && (
Expand Down
2 changes: 2 additions & 0 deletions packages/react-widgets/src/models/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ function getSqlEscapedSource(table, provider) {
export function normalizeObjectKeys(el) {
if (Array.isArray(el)) {
return el.map(normalizeObjectKeys);
} else if (typeof el !== 'object') {
return el;
}

return Object.entries(el).reduce((acc, [key, value]) => {
Expand Down