From a74fe57691958a215334a9da0b24d9fc7d0ef857 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 28 Jan 2021 16:34:46 -0800
Subject: [PATCH] remove extra inventory columns; add horizontal scroll to wide
 tables

---
 .../PaginatedTable/PaginatedTable.jsx           |  5 +++--
 .../Inventory/InventoryList/InventoryList.jsx   | 12 ------------
 .../InventoryList/InventoryListItem.jsx         | 17 -----------------
 3 files changed, 3 insertions(+), 31 deletions(-)

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 = (
-      <>
+      <div css="overflow: scroll">
         {hasContentLoading && <LoadingSpinner />}
         <TableComposable aria-label={dataListLabel}>
           {headerRow}
           <Tbody>{items.map(renderRow)}</Tbody>
         </TableComposable>
-      </>
+      </div>
     );
   }
 
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
index fe3dffdf35..e152e7cde8 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
@@ -1,6 +1,5 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import { useLocation, useRouteMatch, Link } from 'react-router-dom';
-import styled from 'styled-components';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
@@ -19,14 +18,6 @@ import useWsInventories from './useWsInventories';
 import AddDropDownButton from '../../../components/AddDropDownButton';
 import InventoryListItem from './InventoryListItem';
 
-const ResponsiveHeaderCell = styled(HeaderCell)`
-  @media (max-width: 992px) {
-    && {
-      display: none;
-    }
-  }
-`;
-
 const QS_CONFIG = getQSConfig('inventory', {
   page: 1,
   page_size: 20,
@@ -204,9 +195,6 @@ function InventoryList({ i18n }) {
               <HeaderCell>{i18n._(t`Status`)}</HeaderCell>
               <HeaderCell>{i18n._(t`Type`)}</HeaderCell>
               <HeaderCell>{i18n._(t`Organization`)}</HeaderCell>
-              <ResponsiveHeaderCell>{i18n._(t`Groups`)}</ResponsiveHeaderCell>
-              <ResponsiveHeaderCell>{i18n._(t`Hosts`)}</ResponsiveHeaderCell>
-              <ResponsiveHeaderCell>{i18n._(t`Sources`)}</ResponsiveHeaderCell>
               <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
             </HeaderRow>
           }
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
index 354affdf3b..eff6ec1905 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
@@ -14,14 +14,6 @@ import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
 import CopyButton from '../../../components/CopyButton';
 import StatusLabel from '../../../components/StatusLabel';
 
-const ResponsiveTd = styled(Td)`
-  @media (max-width: 992px) {
-    && {
-      display: none;
-    }
-  }
-`;
-
 function InventoryListItem({
   inventory,
   rowIndex,
@@ -98,15 +90,6 @@ function InventoryListItem({
           {inventory?.summary_fields?.organization?.name}
         </Link>
       </Td>
-      <ResponsiveTd dataLabel={i18n._(t`Groups`)}>
-        {inventory.total_groups}
-      </ResponsiveTd>
-      <ResponsiveTd dataLabel={i18n._(t`Hosts`)}>
-        {inventory.total_hosts}
-      </ResponsiveTd>
-      <ResponsiveTd dataLabel={i18n._(t`Sources`)}>
-        {inventory.total_inventory_sources}
-      </ResponsiveTd>
       {inventory.pending_deletion ? (
         <Td dataLabel={i18n._(t`Groups`)}>
           <Label color="red">{i18n._(t`Pending delete`)}</Label>