diff options
author | Wouter Admiraal <wouter.admiraal@sonarsource.com> | 2021-08-19 12:49:11 +0200 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2021-08-20 20:03:09 +0000 |
commit | 6f17541395dcedb52fe54e7755be95f2e5941086 (patch) | |
tree | ce3d742aee2af87e018c193c97eea5e7fc81a4e5 /server/sonar-web/src/main/js/apps/documentation | |
parent | 4ce76b5cde3ee915a6c45bfa452e0c7c61c642a5 (diff) | |
download | sonarqube-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/documentation')
8 files changed, 16 insertions, 16 deletions
diff --git a/server/sonar-web/src/main/js/apps/documentation/components/App.tsx b/server/sonar-web/src/main/js/apps/documentation/components/App.tsx index a8d8423fb78..c7847f7656c 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/App.tsx @@ -28,11 +28,11 @@ import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import NotFound from '../../../app/components/NotFound'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; import DocMarkdownBlock from '../../../components/docs/DocMarkdownBlock'; +import DeferredSpinner from '../../../components/ui/DeferredSpinner'; +import { translate } from '../../../helpers/l10n'; import { ParsedContent, separateFrontMatter } from '../../../helpers/markdown'; -import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from '../../../sonar-ui-common/helpers/l10n'; -import { addSideBarClass, removeSideBarClass } from '../../../sonar-ui-common/helpers/pages'; -import { isDefined } from '../../../sonar-ui-common/helpers/types'; +import { addSideBarClass, removeSideBarClass } from '../../../helpers/pages'; +import { isDefined } from '../../../helpers/types'; import { InstalledPlugin, PluginType } from '../../../types/plugins'; import { getUrlsList } from '../navTreeUtils'; import getPages from '../pages'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx b/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx index 2ad79cbcf6c..fb51d62654e 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import { DocNavigationItem, DocsNavigationBlock } from 'Docs/@types/types'; import * as React from 'react'; -import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; -import OpenCloseIcon from '../../../sonar-ui-common/components/icons/OpenCloseIcon'; +import { ButtonLink } from '../../../components/controls/buttons'; +import OpenCloseIcon from '../../../components/icons/OpenCloseIcon'; import { isDocsNavigationBlock } from '../navTreeUtils'; import { DocumentationEntry, getNodeFromUrl } from '../utils'; import { MenuItem } from './MenuItem'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx b/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx index cc92fa60f99..5eb1d5de655 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import DetachIcon from '../../../components/icons/DetachIcon'; interface Props { title: string; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx b/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx index 23b19e45a08..4ec73f848d3 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx @@ -21,7 +21,7 @@ import { DocNavigationItem } from 'Docs/@types/types'; import { sortBy } from 'lodash'; import lunr, { LunrBuilder, LunrIndex, LunrToken } from 'lunr'; import * as React from 'react'; -import { isDefined } from '../../../sonar-ui-common/helpers/types'; +import { isDefined } from '../../../helpers/types'; import { getUrlsList } from '../navTreeUtils'; import { DocumentationEntry } from '../utils'; import SearchResultEntry from './SearchResultEntry'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx b/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx index 869f0b7f22c..69cae6bc2f8 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx @@ -19,7 +19,7 @@ */ import { DocNavigationItem } from 'Docs/@types/types'; import * as React from 'react'; -import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import SearchBox from '../../../components/controls/SearchBox'; import { DocumentationEntry } from '../utils'; import Menu from './Menu'; import SearchResults from './SearchResults'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx index f48ac2be598..1c18bcb3437 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { addSideBarClass, removeSideBarClass } from '../../../../sonar-ui-common/helpers/pages'; -import { request } from '../../../../sonar-ui-common/helpers/request'; -import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; +import { addSideBarClass, removeSideBarClass } from '../../../../helpers/pages'; +import { request } from '../../../../helpers/request'; +import { waitAndUpdate } from '../../../../helpers/testUtils'; import { InstalledPlugin } from '../../../../types/plugins'; import getPages from '../../pages'; import App from '../App'; @@ -51,12 +51,12 @@ jest.mock('Docs/../static/SonarQubeNavigationTree.json', () => ({ ] })); -jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../helpers/pages', () => ({ addSideBarClass: jest.fn(), removeSideBarClass: jest.fn() })); -jest.mock('../../../../sonar-ui-common/helpers/request', () => { +jest.mock('../../../../helpers/request', () => { const { mockDocumentationMarkdown } = jest.requireActual('../../../../helpers/testMocks'); return { request: jest.fn(() => ({ diff --git a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx index a2b0ed72248..22e19b5b9a5 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-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 '../../../../helpers/testUtils'; import MenuBlock from '../MenuBlock'; it('should render a closed menu block', () => { diff --git a/server/sonar-web/src/main/js/apps/documentation/routes.ts b/server/sonar-web/src/main/js/apps/documentation/routes.ts index 76cfc03421d..7b420fd6754 100644 --- a/server/sonar-web/src/main/js/apps/documentation/routes.ts +++ b/server/sonar-web/src/main/js/apps/documentation/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 App = lazyLoadComponent(() => import(/* webpackChunkName: "docs" */ './components/App')); |