diff --git a/ee/app/assets/javascripts/ai/tanuki_bot/components/app.vue b/ee/app/assets/javascripts/ai/tanuki_bot/components/app.vue index 45d22521c9fd509f138613617dc900f88d25c266..02f0ba48401a915c0ce1dc7abf0aa7c8bd23e6f8 100644 --- a/ee/app/assets/javascripts/ai/tanuki_bot/components/app.vue +++ b/ee/app/assets/javascripts/ai/tanuki_bot/components/app.vue @@ -34,6 +34,7 @@ export default { __('How do I create a template?'), ], }, + helpPagePath: helpPagePath('policy/experiment-beta-support', { anchor: 'beta' }), components: { GlDuoChat, }, @@ -113,11 +114,6 @@ export default { }, computed: { ...mapState(['loading', 'messages']), - experimentHelpPagePath() { - return helpPagePath('policy/experiment-beta-support', { - anchor: this.glFeatures.duoChatBeta ? 'beta' : 'experiment', - }); - }, }, methods: { ...mapActions(['addDuoChatMessage', 'setMessages', 'setLoading']), @@ -183,9 +179,8 @@ export default { :error="error" :is-loading="loading" :predefined-prompts="$options.i18n.predefinedPrompts" - :experiment-help-page-url="$options.experimentHelpPagePath" - :badge-type="glFeatures.duoChatBeta ? 'beta' : 'experiment'" - :badge-help-page-url="experimentHelpPagePath" + badge-type="beta" + :badge-help-page-url="$options.helpPagePath" :tool-name="toolName" class="gl-z-index-9999" @send-chat-prompt="onSendChatPrompt" diff --git a/ee/config/feature_flags/development/duo_chat_beta.yml b/ee/config/feature_flags/development/duo_chat_beta.yml deleted file mode 100644 index 9908aaddbf6d92e9948fee26738740e6f07094c6..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/development/duo_chat_beta.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: duo_chat_beta -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136059 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430071 -milestone: '16.6' -type: development -group: group::ai framework -default_enabled: false diff --git a/ee/lib/ee/gitlab/gon_helper.rb b/ee/lib/ee/gitlab/gon_helper.rb index ab54211531b5ee9cf9318c4610b3e3099f8300cf..5237ede69f2bc7d41df9334bb2ceed481424930f 100644 --- a/ee/lib/ee/gitlab/gon_helper.rb +++ b/ee/lib/ee/gitlab/gon_helper.rb @@ -27,8 +27,6 @@ def add_gon_variables gon.payment_form_url = ::Gitlab::Routing.url_helpers.subscription_portal_payment_form_url gon.payment_validation_form_id = ::Gitlab::SubscriptionPortal::PAYMENT_VALIDATION_FORM_ID end - - push_frontend_feature_flag(:duo_chat_beta) end # Exposes if a licensed feature is available. diff --git a/ee/spec/frontend/ai/tanuki_bot/components/app_spec.js b/ee/spec/frontend/ai/tanuki_bot/components/app_spec.js index e0177322b55d59ac1f1d50fc78e291c134176a9e..46698a8b5731daace92c390b806fe3fb6a660888 100644 --- a/ee/spec/frontend/ai/tanuki_bot/components/app_spec.js +++ b/ee/spec/frontend/ai/tanuki_bot/components/app_spec.js @@ -47,7 +47,6 @@ describe('GitLab Duo Chat', () => { const createComponent = ({ initialState = {}, propsData = { userId: MOCK_USER_ID, resourceId: MOCK_RESOURCE_ID }, - glFeatures = { duoChatBeta: false }, } = {}) => { const store = new Vuex.Store({ actions: actionSpies, @@ -66,9 +65,6 @@ describe('GitLab Duo Chat', () => { store, apolloProvider, propsData, - provide: { - glFeatures, - }, }); }; @@ -119,18 +115,11 @@ describe('GitLab Duo Chat', () => { expect(findGlDuoChat().exists()).toBe(true); }); - it.each` - isFlagEnabled | expectedPropValue | expectedAnchorValue - ${true} | ${'beta'} | ${'#beta'} - ${false} | ${'experiment'} | ${'#experiment'} - `( - 'sets correct `badge-type` and `badge-help-page-url` props on the chat compnent when feature flag is $isFlagEnabled', - ({ isFlagEnabled, expectedPropValue, expectedAnchorValue }) => { - createComponent({ glFeatures: { duoChatBeta: isFlagEnabled } }); - expect(findGlDuoChat().props('badgeType')).toBe(expectedPropValue); - expect(findGlDuoChat().props('badgeHelpPageUrl')).toContain(expectedAnchorValue); - }, - ); + it('sets correct `badge-type` and `badge-help-page-url` props on the chat compnent', () => { + createComponent(); + expect(findGlDuoChat().props('badgeType')).toBe('beta'); + expect(findGlDuoChat().props('badgeHelpPageUrl')).toContain('#beta'); + }); }); describe('events handling', () => {