From 9da636e294968403f6fa83f01637f4564a076399 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 7 Dec 2020 11:34:53 -0800
Subject: [PATCH] table header cleanup; fix inventory status labels

---
 awx/ui_next/src/components/PaginatedTable/ActionsTd.jsx    | 2 +-
 awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx    | 7 ++++++-
 .../src/screens/Inventory/InventoryList/InventoryList.jsx  | 1 +
 .../screens/Inventory/InventoryList/InventoryListItem.jsx  | 6 ++----
 .../Organization/OrganizationList/OrganizationList.jsx     | 1 +
 .../Organization/OrganizationList/OrganizationListItem.jsx | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/awx/ui_next/src/components/PaginatedTable/ActionsTd.jsx b/awx/ui_next/src/components/PaginatedTable/ActionsTd.jsx
index 58a718d765..7b6199d56f 100644
--- a/awx/ui_next/src/components/PaginatedTable/ActionsTd.jsx
+++ b/awx/ui_next/src/components/PaginatedTable/ActionsTd.jsx
@@ -17,7 +17,7 @@ const ActionsGrid = styled.div`
 `;
 
 export default function ActionsTd({ children }) {
-  const numActions = children.length;
+  const numActions = children.length || 1;
   const width = numActions * 40;
   return (
     <Td
diff --git a/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx b/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx
index 906370c3b9..dcb7134487 100644
--- a/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx
+++ b/awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx
@@ -1,12 +1,17 @@
 import React from 'react';
 import { useLocation, useHistory } from 'react-router-dom';
-import { Thead, Tr, Th } from '@patternfly/react-table';
+import { Thead, Tr, Th as PFTh } from '@patternfly/react-table';
+import styled from 'styled-components';
 import {
   encodeNonDefaultQueryString,
   parseQueryString,
   replaceParams,
 } from '../../util/qs';
 
+const Th = styled(PFTh)`
+  --pf-c-table--cell--Overflow: initial;
+`;
+
 export default function HeaderRow({ qsConfig, defaultSortKey, children }) {
   const location = useLocation();
   const history = useHistory();
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
index 32e8ddd8ea..a66900da17 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
@@ -199,6 +199,7 @@ function InventoryList({ i18n }) {
               <HeaderCell>{i18n._(t`Groups`)}</HeaderCell>
               <HeaderCell>{i18n._(t`Hosts`)}</HeaderCell>
               <HeaderCell>{i18n._(t`Sources`)}</HeaderCell>
+              <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
             </HeaderRow>
           }
           renderToolbar={props => (
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
index 6719851935..b641e66b7d 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
@@ -11,7 +11,7 @@ import { InventoriesAPI } from '../../../api';
 import { Inventory } from '../../../types';
 import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
 import CopyButton from '../../../components/CopyButton';
-import SyncStatusIndicator from '../../../components/SyncStatusIndicator';
+import StatusLabel from '../../../components/StatusLabel';
 
 function InventoryListItem({
   inventory,
@@ -74,9 +74,7 @@ function InventoryListItem({
         )}
       </Td>
       <Td>
-        {inventory.kind !== 'smart' && (
-          <SyncStatusIndicator status={syncStatus} />
-        )}
+        {inventory.kind !== 'smart' && <StatusLabel status={syncStatus} />}
       </Td>
       <Td>
         {inventory.kind === 'smart'
diff --git a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
index 2d542fe3fe..05d66f2ada 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
@@ -156,6 +156,7 @@ function OrganizationsList({ i18n }) {
                 <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
                 <HeaderCell>{i18n._(t`Members`)}</HeaderCell>
                 <HeaderCell>{i18n._(t`Teams`)}</HeaderCell>
+                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
               </HeaderRow>
             }
             renderToolbar={props => (
diff --git a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
index 63ff176a1a..9bf440e165 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { string, bool, func } from 'prop-types';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
-import { Button, Tooltip } from '@patternfly/react-core';
+import { Button } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
 import { Link } from 'react-router-dom';
 import { PencilAltIcon } from '@patternfly/react-icons';