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/apps/create | |
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/apps/create')
37 files changed, 118 insertions, 118 deletions
diff --git a/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx b/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx index 8f530ee5b12..bb0c910676d 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx @@ -20,11 +20,11 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance } from '../../../types/alm-settings'; export interface AzurePersonalAccessTokenFormProps { diff --git a/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx b/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx index faced4d512c..26deef49616 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx @@ -21,15 +21,15 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getProjectUrl } from '../../../helpers/urls'; +import BoxedGroupAccordion from '../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AzureProject, AzureRepository } from '../../../types/alm-integration'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx index 9d0ff0ac8d8..200a39df833 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.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 SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -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 { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +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 { AzureProject, AzureRepository } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import AzurePersonalAccessTokenForm from './AzurePersonalAccessTokenForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx b/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx index 46816bd8d59..9cc222d1636 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AzureProject, AzureRepository } from '../../../types/alm-integration'; import AzureProjectAccordion from './AzureProjectAccordion'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx index f9568ebd179..41c342bdcf0 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.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 { BitbucketCloudRepository } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import BitbucketCloudSearchForm from './BitbucketCloudSearchForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx index b97c2b57d45..18239e73af1 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx @@ -20,17 +20,17 @@ 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 SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -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 { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +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 { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BitbucketCloudRepository } from '../../../types/alm-integration'; import { ComponentQualifier } from '../../../types/component'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx index e6673eb9782..2f1c1d22bf3 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketProjectRepositories, diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx index 150a25f2160..dcc00be8cff 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx @@ -21,13 +21,13 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getProjectUrl } from '../../../helpers/urls'; +import BoxedGroupAccordion from '../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketRepository } from '../../../types/alm-integration'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx index 50694a2b665..83554586735 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.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 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 { Button } from '../../../sonar-ui-common/components/controls/buttons'; +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 { BitbucketProject, BitbucketProjectRepositories, diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx index b0771758242..de3c1324d18 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx @@ -19,8 +19,8 @@ */ import { uniq, without } from 'lodash'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketProjectRepositories, diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx index 1d9b7f7cd86..bf441e280ec 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx @@ -18,9 +18,9 @@ * 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 DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketRepository } from '../../../types/alm-integration'; import BitbucketProjectAccordion from './BitbucketProjectAccordion'; diff --git a/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx b/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx index 6d3fc17a105..9f89d514d6c 100644 --- a/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import ChevronsIcon from 'sonar-ui-common/components/icons/ChevronsIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { withAppState } from '../../../components/hoc/withAppState'; +import ChevronsIcon from '../../../sonar-ui-common/components/icons/ChevronsIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AlmKeys } from '../../../types/alm-settings'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx b/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx index 70747ecd634..f91c074812a 100644 --- a/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx @@ -20,12 +20,12 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { WithRouterProps } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getAlmSettings } from '../../../api/alm-settings'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import { whenLoggedIn } from '../../../components/hoc/whenLoggedIn'; import { withAppState } from '../../../components/hoc/withAppState'; import { getProjectUrl } from '../../../helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import AlmBindingDefinitionForm from '../../settings/components/almIntegration/AlmBindingDefinitionForm'; import AzureProjectCreate from './AzureProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx index ece5a41f4ce..7a404c935e9 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx @@ -20,13 +20,13 @@ import { debounce } from 'lodash'; import * as React from 'react'; import { WithRouterProps } from 'react-router'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; import { getGithubClientId, getGithubOrganizations, getGithubRepositories, importGithubRepository } from '../../../api/alm-integrations'; +import { getHostUrl } from '../../../sonar-ui-common/helpers/urls'; import { GithubOrganization, GithubRepository } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import GitHubProjectCreateRenderer from './GitHubProjectCreateRenderer'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx index 35e82d7322a..2a6bf0edcbb 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx @@ -20,19 +20,19 @@ 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 ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getBaseUrl } from '../../../helpers/system'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import SearchSelect from '../../../sonar-ui-common/components/controls/SearchSelect'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { GithubOrganization, GithubRepository } from '../../../types/alm-integration'; import { ComponentQualifier } from '../../../types/component'; import CreateProjectPageHeader from './CreateProjectPageHeader'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx index 25795300b5b..26025cc6e76 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.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 { GitlabProject } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import CreateProjectPageHeader from './CreateProjectPageHeader'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx index 7ab9a59b924..fb9a6b5a045 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx @@ -20,17 +20,17 @@ 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 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 CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +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 CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { GitlabProject } from '../../../types/alm-integration'; import { ComponentQualifier } from '../../../types/component'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx b/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx index 85bf0e190a5..5150e25d1f9 100644 --- a/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx @@ -20,15 +20,15 @@ import * as classNames from 'classnames'; import { debounce } from 'lodash'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createProject, doesComponentExists } from '../../../api/components'; import ProjectKeyInput from '../../../components/common/ProjectKeyInput'; import { PROJECT_KEY_INVALID_CHARACTERS, validateProjectKey } from '../../../helpers/projects'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ProjectKeyValidationResult } from '../../../types/component'; import { PROJECT_NAME_MAX_LEN } from './constants'; import CreateProjectPageHeader from './CreateProjectPageHeader'; diff --git a/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx b/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx index 9d82f6be75f..6f82c135653 100644 --- a/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx @@ -20,16 +20,16 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -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 { checkPersonalAccessTokenIsValid, setAlmPersonalAccessToken } from '../../../api/alm-integrations'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +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 { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx b/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx index 670a81e7d42..d60551a35f4 100644 --- a/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx @@ -20,9 +20,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 { getGlobalSettingsUrl } from '../../../helpers/urls'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import { ALM_INTEGRATION } from '../../settings/components/AdditionalCategoryKeys'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx index 820f2428514..51740e63712 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { change, submit } from 'sonar-ui-common/helpers/testUtils'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import { change, submit } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import AzurePersonalAccessTokenForm, { AzurePersonalAccessTokenFormProps diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx index e7ff10e54e2..d75707cb429 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import Radio from 'sonar-ui-common/components/controls/Radio'; import { mockAzureProject, mockAzureRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockEvent } from '../../../../helpers/testMocks'; +import BoxedGroupAccordion from '../../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; import AzureProjectAccordion, { AzureProjectAccordionProps } from '../AzureProjectAccordion'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx index b9ac65d6d02..bac8a0b607c 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx @@ -20,7 +20,6 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { checkPersonalAccessTokenIsValid, getAzureProjects, @@ -32,6 +31,7 @@ import { import { mockAzureProject, mockAzureRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import AzureProjectCreate from '../AzureProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx index 6b3ada7adb4..45871211fb2 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; import { mockAzureProject, mockAzureRepository } from '../../../../helpers/mocks/alm-integrations'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; import AzureProjectAccordion from '../AzureProjectAccordion'; import AzureProjectsList, { AzureProjectsListProps } from '../AzureProjectsList'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx index aac602992b7..c06c5a9c675 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { importBitbucketCloudRepository, searchForBitbucketCloudRepositories @@ -27,6 +26,7 @@ import { import { mockBitbucketCloudRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockBitbucketCloudAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BitbucketCloudProjectCreate, { BITBUCKET_CLOUD_PROJECTS_PAGESIZE } from '../BitbucketCloudProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx index 702e6134058..9fd4b31172e 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx @@ -20,12 +20,12 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { change } from 'sonar-ui-common/helpers/testUtils'; import { mockBitbucketProject, mockBitbucketRepository } from '../../../../helpers/mocks/alm-integrations'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; +import { change } from '../../../../sonar-ui-common/helpers/testUtils'; import BitbucketImportRepositoryForm, { BitbucketImportRepositoryFormProps } from '../BitbucketImportRepositoryForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx index 671cfa4fdc0..8d1f7062a79 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx @@ -20,11 +20,11 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; import { mockBitbucketProject, mockBitbucketRepository } from '../../../../helpers/mocks/alm-integrations'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; import BitbucketProjectAccordion, { BitbucketProjectAccordionProps } from '../BitbucketProjectAccordion'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx index b9ea23c639d..bd13b29af8f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getBitbucketServerProjects, getBitbucketServerRepositories, @@ -32,6 +31,7 @@ import { } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import BitbucketProjectCreate from '../BitbucketProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx index 87cdc788213..49a5236e56c 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx @@ -20,11 +20,11 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockBitbucketProject, mockBitbucketRepository } from '../../../../helpers/mocks/alm-integrations'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import BitbucketProjectAccordion from '../BitbucketProjectAccordion'; import BitbucketRepositories, { BitbucketRepositoriesProps } from '../BitbucketRepositories'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx index b0633d92c74..7dc3b94019d 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-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 { AlmKeys } from '../../../../types/alm-settings'; import { CreateProjectModeSelection, diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx index 2845ff4d050..ca4d3f3337f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getAlmSettings } from '../../../../api/alm-settings'; import { mockLocation, mockLoggedInUser, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import AlmBindingDefinitionForm from '../../../settings/components/almIntegration/AlmBindingDefinitionForm'; import CreateProjectModeSelection from '../CreateProjectModeSelection'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx index c5c5c97dfff..a8647296957 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getGithubClientId, getGithubOrganizations, @@ -29,6 +28,7 @@ import { import { mockGitHubRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import GitHubProjectCreate from '../GitHubProjectCreate'; jest.mock('../../../../api/alm-integrations', () => ({ diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx index a3cd7679412..997c309ee5e 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; import { mockGitHubRepository } from '../../../../helpers/mocks/alm-integrations'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; +import SearchSelect from '../../../../sonar-ui-common/components/controls/SearchSelect'; import { GithubOrganization } from '../../../../types/alm-integration'; import GitHubProjectCreateRenderer, { GitHubProjectCreateRendererProps diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx index 60474b4695c..56bfc8ef52f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getGitlabProjects, importGitlabProject } from '../../../../api/alm-integrations'; import { mockGitlabProject } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import GitlabProjectCreate from '../GitlabProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx index 027ef23dc6d..446508109ef 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; import { mockGitlabProject } from '../../../../helpers/mocks/alm-integrations'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; import GitlabProjectSelectionForm, { GitlabProjectSelectionFormProps } from '../GitlabProjectSelectionForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx index 28d38847477..42417a3c2dc 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx @@ -20,13 +20,13 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createProject, doesComponentExists } from '../../../../api/components'; import ProjectKeyInput from '../../../../components/common/ProjectKeyInput'; import { validateProjectKey } from '../../../../helpers/projects'; import { mockEvent } from '../../../../helpers/testMocks'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../../sonar-ui-common/components/controls/ValidationInput'; +import { change, submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ProjectKeyValidationResult } from '../../../../types/component'; import { PROJECT_NAME_MAX_LEN } from '../constants'; import ManualProjectCreate from '../ManualProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx index f8d55114a1e..082039b0a93 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { checkPersonalAccessTokenIsValid, setAlmPersonalAccessToken @@ -29,6 +27,8 @@ import { mockAlmSettingsInstance, mockBitbucketCloudAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import { change, submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import PersonalAccessTokenForm from '../PersonalAccessTokenForm'; |