External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11534 from marshmalien/7678-inv-sync-link

Browse Source 
Link from sync status icon to prefiltered list of inventory source sync jobs
This commit is contained in:
Sarah Akus
2022-01-25 12:03:09 -05:00
committed by GitHub
parent cfabbcaaf6 11cc7e37e1
commit 4cdc88e4bb
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/src/components/JobList/JobList.js
View File

@@ -26,7 +26,11 @@ import JobListItem from './JobListItem';
import JobListCancelButton from './JobListCancelButton'; import JobListCancelButton from './JobListCancelButton';
import useWsJobs from './useWsJobs'; import useWsJobs from './useWsJobs';
function JobList({ defaultParams, showTypeColumn = false }) { function JobList({
defaultParams,
showTypeColumn = false,
additionalRelatedSearchableKeys = [],
}) {
const qsConfig = getQSConfig( const qsConfig = getQSConfig(
'job', 'job',
{ {
@@ -243,7 +247,10 @@ function JobList({ defaultParams, showTypeColumn = false }) {
} }
clearSelected={clearSelected} clearSelected={clearSelected}
toolbarSearchableKeys={searchableKeys} toolbarSearchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={[
...relatedSearchableKeys,
...additionalRelatedSearchableKeys,
]}
renderToolbar={(props) => ( renderToolbar={(props) => (
<DatalistToolbar <DatalistToolbar
{...props} {...props}

3
awx/ui/src/screens/Inventory/Inventory.js
View File

@@ -167,6 +167,9 @@ function Inventory({ setBreadcrumb }) {
inventory.id, inventory.id,
or__workflowjob__inventory: inventory.id, or__workflowjob__inventory: inventory.id,
}} }}
additionalRelatedSearchableKeys={[
'inventoryupdate__inventory_source__inventory',
]}
/> />
</Route>, </Route>,
<Route path="*" key="not-found"> <Route path="*" key="not-found">

16
awx/ui/src/screens/Inventory/InventoryList/InventoryListItem.js
View File

@@ -95,9 +95,19 @@ function InventoryListItem({
)} )}
</TdBreakWord> </TdBreakWord>
<Td dataLabel={t`Status`}> <Td dataLabel={t`Status`}>
{inventory.kind !== 'smart' && ( {inventory.kind !== 'smart' &&
<StatusLabel status={syncStatus} tooltipContent={tooltipContent} /> (inventory.has_inventory_sources ? (
)} <Link
to={`/inventories/inventory/${inventory.id}/jobs?job.or__inventoryupdate__inventory_source__inventory__id=${inventory.id}`}
>
<StatusLabel
status={syncStatus}
tooltipContent={tooltipContent}
/>
</Link>
) : (
<StatusLabel status={syncStatus} tooltipContent={tooltipContent} />
))}
</Td> </Td>
<Td dataLabel={t`Type`}> <Td dataLabel={t`Type`}>
{inventory.kind === 'smart' ? t`Smart Inventory` : t`Inventory`} {inventory.kind === 'smart' ? t`Smart Inventory` : t`Inventory`}