QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(data-table): make formatted dttm the default (#20140)

Browse Source 
fix test
This commit is contained in:
Ville Brofeldt
2022-05-20 15:39:10 +03:00
committed by GitHub
parent d8117f7e37
commit 0bcc21bc45
9 changed files with 199 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.test.tsx
View File

@@ -151,7 +151,7 @@ describe('DataTablesPane', () => {
useRedux: true,
initialState: {
explore: {
timeFormattedColumns: {
originalFormattedTimeColumns: {
'34__table': ['__timestamp'],
},
},
@@ -203,7 +203,7 @@ describe('DataTablesPane', () => {
useRedux: true,
initialState: {
explore: {
timeFormattedColumns: {
originalFormattedTimeColumns: {
'34__table': ['__timestamp'],
},
},

14
superset-frontend/src/explore/components/DataTablesPane/index.tsx
View File

@@ -52,7 +52,7 @@ import {
useTableColumns,
} from 'src/explore/components/DataTableControl';
import { applyFormattingToTabularData } from 'src/utils/common';
import { useTimeFormattedColumns } from '../useTimeFormattedColumns';
import { useOriginalFormattedTimeColumns } from '../useOriginalFormattedTimeColumns';
const RESULT_TYPES = {
results: 'results' as const,
@@ -147,7 +147,8 @@ const DataTable = ({
errorMessage,
type,
}: DataTableProps) => {
const timeFormattedColumns = useTimeFormattedColumns(datasource);
const originalFormattedTimeColumns =
useOriginalFormattedTimeColumns(datasource);
// this is to preserve the order of the columns, even if there are integer values,
// while also only grabbing the first column's keys
const columns = useTableColumns(
@@ -155,7 +156,7 @@ const DataTable = ({
columnTypes,
data,
datasource,
timeFormattedColumns,
originalFormattedTimeColumns,
);
const filteredData = useFilteredTableData(filterText, data);
@@ -210,10 +211,11 @@ const TableControls = ({
columnNames: string[];
isLoading: boolean;
}) => {
const timeFormattedColumns = useTimeFormattedColumns(datasourceId);
const originalFormattedTimeColumns =
useOriginalFormattedTimeColumns(datasourceId);
const formattedData = useMemo(
() => applyFormattingToTabularData(data, timeFormattedColumns),
[data, timeFormattedColumns],
() => applyFormattingToTabularData(data, originalFormattedTimeColumns),
[data, originalFormattedTimeColumns],
);
return (
<TableControlsWrapper>