SONAR-15297 Move sonar-ui-common code to sonar-web

16 files changed, 43 insertions, 41 deletions

diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx
index 317505e466d..f447f649b1e 100644
--- a/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.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 { Application } from '../../types/application';
 import ApplicationProjectBranch from './ApplicationProjectBranch';
 import CreateBranchForm from './CreateBranchForm';
diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx
index d089107e86c..dc908a24db6 100644
--- a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx
@@ -20,9 +20,9 @@
 import { Location } from 'history';
 import * as React from 'react';
 import { InjectedRouter } from 'react-router';
-import { translate } from 'sonar-ui-common/helpers/l10n';
 import { editApplication, getApplicationDetails, refreshApplication } from '../../api/application';
 import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage';
+import { translate } from '../../sonar-ui-common/helpers/l10n';
 import { Application, ApplicationProject } from '../../types/application';
 import ApplicationConsoleAppRenderer from './ApplicationConsoleAppRenderer';
 import { ApplicationBranch } from './utils';
diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx
index e5465cbc439..4b3319244d8 100644
--- a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.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 { Application, ApplicationProject } from '../../types/application';
 import { Branch } from '../../types/branch-like';
 import ApplicationBranches from './ApplicationBranches';
diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx
index 065d3d02e45..bfc6edb8c39 100644
--- a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx
@@ -18,8 +18,8 @@
  * 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 { translate } from 'sonar-ui-common/helpers/l10n';
+import BranchIcon from '../../sonar-ui-common/components/icons/BranchIcon';
+import { translate } from '../../sonar-ui-common/helpers/l10n';
 import { Application } from '../../types/application';
 import BranchRowActions from './BranchRowActions';
 import { ApplicationBranch } from './utils';
diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx
index d9f3d409174..ed48c688cea 100644
--- a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx
@@ -19,16 +19,16 @@
  */
 import { find, without } from 'lodash';
 import * as React from 'react';
-import SelectList, {
-  SelectListFilter,
-  SelectListSearchParams
-} from 'sonar-ui-common/components/controls/SelectList';
-import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon';
 import {
   addProjectToApplication,
   getApplicationProjects,
   removeProjectFromApplication
 } from '../../api/application';
+import SelectList, {
+  SelectListFilter,
+  SelectListSearchParams
+} from '../../sonar-ui-common/components/controls/SelectList';
+import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon';
 import { Application, ApplicationProject } from '../../types/application';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx b/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx
index 8cd2141eac1..884c8010db5 100644
--- a/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx
@@ -19,12 +19,12 @@
  */
 import { without } from 'lodash';
 import * as React from 'react';
+import { deleteApplicationBranch } from '../../api/application';
 import ActionsDropdown, {
   ActionsDropdownItem
-} from 'sonar-ui-common/components/controls/ActionsDropdown';
-import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton';
-import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n';
-import { deleteApplicationBranch } from '../../api/application';
+} from '../../sonar-ui-common/components/controls/ActionsDropdown';
+import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton';
+import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n';
 import { Application } from '../../types/application';
 import CreateBranchForm from './CreateBranchForm';
 import { ApplicationBranch } from './utils';
