From 3cccd102ba543e02725d247893729e5c73b38295 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Apr 2022 10:00:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-10-stable-ee --- .../components/graph/graph_component_wrapper.vue | 1 + .../pipelines/components/graph/job_item.vue | 3 +- .../pipelines/components/graph/linked_pipeline.vue | 4 +- .../components/graph/stage_column_component.vue | 4 +- .../pipelines/components/header_component.vue | 4 +- .../components/jobs_shared/job_name_component.vue | 2 +- .../pipelines/components/pipeline_tabs.vue | 50 +++++ .../components/pipelines_list/empty_state.vue | 2 +- .../pipelines_list/empty_state/ci_templates.vue | 81 ++++++++ .../empty_state/pipelines_ci_templates.vue | 173 ++++++++++++++++ .../pipelines_list/pipeline_triggerer.vue | 22 +-- .../components/pipelines_list/pipeline_url.vue | 11 ++ .../pipelines_list/pipelines_ci_templates.vue | 219 --------------------- .../components/pipelines_list/pipelines_table.vue | 6 +- .../components/pipelines_list/time_ago.vue | 32 +-- .../tokens/pipeline_trigger_author_token.vue | 8 +- .../queries/get_pipeline_jobs.query.graphql | 2 +- .../pipelines/pipeline_details_bundle.js | 77 ++++---- app/assets/javascripts/pipelines/pipeline_tabs.js | 44 +++++ .../pipelines/services/pipelines_service.js | 2 +- .../pipelines/stores/pipelines_store.js | 2 +- .../pipelines/stores/test_reports/actions.js | 1 + .../pipelines/stores/test_reports/utils.js | 2 +- 23 files changed, 443 insertions(+), 309 deletions(-) create mode 100644 app/assets/javascripts/pipelines/components/pipeline_tabs.vue create mode 100644 app/assets/javascripts/pipelines/components/pipelines_list/empty_state/ci_templates.vue create mode 100644 app/assets/javascripts/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue delete mode 100644 app/assets/javascripts/pipelines/components/pipelines_list/pipelines_ci_templates.vue create mode 100644 app/assets/javascripts/pipelines/pipeline_tabs.js (limited to 'app/assets/javascripts/pipelines') diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue index e995d400907..534ad25a35d 100644 --- a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue +++ b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue @@ -273,6 +273,7 @@ export default { diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue index c59f56fc68f..d59802196af 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue +++ b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue @@ -133,7 +133,7 @@ export default { class="gl-h-full gl-display-flex! gl-border-solid gl-border-gray-100 gl-border-1" :class="flexDirection" :title="tooltipText" - data-qa-selector="child_pipeline" + data-qa-selector="linked_pipeline_container" @mouseover="onDownstreamHovered" @mouseleave="onDownstreamHoverLeave" > @@ -171,7 +171,7 @@ export default { :icon="expandedIcon" :aria-label="__('Expand pipeline')" data-testid="expand-pipeline-button" - data-qa-selector="expand_pipeline_button" + data-qa-selector="expand_linked_pipeline_button" @click="onClickLinkedPipeline" /> diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue index b0f375c9aeb..6ab4eb58977 100644 --- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue @@ -141,7 +141,9 @@ export default { class="gl-display-flex gl-justify-content-space-between gl-relative" :class="$options.titleClasses" > -
{{ formattedTitle }}
+ + {{ formattedTitle }} + -import ciIcon from '../../../vue_shared/components/ci_icon.vue'; +import ciIcon from '~/vue_shared/components/ci_icon.vue'; /** * Component that renders both the CI icon status and the job name. diff --git a/app/assets/javascripts/pipelines/components/pipeline_tabs.vue b/app/assets/javascripts/pipelines/components/pipeline_tabs.vue new file mode 100644 index 00000000000..62c785d7ad2 --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipeline_tabs.vue @@ -0,0 +1,50 @@ + + + diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue index 0380ba646cc..5a9c85a0f10 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue @@ -1,7 +1,7 @@ + diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue new file mode 100644 index 00000000000..be46a7f5cec --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue @@ -0,0 +1,173 @@ + + diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue index b29c8426301..2a73795db0a 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue @@ -1,10 +1,14 @@