diff --git a/ui/job-view/details/tabs/failureSummary/SuggestionsListItem.jsx b/ui/job-view/details/tabs/failureSummary/SuggestionsListItem.jsx index 92e1c2f17..df3213ea1 100644 --- a/ui/job-view/details/tabs/failureSummary/SuggestionsListItem.jsx +++ b/ui/job-view/details/tabs/failureSummary/SuggestionsListItem.jsx @@ -2,7 +2,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import { thBugSuggestionLimit } from '../../../../js/constants'; - import BugListItem from './BugListItem'; export default class SuggestionsListItem extends React.Component { diff --git a/ui/job-view/headerbars/SecondaryNavBar.jsx b/ui/job-view/headerbars/SecondaryNavBar.jsx index 350d19287..750cf17f1 100644 --- a/ui/job-view/headerbars/SecondaryNavBar.jsx +++ b/ui/job-view/headerbars/SecondaryNavBar.jsx @@ -188,8 +188,7 @@ export default class SecondaryNavBar extends React.Component { render() { const { - updateButtonClick, serverChanged, $injector, setCurrentRepoTreeStatus, - repos, + updateButtonClick, serverChanged, setCurrentRepoTreeStatus, repos, } = this.props; const { watchedRepoNames, groupsExpanded, showDuplicateJobs, searchQueryStr, @@ -219,7 +218,6 @@ export default class SecondaryNavBar extends React.Component { diff --git a/ui/job-view/headerbars/WatchedRepo.jsx b/ui/job-view/headerbars/WatchedRepo.jsx index f9ff3842f..1f76a85d2 100644 --- a/ui/job-view/headerbars/WatchedRepo.jsx +++ b/ui/job-view/headerbars/WatchedRepo.jsx @@ -43,9 +43,6 @@ export default class WatchedRepo extends React.Component { constructor(props) { super(props); - const { $injector } = this.props; - this.$rootScope = $injector.get('$rootScope'); - this.state = { status: 'not retrieved yet', reason: '', @@ -186,7 +183,6 @@ export default class WatchedRepo extends React.Component { } WatchedRepo.propTypes = { - $injector: PropTypes.object.isRequired, repoName: PropTypes.string.isRequired, unwatchRepo: PropTypes.func.isRequired, repo: PropTypes.object.isRequired, diff --git a/ui/job-view/pushes/JobButton.jsx b/ui/job-view/pushes/JobButton.jsx index 971cf3462..7f843ff3b 100644 --- a/ui/job-view/pushes/JobButton.jsx +++ b/ui/job-view/pushes/JobButton.jsx @@ -6,10 +6,6 @@ import { getUrlParam } from '../../helpers/location'; export default class JobButtonComponent extends React.Component { constructor(props) { super(props); - const { $injector } = this.props; - - this.$rootScope = $injector.get('$rootScope'); - this.ThResultSetStore = $injector.get('ThResultSetStore'); this.state = { isSelected: false, @@ -128,7 +124,6 @@ export default class JobButtonComponent extends React.Component { JobButtonComponent.propTypes = { job: PropTypes.object.isRequired, - $injector: PropTypes.object.isRequired, filterModel: PropTypes.object.isRequired, repoName: PropTypes.string.isRequired, visible: PropTypes.bool.isRequired, diff --git a/ui/job-view/pushes/PushActionMenu.jsx b/ui/job-view/pushes/PushActionMenu.jsx index f417f07f2..bccbc5c6f 100644 --- a/ui/job-view/pushes/PushActionMenu.jsx +++ b/ui/job-view/pushes/PushActionMenu.jsx @@ -15,7 +15,6 @@ export default class PushActionMenu extends React.PureComponent { this.$rootScope = $injector.get('$rootScope'); this.thNotify = $injector.get('thNotify'); this.ThResultSetStore = $injector.get('ThResultSetStore'); - this.$uibModal = $injector.get('$uibModal'); this.revision = this.props.revision; this.pushId = this.props.pushId; diff --git a/ui/job-view/pushes/PushJobs.jsx b/ui/job-view/pushes/PushJobs.jsx index 7ed7bfb8a..3d27bbc45 100644 --- a/ui/job-view/pushes/PushJobs.jsx +++ b/ui/job-view/pushes/PushJobs.jsx @@ -105,6 +105,7 @@ export default class PushJobs extends React.Component { onMouseDown(ev) { const jobElem = ev.target.attributes.getNamedItem('data-job-id'); + if (jobElem) { const jobId = jobElem.value; const job = this.getJobFromId(jobId); diff --git a/ui/job-view/pushes/PushList.jsx b/ui/job-view/pushes/PushList.jsx index 371b7c322..0b9ac4a7e 100644 --- a/ui/job-view/pushes/PushList.jsx +++ b/ui/job-view/pushes/PushList.jsx @@ -3,18 +3,16 @@ import React from 'react'; import PropTypes from 'prop-types'; import isEqual from 'lodash/isEqual'; -import Push from './Push'; +import { thDefaultRepo, thEvents, thMaxPushFetchSize } from '../../js/constants'; +import { reloadOnChangeParameters } from '../../helpers/filter'; import { findInstance, findSelectedInstance, findJobInstance, scrollToElement, } from '../../helpers/job'; -import PushLoadErrors from './PushLoadErrors'; -import { thDefaultRepo, thEvents, thMaxPushFetchSize } from '../../js/constants'; import JobModel from '../../models/job'; import PushModel from '../../models/push'; -import ErrorBoundary from '../../shared/ErrorBoundary'; import { getAllUrlParams, getQueryString, @@ -23,10 +21,11 @@ import { setUrlParam, } from '../../helpers/location'; import { parseQueryParams } from '../../helpers/url'; -import { reloadOnChangeParameters } from '../../helpers/filter'; +import ErrorBoundary from '../../shared/ErrorBoundary'; +import Push from './Push'; +import PushLoadErrors from './PushLoadErrors'; export default class PushList extends React.Component { - constructor(props) { super(props); const { $injector, repoName } = this.props;