diff options
| author | Wouter Admiraal <wouter.admiraal@sonarsource.com> | 2021-08-17 15:50:55 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2021-08-20 20:03:08 +0000 |
| commit | 6ef7ca151ecd602ca8e9cea21743a895a81e89ba (patch) | |
| tree | 40d7a97a8075b416901a4078638e4cde9ee15942 /server/sonar-web/src/main/js/components | |
| parent | 2454e077b1d77d70508dcce6a5b015d4a69f41fa (diff) | |
| download | sonarqube-6ef7ca151ecd602ca8e9cea21743a895a81e89ba.tar.gz sonarqube-6ef7ca151ecd602ca8e9cea21743a895a81e89ba.zip | |
SONAR-15297 Move sonar-ui-common code to sonar-web
Diffstat (limited to 'server/sonar-web/src/main/js/components')
243 files changed, 521 insertions, 512 deletions
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx index 56fb594c4fd..f08f456c69d 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const SourceViewer = lazyLoadComponent( () => import(/* webpackPrefetch: true */ './SourceViewerBase'), diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx index 352d2bac7ce..51a2089cfa0 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx @@ -19,8 +19,6 @@ */ import { intersection, uniqBy } from 'lodash'; import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getComponentData, getComponentForSourceViewer, @@ -28,6 +26,8 @@ import { getSources } from '../../api/components'; import { getBranchLikeQuery, isSameBranchLike } from '../../helpers/branch-like'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import { WorkspaceContext } from '../workspace/context'; import DuplicationPopup from './components/DuplicationPopup'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx index 8aa0c34a5d4..c95af38d52e 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import { MetricKey } from '../../types/metrics'; import Line from './components/Line'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx index 6e5e2f3f21d..089f44cf40c 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx @@ -20,21 +20,21 @@ import { stringify } from 'querystring'; import * as React from 'react'; import { Link } from 'react-router'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import ListIcon from 'sonar-ui-common/components/icons/ListIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { collapsedDirFromPath, fileFromPath } from 'sonar-ui-common/helpers/path'; -import { omitNil } from 'sonar-ui-common/helpers/request'; -import { getBaseUrl, getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getBranchLikeQuery } from '../../helpers/branch-like'; import { ISSUE_TYPES } from '../../helpers/constants'; import { ISSUETYPE_METRIC_KEYS_MAP } from '../../helpers/issues'; import { getBranchLikeUrl, getCodeUrl, getComponentIssuesUrl } from '../../helpers/urls'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../sonar-ui-common/components/controls/clipboard'; +import Dropdown from '../../sonar-ui-common/components/controls/Dropdown'; +import ListIcon from '../../sonar-ui-common/components/icons/ListIcon'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import { PopupPlacement } from '../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; +import { collapsedDirFromPath, fileFromPath } from '../../sonar-ui-common/helpers/path'; +import { omitNil } from '../../sonar-ui-common/helpers/request'; +import { getBaseUrl, getPathUrlAsString } from '../../sonar-ui-common/helpers/urls'; import { BranchLike } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; import { WorkspaceContextShape } from '../workspace/context'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx index 1adc0fb8d5c..6a160338172 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx @@ -20,16 +20,16 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import ExpandSnippetIcon from 'sonar-ui-common/components/icons/ExpandSnippetIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { collapsedDirFromPath, fileFromPath } from 'sonar-ui-common/helpers/path'; -import { getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getBranchLikeQuery } from '../../helpers/branch-like'; import { getBranchLikeUrl, getComponentIssuesUrl } from '../../helpers/urls'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../sonar-ui-common/components/controls/clipboard'; +import ExpandSnippetIcon from '../../sonar-ui-common/components/icons/ExpandSnippetIcon'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { collapsedDirFromPath, fileFromPath } from '../../sonar-ui-common/helpers/path'; +import { getPathUrlAsString } from '../../sonar-ui-common/helpers/urls'; import { BranchLike } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; import './SourceViewerHeaderSlim.css'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx index eea4cbd8247..7f9ac1d28a1 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getComponentData, getComponentForSourceViewer, getSources } from '../../../api/components'; import { mockMainBranch } from '../../../helpers/mocks/branch-like'; import { mockIssue, mockSourceLine, mockSourceViewerFile } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import defaultLoadIssues from '../helpers/loadIssues'; import SourceViewerBase from '../SourceViewerBase'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx index 362f781ef64..5f64b732f39 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx @@ -20,12 +20,12 @@ import { groupBy, sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { collapsedDirFromPath, fileFromPath } from 'sonar-ui-common/helpers/path'; import { isPullRequest } from '../../../helpers/branch-like'; import { getProjectUrl } from '../../../helpers/urls'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { collapsedDirFromPath, fileFromPath } from '../../../sonar-ui-common/helpers/path'; import { BranchLike } from '../../../types/branch-like'; import { WorkspaceContextShape } from '../../workspace/context'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx index b69c4347c16..5ca08ba5d0a 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface LineCoverageProps { line: T.SourceLine; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx index 3d3cc14552f..74d9e33f258 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface LineDuplicationBlockProps { blocksLoaded: boolean; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx index a621ccbdae9..2397856404c 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx @@ -20,10 +20,10 @@ import * as classNames from 'classnames'; import { uniq } from 'lodash'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import IssueIcon from 'sonar-ui-common/components/icons/IssueIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { sortByType } from '../../../helpers/issues'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import IssueIcon from '../../../sonar-ui-common/components/icons/IssueIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface LineIssuesIndicatorProps { issues: T.Issue[]; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx index 48e63fe419d..8015ab5d8cc 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import LineOptionsPopup from './LineOptionsPopup'; export interface LineNumberProps { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx index 24ee901a7ea..57a43002b9c 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ActionsDropdownItem } from 'sonar-ui-common/components/controls/ActionsDropdown'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getCodeUrl } from '../../../helpers/urls'; +import { ActionsDropdownItem } from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getPathUrlAsString } from '../../../sonar-ui-common/helpers/urls'; import { SourceViewerContext } from '../SourceViewerContext'; export interface LineOptionsPopupProps { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx index 0efc34fef62..e50618cad7f 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import SCMPopup from './SCMPopup'; export interface LineSCMProps { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx index 54f72e11fe1..f403e9ab6d6 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx @@ -20,14 +20,6 @@ import { groupBy, keyBy, sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import DuplicationsRating from 'sonar-ui-common/components/ui/DuplicationsRating'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getFacets } from '../../../api/issues'; import { getMeasures } from '../../../api/measures'; import { getAllMetrics } from '../../../api/metrics'; @@ -35,6 +27,14 @@ import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { ISSUE_TYPES, SEVERITIES } from '../../../helpers/constants'; import { enhanceMeasuresWithMetrics, getDisplayMetrics } from '../../../helpers/measures'; import { getBranchLikeUrl } from '../../../helpers/urls'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import DuplicationsRating from '../../../sonar-ui-common/components/ui/DuplicationsRating'; +import { getLocalizedMetricName, translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import Measure from '../../measure/Measure'; import SeverityHelper from '../../shared/SeverityHelper'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx index 034eec8e02e..394b748d5e8 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { getLocalizedMetricName } from '../../../sonar-ui-common/helpers/l10n'; import { isMetricKey, MetricKey } from '../../../types/metrics'; import Measure from '../../measure/Measure'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx index 9571538b1b8..cd324ab1263 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface SCMPopupProps { line: T.SourceLine; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx index f852404b844..a0d47ae847e 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import Toggler from '../../../../sonar-ui-common/components/controls/Toggler'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { LineDuplicationBlock, LineDuplicationBlockProps } from '../LineDuplicationBlock'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx index d7a65492471..abba13b5906 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockIssue } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { LineIssuesIndicator, LineIssuesIndicatorProps } from '../LineIssuesIndicator'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx index 07f4fb615d7..1af17b98b44 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockBranch } from '../../../../helpers/mocks/branch-like'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { MetricKey } from '../../../../types/metrics'; import MeasuresOverlay from '../MeasuresOverlay'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx index bb3a1bf5511..a0295be6d31 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx @@ -19,11 +19,11 @@ */ import { find, sortBy } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; import { isDiffMetric } from '../../helpers/measures'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../sonar-ui-common/components/icons/DropdownIcon'; +import { getLocalizedMetricName, translate } from '../../sonar-ui-common/helpers/l10n'; import AddGraphMetricPopup from './AddGraphMetricPopup'; interface Props { diff --git a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx index efb16123ecd..45098fa56a9 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import MultiSelect from '../common/MultiSelect'; export interface AddGraphMetricPopupProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx index 0564585ddf1..8e872d882ae 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer'; -import AdvancedTimeline from 'sonar-ui-common/components/charts/AdvancedTimeline'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getShortType } from '../../helpers/measures'; +import AdvancedTimeline from '../../sonar-ui-common/components/charts/AdvancedTimeline'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { MeasureHistory, Serie } from '../../types/project-activity'; import GraphsLegendCustom from './GraphsLegendCustom'; import GraphsLegendStatic from './GraphsLegendStatic'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx index 637dc0ae43c..74879dc3999 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx @@ -19,8 +19,8 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { GraphType } from '../../types/project-activity'; import AddGraphMetric from './AddGraphMetric'; import './styles.css'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx index 36257772f7f..b82f6f2406b 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx @@ -19,9 +19,9 @@ */ import { isEqual } from 'lodash'; import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../sonar-ui-common/helpers/urls'; import { GraphType, MeasureHistory, Serie } from '../../types/project-activity'; import GraphHistory from './GraphHistory'; import './styles.css'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx index 7b8d5b6bb8e..78cbb66d597 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Serie } from '../../types/project-activity'; import GraphsLegendItem from './GraphsLegendItem'; import { hasDataValues } from './utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx index 985b344ef73..3303a22455f 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import AlertWarnIcon from 'sonar-ui-common/components/icons/AlertWarnIcon'; -import ChartLegendIcon from 'sonar-ui-common/components/icons/ChartLegendIcon'; +import { ClearButton } from '../../sonar-ui-common/components/controls/buttons'; +import AlertWarnIcon from '../../sonar-ui-common/components/icons/AlertWarnIcon'; +import ChartLegendIcon from '../../sonar-ui-common/components/icons/ChartLegendIcon'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx index afa9058193e..65bda38c508 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export default function GraphsLegendNewCode() { return ( diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx index 283b0f83796..6f0f22c36cf 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { Popup, PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { isDefined } from 'sonar-ui-common/helpers/types'; +import DateTimeFormatter from '../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { Popup, PopupPlacement } from '../../sonar-ui-common/components/ui/popups'; +import { isDefined } from '../../sonar-ui-common/helpers/types'; import { MeasureHistory, Serie } from '../../types/project-activity'; import GraphsTooltipsContent from './GraphsTooltipsContent'; import GraphsTooltipsContentCoverage from './GraphsTooltipsContentCoverage'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx index f38a0002104..3c30e28cf87 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ChartLegendIcon from 'sonar-ui-common/components/icons/ChartLegendIcon'; +import ChartLegendIcon from '../../sonar-ui-common/components/icons/ChartLegendIcon'; interface Props { name: string; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx index 9a1843acd43..482a4503dd8 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { MeasureHistory } from '../../types/project-activity'; export interface GraphsTooltipsContentCoverageProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx index 7cfcad3d071..95839b501d7 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { MeasureHistory } from '../../types/project-activity'; export interface GraphsTooltipsContentDuplicationProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx index 92e1be94c77..5346165eea9 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ChartLegendIcon from 'sonar-ui-common/components/icons/ChartLegendIcon'; -import Rating from 'sonar-ui-common/components/ui/Rating'; +import ChartLegendIcon from '../../sonar-ui-common/components/icons/ChartLegendIcon'; +import Rating from '../../sonar-ui-common/components/ui/Rating'; import { MeasureHistory } from '../../types/project-activity'; export interface GraphsTooltipsContentIssuesProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx index c71eaf6937f..b2aee06f7fd 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer'; -import ZoomTimeLine from 'sonar-ui-common/components/charts/ZoomTimeLine'; +import ZoomTimeLine from '../../sonar-ui-common/components/charts/ZoomTimeLine'; import { Serie } from '../../types/project-activity'; import { hasHistoryData } from './utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx index 7b1e439ba8b..aa6fcc54dd8 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphHistory from '../GraphHistory'; import { DEFAULT_GRAPH } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx index ad83117996c..b18469949a3 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx @@ -20,7 +20,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsHistory from '../GraphsHistory'; import { DEFAULT_GRAPH } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx index 9c8ef242b53..5829be3deac 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsLegendCustom, { GraphsLegendCustomProps } from '../GraphsLegendCustom'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx index ac1715a0b24..dcac4a82363 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ClearButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import GraphsLegendItem from '../GraphsLegendItem'; it('should render correctly a legend', () => { diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx index 2461b3a6513..6bb92900cf5 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx @@ -20,8 +20,8 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { mockEvent } from '../../../helpers/testMocks'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltips from '../GraphsTooltips'; import { DEFAULT_GRAPH } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx index f088d70aadc..9f89feeeddd 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx @@ -20,7 +20,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltipsContentCoverage, { GraphsTooltipsContentCoverageProps } from '../GraphsTooltipsContentCoverage'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx index 7b8c6e44d79..cf994c06583 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltipsContentDuplication, { GraphsTooltipsContentDuplicationProps } from '../GraphsTooltipsContentDuplication'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx index 63558a0ee2c..635e8fee88a 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltipsContentIssues, { GraphsTooltipsContentIssuesProps } from '../GraphsTooltipsContentIssues'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts b/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts index d9f53bc3ef8..6e26f2f9e5e 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import * as dates from 'sonar-ui-common/helpers/dates'; +import * as dates from '../../../sonar-ui-common/helpers/dates'; import { MetricKey } from '../../../types/metrics'; import { GraphType, Serie } from '../../../types/project-activity'; import * as utils from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/utils.ts b/server/sonar-web/src/main/js/components/activity-graph/utils.ts index efe86766a74..c4b13e1887c 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/utils.ts +++ b/server/sonar-web/src/main/js/components/activity-graph/utils.ts @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { chunk, flatMap, groupBy, sortBy } from 'lodash'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { get, save } from 'sonar-ui-common/helpers/storage'; import { localizeMetric } from '../../helpers/measures'; +import { getLocalizedMetricName, translate } from '../../sonar-ui-common/helpers/l10n'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import { MetricKey } from '../../types/metrics'; import { GraphType, MeasureHistory, Serie } from '../../types/project-activity'; diff --git a/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx b/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx index a9fbd7eea56..67605e1db0e 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx +++ b/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx @@ -20,7 +20,7 @@ import * as classNames from 'classnames'; import { ScaleLinear, ScaleOrdinal } from 'd3-scale'; import * as React from 'react'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import './ColorBoxLegend.css'; interface Props { diff --git a/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx b/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx index 53af7bba224..cce95472cc0 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx +++ b/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { RATING_COLORS } from '../../helpers/constants'; +import { ButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import './ColorBoxLegend.css'; export interface ColorRatingsLegendProps { diff --git a/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx b/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx index 06204ba9af1..f603b34a89e 100644 --- a/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx +++ b/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx @@ -19,9 +19,9 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import Histogram from 'sonar-ui-common/components/charts/Histogram'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import Histogram from '../../sonar-ui-common/components/charts/Histogram'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; interface Props { alignTicks?: boolean; diff --git a/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx b/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx index 50eb686ae58..7638e1288e8 100644 --- a/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx +++ b/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; import ColorRatingsLegend, { ColorRatingsLegendProps } from '../ColorRatingsLegend'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/common/ActivityLink.tsx b/server/sonar-web/src/main/js/components/common/ActivityLink.tsx index 8128db11301..4d6afcb46ab 100644 --- a/server/sonar-web/src/main/js/components/common/ActivityLink.tsx +++ b/server/sonar-web/src/main/js/components/common/ActivityLink.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HistoryIcon from 'sonar-ui-common/components/icons/HistoryIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getActivityUrl, getMeasureHistoryUrl } from '../../helpers/urls'; +import HistoryIcon from '../../sonar-ui-common/components/icons/HistoryIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import { GraphType } from '../../types/project-activity'; import { isCustomGraph } from '../activity-graph/utils'; diff --git a/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx b/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx index dc99b50368f..f107a35e31a 100644 --- a/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx +++ b/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import WarningIcon from 'sonar-ui-common/components/icons/WarningIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { dismissAnalysisWarning, getTask } from '../../api/ce'; import { sanitizeStringRestricted } from '../../helpers/sanitize'; +import { ButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import WarningIcon from '../../sonar-ui-common/components/icons/WarningIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { TaskWarning } from '../../types/tasks'; import { withCurrentUser } from '../hoc/withCurrentUser'; 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 91d80dab3e3..98bdd0eef0f 100644 --- a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx +++ b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import Level from 'sonar-ui-common/components/ui/Level'; +import Level from '../../sonar-ui-common/components/ui/Level'; import { getBranchStatusByBranchLike, Store } from '../../store/rootReducer'; import { BranchLike } from '../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx b/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx index bf81eec490b..e6d26f826b5 100644 --- a/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx +++ b/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import { isDefined } from 'sonar-ui-common/helpers/types'; +import { ClipboardButton } from '../../sonar-ui-common/components/controls/clipboard'; +import { isDefined } from '../../sonar-ui-common/helpers/types'; import './CodeSnippet.css'; export interface CodeSnippetProps { diff --git a/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx b/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx index 5ca6146e233..ba057c4cc21 100644 --- a/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx +++ b/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; export interface DisableableSelectOptionProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx b/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx index 2e1546dd61c..f241884c67c 100644 --- a/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx +++ b/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; import { isWebUri } from 'valid-url'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import DetachIcon from '../../sonar-ui-common/components/icons/DetachIcon'; export interface DocumentationTooltipProps { children?: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/common/EmptySearch.tsx b/server/sonar-web/src/main/js/components/common/EmptySearch.tsx index 07b036f0894..3091ad24715 100644 --- a/server/sonar-web/src/main/js/components/common/EmptySearch.tsx +++ b/server/sonar-web/src/main/js/components/common/EmptySearch.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import './EmptySearch.css'; export default function EmptySearch() { diff --git a/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx b/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx index 800bd3a8fb0..216366e6e59 100644 --- a/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx +++ b/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { displayReset: boolean; diff --git a/server/sonar-web/src/main/js/components/common/FormattingTips.tsx b/server/sonar-web/src/main/js/components/common/FormattingTips.tsx index b231e254e80..6e12fd4521f 100644 --- a/server/sonar-web/src/main/js/components/common/FormattingTips.tsx +++ b/server/sonar-web/src/main/js/components/common/FormattingTips.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getFormattingHelpUrl } from '../../helpers/urls'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx b/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx index bdfc97d1075..106b193920a 100644 --- a/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx +++ b/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx @@ -20,9 +20,9 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import MeasuresIcon from 'sonar-ui-common/components/icons/MeasuresIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getComponentDrilldownUrl } from '../../helpers/urls'; +import MeasuresIcon from '../../sonar-ui-common/components/icons/MeasuresIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import './MeasuresLink.css'; diff --git a/server/sonar-web/src/main/js/components/common/MultiSelect.tsx b/server/sonar-web/src/main/js/components/common/MultiSelect.tsx index 24738a5ee40..430aa020c64 100644 --- a/server/sonar-web/src/main/js/components/common/MultiSelect.tsx +++ b/server/sonar-web/src/main/js/components/common/MultiSelect.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import { difference } from 'lodash'; import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import { translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import MultiSelectOption from './MultiSelectOption'; interface Props { diff --git a/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx b/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx index e6a89f70140..244c85cb2a9 100644 --- a/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx +++ b/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface MultiSelectOptionProps { active?: boolean; diff --git a/server/sonar-web/src/main/js/components/common/PageCounter.tsx b/server/sonar-web/src/main/js/components/common/PageCounter.tsx index 033b822bba7..40bc2808ddc 100644 --- a/server/sonar-web/src/main/js/components/common/PageCounter.tsx +++ b/server/sonar-web/src/main/js/components/common/PageCounter.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; export interface PageCounterProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx b/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx index bf3e8e3e2ee..c8f4200691e 100644 --- a/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx +++ b/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface PrivacyBadgeContainerProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx b/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx index 0e5e27283c1..5a8ae7c92cf 100644 --- a/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx +++ b/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { PROJECT_KEY_MAX_LEN } from '../../helpers/constants'; +import ValidationInput from '../../sonar-ui-common/components/controls/ValidationInput'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface ProjectKeyInputProps { error?: string; diff --git a/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx b/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx index 8f46d2f8650..d0de4ad77e9 100644 --- a/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx +++ b/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { changePassword } from '../../api/users'; +import { SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/RestartButton.tsx b/server/sonar-web/src/main/js/components/common/RestartButton.tsx index 5643c3b1a9b..22215f367e3 100644 --- a/server/sonar-web/src/main/js/components/common/RestartButton.tsx +++ b/server/sonar-web/src/main/js/components/common/RestartButton.tsx @@ -19,10 +19,10 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { restart } from '../../api/system'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/SelectListItem.tsx b/server/sonar-web/src/main/js/components/common/SelectListItem.tsx index dbfba2748a8..d3f52082451 100644 --- a/server/sonar-web/src/main/js/components/common/SelectListItem.tsx +++ b/server/sonar-web/src/main/js/components/common/SelectListItem.tsx @@ -19,7 +19,7 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; interface Props { active?: string; diff --git a/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx b/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx index 5e37429ade6..f158f69abcd 100644 --- a/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx +++ b/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import './StatusIndicator.css'; export interface StatusIndicatorProps { diff --git a/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx b/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx index 88a4d37cd5b..663a3a5bf3b 100644 --- a/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx +++ b/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Radio from '../../sonar-ui-common/components/controls/Radio'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { canTurnToPrivate?: boolean; diff --git a/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx index 6514e28297a..a4289821d20 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { dismissAnalysisWarning, getTask } from '../../../api/ce'; import { mockTaskWarning } from '../../../helpers/mocks/tasks'; import { mockCurrentUser, mockEvent } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { AnalysisWarningsModal } from '../AnalysisWarningsModal'; jest.mock('../../../api/ce', () => ({ diff --git a/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx index 96ec202034a..19a384037b0 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import FormattingTips from '../FormattingTips'; const originalOpen = window.open; diff --git a/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx index 7333ba41d8d..3a4a6aaf997 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; import ProjectKeyInput, { ProjectKeyInputProps } from '../ProjectKeyInput'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx index e940f20395e..2650c54e9c3 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { changePassword } from '../../../api/users'; import { mockEvent, mockLoggedInUser } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ResetPasswordForm from '../ResetPasswordForm'; jest.mock('../../../api/users', () => ({ diff --git a/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx index 58263ec3c03..ce778d7f3fe 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx @@ -19,7 +19,7 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { click, keydown } from 'sonar-ui-common/helpers/testUtils'; +import { click, keydown } from '../../../sonar-ui-common/helpers/testUtils'; import SelectList from '../SelectList'; import SelectListItem from '../SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx index 95bb0bbe561..5dce0b915af 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; import VisibilitySelector from '../VisibilitySelector'; it('changes visibility', () => { diff --git a/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx b/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx index 84e7be44554..e0c4b00f660 100644 --- a/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx +++ b/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx @@ -19,7 +19,6 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getReportStatus, subscribeToEmailReport, @@ -27,6 +26,7 @@ import { } from '../../api/component-report'; import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage'; import { isLoggedIn } from '../../helpers/users'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { Store } from '../../store/rootReducer'; import { Branch } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; diff --git a/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx b/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx index a693b8315f7..581ec4da87e 100644 --- a/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx +++ b/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getReportUrl } from '../../api/component-report'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { Branch } from '../../types/branch-like'; export interface ComponentReportActionsRendererProps { diff --git a/server/sonar-web/src/main/js/components/controls/DateInput.tsx b/server/sonar-web/src/main/js/components/controls/DateInput.tsx index fb62d5b4953..eb1d5422093 100644 --- a/server/sonar-web/src/main/js/components/controls/DateInput.tsx +++ b/server/sonar-web/src/main/js/components/controls/DateInput.tsx @@ -26,18 +26,18 @@ import { range } from 'lodash'; import * as React from 'react'; import { DayModifiers, Modifier, Modifiers } from 'react-day-picker'; import { InjectedIntlProps, injectIntl } from 'react-intl'; -import { ButtonIcon, ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; -import Select from 'sonar-ui-common/components/controls/Select'; -import CalendarIcon from 'sonar-ui-common/components/icons/CalendarIcon'; -import ChevronLeftIcon from 'sonar-ui-common/components/icons/ChevronLeftIcon'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { ButtonIcon, ClearButton } from '../../sonar-ui-common/components/controls/buttons'; +import OutsideClickHandler from '../../sonar-ui-common/components/controls/OutsideClickHandler'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import CalendarIcon from '../../sonar-ui-common/components/icons/CalendarIcon'; +import ChevronLeftIcon from '../../sonar-ui-common/components/icons/ChevronLeftIcon'; +import ChevronRightIcon from '../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; import { getShortMonthName, getShortWeekDayName, getWeekDayName -} from 'sonar-ui-common/helpers/l10n'; +} from '../../sonar-ui-common/helpers/l10n'; import './DayPicker.css'; import './styles.css'; diff --git a/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx b/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx index b258ca14313..371ad27425a 100644 --- a/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx +++ b/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx @@ -20,7 +20,7 @@ import * as classNames from 'classnames'; import { max, min } from 'date-fns'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import DateInput from './DateInput'; type DateRange = { from?: Date; to?: Date }; diff --git a/server/sonar-web/src/main/js/components/controls/Favorite.tsx b/server/sonar-web/src/main/js/components/controls/Favorite.tsx index 6432d1854a2..3c0ba619fc3 100644 --- a/server/sonar-web/src/main/js/components/controls/Favorite.tsx +++ b/server/sonar-web/src/main/js/components/controls/Favorite.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import FavoriteButton from 'sonar-ui-common/components/controls/FavoriteButton'; import { addFavorite, removeFavorite } from '../../api/favorites'; +import FavoriteButton from '../../sonar-ui-common/components/controls/FavoriteButton'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx b/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx index f97e9747406..64c804bd697 100644 --- a/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx +++ b/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx @@ -20,11 +20,11 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { connect } from 'react-redux'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import HomeIcon from 'sonar-ui-common/components/icons/HomeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isLoggedIn } from '../../helpers/users'; +import { ButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import HomeIcon from '../../sonar-ui-common/components/icons/HomeIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { getCurrentUser, Store } from '../../store/rootReducer'; import { setHomePage } from '../../store/users'; diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx index 844b4d78cb9..c32443d6d23 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx @@ -20,7 +20,6 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getReportStatus, subscribeToEmailReport, @@ -30,6 +29,7 @@ import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage' import { mockBranch } from '../../../helpers/mocks/branch-like'; import { mockComponentReportStatus } from '../../../helpers/mocks/component-report'; import { mockComponent, mockCurrentUser } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../types/component'; import { ComponentReportActions } from '../ComponentReportActions'; diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx index 4938ffc4f9d..64bbec9b825 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx @@ -24,7 +24,7 @@ import * as subDays from 'date-fns/sub_days'; import * as subMonths from 'date-fns/sub_months'; import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import DateInput from '../DateInput'; beforeAll(() => { diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx index 9e2a55482d0..0d023f19e01 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import DateRangeInput from '../DateRangeInput'; const dateA = parseDate('2018-01-17T00:00:00.000Z'); diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx index f59867db0fe..dcfd8e3f1af 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import FavoriteButton from 'sonar-ui-common/components/controls/FavoriteButton'; +import FavoriteButton from '../../../sonar-ui-common/components/controls/FavoriteButton'; import Favorite from '../Favorite'; jest.mock('../../../api/favorites', () => ({ diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx index 4c37bf9c5f6..7c05867ab27 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockCurrentUser, mockLoggedInUser } from '../../../helpers/testMocks'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { click, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { DEFAULT_HOMEPAGE, HomePageSelect } from '../HomePageSelect'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx b/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx index 9af17ff06a6..e335ee3eb8c 100644 --- a/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import OpenCloseIcon from 'sonar-ui-common/components/icons/OpenCloseIcon'; +import OpenCloseIcon from '../../sonar-ui-common/components/icons/OpenCloseIcon'; interface State { open: boolean; diff --git a/server/sonar-web/src/main/js/components/docs/DocImg.tsx b/server/sonar-web/src/main/js/components/docs/DocImg.tsx index 801694e15f7..f2836e9a18f 100644 --- a/server/sonar-web/src/main/js/components/docs/DocImg.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocImg.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { getBaseUrl } from '../../sonar-ui-common/helpers/urls'; export default function DocImg(props: React.ImgHTMLAttributes<HTMLImageElement>) { const { alt, src, ...other } = props; diff --git a/server/sonar-web/src/main/js/components/docs/DocLink.tsx b/server/sonar-web/src/main/js/components/docs/DocLink.tsx index 98e1417e7b9..3cb93cf5812 100644 --- a/server/sonar-web/src/main/js/components/docs/DocLink.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocLink.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; import { isSonarCloud } from '../../helpers/system'; +import DetachIcon from '../../sonar-ui-common/components/icons/DetachIcon'; import { withAppState } from '../hoc/withAppState'; interface OwnProps { diff --git a/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx b/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx index 9a04f699535..b183a8ad4f5 100644 --- a/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx @@ -25,7 +25,7 @@ import rehypeSlug from 'rehype-slug'; import remark from 'remark'; import remarkCustomBlocks from 'remark-custom-blocks'; import remarkRehype from 'remark-rehype'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; +import { scrollToElement } from '../../sonar-ui-common/helpers/scrolling'; import DocCollapsibleBlock from './DocCollapsibleBlock'; import DocImg from './DocImg'; import DocLink from './DocLink'; diff --git a/server/sonar-web/src/main/js/components/docs/DocToc.tsx b/server/sonar-web/src/main/js/components/docs/DocToc.tsx index 28dc7f82b83..18a455c0192 100644 --- a/server/sonar-web/src/main/js/components/docs/DocToc.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocToc.tsx @@ -23,7 +23,7 @@ import * as React from 'react'; import { findDOMNode } from 'react-dom'; import remark from 'remark'; import reactRenderer from 'remark-react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import onlyToc from './plugins/remark-only-toc'; interface Props { diff --git a/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx b/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx index aea12f3bc62..f1624dcc954 100644 --- a/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx @@ -20,7 +20,7 @@ import { forEach } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; +import DetachIcon from '../../sonar-ui-common/components/icons/DetachIcon'; interface OwnProps { customProps?: T.Dict<string>; diff --git a/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx b/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx index b649b865b67..8e8827d5d61 100644 --- a/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx +++ b/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import DocCollapsibleBlock from '../DocCollapsibleBlock'; const children = ( diff --git a/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx b/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx index 86a4f1e9eb5..47cccf1ef0c 100644 --- a/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx +++ b/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { mockEvent } from '../../../helpers/testMocks'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import DocMarkdownBlock from '../DocMarkdownBlock'; const CONTENT = ` @@ -50,7 +50,7 @@ jest.mock('rehype-raw', () => ({ default: jest.requireActual('rehype-raw') })); jest.mock('rehype-react', () => ({ default: jest.requireActual('rehype-react') })); jest.mock('rehype-slug', () => ({ default: jest.requireActual('rehype-slug') })); -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx b/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx index e49cf8710df..3113d2972ae 100644 --- a/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx +++ b/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx @@ -19,7 +19,7 @@ */ import { mount } from 'enzyme'; import * as React from 'react'; -import { click, scrollTo } from 'sonar-ui-common/helpers/testUtils'; +import { click, scrollTo } from '../../../sonar-ui-common/helpers/testUtils'; import DocToc from '../DocToc'; const OFFSET = 300; diff --git a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx index f8868ac7262..cb7a7de515d 100644 --- a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx +++ b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import OpenCloseIcon from 'sonar-ui-common/components/icons/OpenCloseIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import OpenCloseIcon from '../../sonar-ui-common/components/icons/OpenCloseIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; interface Props { children?: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx b/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx index 70d8545712d..dacee4ebd96 100644 --- a/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx +++ b/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx @@ -20,13 +20,13 @@ import * as classNames from 'classnames'; import { sortBy, without } from 'lodash'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { queriesEqual } from 'sonar-ui-common/helpers/query'; +import ListFooter from '../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; +import { queriesEqual } from '../../sonar-ui-common/helpers/query'; import FacetBox from './FacetBox'; import FacetHeader from './FacetHeader'; import FacetItem from './FacetItem'; diff --git a/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx b/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx index ab87b1fef28..1afa9718fa0 100644 --- a/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx +++ b/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx b/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx index 063297d25f8..913644ad6aa 100644 --- a/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx +++ b/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import './MultipleSelectionHint.css'; interface Props { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx index e541b8900ec..c135b73d803 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import FacetHeader from '../FacetHeader'; it('should render open facet with value', () => { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx index 83647b04946..54f0cba0272 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import FacetItem, { Props } from '../FacetItem'; it('should render active', () => { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx index 4ac3324585e..72e4ff445e4 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx @@ -19,7 +19,7 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ListStyleFacet, { Props } from '../ListStyleFacet'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx index 02ce7a4aecf..cf4edc30d25 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import ListStyleFacetFooter from '../ListStyleFacetFooter'; it('should not render "show more"', () => { diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx index 5ee9fbeefb2..18de0d584b1 100644 --- a/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx +++ b/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx @@ -19,11 +19,11 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { mockStore } from '../../../helpers/testMocks'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { whenLoggedIn } from '../whenLoggedIn'; -jest.mock('sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ +jest.mock('../../../sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ default: jest.fn() })); diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx index 102a987dd95..60a8ba13cca 100644 --- a/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx +++ b/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx @@ -19,8 +19,8 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { KEYCODE_MAP, keydown } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent } from '../../../helpers/testMocks'; +import { KEYCODE_MAP, keydown } from '../../../sonar-ui-common/helpers/testUtils'; import withKeyboardNavigation, { WithKeyboardNavigationProps } from '../withKeyboardNavigation'; class X extends React.Component<{ diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx index 5f1e351f9c9..babc0bf1e25 100644 --- a/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx +++ b/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { addNotification, getNotifications, removeNotification } from '../../../api/notifications'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { withNotifications, WithNotificationsProps } from '../withNotifications'; jest.mock('../../../api/notifications', () => ({ diff --git a/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx b/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx index e34d37059ee..250ecb9e3d7 100644 --- a/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx +++ b/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { isLoggedIn } from '../../helpers/users'; +import handleRequiredAuthentication from '../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { getWrappedDisplayName } from './utils'; import { withCurrentUser } from './withCurrentUser'; diff --git a/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx b/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx index 15c53d6a5a4..4db6963967b 100644 --- a/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx +++ b/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx @@ -19,7 +19,7 @@ */ import * as key from 'keymaster'; import * as React from 'react'; -import PageActions from 'sonar-ui-common/components/ui/PageActions'; +import PageActions from '../../sonar-ui-common/components/ui/PageActions'; import { getWrappedDisplayName } from './utils'; export interface WithKeyboardNavigationProps { diff --git a/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx b/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx index e64f93febdd..8b301c9aed0 100644 --- a/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx +++ b/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import { IconProps } from 'sonar-ui-common/components/icons/Icon'; -import PullRequestIcon from 'sonar-ui-common/components/icons/PullRequestIcon'; import { isPullRequest } from '../../helpers/branch-like'; +import BranchIcon from '../../sonar-ui-common/components/icons/BranchIcon'; +import { IconProps } from '../../sonar-ui-common/components/icons/Icon'; +import PullRequestIcon from '../../sonar-ui-common/components/icons/PullRequestIcon'; import { BranchLike } from '../../types/branch-like'; export interface BranchLikeIconProps extends IconProps { diff --git a/server/sonar-web/src/main/js/components/issue/IssueView.tsx b/server/sonar-web/src/main/js/components/issue/IssueView.tsx index 98d1d885a66..dc2d5e9c82c 100644 --- a/server/sonar-web/src/main/js/components/issue/IssueView.tsx +++ b/server/sonar-web/src/main/js/components/issue/IssueView.tsx @@ -19,8 +19,8 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; import { deleteIssueComment, editIssueComment } from '../../api/issues'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; import { BranchLike } from '../../types/branch-like'; import { updateIssue } from './actions'; import IssueActionsBar from './components/IssueActionsBar'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx index 2022ebcc0d2..5389b6c2ded 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IssueResponse } from '../../../types/issues'; import { updateIssue } from '../actions'; import IssueAssign from './IssueAssign'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx index afc63537aab..11c7af41e71 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import Avatar from '../../ui/Avatar'; import SetAssigneePopup from '../popups/SetAssigneePopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx index 15261cc7e77..10d6cbdae9d 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; import ChangelogPopup from '../popups/ChangelogPopup'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx index d6281e0133a..119f7799a59 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { diff: T.IssueChangelogDiff; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx index d5826942b9c..8373f5faeca 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { addIssueComment } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { updateIssue } from '../actions'; import CommentPopup from '../popups/CommentPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx index 06d4a937ed2..0e598e235c5 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DeleteButton, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { sanitizeString } from '../../../helpers/sanitize'; +import { DeleteButton, EditButton } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import Avatar from '../../ui/Avatar'; import CommentDeletePopup from '../popups/CommentDeletePopup'; import CommentPopup from '../popups/CommentPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx index 49b7814078f..5c83e6f7a2b 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { RuleStatus } from '../../../types/rules'; import DocumentationTooltip from '../../common/DocumentationTooltip'; import { WorkspaceContextShape } from '../../workspace/context'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx index c6996fd066c..9a3d77151db 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setIssueSeverity } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IssueResponse } from '../../../types/issues'; import SeverityHelper from '../../shared/SeverityHelper'; import SetSeverityPopup from '../popups/SetSeverityPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx index 553bb8c6e80..e1621611761 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setIssueTags } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import TagsList from '../../tags/TagsList'; import { updateIssue } from '../actions'; import SetIssueTagsPopup from '../popups/SetIssueTagsPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx index 1b82ac169b2..581ab6fcbd9 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import LinkIcon from 'sonar-ui-common/components/icons/LinkIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { getComponentIssuesUrl } from '../../../helpers/urls'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import LinkIcon from '../../../sonar-ui-common/components/icons/LinkIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import { RuleStatus } from '../../../types/rules'; import LocationIndex from '../../common/LocationIndex'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx index 419eaa2b92d..151b16b4c60 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setIssueTransition } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import StatusHelper from '../../shared/StatusHelper'; import { updateIssue } from '../actions'; import SetTransitionPopup from '../popups/SetTransitionPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx index d2d4871f289..dfb5884e687 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setIssueType } from '../../../api/issues'; import { colors } from '../../../app/theme'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IssueResponse } from '../../../types/issues'; import SetTypePopup from '../popups/SetTypePopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx b/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx index 3292efc5f68..9719b16e892 100644 --- a/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import FilterIcon from 'sonar-ui-common/components/icons/FilterIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import FilterIcon from '../../../sonar-ui-common/components/icons/FilterIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SimilarIssuesPopup from '../popups/SimilarIssuesPopup'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx index 6d39c9b8087..b7a57ad8f6f 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockIssue } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueAssign from '../IssueAssign'; const issue = mockIssue(false, { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx index 791574241d7..79c9f420d31 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueChangelog from '../IssueChangelog'; const issue = { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx index e17301e4294..ea85db6caf3 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueCommentAction from '../IssueCommentAction'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx index bb309096778..1bc3834007c 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueCommentLine from '../IssueCommentLine'; const comment: T.IssueComment = { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx index 1bdf7b0e8d9..76434929cdf 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ButtonLink } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { RuleStatus } from '../../../../types/rules'; import IssueMessage, { IssueMessageProps } from '../IssueMessage'; diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx index c98f0e6ee74..0ab46df88ff 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueSeverity from '../IssueSeverity'; const issue = { severity: 'BLOCKER' }; diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx index 49acbba7d0d..bb66a22454d 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueTags from '../IssueTags'; const issue = { key: 'issuekey', tags: ['mytag', 'test'] }; diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx index c574a8c1fae..a781f587839 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueTransition from '../IssueTransition'; const issue: IssueTransition['props']['issue'] = { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx index 460413c3cda..82c0709b272 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueType from '../IssueType'; const issue: Pick<T.Issue, 'type'> = { type: 'BUG' }; diff --git a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx index c92a8bf217d..f34b57ee112 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getIssueChangelog } from '../../../api/issues'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import Avatar from '../../ui/Avatar'; import IssueChangelogDiff from '../components/IssueChangelogDiff'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx index 28bfed0db9e..6228c4531e2 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onDelete: () => void; diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx index edeb5b687de..2698e111960 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button, ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import FormattingTips from '../../common/FormattingTips'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx index 697405f3dd9..2ca2cdd3cf8 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx @@ -19,11 +19,11 @@ */ import { map } from 'lodash'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { searchUsers } from '../../../api/users'; import { isLoggedIn, isUserActive } from '../../../helpers/users'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; import { withCurrentUser } from '../../hoc/withCurrentUser'; 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 e7ccefc4c7e..6a67ab9522f 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,9 +19,9 @@ */ import { difference, without } from 'lodash'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; import { searchIssueTags } from '../../../api/issues'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; import TagsSelector from '../../tags/TagsSelector'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx index a249cab9f91..9758367c83d 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SeverityIcon from 'sonar-ui-common/components/icons/SeverityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import SeverityIcon from '../../../sonar-ui-common/components/icons/SeverityIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx index 93faa598e95..1c5ccb83a53 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { hasMessage, translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx index 95928141ea4..39807141097 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx index 1684b684d32..32d6136db31 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { fileFromPath, limitComponentName } from 'sonar-ui-common/helpers/path'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { fileFromPath, limitComponentName } from '../../../sonar-ui-common/helpers/path'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; import SeverityHelper from '../../shared/SeverityHelper'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx index 141238705e1..a2c1c2eb712 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getIssueChangelog } from '../../../../api/issues'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ChangelogPopup from '../ChangelogPopup'; jest.mock('../../../../api/issues', () => ({ diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx index 30e1fa23638..dc620384173 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import CommentDeletePopup from '../CommentDeletePopup'; it('should render the comment delete popup correctly', () => { diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx index 0f234f38d26..28364fe0a3f 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import CommentPopup from '../CommentPopup'; it('should render the comment popup correctly without existing comment', () => { diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx index 7a744a33cf2..71861beb06b 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchUsers } from '../../../../api/users'; import { mockLoggedInUser, mockUser } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { SetAssigneePopup } from '../SetAssigneePopup'; jest.mock('../../../../api/users', () => { diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx index 95f57dff106..bcd199f2a18 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { hasMessage } from 'sonar-ui-common/helpers/l10n'; +import { hasMessage } from '../../../../sonar-ui-common/helpers/l10n'; import SetTransitionPopup, { Props } from '../SetTransitionPopup'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ - ...jest.requireActual('sonar-ui-common/helpers/l10n'), +jest.mock('../../../../sonar-ui-common/helpers/l10n', () => ({ + ...jest.requireActual('../../../../sonar-ui-common/helpers/l10n'), hasMessage: jest.fn().mockReturnValue(false) })); 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 57ad705956e..f1d0d8469e0 100644 --- a/server/sonar-web/src/main/js/components/measure/Measure.tsx +++ b/server/sonar-web/src/main/js/components/measure/Measure.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import Level from 'sonar-ui-common/components/ui/Level'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import Level from '../../sonar-ui-common/components/ui/Level'; +import Rating from '../../sonar-ui-common/components/ui/Rating'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { getRatingTooltip } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx b/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx index 3fbcfaba327..222222308c2 100644 --- a/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx +++ b/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SeverityIcon from 'sonar-ui-common/components/icons/SeverityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SeverityIcon from '../../sonar-ui-common/components/icons/SeverityIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx b/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx index 7c4d972c25c..bc9de1dd8a0 100644 --- a/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx +++ b/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import StatusIcon from 'sonar-ui-common/components/icons/StatusIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import StatusIcon from '../../sonar-ui-common/components/icons/StatusIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx b/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx index 02aab6b4ed1..18ac7cc516f 100644 --- a/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx +++ b/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import IssueTypeIcon from '../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/tags/TagsList.tsx b/server/sonar-web/src/main/js/components/tags/TagsList.tsx index 11192df6c6f..00853bc998b 100644 --- a/server/sonar-web/src/main/js/components/tags/TagsList.tsx +++ b/server/sonar-web/src/main/js/components/tags/TagsList.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import DropdownIcon from '../../sonar-ui-common/components/icons/DropdownIcon'; +import TagsIcon from '../../sonar-ui-common/components/icons/TagsIcon'; +import { translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import './TagsList.css'; interface Props { diff --git a/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx b/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx index b98f161b572..ae83cabad8c 100644 --- a/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx +++ b/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import MultiSelect from '../common/MultiSelect'; import './TagsList.css'; diff --git a/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx b/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx index 2dd1d3851c9..43588b85c38 100644 --- a/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { WithRouterProps } from 'react-router'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; import { getAlmSettingsNoCatch } from '../../api/alm-settings'; import { getValues } from '../../api/settings'; +import { getHostUrl } from '../../sonar-ui-common/helpers/urls'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../types/alm-settings'; import { SettingsKey } from '../../types/settings'; import { withRouter } from '../hoc/withRouter'; diff --git a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx index 257077294b7..af7d93ee15d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import EllipsisIcon from 'sonar-ui-common/components/icons/EllipsisIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import EllipsisIcon from '../../sonar-ui-common/components/icons/EllipsisIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../sonar-ui-common/helpers/urls'; import { AlmKeys, AlmSettingsInstance, ProjectAlmBindingResponse } from '../../types/alm-settings'; import AzurePipelinesTutorial from './azure-pipelines/AzurePipelinesTutorial'; import BitbucketPipelinesTutorial from './bitbucket-pipelines/BitbucketPipelinesTutorial'; diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx index 8fbac8a413e..6eab55cfecf 100644 --- a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; import { getAlmSettingsNoCatch } from '../../../api/alm-settings'; import { getValues } from '../../../api/settings'; import { @@ -33,11 +31,13 @@ import { mockLoggedInUser, mockRouter } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; +import { getHostUrl } from '../../../sonar-ui-common/helpers/urls'; import { SettingsKey } from '../../../types/settings'; import { TutorialSelection } from '../TutorialSelection'; import { TutorialModes } from '../types'; -jest.mock('sonar-ui-common/helpers/urls', () => ({ +jest.mock('../../../sonar-ui-common/helpers/urls', () => ({ getHostUrl: jest.fn().mockReturnValue('http://host.url') })); diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx index 70c2829493a..a6c45ad79f7 100644 --- a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockAlmSettingsInstance, mockProjectAzureBindingResponse, @@ -29,6 +28,7 @@ import { mockProjectGitLabBindingResponse } from '../../../helpers/mocks/alm-settings'; import { mockComponent, mockLoggedInUser } from '../../../helpers/testMocks'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import TutorialSelectionRenderer, { TutorialSelectionRendererProps } from '../TutorialSelectionRenderer'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx index fd794e44f4d..e54a817f490 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import AllSetStep from '../components/AllSetStep'; import FinishButton from '../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx index e8fd38050d4..7bd83625b83 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getLanguages, Store } from '../../../store/rootReducer'; import RenderOptions from '../components/RenderOptions'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx index 0fc014113d0..457a3c85238 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function ExtensionInstallationStepContent() { return ( diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx index c4619c8e4c5..4f357e41299 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; function renderSentenceWithFieldAndValue(props: { field: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx index 04254a2482b..330d2175399 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EditTokenModal from '../components/EditTokenModal'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx index 21c414bd54b..245a6279f4c 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import Step from '../../components/Step'; import AzurePipelinesTutorial, { AzurePipelinesTutorialProps } from '../AzurePipelinesTutorial'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx index 0f4f849718f..05d0a5e3de6 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import EditTokenModal from '../../components/EditTokenModal'; import ServiceEndpointStepContent from '../ServiceEndpointStepContent'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx index 06aca839b05..136242ab73b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx @@ -21,9 +21,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../../types/alm-settings'; export default function AlertClassicEditor() { diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx index d0b7783818c..1cdc13e7ed5 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getHostUrl } from '../../../../sonar-ui-common/helpers/urls'; import CodeSnippet from '../../../common/CodeSnippet'; import { CompilationInfo } from '../../components/CompilationInfo'; import RenderOptions from '../../components/RenderOptions'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx index 372499561dd..ac9b306252d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; import { BuildTools } from '../../types'; import JavaToolInstallation from '../JavaToolInstallation'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx index aee48bdc51d..50f84fce710 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; import { BuildTools } from '../../types'; import JavaToolInstallation from '../JavaToolInstallation'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx index 744a22da66e..b43b6ce906e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; import { BuildTools } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx index 580301e681c..a4b99aaa31b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx @@ -21,9 +21,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../../types/alm-settings'; import { withAppState } from '../../../hoc/withAppState'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx index 76f314de563..7366acaa63e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx index 910cfa3034c..bfc5e8499be 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; import DefaultProjectKey from '../components/DefaultProjectKey'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx index 61c4d6fc076..c3227e8a063 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../../types/alm-settings'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; import TokenStepGenerator from '../components/TokenStepGenerator'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx b/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx index 1721c3d3f84..5e71426c94d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AlmKeys } from '../../../types/alm-settings'; import { withAppState } from '../../hoc/withAppState'; import SentenceWithHighlights from './SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx b/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx index 0146f4968b3..5f823cc2075 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import AllSet from './AllSet'; import Step from './Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx b/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx index f86872e8751..51cbcf43cbd 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface CompilationInfoProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx b/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx index 395aadbc729..a08f0ab767d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; export interface CreateYmlFileProps { diff --git a/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx b/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx index ed775c90b11..fff4339ec1b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx @@ -20,13 +20,13 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button, DeleteButton } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { generateToken, getTokens, revokeToken } from '../../../api/user-tokens'; +import { Button, DeleteButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { getUniqueTokenName } from '../utils'; interface State { diff --git a/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx b/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx index 491637b730f..317c5b35fc0 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface FinishButtonProps { onClick: () => void; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx b/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx index 18962f7f96e..962c4ec10e3 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface LabelActionPairProps { translationKey: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx b/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx index 7f55ff7fbe8..9ee3babea90 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface LabelValuePairProps { translationKey: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx b/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx index 84659248d5b..ae796aa23ce 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface RenderOptionsProps { checked: string | undefined; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx index ad1e328ea14..d8d392d1a9a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface SentenceWithFilenameProps { filename: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx index 0a4d57d3bc7..de7b5b23a0f 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface SentenceWithHighlightsProps { highlightKeys: string[]; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx b/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx index dea0fa4a8c6..cbafc901032 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EditTokenModal from './EditTokenModal'; export interface TokenStepGeneratorProps { diff --git a/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx index f9a6c4828c2..21d108c479d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx index 95098784d0c..062c1cef18f 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { generateToken, getTokens, revokeToken } from '../../../../api/user-tokens'; import { mockComponent, mockEvent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { getUniqueTokenName } from '../../utils'; import EditTokenModal from '../EditTokenModal'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx index 10983bab7a6..4672e3b653e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import Step from '../Step'; it('renders', () => { diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx index 7be0f3252a0..c990ecce3d3 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx index 8e91c51c7a6..6253a56bdf6 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../../types/alm-settings'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; import TokenStepGenerator from '../components/TokenStepGenerator'; diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx index 4f2a13aeae7..0a223beaf08 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { CompilationInfo } from '../../components/CompilationInfo'; import CreateYmlFile from '../../components/CreateYmlFile'; import DefaultProjectKey from '../../components/DefaultProjectKey'; diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx index af28cb25261..8f7ba36e3ce 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import CreateYmlFile from '../../components/CreateYmlFile'; import FinishButton from '../../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx index 879f9df3334..73618bc6b5b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import CreateYmlFile from '../../components/CreateYmlFile'; import FinishButton from '../../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx index beb4f2f9ae6..4c770fed88a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Step from '../components/Step'; import TokenStepGenerator from '../components/TokenStepGenerator'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx index 6595d407972..c302598a3a7 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import AllSetStep from '../components/AllSetStep'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx index d4f03a0480e..f1f095cc228 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx index d6be9f21cc0..6620ccdaada 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withAppState } from '../../hoc/withAppState'; import FinishButton from '../components/FinishButton'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx index 0af21063e28..43393164c70 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getAppState, getCurrentUserSetting, Store } from '../../../store/rootReducer'; import { setCurrentUserSetting } from '../../../store/users'; import { diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx index a6ab708384f..057511e09e5 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx index 13c866859e2..475df4e7d67 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx index 7123047dd6b..a75017cf628 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import LabelActionPair from '../components/LabelActionPair'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx index c488fb4b526..ec20d0ddc73 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx @@ -20,12 +20,12 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx index 20579ed0110..f2bc56e759a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import { hasMessage, translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx index e0a9a5cdb2d..11dbe47aa07 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button, ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button, ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx index b5bdfb0f7ac..05fd27ef083 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { stripTrailingSlash } from '../../../helpers/urls'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx index 3ab1a430141..c94a66d0288 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; import LabelActionPair from '../components/LabelActionPair'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx index 64d20fd3ed7..9c446ea7185 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../../types/alm-settings'; import CodeSnippet from '../../common/CodeSnippet'; import LabelActionPair from '../components/LabelActionPair'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx index d0d3b95b9b6..4096d4a347a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx @@ -24,7 +24,7 @@ import { AlmKeys } from '../../../../types/alm-settings'; import Step from '../../components/Step'; import SelectAlmStep, { SelectAlmStepProps } from '../SelectAlmStep'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/l10n', () => ({ hasMessage: (_a: string, k: string, _b: string) => k === AlmKeys.BitbucketCloud, translate: (...k: string[]) => k.join('.') })); diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx index 40572ef286f..03376585600 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { CompilationInfo } from '../../components/CompilationInfo'; import DefaultProjectKey from '../../components/DefaultProjectKey'; import FinishButton from '../../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx index f87c1c9616f..3a4beda931e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; +import HelpTooltip from '../../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; import CodeSnippet from '../../../common/CodeSnippet'; import SentenceWithFilename from '../../components/SentenceWithFilename'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx index 2664493f4d1..fe6c15d88cf 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import FinishButton from '../../components/FinishButton'; import RenderOptions from '../../components/RenderOptions'; import { OSs } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx index 9a64daa0414..3db98dc4ed2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; export default function DotNetPrereqsMSBuild() { diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx index a68e7b1055b..708e4518ddc 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; export default function DotNetPrereqsScanner() { diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx index c805794317f..aad059d1c9b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; import { BuildTools, ManualTutorialConfig, OSs } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx index 0b782d55708..d7cf0a1ec1b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface DoneNextStepsProps { component: T.Component; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx index e1f666c9755..4dfcedaef7a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../common/InstanceMessage'; import ProjectAnalysisStep from './ProjectAnalysisStep'; import TokenStep from './TokenStep'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx index e82ae41c58d..10d35f2fd04 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Step from '../components/Step'; import { ManualTutorialConfig } from '../types'; import BuildToolForm from './BuildToolForm'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx index 3c109bcba50..02b53819950 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx @@ -20,12 +20,16 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button, DeleteButton, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { generateToken, getTokens, revokeToken } from '../../../api/user-tokens'; +import { + Button, + DeleteButton, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Step from '../components/Step'; import { getUniqueTokenName } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx index b180ee09174..f12c9486df2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx @@ -19,7 +19,12 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, click, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { + change, + click, + submit, + waitAndUpdate +} from '../../../../sonar-ui-common/helpers/testUtils'; import TokenStep from '../TokenStep'; jest.mock('../../../../api/user-tokens', () => ({ diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx index 1cb28a011d1..120757ccf6e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; +import { getHostUrl } from '../../../../sonar-ui-common/helpers/urls'; import { BuildTools, ManualTutorialConfig } from '../../types'; import ClangGCCCustom from './ClangGCCCommand'; import DotNet from './DotNet'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx index 9d74fe62b43..ba3b40b0650 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import { DotNetProps } from './DotNet'; import DotNetExecute from './DotNetExecute'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx index 56091251a9a..9d3daf27387 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import DoneNextSteps from '../DoneNextSteps'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx index 2542db69702..2f22d88b1ad 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { DotNetProps } from './DotNet'; import DotNetExecute from './DotNetExecute'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx index 0e8636b9763..d7c90aa69d2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../../sonar-ui-common/helpers/urls'; import { OSs } from '../../types'; export interface DownloadBuildWrapperProps { diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx index 81ef04c99b7..f30d9f50657 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { OSs } from '../../types'; interface Props { diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx index 677d22f2f77..57b60f8aaa2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import { OSs } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx index a3c2083ec34..ae71a14ddaa 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import { OSs } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx index 773148047c2..2a39fd02072 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import DoneNextSteps from '../DoneNextSteps'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx index d6e00ac2fbf..b934fa55c32 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import DoneNextSteps from '../DoneNextSteps'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx index b4687447326..ccd19e18c92 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx @@ -23,7 +23,7 @@ import { mockComponent } from '../../../../../helpers/testMocks'; import { BuildTools, OSs } from '../../../types'; import AnalysisCommand, { AnalysisCommandProps } from '../AnalysisCommand'; -jest.mock('sonar-ui-common/helpers/urls', () => ({ +jest.mock('../../../../../sonar-ui-common/helpers/urls', () => ({ getHostUrl: () => 'HOST' })); 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 5d1f705aaaa..3f7548db439 100644 --- a/server/sonar-web/src/main/js/components/ui/Avatar.tsx +++ b/server/sonar-web/src/main/js/components/ui/Avatar.tsx @@ -20,7 +20,7 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { connect } from 'react-redux'; -import GenericAvatar from 'sonar-ui-common/components/ui/GenericAvatar'; +import GenericAvatar from '../../sonar-ui-common/components/ui/GenericAvatar'; import { getGlobalSettingValue, Store } from '../../store/rootReducer'; interface Props { diff --git a/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx b/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx index 52b5601d4f0..a73ae9b4bd1 100644 --- a/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx +++ b/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; import { colors } from '../../app/theme'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const DonutChart = lazyLoadComponent( - () => import('sonar-ui-common/components/charts/DonutChart'), + () => import('../../sonar-ui-common/components/charts/DonutChart'), 'DonutChart' ); diff --git a/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx b/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx index 9c3fa5f8dea..8e2ac8ca4da 100644 --- a/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx +++ b/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import ClearIcon from 'sonar-ui-common/components/icons/ClearIcon'; -import { Alert, AlertProps } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { get, save } from 'sonar-ui-common/helpers/storage'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import ClearIcon from '../../sonar-ui-common/components/icons/ClearIcon'; +import { Alert, AlertProps } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import './DismissableAlert.css'; export interface DismissableAlertProps extends AlertProps { diff --git a/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx b/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx index 5af086cd941..4f20d315791 100644 --- a/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx +++ b/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; export interface PageShortcutsTooltipProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx b/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx index c371d5a0c19..2de4b43a827 100644 --- a/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx +++ b/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx @@ -20,15 +20,15 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import { save } from 'sonar-ui-common/helpers/storage'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import { save } from '../../../sonar-ui-common/helpers/storage'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import DismissableAlert, { DismissableAlertProps, DISMISSED_ALERT_STORAGE_KEY } from '../DismissableAlert'; -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn((_: string, suffix: string) => (suffix === 'bar' ? 'true' : undefined)), save: jest.fn() })); diff --git a/server/sonar-web/src/main/js/components/workspace/Workspace.tsx b/server/sonar-web/src/main/js/components/workspace/Workspace.tsx index cfd5f2415a0..80cb63af455 100644 --- a/server/sonar-web/src/main/js/components/workspace/Workspace.tsx +++ b/server/sonar-web/src/main/js/components/workspace/Workspace.tsx @@ -19,9 +19,9 @@ */ import { omit, uniqBy } from 'lodash'; import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { get, save } from 'sonar-ui-common/helpers/storage'; import { getRulesApp } from '../../api/rules'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import { ComponentDescriptor, RuleDescriptor, WorkspaceContext } from './context'; import './styles.css'; import WorkspacePortal from './WorkspacePortal'; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx index 10e55f2910b..4e2775c6c93 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { collapsePath } from 'sonar-ui-common/helpers/path'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import { collapsePath } from '../../sonar-ui-common/helpers/path'; import { ComponentDescriptor } from './context'; interface Props { diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx index 09b37d3b13a..a4ccc7cf640 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx @@ -20,9 +20,9 @@ import { debounce } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { getParents } from '../../api/components'; import { isPullRequest } from '../../helpers/branch-like'; +import { scrollToElement } from '../../sonar-ui-common/helpers/scrolling'; import { fetchBranchStatus } from '../../store/rootActions'; import { BranchLike } from '../../types/branch-like'; import SourceViewer from '../SourceViewer/SourceViewer'; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx index 51765517b08..c9c9a3adc9e 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { DraggableCore, DraggableData } from 'react-draggable'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import ClearIcon from 'sonar-ui-common/components/icons/ClearIcon'; -import CollapseIcon from 'sonar-ui-common/components/icons/CollapseIcon'; -import ExpandIcon from 'sonar-ui-common/components/icons/ExpandIcon'; -import { IconProps } from 'sonar-ui-common/components/icons/Icon'; -import MinimizeIcon from 'sonar-ui-common/components/icons/MinimizeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import ClearIcon from '../../sonar-ui-common/components/icons/ClearIcon'; +import CollapseIcon from '../../sonar-ui-common/components/icons/CollapseIcon'; +import ExpandIcon from '../../sonar-ui-common/components/icons/ExpandIcon'; +import { IconProps } from '../../sonar-ui-common/components/icons/Icon'; +import MinimizeIcon from '../../sonar-ui-common/components/icons/MinimizeIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface Props { children: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx index dd25f73f540..2b5c9cc85af 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; +import { ClearButton } from '../../sonar-ui-common/components/controls/buttons'; export interface Props { children: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx index 5c9a7fd6c96..f3782661cab 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx @@ -19,11 +19,11 @@ */ import { keyBy } from 'lodash'; import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; import { getRuleDetails, getRulesApp } from '../../api/rules'; import RuleDetailsDescription from '../../apps/coding-rules/components/RuleDetailsDescription'; import RuleDetailsMeta from '../../apps/coding-rules/components/RuleDetailsMeta'; import '../../apps/coding-rules/styles.css'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; interface Props { onLoad: (details: { name: string }) => void; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx index aaebd780f4c..a064ce29c62 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import LightBulbIcon from 'sonar-ui-common/components/icons/LightBulbIcon'; import { colors } from '../../app/theme'; +import LightBulbIcon from '../../sonar-ui-common/components/icons/LightBulbIcon'; import { RuleDescriptor } from './context'; interface Props { diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx index 1c203306601..89fce91ea1d 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { get, save } from 'sonar-ui-common/helpers/storage'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockBranch } from '../../../helpers/mocks/branch-like'; +import { get, save } from '../../../sonar-ui-common/helpers/storage'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../types/component'; import Workspace, { INITIAL_HEIGHT, @@ -31,7 +31,7 @@ import Workspace, { WorkspaceTypes } from '../Workspace'; -jest.mock('sonar-ui-common/helpers/storage', () => { +jest.mock('../../../sonar-ui-common/helpers/storage', () => { return { get: jest.fn(), save: jest.fn() diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx index 71b86bff688..1f2d8bd4617 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getParents } from '../../../api/components'; import { mockPullRequest } from '../../../helpers/mocks/branch-like'; import { mockIssue } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { Props, WorkspaceComponentViewer } from '../WorkspaceComponentViewer'; jest.mock('../../../api/components', () => ({ diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx index 6fbd53e06d3..70d05e9ca22 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import WorkspaceNavItem, { Props } from '../WorkspaceNavItem'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx index 955dedaf246..1e0e71078c6 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import WorkspaceRuleDetails from '../WorkspaceRuleDetails'; jest.mock('../../../api/rules', () => ({ |