From 3aeea07185ebb2eceeab4a0ec520f7d641d02f39 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 23 Oct 2017 20:38:19 +0200 Subject: use eslint for typescript, update eslint configuration (#2742) --- .../src/main/js/apps/projects/components/AllProjects.tsx | 12 ++++++++---- .../js/apps/projects/components/ProjectCardLanguages.tsx | 2 +- .../main/js/apps/projects/components/ProjectCardOverall.tsx | 2 +- .../apps/projects/components/ProjectCardOverallMeasures.tsx | 2 +- .../apps/projects/components/__tests__/AllProjects-test.tsx | 4 ++++ .../components/__tests__/DefaultPageSelector-test.tsx | 2 ++ .../projects/components/__tests__/FavoriteFilter-test.tsx | 1 + 7 files changed, 18 insertions(+), 7 deletions(-) (limited to 'server/sonar-web/src/main/js/apps/projects/components') diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx index 4181d618a10..65bdfac3f43 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx @@ -51,7 +51,6 @@ interface State { export default class AllProjects extends React.PureComponent { mounted: boolean; - state: State = { loading: true, query: {} }; static contextTypes = { currentUser: PropTypes.object.isRequired, @@ -59,6 +58,11 @@ export default class AllProjects extends React.PureComponent { router: PropTypes.object.isRequired }; + constructor(props: Props) { + super(props); + this.state = { loading: true, query: {} }; + } + componentDidMount() { this.mounted = true; if (this.props.isFavorite && !this.context.currentUser.isLoggedIn) { @@ -88,7 +92,7 @@ export default class AllProjects extends React.PureComponent { getSort = () => this.state.query.sort || 'name'; - isFiltered = () => Object.values(this.state.query).some(value => value != undefined); + isFiltered = () => Object.values(this.state.query).some(value => value !== undefined); stopLoading = () => { if (this.mounted) { @@ -280,10 +284,10 @@ export default class AllProjects extends React.PureComponent { /> )} ); diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLanguages.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLanguages.tsx index 4bf823864e0..277a3b6eec8 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLanguages.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLanguages.tsx @@ -37,7 +37,7 @@ export default class ProjectCardLanguages extends React.PureComponent { }; render() { - if (this.props.distribution == undefined) { + if (this.props.distribution === undefined) { return null; } diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectCardOverall.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectCardOverall.tsx index 80ce9ceadb0..7dcae1fe7a2 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ProjectCardOverall.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectCardOverall.tsx @@ -43,7 +43,7 @@ export default function ProjectCardOverall({ organization, project }: Props) { return (
- {project.isFavorite != undefined && ( + {project.isFavorite !== undefined && ( ({ + // eslint-disable-next-line default: function ProjectsList() { return null; } })); jest.mock('../PageHeader', () => ({ + // eslint-disable-next-line default: function PageHeader() { return null; } })); jest.mock('../PageSidebar', () => ({ + // eslint-disable-next-line default: function PageSidebar() { return null; } diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx index ce03b94e0b3..b5d80b02f7e 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx @@ -17,7 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +/* eslint-disable import/first, import/order */ jest.mock('../AllProjects', () => ({ + // eslint-disable-next-line default: function AllProjects() { return null; } diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx index b7971fb416a..658ee1ab158 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx @@ -17,6 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +/* eslint-disable import/first */ jest.mock('../../../../helpers/storage', () => ({ saveAll: jest.fn(), saveFavorite: jest.fn() -- cgit v1.2.3