Simplify import paths of some components

19 files changed, 64 insertions, 64 deletions

diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js
index ffb8dd35c17..0eb7f114d70 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js
@@ -20,10 +20,10 @@
 // @flow
 import React from 'react';
 import SetAssigneePopup from '../popups/SetAssigneePopup';
-import Avatar from '../../../components/ui/Avatar';
-import Toggler from '../../../components/controls/Toggler';
-import DropdownIcon from '../../../components/icons-components/DropdownIcon';
-import { Button } from '../../../components/ui/buttons';
+import Avatar from '../../ui/Avatar';
+import Toggler from '../../controls/Toggler';
+import DropdownIcon from '../../icons-components/DropdownIcon';
+import { Button } from '../../ui/buttons';
 import { translate } from '../../../helpers/l10n';
 /*:: import type { Issue } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.js b/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.js
index 3b6135a0d91..0117454c1e9 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.js
@@ -20,12 +20,12 @@
 // @flow
 import React from 'react';
 import ChangelogPopup from '../popups/ChangelogPopup';
-import DropdownIcon from '../../../components/icons-components/DropdownIcon';
-import DateFromNow from '../../../components/intl/DateFromNow';
-import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
-import Toggler from '../../../components/controls/Toggler';
-import Tooltip from '../../../components/controls/Tooltip';
-import { Button } from '../../../components/ui/buttons';
+import DropdownIcon from '../../icons-components/DropdownIcon';
+import DateFromNow from '../../intl/DateFromNow';
+import DateTimeFormatter from '../../intl/DateTimeFormatter';
+import Toggler from '../../controls/Toggler';
+import Tooltip from '../../controls/Tooltip';
+import { Button } from '../../ui/buttons';
 /*:: import type { Issue } from '../types'; */
 
 /*::
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js
index 814d4053cf4..5dfd3bfc69d 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js
@@ -20,8 +20,8 @@
 // @flow
 import React from 'react';
 import { updateIssue } from '../actions';
-import Toggler from '../../../components/controls/Toggler';
-import { Button } from '../../../components/ui/buttons';
+import Toggler from '../../controls/Toggler';
+import { Button } from '../../ui/buttons';
 import CommentPopup from '../popups/CommentPopup';
 import { addIssueComment } from '../../../api/issues';
 import { translate } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js
index cce84863a06..417f4294609 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js
@@ -19,13 +19,13 @@
  */
 // @flow
 import React from 'react';
-import Avatar from '../../../components/ui/Avatar';
-import Toggler from '../../../components/controls/Toggler';
-import EditIcon from '../../../components/icons-components/EditIcon';
-import { EditButton, DeleteButton } from '../../../components/ui/buttons';
+import Avatar from '../../ui/Avatar';
+import Toggler from '../../controls/Toggler';
+import EditIcon from '../../icons-components/EditIcon';
+import { EditButton, DeleteButton } from '../../ui/buttons';
 import CommentDeletePopup from '../popups/CommentDeletePopup';
 import CommentPopup from '../popups/CommentPopup';
