From ce1a469afa71e197011c4c461049e341ffc3b2d2 Mon Sep 17 00:00:00 2001 From: Mark Florian Date: Thu, 2 Apr 2020 14:57:57 +0100 Subject: [PATCH 1/2] Tweak Dependency List pipeline subheading text This also takes the opportunity to switch to `GlSprintf` for i18n. Part of [Update dependencies table UI][1]. [1]: https://gitlab.com/gitlab-org/gitlab/-/issues/195928 --- .../dependencies/components/app.vue | 27 +++++++++---------- ...hange-dependency-list-pipeline-message.yml | 5 ++++ .../dependencies/components/app_spec.js | 6 ++--- 3 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 ee/changelogs/unreleased/195928-change-dependency-list-pipeline-message.yml diff --git a/ee/app/assets/javascripts/dependencies/components/app.vue b/ee/app/assets/javascripts/dependencies/components/app.vue index 101ddbb0ead702..66b3f2a396651f 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 00000000000000..cd10a890fcf7b1 --- /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 e215ed580eaf37..44569fff7afa47 100644 --- a/ee/spec/frontend/dependencies/components/app_spec.js +++ b/ee/spec/frontend/dependencies/components/app_spec.js @@ -1,4 +1,4 @@ -import { GlBadge, GlEmptyState, GlLoadingIcon, GlTab, GlLink } from '@gitlab/ui'; +import { GlBadge, GlEmptyState, GlLoadingIcon, GlSprintf, GlTab, GlLink } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import createStore from 'ee/dependencies/store'; @@ -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); -- GitLab From 28e8094bd3bcaf48a775bdf1e3ff605ea64b98ce Mon Sep 17 00:00:00 2001 From: Mark Florian Date: Thu, 2 Apr 2020 15:43:09 +0100 Subject: [PATCH 2/2] Fix job failures --- ee/app/assets/javascripts/dependencies/components/app.vue | 2 +- ee/spec/frontend/dependencies/components/app_spec.js | 2 +- locale/gitlab.pot | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ee/app/assets/javascripts/dependencies/components/app.vue b/ee/app/assets/javascripts/dependencies/components/app.vue index 66b3f2a396651f..55a044069b3825 100644 --- a/ee/app/assets/javascripts/dependencies/components/app.vue +++ b/ee/app/assets/javascripts/dependencies/components/app.vue @@ -173,7 +173,7 @@ export default { :message="s__('Dependencies|Based on the %{linkStart}latest successful%{linkEnd} scan')" >