From bd907244c45651f1449d10bb4694da59b6f66321 Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Mon, 19 Feb 2024 14:37:13 +0800 Subject: [PATCH] chore: don't hide columns in connected instances table (#6264) Don't hide anything yet, so remove related code. Plus other code we don't need has been removed. --- .../ConnectedInstances/ConnectedInstances.tsx | 15 +------ .../ConnectedInstancesTable.tsx | 40 +------------------ .../useConnectedInstancesTable.tsx | 6 --- 3 files changed, 3 insertions(+), 58 deletions(-) diff --git a/frontend/src/component/application/ConnectedInstances/ConnectedInstances.tsx b/frontend/src/component/application/ConnectedInstances/ConnectedInstances.tsx index 22bb1718e2..b3b05592e1 100644 --- a/frontend/src/component/application/ConnectedInstances/ConnectedInstances.tsx +++ b/frontend/src/component/application/ConnectedInstances/ConnectedInstances.tsx @@ -26,28 +26,17 @@ export const ConnectedInstances = () => { ); }, [application]); - const { - getTableProps, - getTableBodyProps, - headerGroups, - rows, - prepareRow, - state: { globalFilter }, - setHiddenColumns, - columns, - } = useConnectedInstancesTable(tableData); + const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow } = + useConnectedInstancesTable(tableData); return ( ); }; diff --git a/frontend/src/component/application/ConnectedInstances/ConnectedInstancesTable.tsx b/frontend/src/component/application/ConnectedInstances/ConnectedInstancesTable.tsx index 0e0a995967..8108ba4bf9 100644 --- a/frontend/src/component/application/ConnectedInstances/ConnectedInstancesTable.tsx +++ b/frontend/src/component/application/ConnectedInstances/ConnectedInstancesTable.tsx @@ -11,27 +11,11 @@ import { TableCell, TablePlaceholder, } from 'component/common/Table'; -import { - Box, - styled, - Table, - TableBody, - TableRow, - useMediaQuery, -} from '@mui/material'; -import theme from 'themes/theme'; +import { Box, Table, TableBody, TableRow } from '@mui/material'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; -import { useConditionallyHiddenColumns } from 'hooks/useConditionallyHiddenColumns'; - -const hiddenColumnsSmall = ['ip', 'sdkVersion']; -const hiddenColumnsCompact = ['ip', 'sdkVersion', 'lastSeen']; - type ConnectedInstancesTableProps = { - compact?: boolean; loading: boolean; - setHiddenColumns: (param: any) => void; - columns: any[]; rows: Row[]; prepareRow: (row: Row) => void; getTableProps: ( @@ -41,37 +25,15 @@ type ConnectedInstancesTableProps = { propGetter?: TableBodyPropGetter | undefined, ) => TableBodyProps; headerGroups: HeaderGroup[]; - globalFilter: any; }; export const ConnectedInstancesTable = ({ - compact = false, - setHiddenColumns, - columns, loading, rows, getTableProps, getTableBodyProps, headerGroups, - globalFilter, prepareRow, }: ConnectedInstancesTableProps) => { - const isSmallScreen = useMediaQuery(theme.breakpoints.down('md')); - - useConditionallyHiddenColumns( - [ - { - condition: isSmallScreen, - columns: hiddenColumnsSmall, - }, - { - condition: compact, - columns: hiddenColumnsCompact, - }, - ], - setHiddenColumns, - columns, - ); - return ( <> diff --git a/frontend/src/component/application/ConnectedInstances/useConnectedInstancesTable.tsx b/frontend/src/component/application/ConnectedInstances/useConnectedInstancesTable.tsx index e00dc6730e..234b1d8aa1 100644 --- a/frontend/src/component/application/ConnectedInstances/useConnectedInstancesTable.tsx +++ b/frontend/src/component/application/ConnectedInstances/useConnectedInstancesTable.tsx @@ -1,13 +1,7 @@ import { useMemo } from 'react'; -import { IApiToken } from 'hooks/api/getters/useApiTokens/useApiTokens'; -import { DateCell } from 'component/common/Table/cells/DateCell/DateCell'; import { HighlightCell } from 'component/common/Table/cells/HighlightCell/HighlightCell'; -import { IconCell } from 'component/common/Table/cells/IconCell/IconCell'; -import { TimeAgoCell } from 'component/common/Table/cells/TimeAgoCell/TimeAgoCell'; import { useTable, useGlobalFilter, useSortBy } from 'react-table'; import { sortTypes } from 'utils/sortTypes'; -import { ProjectsList } from 'component/admin/apiToken/ProjectsList/ProjectsList'; -import { Key } from '@mui/icons-material'; type ConnectedInstancesTableData = { instanceId: string;