-import DateFromNow from '../../../components/intl/DateFromNow';
+import DateFromNow from '../../intl/DateFromNow';
 /*:: import type { IssueComment } from '../types'; */
 
 /*::
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.js b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.js
index f75e0e8f3c7..3541f276c9b 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.js
@@ -21,10 +21,10 @@
 import React from 'react';
 import SetSeverityPopup from '../popups/SetSeverityPopup';
 import { setIssueSeverity } from '../../../api/issues';
-import Toggler from '../../../components/controls/Toggler';
-import DropdownIcon from '../../../components/icons-components/DropdownIcon';
-import SeverityHelper from '../../../components/shared/SeverityHelper';
-import { Button } from '../../../components/ui/buttons';
+import Toggler from '../../controls/Toggler';
+import DropdownIcon from '../../icons-components/DropdownIcon';
+import SeverityHelper from '../../shared/SeverityHelper';
+import { Button } from '../../ui/buttons';
 /*:: import type { Issue } from '../types'; */
 
 /*::
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTags.js b/server/sonar-web/src/main/js/components/issue/components/IssueTags.js
index b9f1fcba0be..00912b7ca81 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueTags.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueTags.js
@@ -22,9 +22,9 @@ import React from 'react';
 import { updateIssue } from '../actions';
 import SetIssueTagsPopup from '../popups/SetIssueTagsPopup';
 import { setIssueTags } from '../../../api/issues';
-import Toggler from '../../../components/controls/Toggler';
-import TagsList from '../../../components/tags/TagsList';
-import { Button } from '../../../components/ui/buttons';
+import Toggler from '../../controls/Toggler';
+import TagsList from '../../tags/TagsList';
+import { Button } from '../../ui/buttons';
 import { translate } from '../../../helpers/l10n';
 /*:: import type { Issue } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js
index 3e1bea15210..080113085e6 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js
@@ -23,7 +23,7 @@ import { Link } from 'react-router';
 import IssueChangelog from './IssueChangelog';
 import IssueMessage from './IssueMessage';
 import SimilarIssuesFilter from './SimilarIssuesFilter';
-import LinkIcon from '../../../components/icons-components/LinkIcon';
+import LinkIcon from '../../icons-components/LinkIcon';
 import LocationIndex from '../../common/LocationIndex';
 import Tooltip from '../../controls/Tooltip';
 import { getBranchLikeQuery } from '../../../helpers/branches';
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.js b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.js
index 3aced6f8685..52b17fba604 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.js
@@ -22,10 +22,10 @@ import React from 'react';
 import { updateIssue } from '../actions';
 import SetTransitionPopup from '../popups/SetTransitionPopup';
 import { setIssueTransition } from '../../../api/issues';
-import Toggler from '../../../components/controls/Toggler';
-import DropdownIcon from '../../../components/icons-components/DropdownIcon';
-import StatusHelper from '../../../components/shared/StatusHelper';
-import { Button } from '../../../components/ui/buttons';
+import Toggler from '../../controls/Toggler';
+import DropdownIcon from '../../icons-components/DropdownIcon';
+import StatusHelper from '../../shared/StatusHelper';
+import { Button } from '../../ui/buttons';
 /*:: import type { Issue } from '../types'; */
 
 /*::
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueType.js b/server/sonar-web/src/main/js/components/issue/components/IssueType.js
index 909a718cb97..dffc6245a69 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueType.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueType.js
@@ -21,10 +21,10 @@
 import React from 'react';
 import SetTypePopup from '../popups/SetTypePopup';
 import { setIssueType } from '../../../api/issues';
-import Toggler from '../../../components/controls/Toggler';
-import DropdownIcon from '../../../components/icons-components/DropdownIcon';
-import { Button } from '../../../components/ui/buttons';
-import IssueTypeIcon from '../../../components/ui/IssueTypeIcon';
+import Toggler from '../../controls/Toggler';
+import DropdownIcon from '../../icons-components/DropdownIcon';
+import { Button } from '../../ui/buttons';
+import IssueTypeIcon from '../../ui/IssueTypeIcon';
 import { translate } from '../../../helpers/l10n';
 /*:: import type { Issue } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.js b/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.js
index 4cb86e6fc01..7126df24225 100644
--- a/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.js
+++ b/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.js
@@ -20,10 +20,10 @@
 // @flow
 import React from 'react';
 import SimilarIssuesPopup from '../popups/SimilarIssuesPopup';
-import Toggler from '../../../components/controls/Toggler';
-import DropdownIcon from '../../../components/icons-components/DropdownIcon';
-import FilterIcon from '../../../components/icons-components/FilterIcon';
-import { Button } from '../../../components/ui/buttons';
+import Toggler from '../../controls/Toggler';
+import DropdownIcon from '../../icons-components/DropdownIcon';
+import FilterIcon from '../../icons-components/FilterIcon';
+import { Button } from '../../ui/buttons';
 import { translate } from '../../../helpers/l10n';
 /*:: import type { Issue } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js
index fcfd515b587..3c60cad23a2 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js
@@ -21,8 +21,8 @@
 import React from 'react';
 import { getIssueChangelog } from '../../../api/issues';
 import { translate } from '../../../helpers/l10n';
-import Avatar from '../../../components/ui/Avatar';
-import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
+import Avatar from '../../ui/Avatar';
+import DateTimeFormatter from '../../intl/DateTimeFormatter';
 import IssueChangelogDiff from '../components/IssueChangelogDiff';
 import { DropdownOverlay } from '../../controls/Dropdown';
 /*:: import type { ChangelogDiff } from '../components/IssueChangelogDiff'; */
diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js
index c7fd5d89ae8..940718ffe8b 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js
@@ -19,7 +19,7 @@
  */
 // @flow
 import React from 'react';
-import { Button } from '../../../components/ui/buttons';
+import { Button } from '../../ui/buttons';
 import { translate } from '../../../helpers/l10n';
 import { DropdownOverlay } from '../../controls/Dropdown';
 
diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.js b/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.js
index bee719a083e..aa298b7f919 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.js
@@ -19,8 +19,8 @@
  */
 // @flow
 import React from 'react';
