Skip to content

Commit

Permalink
FIX ESLint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Sabina Talipova committed Jul 2, 2023
1 parent 990e0e5 commit e29d601
Show file tree
Hide file tree
Showing 23 changed files with 144 additions and 148 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion client/src/boot/registerComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ export default () => {
HistoryViewerCompareWarning,
});
};

14 changes: 6 additions & 8 deletions client/src/components/HistoryViewer/HistoryViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class HistoryViewer extends Component {
{
'history-viewer__compare-mode': compare,
'history-viewer--no-margins': isInGridField && !this.isListView(),
}
},
);
}

Expand All @@ -112,7 +112,7 @@ class HistoryViewer extends Component {

// Look for one in the list of available versions
const latestDraftVersion = this.getVersions()
.filter(version => version.latestDraftVersion === true);
.filter((version) => version.latestDraftVersion === true);

if (latestDraftVersion.length) {
return latestDraftVersion[0];
Expand Down Expand Up @@ -338,7 +338,6 @@ class HistoryViewer extends Component {
compare: { versionFrom: hasVersionFrom },
} = this.props;


return (
<div className={this.getContainerClasses()}>
<CompareWarningComponent />
Expand All @@ -363,7 +362,7 @@ class HistoryViewer extends Component {
const { compare } = this.props;

if (compare && compare.versionFrom && compare.versionTo) {
return this.renderVersionDetail();
return this.renderVersionDetail();
}
return this.renderVersionList();
}
Expand Down Expand Up @@ -436,7 +435,6 @@ HistoryViewer.defaultProps = {
},
};


function mapStateToProps(state) {
const {
currentPage,
Expand Down Expand Up @@ -465,7 +463,7 @@ function mapDispatchToProps(dispatch) {
},
onResize(panelWidth) {
dispatch(viewModeActions.enableOrDisableSplitMode(panelWidth));
}
},
};
}

Expand All @@ -481,6 +479,6 @@ export default compose(
VersionDetailComponent,
CompareWarningComponent,
}),
({ contextKey }) => `VersionedAdmin.HistoryViewer.${contextKey}`
)
({ contextKey }) => `VersionedAdmin.HistoryViewer.${contextKey}`,
),
)(HistoryViewer);
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ export { HistoryViewerCompareWarning as Component };

export default connect(
mapStateToProps,
mapDispatchToProps
mapDispatchToProps,
)(HistoryViewerCompareWarning);
4 changes: 2 additions & 2 deletions client/src/components/HistoryViewer/HistoryViewerHeading.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class HistoryViewerHeading extends Component {
}

toggle() {
this.setState(prevState => ({
dropdownOpen: !prevState.dropdownOpen
this.setState((prevState) => ({
dropdownOpen: !prevState.dropdownOpen,
}));
}

Expand Down
13 changes: 6 additions & 7 deletions client/src/components/HistoryViewer/HistoryViewerToolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class HistoryViewerToolbar extends Component {
ViewModeComponent,
isLatestVersion,
isPreviewable,
isRevertable
isRevertable,
} = this.props;
const { isReverting } = this.state;

Expand All @@ -58,7 +58,7 @@ class HistoryViewerToolbar extends Component {
title: revertButtonTitle,
}}
data={{
buttonStyle: 'warning'
buttonStyle: 'warning',
}}
disabled={isLatestVersion || isReverting}
loading={isReverting}
Expand Down Expand Up @@ -91,15 +91,14 @@ HistoryViewerToolbar.defaultProps = {
isRevertable: false,
};


function mapDispatchToProps(dispatch) {
return {
onAfterRevert(versionId) {
dispatch(addMessage(
i18n.sprintf(
i18n._t('HistoryViewerToolbar.REVERTED_MESSAGE', 'Successfully reverted to version %s'),
versionId
)
versionId,
),
));
dispatch(showList());
},
Expand All @@ -116,6 +115,6 @@ export default compose(
FormActionComponent,
ViewModeComponent,
}),
() => 'VersionedAdmin.HistoryViewer.Toolbar'
)
() => 'VersionedAdmin.HistoryViewer.Toolbar',
),
)(HistoryViewerToolbar);
6 changes: 3 additions & 3 deletions client/src/components/HistoryViewer/HistoryViewerVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ function mapDispatchToProps(dispatch) {
onCompareMode(version) {
dispatch(setCompareFrom(version));
dispatch(setCompareMode(true));
}
},
};
}

Expand All @@ -293,6 +293,6 @@ export default compose(
context += `.${version.version}`;
}
return context;
}
)
},
),
)(HistoryViewerVersion);
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class HistoryViewerVersionDetail extends PureComponent {
* north toolbar based on whether the view mode is "split" (add) or anything else (remove)
*/
componentDidUpdate() {
this.toggleToolbarClass(this.props.previewState === 'split');
this.toggleToolbarClass(this.props.previewState === 'split');
}

componentWillUnmount() {
Expand Down Expand Up @@ -90,7 +90,7 @@ class HistoryViewerVersionDetail extends PureComponent {
const {
version: { absoluteLink, lastEdited, version },
PreviewComponent,
previewState
previewState,
} = this.props;

// Don't render the preview if the view mode is "edit"
Expand Down Expand Up @@ -248,5 +248,5 @@ export default inject(
PreviewComponent,
CompareWarningComponent,
}),
({ version }, context) => `${context}.HistoryViewerVersionDetail.${version.Version}`
({ version }, context) => `${context}.HistoryViewerVersionDetail.${version.Version}`,
)(HistoryViewerVersionDetail);
14 changes: 7 additions & 7 deletions client/src/components/HistoryViewer/HistoryViewerVersionList.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ class HistoryViewerVersionList extends PureComponent {
* @returns {boolean}
*/
isVersionActive(version) {
const { currentVersion, compare, compare: { versionFrom, versionTo } } = this.props;
const { currentVersion, compare, compare: { versionFrom, versionTo } } = this.props;

const isCurrent = currentVersion && currentVersion.version === version.version;
const isCompareFrom = versionFrom && versionFrom.version === version.version;
const isCompareTo = versionTo && versionTo.version === version.version;
const isCurrent = currentVersion && currentVersion.version === version.version;
const isCompareFrom = versionFrom && versionFrom.version === version.version;
const isCompareTo = versionTo && versionTo.version === version.version;

return (!compare && isCurrent) || isCompareFrom || isCompareTo;
return (!compare && isCurrent) || isCompareFrom || isCompareTo;
}

/**
Expand Down Expand Up @@ -163,6 +163,6 @@ export default compose(
HeadingComponent: HistoryViewerHeading,
VersionComponent: HistoryViewerVersion,
}),
() => 'VersionedAdmin.HistoryViewer.HistoryViewerVersionList'
)
() => 'VersionedAdmin.HistoryViewer.HistoryViewerVersionList',
),
)(HistoryViewerVersionList);
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ HistoryViewerVersionState.propTypes = {
BadgeComponent: PropTypes.oneOfType([
PropTypes.node,
PropTypes.func,
]).isRequired
]).isRequired,
};

HistoryViewerVersionState.defaultProps = {
Expand All @@ -106,5 +106,5 @@ export { HistoryViewerVersionState as Component };
export default inject(
['Badge'],
(BadgeComponent) => ({ BadgeComponent }),
({ version }) => `HistoryViewer.HistoryViewerVersionState.${version.Version}`
({ version }) => `HistoryViewer.HistoryViewerVersionState.${version.Version}`,
)(HistoryViewerVersionState);
Loading

0 comments on commit e29d601

Please sign in to comment.