strengthen import/order (#3024)

author: Stas Vilchik <stas.vilchik@sonarsource.com> 2018-02-07 13:27:14 +0100
committer: GitHub <noreply@github.com> 2018-02-07 13:27:14 +0100
commit: 448e1fb820c918d462492b857403d0fc9a75a673 (patch)
tree: f13ffbd16131251746b185230d0d6b8823ef2bcd
parent: cc9b6d04f4f47d9f8b55a3873ae74ebad0a3990c (diff)
download: sonarqube-448e1fb820c918d462492b857403d0fc9a75a673.tar.gz
sonarqube-448e1fb820c918d462492b857403d0fc9a75a673.zip
106 files changed, 147 insertions, 141 deletions
diff --git a/server/sonar-web/.eslintrc b/server/sonar-web/.eslintrc
index e62bb030296..00b12a8d6b4 100644
--- a/server/sonar-web/.eslintrc
+++ b/server/sonar-web/.eslintrc
@@ -135,7 +135,13 @@
     "import/no-named-as-default-member": "error",
     "import/no-named-default": "error",
     "import/no-webpack-loader-syntax": "error",
-    "import/order": ["error", { "groups": ["builtin", "external"], "newlines-between": "never" }],
+    "import/order": [
+      "error",
+      {
+        "groups": ["builtin", "external", ["index", "sibling"], ["parent", "internal"]],
+        "newlines-between": "never"
+      }
+    ],
 
     // does not properly work with ts
     "import/no-unresolved": "off",
diff --git a/server/sonar-web/src/main/js/api/permissions.ts b/server/sonar-web/src/main/js/api/permissions.ts
index 43de59421a7..b87dbc9956d 100644
--- a/server/sonar-web/src/main/js/api/permissions.ts
+++ b/server/sonar-web/src/main/js/api/permissions.ts
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { getJSON, post, postJSON, RequestData } from '../helpers/request';
 import { BaseSearchProjectsParameters } from './components';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
 
 const PAGE_SIZE = 100;
 
diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.tsx
index 9524c6de7b6..b0a9a2c29a3 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalFooterContainer.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { connect } from 'react-redux';
-import { getAppState } from '../../store/rootReducer';
 import GlobalFooter from './GlobalFooter';
+import { getAppState } from '../../store/rootReducer';
 
 interface StateProps {
   productionDatabase: boolean;
diff --git a/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx b/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx
index 883fdfc3e24..8db3e7299c3 100644
--- a/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx
@@ -19,9 +19,9 @@
  */
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
-import * as theme from '../theme';
 import GlobalLoading from './GlobalLoading';
 import GlobalFooterContainer from './GlobalFooterContainer';
+import * as theme from '../theme';
 import { tryGetGlobalNavigation } from '../../api/nav';
 import NavBar from '../../components/nav/NavBar';
 
diff --git a/server/sonar-web/src/main/js/app/components/extensions/Extension.js b/server/sonar-web/src/main/js/app/components/extensions/Extension.js
index cf3ce657a71..e1a0ab878e8 100644
--- a/server/sonar-web/src/main/js/app/components/extensions/Extension.js
+++ b/server/sonar-web/src/main/js/app/components/extensions/Extension.js
@@ -23,10 +23,10 @@ import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import { injectIntl } from 'react-intl';
+import { getExtensionStart } from './utils';
 import { addGlobalErrorMessage } from '../../../store/globalMessages/duck';
 import { getCurrentUser } from '../../../store/rootReducer';
 import { translate } from '../../../helpers/l10n';
-import { getExtensionStart } from './utils';
 import getStore from '../../utils/getStore';
 
 /*::
diff --git a/server/sonar-web/src/main/js/app/components/extensions/ExtensionContainer.tsx b/server/sonar-web/src/main/js/app/components/extensions/ExtensionContainer.tsx
index d1808b36d91..e24cb825b9b 100644
--- a/server/sonar-web/src/main/js/app/components/extensions/ExtensionContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/extensions/ExtensionContainer.tsx
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { connect } from 'react-redux';
+import Extension from './Extension';
 import { getCurrentUser } from '../../../store/rootReducer';
 import { addGlobalErrorMessage } from '../../../store/globalMessages/duck';
-import Extension from './Extension';
 
 const mapStateToProps = (state: any) => ({
   currentUser: getCurrentUser(state)
diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx
index 7d7901e36dd..32433c78d15 100644
--- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx
@@ -20,9 +20,9 @@
 import * as React from 'react';
 import * as classNames from 'classnames';
 import { IndexLink, Link } from 'react-router';
+import SettingsEditionsNotifContainer from './SettingsEditionsNotifContainer';
 import * as theme from '../../../../app/theme';
 import ContextNavBar from '../../../../components/nav/ContextNavBar';
-import SettingsEditionsNotifContainer from './SettingsEditionsNotifContainer';
 import NavBarTabs from '../../../../components/nav/NavBarTabs';
 import { EditionStatus } from '../../../../api/marketplace';
 import { Extension } from '../../../types';
diff --git a/server/sonar-web/src/main/js/app/utils/startReactApp.js b/server/sonar-web/src/main/js/app/utils/startReactApp.js
index 0b8092d9570..f3a96e04522 100644
--- a/server/sonar-web/src/main/js/app/utils/startReactApp.js
+++ b/server/sonar-web/src/main/js/app/utils/startReactApp.js
@@ -21,6 +21,8 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Router, Route, IndexRoute, Redirect } from 'react-router';
 import { Provider } from 'react-redux';
+import getStore from './getStore';
+import getHistory from './getHistory';
 import DefaultHelmetContainer from '../components/DefaultHelmetContainer';
 import LocalizationContainer from '../components/LocalizationContainer';
 import MigrationContainer from '../components/MigrationContainer';
@@ -74,8 +76,6 @@ import usersRoutes from '../../apps/users/routes';
 import webAPIRoutes from '../../apps/web-api/routes';
 import { maintenanceRoutes, setupRoutes } from '../../apps/maintenance/routes';
 import { globalPermissionsRoutes, projectPermissionsRoutes } from '../../apps/permissions/routes';
-import getStore from './getStore';
-import getHistory from './getHistory';
 
 function handleUpdate() {
   const { action } = this.state.location;
diff --git a/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.js b/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.js
index bf116a08998..21b7c28f9d1 100644
--- a/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.js
+++ b/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.js
@@ -20,6 +20,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import NotificationsList from './NotificationsList';
+import { addNotification, removeNotification } from './actions';
 import { translate } from '../../../helpers/l10n';
 import {
   getGlobalNotifications,
@@ -32,7 +33,6 @@ import {
   ChannelsState,
   TypesState
 } from '../../../store/notifications/duck'; */
-import { addNotification, removeNotification } from './actions';
 
 /*::
 type Props = {
diff --git a/server/sonar-web/src/main/js/apps/account/notifications/Notifications.js b/server/sonar-web/src/main/js/apps/account/notifications/Notifications.js
index 2116133816c..56148702a1d 100644
--- a/server/sonar-web/src/main/js/apps/account/notifications/Notifications.js
+++ b/server/sonar-web/src/main/js/apps/account/notifications/Notifications.js
@@ -23,8 +23,8 @@ import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
 import GlobalNotifications from './GlobalNotifications';
 import Projects from './Projects';
-import { translate } from '../../../helpers/l10n';
 import { fetchNotifications } from './actions';
+import { translate } from '../../../helpers/l10n';
 
 class Notifications extends React.PureComponent {
   /*:: props: {
diff --git a/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.js b/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.js
index 0dc2bbe2ec3..8fbf66c2d4c 100644
--- a/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.js
+++ b/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.js
@@ -21,6 +21,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { Link } from 'react-router';
 import NotificationsList from './NotificationsList';
+import { addNotification, removeNotification } from './actions';
 import Organization from '../../../components/shared/Organization';
 import { translate } from '../../../helpers/l10n';
 import {
@@ -34,7 +35,6 @@ import {
   ChannelsState,
   TypesState
 } from '../../../store/notifications/duck'; */
-import { addNotification, removeNotification } from './actions';
 import { getProjectUrl } from '../../../helpers/urls';
 
 class ProjectNotifications extends React.PureComponent {
diff --git a/server/sonar-web/src/main/js/apps/account/organizations/UserOrganizations.tsx b/server/sonar-web/src/main/js/apps/account/organizations/UserOrganizations.tsx
index f03c2e8132f..30895a4147e 100644
--- a/server/sonar-web/src/main/js/apps/account/organizations/UserOrganizations.tsx
+++ b/server/sonar-web/src/main/js/apps/account/organizations/UserOrganizations.tsx
@@ -22,8 +22,8 @@ import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
 import OrganizationsList from './OrganizationsList';
 import CreateOrganizationForm from './CreateOrganizationForm';
-import { translate } from '../../../helpers/l10n';
 import { fetchIfAnyoneCanCreateOrganizations } from './actions';
+import { translate } from '../../../helpers/l10n';
 import { getAppState, getMyOrganizations, getGlobalSettingValue } from '../../../store/rootReducer';
 import { Organization } from '../../../app/types';
 
diff --git a/server/sonar-web/src/main/js/apps/code/components/App.tsx b/server/sonar-web/src/main/js/apps/code/components/App.tsx
index f6fa32269a2..08ceee43e65 100644
--- a/server/sonar-web/src/main/js/apps/code/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/App.tsx
@@ -22,17 +22,17 @@ import * as React from 'react';
 import Helmet from 'react-helmet';
 import Components from './Components';
 import Breadcrumbs from './Breadcrumbs';
-import { Component as CodeComponent } from '../types';
-import SourceViewer from './../../../components/SourceViewer/SourceViewer';
 import Search from './Search';
-import ListFooter from '../../../components/controls/ListFooter';
+import { addComponent, addComponentBreadcrumbs, clearBucket } from '../bucket';
+import { Component as CodeComponent } from '../types';
 import { retrieveComponentChildren, retrieveComponent, loadMoreChildren } from '../utils';
+import ListFooter from '../../../components/controls/ListFooter';
+import SourceViewer from '../../../components/SourceViewer/SourceViewer';
 import { parseError } from '../../../helpers/request';
-import { addComponent, addComponentBreadcrumbs, clearBucket } from '../bucket';
 import { getBranchName } from '../../../helpers/branches';
 import { translate } from '../../../helpers/l10n';
-import '../code.css';
 import { Component, Branch } from '../../../app/types';
+import '../code.css';
 
 interface Props {
   branch?: Branch;
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx
index 794ede92bdf..2dfe9096b12 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx
@@ -22,6 +22,11 @@ import { Helmet } from 'react-helmet';
 import * as PropTypes from 'prop-types';
 import { keyBy } from 'lodash';
 import * as key from 'keymaster';
+import BulkChange from './BulkChange';
+import FacetsList from './FacetsList';
+import PageActions from './PageActions';
+import RuleDetails from './RuleDetails';
+import RuleListItem from './RuleListItem';
 import {
   Facets,
   Query,
@@ -43,15 +48,10 @@ import ScreenPositionHelper from '../../../components/common/ScreenPositionHelpe
 import { translate } from '../../../helpers/l10n';
 import { RawQuery } from '../../../helpers/query';
 import ListFooter from '../../../components/controls/ListFooter';
-import RuleListItem from './RuleListItem';
-import PageActions from './PageActions';
 import FiltersHeader from '../../../components/common/FiltersHeader';
 import SearchBox from '../../../components/controls/SearchBox';
-import FacetsList from './FacetsList';
 import { searchQualityProfiles, Profile } from '../../../api/quality-profiles';
 import { scrollToElement } from '../../../helpers/scrolling';
-import BulkChange from './BulkChange';
-import RuleDetails from './RuleDetails';
 
 import '../styles.css';
 
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx
index 16a758b4256..752c317cb50 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx
@@ -19,7 +19,6 @@
  */
 import * as React from 'react';
 import CustomRuleButton from './CustomRuleButton';
-import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import RuleDetailsCustomRules from './RuleDetailsCustomRules';
 import RuleDetailsDescription from './RuleDetailsDescription';
 import RuleDetailsIssues from './RuleDetailsIssues';
@@ -30,6 +29,7 @@ import { Query, Activation } from '../query';
 import { Profile } from '../../../api/quality-profiles';
 import { getRuleDetails, deleteRule, updateRule } from '../../../api/rules';
 import { RuleActivation, RuleDetails as IRuleDetails } from '../../../app/types';
+import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import ConfirmButton from '../../../components/controls/ConfirmButton';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
 
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx
index 88d81b5faca..310af7e4bee 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx
@@ -19,18 +19,18 @@
  */
 import * as React from 'react';
 import { Link } from 'react-router';
+import RuleDetailsTagsPopup from './RuleDetailsTagsPopup';
+import SimilarRulesFilter from './SimilarRulesFilter';
 import { Query } from '../query';
 import { RuleDetails, RuleScope } from '../../../app/types';
 import { getRuleUrl } from '../../../helpers/urls';
 import LinkIcon from '../../../components/icons-components/LinkIcon';
 import RuleScopeIcon from '../../../components/icons-components/RuleScopeIcon';
-import SimilarRulesFilter from './SimilarRulesFilter';
 import Tooltip from '../../../components/controls/Tooltip';
 import { translate } from '../../../helpers/l10n';
 import IssueTypeIcon from '../../../components/ui/IssueTypeIcon';
 import SeverityHelper from '../../../components/shared/SeverityHelper';
 import BubblePopupHelper from '../../../components/common/BubblePopupHelper';
-import RuleDetailsTagsPopup from './RuleDetailsTagsPopup';
 import TagsList from '../../../components/tags/TagsList';
 import DateFormatter from '../../../components/intl/DateFormatter';
 
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx
index 20c045ba704..3f9852c418d 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx
@@ -20,9 +20,9 @@
 import * as React from 'react';
 import * as classNames from 'classnames';
 import { Link } from 'react-router';
-import { Activation, Query } from '../query';
 import ActivationButton from './ActivationButton';
 import SimilarRulesFilter from './SimilarRulesFilter';
+import { Activation, Query } from '../query';
 import { Profile, deactivateRule } from '../../../api/quality-profiles';
 import { Rule, RuleInheritance } from '../../../app/types';
 import ConfirmButton from '../../../components/controls/ConfirmButton';
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
index ae13d36acf2..a9d9f81c35d 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
@@ -20,14 +20,14 @@
 // @flow
 import React from 'react';
 import classNames from 'classnames';
-import CodeView from '../drilldown/CodeView';
 import Breadcrumbs from './Breadcrumbs';
-import FilesView from '../drilldown/FilesView';
 import MeasureFavoriteContainer from './MeasureFavoriteContainer';
 import MeasureHeader from './MeasureHeader';
 import MeasureViewSelect from './MeasureViewSelect';
 import MetricNotFound from './MetricNotFound';
 import PageActions from './PageActions';
+import FilesView from '../drilldown/FilesView';
+import CodeView from '../drilldown/CodeView';
 import TreeMapView from '../drilldown/TreeMapView';
 import { getComponentTree } from '../../../api/components';
 import { complementary } from '../config/complementary';
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js
index c7964eb56a1..87c543aaa76 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js
@@ -20,11 +20,11 @@
 // @flow
 import React from 'react';
 import { Link } from 'react-router';
+import LeakPeriodLegend from './LeakPeriodLegend';
 import ComplexityDistribution from '../../../components/shared/ComplexityDistribution';
 import HistoryIcon from '../../../components/icons-components/HistoryIcon';
 import IssueTypeIcon from '../../../components/ui/IssueTypeIcon';
 import LanguageDistributionContainer from '../../../components/charts/LanguageDistributionContainer';
-import LeakPeriodLegend from './LeakPeriodLegend';
 import Measure from '../../../components/measure/Measure';
 import Tooltip from '../../../components/controls/Tooltip';
 import { getLocalizedMetricName, translate } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js
index 22965bfd6f8..a5e79b7a134 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js
@@ -20,10 +20,10 @@
 // @flow
 import React from 'react';
 import Breadcrumbs from './Breadcrumbs';
-import BubbleChart from '../drilldown/BubbleChart';
 import LeakPeriodLegend from './LeakPeriodLegend';
 import MeasureFavoriteContainer from './MeasureFavoriteContainer';
 import PageActions from './PageActions';
+import BubbleChart from '../drilldown/BubbleChart';
 import SourceViewer from '../../../components/SourceViewer/SourceViewer';
 import { getComponentLeaves } from '../../../api/components';
 import { enhanceComponent, getBubbleMetrics, isFileType } from '../utils';
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/PageActions.js b/server/sonar-web/src/main/js/apps/component-measures/components/PageActions.js
index fb9cc6fd0c8..c68d7090f13 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/PageActions.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/PageActions.js
@@ -19,8 +19,8 @@
  */
 // @flow
 import React from 'react';
-import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import FilesCounter from './FilesCounter';
+import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import { translate } from '../../../helpers/l10n';
 /*:: import type { Paging } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
index dcefc84d246..3892abf2689 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.js
@@ -21,10 +21,10 @@
 import React from 'react';
 import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
 import { scaleLinear, scaleOrdinal } from 'd3-scale';
+import EmptyResult from './EmptyResult';
 import * as theme from '../../../app/theme';
 import ColorBoxLegend from '../../../components/charts/ColorBoxLegend';
 import ColorGradientLegend from '../../../components/charts/ColorGradientLegend';
-import EmptyResult from './EmptyResult';
 import QualifierIcon from '../../../components/icons-components/QualifierIcon';
 import TreeMap from '../../../components/charts/TreeMap';
 import { translate, translateWithParameters, getLocalizedMetricName } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.js b/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.js
index 3fd472649cd..6ea4bc1afd1 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.js
@@ -19,12 +19,12 @@
  */
 // @flow
 import React from 'react';
+import FacetMeasureValue from './FacetMeasureValue';
 import BubblesIcon from '../../../components/icons-components/BubblesIcon';
 import FacetBox from '../../../components/facet/FacetBox';
 import FacetHeader from '../../../components/facet/FacetHeader';
 import FacetItem from '../../../components/facet/FacetItem';
 import FacetItemsList from '../../../components/facet/FacetItemsList';
-import FacetMeasureValue from './FacetMeasureValue';
 import {
   addMeasureCategories,
   filterMeasures,
diff --git a/server/sonar-web/src/main/js/apps/component-measures/utils.js b/server/sonar-web/src/main/js/apps/component-measures/utils.js
index c793c38318a..d822e66e674 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/utils.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/utils.js
@@ -19,10 +19,10 @@
  */
 // @flow
 import { groupBy, memoize, sortBy, toPairs } from 'lodash';
-import { getLocalizedMetricName } from '../../helpers/l10n';
-import { cleanQuery, parseAsString, serializeString } from '../../helpers/query';
 import { domains } from './config/domains';
 import { bubbles } from './config/bubbles';
+import { getLocalizedMetricName } from '../../helpers/l10n';
+import { cleanQuery, parseAsString, serializeString } from '../../helpers/query';
 import { enhanceMeasure } from '../../components/measure/utils';
 /*:: import type { Component, ComponentEnhanced, Query } from './types'; */
 /*:: import type { RawQuery } from '../../helpers/query'; */
diff --git a/server/sonar-web/src/main/js/apps/custom-measures/delete-view.js b/server/sonar-web/src/main/js/apps/custom-measures/delete-view.js
index aeb6f1907d2..e910f280e55 100644
--- a/server/sonar-web/src/main/js/apps/custom-measures/delete-view.js
+++ b/server/sonar-web/src/main/js/apps/custom-measures/delete-view.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import ModalForm from '../../components/common/modal-form';
 import Template from './templates/custom-measures-delete.hbs';
+import ModalForm from '../../components/common/modal-form';
 
 export default ModalForm.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/apps/custom-measures/form-view.js b/server/sonar-web/src/main/js/apps/custom-measures/form-view.js
index 517ea47a706..aa8ff0a64df 100644
--- a/server/sonar-web/src/main/js/apps/custom-measures/form-view.js
+++ b/server/sonar-web/src/main/js/apps/custom-measures/form-view.js
@@ -17,9 +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.
  */
+import Template from './templates/custom-measures-form.hbs';
 import ModalForm from '../../components/common/modal-form';
 import Metrics from '../metrics/metrics';
-import Template from './templates/custom-measures-form.hbs';
 
 export default ModalForm.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/apps/groups/components/List.tsx b/server/sonar-web/src/main/js/apps/groups/components/List.tsx
index c4207f141d5..bac8da1aa30 100644
--- a/server/sonar-web/src/main/js/apps/groups/components/List.tsx
+++ b/server/sonar-web/src/main/js/apps/groups/components/List.tsx
@@ -19,8 +19,8 @@
  */
 import * as React from 'react';
 import { sortBy } from 'lodash';
-import { Group } from '../../../app/types';
 import ListItem from './ListItem';
+import { Group } from '../../../app/types';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/issues/components/App.js b/server/sonar-web/src/main/js/apps/issues/components/App.js
index 81261fe01bf..a4f0a861a95 100644
--- a/server/sonar-web/src/main/js/apps/issues/components/App.js
+++ b/server/sonar-web/src/main/js/apps/issues/components/App.js
@@ -25,7 +25,6 @@ import { keyBy, without } from 'lodash';
 import PropTypes from 'prop-types';
 import PageActions from './PageActions';
 import MyIssuesFilter from './MyIssuesFilter';
-import Sidebar from '../sidebar/Sidebar';
 import IssuesList from './IssuesList';
 import ComponentBreadcrumbs from './ComponentBreadcrumbs';
 import IssuesSourceViewer from './IssuesSourceViewer';
@@ -33,6 +32,7 @@ import BulkChangeModal from './BulkChangeModal';
 import NoMyIssues from './NoMyIssues';
 import ConciseIssuesList from '../conciseIssuesList/ConciseIssuesList';
 import ConciseIssuesListHeader from '../conciseIssuesList/ConciseIssuesListHeader';
+import Sidebar from '../sidebar/Sidebar';
 import * as actions from '../actions';
 import {
   parseQuery,
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.js b/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.js
index b7f8bf39d81..1ccd0307689 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.js
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.js
@@ -20,11 +20,11 @@
 // @flow
 import React from 'react';
 import { sortBy, uniq, without } from 'lodash';
+import LanguageFacetFooter from './LanguageFacetFooter';
 import FacetBox from '../../../components/facet/FacetBox';
 import FacetHeader from '../../../components/facet/FacetHeader';
 import FacetItem from '../../../components/facet/FacetItem';
 import FacetItemsList from '../../../components/facet/FacetItemsList';
-import LanguageFacetFooter from './LanguageFacetFooter';
 import { translate } from '../../../helpers/l10n';
 import { formatFacetStat } from '../utils';
 /*:: import type { ReferencedLanguage } from '../utils'; */
diff --git a/server/sonar-web/src/main/js/apps/marketplace/App.tsx b/server/sonar-web/src/main/js/apps/marketplace/App.tsx
index da8d71a8b22..9615d5f844e 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/App.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/App.tsx
@@ -27,6 +27,7 @@ import Footer from './Footer';
 import PendingActions from './PendingActions';
 import PluginsList from './PluginsList';
 import Search from './Search';
+import { filterPlugins, parseQuery, Query, serializeQuery } from './utils';
 import {
   getAvailablePlugins,
   getInstalledPluginsWithUpdates,
@@ -38,7 +39,6 @@ import {
 import { Edition, EditionStatus } from '../../api/marketplace';
 import { RawQuery } from '../../helpers/query';
 import { translate } from '../../helpers/l10n';
-import { filterPlugins, parseQuery, Query, serializeQuery } from './utils';
 import './style.css';
 
 export interface Props {
diff --git a/server/sonar-web/src/main/js/apps/marketplace/EditionBoxes.tsx b/server/sonar-web/src/main/js/apps/marketplace/EditionBoxes.tsx
index bec96531575..d169e5b31a4 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/EditionBoxes.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/EditionBoxes.tsx
@@ -22,9 +22,9 @@ import { FormattedMessage } from 'react-intl';
 import EditionBox from './components/EditionBox';
 import LicenseEditionForm from './components/LicenseEditionForm';
 import UninstallEditionForm from './components/UninstallEditionForm';
+import { sortEditions } from './utils';
 import { Edition, EditionStatus } from '../../api/marketplace';
 import { translate } from '../../helpers/l10n';
-import { sortEditions } from './utils';
 
 export interface Props {
   canInstall: boolean;
diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx
index bbcb7b7c0ae..324f3d9d34a 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import PluginUpdateButton from './PluginUpdateButton';
 import Checkbox from '../../../components/controls/Checkbox';
 import CheckIcon from '../../../components/icons-components/CheckIcon';
-import PluginUpdateButton from './PluginUpdateButton';
 import { Plugin, installPlugin, updatePlugin, uninstallPlugin } from '../../../api/plugins';
 import { isPluginAvailable, isPluginInstalled } from '../utils';
 import { translate } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx
index 4b0b2d751c5..26b333cc334 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import BubblePopup from '../../../components/common/BubblePopup';
 import PluginChangeLogItem from './PluginChangeLogItem';
+import BubblePopup from '../../../components/common/BubblePopup';
 import { Release, Update } from '../../../api/plugins';
 import { translate } from '../../../helpers/l10n';
 
diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx
index 33883ff2d55..a1f17963a7e 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import BubblePopupHelper from '../../../components/common/BubblePopupHelper';
 import PluginChangeLog from './PluginChangeLog';
+import BubblePopupHelper from '../../../components/common/BubblePopupHelper';
 import { Release, Update } from '../../../api/plugins';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx
index ea92b059eaf..8c42916e6c1 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { Plugin } from '../../../api/plugins';
 import PluginActions from './PluginActions';
+import { Plugin } from '../../../api/plugins';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/metrics/delete-view.js b/server/sonar-web/src/main/js/apps/metrics/delete-view.js
index 5723921e4c6..5839bb00b96 100644
--- a/server/sonar-web/src/main/js/apps/metrics/delete-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/delete-view.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import ModalForm from '../../components/common/modal-form';
 import Template from './templates/metrics-delete.hbs';
+import ModalForm from '../../components/common/modal-form';
 
 export default ModalForm.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/apps/metrics/form-view.js b/server/sonar-web/src/main/js/apps/metrics/form-view.js
index 24bd4602b68..4cc287bec76 100644
--- a/server/sonar-web/src/main/js/apps/metrics/form-view.js
+++ b/server/sonar-web/src/main/js/apps/metrics/form-view.js
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import $ from 'jquery';
-import ModalForm from '../../components/common/modal-form';
 import Template from './templates/metrics-form.hbs';
+import ModalForm from '../../components/common/modal-form';
 
 export default ModalForm.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/apps/organizations/components/MembersListItem.js b/server/sonar-web/src/main/js/apps/organizations/components/MembersListItem.js
index 7626ef7dada..891502d42e6 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/MembersListItem.js
+++ b/server/sonar-web/src/main/js/apps/organizations/components/MembersListItem.js
@@ -19,11 +19,11 @@
  */
 //@flow
 import React from 'react';
+import RemoveMemberForm from './forms/RemoveMemberForm';
+import ManageMemberGroupsForm from './forms/ManageMemberGroupsForm';
 import Avatar from '../../../components/ui/Avatar';
 import { translateWithParameters } from '../../../helpers/l10n';
 import { formatMeasure } from '../../../helpers/measures';
-import RemoveMemberForm from './forms/RemoveMemberForm';
-import ManageMemberGroupsForm from './forms/ManageMemberGroupsForm';
 import ActionsDropdown, {
   ActionsDropdownDivider
 } from '../../../components/controls/ActionsDropdown';
diff --git a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigationMenu.tsx b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigationMenu.tsx
index c4bbf75e335..2c7b4f8b863 100644
--- a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigationMenu.tsx
+++ b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigationMenu.tsx
@@ -19,12 +19,12 @@
  */
 import * as React from 'react';
 import { Link } from 'react-router';
+import OrganizationNavigationExtensions from './OrganizationNavigationExtensions';
+import OrganizationNavigationAdministration from './OrganizationNavigationAdministration';
 import { Organization } from '../../../app/types';
 import NavBarTabs from '../../../components/nav/NavBarTabs';
 import { translate } from '../../../helpers/l10n';
 import { getQualityGatesUrl } from '../../../helpers/urls';
-import OrganizationNavigationExtensions from './OrganizationNavigationExtensions';
-import OrganizationNavigationAdministration from './OrganizationNavigationAdministration';
 
 interface Props {
   location: { pathname: string };
diff --git a/server/sonar-web/src/main/js/apps/organizations/routes.ts b/server/sonar-web/src/main/js/apps/organizations/routes.ts
index 6546097f981..2b11756dbc3 100644
--- a/server/sonar-web/src/main/js/apps/organizations/routes.ts
+++ b/server/sonar-web/src/main/js/apps/organizations/routes.ts
@@ -18,15 +18,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { RouterState, RedirectFunction } from 'react-router';
-import GlobalPermissionsApp from '../permissions/global/components/App';
 import OrganizationPageContainer from './components/OrganizationPage';
-import OrganizationPageExtension from '../../app/components/extensions/OrganizationPageExtension';
 import OrganizationContainer from './components/OrganizationContainer';
 import OrganizationProjects from './components/OrganizationProjects';
 import OrganizationAdminContainer from './components/OrganizationAdminContainer';
 import OrganizationEdit from './components/OrganizationEdit';
 import OrganizationMembersContainer from './components/OrganizationMembersContainer';
 import OrganizationDelete from './components/OrganizationDelete';
+import GlobalPermissionsApp from '../permissions/global/components/App';
 import PermissionTemplateApp from '../permission-templates/components/AppContainer';
 import ProjectManagementApp from '../projectsManagement/AppContainer';
 import codingRulesRoutes from '../coding-rules/routes';
@@ -34,6 +33,7 @@ import qualityGatesRoutes from '../quality-gates/routes';
 import qualityProfilesRoutes from '../quality-profiles/routes';
 import Issues from '../issues/components/AppContainer';
 import GroupsApp from '../groups/components/App';
+import OrganizationPageExtension from '../../app/components/extensions/OrganizationPageExtension';
 
 const routes = [
   {
diff --git a/server/sonar-web/src/main/js/apps/overview/badges/BadgeParams.tsx b/server/sonar-web/src/main/js/apps/overview/badges/BadgeParams.tsx
index e6bce97e5d1..17e3da5f7eb 100644
--- a/server/sonar-web/src/main/js/apps/overview/badges/BadgeParams.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/badges/BadgeParams.tsx
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import { BadgeColors, BadgeType, BadgeOptions } from './utils';
 import Select from '../../../components/controls/Select';
 import { fetchWebApi } from '../../../api/web-api';
-import { BadgeColors, BadgeType, BadgeOptions } from './utils';
 import { getLocalizedMetricName, translate } from '../../../helpers/l10n';
 import { Metric } from '../../../app/types';
 
diff --git a/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx b/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx
index ae664043b7c..b86c74027f4 100644
--- a/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx
@@ -18,12 +18,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import Modal from '../../../components/controls/Modal';
 import BadgeButton from './BadgeButton';
 import BadgeSnippet from './BadgeSnippet';
 import BadgeParams from './BadgeParams';
 import { BadgeType, BadgeOptions, getBadgeUrl } from './utils';
 import { Metric } from '../../../app/types';
+import Modal from '../../../components/controls/Modal';
 import { translate } from '../../../helpers/l10n';
 import './styles.css';
 
diff --git a/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js b/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js
index 259afad8acd..94786fea4f8 100644
--- a/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js
@@ -19,10 +19,10 @@
  */
 import React from 'react';
 import { Link } from 'react-router';
+import enhance from './enhance';
 import Tooltip from '../../../components/controls/Tooltip';
 import DateFromNow from '../../../components/intl/DateFromNow';
 import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
-import enhance from './enhance';
 import { getMetricName } from '../helpers/metrics';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
 import { formatMeasure, isDiffMetric } from '../../../helpers/measures';
diff --git a/server/sonar-web/src/main/js/apps/overview/main/enhance.tsx b/server/sonar-web/src/main/js/apps/overview/main/enhance.tsx
index 142cdf3eb90..43e23c1715d 100644
--- a/server/sonar-web/src/main/js/apps/overview/main/enhance.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/main/enhance.tsx
@@ -23,7 +23,7 @@ import DrilldownLink from '../../../components/shared/DrilldownLink';
 import BubblesIcon from '../../../components/icons-components/BubblesIcon';
 import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import HistoryIcon from '../../../components/icons-components/HistoryIcon';
-import Rating from './../../../components/ui/Rating';
+import Rating from '../../../components/ui/Rating';
 import Timeline from '../components/Timeline';
 import Tooltip from '../../../components/controls/Tooltip';
 import {
diff --git a/server/sonar-web/src/main/js/apps/overview/meta/Meta.tsx b/server/sonar-web/src/main/js/apps/overview/meta/Meta.tsx
index d05bdee1893..82521e8c55c 100644
--- a/server/sonar-web/src/main/js/apps/overview/meta/Meta.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/meta/Meta.tsx
@@ -24,10 +24,10 @@ import MetaOrganizationKey from './MetaOrganizationKey';
 import MetaLinks from './MetaLinks';
 import MetaQualityGate from './MetaQualityGate';
 import MetaQualityProfiles from './MetaQualityProfiles';
-import AnalysesList from '../events/AnalysesList';
 import MetaSize from './MetaSize';
 import MetaTags from './MetaTags';
 import BadgesModal from '../badges/BadgesModal';
+import AnalysesList from '../events/AnalysesList';
 import { Visibility, Component, Metric } from '../../../app/types';
 import { History } from '../../../api/time-machine';
 import { MeasureEnhanced } from '../../../helpers/measures';
diff --git a/server/sonar-web/src/main/js/apps/overview/meta/MetaTags.tsx b/server/sonar-web/src/main/js/apps/overview/meta/MetaTags.tsx
index 0e22da39691..e0caea4f6fb 100644
--- a/server/sonar-web/src/main/js/apps/overview/meta/MetaTags.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/meta/MetaTags.tsx
@@ -18,10 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import MetaTagsSelector from './MetaTagsSelector';
 import { setProjectTags } from '../../../api/components';
 import { translate } from '../../../helpers/l10n';
 import TagsList from '../../../components/tags/TagsList';
-import MetaTagsSelector from './MetaTagsSelector';
 import { BubblePopupPosition } from '../../../components/common/BubblePopup';
 import { Component } from '../../../app/types';
 
diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersListContainer.tsx b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersListContainer.tsx
index 4c37e1193fe..6038c2cc7f2 100644
--- a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersListContainer.tsx
+++ b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersListContainer.tsx
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { connect } from 'react-redux';
+import AllHoldersList from './AllHoldersList';
 import {
   loadHolders,
   grantToUser,
@@ -35,7 +36,6 @@ import {
   getPermissionsAppFilter,
   getPermissionsAppSelectedPermission
 } from '../../../../store/rootReducer';
-import AllHoldersList from './AllHoldersList';
 import { Organization } from '../../../../app/types';
 import { PermissionUser, PermissionGroup } from '../../../../api/permissions';
 
diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/App.js b/server/sonar-web/src/main/js/apps/permissions/project/components/App.js
index 174dbef8b9c..409bf3932cd 100644
--- a/server/sonar-web/src/main/js/apps/permissions/project/components/App.js
+++ b/server/sonar-web/src/main/js/apps/permissions/project/components/App.js
@@ -21,11 +21,11 @@
 import React from 'react';
 import Helmet from 'react-helmet';
 import { without } from 'lodash';
+import AllHoldersList from './AllHoldersList';
 import PageHeader from './PageHeader';
+import PublicProjectDisclaimer from './PublicProjectDisclaimer';
 import UpgradeOrganizationBox from '../../../../components/common/UpgradeOrganizationBox';
 import VisibilitySelector from '../../../../components/common/VisibilitySelector';
-import AllHoldersList from './AllHoldersList';
-import PublicProjectDisclaimer from './PublicProjectDisclaimer';
 import PageError from '../../shared/components/PageError';
 import * as api from '../../../../api/permissions';
 import { translate } from '../../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js b/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js
index 93c910e9729..cf6ffdb2d9a 100644
--- a/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js
@@ -22,6 +22,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import BulkUpdateForm from './BulkUpdateForm';
 import BulkUpdateResults from './BulkUpdateResults';
+import { reloadUpdateKeyPage } from './utils';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
 import { bulkChangeKey } from '../../../api/components';
 import { parseError } from '../../../helpers/request';
@@ -30,7 +31,6 @@ import {
   addGlobalSuccessMessage,
   closeAllGlobalMessages
 } from '../../../store/globalMessages/duck';
-import { reloadUpdateKeyPage } from './utils';
 import RecentHistory from '../../../app/components/RecentHistory';
 
 class BulkUpdate extends React.PureComponent {
diff --git a/server/sonar-web/src/main/js/apps/project-admin/key/Key.js b/server/sonar-web/src/main/js/apps/project-admin/key/Key.js
index 9f66444406f..52faac1bdc0 100644
--- a/server/sonar-web/src/main/js/apps/project-admin/key/Key.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/key/Key.js
@@ -25,6 +25,7 @@ import Header from './Header';
 import UpdateForm from './UpdateForm';
 import BulkUpdate from './BulkUpdate';
 import FineGrainedUpdate from './FineGrainedUpdate';
+import { reloadUpdateKeyPage } from './utils';
 import { fetchProjectModules, changeKey } from '../store/actions';
 import { translate } from '../../../helpers/l10n';
 import {
@@ -33,7 +34,6 @@ import {
   addGlobalSuccessMessage
 } from '../../../store/globalMessages/duck';
 import { parseError } from '../../../helpers/request';
-import { reloadUpdateKeyPage } from './utils';
 import RecentHistory from '../../../app/components/RecentHistory';
 import { getProjectAdminProjectModules } from '../../../store/rootReducer';
 
diff --git a/server/sonar-web/src/main/js/apps/project-admin/key/views/UpdateKeyConfirmation.js b/server/sonar-web/src/main/js/apps/project-admin/key/views/UpdateKeyConfirmation.js
index 83bbdd476a0..afdc1ccf3d7 100644
--- a/server/sonar-web/src/main/js/apps/project-admin/key/views/UpdateKeyConfirmation.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/key/views/UpdateKeyConfirmation.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import ModalForm from '../../../../components/common/modal-form';
 import Template from './UpdateKeyConfirmation.hbs';
+import ModalForm from '../../../../components/common/modal-form';
 
 export default ModalForm.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js b/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js
index 020a4e8ee18..d00cb68e3be 100644
--- a/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import ModalForm from '../../../../components/common/modal-form';
 import Template from './CreationModalTemplate.hbs';
+import ModalForm from '../../../../components/common/modal-form';
 import { parseError } from '../../../../helpers/request';
 
 export default ModalForm.extend({
diff --git a/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js b/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js
index 07f8e6ffc72..7b12ab08d84 100644
--- a/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import ModalForm from '../../../../components/common/modal-form';
 import Template from './DeletionModalTemplate.hbs';
+import ModalForm from '../../../../components/common/modal-form';
 import { deleteLink } from '../../../../api/projectLinks';
 import { parseError } from '../../../../helpers/request';
 
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js
index 580ffc0ca39..535529ccc18 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js
@@ -19,10 +19,10 @@
  */
 import React from 'react';
 import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
-import AdvancedTimeline from '../../../components/charts/AdvancedTimeline';
 import GraphsTooltips from './GraphsTooltips';
 import GraphsLegendCustom from './GraphsLegendCustom';
 import GraphsLegendStatic from './GraphsLegendStatic';
+import AdvancedTimeline from '../../../components/charts/AdvancedTimeline';
 import { formatMeasure, getShortType } from '../../../helpers/measures';
 /*:: import type { Event, MeasureHistory } from '../types'; */
 /*:: import type { Serie } from '../../../components/charts/AdvancedTimeline'; */
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsHistory.js b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsHistory.js
index 207cc46e3b1..989b2ea690b 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsHistory.js
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsHistory.js
@@ -19,8 +19,8 @@
  */
 import React from 'react';
 import { isEqual, sortBy } from 'lodash';
-import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import GraphHistory from './GraphHistory';
+import DeferredSpinner from '../../../components/common/DeferredSpinner';
 import { EVENT_TYPES, getSeriesMetricType, hasHistoryData, isCustomGraph } from '../utils';
 import { translate } from '../../../helpers/l10n';
 import { parseDate } from '../../../helpers/dates';
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsTooltips.js b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsTooltips.js
index e5f5be5f102..98c8c2db81c 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsTooltips.js
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphsTooltips.js
@@ -19,14 +19,14 @@
  */
 // @flow
 import React from 'react';
-import BubblePopup from '../../../components/common/BubblePopup';
-import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import GraphsTooltipsContent from './GraphsTooltipsContent';
 import GraphsTooltipsContentEvents from './GraphsTooltipsContentEvents';
 import GraphsTooltipsContentCoverage from './GraphsTooltipsContentCoverage';
 import GraphsTooltipsContentDuplication from './GraphsTooltipsContentDuplication';
 import GraphsTooltipsContentIssues from './GraphsTooltipsContentIssues';
 import { DEFAULT_GRAPH } from '../utils';
+import BubblePopup from '../../../components/common/BubblePopup';
+import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 /*:: import type { Event, MeasureHistory } from '../types'; */
 /*:: import type { Serie } from '../../../components/charts/AdvancedTimeline'; */
 
diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchRow.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchRow.tsx
index 979a726f336..b103ded575f 100644
--- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchRow.tsx
+++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchRow.tsx
@@ -19,14 +19,14 @@
  */
 import * as React from 'react';
 import * as classNames from 'classnames';
-import { Branch } from '../../../app/types';
 import DeleteBranchModal from './DeleteBranchModal';
 import LeakPeriodForm from './LeakPeriodForm';
+import RenameBranchModal from './RenameBranchModal';
+import { Branch } from '../../../app/types';
 import BranchStatus from '../../../components/common/BranchStatus';
 import BranchIcon from '../../../components/icons-components/BranchIcon';
 import { isShortLivingBranch, isLongLivingBranch } from '../../../helpers/branches';
 import { translate } from '../../../helpers/l10n';
-import RenameBranchModal from './RenameBranchModal';
 import DateFromNow from '../../../components/intl/DateFromNow';
 import ActionsDropdown, {
   ActionsDropdownItem,
diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx
index 3182e69fd30..cbc15e22bad 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx
@@ -19,10 +19,10 @@
  */
 import * as React from 'react';
 import * as classNames from 'classnames';
-import SearchFilterContainer from '../filters/SearchFilterContainer';
-import Tooltip from '../../../components/controls/Tooltip';
 import PerspectiveSelect from './PerspectiveSelect';
 import ProjectsSortingSelect from './ProjectsSortingSelect';
+import SearchFilterContainer from '../filters/SearchFilterContainer';
+import Tooltip from '../../../components/controls/Tooltip';
 import { CurrentUser, isLoggedIn, HomePageType } from '../../../app/types';
 import HomePageSelect from '../../../components/controls/HomePageSelect';
 import { translate } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLeak.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLeak.tsx
index 2c990df3673..d4477d904eb 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLeak.tsx
+++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectCardLeak.tsx
@@ -19,12 +19,12 @@
  */
 import * as React from 'react';
 import { Link } from 'react-router';
-import DateFromNow from '../../../components/intl/DateFromNow';
-import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import ProjectCardQualityGate from './ProjectCardQualityGate';
 import ProjectCardLeakMeasures from './ProjectCardLeakMeasures';
 import ProjectCardOrganizationContainer from './ProjectCardOrganizationContainer';
 import Favorite from '../../../components/controls/Favorite';
+import DateFromNow from '../../../components/intl/DateFromNow';
+import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import TagsList from '../../../components/tags/TagsList';
 import PrivateBadge from '../../../components/common/PrivateBadge';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
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 275aa8fb49a..0721c0d34eb 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
@@ -19,11 +19,11 @@
  */
 import * as React from 'react';
 import { Link } from 'react-router';
-import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import ProjectCardQualityGate from './ProjectCardQualityGate';
 import ProjectCardOverallMeasures from './ProjectCardOverallMeasures';
 import ProjectCardOrganizationContainer from './ProjectCardOrganizationContainer';
 import Favorite from '../../../components/controls/Favorite';
+import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import TagsList from '../../../components/tags/TagsList';
 import PrivateBadge from '../../../components/common/PrivateBadge';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx
index 2e54db0c19a..99f67289a3a 100644
--- a/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx
+++ b/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import CodeSmellIcon from '../../../components/icons-components/CodeSmellIcon';
 import IssuesFilter from './IssuesFilter';
+import CodeSmellIcon from '../../../components/icons-components/CodeSmellIcon';
 import { translate } from '../../../helpers/l10n';
 import { Facet } from '../types';
 import { RawQuery } from '../../../helpers/query';
diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx
index 365b782a8fa..9453ea55c79 100644
--- a/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx
+++ b/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import BugIcon from '../../../components/icons-components/BugIcon';
 import IssuesFilter from './IssuesFilter';
+import BugIcon from '../../../components/icons-components/BugIcon';
 import { translate } from '../../../helpers/l10n';
 import { Facet } from '../types';
 import { RawQuery } from '../../../helpers/query';
diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx
index 188659eef25..f6c5dc24802 100644
--- a/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx
+++ b/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import VulnerabilityIcon from '../../../components/icons-components/VulnerabilityIcon';
 import IssuesFilter from './IssuesFilter';
+import VulnerabilityIcon from '../../../components/icons-components/VulnerabilityIcon';
 import { translate } from '../../../helpers/l10n';
 import { Facet } from '../types';
 import { RawQuery } from '../../../helpers/query';
diff --git a/server/sonar-web/src/main/js/apps/projects/utils.ts b/server/sonar-web/src/main/js/apps/projects/utils.ts
index 2a7ee27d7fa..5aa2bd86909 100644
--- a/server/sonar-web/src/main/js/apps/projects/utils.ts
+++ b/server/sonar-web/src/main/js/apps/projects/utils.ts
@@ -18,13 +18,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { sumBy, uniq } from 'lodash';
+import { Query, convertToFilter } from './query';
 import { translate } from '../../helpers/l10n';
 import { RequestData } from '../../helpers/request';
 import { getOrganizations } from '../../api/organizations';
 import { searchProjects, Facet } from '../../api/components';
 import { getMeasuresForProjects } from '../../api/measures';
 import { isDiffMetric, getPeriodValue } from '../../helpers/measures';
-import { Query, convertToFilter } from './query';
 
 interface SortingOption {
   class?: string;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx
index cdb44039fcc..5b6131ac59a 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx
@@ -24,8 +24,8 @@ import Header from './Header';
 import Search from './Search';
 import Projects from './Projects';
 import CreateProjectForm from './CreateProjectForm';
-import ListFooter from '../../components/controls/ListFooter';
 import { PAGE_SIZE, Project } from './utils';
+import ListFooter from '../../components/controls/ListFooter';
 import { getComponents } from '../../api/components';
 import { Organization } from '../../app/types';
 import { translate } from '../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx
index fccf560a466..c5e3c2be471 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx
@@ -18,10 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import Checkbox from '../../../components/controls/Checkbox';
 import DeleteConditionForm from './DeleteConditionForm';
-import Select from '../../../components/controls/Select';
 import ThresholdInput from './ThresholdInput';
+import Checkbox from '../../../components/controls/Checkbox';
+import Select from '../../../components/controls/Select';
 import {
   Condition as ICondition,
   ConditionBase,
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js
index 6dd53a36b2a..37c9627a8df 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js
@@ -20,9 +20,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { fetchQualityGate } from '../../../api/quality-gates';
 import DetailsHeader from './DetailsHeader';
 import DetailsContent from './DetailsContent';
+import { fetchQualityGate } from '../../../api/quality-gates';
 
 export default class Details extends React.PureComponent {
   static contextTypes = {
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx
index 77b2ed020ba..ba7c7957ea5 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import { User, Group } from './ProfilePermissions';
 import ProfilePermissionsFormSelect from './ProfilePermissionsFormSelect';
 import {
   searchUsers,
@@ -28,7 +29,6 @@ import {
 } from '../../../api/quality-profiles';
 import Modal from '../../../components/controls/Modal';
 import { translate } from '../../../helpers/l10n';
-import { User, Group } from './ProfilePermissions';
 
 interface Props {
   onClose: () => void;
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts b/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts
index 062d9296dfa..c0e23eeaf9f 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { sortBy } from 'lodash';
+import { Profile } from './types';
 import { Profile as BaseProfile } from '../../api/quality-profiles';
 import { differenceInYears, isValidDate, parseDate } from '../../helpers/dates';
-import { Profile } from './types';
 
 export function sortProfiles(profiles: BaseProfile[]): Profile[] {
   const result: Profile[] = [];
diff --git a/server/sonar-web/src/main/js/apps/settings/store/actions.js b/server/sonar-web/src/main/js/apps/settings/store/actions.js
index d90ce023b1a..7865fd56313 100644
--- a/server/sonar-web/src/main/js/apps/settings/store/actions.js
+++ b/server/sonar-web/src/main/js/apps/settings/store/actions.js
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+import { receiveValues } from './values/actions';
+import { receiveDefinitions } from './definitions/actions';
+import { startLoading, stopLoading } from './settingsPage/loading/actions';
+import { passValidation, failValidation } from './settingsPage/validationMessages/actions';
+import { cancelChange } from './settingsPage/changedValues/actions';
 import {
   getDefinitions,
   getValues,
   setSettingValue,
   resetSettingValue
 } from '../../../api/settings';
-import { receiveValues } from './values/actions';
-import { receiveDefinitions } from './definitions/actions';
-import { startLoading, stopLoading } from './settingsPage/loading/actions';
 import { parseError } from '../../../helpers/request';
 import { addGlobalErrorMessage, closeAllGlobalMessages } from '../../../store/globalMessages/duck';
-import { passValidation, failValidation } from './settingsPage/validationMessages/actions';
-import { cancelChange } from './settingsPage/changedValues/actions';
 import { isEmptyValue } from '../utils';
 import { translate } from '../../../helpers/l10n';
 import { getSettingsAppDefinition, getSettingsAppChangedValue } from '../../../store/rootReducer';
diff --git a/server/sonar-web/src/main/js/apps/settings/store/rootReducer.js b/server/sonar-web/src/main/js/apps/settings/store/rootReducer.js
index 27bc6f56b4e..13320969836 100644
--- a/server/sonar-web/src/main/js/apps/settings/store/rootReducer.js
+++ b/server/sonar-web/src/main/js/apps/settings/store/rootReducer.js
@@ -20,10 +20,10 @@
 // @flow
 import { combineReducers } from 'redux';
 import definitions, * as fromDefinitions from './definitions/reducer';
+import encryptionPage from './encryptionPage/reducer';
 import values, * as fromValues from './values/reducer';
 import settingsPage, * as fromSettingsPage from './settingsPage/reducer';
 import globalMessages, * as fromGlobalMessages from '../../../store/globalMessages/duck';
-import encryptionPage from './encryptionPage/reducer';
 /*:: import type { State as GlobalMessagesState } from '../../../store/globalMessages/duck'; */
 /*:: import type { State as ValuesState } from './values/reducer'; */
 
diff --git a/server/sonar-web/src/main/js/apps/settings/utils.js b/server/sonar-web/src/main/js/apps/settings/utils.js
index 6f1de274376..f48db75aa2b 100644
--- a/server/sonar-web/src/main/js/apps/settings/utils.js
+++ b/server/sonar-web/src/main/js/apps/settings/utils.js
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { translate, hasMessage } from '../../helpers/l10n';
 import {
   TYPE_PROPERTY_SET,
   TYPE_BOOLEAN,
   TYPE_SINGLE_SELECT_LIST,
   TYPE_PASSWORD
 } from './constants';
+import { translate, hasMessage } from '../../helpers/l10n';
 
 export const DEFAULT_CATEGORY = 'general';
 
diff --git a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx
index 2f66bb16ba3..105c8002bcd 100644
--- a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx
+++ b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx
@@ -21,8 +21,8 @@ import * as React from 'react';
 import * as classNames from 'classnames';
 import { map } from 'lodash';
 import HealthItem from './HealthItem';
-import OpenCloseIcon from '../../../../components/icons-components/OpenCloseIcon';
 import Section from './Section';
+import OpenCloseIcon from '../../../../components/icons-components/OpenCloseIcon';
 import { HealthType, SysValueObject } from '../../../../api/system';
 import { LOGS_LEVELS, groupSections, getLogsLevel } from '../../utils';
 import { translate } from '../../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx b/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx
index 7b32d0c9125..052dae587c2 100644
--- a/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx
+++ b/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx
@@ -19,9 +19,9 @@
  */
 import * as React from 'react';
 import { map } from 'lodash';
+import HealthItem from './HealthItem';
 import CheckIcon from '../../../../components/icons-components/CheckIcon';
 import ClearIcon from '../../../../components/icons-components/ClearIcon';
-import HealthItem from './HealthItem';
 import { HealthType, SysValue, SysValueObject } from '../../../../api/system';
 import { HEALTH_FIELD } from '../../utils';
 
diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx
index 6aebbc94b75..f1db5f40d94 100644
--- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx
+++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx
@@ -19,8 +19,8 @@
  */
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
-import DateFormatter from '../../../../components/intl/DateFormatter';
 import SystemUpgradeIntermediate from './SystemUpgradeIntermediate';
+import DateFormatter from '../../../../components/intl/DateFormatter';
 import { SystemUpgrade } from '../../../../api/system';
 import { translate, translateWithParameters } from '../../../../helpers/l10n';
 
diff --git a/server/sonar-web/src/main/js/apps/users/UsersApp.tsx b/server/sonar-web/src/main/js/apps/users/UsersApp.tsx
index 678b4f86d1a..411ddc18db8 100644
--- a/server/sonar-web/src/main/js/apps/users/UsersApp.tsx
+++ b/server/sonar-web/src/main/js/apps/users/UsersApp.tsx
@@ -22,13 +22,13 @@ import * as PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Location } from 'history';
 import Header from './Header';
-import ListFooter from '../../components/controls/ListFooter';
 import Search from './Search';
 import UsersList from './UsersList';
+import { parseQuery, Query, serializeQuery } from './utils';
+import ListFooter from '../../components/controls/ListFooter';
 import { getIdentityProviders, IdentityProvider, searchUsers, User } from '../../api/users';
 import { Paging } from '../../app/types';
 import { translate } from '../../helpers/l10n';
-import { parseQuery, Query, serializeQuery } from './utils';
 
 interface Props {
   currentUser: { isLoggedIn: boolean; login?: string };
diff --git a/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx b/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx
index 3befffc30da..79cf17f38cc 100644
--- a/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx
@@ -37,8 +37,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import Modal from '../../../components/controls/Modal';
 import TokensForm from './TokensForm';
+import Modal from '../../../components/controls/Modal';
 import { User } from '../../../api/users';
 import { translate } from '../../../helpers/l10n';
 
diff --git a/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx b/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx
index e50ca6b7553..63b30598e4b 100644
--- a/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx
@@ -18,14 +18,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import ActionsDropdown, {
-  ActionsDropdownItem,
-  ActionsDropdownDivider
-} from '../../../components/controls/ActionsDropdown';
 import DeactivateForm from './DeactivateForm';
 import PasswordForm from './PasswordForm';
 import UserForm from './UserForm';
 import { User } from '../../../api/users';
+import ActionsDropdown, {
+  ActionsDropdownItem,
+  ActionsDropdownDivider
+} from '../../../components/controls/ActionsDropdown';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
index d7052b3d49b..ab3a5f75deb 100644
--- a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
@@ -19,8 +19,8 @@
  */
 import * as React from 'react';
 import { uniq } from 'lodash';
-import Modal from '../../../components/controls/Modal';
 import UserScmAccountInput from './UserScmAccountInput';
+import Modal from '../../../components/controls/Modal';
 import throwGlobalError from '../../../app/utils/throwGlobalError';
 import { parseError } from '../../../helpers/request';
 import { createUser, updateUser, User } from '../../../api/users';
diff --git a/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx b/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx
index 97eb0924d9e..f47c43058fa 100644
--- a/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import BulletListIcon from '../../../components/icons-components/BulletListIcon';
 import GroupsForm from './GroupsForm';
+import BulletListIcon from '../../../components/icons-components/BulletListIcon';
 import { User } from '../../../api/users';
 import { ButtonIcon } from '../../../components/ui/buttons';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx b/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx
index 96042ce7ea5..8dc4a869445 100644
--- a/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx
@@ -18,15 +18,15 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import Avatar from '../../../components/ui/Avatar';
-import BulletListIcon from '../../../components/icons-components/BulletListIcon';
-import { ButtonIcon } from '../../../components/ui/buttons';
 import TokensFormModal from './TokensFormModal';
 import UserActions from './UserActions';
 import UserGroups from './UserGroups';
 import UserListItemIdentity from './UserListItemIdentity';
 import UserScmAccounts from './UserScmAccounts';
 import { IdentityProvider, User } from '../../../api/users';
+import BulletListIcon from '../../../components/icons-components/BulletListIcon';
+import Avatar from '../../../components/ui/Avatar';
+import { ButtonIcon } from '../../../components/ui/buttons';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx b/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx
index b67a53cfcd4..b59e8cb07a8 100644
--- a/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx
+++ b/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx
@@ -20,12 +20,12 @@
 import * as React from 'react';
 import { Link } from 'react-router';
 import * as classNames from 'classnames';
-import { getActionKey } from '../utils';
 import Params from './Params';
 import ResponseExample from './ResponseExample';
 import ActionChangelog from './ActionChangelog';
 import DeprecatedBadge from './DeprecatedBadge';
 import InternalBadge from './InternalBadge';
+import { getActionKey } from '../utils';
 import LinkIcon from '../../../components/icons-components/LinkIcon';
 import { Action as ActionType, Domain as DomainType } from '../../../api/web-api';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx b/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx
index 270c821ce00..ad9c009475d 100644
--- a/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx
+++ b/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx
@@ -21,10 +21,10 @@ import * as React from 'react';
 import * as PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router';
-import { Domain as DomainType, fetchWebApi } from '../../../api/web-api';
 import Menu from './Menu';
 import Search from './Search';
 import Domain from './Domain';
+import { Domain as DomainType, fetchWebApi } from '../../../api/web-api';
 import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper';
 import { getActionKey, isDomainPathActive } from '../utils';
 import { scrollToElement } from '../../../helpers/scrolling';
diff --git a/server/sonar-web/src/main/js/components/RestartModal/index.js b/server/sonar-web/src/main/js/components/RestartModal/index.js
index 2402e0b4a6f..c3d3f2669a4 100644
--- a/server/sonar-web/src/main/js/components/RestartModal/index.js
+++ b/server/sonar-web/src/main/js/components/RestartModal/index.js
@@ -17,9 +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.
  */
-import ModalForm from '../common/modal-form';
 import Template from './templates/template.hbs';
 import RestartingTemplate from './templates/restarting.hbs';
+import ModalForm from '../common/modal-form';
 import { restartAndWait } from '../../api/system';
 
 const RestartModal = ModalForm.extend({
diff --git a/server/sonar-web/src/main/js/components/SelectList/index.js b/server/sonar-web/src/main/js/components/SelectList/index.js
index 87d2dd32bf7..f8b47f5aeb8 100644
--- a/server/sonar-web/src/main/js/components/SelectList/index.js
+++ b/server/sonar-web/src/main/js/components/SelectList/index.js
@@ -21,9 +21,9 @@ import $ from 'jquery';
 import Backbone from 'backbone';
 import { debounce, throttle } from 'lodash';
 import escapeHtml from 'escape-html';
-import { translate } from '../../helpers/l10n';
 import ItemTemplate from './templates/item.hbs';
 import ListTemplate from './templates/list.hbs';
+import { translate } from '../../helpers/l10n';
 import './styles.css';
 import '../controls/SearchBox.css';
 
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js
index 16c3e399d6b..b3285d2ff0c 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js
+++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js
@@ -21,8 +21,8 @@
 import React from 'react';
 import { intersection } from 'lodash';
 import Line from './components/Line';
-import { translate } from '../../helpers/l10n';
 import { getLinearLocations } from './helpers/issueLocations';
+import { translate } from '../../helpers/l10n';
 /*:: import type { Duplication, SourceLine } from './types'; */
 /*:: import type { Issue, FlowLocation } from '../issue/types'; */
 /*:: import type { LinearIssueLocation } from './helpers/indexing'; */
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/popups/coverage-popup.js b/server/sonar-web/src/main/js/components/SourceViewer/popups/coverage-popup.js
index 16ee3fc81e6..694182c0c60 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/popups/coverage-popup.js
+++ b/server/sonar-web/src/main/js/components/SourceViewer/popups/coverage-popup.js
@@ -19,8 +19,8 @@
  */
 import $ from 'jquery';
 import { groupBy } from 'lodash';
-import Popup from '../../common/popup';
 import Template from './templates/source-viewer-coverage-popup.hbs';
+import Popup from '../../common/popup';
 
 export default Popup.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/popups/duplication-popup.js b/server/sonar-web/src/main/js/components/SourceViewer/popups/duplication-popup.js
index b4e0623427d..f45a5dc25b2 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/popups/duplication-popup.js
+++ b/server/sonar-web/src/main/js/components/SourceViewer/popups/duplication-popup.js
@@ -19,8 +19,8 @@
  */
 import $ from 'jquery';
 import { groupBy, sortBy } from 'lodash';
-import Popup from '../../common/popup';
 import Template from './templates/source-viewer-duplication-popup.hbs';
+import Popup from '../../common/popup';
 
 export default Popup.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/popups/line-actions-popup.js b/server/sonar-web/src/main/js/components/SourceViewer/popups/line-actions-popup.js
index 0830aaebb44..33d44cfb1f5 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/popups/line-actions-popup.js
+++ b/server/sonar-web/src/main/js/components/SourceViewer/popups/line-actions-popup.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import Popup from '../../common/popup';
 import Template from './templates/source-viewer-line-options-popup.hbs';
+import Popup from '../../common/popup';
 
 export default Popup.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/popups/scm-popup.js b/server/sonar-web/src/main/js/components/SourceViewer/popups/scm-popup.js
index adf207d49bc..5478c6fc533 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/popups/scm-popup.js
+++ b/server/sonar-web/src/main/js/components/SourceViewer/popups/scm-popup.js
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import Popup from '../../common/popup';
 import Template from './templates/source-viewer-scm-popup.hbs';
+import Popup from '../../common/popup';
 
 export default Popup.extend({
   template: Template,
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js b/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js
index 6b51f4ad843..925e533b87f 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js
+++ b/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js
@@ -21,8 +21,8 @@ import $ from 'jquery';
 import { select } from 'd3-selection';
 import { arc as d3Arc, pie as d3Pie } from 'd3-shape';
 import { groupBy, sortBy, toPairs } from 'lodash';
-import ModalView from '../../common/modals';
 import Template from './templates/source-viewer-measures.hbs';
+import ModalView from '../../common/modals';
 import { searchIssues } from '../../../api/issues';
 import { getMeasures } from '../../../api/measures';
 import { getAllMetrics } from '../../../api/metrics';
diff --git a/server/sonar-web/src/main/js/components/charts/LanguageDistributionContainer.tsx b/server/sonar-web/src/main/js/components/charts/LanguageDistributionContainer.tsx
index 63f1b849747..9ef2039202e 100644
--- a/server/sonar-web/src/main/js/components/charts/LanguageDistributionContainer.tsx
+++ b/server/sonar-web/src/main/js/components/charts/LanguageDistributionContainer.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { connect } from 'react-redux';
-import { getLanguages } from '../../store/rootReducer';
 import LanguageDistribution from './LanguageDistribution';
+import { getLanguages } from '../../store/rootReducer';
 
 const mapStateToProps = (state: any) => ({
   languages: getLanguages(state)
diff --git a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx
index 27fd922e204..45b271f6179 100644
--- a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx
+++ b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx
@@ -18,11 +18,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import StatusIndicator from './StatusIndicator';
 import { Branch } from '../../app/types';
 import Level from '../ui/Level';
 import BugIcon from '../icons-components/BugIcon';
 import CodeSmellIcon from '../icons-components/CodeSmellIcon';
-import StatusIndicator from './StatusIndicator';
 import VulnerabilityIcon from '../icons-components/VulnerabilityIcon';
 import { isShortLivingBranch } from '../../helpers/branches';
 import './BranchStatus.css';
diff --git a/server/sonar-web/src/main/js/components/icons-components/AlertErrorIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/AlertErrorIcon.tsx
index c381ce62765..f13ec8871b8 100644
--- a/server/sonar-web/src/main/js/components/icons-components/AlertErrorIcon.tsx
+++ b/server/sonar-web/src/main/js/components/icons-components/AlertErrorIcon.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import * as theme from '../../app/theme';
 import { IconProps } from './types';
+import * as theme from '../../app/theme';
 
 export default function AlertErrorIcon({ className, fill = theme.red, size = 16 }: IconProps) {
   return (
diff --git a/server/sonar-web/src/main/js/components/icons-components/DeleteIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/DeleteIcon.tsx
index 401fd61e1bf..75b8ea4e6d1 100644
--- a/server/sonar-web/src/main/js/components/icons-components/DeleteIcon.tsx
+++ b/server/sonar-web/src/main/js/components/icons-components/DeleteIcon.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import * as theme from '../../app/theme';
 import { ClearIcon } from './icons';
+import * as theme from '../../app/theme';
 
 interface Props {
   className?: string;
diff --git a/server/sonar-web/src/main/js/components/icons-components/GroupIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/GroupIcon.tsx
index cca517e71fd..ec1c9d0b820 100644
--- a/server/sonar-web/src/main/js/components/icons-components/GroupIcon.tsx
+++ b/server/sonar-web/src/main/js/components/icons-components/GroupIcon.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import * as theme from '../../app/theme';
 import { IconProps } from './types';
+import * as theme from '../../app/theme';
 
 export default function GroupIcon({ className, fill = theme.gray67, size = 36 }: IconProps) {
   return (
diff --git a/server/sonar-web/src/main/js/components/icons-components/LongLivingBranchIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/LongLivingBranchIcon.tsx
index 20831ef33ff..fe6793ba85b 100644
--- a/server/sonar-web/src/main/js/components/icons-components/LongLivingBranchIcon.tsx
+++ b/server/sonar-web/src/main/js/components/icons-components/LongLivingBranchIcon.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import * as theme from '../../app/theme';
 import { IconProps } from './types';
+import * as theme from '../../app/theme';
 
 export default function LongLivingBranchIcon({
   className,
diff --git a/server/sonar-web/src/main/js/components/icons-components/PendingIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/PendingIcon.tsx
index 19c0fefd12f..fbf7564f505 100644
--- a/server/sonar-web/src/main/js/components/icons-components/PendingIcon.tsx
+++ b/server/sonar-web/src/main/js/components/icons-components/PendingIcon.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import * as theme from '../../app/theme';
 import { IconProps } from './types';
+import * as theme from '../../app/theme';
 
 export default function PendingIcon({ className, fill = theme.gray67, size = 16 }: IconProps) {
   return (
diff --git a/server/sonar-web/src/main/js/components/icons-components/PullRequestIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/PullRequestIcon.tsx
index bf89729441d..f0e94ac2fbf 100644
--- a/server/sonar-web/src/main/js/components/icons-components/PullRequestIcon.tsx
+++ b/server/sonar-web/src/main/js/components/icons-components/PullRequestIcon.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import * as theme from '../../app/theme';
 import { IconProps } from './types';
+import * as theme from '../../app/theme';
 
 export default function PullRequestIcon({ className, fill = theme.blue, size = 16 }: IconProps) {
   return (
diff --git a/server/sonar-web/src/main/js/components/issue/Issue.js b/server/sonar-web/src/main/js/components/issue/Issue.js
index eb15d8dcb7b..d66c6e12814 100644
--- a/server/sonar-web/src/main/js/components/issue/Issue.js
+++ b/server/sonar-web/src/main/js/components/issue/Issue.js
@@ -22,9 +22,9 @@ import React from 'react';
 import key from 'keymaster';
 import PropTypes from 'prop-types';
 import IssueView from './IssueView';
+import { updateIssue } from './actions';
 import { onFail } from '../../store/rootActions';
 import { setIssueAssignee } from '../../api/issues';
-import { updateIssue } from './actions';
 /*:: import type { Issue as IssueType } from './types'; */
 
 /*::
diff --git a/server/sonar-web/src/main/js/components/measure/Measure.tsx b/server/sonar-web/src/main/js/components/measure/Measure.tsx
index ae12c4c480f..3437fa9616f 100644
--- a/server/sonar-web/src/main/js/components/measure/Measure.tsx
+++ b/server/sonar-web/src/main/js/components/measure/Measure.tsx
@@ -18,11 +18,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import { getRatingTooltip } from './utils';
 import Rating from '../ui/Rating';
 import Level from '../ui/Level';
 import Tooltips from '../controls/Tooltip';
 import { formatMeasure } from '../../helpers/measures';
-import { getRatingTooltip } from './utils';
 
 interface Props {
   className?: string;
diff --git a/server/sonar-web/src/main/js/components/preview-graph/PreviewGraph.js b/server/sonar-web/src/main/js/components/preview-graph/PreviewGraph.js
index 8a8ac8443c5..124b818a267 100644
--- a/server/sonar-web/src/main/js/components/preview-graph/PreviewGraph.js
+++ b/server/sonar-web/src/main/js/components/preview-graph/PreviewGraph.js
@@ -22,8 +22,8 @@ import React from 'react';
 import { minBy } from 'lodash';
 import * as PropTypes from 'prop-types';
 import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
-import AdvancedTimeline from '../charts/AdvancedTimeline';
 import PreviewGraphTooltips from './PreviewGraphTooltips';
+import AdvancedTimeline from '../charts/AdvancedTimeline';
 import {
   DEFAULT_GRAPH,
   getDisplayedHistoryMetrics,
diff --git a/server/sonar-web/src/main/js/components/preview-graph/PreviewGraphTooltips.js b/server/sonar-web/src/main/js/components/preview-graph/PreviewGraphTooltips.js
index e3db4a195d5..7d67d56c8d8 100644
--- a/server/sonar-web/src/main/js/components/preview-graph/PreviewGraphTooltips.js
+++ b/server/sonar-web/src/main/js/components/preview-graph/PreviewGraphTooltips.js
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import React from 'react';
+import PreviewGraphTooltipsContent from './PreviewGraphTooltipsContent';
 import BubblePopup from '../common/BubblePopup';
 import DateFormatter from '../intl/DateFormatter';
-import PreviewGraphTooltipsContent from './PreviewGraphTooltipsContent';
 /*:: import type { Metric } from '../types'; */
 /*:: import type { Serie } from '../charts/AdvancedTimeline'; */
 
diff --git a/server/sonar-web/src/main/js/components/ui/Avatar.tsx b/server/sonar-web/src/main/js/components/ui/Avatar.tsx
index c09513b6d5b..0c87c366251 100644
--- a/server/sonar-web/src/main/js/components/ui/Avatar.tsx
+++ b/server/sonar-web/src/main/js/components/ui/Avatar.tsx
@@ -20,8 +20,8 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import * as classNames from 'classnames';
-import { getGlobalSettingValue } from '../../store/rootReducer';
 import GenericAvatar from './GenericAvatar';
+import { getGlobalSettingValue } from '../../store/rootReducer';
 
 interface Props {
   className?: string;
diff --git a/server/sonar-web/src/main/js/components/ui/OrganizationListItem.tsx b/server/sonar-web/src/main/js/components/ui/OrganizationListItem.tsx
index ae4dae09112..5a5f7761e15 100644
--- a/server/sonar-web/src/main/js/components/ui/OrganizationListItem.tsx
+++ b/server/sonar-web/src/main/js/components/ui/OrganizationListItem.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { Organization } from '../../app/types';
 import OrganizationLink from './OrganizationLink';
+import { Organization } from '../../app/types';
 import OrganizationAvatar from '../common/OrganizationAvatar';
 import { translate } from '../../helpers/l10n';
 
diff --git a/server/sonar-web/src/main/js/store/rootActions.js b/server/sonar-web/src/main/js/store/rootActions.js
index c81df505fab..52289a5ccd1 100644
--- a/server/sonar-web/src/main/js/store/rootActions.js
+++ b/server/sonar-web/src/main/js/store/rootActions.js
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+import { setAppState } from './appState/duck';
+import { receiveOrganizations } from './organizations/duck';
+import { receiveLanguages } from './languages/actions';
+import { receiveMetrics } from './metrics/actions';
+import { addGlobalErrorMessage } from './globalMessages/duck';
 import { getLanguages } from '../api/languages';
 import { getGlobalNavigation } from '../api/nav';
 import * as auth from '../api/auth';
 import { getOrganizations } from '../api/organizations';
 import { getAllMetrics } from '../api/metrics';
-import { receiveLanguages } from './languages/actions';
-import { receiveMetrics } from './metrics/actions';
-import { addGlobalErrorMessage } from './globalMessages/duck';
 import { parseError } from '../helpers/request';
-import { setAppState } from './appState/duck';
-import { receiveOrganizations } from './organizations/duck';
 
 export const onFail = dispatch => error =>
   parseError(error).then(message => dispatch(addGlobalErrorMessage(message)));
author	Stas Vilchik <stas.vilchik@sonarsource.com>	2018-02-07 13:27:14 +0100
committer	GitHub <noreply@github.com>	2018-02-07 13:27:14 +0100
commit	448e1fb820c918d462492b857403d0fc9a75a673 (patch)
tree	f13ffbd16131251746b185230d0d6b8823ef2bcd
parent	cc9b6d04f4f47d9f8b55a3873ae74ebad0a3990c (diff)
download	sonarqube-448e1fb820c918d462492b857403d0fc9a75a673.tar.gz sonarqube-448e1fb820c918d462492b857403d0fc9a75a673.zip