-import MarkdownTips from '../../../components/common/MarkdownTips';
-import { Button, ResetButtonLink } from '../../../components/ui/buttons';
+import MarkdownTips from '../../common/MarkdownTips';
+import { Button, ResetButtonLink } from '../../ui/buttons';
 import { translate } from '../../../helpers/l10n';
 import { DropdownOverlay } from '../../controls/Dropdown';
 /*:: import type { IssueComment } from '../types'; */
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js
index b5658c997d3..a1758698ec8 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js
@@ -22,10 +22,10 @@ import React from 'react';
 import { map } from 'lodash';
 import { connect } from 'react-redux';
 import * as PropTypes from 'prop-types';
-import Avatar from '../../../components/ui/Avatar';
-import SelectList from '../../../components/common/SelectList';
-import SelectListItem from '../../../components/common/SelectListItem';
-import SearchBox from '../../../components/controls/SearchBox';
+import Avatar from '../../ui/Avatar';
+import SelectList from '../../common/SelectList';
+import SelectListItem from '../../common/SelectListItem';
+import SearchBox from '../../controls/SearchBox';
 import { searchMembers } from '../../../api/organizations';
 import { searchUsers } from '../../../api/users';
 import { translate } from '../../../helpers/l10n';
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx
index c41c216e8b6..c8c6b382ef8 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx
+++ b/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx
@@ -19,7 +19,7 @@
  */
 import * as React from 'react';
 import { difference, without } from 'lodash';
-import TagsSelector from '../../../components/tags/TagsSelector';
+import TagsSelector from '../../tags/TagsSelector';
 import { searchIssueTags } from '../../../api/issues';
 import { DropdownOverlay } from '../../controls/Dropdown';
 import { PopupPlacement } from '../../ui/popups';
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js
index 3a0a211f1d6..12fb311222b 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js
@@ -20,9 +20,9 @@
 // @flow
 import React from 'react';
 import { translate } from '../../../helpers/l10n';
-import SelectList from '../../../components/common/SelectList';
-import SelectListItem from '../../../components/common/SelectListItem';
-import SeverityIcon from '../../../components/icons-components/SeverityIcon';
+import SelectList from '../../common/SelectList';
+import SelectListItem from '../../common/SelectListItem';
+import SeverityIcon from '../../icons-components/SeverityIcon';
 import { DropdownOverlay } from '../../controls/Dropdown';
 /*:: import type { Issue } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.js
index 37d342f7eb2..20bf1f6c1f4 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.js
@@ -19,8 +19,8 @@
  */
 // @flow
 import React from 'react';
-import SelectList from '../../../components/common/SelectList';
-import SelectListItem from '../../../components/common/SelectListItem';
+import SelectList from '../../common/SelectList';
+import SelectListItem from '../../common/SelectListItem';
 import { translate } from '../../../helpers/l10n';
 import { DropdownOverlay } from '../../controls/Dropdown';
 
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js
index f69e07cf141..4c2fadc9f0c 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js
@@ -20,9 +20,9 @@
 // @flow
 import React from 'react';
 import { translate } from '../../../helpers/l10n';
-import IssueTypeIcon from '../../../components/ui/IssueTypeIcon';
-import SelectList from '../../../components/common/SelectList';
-import SelectListItem from '../../../components/common/SelectListItem';
+import IssueTypeIcon from '../../ui/IssueTypeIcon';
+import SelectList from '../../common/SelectList';
+import SelectListItem from '../../common/SelectListItem';
 import { DropdownOverlay } from '../../controls/Dropdown';
 /*:: import type { Issue } from '../types'; */
 
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js
index e1b7315c266..9674ca0fc93 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js
@@ -19,15 +19,15 @@
  */
 // @flow
 import React from 'react';
-import SelectList from '../../../components/common/SelectList';
-import SelectListItem from '../../../components/common/SelectListItem';
-import { DropdownOverlay } from '../../../components/controls/Dropdown';
-import SeverityHelper from '../../../components/shared/SeverityHelper';
-import StatusHelper from '../../../components/shared/StatusHelper';
-import QualifierIcon from '../../../components/icons-components/QualifierIcon';
-import TagsIcon from '../../../components/icons-components/TagsIcon';
-import IssueTypeIcon from '../../../components/ui/IssueTypeIcon';
-import Avatar from '../../../components/ui/Avatar';
+import SelectList from '../../common/SelectList';
+import SelectListItem from '../../common/SelectListItem';
+import { DropdownOverlay } from '../../controls/Dropdown';
+import SeverityHelper from '../../shared/SeverityHelper';
+import StatusHelper from '../../shared/StatusHelper';
+import QualifierIcon from '../../icons-components/QualifierIcon';
+import TagsIcon from '../../icons-components/TagsIcon';
+import IssueTypeIcon from '../../ui/IssueTypeIcon';
+import Avatar from '../../ui/Avatar';
 import { translate } from '../../../helpers/l10n';
 import { fileFromPath, limitComponentName } from '../../../helpers/path';
 /*:: import type { Issue } from '../types'; */