--- /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 styled from '@emotion/styled';
+import { IconSparkle } from '@sonarsource/echoes-react';
+import { themeColor } from 'design-system';
+
+const AIGeneratedIcon = styled(IconSparkle)`
+ color: ${themeColor('primary')};
+`;
+
+export default AIGeneratedIcon;
export default function CaycCompliantBanner() {
return (
- <CardWithPrimaryBackground className="sw-mb-9 sw-p-8">
+ <CardWithPrimaryBackground className="sw-mt-9 sw-p-8">
<div className="sw-flex sw-items-center sw-mb-2">
<QGRecommendedIcon className="sw-mr-2" />
<SubHeadingHighlight className="sw-m-0">
export default function CaycNonCompliantBanner({ renderCaycModal, isOptimizing }: Readonly<Props>) {
return (
- <CardWithPrimaryBackground className="sw-mb-9 sw-p-8">
+ <CardWithPrimaryBackground className="sw-mt-9 sw-p-8">
<SubHeadingHighlight className="sw-mb-2">
{translate(
isOptimizing
import { CaycStatus, Condition as ConditionType, QualityGate } from '../../../types/types';
import { groupAndSortByPriorityConditions, isQualityGateOptimized } from '../utils';
import AddConditionModal from './AddConditionModal';
+import AIGeneratedIcon from './AIGeneratedIcon';
import CaycCompliantBanner from './CaycCompliantBanner';
import CaycCondition from './CaycCondition';
import CaYCConditionsSimplificationGuide from './CaYCConditionsSimplificationGuide';
}
export default function Conditions({ qualityGate, isFetching }: Readonly<Props>) {
- const [editing, setEditing] = React.useState<boolean>(
- qualityGate.caycStatus === CaycStatus.NonCompliant,
- );
- const { name } = qualityGate;
+ const { name, isBuiltIn, actions, conditions = [], caycStatus } = qualityGate;
+
+ const [editing, setEditing] = React.useState<boolean>(caycStatus === CaycStatus.NonCompliant);
const metrics = useMetrics();
- const canEdit = Boolean(qualityGate.actions?.manageConditions);
- const { conditions = [] } = qualityGate;
+ const { hasFeature } = useAvailableFeatures();
+
+ const canEdit = Boolean(actions?.manageConditions);
const existingConditions = conditions.filter((condition) => metrics[condition.metric]);
const { overallCodeConditions, newCodeConditions, caycConditions } =
- groupAndSortByPriorityConditions(existingConditions, metrics, qualityGate.isBuiltIn);
+ groupAndSortByPriorityConditions(existingConditions, metrics, isBuiltIn);
+ const isAICodeAssuranceQualityGate =
+ hasFeature(Feature.AiCodeAssurance) && isBuiltIn && name === 'Sonar way';
const duplicates: ConditionType[] = [];
const savedConditions = existingConditions.filter((condition) => condition.id != null);
duplicates.push(condition);
}
});
- const { hasFeature } = useAvailableFeatures();
const uniqDuplicates = uniqBy(duplicates, (d) => d.metric).map((condition) => ({
...condition,
// set edit only when the name is change
// i.e when user changes the quality gate
React.useEffect(() => {
- setEditing(qualityGate.caycStatus === CaycStatus.NonCompliant);
+ setEditing(caycStatus === CaycStatus.NonCompliant);
}, [name]); // eslint-disable-line react-hooks/exhaustive-deps
const docUrl = useDocUrl(DocLink.CaYC);
- const isCompliantCustomQualityGate =
- qualityGate.caycStatus !== CaycStatus.NonCompliant && !qualityGate.isBuiltIn;
+ const isCompliantCustomQualityGate = caycStatus !== CaycStatus.NonCompliant && !isBuiltIn;
const isOptimizing = isCompliantCustomQualityGate && !isQualityGateOptimized(qualityGate);
const renderCaycModal = React.useCallback(
({ onClose }: ModalProps) => {
- const { conditions = [] } = qualityGate;
- const canEdit = Boolean(qualityGate.actions?.manageConditions);
return (
<CaycReviewUpdateConditionsModal
qualityGate={qualityGate}
/>
);
},
- [qualityGate, metrics, isOptimizing],
+ [qualityGate, conditions, metrics, isOptimizing, canEdit],
);
return (
<div>
<CaYCConditionsSimplificationGuide qualityGate={qualityGate} />
- {qualityGate.isBuiltIn && (
- <div className="sw-flex sw-items-center sw-mt-2 sw-mb-9">
+ {isBuiltIn && (
+ <div className="sw-flex sw-items-center">
<QGRecommendedIcon className="sw-mr-1" />
<LightLabel>
<FormattedMessage
</div>
)}
+ {isAICodeAssuranceQualityGate && (
+ <div className="sw-flex sw-items-center sw-mt-2">
+ <AIGeneratedIcon className="sw-mr-1" />
+ <LightLabel>
+ <FormattedMessage
+ defaultMessage="quality_gates.ai_generated.description"
+ id="quality_gates.ai_generated.description"
+ values={{
+ link: (
+ <DocumentationLink to={DocLink.AiCodeAssurance}>
+ {translate('quality_gates.ai_generated.description.clean_ai_generated_code')}
+ </DocumentationLink>
+ ),
+ }}
+ />
+ </LightLabel>
+ </div>
+ )}
+
{isCompliantCustomQualityGate && !isOptimizing && <CaycCompliantBanner />}
{isCompliantCustomQualityGate && isOptimizing && canEdit && (
<CaycFixOptimizeBanner renderCaycModal={renderCaycModal} isOptimizing />
)}
- {qualityGate.caycStatus === CaycStatus.NonCompliant && canEdit && (
+ {caycStatus === CaycStatus.NonCompliant && canEdit && (
<CaycFixOptimizeBanner renderCaycModal={renderCaycModal} />
)}
- <header className="sw-flex sw-items-center sw-mb-4 sw-justify-between">
+ <header className="sw-flex sw-items-center sw-mt-9 sw-mb-4 sw-justify-between">
<div className="sw-flex">
<HeadingDark className="sw-typo-lg-semibold sw-m-0">
{translate('quality_gates.conditions')}
</HeadingDark>
- {!qualityGate.isBuiltIn && (
+ {!isBuiltIn && (
<DocHelpTooltip
className="sw-ml-2"
content={translate('quality_gates.conditions.help')}
<Spinner loading={isFetching} className="sw-ml-4 sw-mt-1" />
</div>
<div>
- {(qualityGate.caycStatus === CaycStatus.NonCompliant || editing) && canEdit && (
+ {(caycStatus === CaycStatus.NonCompliant || editing) && canEdit && (
<AddConditionModal qualityGate={qualityGate} />
)}
</div>
)}
</div>
- {qualityGate.caycStatus !== CaycStatus.NonCompliant && !editing && canEdit && (
+ {caycStatus !== CaycStatus.NonCompliant && !editing && canEdit && (
<div className="sw-mt-4 it__qg-unfollow-cayc">
<SubHeading as="p" className="sw-mb-2 sw-typo-default">
<FormattedMessage
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+import { Tooltip } from '@sonarsource/echoes-react';
import { Badge, BareButton, SubnavigationGroup, SubnavigationItem } from 'design-system';
import * as React from 'react';
import { useNavigate } from 'react-router-dom';
-import Tooltip from '../../../components/controls/Tooltip';
-
+import { useAvailableFeatures } from '../../../app/components/available-features/withAvailableFeatures';
import { translate } from '../../../helpers/l10n';
import { getQualityGateUrl } from '../../../helpers/urls';
+import { Feature } from '../../../types/features';
import { CaycStatus, QualityGate } from '../../../types/types';
+import AIGeneratedIcon from './AIGeneratedIcon';
import BuiltInQualityGateBadge from './BuiltInQualityGateBadge';
import QGRecommendedIcon from './QGRecommendedIcon';
export default function List({ qualityGates, currentQualityGate }: Props) {
const navigateTo = useNavigate();
-
- function redirectQualityGate(qualityGateName: string) {
- navigateTo(getQualityGateUrl(qualityGateName));
- }
+ const { hasFeature } = useAvailableFeatures();
return (
<SubnavigationGroup>
- {qualityGates.map((qualityGate) => {
- const isDefaultTitle = qualityGate.isDefault ? ` ${translate('default')}` : '';
- const isBuiltInTitle = qualityGate.isBuiltIn
- ? ` ${translate('quality_gates.built_in')}`
- : '';
+ {qualityGates.map(({ isDefault, isBuiltIn, name, caycStatus }) => {
+ const isDefaultTitle = isDefault ? ` ${translate('default')}` : '';
+ const isBuiltInTitle = isBuiltIn ? ` ${translate('quality_gates.built_in')}` : '';
+ const isAICodeAssuranceQualityGate =
+ hasFeature(Feature.AiCodeAssurance) && isBuiltIn && name === 'Sonar way';
return (
<SubnavigationItem
className="it__list-group-item"
- active={currentQualityGate === qualityGate.name}
- key={qualityGate.name}
+ active={currentQualityGate === name}
+ key={name}
onClick={() => {
- redirectQualityGate(qualityGate.name);
+ navigateTo(getQualityGateUrl(name));
}}
>
<div className="sw-flex sw-flex-col sw-min-w-0">
<BareButton
- aria-current={currentQualityGate === qualityGate.name && 'page'}
- title={`${qualityGate.name}${isDefaultTitle}${isBuiltInTitle}`}
+ aria-current={currentQualityGate === name && 'page'}
+ title={`${name}${isDefaultTitle}${isBuiltInTitle}`}
className="sw-flex-1 sw-text-ellipsis sw-overflow-hidden sw-max-w-abs-250 sw-whitespace-nowrap"
>
- {qualityGate.name}
+ {name}
</BareButton>
- {(qualityGate.isDefault || qualityGate.isBuiltIn) && (
+ {(isDefault || isBuiltIn) && (
<div className="sw-mt-2">
- {qualityGate.isDefault && (
- <Badge className="sw-mr-2">{translate('default')}</Badge>
- )}
- {qualityGate.isBuiltIn && <BuiltInQualityGateBadge />}
+ {isDefault && <Badge className="sw-mr-2">{translate('default')}</Badge>}
+ {isBuiltIn && <BuiltInQualityGateBadge />}
</div>
)}
</div>
- {qualityGate.caycStatus !== CaycStatus.NonCompliant && (
- <Tooltip content={translate('quality_gates.cayc.tooltip.message')}>
- <span>
- <QGRecommendedIcon />
- </span>
- </Tooltip>
- )}
+ <div>
+ {isAICodeAssuranceQualityGate && (
+ <Tooltip content={translate('quality_gates.ai_generated.tootltip.message')}>
+ <span className="sw-mr-1">
+ <AIGeneratedIcon />
+ </span>
+ </Tooltip>
+ )}
+ {caycStatus !== CaycStatus.NonCompliant && (
+ <Tooltip content={translate('quality_gates.cayc.tooltip.message')}>
+ <span>
+ <QGRecommendedIcon />
+ </span>
+ </Tooltip>
+ )}
+ </div>
</SubnavigationItem>
);
})}
await user.click(nonCompliantQualityGate);
expect(await screen.findByText(/quality_gates.cayc_missing.banner.title/)).toBeInTheDocument();
- expect(screen.getAllByText('quality_gates.cayc.tooltip.message').length).toBeGreaterThan(0);
});
it('should show optimize banner when quality gate is compliant but non-CaYC and user has permission to edit it', async () => {
});
await user.click(nonCompliantQualityGate);
- // expect(screen.getByTestId('conditions')).toMatchSnapshot();
expect(await screen.findByText(/quality_gates.cayc_optimize.banner.title/)).toBeInTheDocument();
- expect(screen.getAllByText('quality_gates.cayc.tooltip.message').length).toBeGreaterThan(0);
});
it('should render CaYC conditions on a separate table if Sonar way', async () => {
expect(byRole('alertdialog').query()).not.toBeInTheDocument();
});
+it('should advertise the Sonar way Quality Gate as AI-ready', async () => {
+ const user = userEvent.setup();
+ qualityGateHandler.setIsAdmin(true);
+ renderQualityGateApp({
+ currentUser: mockLoggedInUser({
+ dismissedNotices: { [NoticeType.QG_CAYC_CONDITIONS_SIMPLIFICATION]: true },
+ }),
+ featureList: [Feature.AiCodeAssurance],
+ });
+
+ await user.click(await screen.findByRole('link', { name: /Sonar way/ }));
+ expect(
+ await screen.findByRole('link', {
+ name: 'quality_gates.ai_generated.description.clean_ai_generated_code open_in_new_tab',
+ }),
+ ).toBeInTheDocument();
+});
+
it('should not allow to change value of prioritized_rule_issues', async () => {
const user = userEvent.setup();
qualityGateHandler.setIsAdmin(true);
export enum DocLink {
AccountTokens = '/user-guide/managing-tokens/',
ActiveVersions = '/server-upgrade-and-maintenance/upgrade/upgrade-the-server/active-versions/',
+ AiCodeAssurance = '/ai-features/ai-code-assurance/',
AlmAzureIntegration = '/devops-platform-integration/azure-devops-integration/',
AlmBitBucketCloudAuth = '/instance-administration/authentication/bitbucket-cloud/',
AlmBitBucketCloudIntegration = '/devops-platform-integration/bitbucket-integration/bitbucket-cloud-integration/',
GitlabProvisioning = 'gitlab-provisioning',
PrioritizedRules = 'prioritized-rules',
FixSuggestions = 'fix-suggestions',
+ AiCodeAssurance = 'ai-code-assurance',
}
quality_gates.cayc_unfollow.description=You may click unlock to edit this quality gate. Adding extra conditions to a compliant quality gate can result in drawbacks. Are you reconsidering {cayc_link}? We strongly recommend this methodology to achieve a Clean Code status.
quality_gates.cayc.review_update_modal.add_condition.header= {0} condition(s) on new code will be added
quality_gates.cayc.review_update_modal.modify_condition.header= {0} condition(s) on new code will be modified
+quality_gates.ai_generated.tootltip.message=Sonar way ensures clean AI-generated code
+quality_gates.ai_generated.description=Sonar way ensures {link}
+quality_gates.ai_generated.description.clean_ai_generated_code=clean AI-generated code
#------------------------------------------------------------------------------
#
projects / sonarqube.git / commitdiff