diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx index 374609b6bb9..d356f6d4a86 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx +++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx @@ -120,7 +120,7 @@ export default typedMemo(function DataTable({ onServerPaginationChange, rowCount, selectPageSize, - noResults: noResultsText = 'No data found', + noResults: noResultsText = t('No data found'), hooks, serverPagination, wrapperRef: userWrapperRef, diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx index 59a7faff912..be0fe1c5f9f 100644 --- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx +++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx @@ -952,6 +952,7 @@ export default function TableChart( i: number, ): ColumnWithLooseAccessor & { columnKey: string; + columnLabel: string; } => { const { key, @@ -1040,6 +1041,7 @@ export default function TableChart( // typing is incorrect in current version of `@types/react-table` // so we ask TS not to check. columnKey: key, + columnLabel: label, accessor: ((datum: D) => datum[key]) as never, Cell: ({ value, row }: { value: DataRecordValue; row: Row }) => { const [isHtml, text] = formatColumnValue(column, value, row.original); @@ -1457,13 +1459,14 @@ export default function TableChart( columns as unknown as ColumnWithLooseAccessor & { columnKey: string; + columnLabel: string; sortType?: string; }[] ) .filter(col => col?.sortType === 'alphanumeric') .map(column => ({ value: column.columnKey, - label: column.columnKey, + label: column.columnLabel, })); if (!isEqual(options, searchOptions)) {