diff --git a/ee/app/assets/javascripts/vulnerabilities/components/header.vue b/ee/app/assets/javascripts/vulnerabilities/components/header.vue index ea8be5d422a9f0823b2d2a9c093dd0bfca2c3c73..9c59ec2a0330389d52a4cf07272d03d2ed55799c 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/header.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/header.vue @@ -14,7 +14,7 @@ import { convertObjectPropsToSnakeCase } from '~/lib/utils/common_utils'; import download from '~/lib/utils/downloader'; import { visitUrl } from '~/lib/utils/url_utility'; import UsersCache from '~/lib/utils/users_cache'; -import { __, s__ } from '~/locale'; +import { s__ } from '~/locale'; import aiResponseSubscription from 'ee/graphql_shared/subscriptions/ai_completion_response.subscription.graphql'; import aiResolveVulnerability from '../graphql/ai_resolve_vulnerability.mutation.graphql'; import { @@ -45,14 +45,6 @@ export const EXPLAIN_VULNERABILITY_AI_ACTION = { category: 'primary', }; -export const CREATE_MR_AI_ACTION_DEPRECATED = { - ...CREATE_MR_AI_ACTION, - badge: __('Experiment'), - tooltip: s__( - 'AI|This is an experiment feature that uses AI to provide recommendations for resolving this vulnerability. Use this feature with caution.', - ), -}; - export const CLIENT_SUBSCRIPTION_ID = uuidv4(); export default { @@ -98,7 +90,7 @@ export default { } if (this.glAbilities.resolveVulnerabilityWithAi) { - buttons.push(CREATE_MR_AI_ACTION_DEPRECATED); + buttons.push(CREATE_MR_AI_ACTION); } if (this.glAbilities.explainVulnerabilityWithAi) { diff --git a/ee/spec/frontend/vulnerabilities/header_spec.js b/ee/spec/frontend/vulnerabilities/header_spec.js index e8a1d1e9b45429c36c95332babd603e3390c4ebb..b8eaacbb5bfa7e3da8dbc449b2e053ee0702730c 100644 --- a/ee/spec/frontend/vulnerabilities/header_spec.js +++ b/ee/spec/frontend/vulnerabilities/header_spec.js @@ -396,28 +396,6 @@ describe('Vulnerability Header', () => { }); }); - describe('when using experimental "Resolve with AI" (deprecated)', () => { - it('passes the experiment badge, tooltip, category, and tanuki icon', () => { - createWrapper({ - glFeatures: { - explainVulnerabilityTool: false, - resolveVulnerability: true, - vulnerabilityResolutionGa: false, - }, - vulnerability: getVulnerability(), - }); - - const buttons = findSplitButton().props('buttons'); - expect(buttons[0]).toMatchObject({ - badge: 'Experiment', - tooltip: - 'This is an experiment feature that uses AI to provide recommendations for resolving this vulnerability. Use this feature with caution.', - icon: 'tanuki-ai', - category: 'primary', - }); - }); - }); - describe('when the "vulnerabilityResolutionGa" feature flag is disabled', () => { it('shows the split button and does not show the dropdown button with the list of available actions', () => { createWrapper({ @@ -689,19 +667,6 @@ describe('Vulnerability Header', () => { }); }); - // Note: when the `resolveVulnerability` is removed, these tests can be deleted as well - it('does not pass the experimental badge or tooltip', () => { - createWrapper({ - vulnerability: getVulnerability(), - glFeatures: { - vulnerabilityResolutionGa: false, - }, - }); - - expect(findResolveWithAIButton()).toHaveProperty('badge'); - expect(findResolveWithAIButton()).toHaveProperty('tooltip'); - }); - it('continues to show the loading state into the redirect call', async () => { await createWrapperWithAiApollo(); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index eaae07a4121c47b764b9eb884a679db9163ccf11..c950c1c44aeaa969f2865bceaec489a82c1680e9 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2348,9 +2348,6 @@ msgstr "" msgid "AI|The existing description will be replaced when you submit." msgstr "" -msgid "AI|This is an experiment feature that uses AI to provide recommendations for resolving this vulnerability. Use this feature with caution." -msgstr "" - msgid "AI|To help improve the quality of the content, send your feedback to GitLab team members." msgstr ""