Skip to content

Commit

Permalink
MNT ESLint issues (#297)
Browse files Browse the repository at this point in the history
  • Loading branch information
sabina-talipova authored Jul 9, 2023
1 parent 990e0e5 commit 0b2928b
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 22 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,
});
};

4 changes: 1 addition & 3 deletions client/src/components/HistoryViewer/HistoryViewer.js
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ HistoryViewerToolbar.defaultProps = {
isRevertable: false,
};


function mapDispatchToProps(dispatch) {
return {
onAfterRevert(versionId) {
Expand Down
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
10 changes: 5 additions & 5 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* global jest, test, describe, it, expect */

import React from 'react';
import { Component as HistoryViewer } from '../HistoryViewer';
import { render, screen, fireEvent } from '@testing-library/react';
import { Component as HistoryViewer } from '../HistoryViewer';

function makeProps(obj = {}) {
return {
Expand All @@ -19,7 +19,7 @@ function makeProps(obj = {}) {
data-version={version.version}
data-comparemodeavailable={compareModeAvailable}
/>
),
),
CompareWarningComponent: () => <div data-testid="test-compare-warning"/>,
versions: {
versions: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* global jest, test, describe, it, expect */

import React from 'react';
import { Component as HistoryViewerHeading } from '../HistoryViewerHeading';
import { render, fireEvent } from '@testing-library/react';
import { Component as HistoryViewerHeading } from '../HistoryViewerHeading';

test('HistoryViewerHeading triggers mapDispatchToProps functions to notify and update the Redux store', () => {
const onCompareModeUnselect = jest.fn();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* global jest, test, describe, it, expect */

import React from 'react';
import { Component as HistoryViewerToolbar } from '../HistoryViewerToolbar';
import { render, fireEvent } from '@testing-library/react';
import { Component as HistoryViewerToolbar } from '../HistoryViewerToolbar';

test('HistoryViewerToolbar renders', async () => {
const revertHandler = jest.fn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* global jest, test, describe, it, expect */

import React from 'react';
import { Component as HistoryViewerVersion } from '../HistoryViewerVersion';
import { render, screen, fireEvent } from '@testing-library/react';
import { Component as HistoryViewerVersion } from '../HistoryViewerVersion';

function makeProps(obj = {}) {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* global jest, test, describe, it, expect */

import React from 'react';
import { Component as HistoryViewerVersionList } from '../HistoryViewerVersionList';
import { render } from '@testing-library/react';
import { Component as HistoryViewerVersionList } from '../HistoryViewerVersionList';

test('HistoryViewerVersionList returns an unordered list', () => {
const { container } = render(
Expand All @@ -16,4 +16,3 @@ test('HistoryViewerVersionList returns an unordered list', () => {
);
expect(container.querySelector('ul.history-viewer__table')).not.toBeNull();
});

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* global jest, test, describe, it, expect */

import React from 'react';
import { Component as HistoryViewerVersionState } from '../HistoryViewerVersionState';
import { render } from '@testing-library/react';
import { Component as HistoryViewerVersionState } from '../HistoryViewerVersionState';

function makeProps(obj = {}) {
return {
Expand Down Expand Up @@ -108,7 +108,6 @@ test('HistoryViewerVersionState returns a badge when the version is live', () =>
expect(badge.getAttribute('data-status')).toBe('success');
});


test('HistoryViewerVersionState doess not return a badge when the version is false', () => {
const { container } = render(
<HistoryViewerVersionState {...makeProps({
Expand Down
2 changes: 1 addition & 1 deletion client/src/state/historyviewer/HistoryViewerReducer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import HISTORY_VIEWER from './HistoryViewerActionTypes';
import { defaultCompare } from 'types/compareType';
import HISTORY_VIEWER from './HistoryViewerActionTypes';

const initialState = {
currentPage: 1,
Expand Down

0 comments on commit 0b2928b

Please sign in to comment.