From 1ca3e3e7ff33e7f5ad6a17add1ae3af84c88135d Mon Sep 17 00:00:00 2001 From: Gabriel Hernandez Date: Fri, 8 Mar 2024 15:46:38 +0000 Subject: [PATCH] remove unneeded table boarders on mdm page (#17492) remove unneeded header boarders on mdm pages. **before:** ![image](https://github.com/fleetdm/fleet/assets/1153709/6fd93f49-1218-468c-a83b-aa80ca7b0384) **after:** ![image](https://github.com/fleetdm/fleet/assets/1153709/ad885532-c88e-474e-b88c-90155c5416e3) - [x] Manual QA for all new/changed functionality --- .../DiskEncryptionTable/DiskEncryptionTableConfig.tsx | 7 +------ .../components/DiskEncryptionTable/_styles.scss | 4 ++++ .../components/OSVersionTable/OSVersionTableConfig.tsx | 2 +- .../OSUpdates/components/OSVersionTable/_styles.scss | 4 ++++ .../components/BootstrapPackageTable/_styles.scss | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/DiskEncryptionTableConfig.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/DiskEncryptionTableConfig.tsx index f709acfcf5..49c447bcb4 100644 --- a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/DiskEncryptionTableConfig.tsx +++ b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/DiskEncryptionTableConfig.tsx @@ -86,10 +86,7 @@ const defaultTableHeaders: IDataColumn[] = [ ), disableSortBy: true, accessor: "macosHosts", - Cell: ({ - cell: { value: aggregateCount }, - row: { original }, - }: ICellProps) => { + Cell: ({ cell: { value: aggregateCount } }: ICellProps) => { return (
<>{val}} /> @@ -191,8 +188,6 @@ const STATUS_CELL_VALUES: Record = { }, }; -type StatusEntry = [DiskEncryptionStatus, IDiskEncryptionStatusAggregate]; - // Order of the status column. We want the order to always be the same. const STATUS_ORDER = [ "verified", diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/_styles.scss b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/_styles.scss index 0a4456453e..4b9fe65d32 100644 --- a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/_styles.scss +++ b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/_styles.scss @@ -5,6 +5,10 @@ min-width: auto; } + .data-table-block th:nth-last-child(2) { + border-right: none; + } + @media (max-width: $break-md) { .view-hosts-link { span { diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTableConfig.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTableConfig.tsx index 0b69cca6c1..7180a4a432 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTableConfig.tsx +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTableConfig.tsx @@ -60,7 +60,7 @@ export const generateTableHeaders = (teamId: number) => { /> ), Cell: ({ row }: IHostCellProps): JSX.Element => { - const { hosts_count, name_only, version } = row.original; + const { hosts_count } = row.original; return ; }, }, diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/_styles.scss b/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/_styles.scss index 1e5eceb61c..89b97eddda 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/_styles.scss +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/_styles.scss @@ -15,4 +15,8 @@ opacity: 1; } } + + .data-table-block th:nth-last-child(2) { + border-right: none; + } } diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageTable/_styles.scss b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageTable/_styles.scss index a64ae509ff..3533b35ffc 100644 --- a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageTable/_styles.scss +++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageTable/_styles.scss @@ -10,7 +10,7 @@ min-width: auto; } - th:nth-last-child(2) { + .data-table-block th:nth-last-child(2) { border-right: 0; }