import { translate } from 'sonar-ui-common/helpers/l10n';
import { getChildren } from '../../../api/components';
import { getMeasures } from '../../../api/measures';
+import MeasuresLink from '../../../components/common/MeasuresLink';
import Measure from '../../../components/measure/Measure';
import { fetchMetrics } from '../../../store/rootActions';
import { getMetrics, Store } from '../../../store/rootReducer';
import '../styles.css';
import { SubComponent } from '../types';
import { convertMeasures, PORTFOLIO_METRICS, SUB_COMPONENTS_METRICS } from '../utils';
-import MeasuresButtonLink from './MeasuresButtonLink';
import MetricBox from './MetricBox';
import Report from './Report';
import WorstProjects from './WorstProjects';
</div>
<div className="portfolio-breakdown-box-link">
<div>
- <MeasuresButtonLink component={component.key} metric="projects" />
+ <MeasuresLink component={component.key} metric="projects" />
</div>
</div>
</div>
</div>
<div className="portfolio-breakdown-box-link">
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component={component.key}
label={translate('portfolio.language_breakdown_link')}
metric="ncloc"
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2020 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 React from 'react';
-import { Link } from 'react-router';
-import HistoryIcon from 'sonar-ui-common/components/icons/HistoryIcon';
-import { translate } from 'sonar-ui-common/helpers/l10n';
-import { getMeasureHistoryUrl } from '../../../helpers/urls';
-
-interface Props {
- component: string;
- metric: string;
-}
-
-export default function HistoryButtonLink({ component, metric }: Props) {
- return (
- <Link to={getMeasureHistoryUrl(component, metric)}>
- <HistoryIcon className="little-spacer-right" size={14} />
- <span>{translate('portfolio.activity_link')}</span>
- </Link>
- );
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2020 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 React from 'react';
-import { Link } from 'react-router';
-import MeasuresIcon from 'sonar-ui-common/components/icons/MeasuresIcon';
-import { translate } from 'sonar-ui-common/helpers/l10n';
-import { getComponentDrilldownUrl } from '../../../helpers/urls';
-
-interface Props {
- component: string;
- label?: string;
- metric: string;
-}
-
-export default function MeasuresButtonLink({ component, label, metric }: Props) {
- return (
- <Link to={getComponentDrilldownUrl({ componentKey: component, metric })}>
- <MeasuresIcon className="little-spacer-right" size={14} />
- <span>{label || translate('portfolio.measures_link')}</span>
- </Link>
- );
-}
import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip';
import Level from 'sonar-ui-common/components/ui/Level';
import { translate } from 'sonar-ui-common/helpers/l10n';
+import ActivityLink from '../../../components/common/ActivityLink';
+import MeasuresLink from '../../../components/common/MeasuresLink';
import Measure from '../../../components/measure/Measure';
import { getComponentDrilldownUrl } from '../../../helpers/urls';
import { METRICS_PER_TYPE } from '../utils';
import Effort from './Effort';
-import HistoryButtonLink from './HistoryButtonLink';
import MainRating from './MainRating';
-import MeasuresButtonLink from './MeasuresButtonLink';
import RatingFreshness from './RatingFreshness';
export interface MetricBoxProps {
<div className="portfolio-box-links">
<div>
- <MeasuresButtonLink component={component} metric={keys.measuresMetric} />
+ <MeasuresLink component={component} metric={keys.measuresMetric} />
</div>
<div>
- <HistoryButtonLink component={component} metric={keys.activity || keys.rating} />
+ <ActivityLink component={component} metric={keys.activity || keys.rating} />
</div>
</div>
</div>
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2020 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 HistoryButtonLink from '../HistoryButtonLink';
-
-it('renders', () => {
- expect(shallow(<HistoryButtonLink component="foo" metric="security_rating" />)).toMatchSnapshot();
-});
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2020 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 MeasuresButtonLink from '../MeasuresButtonLink';
-
-it('renders', () => {
- expect(shallowRender()).toMatchSnapshot();
- expect(shallowRender({ label: 'Foo' })).toMatchSnapshot();
-});
-
-function shallowRender(props = {}) {
- return shallow(<MeasuresButtonLink component="foo" metric="security_rating" {...props} />);
-}
className="portfolio-breakdown-box-link"
>
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component="foo"
metric="projects"
/>
className="portfolio-breakdown-box-link"
>
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component="foo"
label="portfolio.language_breakdown_link"
metric="ncloc"
+++ /dev/null
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders 1`] = `
-<Link
- onlyActiveOnIndex={false}
- style={Object {}}
- to={
- Object {
- "pathname": "/project/activity",
- "query": Object {
- "custom_metrics": "security_rating",
- "graph": "custom",
- "id": "foo",
- },
- }
- }
->
- <HistoryIcon
- className="little-spacer-right"
- size={14}
- />
- <span>
- portfolio.activity_link
- </span>
-</Link>
-`;
+++ /dev/null
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders 1`] = `
-<Link
- onlyActiveOnIndex={false}
- style={Object {}}
- to={
- Object {
- "pathname": "/component_measures",
- "query": Object {
- "id": "foo",
- "metric": "security_rating",
- },
- }
- }
->
- <MeasuresIcon
- className="little-spacer-right"
- size={14}
- />
- <span>
- portfolio.measures_link
- </span>
-</Link>
-`;
-
-exports[`renders 2`] = `
-<Link
- onlyActiveOnIndex={false}
- style={Object {}}
- to={
- Object {
- "pathname": "/component_measures",
- "query": Object {
- "id": "foo",
- "metric": "security_rating",
- },
- }
- }
->
- <MeasuresIcon
- className="little-spacer-right"
- size={14}
- />
- <span>
- Foo
- </span>
-</Link>
-`;
className="portfolio-box-links"
>
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component="foo"
metric="Reliability"
/>
</div>
<div>
- <HistoryButtonLink
+ <ActivityLink
component="foo"
metric="reliability_rating"
/>
className="portfolio-box-links"
>
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component="foo"
metric="Releasability"
/>
</div>
<div>
- <HistoryButtonLink
+ <ActivityLink
component="foo"
metric="releasability_rating"
/>
className="portfolio-box-links"
>
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component="foo"
metric="Releasability"
/>
</div>
<div>
- <HistoryButtonLink
+ <ActivityLink
component="foo"
metric="releasability_rating"
/>
className="portfolio-box-links"
>
<div>
- <MeasuresButtonLink
+ <MeasuresLink
component="foo"
metric="Releasability"
/>
</div>
<div>
- <HistoryButtonLink
+ <ActivityLink
component="foo"
metric="releasability_rating"
/>
border-right: 1px solid var(--barBorderColor);
}
-.portfolio-box-links a,
-.portfolio-breakdown-box-link a {
- border: none;
-}
-
.portfolio-box-links svg,
.portfolio-breakdown-box-link svg {
vertical-align: middle;
}
-.portfolio-box-links a > span,
-.portfolio-breakdown-box-link a > span {
- border-bottom: 1px solid #cae3f2;
-}
-
.portfolio-breakdown {
display: flex;
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 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.
+ */
+a.activity-link {
+ border: none;
+}
+
+.activity-link > span {
+ border-bottom: 1px solid var(--lightBlue);
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 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 React from 'react';
+import { Link } from 'react-router';
+import HistoryIcon from 'sonar-ui-common/components/icons/HistoryIcon';
+import { translate } from 'sonar-ui-common/helpers/l10n';
+import { getActivityUrl, getMeasureHistoryUrl } from '../../helpers/urls';
+import { BranchLike } from '../../types/branch-like';
+import { GraphType } from '../../types/project-activity';
+import { isCustomGraph } from '../activity-graph/utils';
+import './ActivityLink.css';
+
+export interface ActivityLinkProps {
+ branchLike?: BranchLike;
+ component: string;
+ graph?: GraphType;
+ label?: string;
+ metric?: string;
+}
+
+export default function ActivityLink(props: ActivityLinkProps) {
+ const { branchLike, component, graph, label, metric } = props;
+ return (
+ <Link
+ className="activity-link"
+ to={
+ metric !== undefined && graph !== undefined && isCustomGraph(graph)
+ ? getMeasureHistoryUrl(component, metric, branchLike)
+ : getActivityUrl(component, branchLike, graph)
+ }>
+ <HistoryIcon className="little-spacer-right" size={14} />
+ <span>{label || translate('portfolio.activity_link')}</span>
+ </Link>
+ );
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 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.
+ */
+.measures-link {
+ border: none;
+}
+
+.measures-link > span {
+ border-bottom: 1px solid var(--lightBlue);
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 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';
+import { Link } from 'react-router';
+import MeasuresIcon from 'sonar-ui-common/components/icons/MeasuresIcon';
+import { translate } from 'sonar-ui-common/helpers/l10n';
+import { getComponentDrilldownUrl } from '../../helpers/urls';
+import { BranchLike } from '../../types/branch-like';
+import './MeasuresLink.css';
+
+export interface MeasuresLinkProps {
+ branchLike?: BranchLike;
+ className?: string;
+ component: string;
+ label?: string;
+ metric: string;
+}
+
+export default function MeasuresLink(props: MeasuresLinkProps) {
+ const { branchLike, className, component, label, metric } = props;
+ return (
+ <Link
+ className={classNames('measures-link', className)}
+ to={getComponentDrilldownUrl({ branchLike, componentKey: component, metric })}>
+ <MeasuresIcon className="little-spacer-right" size={14} />
+ <span>{label || translate('portfolio.measures_link')}</span>
+ </Link>
+ );
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 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 { mockBranch } from '../../../helpers/mocks/branch-like';
+import { GraphType } from '../../../types/project-activity';
+import ActivityLink, { ActivityLinkProps } from '../ActivityLink';
+
+it('renders correctly', () => {
+ expect(shallowRender()).toMatchSnapshot();
+ expect(shallowRender({ label: 'Foo', branchLike: mockBranch() })).toMatchSnapshot();
+ expect(shallowRender({ graph: GraphType.coverage })).toMatchSnapshot();
+ expect(shallowRender({ graph: GraphType.custom, metric: 'new_bugs,bugs' })).toMatchSnapshot();
+});
+
+function shallowRender(props: Partial<ActivityLinkProps> = {}) {
+ return shallow(<ActivityLink component="foo" {...props} />);
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 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 { mockMainBranch } from '../../../helpers/mocks/branch-like';
+import MeasuresLink, { MeasuresLinkProps } from '../MeasuresLink';
+
+it('renders', () => {
+ expect(shallowRender()).toMatchSnapshot();
+ expect(shallowRender({ label: 'Foo' })).toMatchSnapshot();
+ expect(shallowRender({ branchLike: mockMainBranch() })).toMatchSnapshot();
+});
+
+function shallowRender(props: Partial<MeasuresLinkProps> = {}) {
+ return shallow(<MeasuresLink component="foo" metric="security_rating" {...props} />);
+}
--- /dev/null
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders correctly 1`] = `
+<Link
+ className="activity-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/project/activity",
+ "query": Object {
+ "graph": undefined,
+ "id": "foo",
+ },
+ }
+ }
+>
+ <HistoryIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ portfolio.activity_link
+ </span>
+</Link>
+`;
+
+exports[`renders correctly 2`] = `
+<Link
+ className="activity-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/project/activity",
+ "query": Object {
+ "branch": "branch-6.7",
+ "graph": undefined,
+ "id": "foo",
+ },
+ }
+ }
+>
+ <HistoryIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ Foo
+ </span>
+</Link>
+`;
+
+exports[`renders correctly 3`] = `
+<Link
+ className="activity-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/project/activity",
+ "query": Object {
+ "graph": "coverage",
+ "id": "foo",
+ },
+ }
+ }
+>
+ <HistoryIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ portfolio.activity_link
+ </span>
+</Link>
+`;
+
+exports[`renders correctly 4`] = `
+<Link
+ className="activity-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/project/activity",
+ "query": Object {
+ "custom_metrics": "new_bugs,bugs",
+ "graph": "custom",
+ "id": "foo",
+ },
+ }
+ }
+>
+ <HistoryIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ portfolio.activity_link
+ </span>
+</Link>
+`;
--- /dev/null
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders 1`] = `
+<Link
+ className="measures-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/component_measures",
+ "query": Object {
+ "id": "foo",
+ "metric": "security_rating",
+ },
+ }
+ }
+>
+ <MeasuresIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ portfolio.measures_link
+ </span>
+</Link>
+`;
+
+exports[`renders 2`] = `
+<Link
+ className="measures-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/component_measures",
+ "query": Object {
+ "id": "foo",
+ "metric": "security_rating",
+ },
+ }
+ }
+>
+ <MeasuresIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ Foo
+ </span>
+</Link>
+`;
+
+exports[`renders 3`] = `
+<Link
+ className="measures-link"
+ onlyActiveOnIndex={false}
+ style={Object {}}
+ to={
+ Object {
+ "pathname": "/component_measures",
+ "query": Object {
+ "id": "foo",
+ "metric": "security_rating",
+ },
+ }
+ }
+>
+ <MeasuresIcon
+ className="little-spacer-right"
+ size={14}
+ />
+ <span>
+ portfolio.measures_link
+ </span>
+</Link>
+`;
import { getBaseUrl, Location } from 'sonar-ui-common/helpers/urls';
import { getProfilePath } from '../apps/quality-profiles/utils';
import { BranchLike } from '../types/branch-like';
+import { GraphType } from '../types/project-activity';
import { getBranchLikeQuery, isBranch, isMainBranch, isPullRequest } from './branch-like';
type Query = Location['query'];
return getComponentDrilldownUrl({ componentKey, metric, treemapView: true });
}
-export function getActivityUrl(component: string, branchLike?: BranchLike) {
+export function getActivityUrl(component: string, branchLike?: BranchLike, graph?: GraphType) {
return {
pathname: '/project/activity',
- query: { id: component, ...getBranchLikeQuery(branchLike) }
+ query: { id: component, graph, ...getBranchLikeQuery(branchLike) }
};
}
projects / sonarqube.git / commitdiff