External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Improves copy clipaboard message and some prop names

Browse Source
This commit is contained in:
Alex Corey
2020-06-05 10:46:45 -04:00
parent 40cd87f253
commit edb0df788b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui_next/src/components/ClipboardCopyButton/ClipboardCopyButton.jsx
View File

@@ -41,10 +41,10 @@ class ClipboardCopyButton extends React.Component {
render() { render() {
const { const {
clickTip, copyTip,
entryDelay, entryDelay,
exitDelay, exitDelay,
hoverTip, copiedSuccessTip,
isDisabled, isDisabled,
} = this.props; } = this.props;
const { copied } = this.state; const { copied } = this.state;
@@ -54,13 +54,13 @@ class ClipboardCopyButton extends React.Component {
entryDelay={entryDelay} entryDelay={entryDelay}
exitDelay={exitDelay} exitDelay={exitDelay}
trigger="mouseenter focus click" trigger="mouseenter focus click"
content={copied ? clickTip : hoverTip} content={copied ? copiedSuccessTip : copyTip}
> >
<Button <Button
isDisabled={isDisabled} isDisabled={isDisabled}
variant="plain" variant="plain"
onClick={this.handleCopyClick} onClick={this.handleCopyClick}
aria-label={hoverTip} aria-label={copyTip}
> >
<CopyIcon /> <CopyIcon />
</Button> </Button>
@@ -70,10 +70,10 @@ class ClipboardCopyButton extends React.Component {
} }
ClipboardCopyButton.propTypes = { ClipboardCopyButton.propTypes = {
clickTip: PropTypes.string.isRequired, copyTip: PropTypes.string.isRequired,
entryDelay: PropTypes.number, entryDelay: PropTypes.number,
exitDelay: PropTypes.number, exitDelay: PropTypes.number,
hoverTip: PropTypes.string.isRequired, copiedSuccessTip: PropTypes.string.isRequired,
stringToCopy: PropTypes.string.isRequired, stringToCopy: PropTypes.string.isRequired,
switchDelay: PropTypes.number, switchDelay: PropTypes.number,
isDisabled: PropTypes.bool.isRequired, isDisabled: PropTypes.bool.isRequired,

6
awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
View File

@@ -128,14 +128,14 @@ function ProjectListItem({
{project.scm_revision.substring(0, 7)} {project.scm_revision.substring(0, 7)}
{!project.scm_revision && ( {!project.scm_revision && (
<Label aria-label={i18n._(t`copy to clipboard disabled`)}> <Label aria-label={i18n._(t`copy to clipboard disabled`)}>
{i18n._(t`Sync to activate`)} {i18n._(t`Sync for revision`)}
</Label> </Label>
)} )}
<ClipboardCopyButton <ClipboardCopyButton
isDisabled={!project.scm_revision} isDisabled={!project.scm_revision}
stringToCopy={project.scm_revision} stringToCopy={project.scm_revision}
hoverTip={i18n._(t`Copy full revision to clipboard.`)} copyTip={i18n._(t`Copy full revision to clipboard.`)}
clickTip={i18n._(t`Successfully copied to clipboard!`)} copiedSuccessTip={i18n._(t`Successfully copied to clipboard!`)}
/> />
</DataListCell>, </DataListCell>,
]} ]}

2
awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.test.jsx
View File

@@ -245,7 +245,7 @@ describe('<ProjectsListItem />', () => {
); );
expect( expect(
wrapper.find('span[aria-label="copy to clipboard disabled"]').text() wrapper.find('span[aria-label="copy to clipboard disabled"]').text()
).toBe('Sync to activate'); ).toBe('Sync for revision');
expect(wrapper.find('ClipboardCopyButton').prop('isDisabled')).toBe(true); expect(wrapper.find('ClipboardCopyButton').prop('isDisabled')).toBe(true);
}); });
}); });