Compare commits
3 Commits
renovate/n
...
open-relea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
549250cdc0 | ||
|
|
15b5d171fe | ||
|
|
8437a17c07 |
@@ -10,6 +10,7 @@ $fa-font-path: "~font-awesome/fonts";
|
||||
$input-focus-box-shadow: $input-box-shadow; // hack to get upgrade to paragon 4.0.0 to work
|
||||
|
||||
@import "~@edx/frontend-component-footer/dist/_footer";
|
||||
@import "~@edx/frontend-component-header/dist/index";
|
||||
|
||||
#root {
|
||||
display: flex;
|
||||
|
||||
@@ -19,7 +19,7 @@ export const ErrorBanner = ({ actions, headingMessage, children }) => {
|
||||
return (
|
||||
<Alert variant="danger" icon={Info} actions={actionButtons}>
|
||||
<Alert.Heading>
|
||||
<FormattedMessage {...headingMessage} />
|
||||
{headingMessage ? <FormattedMessage {...headingMessage} /> : null}
|
||||
</Alert.Heading>
|
||||
{children}
|
||||
</Alert>
|
||||
|
||||
@@ -16,7 +16,7 @@ import ReviewError from './ReviewError';
|
||||
*/
|
||||
export class LockErrors extends React.Component {
|
||||
get errorProp() {
|
||||
if (this.props.errorStatus === ErrorStatuses.forbidden) {
|
||||
if (this.props.errorStatus === ErrorStatuses.conflict) {
|
||||
return {
|
||||
heading: messages.errorLockContestedHeading,
|
||||
message: messages.errorLockContested,
|
||||
|
||||
@@ -42,7 +42,7 @@ describe('LockErrors component', () => {
|
||||
expect(el.instance().render()).toMatchSnapshot();
|
||||
});
|
||||
test('snapshot: error with conflicted lock', () => {
|
||||
el.setProps({ errorStatus: ErrorStatuses.forbidden });
|
||||
el.setProps({ errorStatus: ErrorStatuses.conflict });
|
||||
expect(el.instance().render()).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user