aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/apps/about
diff options
context:
space:
mode:
authorWouter Admiraal <wouter.admiraal@sonarsource.com>2021-08-19 12:49:11 +0200
committersonartech <sonartech@sonarsource.com>2021-08-20 20:03:09 +0000
commit6f17541395dcedb52fe54e7755be95f2e5941086 (patch)
treece3d742aee2af87e018c193c97eea5e7fc81a4e5 /server/sonar-web/src/main/js/apps/about
parent4ce76b5cde3ee915a6c45bfa452e0c7c61c642a5 (diff)
downloadsonarqube-6f17541395dcedb52fe54e7755be95f2e5941086.tar.gz
sonarqube-6f17541395dcedb52fe54e7755be95f2e5941086.zip
SONAR-15297 Move all code from sonar-ui-common back to respective sonar-web folders
Diffstat (limited to 'server/sonar-web/src/main/js/apps/about')
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx10
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx10
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx6
-rw-r--r--server/sonar-web/src/main/js/apps/about/routes.ts2
13 files changed, 27 insertions, 27 deletions
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx
index 869aecc4e12..56096b2673d 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx
@@ -28,9 +28,9 @@ import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget';
import withIndexationContext, {
WithIndexationContextProps
} from '../../../components/hoc/withIndexationContext';
+import { translate } from '../../../helpers/l10n';
+import { addWhitePageClass, removeWhitePageClass } from '../../../helpers/pages';
import { sanitizeString } from '../../../helpers/sanitize';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
-import { addWhitePageClass, removeWhitePageClass } from '../../../sonar-ui-common/helpers/pages';
import {
getAppState,
getCurrentUser,
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx
index ab8ece04b32..06c3895fda8 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.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 '../../../helpers/l10n';
import ReadMore from './ReadMore';
const link = '/documentation/user-guide/issues/';
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx
index 7ae2dd95bc8..dec68ff5227 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.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 '../../../helpers/l10n';
const languages = [
{ name: 'Java', url: 'https://redirect.sonarsource.com/plugins/java.html' },
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx
index 3a3ec8f27e0..5866a83a6db 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.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 '../../../helpers/l10n';
import ReadMore from './ReadMore';
const link = '/documentation/user-guide/clean-as-you-code/';
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx
index d071cfe88fc..c9d745e20f1 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx
@@ -19,8 +19,8 @@
*/
import * as React from 'react';
import { Link } from 'react-router';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
-import { formatMeasure } from '../../../sonar-ui-common/helpers/measures';
+import { translate } from '../../../helpers/l10n';
+import { formatMeasure } from '../../../helpers/measures';
interface Props {
count: number;
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx
index a491da67517..f97c42ab4b0 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.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 '../../../helpers/l10n';
import ReadMore from './ReadMore';
const link = '/documentation/user-guide/quality-gates/';
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx
index f80bf8ee117..d2a97c43087 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx
@@ -18,11 +18,11 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
-import BugIcon from '../../../sonar-ui-common/components/icons/BugIcon';
-import CodeSmellIcon from '../../../sonar-ui-common/components/icons/CodeSmellIcon';
-import SecurityHotspotIcon from '../../../sonar-ui-common/components/icons/SecurityHotspotIcon';
-import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
+import BugIcon from '../../../components/icons/BugIcon';
+import CodeSmellIcon from '../../../components/icons/CodeSmellIcon';
+import SecurityHotspotIcon from '../../../components/icons/SecurityHotspotIcon';
+import VulnerabilityIcon from '../../../components/icons/VulnerabilityIcon';
+import { translate } from '../../../helpers/l10n';
export default function AboutQualityModel() {
return (
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx
index a9db3de495e..bcbd9f92f57 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx
@@ -19,8 +19,8 @@
*/
import * as React from 'react';
import { Link } from 'react-router';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
-import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls';
+import { translate } from '../../../helpers/l10n';
+import { getBaseUrl } from '../../../helpers/urls';
const scanners = [
{
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx
index b39e7230cf8..b756bdbf0d4 100644
--- a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx
@@ -19,9 +19,9 @@
*/
import * as React from 'react';
import { Link } from 'react-router';
+import TagsIcon from '../../../components/icons/TagsIcon';
+import { translate } from '../../../helpers/l10n';
import { getRulesUrl } from '../../../helpers/urls';
-import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
import ReadMore from './ReadMore';
const link = '/documentation/user-guide/rules/';
diff --git a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx
index a7db1eb714d..7f3e3f06d03 100644
--- a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx
@@ -19,12 +19,12 @@
*/
import * as React from 'react';
import { Link } from 'react-router';
+import BugIcon from '../../../components/icons/BugIcon';
+import CodeSmellIcon from '../../../components/icons/CodeSmellIcon';
+import VulnerabilityIcon from '../../../components/icons/VulnerabilityIcon';
+import { translate } from '../../../helpers/l10n';
+import { formatMeasure } from '../../../helpers/measures';
import { getIssuesUrl } from '../../../helpers/urls';
-import BugIcon from '../../../sonar-ui-common/components/icons/BugIcon';
-import CodeSmellIcon from '../../../sonar-ui-common/components/icons/CodeSmellIcon';
-import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
-import { formatMeasure } from '../../../sonar-ui-common/helpers/measures';
export interface EntryIssueTypesProps {
bugs?: number;
diff --git a/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx b/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx
index e5cc42affa0..9cd05e74d7c 100644
--- a/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx
@@ -19,7 +19,7 @@
*/
import * as React from 'react';
import { Link } from 'react-router';
-import { translate } from '../../../sonar-ui-common/helpers/l10n';
+import { translate } from '../../../helpers/l10n';
interface Props {
link: string;
diff --git a/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx b/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx
index d9949372460..56da775ca17 100644
--- a/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx
+++ b/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx
@@ -21,13 +21,13 @@ import { shallow } from 'enzyme';
import * as React from 'react';
import { searchProjects } from '../../../../api/components';
import { getFacet } from '../../../../api/issues';
+import { addWhitePageClass, removeWhitePageClass } from '../../../../helpers/pages';
import { mockCurrentUser, mockLocation } from '../../../../helpers/testMocks';
-import { addWhitePageClass, removeWhitePageClass } from '../../../../sonar-ui-common/helpers/pages';
-import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils';
+import { waitAndUpdate } from '../../../../helpers/testUtils';
import { AboutApp } from '../AboutApp';
import EntryIssueTypes from '../EntryIssueTypes';
-jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({
+jest.mock('../../../../helpers/pages', () => ({
addWhitePageClass: jest.fn(),
removeWhitePageClass: jest.fn()
}));
diff --git a/server/sonar-web/src/main/js/apps/about/routes.ts b/server/sonar-web/src/main/js/apps/about/routes.ts
index 1efdc06f832..78799c787b0 100644
--- a/server/sonar-web/src/main/js/apps/about/routes.ts
+++ b/server/sonar-web/src/main/js/apps/about/routes.ts
@@ -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 '../../components/lazyLoadComponent';
const routes = [
{ indexRoute: { component: lazyLoadComponent(() => import('./components/AboutApp')) } }