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.

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

QA: fix: Paragon updates for bd-39 testing #338

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions src/components/AssetsTable/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,15 @@ export default class AssetsTable extends React.Component {
}
return (
<WrappedMessage message={lockStateMessage} values={{ object: asset.display_name }}>
{ displayText =>
(<Button
{displayText => (
<Button
className={classes}
label={''}
data-asset-id={asset.id}
aria-label={displayText}
onClick={this.onLockClick}
data-identifier="asset-lock-button"
/>)
}
/>
)}
</WrappedMessage>
);
}
Expand All @@ -166,14 +165,15 @@ export default class AssetsTable extends React.Component {
message={messages.assetsTableUpdateLock}
values={{ assetName: asset.display_name }}
>
{ displayText =>
(<Button
{displayText => (
<Button
className={['btn-outline-primary']}
label={(<span className={classNames(...spinnerClasses)} />)}
aria-label={displayText}
data-identifier="asset-locking-button"
/>)
}
>
<span className={classNames(...spinnerClasses)} />
</Button>
)}
</WrappedMessage>
);
}
Expand Down Expand Up @@ -282,17 +282,16 @@ export default class AssetsTable extends React.Component {
message={messages.assetsTableDeleteObject}
values={{ displayName: currentAsset.display_name }}
>
{ displayText =>
(<Button
{ displayText => (
<Button
key={currentAsset.id}
className={[FontAwesomeStyles.fa, FontAwesomeStyles['fa-trash'], 'btn-outline-primary']}
label={''}
aria-label={displayText}
onClick={() => { this.onDeleteClick(index); }}
inputRef={ref => this.getAssetDeleteButtonRef(ref, currentAsset)}
data-identifier="asset-delete-button"
/>)
}
/>
)}
</WrappedMessage>
);

Expand Down Expand Up @@ -370,11 +369,12 @@ export default class AssetsTable extends React.Component {
onClose={this.closeModal}
buttons={[
<Button
label={<WrappedMessage message={messages.assetsTablePermaDelete} />}
buttonType="primary"
onClick={this.deleteAsset}
data-identifier="asset-confirm-delete-button"
/>,
>
<WrappedMessage message={messages.assetsTablePermaDelete} />
</Button>,
]}
variant={{ status: Variant.status.WARNING }}
parentSelector={`#${modalWrapperID}`}
Expand Down
5 changes: 3 additions & 2 deletions src/components/BackendStatusBanner/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ class BackendStatusBanner extends React.Component {
)}
>
<Button
label="↻"
buttonType="sm"
className={[styles['btn-outline-primary']]}
onClick={this.props.pingStudio}
/>
>
</Button>
{' '}
{this.renderStatusMessage()}
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/CopyButton/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,19 @@ export default class CopyButton extends React.Component {

render() {
const label = this.state.wasClicked ? this.props.onCopyLabel : this.props.label;

return (
<Button
className={[...this.props.className, styles['copy-button'], 'btn-outline-primary']}
aria-label={this.props.ariaLabel}
label={label}
inputRef={this.setButtonRef}
onClick={this.onClick}
onBlur={this.onBlur}
onMouseUp={this.onMouseUp}
onMouseDown={this.onMouseDown}
data-identifier={this.props['data-identifier']}
/>
>
{label}
</Button>
);
}
}
Expand Down
33 changes: 15 additions & 18 deletions src/components/EditImageModal/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -740,40 +740,37 @@ export default class EditImageModal extends React.Component {

getNextPageButton = () => (
<Button
label={
<WrappedMessage
message={messages.editImageModalNextPageButton}
/>
}
buttonType="primary"
disabled={!this.isAssetSelected()}
onClick={this.onNextPageButtonClick}
/>
>
<WrappedMessage
message={messages.editImageModalNextPageButton}
/>
</Button>
);

getPreviousPageButton = () => (
<Button
label={
<WrappedMessage
message={messages.editImageModalPreviousPageButton}
/>
}
buttonType="link"
onClick={this.onPreviousPageButtonClick}
inputRef={this.setPreviousButtonRef}
/>
>
<WrappedMessage
message={messages.editImageModalPreviousPageButton}
/>
</Button>
);

getInsertImageButton = () => (
<Button
label={
<WrappedMessage
message={messages.editImageModalInsertImageButton}
/>
}
buttonType="primary"
onClick={this.onInsertImageButtonClick}
/>
>
<WrappedMessage
message={messages.editImageModalInsertImageButton}
/>
</Button
);

getUploadErrorStatusMessage = () => {
Expand Down