External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 20:30:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

table header cleanup; fix inventory status labels

Browse Source
This commit is contained in:
Keith Grant 2020-12-07 11:34:53 -08:00
parent 6a47899dbb
commit 9da636e294
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/PaginatedTable/ActionsTd.jsx
View File

@ -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

7
awx/ui_next/src/components/PaginatedTable/HeaderRow.jsx
View File

@ -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();

1
awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
View File

@ -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 => (

6
awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
View File

@ -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'

1
awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
View File

@ -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 => (

2
awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
View File

@ -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';