add expandable row details to template list

This commit is contained in:
Keith Grant
2021-01-19 15:00:41 -08:00
parent f3410f6517
commit ad71dc3e98
2 changed files with 204 additions and 121 deletions

View File

@@ -208,40 +208,14 @@ function TemplateList({ i18n }) {
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
toolbarSortColumns={[
{
name: i18n._(t`Inventory`),
key: 'job_template__inventory__id',
},
{
name: i18n._(t`Last Job Run`),
key: 'last_job_run',
},
{
name: i18n._(t`Modified`),
key: 'modified',
},
{
name: i18n._(t`Name`),
key: 'name',
},
{
name: i18n._(t`Project`),
key: 'jobtemplate__project__id',
},
{
name: i18n._(t`Type`),
key: 'type',
},
]}
toolbarSearchableKeys={searchableKeys} toolbarSearchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG} isExpandable>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
<HeaderCell sortKey="type">{i18n._(t`Type`)}</HeaderCell> <HeaderCell sortKey="type">{i18n._(t`Type`)}</HeaderCell>
<HeaderCell sortKey="last_job_run"> <HeaderCell sortKey="last_job_run">
{i18n._(t`Recent Jobs`)} {i18n._(t`Last Run`)}
</HeaderCell> </HeaderCell>
</HeaderRow> </HeaderRow>
} }

View File

@@ -1,8 +1,8 @@
import 'styled-components/macro'; import 'styled-components/macro';
import React, { useState, useCallback } from 'react'; import React, { useState, useCallback } from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Button, Tooltip } from '@patternfly/react-core'; import { Button, Tooltip, Chip } from '@patternfly/react-core';
import { Tr, Td } from '@patternfly/react-table'; import { Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { import {
@@ -12,6 +12,13 @@ import {
RocketIcon, RocketIcon,
} from '@patternfly/react-icons'; } from '@patternfly/react-icons';
import { ActionsTd, ActionItem } from '../../../components/PaginatedTable'; import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
import {
DetailList,
Detail,
DeletedDetail,
} from '../../../components/DetailList';
import ChipGroup from '../../../components/ChipGroup';
import CredentialChip from '../../../components/CredentialChip';
import { timeOfDay } from '../../../util/dates'; import { timeOfDay } from '../../../util/dates';
import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../../api'; import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../../api';
@@ -29,6 +36,7 @@ function TemplateListItem({
fetchTemplates, fetchTemplates,
rowIndex, rowIndex,
}) { }) {
const [isExpanded, setIsExpanded] = useState(false);
const [isDisabled, setIsDisabled] = useState(false); const [isDisabled, setIsDisabled] = useState(false);
const labelId = `check-action-${template.id}`; const labelId = `check-action-${template.id}`;
@@ -53,13 +61,43 @@ function TemplateListItem({
setIsDisabled(false); setIsDisabled(false);
}, []); }, []);
const {
summary_fields: summaryFields,
ask_inventory_on_launch: askInventoryOnLaunch,
} = template;
const missingResourceIcon = const missingResourceIcon =
template.type === 'job_template' && template.type === 'job_template' &&
(!template.summary_fields.project || (!summaryFields.project ||
(!template.summary_fields.inventory && (!summaryFields.inventory && !askInventoryOnLaunch));
!template.ask_inventory_on_launch));
const inventoryValue = (kind, id) => {
const inventorykind = kind === 'smart' ? 'smart_inventory' : 'inventory';
return askInventoryOnLaunch ? (
<>
<Link to={`/inventories/${inventorykind}/${id}/details`}>
{summaryFields.inventory.name}
</Link>
<span> {i18n._(t`(Prompt on launch)`)}</span>
</>
) : (
<Link to={`/inventories/${inventorykind}/${id}/details`}>
{summaryFields.inventory.name}
</Link>
);
};
return ( return (
<>
<Tr id={`template-row-${template.id}`}> <Tr id={`template-row-${template.id}`}>
<Td
expand={{
rowIndex,
isExpanded,
onToggle: () => setIsExpanded(!isExpanded),
}}
/>
<Td <Td
select={{ select={{
rowIndex, rowIndex,
@@ -149,6 +187,77 @@ function TemplateListItem({
</ActionItem> </ActionItem>
</ActionsTd> </ActionsTd>
</Tr> </Tr>
<Tr isExpanded={isExpanded}>
<Td colspan={2} />
<Td colspan={4}>
<ExpandableRowContent>
<DetailList>
<Detail
label={i18n._(t`Activity`)}
value={<Sparkline jobs={summaryFields.recent_jobs} />}
/>
{summaryFields.credentials && summaryFields.credentials.length && (
<Detail
label={i18n._(t`Credentials`)}
value={
<ChipGroup
numChips={5}
totalChips={summaryFields.credentials.length}
>
{summaryFields.credentials.map(c => (
<CredentialChip key={c.id} credential={c} isReadOnly />
))}
</ChipGroup>
}
/>
)}
{summaryFields.inventory ? (
<Detail
label={i18n._(t`Inventory`)}
value={inventoryValue(
summaryFields.inventory.kind,
summaryFields.inventory.id
)}
/>
) : (
!askInventoryOnLaunch && (
<DeletedDetail label={i18n._(t`Inventory`)} />
)
)}
{summaryFields.labels && summaryFields.labels.results.length > 0 && (
<Detail
label={i18n._(t`Labels`)}
value={
<ChipGroup
numChips={5}
totalChips={summaryFields.labels.results.length}
>
{summaryFields.labels.results.map(l => (
<Chip key={l.id} isReadOnly>
{l.name}
</Chip>
))}
</ChipGroup>
}
/>
)}
{summaryFields.project ? (
<Detail
label={i18n._(t`Project`)}
value={
<Link to={`/projects/${summaryFields.project.id}/details`}>
{summaryFields.project.name}
</Link>
}
/>
) : (
<DeletedDetail label={i18n._(t`Project`)} />
)}
</DetailList>
</ExpandableRowContent>
</Td>
</Tr>
</>
); );
} }