Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor edits to the text in labels for bulk operations. #569

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor edits to the text in labels for bulk operations. #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pantheon-bundle/frontend/src/app/__snapshots__/bulkOperationConfirmation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ exports[`BulkOperationConfirmation tests should render BulkOperationConfirmation
measureLocation="top"
min={0}
size="sm"
title="Update Succeeded"
title="Succeeded"
tooltipPosition="top"
value={50}
valueText={null}
Expand All @@ -49,7 +49,7 @@ exports[`BulkOperationConfirmation tests should render BulkOperationConfirmation
measureLocation="top"
min={0}
size="sm"
title="Update failed"
title="Failed"
tooltipPosition="top"
value={10}
valueText={null}
Expand All @@ -66,7 +66,7 @@ exports[`BulkOperationConfirmation tests should render BulkOperationConfirmation
measureLocation="top"
min={0}
size="sm"
title="No draft version found. No action taken"
title="No drafts found - no action taken"
tooltipPosition="top"
value={40}
valueText={null}
Expand Down Expand Up @@ -120,7 +120,7 @@ exports[`BulkOperationConfirmation tests should render BulkOperationConfirmation
variant="large"
>
<strong>
Update Succeeded:
Succeeded:
</strong>
<br />
<span
Expand Down Expand Up @@ -151,7 +151,7 @@ exports[`BulkOperationConfirmation tests should render BulkOperationConfirmation
<br />
<br />
<strong>
Update Ignored:
Ignored:
</strong>
<br />
<span
Expand All @@ -177,7 +177,7 @@ exports[`BulkOperationConfirmation tests should render BulkOperationConfirmation
<br />
<br />
<strong>
Update Failed:
Failed:
</strong>
<br />
<span
Expand Down
14 changes: 7 additions & 7 deletions pantheon-bundle/frontend/src/app/bulkOperationConfirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ class BulkOperationConfirmation extends React.Component<IBulkOperationProps, any
</React.Fragment>
}
>
<div><Progress value={this.props.progressSuccessValue} title="Update Succeeded" variant={ProgressVariant.success} size={ProgressSize.sm} /></div>
<div><Progress value={this.props.progressFailureValue} title="Update failed" variant={ProgressVariant.danger} size={ProgressSize.sm} /></div>
<div><Progress value={this.props.progressWarningValue} title="No draft version found. No action taken" variant={ProgressVariant.warning} size={ProgressSize.sm} /></div>
<div><Progress value={this.props.progressSuccessValue} title="Succeeded" variant={ProgressVariant.success} size={ProgressSize.sm} /></div>
<div><Progress value={this.props.progressFailureValue} title="Failed" variant={ProgressVariant.danger} size={ProgressSize.sm} /></div>
<div><Progress value={this.props.progressWarningValue} title="No drafts found - no action taken" variant={ProgressVariant.warning} size={ProgressSize.sm} /></div>
</Alert>
<Modal
variant={ModalVariant.large}
Expand All @@ -72,7 +72,7 @@ class BulkOperationConfirmation extends React.Component<IBulkOperationProps, any
onClose={this.handleModalToggle}
footer={footer}
>
<strong>Update Succeeded:</strong>
<strong>Succeeded:</strong>
<br />
<span id="update-succeeded">
<List aria-label="succeeded" component={ListComponent.ol} type={OrderType.number}>
Expand All @@ -85,7 +85,7 @@ class BulkOperationConfirmation extends React.Component<IBulkOperationProps, any
</span>
<br />
<br />
<strong>Update Ignored:</strong>
<strong>Ignored:</strong>
<br />
<span id="update-ignored">
<List aria-label="ignored" component={ListComponent.ol} type={OrderType.number}>
Expand All @@ -98,7 +98,7 @@ class BulkOperationConfirmation extends React.Component<IBulkOperationProps, any
</span>
<br />
<br />
<strong>Update Failed:</strong>
<strong>Failed:</strong>
<br />
<span id="update-failed">
<List aria-label="failed" component={ListComponent.ol} type={OrderType.number}>
Expand Down Expand Up @@ -130,4 +130,4 @@ class BulkOperationConfirmation extends React.Component<IBulkOperationProps, any
}
}

export { BulkOperationConfirmation }
export { BulkOperationConfirmation }
4 changes: 2 additions & 2 deletions pantheon-bundle/frontend/src/app/bulkOperationMetadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ class BulkOperationMetadata extends React.Component<IBulkOperationMetadataProps,
this.calculateWarningProgress(this.state.bulkUpdateWarning)
if (this.state.bulkUpdateWarning > 0 && this.state.bulkUpdateWarning === this.props.documentsSelected.length) {

this.setState({ metadataEditError: "No draft versions found on selected items. Unable to save metadata." })
this.setState({ metadataEditError: "No drafts found on selected items. Unable to save metadata." })
}
})
}
Expand Down Expand Up @@ -485,4 +485,4 @@ class BulkOperationMetadata extends React.Component<IBulkOperationMetadataProps,
}
}
}
export { BulkOperationMetadata }
export { BulkOperationMetadata }
2 changes: 1 addition & 1 deletion pantheon-bundle/src/main/java/com/redhat/pantheon/validation/validators/XrefValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private Violations checkIfXrefValid(Violations violations) {
return violations;
}
return violations.add(PantheonConstants.VALID_XREF,
new ErrorDetails().add("invalid Cross reference(s) exists in the document"));
new ErrorDetails().add("Invalid cross references"));
}

private boolean isValidXref() {
Expand Down