diff --git a/ee/app/assets/javascripts/dependencies/components/app.vue b/ee/app/assets/javascripts/dependencies/components/app.vue index 101ddbb0ead702f381499c278549c370ac694508..55a044069b38257cd605f26a52991c850e5f1e9a 100644 --- a/ee/app/assets/javascripts/dependencies/components/app.vue +++ b/ee/app/assets/javascripts/dependencies/components/app.vue @@ -4,12 +4,13 @@ import { GlBadge, GlEmptyState, GlLoadingIcon, + GlSprintf, GlTab, GlTabs, GlLink, GlDeprecatedButton, } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; +import { __ } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; import DependenciesActions from './dependencies_actions.vue'; import DependencyListIncompleteAlert from './dependency_list_incomplete_alert.vue'; @@ -25,6 +26,7 @@ export default { GlBadge, GlEmptyState, GlLoadingIcon, + GlSprintf, GlTab, GlTabs, GlLink, @@ -80,18 +82,6 @@ export default { this.setCurrentList(namespace); }, }, - subHeadingText() { - const { jobPath } = this.reportInfo; - - const body = __( - 'Displays dependencies and known vulnerabilities, based on the %{linkStart}latest successful%{linkEnd} scan', - ); - - const linkStart = jobPath ? `` : ''; - const linkEnd = jobPath ? '' : ''; - - return sprintf(body, { linkStart, linkEnd }, false); - }, showEmptyState() { return this.isJobNotSetUp || this.hasNoDependencies; }, @@ -179,7 +169,16 @@ export default {

- + + + {{ generatedAtTimeAgo }} diff --git a/ee/changelogs/unreleased/195928-change-dependency-list-pipeline-message.yml b/ee/changelogs/unreleased/195928-change-dependency-list-pipeline-message.yml new file mode 100644 index 0000000000000000000000000000000000000000..cd10a890fcf7b19e58355da66dc3ff708a4e9b7b --- /dev/null +++ b/ee/changelogs/unreleased/195928-change-dependency-list-pipeline-message.yml @@ -0,0 +1,5 @@ +--- +title: Make Dependency List pipeline subheading more succinct +merge_request: 28665 +author: +type: changed diff --git a/ee/spec/frontend/dependencies/components/app_spec.js b/ee/spec/frontend/dependencies/components/app_spec.js index e215ed580eaf375110b3303328010d102a963abb..bdc7e6cebd99374df2c14f7ded195bfb6a4d802b 100644 --- a/ee/spec/frontend/dependencies/components/app_spec.js +++ b/ee/spec/frontend/dependencies/components/app_spec.js @@ -30,7 +30,7 @@ describe('DependenciesApp component', () => { addListType(store, DEPENDENCY_LIST_TYPES.vulnerable); jest.spyOn(store, 'dispatch').mockImplementation(); - const canBeStubbed = component => !['GlTab', 'GlTabs'].includes(component); + const canBeStubbed = component => !['GlSprintf', 'GlTab', 'GlTabs'].includes(component); const stubs = Object.keys(DependenciesApp.components).filter(canBeStubbed); wrapper = mount(DependenciesApp, { @@ -107,7 +107,7 @@ describe('DependenciesApp component', () => { const findHeader = () => wrapper.find('section > header'); const findHeaderHelpLink = () => findHeader().find(GlLink); - const findHeaderJobLink = () => findHeader().find('a'); + const findHeaderJobLink = () => wrapper.find({ ref: 'jobLink' }); const expectComponentWithProps = (Component, props = {}) => { const componentWrapper = wrapper.find(Component); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b9f0e1f7b8b893b7e760b5c29e9bad682af4434f..248c9ba5ecf2f8b37ad7058179517405f2dea606 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6567,6 +6567,9 @@ msgstr "" msgid "Dependencies|All" msgstr "" +msgid "Dependencies|Based on the %{linkStart}latest successful%{linkEnd} scan" +msgstr "" + msgid "Dependencies|Component" msgstr "" @@ -7124,9 +7127,6 @@ msgstr "" msgid "Display source" msgstr "" -msgid "Displays dependencies and known vulnerabilities, based on the %{linkStart}latest successful%{linkEnd} scan" -msgstr "" - msgid "Do not display offers from third parties within GitLab" msgstr ""