diff options
Diffstat (limited to 'server/sonar-web/src/main/js/apps')
7 files changed, 21 insertions, 21 deletions
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.js b/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.js index b8d27cf0e7f..94090edd286 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.js @@ -23,12 +23,12 @@ import PropTypes from 'prop-types'; import Helmet from 'react-helmet'; import { debounce, uniq } from 'lodash'; import { connect } from 'react-redux'; -import { DEFAULT_FILTERS, DEBOUNCE_DELAY, STATUSES, CURRENTS } from './../constants'; import Header from './Header'; import Footer from './Footer'; -import StatsContainer from '../components/StatsContainer'; -import Search from '../components/Search'; -import Tasks from '../components/Tasks'; +import StatsContainer from './StatsContainer'; +import Search from './Search'; +import Tasks from './Tasks'; +import { DEFAULT_FILTERS, DEBOUNCE_DELAY, STATUSES, CURRENTS } from '../constants'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import { getTypes, @@ -38,12 +38,12 @@ import { cancelTask as cancelTaskAPI } from '../../../api/ce'; import { updateTask, mapFiltersToParameters } from '../utils'; -/*:: import type { Task } from '../types'; */ -import '../background-tasks.css'; import { fetchOrganizations } from '../../../store/rootActions'; import { translate } from '../../../helpers/l10n'; import { parseAsDate } from '../../../helpers/query'; import { toShortNotSoISOString } from '../../../helpers/dates'; +/*:: import type { Task } from '../types'; */ +import '../background-tasks.css'; /*:: type Props = { @@ -234,32 +234,32 @@ class BackgroundTasksApp extends React.PureComponent { <StatsContainer component={component} - pendingCount={pendingCount} failingCount={failingCount} - onShowFailing={this.handleShowFailing.bind(this)} onCancelAllPending={this.handleCancelAllPending.bind(this)} + onShowFailing={this.handleShowFailing.bind(this)} + pendingCount={pendingCount} /> <Search - loading={loading} component={component} - status={status} currents={currents} - minSubmittedAt={minSubmittedAt} + loading={loading} maxExecutedAt={maxExecutedAt} + minSubmittedAt={minSubmittedAt} + onFilterUpdate={this.handleFilterUpdate.bind(this)} + onReload={this.loadTasksDebounced} query={query} + status={status} taskType={taskType} types={types} - onFilterUpdate={this.handleFilterUpdate.bind(this)} - onReload={this.loadTasksDebounced} /> <Tasks - loading={loading} component={component} - tasks={tasks} + loading={loading} onCancelTask={this.handleCancelTask.bind(this)} onFilterTask={this.handleFilterTask.bind(this)} + tasks={tasks} /> <Footer tasks={tasks} /> diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Search.js b/server/sonar-web/src/main/js/apps/background-tasks/components/Search.js index e43c4adc54d..3e02fcc974d 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Search.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Search.js @@ -24,7 +24,7 @@ import StatusFilter from './StatusFilter'; import TypesFilter from './TypesFilter'; import CurrentsFilter from './CurrentsFilter'; import DateFilter from './DateFilter'; -import { DEFAULT_FILTERS } from './../constants'; +import { DEFAULT_FILTERS } from '../constants'; import SearchBox from '../../../components/controls/SearchBox'; import { Button } from '../../../components/ui/buttons'; import { translate } from '../../../helpers/l10n'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx index 44f72bf29ed..02b367047bf 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import ScannerContext from './ScannerContext'; import Stacktrace from './Stacktrace'; -import { STATUSES } from './../constants'; +import { STATUSES } from '../constants'; import { translate, translateWithParameters } from '../../../helpers/l10n'; import { Task } from '../types'; import ActionsDropdown, { ActionsDropdownItem } from '../../../components/controls/ActionsDropdown'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx index 4e3aa59dc73..3693ab0a6e4 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { STATUSES } from './../constants'; +import { STATUSES } from '../constants'; import PendingIcon from '../../../components/icons-components/PendingIcon'; import { translate } from '../../../helpers/l10n'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/AppContainer.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/AppContainer.tsx index 42f537dbbe6..9004f091ac8 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/AppContainer.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/AppContainer.tsx @@ -25,7 +25,7 @@ import { Organization, LoggedInUser, Visibility } from '../../app/types'; import { getAppState, getOrganizationByKey, getCurrentUser } from '../../store/rootReducer'; import { receiveOrganizations } from '../../store/organizations/duck'; import { changeProjectDefaultVisibility } from '../../api/permissions'; -import { fetchOrganization } from '../../apps/organizations/actions'; +import { fetchOrganization } from '../organizations/actions'; interface StateProps { appState: { defaultOrganization: string; qualifiers: string[] }; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx index e85af064e43..2f7d6c54079 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import CreateQualityGateForm from './CreateQualityGateForm'; import { Button } from '../../../components/ui/buttons'; -import CreateQualityGateForm from '../components/CreateQualityGateForm'; import DocTooltip from '../../../components/docs/DocTooltip'; import ModalButton from '../../../components/controls/ModalButton'; import { translate } from '../../../helpers/l10n'; diff --git a/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectWatcher.tsx b/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectWatcher.tsx index 31683d2f4cd..0b164f8bc6c 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectWatcher.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectWatcher.tsx @@ -23,7 +23,7 @@ import * as classNames from 'classnames'; import AlertErrorIcon from '../../../components/icons-components/AlertErrorIcon'; import AlertSuccessIcon from '../../../components/icons-components/AlertSuccessIcon'; import { getTasksForComponent } from '../../../api/ce'; -import { STATUSES } from '../../../apps/background-tasks/constants'; +import { STATUSES } from '../../background-tasks/constants'; import { translate } from '../../../helpers/l10n'; const INTERVAL = 5000; |