aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/apps/permission-templates/components
diff options
context:
space:
mode:
authorWouter Admiraal <wouter.admiraal@sonarsource.com>2021-08-17 15:50:55 +0200
committersonartech <sonartech@sonarsource.com>2021-08-20 20:03:08 +0000
commit6ef7ca151ecd602ca8e9cea21743a895a81e89ba (patch)
tree40d7a97a8075b416901a4078638e4cde9ee15942 /server/sonar-web/src/main/js/apps/permission-templates/components
parent2454e077b1d77d70508dcce6a5b015d4a69f41fa (diff)
downloadsonarqube-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/permission-templates/components')
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx10
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx11
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx15
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx6
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx2
12 files changed, 34 insertions, 28 deletions
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx
index 103e4ea4959..b98ab8e2ad0 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx
@@ -19,17 +19,17 @@
*/
import { difference } from 'lodash';
import * as React from 'react';
-import ActionsDropdown, {
- ActionsDropdownItem
-} from 'sonar-ui-common/components/controls/ActionsDropdown';
-import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon';
-import { translate } from 'sonar-ui-common/helpers/l10n';
import {
deletePermissionTemplate,
setDefaultPermissionTemplate,
updatePermissionTemplate
} from '../../../api/permissions';
import { Router, withRouter } from '../../../components/hoc/withRouter';
+import ActionsDropdown, {
+ ActionsDropdownItem
+} from '../../../sonar-ui-common/components/controls/ActionsDropdown';
+import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
import { PERMISSION_TEMPLATES_PATH } from '../utils';
import DeleteForm from './DeleteForm';
import Form from './Form';
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx
index fb94613a334..d3d41a26ac8 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx
@@ -21,9 +21,9 @@ import { Location } from 'history';
import * as React from 'react';
import { Helmet } from 'react-helmet-async';
import { connect } from 'react-redux';
-import { translate } from 'sonar-ui-common/helpers/l10n';
import { getPermissionTemplates } from '../../../api/permissions';
import Suggestions from '../../../app/components/embed-docs-modal/Suggestions';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
import { getAppState, Store } from '../../../store/rootReducer';
import '../../permissions/styles.css';
import { mergeDefaultsToTemplates, mergePermissionsToTemplates, sortPermissions } from '../utils';
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx
index d75681dc579..862c5e7f212 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx
@@ -19,7 +19,7 @@
*/
import { sortBy } from 'lodash';
import * as React from 'react';
-import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n';
+import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n';
interface Props {
template: T.PermissionTemplate;
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx
index 4d915117ede..3897b635b6d 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx
@@ -18,10 +18,13 @@
* 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, translateWithParameters } 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, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n';
interface Props {
onClose: () => void;
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx
index 2b3dd4b272d..aa8595b7e59 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx
@@ -18,12 +18,15 @@
* 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 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 {
+ 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';
interface Props {
confirmButtonText: string;
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx
index 978a38f6a66..ec53e638978 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Header.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 { translate } from 'sonar-ui-common/helpers/l10n';
import { createPermissionTemplate } from '../../../api/permissions';
import { Router, withRouter } from '../../../components/hoc/withRouter';
+import { Button } from '../../../sonar-ui-common/components/controls/buttons';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
import { PERMISSION_TEMPLATES_PATH } from '../utils';
import Form from './Form';
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx
index d6aa56b495e..4bd8c9de9fb 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx
@@ -19,7 +19,7 @@
*/
import * as React from 'react';
import { Helmet } from 'react-helmet-async';
-import { translate } from 'sonar-ui-common/helpers/l10n';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
import Header from './Header';
import List from './List';
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx
index f59bb0964e1..4962e65d652 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx
@@ -18,10 +18,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
-import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip';
-import { Alert } from 'sonar-ui-common/components/ui/Alert';
-import { translate } from 'sonar-ui-common/helpers/l10n';
import InstanceMessage from '../../../components/common/InstanceMessage';
+import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip';
+import { Alert } from '../../../sonar-ui-common/components/ui/Alert';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
interface Props {
permissions: T.Permission[];
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx
index f02b3a4f1ee..b7989446ecc 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx
@@ -18,9 +18,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
-import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip';
-import { translate } from 'sonar-ui-common/helpers/l10n';
import { isSonarCloud } from '../../../helpers/system';
+import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
interface Props {
permission: {
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx
index 7d9987d8388..ffc9ea631d9 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx
@@ -19,8 +19,8 @@
*/
import * as React from 'react';
import { Helmet } from 'react-helmet-async';
-import { translate } from 'sonar-ui-common/helpers/l10n';
import * as api from '../../../api/permissions';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
import HoldersList from '../../permissions/shared/components/HoldersList';
import SearchForm from '../../permissions/shared/components/SearchForm';
import {
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx
index 894536aab32..cf1a984d98b 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx
@@ -19,7 +19,7 @@
*/
import * as React from 'react';
import { Link } from 'react-router';
-import { translate } from 'sonar-ui-common/helpers/l10n';
+import { translate } from '../../../sonar-ui-common/helpers/l10n';
import { PERMISSION_TEMPLATES_PATH } from '../utils';
import ActionsCell from './ActionsCell';
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx
index 9612d5b2cee..c9d7874a0c6 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx
@@ -19,8 +19,8 @@
*/
import { shallow } from 'enzyme';
import * as React from 'react';
-import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils';
import { mockLocation } from '../../../../helpers/testMocks';
+import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils';
import { App } from '../App';
jest.mock('../../../../api/permissions', () => ({