SONAR-15297 Move all code from sonar-ui-common back to respective sonar-web folders

20 files changed, 59 insertions, 61 deletions

diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx
index c624bd1db93..c3c7d9ce91f 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx
@@ -25,10 +25,10 @@ import { getComponents, Project } from '../../api/components';
 import { changeProjectDefaultVisibility } from '../../api/permissions';
 import { getValues } from '../../api/settings';
 import Suggestions from '../../app/components/embed-docs-modal/Suggestions';
+import ListFooter from '../../components/controls/ListFooter';
+import { toShortNotSoISOString } from '../../helpers/dates';
+import { translate } from '../../helpers/l10n';
 import { hasGlobalPermission } from '../../helpers/users';
-import ListFooter from '../../sonar-ui-common/components/controls/ListFooter';
-import { toShortNotSoISOString } from '../../sonar-ui-common/helpers/dates';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
 import { getAppState, getCurrentUser, Store } from '../../store/rootReducer';
 import { Permissions } from '../../types/permissions';
 import { SettingsKey } from '../../types/settings';
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx
index 027ee59e33a..d6d90784353 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx
@@ -19,14 +19,14 @@
  */
 import * as React from 'react';
 import { bulkApplyTemplate, getPermissionTemplates } from '../../api/permissions';
-import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons';
-import Modal from '../../sonar-ui-common/components/controls/Modal';
-import Select from '../../sonar-ui-common/components/controls/Select';
-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 { toNotSoISOString } from '../../sonar-ui-common/helpers/dates';
-import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n';
+import { ResetButtonLink, SubmitButton } from '../../components/controls/buttons';
+import Modal from '../../components/controls/Modal';
+import Select from '../../components/controls/Select';
+import { Alert } from '../../components/ui/Alert';
+import MandatoryFieldMarker from '../../components/ui/MandatoryFieldMarker';
+import MandatoryFieldsExplanation from '../../components/ui/MandatoryFieldsExplanation';
+import { toNotSoISOString } from '../../helpers/dates';
+import { translate, translateWithParameters } from '../../helpers/l10n';
 
 export interface Props {
   analyzedBefore: Date | undefined;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx
index 4c38ce4f1d0..06fe0785b93 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx
@@ -18,11 +18,11 @@
  * 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 Modal from '../../sonar-ui-common/components/controls/Modal';
-import Radio from '../../sonar-ui-common/components/controls/Radio';
-import { Alert } from '../../sonar-ui-common/components/ui/Alert';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
+import { Button, ResetButtonLink } from '../../components/controls/buttons';
+import Modal from '../../components/controls/Modal';
+import Radio from '../../components/controls/Radio';
+import { Alert } from '../../components/ui/Alert';
+import { translate } from '../../helpers/l10n';
 
 export interface Props {
   defaultVisibility: T.Visibility;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx
index 15c93000141..eeb7e424efe 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx
@@ -22,13 +22,13 @@ import { FormattedMessage } from 'react-intl';
 import { Link } from 'react-router';
 import { createProject } from '../../api/components';
 import VisibilitySelector from '../../components/common/VisibilitySelector';
+import { ResetButtonLink, SubmitButton } from '../../components/controls/buttons';
+import Modal from '../../components/controls/Modal';
+import { Alert } from '../../components/ui/Alert';
+import MandatoryFieldMarker from '../../components/ui/MandatoryFieldMarker';
+import MandatoryFieldsExplanation from '../../components/ui/MandatoryFieldsExplanation';
+import { translate } from '../../helpers/l10n';
 import { getProjectUrl } from '../../helpers/urls';
-import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons';
-import Modal from '../../sonar-ui-common/components/controls/Modal';
-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 {
   defaultProjectVisibility?: T.Visibility;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx
index 66e3d015a7d..9fa913a0c47 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx
@@ -19,11 +19,11 @@
  */
 import * as React from 'react';
 import { bulkDeleteProjects } from '../../api/components';
-import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons';
-import Modal from '../../sonar-ui-common/components/controls/Modal';
-import { Alert } from '../../sonar-ui-common/components/ui/Alert';
-import { toNotSoISOString } from '../../sonar-ui-common/helpers/dates';
-import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n';
+import { ResetButtonLink, SubmitButton } from '../../components/controls/buttons';
+import Modal from '../../components/controls/Modal';
+import { Alert } from '../../components/ui/Alert';
+import { toNotSoISOString } from '../../helpers/dates';
+import { translate, translateWithParameters } from '../../helpers/l10n';
 
 export interface Props {
   analyzedBefore: Date | undefined;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx
index ba9e78aee19..186366ffc0f 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { Button, EditButton } from '../../sonar-ui-common/components/controls/buttons';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
+import { Button, EditButton } from '../../components/controls/buttons';
+import { translate } from '../../helpers/l10n';
 import ChangeDefaultVisibilityForm from './ChangeDefaultVisibilityForm';
 
 export interface Props {
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx
index 767495017dc..6bcb30683f8 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx
@@ -21,11 +21,11 @@ import * as React from 'react';
 import { Link } from 'react-router';
 import { Project } from '../../api/components';
 import PrivacyBadgeContainer from '../../components/common/PrivacyBadgeContainer';
+import Checkbox from '../../components/controls/Checkbox';
+import Tooltip from '../../components/controls/Tooltip';
+import QualifierIcon from '../../components/icons/QualifierIcon';
+import DateFormatter from '../../components/intl/DateFormatter';
 import { getComponentOverviewUrl } from '../../helpers/urls';
-import Checkbox from '../../sonar-ui-common/components/controls/Checkbox';
-import Tooltip from '../../sonar-ui-common/components/controls/Tooltip';
-import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon';
-import DateFormatter from '../../sonar-ui-common/components/intl/DateFormatter';
 import './ProjectRow.css';
 import ProjectRowActions from './ProjectRowActions';
 
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx
index 69f808ff22e..8110759fa59 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx
@@ -20,12 +20,10 @@
 import * as React from 'react';
 import { Project } from '../../api/components';
 import { getComponentNavigation } from '../../api/nav';
+import ActionsDropdown, { ActionsDropdownItem } from '../../components/controls/ActionsDropdown';
+import DeferredSpinner from '../../components/ui/DeferredSpinner';
+import { translate } from '../../helpers/l10n';
 import { getComponentPermissionsUrl } from '../../helpers/urls';
-import ActionsDropdown, {
-  ActionsDropdownItem
-} from '../../sonar-ui-common/components/controls/ActionsDropdown';
-import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
 import ApplyTemplate from '../permissions/project/components/ApplyTemplate';
 import RestoreAccessModal from './RestoreAccessModal';
 
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx
index 3a40b6806b4..60a2ed2f579 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx
@@ -20,7 +20,7 @@
 import * as classNames from 'classnames';
 import * as React from 'react';
 import { Project } from '../../api/components';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
+import { translate } from '../../helpers/l10n';
 import ProjectRow from './ProjectRow';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx
index 562a38942ad..c651f31e4c5 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx
@@ -21,9 +21,9 @@ import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Project } from '../../api/components';
 import { grantPermissionToUser } from '../../api/permissions';
-import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons';
-import Modal from '../../sonar-ui-common/components/controls/Modal';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
+import { ResetButtonLink, SubmitButton } from '../../components/controls/buttons';
+import Modal from '../../components/controls/Modal';
+import { translate } from '../../helpers/l10n';
 
 interface Props {
   currentUser: Pick<T.LoggedInUser, 'login'>;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx
index b0625038a14..fbf0c4558f2 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx
@@ -20,14 +20,14 @@
 import { sortBy } from 'lodash';
 import * as React from 'react';
 import { Project } from '../../api/components';
+import { Button } from '../../components/controls/buttons';
+import Checkbox from '../../components/controls/Checkbox';
 import DateInput from '../../components/controls/DateInput';
-import { Button } from '../../sonar-ui-common/components/controls/buttons';
-import Checkbox from '../../sonar-ui-common/components/controls/Checkbox';
-import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip';
-import SearchBox from '../../sonar-ui-common/components/controls/SearchBox';
-import Select from '../../sonar-ui-common/components/controls/Select';
-import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon';
-import { translate } from '../../sonar-ui-common/helpers/l10n';
+import HelpTooltip from '../../components/controls/HelpTooltip';
+import SearchBox from '../../components/controls/SearchBox';
+import Select from '../../components/controls/Select';
+import QualifierIcon from '../../components/icons/QualifierIcon';
+import { translate } from '../../helpers/l10n';
 import BulkApplyTemplateModal from './BulkApplyTemplateModal';
 import DeleteModal from './DeleteModal';
 
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx
index 5d66104f58c..be92a02befa 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx
@@ -23,7 +23,7 @@ import { getComponents } from '../../../api/components';
 import { changeProjectDefaultVisibility } from '../../../api/permissions';
 import { getValues } from '../../../api/settings';
 import { mockAppState, mockLoggedInUser } from '../../../helpers/testMocks';
-import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
+import { waitAndUpdate } from '../../../helpers/testUtils';
 import { App, Props } from '../App';
 import Search from '../Search';
 
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx
index 647aab9334c..81f90d0c9bd 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx
@@ -19,8 +19,8 @@
  */
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { parseDate } from '../../../sonar-ui-common/helpers/dates';
-import { click, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
+import { parseDate } from '../../../helpers/dates';
+import { click, waitAndUpdate } from '../../../helpers/testUtils';
 import BulkApplyTemplateModal, { Props } from '../BulkApplyTemplateModal';
 
 jest.mock('../../../api/permissions', () => ({
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx
index 0b9a405c4ce..b8d381ebb39 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx
@@ -19,8 +19,8 @@
  */
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import Radio from '../../../sonar-ui-common/components/controls/Radio';
-import { click } from '../../../sonar-ui-common/helpers/testUtils';
+import Radio from '../../../components/controls/Radio';
+import { click } from '../../../helpers/testUtils';
 import ChangeDefaultVisibilityForm from '../ChangeDefaultVisibilityForm';
 
 it('closes', () => {
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx
index ab62bb13fb4..4e3c40dee58 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx
@@ -26,7 +26,7 @@ jest.mock('../../../api/components', () => ({
 
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { change, submit, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
+import { change, submit, waitAndUpdate } from '../../../helpers/testUtils';
 import CreateProjectForm from '../CreateProjectForm';
 
 const createProject = require('../../../api/components').createProject as jest.Mock<any>;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx
index 0f7d0062043..46b525fbb05 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx
@@ -24,8 +24,8 @@ jest.mock('../../../api/components', () => ({
 
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { parseDate } from '../../../sonar-ui-common/helpers/dates';
-import { click } from '../../../sonar-ui-common/helpers/testUtils';
+import { parseDate } from '../../../helpers/dates';
+import { click } from '../../../helpers/testUtils';
 import DeleteModal, { Props } from '../DeleteModal';
 
 const bulkDeleteProjects = require('../../../api/components').bulkDeleteProjects as jest.Mock<any>;
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx
index e50560a61cf..c67e81e0cf6 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-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 Header, { Props } from '../Header';
 
 jest.mock('../../../helpers/system', () => ({ isSonarCloud: jest.fn().mockReturnValue(false) }));
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx
index 09163cf0930..3356b769755 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx
@@ -21,7 +21,7 @@ import { shallow } from 'enzyme';
 import * as React from 'react';
 import { getComponentNavigation } from '../../../api/nav';
 import { mockLoggedInUser } from '../../../helpers/testMocks';
-import { click, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
+import { click, waitAndUpdate } from '../../../helpers/testUtils';
 import ProjectRowActions, { Props } from '../ProjectRowActions';
 
 jest.mock('../../../api/nav', () => ({
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx
index c215f55bb1c..a2e3ce57d66 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-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 Search, { Props } from '../Search';
 
 it('renders', () => {
diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts b/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts
index a823184781c..3af374600fb 100644
--- a/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts
+++ b/server/sonar-web/src/main/js/apps/projectsManagement/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 = [
   {