External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixes Breaedcrumb

Browse Source
This commit is contained in:
Alex Corey
2020-01-13 11:27:23 -05:00
parent dfa578fcde
commit 8bfcef01df
2 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
awx/ui_next/src/screens/Host/HostList/HostList.jsx
View File

@@ -2,7 +2,7 @@ import React, { Component, Fragment } from 'react';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card } from '@patternfly/react-core';
import { HostsAPI } from '@api'; import { HostsAPI } from '@api';
import AlertModal from '@components/AlertModal'; import AlertModal from '@components/AlertModal';
@@ -180,76 +180,74 @@ class HostsList extends Component {
return ( return (
<Fragment> <Fragment>
<PageSection> <Card>
<Card> <PaginatedDataList
<PaginatedDataList contentError={contentError}
contentError={contentError} hasContentLoading={hasContentLoading}
hasContentLoading={hasContentLoading} items={hosts}
items={hosts} itemCount={itemCount}
itemCount={itemCount} pluralizedItemName={i18n._(t`Hosts`)}
pluralizedItemName={i18n._(t`Hosts`)} qsConfig={QS_CONFIG}
qsConfig={QS_CONFIG} onRowClick={this.handleSelect}
onRowClick={this.handleSelect} toolbarSearchColumns={[
toolbarSearchColumns={[ {
{ name: i18n._(t`Name`),
name: i18n._(t`Name`), key: 'name',
key: 'name', isDefault: true,
isDefault: true, },
}, {
{ name: i18n._(t`Created By (Username)`),
name: i18n._(t`Created By (Username)`), key: 'created_by__username',
key: 'created_by__username', },
}, {
{ name: i18n._(t`Modified By (Username)`),
name: i18n._(t`Modified By (Username)`), key: 'modified_by__username',
key: 'modified_by__username', },
}, ]}
]} toolbarSortColumns={[
toolbarSortColumns={[ {
{ name: i18n._(t`Name`),
name: i18n._(t`Name`), key: 'name',
key: 'name', },
}, ]}
]} renderToolbar={props => (
renderToolbar={props => ( <DataListToolbar
<DataListToolbar {...props}
{...props} showSelectAll
showSelectAll isAllSelected={isAllSelected}
isAllSelected={isAllSelected} onSelectAll={this.handleSelectAll}
onSelectAll={this.handleSelectAll} qsConfig={QS_CONFIG}
qsConfig={QS_CONFIG} additionalControls={[
additionalControls={[ <ToolbarDeleteButton
<ToolbarDeleteButton key="delete"
key="delete" onDelete={this.handleHostDelete}
onDelete={this.handleHostDelete} itemsToDelete={selected}
itemsToDelete={selected} pluralizedItemName={i18n._(t`Hosts`)}
pluralizedItemName={i18n._(t`Hosts`)} />,
/>, canAdd ? (
canAdd ? ( <ToolbarAddButton key="add" linkTo={`${match.url}/add`} />
<ToolbarAddButton key="add" linkTo={`${match.url}/add`} /> ) : null,
) : null, ]}
]} />
/> )}
)} renderItem={o => (
renderItem={o => ( <HostListItem
<HostListItem key={o.id}
key={o.id} host={o}
host={o} detailUrl={`${match.url}/${o.id}/details`}
detailUrl={`${match.url}/${o.id}/details`} isSelected={selected.some(row => row.id === o.id)}
isSelected={selected.some(row => row.id === o.id)} onSelect={() => this.handleSelect(o)}
onSelect={() => this.handleSelect(o)} onToggleHost={this.handleHostToggle}
onToggleHost={this.handleHostToggle} toggleLoading={toggleLoading === o.id}
toggleLoading={toggleLoading === o.id} />
/> )}
)} emptyStateControls={
emptyStateControls={ canAdd ? (
canAdd ? ( <ToolbarAddButton key="add" linkTo={`${match.url}/add`} />
<ToolbarAddButton key="add" linkTo={`${match.url}/add`} /> ) : null
) : null }
} />
/> </Card>
</Card>
</PageSection>
{toggleError && !toggleLoading && ( {toggleError && !toggleLoading && (
<AlertModal <AlertModal
variant="danger" variant="danger"

3
awx/ui_next/src/screens/Inventory/Inventories.jsx
View File

@@ -61,6 +61,9 @@ class Inventories extends Component {
t`Sources` t`Sources`
), ),
[`/inventories/${inventoryKind}/${inventory.id}/hosts/add`]: i18n._(
t`Create New Host`
),
[`/inventories/${inventoryKind}/${inventory.id}/hosts/${nestedResource && [`/inventories/${inventoryKind}/${inventory.id}/hosts/${nestedResource &&
nestedResource.id}/edit`]: i18n._(t`Edit Details`), nestedResource.id}/edit`]: i18n._(t`Edit Details`),
[`/inventories/${inventoryKind}/${inventory.id}/hosts/${nestedResource && [`/inventories/${inventoryKind}/${inventory.id}/hosts/${nestedResource &&