From 1d00ac9dede038d1a4d49b30046e4110430669f7 Mon Sep 17 00:00:00 2001 From: Yevhen Shevchenko <90138953+yeshev@users.noreply.github.com> Date: Thu, 6 Jul 2023 17:32:21 +0300 Subject: [PATCH] feat: remove date column table (#3060) * feat: remove date column table * fix: condition for hiding date * fix: remove timestamp column from query table --------- Co-authored-by: Vishal Sharma --- .../src/container/QueryTable/QueryTable.tsx | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/frontend/src/container/QueryTable/QueryTable.tsx b/frontend/src/container/QueryTable/QueryTable.tsx index d08abbd592..309b0fd338 100644 --- a/frontend/src/container/QueryTable/QueryTable.tsx +++ b/frontend/src/container/QueryTable/QueryTable.tsx @@ -1,10 +1,5 @@ -import type { ColumnsType } from 'antd/es/table'; import { ResizeTable } from 'components/ResizeTable'; -import dayjs from 'dayjs'; -import { - createTableColumnsFromQuery, - RowData, -} from 'lib/query/createTableColumnsFromQuery'; +import { createTableColumnsFromQuery } from 'lib/query/createTableColumnsFromQuery'; import { useMemo } from 'react'; import { QueryTableProps } from './QueryTable.intefaces'; @@ -26,23 +21,11 @@ export function QueryTable({ [query, queryTableData, renderActionCell], ); - const modifiedColumns = useMemo(() => { - const currentColumns: ColumnsType = columns.map((column) => - column.key === 'timestamp' - ? { - ...column, - render: (_, record): string => - dayjs(new Date(record.timestamp)).format('MMM DD, YYYY, HH:mm:ss'), - } - : column, - ); - - return currentColumns; - }, [columns]); + const filteredColumns = columns.filter((item) => item.key !== 'timestamp'); const tableColumns = modifyColumns - ? modifyColumns(modifiedColumns) - : modifiedColumns; + ? modifyColumns(filteredColumns) + : filteredColumns; return (