diff --git a/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx b/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx
index 80433c8d834..0f133fe0d91 100644
--- a/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.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 BranchIcon from 'sonar-ui-common/components/icons/BranchIcon';
+import Tooltip from '../../sonar-ui-common/components/controls/Tooltip';
+import BranchIcon from '../../sonar-ui-common/components/icons/BranchIcon';
 
 export interface Option {
   label: string;
diff --git a/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx b/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx
index c040d48a798..17ccbc37106 100644
--- a/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx
@@ -19,17 +19,17 @@
  */
 import { some, without } from 'lodash';
 import * as React from 'react';
-import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons';
-import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal';
-import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner';
-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 {
   addApplicationBranch,
   getApplicationDetails,
   updateApplicationBranch
 } from '../../api/application';
+import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons';
+import SimpleModal from '../../sonar-ui-common/components/controls/SimpleModal';
+import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner';
+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 { Application, ApplicationProject } from '../../types/application';
 import ProjectBranchRow from './ProjectBranchRow';
 import { ApplicationBranch, SelectBranchOption } from './utils';
diff --git a/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx b/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx
index e056c357b96..6634ed80a3a 100644
--- a/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx
@@ -18,10 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons';
-import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal';
-import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner';
-import { translate } from 'sonar-ui-common/helpers/l10n';
+import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons';
+import SimpleModal from '../../sonar-ui-common/components/controls/SimpleModal';
+import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner';
+import { translate } from '../../sonar-ui-common/helpers/l10n';
 import { Application } from '../../types/application';
 
 interface Props {
diff --git a/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx b/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx
index 169519df6ed..9ac6938b6f9 100644
--- a/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx
@@ -19,12 +19,12 @@
  */
 import { orderBy } from 'lodash';
 import * as React from 'react';
-import Checkbox from 'sonar-ui-common/components/controls/Checkbox';
-import Select from 'sonar-ui-common/components/controls/Select';
-import Tooltip from 'sonar-ui-common/components/controls/Tooltip';
-import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon';
-import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner';
 import { getBranches } from '../../api/branches';
+import Checkbox from '../../sonar-ui-common/components/controls/Checkbox';
+import Select from '../../sonar-ui-common/components/controls/Select';
+import Tooltip from '../../sonar-ui-common/components/controls/Tooltip';
+import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon';
+import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner';
 import { ApplicationProject } from '../../types/application';
 import BranchSelectItem from './BranchSelectItem';
 import { ApplicationBranch, SelectBranchOption } from './utils';
diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx
index 0a61bbe5782..67ad87d2417 100644
--- a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx
@@ -19,7 +19,6 @@
  */
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils';
 import {
   editApplication,
   getApplicationDetails,
@@ -28,6 +27,7 @@ import {
 import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage';
 import { mockApplication, mockApplicationProject } from '../../../helpers/mocks/application';
 import { mockLocation, mockRouter } from '../../../helpers/testMocks';
+import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
 import { Application } from '../../../types/application';
 import ApplicationConsoleApp from '../ApplicationConsoleApp';
 
diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx
index ac56e40f161..1e0fa1c2290 100644
--- a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx
@@ -19,8 +19,8 @@
  */
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { click } from 'sonar-ui-common/helpers/testUtils';
 import { mockApplication } from '../../../helpers/mocks/application';
+import { click } from '../../../sonar-ui-common/helpers/testUtils';
 import ApplicationConsoleAppRenderer, {
   ApplicationConsoleAppRendererProps
 } from '../ApplicationConsoleAppRenderer';
diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx
index b8360e07d66..5832ae841a5 100644
--- a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx
@@ -19,14 +19,16 @@
  */
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import SelectList, { SelectListFilter } from 'sonar-ui-common/components/controls/SelectList';
-import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils';
 import {
   addProjectToApplication,
   getApplicationProjects,
   removeProjectFromApplication
 } from '../../../api/application';
 import { mockApplication } from '../../../helpers/mocks/application';
+import SelectList, {
+  SelectListFilter
+} from '../../../sonar-ui-common/components/controls/SelectList';
+import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
 import ApplicationProjects from '../ApplicationProjects';
 
 jest.mock('../../../api/application', () => ({
diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx
index 94216ad3749..a2ca0af6200 100644
--- a/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx
@@ -19,9 +19,9 @@
  */
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils';
 import { getApplicationDetails } from '../../../api/application';
 import { mockApplication, mockApplicationProject } from '../../../helpers/mocks/application';
+import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
 import { Application } from '../../../types/application';
 import CreateBranchForm from '../CreateBranchForm';
 
diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx
index 1e60305639d..bcf6128fd31 100644
--- a/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx
+++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx
@@ -20,9 +20,9 @@
 
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal';
-import { change, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils';
 import { mockApplication } from '../../../helpers/mocks/application';
+import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal';
+import { change, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils';
 import EditForm from '../EditForm';
 
 it('should render correctly', () => {
diff --git a/server/sonar-web/src/main/js/apps/application-console/routes.ts b/server/sonar-web/src/main/js/apps/application-console/routes.ts
index 777305dccf4..7b34efc7ca0 100644
--- a/server/sonar-web/src/main/js/apps/application-console/routes.ts
+++ b/server/sonar-web/src/main/js/apps/application-console/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 '../../sonar-ui-common/components/lazyLoadComponent';
 
 const routes = [
   {