Merge branch 'nl-ai-icon' into 'master'

Use Duo icon and language for AI actions in editor

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153321



Merged-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: Suzanne Selhorn <sselhorn@gitlab.com>
Approved-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: Katie Macoy <kmacoy@gitlab.com>
Reviewed-by: Nick Leonard <nleonard@gitlab.com>
Co-authored-by: Nick Leonard <nleonard@gitlab.com>

doc/user/ai_experiments.md

@@ -171,7 +171,7 @@ To use this feature:
 You can generate the description for an issue from a short summary.
 
 1. Create a new issue.
-1. Above the **Description** field, select **AI actions > Generate issue description**.
+1. Above the **Description** field, select **GitLab Duo** (**{tanuki-ai}**) **> Generate issue description**.
 1. Write a short description and select **Submit**.
 
 The issue description is replaced with AI-generated text.

doc/user/project/merge_requests/ai_in_merge_requests.md

@@ -59,7 +59,7 @@ GitLab Duo fills in the template and replaces the contents of the description.
 To use GitLab Duo to generate a merge request description:
 
 1. [Create a new merge request](creating_merge_requests.md) and go to the **Description** field.
-1. Select **AI Actions** (**{tanuki}**).
+1. Select **GitLab Duo** (**{tanuki-ai}**).
 1. Select **Fill in merge request template**.
 
 The updated description is applied. You can edit or revise the description before you finish creating your merge request.

ee/app/assets/javascripts/ai/components/ai_actions_dropdown.vue

@@ -63,12 +63,7 @@ export default {
           },
         };
       });
-      return [
-        {
-          name: __('AI actions'),
-          items,
-        },
-      ];
+      return items;
     },
   },
   apollo: {
@@ -167,21 +162,21 @@ export default {
 <template>
   <gl-disclosure-dropdown
     :items="availableActions"
-    placement="right"
+    placement="bottom-start"
     class="comment-template-dropdown"
     no-caret
   >
     <template #toggle>
       <gl-button
         v-gl-tooltip
-        :title="__('AI actions')"
-        :aria-label="__('AI actions')"
+        :title="__('GitLab Duo')"
+        :aria-label="__('GitLab Duo')"
         category="tertiary"
         size="small"
         class="gl-mr-2 gl-px-2!"
       >
         <gl-loading-icon v-if="loading" />
-        <gl-icon v-else name="tanuki" />
+        <gl-icon v-else name="tanuki-ai" />
       </gl-button>
     </template>
     <template #list-item="{ item }">

ee/app/assets/javascripts/ai/editor_actions/generate_description.js

@@ -53,7 +53,7 @@ function initDescriptionModal() {
 
 export const generateDescriptionAction = () => ({
   title: s__('AI|Generate issue description'),
-  description: s__('AI|Creates issue description based on a short prompt'),
+  description: s__('AI|Create issue description based on a short prompt'),
   handler() {
     initDescriptionModal();
 

ee/spec/features/projects/issues/user_creates_issue_spec.rb

@@ -26,8 +26,8 @@
       visit(new_project_issue_path(project))
     end
 
-    it 'has the AI actions button' do
-      expect(page).to have_button('AI actions')
+    it 'has the GitLab Duo button' do
+      expect(page).to have_button('GitLab Duo')
     end
   end
 
@@ -39,8 +39,8 @@
       visit(new_project_issue_path(project))
     end
 
-    it 'does not have the AI actions button' do
-      expect(page).not_to have_button('AI actions')
+    it 'does not have the GitLab Duo button' do
+      expect(page).not_to have_button('GitLab Duo')
     end
   end
 

ee/spec/frontend/ai/components/ai_actions_dropdown_spec.js

@@ -81,7 +81,7 @@ describe('AI actions dropdown component', () => {
   it('passes down correct actions', () => {
     const actions = createActions();
     createWrapper(actions);
-    const [{ items }] = findDropdown().props('items');
+    const items = findDropdown().props('items');
     expect(items).toHaveLength(actions.length);
     expect(items[0].text).toBe(actions[0].title);
   });

locale/gitlab.pot

@@ -2024,9 +2024,6 @@ msgstr ""
 msgid "AI Agent was successfully deleted"
 msgstr ""
-msgid "AI actions"
-msgstr ""
-
 msgid "AI-generated summary"
 msgstr ""
@@ -2132,7 +2129,7 @@ msgstr ""
 msgid "AI|Autocomplete"
 msgstr ""
-msgid "AI|Creates issue description based on a short prompt"
+msgid "AI|Create issue description based on a short prompt"
 msgstr ""
 msgid "AI|Description is required"
@@ -23384,6 +23381,9 @@ msgstr ""
 msgid "GitLab Community Edition"
 msgstr ""
+msgid "GitLab Duo"
+msgstr ""
+
 msgid "GitLab Duo Pro seats"
 msgstr ""