${tw` sw-mb-[-1px]`};
${tw`sw-flex sw-items-center`};
${(props) => (props.large ? tw`sw-body-md sw-px-6 sw-py-4` : tw`sw-body-sm sw-px-3 sw-py-1`)}
- ${tw`sw-body-sm`};
${tw`sw-font-semibold`};
${tw`sw-rounded-t-1`};
background-color: ${themeColor('backgroundPrimary')};
`;
+export function InfoCard(props: Readonly<CardProps & { footer?: React.ReactNode }>) {
+ return (
+ <BlueCard>
+ <CardContent>{props.children}</CardContent>
+ {props.footer !== undefined && (
+ <>
+ <BasicSeparator />
+ <CardContent>{props.footer}</CardContent>
+ </>
+ )}
+ </BlueCard>
+ );
+}
+
const CardStyled = styled.div`
background-color: ${themeColor('backgroundSecondary')};
border: ${themeBorder('default', 'projectCardBorder')};
const GreyCardStyled = styled(CardStyled)`
border: ${themeBorder('default', 'almCardBorder')};
`;
+
+const BlueCard = styled.div`
+ ${tw`sw-rounded-1`};
+ border: 1px solid var(--echoes-color-border-default);
+ background: var(--echoes-color-background-info-weak);
+`;
+const CardContent = styled.div`
+ padding: var(--echoes-dimension-space-200);
+`;
<div>
<h2 className="sw-pt-6 sw-pb-4 sw-body-md-highlight">{translate('overview.activity')}</h2>
- <Card data-test="overview__activity-panel">
+ <Card className="sw-rounded-2" data-test="overview__activity-panel">
<GraphsHeader graph={graph} metrics={metrics} onUpdateGraph={props.onGraphChange} />
<GraphsHistory
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { Card, FlagMessage, Link } from 'design-system';
+import { Link } from '@sonarsource/echoes-react';
import * as React from 'react';
+import { FormattedMessage } from 'react-intl';
import { getBranchLikeQuery } from '~sonar-aligned/helpers/branch-like';
-import { DocLink } from '../../../helpers/doc-links';
-import { useDocUrl } from '../../../helpers/docs';
-import { translate, translateWithParameters } from '../../../helpers/l10n';
import { getProjectQueryUrl } from '../../../helpers/urls';
+import { ComponentQualifier } from '../../../sonar-aligned/types/component';
import { QualityGateStatus } from '../../../types/quality-gates';
interface Props {
}
export default function ApplicationNonCaycProjectWarning({ projects }: Props) {
- const caycUrl = useDocUrl(DocLink.CaYC);
-
return (
- <Card className="sw-mt-4 sw-body-sm">
- <FlagMessage variant="warning">
- {translateWithParameters(
- 'overview.quality_gate.application.non_cayc.projects_x',
- projects.length,
- )}
- </FlagMessage>
+ <>
+ <p className="sw-font-bold">
+ <FormattedMessage
+ id={`overview.quality_gate.conditions.cayc.warning.title.${ComponentQualifier.Application}`}
+ />
+ </p>
+
+ <p className="sw-my-4">
+ <FormattedMessage
+ id={`overview.quality_gate.conditions.cayc.details.${ComponentQualifier.Application}`}
+ />
+ </p>
- <ul className="sw-mt-4 sw-ml-2 sw-mb-2">
+ <ul className="sw-ml-2 sw-list-disc sw-list-inside">
{projects.map(({ key, name, branchLike }) => (
- <li key={key} className="sw-text-ellipsis sw-mb-2" title={name}>
+ <li key={key} className="sw-text-ellipsis" title={name}>
<Link to={getProjectQueryUrl(key, getBranchLikeQuery(branchLike))}>{name}</Link>
</li>
))}
</ul>
- <hr className="sw-my-4" />
- <div className="sw-m-2 sw-mt-4">
- <Link to={caycUrl}>{translate('overview.quality_gate.conditions.cayc.link')}</Link>
- </div>
- </Card>
+ </>
);
}
)}
</>
)}
- <AnalysisStatus className="sw-mt-6" component={component} />
<div
data-testid="overview__quality-gate-panel"
className="sw-flex sw-justify-between sw-items-start sw-my-6"
<QGStatus status={qgStatus} titleSize="extra-large" />
<LastAnalysisLabel analysisDate={branch?.analysisDate} />
</div>
+ <AnalysisStatus component={component} />
<div className="sw-flex sw-flex-col sw-mt-6">
<TabsPanel
analyses={analyses}
import { themeColor } from 'design-system/lib';
export const GridContainer = styled.div`
- --grids-gaps: var(--echoes-dimension-space-500);
+ --column-grids-gaps: var(--echoes-dimension-space-600);
+ --row-grids-gaps: var(--echoes-dimension-space-800);
display: grid;
grid-template-columns: repeat(12, minmax(0, 1fr));
- gap: var(--grids-gaps);
+ row-gap: var(--row-grids-gaps);
+ column-gap: var(--column-grids-gaps);
`;
export const StyleMeasuresCard = styled.div`
content: '';
position: absolute;
top: 0;
- right: calc(var(--grids-gaps) / -2);
+ right: calc(var(--column-grids-gaps) / -2);
height: 100%;
width: 1px;
background: ${themeColor('pageBlockBorder')};
&:not(:last-child):after {
content: '';
position: absolute;
- bottom: calc(var(--grids-gaps) / -2);
+ bottom: calc(var(--row-grids-gaps) / -2);
right: 0;
left: 0px;
height: 1px;
content: '';
position: absolute;
top: 0;
- right: calc(var(--grids-gaps) / -2);
+ right: calc(var(--column-grids-gaps) / -2);
height: 100%;
width: 1px;
background: ${themeColor('pageBlockBorder')};
content: '';
position: absolute;
top: 0;
- right: calc(var(--grids-gaps) / -2);
+ right: calc(var(--column-grids-gaps) / -2);
height: 100%;
width: 1px;
background: ${themeColor('pageBlockBorder')};
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { DiscreetLink, FlagMessage, Link } from 'design-system';
+import { Link } from '@sonarsource/echoes-react';
import * as React from 'react';
import { FormattedMessage } from 'react-intl';
-import { DocLink } from '../../../helpers/doc-links';
-import { useDocUrl } from '../../../helpers/docs';
import { translate } from '../../../helpers/l10n';
import { getQualityGateUrl } from '../../../helpers/urls';
-import { Component } from '../../../types/types';
+import { Component, QualityGate } from '../../../types/types';
interface Props {
component: Pick<Component, 'key' | 'qualifier' | 'qualityGate'>;
+ qualityGate?: QualityGate;
}
export default function CleanAsYouCodeWarning({ component }: Props) {
- const caycUrl = useDocUrl(DocLink.CaYC);
-
return (
<>
- <FlagMessage variant="warning">
- {translate('overview.quality_gate.conditions.cayc.warning')}
- </FlagMessage>
+ <p className="sw-mb-4 sw-font-bold">
+ <FormattedMessage
+ id={`overview.quality_gate.conditions.cayc.warning.title.${component.qualifier}`}
+ />
+ </p>
{component.qualityGate ? (
- <p className="sw-my-4">
+ <p>
<FormattedMessage
id="overview.quality_gate.conditions.cayc.details_with_link"
defaultMessage={translate('overview.quality_gate.conditions.cayc.details_with_link')}
values={{
link: (
- <DiscreetLink to={getQualityGateUrl(component.qualityGate.name)}>
+ <Link to={getQualityGateUrl(component.qualityGate.name)}>
{translate('overview.quality_gate.conditions.non_cayc.warning.link')}
- </DiscreetLink>
+ </Link>
),
}}
/>
</p>
) : (
- <p className="sw-my-4">{translate('overview.quality_gate.conditions.cayc.details')}</p>
+ <p>
+ <FormattedMessage
+ id={`overview.quality_gate.conditions.cayc.details.${component.qualifier}`}
+ />
+ </p>
)}
-
- <Link to={caycUrl}>{translate('overview.quality_gate.conditions.cayc.link')}</Link>
</>
);
}
<CardSeparator />
</>
)}
- {qualityGate?.isBuiltIn && isNewCode && (
- <ZeroNewIssuesSimplificationGuide qualityGate={qualityGate} />
- )}
+ {qualityGate && isNewCode && <ZeroNewIssuesSimplificationGuide qualityGate={qualityGate} />}
<QualityGateConditions
component={component}
branchLike={branchLike}
<div id={getTabPanelId(CodeScope.New)}>
{leakPeriod && (
<span
- className="sw-body-xs sw-flex sw-items-center sw-mt-8 sw-mr-6"
+ className="sw-body-xs sw-flex sw-items-center sw-mr-6"
data-spotlight-id="cayc-promotion-2"
>
<LightLabel className="sw-mr-1">{translate('overview.new_code')}:</LightLabel>
)}
<GridContainer className=" sw-relative sw-overflow-hidden sw-mt-8 js-summary">
{!noConditionsAndWarningForNewCode && (
- <StyledConditionsCard className="sw-row-span-4 sw-col-span-4">
+ <StyledConditionsCard className="sw-row-span-3 sw-col-span-4">
<QualityGatePanel
component={component}
loading={loading}
import { isApplication } from '../../../types/component';
import { IssueStatus } from '../../../types/issues';
import { QualityGateStatus } from '../../../types/quality-gates';
-import { CaycStatus, Component, MeasureEnhanced, QualityGate } from '../../../types/types';
+import { Component, MeasureEnhanced, QualityGate } from '../../../types/types';
import MeasuresCard from '../components/MeasuresCard';
import MeasuresCardNumber from '../components/MeasuresCardNumber';
import MeasuresCardPercent from '../components/MeasuresCardPercent';
const securityHotspots = findMeasure(measures, MetricKey.security_hotspots)?.value;
const securityRating = findMeasure(measures, MetricKey.security_review_rating)?.value;
- const nonCaycProjectsInApp =
- isApp && qgStatuses
- ? qgStatuses
- .filter(({ caycStatus }) => caycStatus === CaycStatus.NonCompliant)
- .sort(({ name: a }, { name: b }) =>
- a.localeCompare(b, undefined, { sensitivity: 'base' }),
- )
- : [];
-
- const showCaycWarningInProject =
- qgStatuses &&
- qgStatuses.length === 1 &&
- qgStatuses[0].caycStatus === CaycStatus.NonCompliant &&
- qualityGate?.actions?.manageConditions &&
- !isApp;
-
- const showCaycWarningInApp = nonCaycProjectsInApp.length > 0;
-
- const noConditionsAndWarningForOverallCode =
- totalOverallFailedCondition.length === 0 && !showCaycWarningInApp && !showCaycWarningInProject;
+ const noConditionsAndWarningForOverallCode = totalOverallFailedCondition.length === 0;
return (
<GridContainer
loading={loading}
qgStatuses={qgStatuses}
qualityGate={qualityGate}
- showCaycWarningInApp={showCaycWarningInApp}
- showCaycWarningInProject={showCaycWarningInProject ?? false}
totalFailedConditionLength={totalOverallFailedCondition.length}
/>
</StyledConditionsCard>
getComponentSecurityHotspotsUrl,
} from '~sonar-aligned/helpers/urls';
import { MetricKey, MetricType } from '~sonar-aligned/types/metrics';
+import withMetricsContext from '../../../app/components/metrics/withMetricsContext';
import IssueTypeIcon from '../../../components/icon-mappers/IssueTypeIcon';
import MeasureIndicator from '../../../components/measure/MeasureIndicator';
import {
isIssueMeasure,
propsToIssueParams,
} from '../../../components/shared/utils';
-import { translate } from '../../../helpers/l10n';
-import { isDiffMetric, localizeMetric } from '../../../helpers/measures';
import { getOperatorLabel } from '../../../helpers/qualityGates';
import { getComponentDrilldownUrl } from '../../../helpers/urls';
import { BranchLike } from '../../../types/branch-like';
import { IssueType } from '../../../types/issues';
import { QualityGateStatusConditionEnhanced } from '../../../types/quality-gates';
-import { Component, Dict } from '../../../types/types';
+import { Component, Dict, Metric } from '../../../types/types';
+import { getLocalizedMetricNameNoDiffMetric } from '../../quality-gates/utils';
import { RATING_TO_SEVERITIES_MAPPING } from '../utils';
interface Props {
branchLike?: BranchLike;
component: Pick<Component, 'key'>;
condition: QualityGateStatusConditionEnhanced;
+ metrics: Dict<Metric>;
}
-export
default class QualityGateCondition extends React.PureComponent<Props> {
+export class QualityGateCondition extends React.PureComponent<Props> {
getIssuesUrl = (inNewCodePeriod: boolean, customQuery: Dict<string>) => {
const query: Dict<string | undefined> = {
...DEFAULT_ISSUES_QUERY,
const { condition } = this.props;
const { measure } = condition;
const { metric } = measure;
- const isDiff = isDiffMetric(metric.key);
- const subText =
- !isDiff && condition.period != null
- ? `${localizeMetric(metric.key)} ${translate('quality_gates.conditions.new_code')}`
- : localizeMetric(metric.key);
+ const subText = getLocalizedMetricNameNoDiffMetric(metric, this.props.metrics);
if (metric.type !== MetricType.Rating) {
const actual = (condition.period ? measure.period?.value : measure.value) as string;
);
}
}
+
+export default withMetricsContext(QualityGateCondition);
}
return (
- <ul id="overview-quality-gate-conditions-list" className="sw-mb-2">
- {renderConditions.map((condition) => (
+ <ul id="overview-quality-gate-conditions-list">
+ {renderConditions.map((condition, idx) => (
<div key={condition.measure.metric.key}>
{isSimplifiedCondition(condition) ? (
<QualityGateSimplifiedCondition
condition={condition}
/>
)}
- <CardSeparator />
+ {idx !== renderConditions.length - 1 && <CardSeparator />}
</div>
))}
{renderCollapsed && (
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { Card, CardSeparator, Spinner, TextError } from 'design-system';
+import styled from '@emotion/styled';
+import { LinkStandalone, Spinner } from '@sonarsource/echoes-react';
+import { CardSeparator, InfoCard, TextError } from 'design-system';
import * as React from 'react';
import { FormattedMessage } from 'react-intl';
import { ComponentQualifier } from '~sonar-aligned/types/component';
+import { DocLink } from '../../../helpers/doc-links';
+import { useDocUrl } from '../../../helpers/docs';
import { translate } from '../../../helpers/l10n';
import { isDiffMetric } from '../../../helpers/measures';
import { isApplication } from '../../../types/component';
showCaycWarningInApp = false,
} = props;
+ const caycUrl = useDocUrl(DocLink.CaYC);
+
if (qgStatuses === undefined) {
return null;
}
qgStatuses.some((p) => Boolean(p.ignoredConditions));
return (
- <div data-testid="overview__quality-gate-panel-conditions">
- <div>
- <Spinner loading={loading}>
+ <Spinner isLoading={loading}>
+ <Column data-testid="overview__quality-gate-panel-conditions">
+ <Conditions>
{showIgnoredConditionWarning && isNewCode && <IgnoredConditionWarning />}
{isApp && (
})}
</div>
)}
- </Spinner>
- </div>
-
- {showCaycWarningInApp && <ApplicationNonCaycProjectWarning projects={nonCaycProjectsInApp} />}
+ </Conditions>
- {showCaycWarningInProject && (
- <Card className="sw-mt-4 sw-body-sm">
- <CleanAsYouCodeWarning component={component} />
- </Card>
- )}
+ {showCaycWarningInApp && (
+ <InfoCard
+ className="sw-body-sm"
+ footer={
+ <LinkStandalone to={caycUrl}>
+ <FormattedMessage id="overview.quality_gate.conditions.cayc.link" />
+ </LinkStandalone>
+ }
+ >
+ <ApplicationNonCaycProjectWarning projects={nonCaycProjectsInApp} />
+ </InfoCard>
+ )}
- <SonarLintPromotion qgConditions={qgStatuses?.flatMap((qg) => qg.failedConditions)} />
- </div>
+ {showCaycWarningInProject && (
+ <InfoCard
+ className="sw-body-sm"
+ footer={
+ <LinkStandalone to={caycUrl}>
+ <FormattedMessage id="overview.quality_gate.conditions.cayc.link" />
+ </LinkStandalone>
+ }
+ >
+ <CleanAsYouCodeWarning component={component} />
+ </InfoCard>
+ )}
+ <SonarLintPromotion qgConditions={qgStatuses?.flatMap((qg) => qg.failedConditions)} />
+ </Column>
+ </Spinner>
);
}
export default React.memo(QualityGatePanel);
+
+const Column = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: var(--echoes-dimension-space-400);
+`;
+
+const Conditions = styled.div`
+ &:empty {
+ display: contents;
+ }
+`;
import { formatMeasure } from '~sonar-aligned/helpers/measures';
import { getComponentIssuesUrl } from '~sonar-aligned/helpers/urls';
import { MetricKey, MetricType } from '~sonar-aligned/types/metrics';
+import { useMetrics } from '../../../app/components/metrics/withMetricsContext';
import { propsToIssueParams } from '../../../components/shared/utils';
-import { translate } from '../../../helpers/l10n';
-import { isDiffMetric, localizeMetric } from '../../../helpers/measures';
import { BranchLike } from '../../../types/branch-like';
import { QualityGateStatusConditionEnhanced } from '../../../types/quality-gates';
import { Component } from '../../../types/types';
+import { getLocalizedMetricNameNoDiffMetric } from '../../quality-gates/utils';
interface Props {
branchLike?: BranchLike;
component,
condition,
}: Readonly<Props>) {
+ const metrics = useMetrics();
const getPrimaryText = () => {
const { measure } = condition;
const { metric } = measure;
- const isDiff = isDiffMetric(metric.key);
- const subText =
- !isDiff && condition.period != null
- ? `${localizeMetric(metric.key)} ${translate('quality_gates.conditions.new_code')}`
- : localizeMetric(metric.key);
+ const subText = getLocalizedMetricNameNoDiffMetric(metric, metrics);
return subText;
};
<QualityGateIndicator size="xl" status={status} />
<div className="sw-flex sw-flex-col sw-ml-2 sw-justify-around">
<div className="sw-flex sw-items-center">
- <Note>{translate('overview.quality_gate.status')}</Note>
+ <Note>{translate('overview.quality_gate')}</Note>
<HelpTooltip
className="sw-ml-2"
overlay={<div>{translate('overview.quality_gate.help')}</div>}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2024 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 { HelperHintIcon, LightGreyCardTitle, PageTitle } from 'design-system';
-import React from 'react';
-import HelpTooltip from '~sonar-aligned/components/controls/HelpTooltip';
-import { translate } from '../../../helpers/l10n';
-
-export function QualityGateStatusTitle() {
- return (
- <LightGreyCardTitle>
- <div className="sw-flex sw-items-center">
- <PageTitle as="h2" text={translate('overview.quality_gate.status')} />
- <HelpTooltip
- className="sw-ml-2"
- overlay={<div className="sw-my-4">{translate('overview.quality_gate.help')}</div>}
- >
- <HelperHintIcon aria-label="help-tooltip" />
- </HelpTooltip>
- </div>
- </LightGreyCardTitle>
- );
-}
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { Card, DiscreetLink } from 'design-system';
+import { DiscreetLink, InfoCard } from 'design-system';
import * as React from 'react';
import { FormattedMessage } from 'react-intl';
import { MetricKey } from '~sonar-aligned/types/metrics';
return null;
}
return (
- <Card className="it__overview__sonarlint-promotion sw-my-4 sw-body-sm">
+ <InfoCard className="it__overview__sonarlint-promotion sw-body-sm">
<FormattedMessage
id="overview.fix_failed_conditions_with_sonarlint"
defaultMessage={translate('overview.fix_failed_conditions_with_sonarlint')}
),
}}
/>
- </Card>
+ </InfoCard>
);
}
];
return (
- <div
- className="sw-mt-3"
- data-testid="overview__measures-panel"
- data-spotlight-id="cayc-promotion-1"
- >
+ <div data-testid="overview__measures-panel" data-spotlight-id="cayc-promotion-1">
{loading ? (
<div>
<Spinner isLoading={loading} />
/>
</div>
- <Card className="sw-rounded-b-2 sw-rounded-t-0 sw-border-t-0">
+ <Card className="sw-rounded-b-2 sw-rounded-t-0 sw-border-t-0 sw-pt-8 sw-pb-12 sw-px-6">
{component.qualifier === ComponentQualifier.Application && component.needIssueSync && (
<FlagMessage className="sw-mt-4" variant="info">
<span>
// QG panel
expect(screen.getByText('metric.level.OK')).toBeInTheDocument();
expect(
- screen.queryByText('overview.quality_gate.conditions.cayc.warning'),
+ screen.queryByText('overview.quality_gate.conditions.cayc.warning.title.TRK'),
).not.toBeInTheDocument();
// Measures panel
expect(await screen.findByText('metric.level.OK')).toBeInTheDocument();
expect(
- screen.queryByText('overview.quality_gate.conditions.cayc.warning'),
+ screen.queryByText('overview.quality_gate.conditions.cayc.warning.title.TRK'),
).not.toBeInTheDocument();
});
await screen.findByText('metric.level.OK');
expect(
- await screen.findByText('overview.quality_gate.conditions.cayc.warning'),
+ await screen.findByText('overview.quality_gate.conditions.cayc.warning.title.TRK'),
).toBeInTheDocument();
});
expect(screen.getAllByText(/overview.quality_gate.required_x/)).toHaveLength(3);
expect(
screen.getByRole('link', {
- name: '1 1 metric.new_security_hotspots_reviewed.name quality_gates.operator.GT 2',
+ name: '1 1 new_security_hotspots_reviewed quality_gates.operator.GT 2',
}),
).toHaveAttribute('href', '/security_hotspots?id=foo&inNewCodePeriod=true');
});
}).get(),
).toBeInTheDocument();
expect(byText(/quality_gates.conditions.x_conditions_failed/).get()).toBeInTheDocument();
- expect(byText('1 metric.new_violations.name').get()).toBeInTheDocument();
+ expect(
+ byRole('link', { name: '1 1 new_violations quality_gates.operator.GT 0' }).get(),
+ ).toBeInTheDocument();
});
it("should show projects that don't have a compliant quality gate", async () => {
renderBranchOverview({ component });
expect(
- await screen.findByText('overview.quality_gate.application.non_cayc.projects_x.3'),
+ await screen.findByText('overview.quality_gate.conditions.cayc.details.APP'),
).toBeInTheDocument();
expect(screen.getByText('first project')).toBeInTheDocument();
expect(screen.queryByText('second project')).not.toBeInTheDocument();
renderBranchOverview();
// wait for loading
- await screen.findByText('overview.quality_gate.status');
+ await screen.findByText('overview.quality_gate');
expect(screen.queryByText('overview.project.next_steps.set_up_ci') === null).toBe(expected);
},
await user.click(await ui.overallCodeButton.find());
- expect(await byText('overview.quality_gate.status').find()).toBeInTheDocument();
+ expect(await byText('overview.quality_gate').find()).toBeInTheDocument();
await waitFor(() =>
expect(
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2024 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 { screen } from '@testing-library/react';
-import * as React from 'react';
-import { MetricKey, MetricType } from '~sonar-aligned/types/metrics';
-import { mockBranch } from '../../../../helpers/mocks/branch-like';
-import { mockQualityGateStatusConditionEnhanced } from '../../../../helpers/mocks/quality-gates';
-import { mockMetric } from '../../../../helpers/testMocks';
-import { renderComponent } from '../../../../helpers/testReactTestingUtils';
-import { QualityGateStatusConditionEnhanced } from '../../../../types/quality-gates';
-import QualityGateCondition from '../QualityGateCondition';
-
-it.each([
- [quickMock(MetricKey.reliability_rating)],
- [quickMock(MetricKey.security_rating)],
- [quickMock(MetricKey.sqale_rating)],
- [quickMock(MetricKey.new_reliability_rating, 'RATING', true)],
- [quickMock(MetricKey.new_security_rating, 'RATING', true)],
- [quickMock(MetricKey.new_maintainability_rating, 'RATING', true)],
- [quickMock(MetricKey.security_hotspots_reviewed)],
- [quickMock(MetricKey.new_security_hotspots_reviewed, 'RATING', true)],
-])('should render correclty', async (condition) => {
- renderQualityGateCondition({ condition });
- expect(
- await screen.findByText(`metric.${condition.measure.metric.name}.name`),
- ).toBeInTheDocument();
-
- expect(
- await screen.findByText(`quality_gates.operator.${condition.op}`, { exact: false }),
- ).toBeInTheDocument();
- // if (condition.measure.metric.type === 'RATING') {
- // expect(await screen.findByText('.rating', { exact: false })).toBeInTheDocument();
- // }
-});
-
-it('should show the count when metric is not rating', async () => {
- renderQualityGateCondition({ condition: quickMock(MetricKey.open_issues, MetricType.Integer) });
- expect(await screen.findByText('3 metric.open_issues.name')).toBeInTheDocument();
-});
-
-it('should work with branch', async () => {
- const condition = quickMock(MetricKey.new_maintainability_rating);
- renderQualityGateCondition({ branchLike: mockBranch(), condition });
-
- expect(await screen.findByText('metric.new_maintainability_rating.name')).toBeInTheDocument();
- expect(
- await screen.findByText('quality_gates.operator.GT.rating', { exact: false }),
- ).toBeInTheDocument();
-});
-
-function renderQualityGateCondition(props: Partial<QualityGateCondition['props']>) {
- return renderComponent(
- <QualityGateCondition
- component={{ key: 'abcd-key' }}
- condition={mockQualityGateStatusConditionEnhanced()}
- {...props}
- />,
- );
-}
-
-function quickMock(
- metric: MetricKey,
- type = 'RATING',
- addPeriod = false,
-): QualityGateStatusConditionEnhanced {
- return mockQualityGateStatusConditionEnhanced({
- error: '1',
- measure: {
- metric: mockMetric({
- key: metric,
- name: metric,
- type,
- }),
- value: '3',
- ...(addPeriod ? { period: { value: '3', index: 1 } } : {}),
- },
- metric,
- ...(addPeriod ? { period: 1 } : {}),
- });
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2024 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 { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import * as React from 'react';
-import { mockComponent } from '../../../../helpers/mocks/component';
-import { mockQualityGateStatusConditionEnhanced } from '../../../../helpers/mocks/quality-gates';
-import { mockMeasureEnhanced, mockMetric } from '../../../../helpers/testMocks';
-import { renderComponent } from '../../../../helpers/testReactTestingUtils';
-import { QualityGateStatusConditionEnhanced } from '../../../../types/quality-gates';
-import { QualityGateConditions, QualityGateConditionsProps } from '../QualityGateConditions';
-
-const ALL_CONDITIONS = 10;
-const HALF_CONDITIONS = 5;
-
-it('should render correctly', async () => {
- renderQualityGateConditions();
- expect(await screen.findAllByText(/.*metric..+.name.*/)).toHaveLength(ALL_CONDITIONS);
-
- expect(await screen.findAllByText('quality_gates.operator', { exact: false })).toHaveLength(
- ALL_CONDITIONS,
- );
-});
-
-it('should be collapsible', async () => {
- renderQualityGateConditions({ collapsible: true });
- const user = userEvent.setup();
-
- expect(await screen.findAllByText(/.*metric..+.name.*/)).toHaveLength(HALF_CONDITIONS);
- expect(await screen.findAllByText('quality_gates.operator', { exact: false })).toHaveLength(
- HALF_CONDITIONS,
- );
-
- await user.click(screen.getByRole('link', { name: 'show_more' }));
-
- expect(await screen.findAllByText(/.*metric..+.name.*/)).toHaveLength(ALL_CONDITIONS);
- expect(await screen.findAllByText('quality_gates.operator', { exact: false })).toHaveLength(
- ALL_CONDITIONS,
- );
-});
-
-function renderQualityGateConditions(props: Partial<QualityGateConditionsProps> = {}) {
- const conditions: QualityGateStatusConditionEnhanced[] = [];
- for (let i = ALL_CONDITIONS; i > 0; --i) {
- conditions.push(
- mockQualityGateStatusConditionEnhanced({
- measure: mockMeasureEnhanced({ metric: mockMetric({ key: i.toString() }) }),
- }),
- );
- }
-
- return renderComponent(
- <QualityGateConditions component={mockComponent()} failedConditions={conditions} {...props} />,
- );
-}
status: 'ERROR' as Status,
});
-it('should render correctly for an application for new code section', async () => {
- renderQualityGatePanelSection();
-
- expect(await screen.findByText('metric.new_coverage.name')).toBeInTheDocument();
- expect(screen.getByText('metric.new_violations.name')).toBeInTheDocument();
-});
-
-it('should render correctly for an application for overall code section', async () => {
- renderQualityGatePanelSection({ isNewCode: false });
-
- expect(await screen.findByText('metric.security_hotspots.name')).toBeInTheDocument();
-});
-
it('should render correctly for a project with 1 new code condition', () => {
renderQualityGatePanelSection({
isApplication: false,
qualityGate: mockQualityGate({ isBuiltIn: true }),
});
- expect(screen.queryByText('quality_gates.conditions.new_code_1')).not.toBeInTheDocument();
expect(await byRole('alertdialog').find()).toBeInTheDocument();
});
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2024 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 { screen } from '@testing-library/react';
-import React from 'react';
-import { MetricKey, MetricType } from '~sonar-aligned/types/metrics';
-import { mockQualityGateStatusConditionEnhanced } from '../../../../helpers/mocks/quality-gates';
-import { mockMetric } from '../../../../helpers/testMocks';
-import { renderComponent } from '../../../../helpers/testReactTestingUtils';
-import { QualityGateStatusConditionEnhanced } from '../../../../types/quality-gates';
-import QualityGateCondition from '../QualityGateCondition';
-import QualityGateSimplifiedCondition from '../QualityGateSimplifiedCondition';
-
-it('should show simplified condition', async () => {
- renderQualityGateCondition({
- condition: quickMock(MetricKey.new_violations, MetricType.Integer),
- });
- expect(await screen.findByText('metric.new_violations.name')).toBeInTheDocument();
-});
-
-function renderQualityGateCondition(props: Partial<QualityGateCondition['props']>) {
- return renderComponent(
- <QualityGateSimplifiedCondition
- component={{ key: 'abcd-key' }}
- condition={mockQualityGateStatusConditionEnhanced()}
- {...props}
- />,
- );
-}
-
-function quickMock(
- metric: MetricKey,
- type = MetricType.Rating,
- addPeriod = false,
- value = '3',
-): QualityGateStatusConditionEnhanced {
- return mockQualityGateStatusConditionEnhanced({
- error: '1',
- measure: {
- metric: mockMetric({
- key: metric,
- name: metric,
- type,
- }),
- value,
- ...(addPeriod ? { period: { value, index: 1 } } : {}),
- },
- metric,
- ...(addPeriod ? { period: 1 } : {}),
- });
-}
export default function ZeroNewIssuesSimplificationGuide({ qualityGate }: Readonly<Props>) {
const { currentUser, updateDismissedNotices } = React.useContext(CurrentUserContext);
const shouldRun =
+ Boolean(qualityGate.isBuiltIn) &&
currentUser.isLoggedIn &&
!currentUser.dismissedNotices[NoticeType.OVERVIEW_ZERO_NEW_ISSUES_SIMPLIFICATION];
import { formatMeasure } from '../../../sonar-aligned/helpers/measures';
import { PullRequest } from '../../../types/branch-like';
import { QualityGateStatusConditionEnhanced } from '../../../types/quality-gates';
-import { Component, MeasureEnhanced } from '../../../types/types';
+import { Component, MeasureEnhanced, QualityGate } from '../../../types/types';
import {
GridContainer,
StyleMeasuresCard,
conditions: QualityGateStatusConditionEnhanced[];
measures: MeasureEnhanced[];
pullRequest: PullRequest;
+ qualityGate?: QualityGate;
}
export default function MeasuresCardPanel(props: React.PropsWithChildren<Props>) {
- const { pullRequest, component, measures, conditions } = props;
+ const { pullRequest, component, measures, conditions, qualityGate } = props;
const newSecurityHotspots = getLeakValue(
findMeasure(measures, MetricKey.new_security_hotspots),
const totalFailedConditions = conditions.filter((condition) => condition.level === Status.ERROR);
return (
- <Card>
+ <Card className="sw-py-8 sw-px-6">
<GridContainer
- className={classNames('sw-relative sw-overflow-hidden sw-mt-8 js-summary', {
+ className={classNames('sw-relative sw-overflow-hidden js-summary', {
'sw-grid-cols-3': totalFailedConditions.length === 0,
'sw-grid-cols-4': totalFailedConditions.length > 0,
})}
{totalFailedConditions.length > 0 && (
<StyledConditionsCard className="sw-row-span-3">
<FailedConditions
+ qualityGate={qualityGate}
branchLike={pullRequest}
failedConditions={totalFailedConditions}
isNewCode
<IssueMeasuresCardInner
header={intl.formatMessage({ id: 'overview.new_issues' })}
data-testid={`overview__measures-${MetricKey.new_violations}`}
- data-guiding-id={
- isIssuesConditionFailed ? 'overviewZeroNewIssuesSimplification' : undefined
- }
metric={MetricKey.new_violations}
value={formatMeasure(issuesCount, MetricType.ShortInteger)}
url={issuesUrl}
import { AnalysisStatus } from '../components/AnalysisStatus';
import IgnoredConditionWarning from '../components/IgnoredConditionWarning';
import LastAnalysisLabel from '../components/LastAnalysisLabel';
-import ZeroNewIssuesSimplificationGuide from '../components/ZeroNewIssuesSimplificationGuide';
import '../styles.css';
import { PR_METRICS } from '../utils';
import MeasuresCardPanel from './MeasuresCardPanel';
pullRequest={pullRequest}
component={component}
conditions={enhancedConditions}
+ qualityGate={qualityGate}
measures={measures}
/>
- {qualityGate?.isBuiltIn && <ZeroNewIssuesSimplificationGuide qualityGate={qualityGate} />}
-
<SonarLintAd status={status} />
</div>
</PageContentFontWrapper>
import { screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import * as React from 'react';
-import { byLabelText, byRole } from '~sonar-aligned/helpers/testSelector';
+import { byRole, byText } from '~sonar-aligned/helpers/testSelector';
import { ComponentQualifier } from '~sonar-aligned/types/component';
import { MetricKey, MetricType } from '~sonar-aligned/types/metrics';
import BranchesServiceMock from '../../../../api/mocks/BranchesServiceMock';
renderPullRequestOverview();
await waitFor(async () => expect(await screen.findByText('metric.level.OK')).toBeInTheDocument());
- expect(screen.getByLabelText('overview.quality_gate_x.overview.gate.OK')).toBeInTheDocument();
+ expect(screen.getByText('metric.level.OK')).toBeInTheDocument();
expect(
byRole('link', {
});
renderPullRequestOverview();
- await waitFor(async () => expect(await screen.findByText('metric.level.OK')).toBeInTheDocument());
- expect(screen.getByLabelText('overview.quality_gate_x.overview.gate.OK')).toBeInTheDocument();
+ expect(await screen.findByText('metric.level.OK')).toBeInTheDocument();
expect(screen.getByText('metric.new_lines.name')).toBeInTheDocument();
expect(
});
renderPullRequestOverview();
- await waitFor(async () =>
- expect(
- await byLabelText('overview.quality_gate_x.overview.gate.ERROR').find(),
- ).toBeInTheDocument(),
- );
+ expect(await byText('metric.level.ERROR').find()).toBeInTheDocument();
expect(
byRole('link', {
- name: 'overview.measures.failed_badge overview.failed_condition.x_required 10.0% duplicated_lines≤ 1.0%',
+ name: '1 1 new_bugs quality_gates.operator.GT 3',
}).get(),
).toBeInTheDocument();
expect(
byRole('link', {
- name: 'overview.measures.failed_badge overview.failed_condition.x_required 10 new_bugs≤ 3',
+ name: '1.0% new_coverage quality_gates.operator.GT 2.0%',
}).get(),
).toBeInTheDocument();
});
renderPullRequestOverview();
- expect(
- await byLabelText('overview.quality_gate_x.overview.gate.ERROR').find(),
- ).toBeInTheDocument();
+ expect(await byText('metric.level.ERROR').find()).toBeInTheDocument();
expect(await byRole('alertdialog').find()).toBeInTheDocument();
});
}),
);
- await waitFor(async () =>
- expect(
- await byLabelText('overview.quality_gate_x.overview.gate.ERROR').find(),
- ).toBeInTheDocument(),
- );
+ expect(await byText('metric.level.ERROR').find()).toBeInTheDocument();
expect(await byRole('alertdialog').query()).not.toBeInTheDocument();
});
overview.pull_request.fixed_issues.disclaimer.2=When the pull request and the target branch are not synchronized, issues introduced on the target branch may be incorrectly considered fixed by the pull request. Rebasing the pull request would give an updated value.
overview.accepted_issues=Accepted issues
overview.accepted_issues.help=Valid issues that were not fixed
-overview.quality_gate.status=Quality Gate Status
overview.quality_gate=Quality Gate
overview.quality_gate_x=Quality Gate: {0}
overview.quality_gate.help=A Quality Gate is a set of measure-based Boolean conditions. It helps you know immediately whether your project is production-ready. If your current status is not Passed, you'll see which measures caused the problem and the values required to pass.
overview.quality_gate.ignored_conditions=Some Quality Gate conditions on New Code were ignored because of the small number of New Lines
overview.quality_gate.ignored_conditions.tooltip=At the start of a new code period, if very few lines have been added or modified, it might be difficult to reach the desired level of code coverage or duplications. To prevent Quality Gate failure when there's little that can be done about it, Quality Gate conditions about duplications in new code and coverage on new code are ignored until the number of new lines is at least 20. An administrator can disable this in the general settings.
overview.quality_gate.conditions_on_new_code=Only conditions on new code that are defined in the Quality Gate are checked. See the {link} associated to the project for details.
-overview.quality_gate.conditions.cayc.warning=The quality gate used by this project does not comply with Clean as You Code.
-overview.quality_gate.conditions.cayc.details=Fixing this quality gate will help you achieve a Clean Code state.
-overview.quality_gate.conditions.cayc.details_with_link=Fixing {link} will help you achieve a Clean Code state.
-overview.quality_gate.conditions.non_cayc.warning.link=this quality gate
-overview.quality_gate.conditions.cayc.link=Learn why
+overview.quality_gate.conditions.cayc.warning.title.APP=Some projects are not ready for Clean as You Code
+overview.quality_gate.conditions.cayc.warning.title.TRK=This project is not ready for Clean as You Code
+overview.quality_gate.conditions.cayc.details.APP=The quality gate used by these projects can be improved to enable Clean as You Code:
+overview.quality_gate.conditions.cayc.details.TRK=The quality gate used by this project can be improved to enable Clean as You Code.
+overview.quality_gate.conditions.cayc.details_with_link=The {link} used by this project can be improved to enable Clean as You Code.
+overview.quality_gate.conditions.non_cayc.warning.link=quality gate
+overview.quality_gate.conditions.cayc.link=Learn more
overview.quality_gates.conditions.condition_simplification_tour.title=One condition, zero issues
overview.quality_gates.conditions.condition_simplification_tour.content1=A new condition was introduced in {link} to ensure that new code has no issues.
overview.quality_gates.conditions.condition_simplification_tour.content1.link={0} quality gate
overview.quality_gates.conditions.condition_simplification_tour.content2=Starting now, every issue in new code must be resolved for a project to pass this quality gate.
-overview.quality_gate.application.non_cayc.projects_x={0} project(s) in this application use a Quality Gate that does not comply with Clean as You Code
overview.quality_gate.show_project_conditions_x=Show failed conditions for project {0}
overview.quality_gate.hide_project_conditions_x=Hide failed conditions for project {0}
overview.quality_gate.coverage=Coverage
projects / sonarqube.git / commitdiff