diff --git a/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx b/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx index a70ca52232..5ea13ee6b3 100644 --- a/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx +++ b/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx @@ -71,6 +71,7 @@ export function HeaderCell({ sortBy, columnIndex, idPrefix, + className, children, }) { const sort = sortKey @@ -81,7 +82,11 @@ export function HeaderCell({ } : null; return ( - + {children} ); diff --git a/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx b/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx index 42bf01a638..fcfb250a01 100644 --- a/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx +++ b/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx @@ -1,3 +1,4 @@ +import 'styled-components/macro'; import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import { TableComposable, Tbody } from '@patternfly/react-table'; @@ -88,13 +89,13 @@ function PaginatedTable({ ); } else { Content = ( - <> +
{hasContentLoading && } {headerRow} {items.map(renderRow)} - +
); } diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx index c9594e4e17..e152e7cde8 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx @@ -195,9 +195,6 @@ function InventoryList({ i18n }) { {i18n._(t`Status`)} {i18n._(t`Type`)} {i18n._(t`Organization`)} - {i18n._(t`Groups`)} - {i18n._(t`Hosts`)} - {i18n._(t`Sources`)} {i18n._(t`Actions`)} } diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx index d10dbf2a0a..91f7681f98 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx @@ -89,11 +89,6 @@ function InventoryListItem({ {inventory?.summary_fields?.organization?.name} - {inventory.total_groups} - {inventory.total_hosts} - - {inventory.total_inventory_sources} - {inventory.pending_deletion ? (