aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js
diff options
context:
space:
mode:
authorPhilippe Perrin <philippe.perrin@sonarsource.com>2021-06-25 18:15:26 +0200
committersonartech <sonartech@sonarsource.com>2021-06-28 20:03:21 +0000
commit205dba501eb14aae28504b71b22a7a002bd78778 (patch)
treec63ca2bf0ed1f6f7968c4fa3c4cadcc3cef583f0 /server/sonar-web/src/main/js
parent52e89eb6c3a1669623403f01ba5ca0338fb6a257 (diff)
downloadsonarqube-205dba501eb14aae28504b71b22a7a002bd78778.tar.gz
sonarqube-205dba501eb14aae28504b71b22a7a002bd78778.zip
SONAR-14943 Vertical center the ellipsis icon
Diffstat (limited to 'server/sonar-web/src/main/js')
-rw-r--r--server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/projects/components/__tests__/__snapshots__/ProjectCreationMenu-test.tsx.snap4
-rw-r--r--server/sonar-web/src/main/js/components/icons/EllipsisIcon.tsx39
-rw-r--r--server/sonar-web/src/main/js/components/icons/__tests__/EllipsisIcon-test.tsx34
-rw-r--r--server/sonar-web/src/main/js/components/icons/__tests__/__snapshots__/EllipsisIcon-test.tsx.snap16
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx4
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap15
7 files changed, 11 insertions, 105 deletions
diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx
index a2677ae4de8..3b1c420744f 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx
+++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx
@@ -22,10 +22,10 @@ import { Link } from 'react-router';
import { Button } from 'sonar-ui-common/components/controls/buttons';
import Dropdown from 'sonar-ui-common/components/controls/Dropdown';
import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon';
+import EllipsisIcon from 'sonar-ui-common/components/icons/EllipsisIcon';
import { translate } from 'sonar-ui-common/helpers/l10n';
import { getAlmSettings } from '../../../api/alm-settings';
import { withCurrentUser } from '../../../components/hoc/withCurrentUser';
-import EllipsisIcon from '../../../components/icons/EllipsisIcon';
import { IMPORT_COMPATIBLE_ALMS, IMPORT_COMPATIBLE_ALM_COUNT } from '../../../helpers/constants';
import { hasGlobalPermission } from '../../../helpers/users';
import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings';
@@ -126,7 +126,7 @@ export class ProjectCreationMenu extends React.PureComponent<Props, State> {
{boundAlms.length < IMPORT_COMPATIBLE_ALM_COUNT && (
<li className="bordered-top little-padded-top">
<Link className="display-flex-center" to={{ pathname: '/projects/create' }}>
- <EllipsisIcon width={16} className="big spacer-right" />
+ <EllipsisIcon className="spacer-right" size={16} />
{translate('more')}
</Link>
</li>
diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/__snapshots__/ProjectCreationMenu-test.tsx.snap b/server/sonar-web/src/main/js/apps/projects/components/__tests__/__snapshots__/ProjectCreationMenu-test.tsx.snap
index f5ed0aa061f..01db864b088 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/__snapshots__/ProjectCreationMenu-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/__snapshots__/ProjectCreationMenu-test.tsx.snap
@@ -28,8 +28,8 @@ exports[`should render correctly: default 1`] = `
}
>
<EllipsisIcon
- className="big spacer-right"
- width={16}
+ className="spacer-right"
+ size={16}
/>
more
</Link>
diff --git a/server/sonar-web/src/main/js/components/icons/EllipsisIcon.tsx b/server/sonar-web/src/main/js/components/icons/EllipsisIcon.tsx
deleted file mode 100644
index 51455e17736..00000000000
--- a/server/sonar-web/src/main/js/components/icons/EllipsisIcon.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2021 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-import * as classNames from 'classnames';
-import * as React from 'react';
-
-export interface EllipsisIconProps {
- className?: string;
- height?: number;
- width?: number;
-}
-
-export default function EllipsisIcon({ className, height, width }: EllipsisIconProps) {
- return (
- <span
- aria-disabled={true}
- className={classNames('display-flex-center display-flex-justify-center', className)}
- style={{ height, width }}>
- &hellip;
- </span>
- );
-}
diff --git a/server/sonar-web/src/main/js/components/icons/__tests__/EllipsisIcon-test.tsx b/server/sonar-web/src/main/js/components/icons/__tests__/EllipsisIcon-test.tsx
deleted file mode 100644
index fbc28175276..00000000000
--- a/server/sonar-web/src/main/js/components/icons/__tests__/EllipsisIcon-test.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2021 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-import { shallow } from 'enzyme';
-import * as React from 'react';
-import EllipsisIcon, { EllipsisIconProps } from '../EllipsisIcon';
-
-it('should render correctly', () => {
- const wrapper = shallowRender();
- expect(wrapper).toMatchSnapshot();
-});
-
-function shallowRender(props: Partial<EllipsisIconProps> = {}) {
- return shallow<EllipsisIconProps>(
- <EllipsisIcon height={16} width={16} className="test-class-name" {...props} />
- );
-}
diff --git a/server/sonar-web/src/main/js/components/icons/__tests__/__snapshots__/EllipsisIcon-test.tsx.snap b/server/sonar-web/src/main/js/components/icons/__tests__/__snapshots__/EllipsisIcon-test.tsx.snap
deleted file mode 100644
index adaf939e627..00000000000
--- a/server/sonar-web/src/main/js/components/icons/__tests__/__snapshots__/EllipsisIcon-test.tsx.snap
+++ /dev/null
@@ -1,16 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`should render correctly 1`] = `
-<span
- aria-disabled={true}
- className="display-flex-center display-flex-justify-center test-class-name"
- style={
- Object {
- "height": 16,
- "width": 16,
- }
- }
->
- …
-</span>
-`;
diff --git a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx
index f2749fc9247..28b272f0452 100644
--- a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx
@@ -18,10 +18,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
+import EllipsisIcon from 'sonar-ui-common/components/icons/EllipsisIcon';
import { translate } from 'sonar-ui-common/helpers/l10n';
import { getBaseUrl } from 'sonar-ui-common/helpers/urls';
import { AlmKeys, AlmSettingsInstance, ProjectAlmBindingResponse } from '../../types/alm-settings';
-import EllipsisIcon from '../icons/EllipsisIcon';
import AzurePipelinesTutorial from './azure-pipelines/AzurePipelinesTutorial';
import BitbucketPipelinesTutorial from './bitbucket-pipelines/BitbucketPipelinesTutorial';
import GitHubActionTutorial from './github-action/GitHubActionTutorial';
@@ -178,7 +178,7 @@ export default function TutorialSelectionRenderer(props: TutorialSelectionRender
{renderButton(
TutorialModes.OtherCI,
props.onSelectTutorial,
- <EllipsisIcon className="gigantic" height={DEFAULT_ICON_SIZE} />
+ <EllipsisIcon size={DEFAULT_ICON_SIZE / 2} />
)}
</div>
</div>
diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap
index 9e4c32dd8b2..f718c83a010 100644
--- a/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap
@@ -55,8 +55,7 @@ exports[`should render correctly for azure 1`] = `
type="button"
>
<EllipsisIcon
- className="gigantic"
- height={80}
+ size={40}
/>
<div
className="medium big-spacer-top"
@@ -124,8 +123,7 @@ exports[`should render correctly for bitbucket server 1`] = `
type="button"
>
<EllipsisIcon
- className="gigantic"
- height={80}
+ size={40}
/>
<div
className="medium big-spacer-top"
@@ -226,8 +224,7 @@ exports[`should render correctly for github 1`] = `
type="button"
>
<EllipsisIcon
- className="gigantic"
- height={80}
+ size={40}
/>
<div
className="medium big-spacer-top"
@@ -311,8 +308,7 @@ exports[`should render correctly for gitlab 1`] = `
type="button"
>
<EllipsisIcon
- className="gigantic"
- height={80}
+ size={40}
/>
<div
className="medium big-spacer-top"
@@ -666,8 +662,7 @@ exports[`should render correctly: selection 1`] = `
type="button"
>
<EllipsisIcon
- className="gigantic"
- height={80}
+ size={40}
/>
<div
className="medium big-spacer-top"