Merge pull request #9148 from keithjgrant/6189-credentials-table

Convert Credentials & Projects lists to PaginatedTable

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-02-08 13:21:45 +00:00
committed by GitHub
9 changed files with 462 additions and 427 deletions

View File

@@ -1,3 +1,4 @@
import 'styled-components/macro';
import React from 'react'; import React from 'react';
import { useLocation, useHistory } from 'react-router-dom'; import { useLocation, useHistory } from 'react-router-dom';
import { Thead, Tr, Th as PFTh } from '@patternfly/react-table'; import { Thead, Tr, Th as PFTh } from '@patternfly/react-table';
@@ -72,6 +73,7 @@ export function HeaderCell({
columnIndex, columnIndex,
idPrefix, idPrefix,
className, className,
alignRight,
children, children,
}) { }) {
const sort = sortKey const sort = sortKey
@@ -86,6 +88,7 @@ export function HeaderCell({
id={sortKey ? `${idPrefix}-${sortKey}` : null} id={sortKey ? `${idPrefix}-${sortKey}` : null}
className={className} className={className}
sort={sort} sort={sort}
css={alignRight ? 'text-align: right' : null}
> >
{children} {children}
</Th> </Th>

View File

@@ -89,7 +89,7 @@ function PaginatedTable({
); );
} else { } else {
Content = ( Content = (
<div css="overflow: scroll"> <div css="overflow: auto">
{hasContentLoading && <LoadingSpinner />} {hasContentLoading && <LoadingSpinner />}
<TableComposable aria-label={dataListLabel}> <TableComposable aria-label={dataListLabel}>
{headerRow} {headerRow}

View File

@@ -7,10 +7,14 @@ import { CredentialsAPI } from '../../../api';
import AlertModal from '../../../components/AlertModal'; import AlertModal from '../../../components/AlertModal';
import ErrorDetail from '../../../components/ErrorDetail'; import ErrorDetail from '../../../components/ErrorDetail';
import DataListToolbar from '../../../components/DataListToolbar'; import DataListToolbar from '../../../components/DataListToolbar';
import PaginatedDataList, { import {
ToolbarAddButton, ToolbarAddButton,
ToolbarDeleteButton, ToolbarDeleteButton,
} from '../../../components/PaginatedDataList'; } from '../../../components/PaginatedDataList';
import PaginatedTable, {
HeaderRow,
HeaderCell,
} from '../../../components/PaginatedTable';
import useRequest, { useDeleteItems } from '../../../util/useRequest'; import useRequest, { useDeleteItems } from '../../../util/useRequest';
import { getQSConfig, parseQueryString } from '../../../util/qs'; import { getQSConfig, parseQueryString } from '../../../util/qs';
import CredentialListItem from './CredentialListItem'; import CredentialListItem from './CredentialListItem';
@@ -114,7 +118,7 @@ function CredentialList({ i18n }) {
return ( return (
<PageSection> <PageSection>
<Card> <Card>
<PaginatedDataList <PaginatedTable
contentError={contentError} contentError={contentError}
hasContentLoading={isLoading || isDeleteLoading} hasContentLoading={isLoading || isDeleteLoading}
items={credentials} items={credentials}
@@ -142,7 +146,14 @@ function CredentialList({ i18n }) {
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
renderItem={item => ( headerRow={
<HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
<HeaderCell>{i18n._(t`Type`)}</HeaderCell>
<HeaderCell alignRight>{i18n._(t`Actions`)}</HeaderCell>
</HeaderRow>
}
renderRow={(item, index) => (
<CredentialListItem <CredentialListItem
key={item.id} key={item.id}
credential={item} credential={item}
@@ -150,6 +161,7 @@ function CredentialList({ i18n }) {
detailUrl={`/credentials/${item.id}/details`} detailUrl={`/credentials/${item.id}/details`}
isSelected={selected.some(row => row.id === item.id)} isSelected={selected.some(row => row.id === item.id)}
onSelect={() => handleSelect(item)} onSelect={() => handleSelect(item)}
rowIndex={index}
/> />
)} )}
renderToolbar={props => ( renderToolbar={props => (

View File

@@ -57,25 +57,41 @@ describe('<CredentialList />', () => {
test('should check and uncheck the row item', async () => { test('should check and uncheck the row item', async () => {
expect( expect(
wrapper.find('DataListCheck[id="select-credential-1"]').props().checked wrapper
.find('.pf-c-table__check')
.first()
.find('input')
.props().checked
).toBe(false); ).toBe(false);
await act(async () => { await act(async () => {
wrapper wrapper
.find('DataListCheck[id="select-credential-1"]') .find('.pf-c-table__check')
.first()
.find('input')
.invoke('onChange')(true); .invoke('onChange')(true);
}); });
wrapper.update(); wrapper.update();
expect( expect(
wrapper.find('DataListCheck[id="select-credential-1"]').props().checked wrapper
.find('.pf-c-table__check')
.first()
.find('input')
.props().checked
).toBe(true); ).toBe(true);
await act(async () => { await act(async () => {
wrapper wrapper
.find('DataListCheck[id="select-credential-1"]') .find('.pf-c-table__check')
.first()
.find('input')
.invoke('onChange')(false); .invoke('onChange')(false);
}); });
wrapper.update(); wrapper.update();
expect( expect(
wrapper.find('DataListCheck[id="select-credential-1"]').props().checked wrapper
.find('.pf-c-table__check')
.first()
.find('input')
.props().checked
).toBe(false); ).toBe(false);
}); });
@@ -105,7 +121,9 @@ describe('<CredentialList />', () => {
await act(async () => { await act(async () => {
wrapper wrapper
.find('DataListCheck[id="select-credential-3"]') .find('.pf-c-table__check')
.at(2)
.find('input')
.invoke('onChange')(); .invoke('onChange')();
}); });
wrapper.update(); wrapper.update();
@@ -122,7 +140,9 @@ describe('<CredentialList />', () => {
); );
await act(async () => { await act(async () => {
wrapper wrapper
.find('DataListCheck[id="select-credential-2"]') .find('.pf-c-table__check')
.at(1)
.find('input')
.invoke('onChange')(); .invoke('onChange')();
}); });
wrapper.update(); wrapper.update();

View File

@@ -3,31 +3,16 @@ import { string, bool, func } from 'prop-types';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { import { Button } from '@patternfly/react-core';
Button, import { Tr, Td } from '@patternfly/react-table';
DataListAction as _DataListAction,
DataListCheck,
DataListItem,
DataListItemRow,
DataListItemCells,
Tooltip,
} from '@patternfly/react-core';
import { PencilAltIcon } from '@patternfly/react-icons'; import { PencilAltIcon } from '@patternfly/react-icons';
import styled from 'styled-components'; import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
import DataListCell from '../../../components/DataListCell';
import { timeOfDay } from '../../../util/dates'; import { timeOfDay } from '../../../util/dates';
import { Credential } from '../../../types'; import { Credential } from '../../../types';
import { CredentialsAPI } from '../../../api'; import { CredentialsAPI } from '../../../api';
import CopyButton from '../../../components/CopyButton'; import CopyButton from '../../../components/CopyButton';
const DataListAction = styled(_DataListAction)`
align-items: center;
display: grid;
grid-gap: 16px;
grid-template-columns: repeat(2, 40px);
`;
function CredentialListItem({ function CredentialListItem({
credential, credential,
detailUrl, detailUrl,
@@ -35,6 +20,7 @@ function CredentialListItem({
onSelect, onSelect,
i18n, i18n,
fetchCredentials, fetchCredentials,
rowIndex,
}) { }) {
const [isDisabled, setIsDisabled] = useState(false); const [isDisabled, setIsDisabled] = useState(false);
@@ -57,64 +43,49 @@ function CredentialListItem({
}, []); }, []);
return ( return (
<DataListItem <Tr id={`${credential.id}`}>
key={credential.id} <Td
aria-labelledby={labelId} select={{
id={`${credential.id}`} rowIndex,
> isSelected,
<DataListItemRow> onSelect,
<DataListCheck }}
isDisabled={isDisabled} dataLabel={i18n._(t`Selected`)}
id={`select-credential-${credential.id}`} />
checked={isSelected} <Td id={labelId} dataLabel={i18n._(t`Name`)}>
onChange={onSelect} <Link to={`${detailUrl}`}>
aria-labelledby={labelId} <b>{credential.name}</b>
/> </Link>
<DataListItemCells </Td>
dataListCells={[ <Td dataLabel={i18n._(t`Type`)}>
<DataListCell key="name"> {credential.summary_fields.credential_type.name}
<Link to={`${detailUrl}`}> </Td>
<b>{credential.name}</b> <ActionsTd dataLabel={i18n._(t`Actions`)}>
</Link> <ActionItem visible={canEdit} tooltip={i18n._(t`Edit Credential`)}>
</DataListCell>, <Button
<DataListCell key="type"> isDisabled={isDisabled}
{credential.summary_fields.credential_type.name} aria-label={i18n._(t`Edit Credential`)}
</DataListCell>, variant="plain"
]} component={Link}
/> to={`/credentials/${credential.id}/edit`}
<DataListAction >
aria-label={i18n._(t`actions`)} <PencilAltIcon />
aria-labelledby={labelId} </Button>
id={labelId} </ActionItem>
> <ActionItem visible={credential.summary_fields.user_capabilities.copy}>
{canEdit && ( <CopyButton
<Tooltip content={i18n._(t`Edit Credential`)} position="top"> isDisabled={isDisabled}
<Button onCopyStart={handleCopyStart}
isDisabled={isDisabled} onCopyFinish={handleCopyFinish}
aria-label={i18n._(t`Edit Credential`)} copyItem={copyCredential}
variant="plain" helperText={{
component={Link} tooltip: i18n._(t`Copy Credential`),
to={`/credentials/${credential.id}/edit`} errorMessage: i18n._(t`Failed to copy credential.`),
> }}
<PencilAltIcon /> />
</Button> </ActionItem>
</Tooltip> </ActionsTd>
)} </Tr>
{credential.summary_fields.user_capabilities.copy && (
<CopyButton
isDisabled={isDisabled}
onCopyStart={handleCopyStart}
onCopyFinish={handleCopyFinish}
copyItem={copyCredential}
helperText={{
tooltip: i18n._(t`Copy Credential`),
errorMessage: i18n._(t`Failed to copy credential.`),
}}
/>
)}
</DataListAction>
</DataListItemRow>
</DataListItem>
); );
} }

View File

@@ -16,24 +16,32 @@ describe('<CredentialListItem />', () => {
test('edit button shown to users with edit capabilities', () => { test('edit button shown to users with edit capabilities', () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<CredentialListItem <table>
credential={mockCredentials.results[0]} <tbody>
detailUrl="/foo/bar" <CredentialListItem
isSelected={false} credential={mockCredentials.results[0]}
onSelect={() => {}} detailUrl="/foo/bar"
/> isSelected={false}
onSelect={() => {}}
/>
</tbody>
</table>
); );
expect(wrapper.find('PencilAltIcon').exists()).toBeTruthy(); expect(wrapper.find('PencilAltIcon').exists()).toBeTruthy();
}); });
test('edit button hidden from users without edit capabilities', () => { test('edit button hidden from users without edit capabilities', () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<CredentialListItem <table>
credential={mockCredentials.results[1]} <tbody>
detailUrl="/foo/bar" <CredentialListItem
isSelected={false} credential={mockCredentials.results[1]}
onSelect={() => {}} detailUrl="/foo/bar"
/> isSelected={false}
onSelect={() => {}}
/>
</tbody>
</table>
); );
expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy(); expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
}); });
@@ -41,12 +49,16 @@ describe('<CredentialListItem />', () => {
CredentialsAPI.copy.mockResolvedValue(); CredentialsAPI.copy.mockResolvedValue();
wrapper = mountWithContexts( wrapper = mountWithContexts(
<CredentialListItem <table>
isSelected={false} <tbody>
detailUrl="/foo/bar" <CredentialListItem
credential={mockCredentials.results[0]} isSelected={false}
onSelect={() => {}} detailUrl="/foo/bar"
/> credential={mockCredentials.results[0]}
onSelect={() => {}}
/>
</tbody>
</table>
); );
await act(async () => await act(async () =>
@@ -60,12 +72,16 @@ describe('<CredentialListItem />', () => {
CredentialsAPI.copy.mockRejectedValue(new Error()); CredentialsAPI.copy.mockRejectedValue(new Error());
wrapper = mountWithContexts( wrapper = mountWithContexts(
<CredentialListItem <table>
isSelected={false} <tbody>
detailUrl="/foo/bar" <CredentialListItem
onSelect={() => {}} isSelected={false}
credential={mockCredentials.results[0]} detailUrl="/foo/bar"
/> onSelect={() => {}}
credential={mockCredentials.results[0]}
/>
</tbody>
</table>
); );
await act(async () => await act(async () =>
wrapper.find('Button[aria-label="Copy"]').prop('onClick')() wrapper.find('Button[aria-label="Copy"]').prop('onClick')()
@@ -77,12 +93,16 @@ describe('<CredentialListItem />', () => {
test('should not render copy button', async () => { test('should not render copy button', async () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<CredentialListItem <table>
isSelected={false} <tbody>
detailUrl="/foo/bar" <CredentialListItem
onSelect={() => {}} isSelected={false}
credential={mockCredentials.results[1]} detailUrl="/foo/bar"
/> onSelect={() => {}}
credential={mockCredentials.results[1]}
/>
</tbody>
</table>
); );
expect(wrapper.find('CopyButton').length).toBe(0); expect(wrapper.find('CopyButton').length).toBe(0);
}); });

View File

@@ -9,10 +9,14 @@ import useRequest, { useDeleteItems } from '../../../util/useRequest';
import AlertModal from '../../../components/AlertModal'; import AlertModal from '../../../components/AlertModal';
import DataListToolbar from '../../../components/DataListToolbar'; import DataListToolbar from '../../../components/DataListToolbar';
import ErrorDetail from '../../../components/ErrorDetail'; import ErrorDetail from '../../../components/ErrorDetail';
import PaginatedDataList, { import {
ToolbarAddButton, ToolbarAddButton,
ToolbarDeleteButton, ToolbarDeleteButton,
} from '../../../components/PaginatedDataList'; } from '../../../components/PaginatedDataList';
import PaginatedTable, {
HeaderRow,
HeaderCell,
} from '../../../components/PaginatedTable';
import useWsProjects from './useWsProjects'; import useWsProjects from './useWsProjects';
import { getQSConfig, parseQueryString } from '../../../util/qs'; import { getQSConfig, parseQueryString } from '../../../util/qs';
@@ -116,7 +120,7 @@ function ProjectList({ i18n }) {
<Fragment> <Fragment>
<PageSection> <PageSection>
<Card> <Card>
<PaginatedDataList <PaginatedTable
contentError={contentError} contentError={contentError}
hasContentLoading={hasContentLoading} hasContentLoading={hasContentLoading}
items={projects} items={projects}
@@ -160,12 +164,15 @@ function ProjectList({ i18n }) {
]} ]}
toolbarSearchableKeys={searchableKeys} toolbarSearchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
toolbarSortColumns={[ headerRow={
{ <HeaderRow qsConfig={QS_CONFIG}>
name: i18n._(t`Name`), <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
key: 'name', <HeaderCell>{i18n._(t`Status`)}</HeaderCell>
}, <HeaderCell>{i18n._(t`Type`)}</HeaderCell>
]} <HeaderCell>{i18n._(t`Revision`)}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
</HeaderRow>
}
renderToolbar={props => ( renderToolbar={props => (
<DataListToolbar <DataListToolbar
{...props} {...props}
@@ -191,14 +198,15 @@ function ProjectList({ i18n }) {
]} ]}
/> />
)} )}
renderItem={o => ( renderRow={(project, index) => (
<ProjectListItem <ProjectListItem
fetchProjects={fetchProjects} fetchProjects={fetchProjects}
key={o.id} key={project.id}
project={o} project={project}
detailUrl={`${match.url}/${o.id}`} detailUrl={`${match.url}/${project.id}`}
isSelected={selected.some(row => row.id === o.id)} isSelected={selected.some(row => row.id === project.id)}
onSelect={() => handleSelect(o)} onSelect={() => handleSelect(project)}
rowIndex={index}
/> />
)} )}
emptyStateControls={ emptyStateControls={

View File

@@ -2,37 +2,22 @@ import 'styled-components/macro';
import React, { Fragment, useState, useCallback } from 'react'; import React, { Fragment, useState, useCallback } from 'react';
import { string, bool, func } from 'prop-types'; import { string, bool, func } from 'prop-types';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { import { Button, Tooltip } from '@patternfly/react-core';
Button, import { Tr, Td } from '@patternfly/react-table';
DataListAction as _DataListAction,
DataListCheck,
DataListItem,
DataListItemRow,
DataListItemCells,
Tooltip,
} from '@patternfly/react-core';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { PencilAltIcon } from '@patternfly/react-icons'; import { PencilAltIcon } from '@patternfly/react-icons';
import styled from 'styled-components'; import styled from 'styled-components';
import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
import { formatDateString, timeOfDay } from '../../../util/dates'; import { formatDateString, timeOfDay } from '../../../util/dates';
import { ProjectsAPI } from '../../../api'; import { ProjectsAPI } from '../../../api';
import ClipboardCopyButton from '../../../components/ClipboardCopyButton'; import ClipboardCopyButton from '../../../components/ClipboardCopyButton';
import StatusIcon from '../../../components/StatusIcon'; import StatusLabel from '../../../components/StatusLabel';
import DataListCell from '../../../components/DataListCell';
import { toTitleCase } from '../../../util/strings'; import { toTitleCase } from '../../../util/strings';
import CopyButton from '../../../components/CopyButton'; import CopyButton from '../../../components/CopyButton';
import ProjectSyncButton from '../shared/ProjectSyncButton'; import ProjectSyncButton from '../shared/ProjectSyncButton';
import { Project } from '../../../types'; import { Project } from '../../../types';
const DataListAction = styled(_DataListAction)`
align-items: center;
display: grid;
grid-gap: 16px;
grid-template-columns: repeat(3, 40px);
`;
const Label = styled.span` const Label = styled.span`
color: var(--pf-global--disabled-color--100); color: var(--pf-global--disabled-color--100);
`; `;
@@ -42,8 +27,9 @@ function ProjectListItem({
isSelected, isSelected,
onSelect, onSelect,
detailUrl, detailUrl,
i18n,
fetchProjects, fetchProjects,
rowIndex,
i18n,
}) { }) {
const [isDisabled, setIsDisabled] = useState(false); const [isDisabled, setIsDisabled] = useState(false);
ProjectListItem.propTypes = { ProjectListItem.propTypes = {
@@ -88,106 +74,89 @@ function ProjectListItem({
}, []); }, []);
const labelId = `check-action-${project.id}`; const labelId = `check-action-${project.id}`;
return ( return (
<DataListItem <Tr id={`${project.id}`}>
key={project.id} <Td
aria-labelledby={labelId} select={{
id={`${project.id}`} rowIndex,
> isSelected,
<DataListItemRow> onSelect,
<DataListCheck }}
id={`select-project-${project.id}`} dataLabel={i18n._(t`Selected`)}
checked={isSelected} />
onChange={onSelect} <Td id={labelId} dataLabel={i18n._(t`Name`)}>
aria-labelledby={labelId} <Link id={labelId} to={`${detailUrl}`}>
<b>{project.name}</b>
</Link>
</Td>
<Td dataLabel={i18n._(t`Status`)}>
{project.summary_fields.last_job && (
<Tooltip
position="top"
content={generateLastJobTooltip(project.summary_fields.last_job)}
key={project.summary_fields.last_job.id}
>
<Link to={`/jobs/project/${project.summary_fields.last_job.id}`}>
<StatusLabel status={project.summary_fields.last_job.status} />
</Link>
</Tooltip>
)}
</Td>
<Td dataLabel={i18n._(t`Type`)}>
{project.scm_type === ''
? i18n._(t`Manual`)
: toTitleCase(project.scm_type)}
</Td>
<Td dataLabel={i18n._(t`Revision`)}>
{project.scm_revision.substring(0, 7)}
{!project.scm_revision && (
<Label aria-label={i18n._(t`copy to clipboard disabled`)}>
{i18n._(t`Sync for revision`)}
</Label>
)}
<ClipboardCopyButton
isDisabled={!project.scm_revision}
stringToCopy={project.scm_revision}
copyTip={i18n._(t`Copy full revision to clipboard.`)}
copiedSuccessTip={i18n._(t`Successfully copied to clipboard!`)}
/> />
<DataListItemCells </Td>
dataListCells={[ <ActionsTd dataLabel={i18n._(t`Actions`)}>
<DataListCell key="status" isFilled={false}> <ActionItem
{project.summary_fields.last_job && ( visible={project.summary_fields.user_capabilities.start}
<Tooltip tooltip={i18n._(t`Sync Project`)}
position="top"
content={generateLastJobTooltip(
project.summary_fields.last_job
)}
key={project.summary_fields.last_job.id}
>
<Link
to={`/jobs/project/${project.summary_fields.last_job.id}`}
>
<StatusIcon
status={project.summary_fields.last_job.status}
/>
</Link>
</Tooltip>
)}
</DataListCell>,
<DataListCell key="name">
<Link id={labelId} to={`${detailUrl}`}>
<b>{project.name}</b>
</Link>
</DataListCell>,
<DataListCell key="type">
{project.scm_type === ''
? i18n._(t`Manual`)
: toTitleCase(project.scm_type)}
</DataListCell>,
<DataListCell key="revision">
{project.scm_revision.substring(0, 7)}
{!project.scm_revision && (
<Label aria-label={i18n._(t`copy to clipboard disabled`)}>
{i18n._(t`Sync for revision`)}
</Label>
)}
<ClipboardCopyButton
isDisabled={!project.scm_revision}
stringToCopy={project.scm_revision}
copyTip={i18n._(t`Copy full revision to clipboard.`)}
copiedSuccessTip={i18n._(t`Successfully copied to clipboard!`)}
/>
</DataListCell>,
]}
/>
<DataListAction
aria-label={i18n._(t`actions`)}
aria-labelledby={labelId}
id={labelId}
> >
{project.summary_fields.user_capabilities.start && ( <ProjectSyncButton projectId={project.id} />
<Tooltip content={i18n._(t`Sync Project`)} position="top"> </ActionItem>
<ProjectSyncButton projectId={project.id} /> <ActionItem
</Tooltip> visible={project.summary_fields.user_capabilities.edit}
)} tooltip={i18n._(t`Edit Project`)}
{project.summary_fields.user_capabilities.edit ? ( >
<Tooltip content={i18n._(t`Edit Project`)} position="top"> <Button
<Button isDisabled={isDisabled}
isDisabled={isDisabled} aria-label={i18n._(t`Edit Project`)}
aria-label={i18n._(t`Edit Project`)} variant="plain"
variant="plain" component={Link}
component={Link} to={`/projects/${project.id}/edit`}
to={`/projects/${project.id}/edit`} >
> <PencilAltIcon />
<PencilAltIcon /> </Button>
</Button> </ActionItem>
</Tooltip> <ActionItem visible={project.summary_fields.user_capabilities.copy}>
) : ( <CopyButton
'' copyItem={copyProject}
)} isDisabled={isDisabled}
{project.summary_fields.user_capabilities.copy && ( onCopyStart={handleCopyStart}
<CopyButton onCopyFinish={handleCopyFinish}
copyItem={copyProject} helperText={{
isDisabled={isDisabled} tooltip: i18n._(t`Copy Project`),
onCopyStart={handleCopyStart} errorMessage: i18n._(t`Failed to copy project.`),
onCopyFinish={handleCopyFinish} }}
helperText={{ />
tooltip: i18n._(t`Copy Project`), </ActionItem>
errorMessage: i18n._(t`Failed to copy project.`), </ActionsTd>
}} </Tr>
/>
)}
</DataListAction>
</DataListItemRow>
</DataListItem>
); );
} }
export default withI18n()(ProjectListItem); export default withI18n()(ProjectListItem);

View File

@@ -10,112 +10,128 @@ jest.mock('../../../api/models/Projects');
describe('<ProjectsListItem />', () => { describe('<ProjectsListItem />', () => {
test('launch button shown to users with start capabilities', () => { test('launch button shown to users with start capabilities', () => {
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
start: true, },
}, user_capabilities: {
}, start: true,
}} },
/> },
}}
/>
</tbody>
</table>
); );
expect(wrapper.find('ProjectSyncButton').exists()).toBeTruthy(); expect(wrapper.find('ProjectSyncButton').exists()).toBeTruthy();
}); });
test('launch button hidden from users without start capabilities', () => { test('launch button hidden from users without start capabilities', () => {
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
start: false, },
}, user_capabilities: {
}, start: false,
}} },
/> },
}}
/>
</tbody>
</table>
); );
expect(wrapper.find('ProjectSyncButton').exists()).toBeFalsy(); expect(wrapper.find('ProjectSyncButton').exists()).toBeFalsy();
}); });
test('edit button shown to users with edit capabilities', () => { test('edit button shown to users with edit capabilities', () => {
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
edit: true, },
}, user_capabilities: {
}, edit: true,
}} },
/> },
}}
/>
</tbody>
</table>
); );
expect(wrapper.find('PencilAltIcon').exists()).toBeTruthy(); expect(wrapper.find('PencilAltIcon').exists()).toBeTruthy();
}); });
test('edit button hidden from users without edit capabilities', () => { test('edit button hidden from users without edit capabilities', () => {
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
edit: false, },
}, user_capabilities: {
}, edit: false,
}} },
/> },
}}
/>
</tbody>
</table>
); );
expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy(); expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
}); });
@@ -123,29 +139,33 @@ describe('<ProjectsListItem />', () => {
test('should call api to copy project', async () => { test('should call api to copy project', async () => {
ProjectsAPI.copy.mockResolvedValue(); ProjectsAPI.copy.mockResolvedValue();
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
edit: false, },
copy: true, user_capabilities: {
}, edit: false,
}, copy: true,
}} },
/> },
}}
/>
</tbody>
</table>
); );
await act(async () => await act(async () =>
@@ -159,29 +179,33 @@ describe('<ProjectsListItem />', () => {
ProjectsAPI.copy.mockRejectedValue(new Error()); ProjectsAPI.copy.mockRejectedValue(new Error());
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
edit: false, },
copy: true, user_capabilities: {
}, edit: false,
}, copy: true,
}} },
/> },
}}
/>
</tbody>
</table>
); );
await act(async () => await act(async () =>
wrapper.find('Button[aria-label="Copy"]').prop('onClick')() wrapper.find('Button[aria-label="Copy"]').prop('onClick')()
@@ -192,56 +216,64 @@ describe('<ProjectsListItem />', () => {
}); });
test('should not render copy button', async () => { test('should not render copy button', async () => {
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/foo/bar" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/foo/bar"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '7788f7erga0jijodfgsjisiodf98sdga9hg9a98gaf',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
edit: false, },
copy: false, user_capabilities: {
}, edit: false,
}, copy: false,
}} },
/> },
}}
/>
</tbody>
</table>
); );
expect(wrapper.find('CopyButton').length).toBe(0); expect(wrapper.find('CopyButton').length).toBe(0);
}); });
test('should render disabled copy to clipboard button', () => { test('should render disabled copy to clipboard button', () => {
const wrapper = mountWithContexts( const wrapper = mountWithContexts(
<ProjectsListItem <table>
isSelected={false} <tbody>
detailUrl="/project/1" <ProjectsListItem
onSelect={() => {}} isSelected={false}
project={{ detailUrl="/project/1"
id: 1, onSelect={() => {}}
name: 'Project 1', project={{
url: '/api/v2/projects/1', id: 1,
type: 'project', name: 'Project 1',
scm_type: 'git', url: '/api/v2/projects/1',
scm_revision: '', type: 'project',
summary_fields: { scm_type: 'git',
last_job: { scm_revision: '',
id: 9000, summary_fields: {
status: 'successful', last_job: {
}, id: 9000,
user_capabilities: { status: 'successful',
edit: true, },
}, user_capabilities: {
}, edit: true,
}} },
/> },
}}
/>
</tbody>
</table>
); );
expect( expect(
wrapper.find('span[aria-label="copy to clipboard disabled"]').text() wrapper.find('span[aria-label="copy to clipboard disabled"]').text()