Merge branch '339113-remove-download-text' into 'master'

Remove download text from pipeline artifact dropdown items

See merge request gitlab-org/gitlab!70982

app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue

@@ -5,7 +5,6 @@ import {
   GlDropdownItem,
   GlDropdownSectionHeader,
   GlLoadingIcon,
-  GlSprintf,
   GlTooltipDirective,
 } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
@@ -13,7 +12,6 @@ import { __, s__ } from '~/locale';
 
 export const i18n = {
   artifacts: __('Artifacts'),
-  downloadArtifact: __('Download %{name} artifact'),
   artifactSectionHeader: __('Download artifacts'),
   artifactsFetchErrorMessage: s__('Pipelines|Could not load artifacts.'),
   emptyArtifactsMessage: __('No artifacts found'),
@@ -30,7 +28,6 @@ export default {
     GlDropdownItem,
     GlDropdownSectionHeader,
     GlLoadingIcon,
-    GlSprintf,
   },
   inject: {
     artifactsEndpoint: {
@@ -113,9 +110,7 @@ export default {
       class="gl-word-break-word"
       data-testid="artifact-item"
     >
-      <gl-sprintf :message="$options.i18n.downloadArtifact">
-        <template #name>{{ artifact.name }}</template>
-      </gl-sprintf>
+      {{ artifact.name }}
     </gl-dropdown-item>
   </gl-dropdown>
 </template>

app/assets/javascripts/pipelines/components/pipelines_list/pipelines_artifacts.vue

@@ -3,8 +3,8 @@ import {
   GlAlert,
   GlDropdown,
   GlDropdownItem,
+  GlDropdownSectionHeader,
   GlLoadingIcon,
-  GlSprintf,
   GlTooltipDirective,
 } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
@@ -12,7 +12,6 @@ import { __, s__ } from '~/locale';
 
 export const i18n = {
   artifacts: __('Artifacts'),
-  downloadArtifact: __('Download %{name} artifact'),
   artifactSectionHeader: __('Download artifacts'),
   artifactsFetchErrorMessage: s__('Pipelines|Could not load artifacts.'),
   noArtifacts: s__('Pipelines|No artifacts available'),
@@ -27,8 +26,8 @@ export default {
     GlAlert,
     GlDropdown,
     GlDropdownItem,
+    GlDropdownSectionHeader,
     GlLoadingIcon,
-    GlSprintf,
   },
   inject: {
     artifactsEndpoint: {
@@ -92,6 +91,10 @@ export default {
     text-sr-only
     @show.once="fetchArtifacts"
   >
+    <gl-dropdown-section-header>{{
+      $options.i18n.artifactSectionHeader
+    }}</gl-dropdown-section-header>
+
     <gl-alert v-if="hasError" variant="danger" :dismissible="false">
       {{ $options.i18n.artifactsFetchErrorMessage }}
     </gl-alert>
@@ -108,10 +111,9 @@ export default {
       :href="artifact.path"
       rel="nofollow"
       download
+      class="gl-word-break-word"
     >
-      <gl-sprintf :message="$options.i18n.downloadArtifact">
-        <template #name>{{ artifact.name }}</template>
-      </gl-sprintf>
+      {{ artifact.name }}
     </gl-dropdown-item>
   </gl-dropdown>
 </template>

locale/gitlab.pot

@@ -12132,9 +12132,6 @@ msgstr ""
 msgid "Download %{format}:"
 msgstr ""
 
-msgid "Download %{name} artifact"
-msgstr ""
-
 msgid "Download (%{fileSizeReadable})"
 msgstr ""
 

spec/frontend/pipelines/pipeline_multi_actions_spec.js

@@ -95,7 +95,7 @@ describe('Pipeline Multi Actions Dropdown', () => {
       createComponent({ mockData: { artifacts } });
 
       expect(findFirstArtifactItem().attributes('href')).toBe(artifacts[0].path);
-      expect(findFirstArtifactItem().text()).toBe(`Download ${artifacts[0].name} artifact`);
+      expect(findFirstArtifactItem().text()).toBe(artifacts[0].name);
     });
 
     it('should render empty message when no artifacts are found', () => {

spec/frontend/pipelines/pipelines_artifacts_spec.js

@@ -87,8 +87,7 @@ describe('Pipelines Artifacts dropdown', () => {
     createComponent({ mockData: { artifacts } });
 
     expect(findFirstGlDropdownItem().attributes('href')).toBe(artifacts[0].path);
-
-    expect(findFirstGlDropdownItem().text()).toBe(`Download ${artifacts[0].name} artifact`);
+    expect(findFirstGlDropdownItem().text()).toBe(artifacts[0].name);
   });
 
   describe('with a failing request', () => {