Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-18 00:09:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-18 00:09:57 +0300
commit43678813e8265b8a00b3039fce155f4c20947a7a (patch)
tree0bd6d4f8ecfebf00e5cde7770d73aec62973d800 /app/assets/javascripts/pipelines
parentf3b791d5d5b0b058d2b717da1a54a63f3bba5adc (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r--app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue13
1 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
index 73e5f2542fb..47f0e30b76c 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
@@ -47,8 +47,11 @@ export default {
};
},
computed: {
+ pipelineStages() {
+ return this.pipelineData?.stages || [];
+ },
isPipelineDataEmpty() {
- return !this.isInvalidCiConfig && isEmpty(this.pipelineData?.stages);
+ return !this.isInvalidCiConfig && isEmpty(this.pipelineStages);
},
isInvalidCiConfig() {
return this.pipelineData?.status === CI_CONFIG_STATUS_INVALID;
@@ -133,7 +136,7 @@ export default {
methods: {
prepareLinkData() {
try {
- const arrayOfJobs = unwrapArrayOfJobs(this.pipelineData);
+ const arrayOfJobs = unwrapArrayOfJobs(this.pipelineStages);
const parsedData = parseData(arrayOfJobs);
this.links = generateLinksData(parsedData, this.$options.CONTAINER_ID);
} catch {
@@ -141,7 +144,7 @@ export default {
}
},
getStageBackgroundClasses(index) {
- const { length } = this.pipelineData.stages;
+ const { length } = this.pipelineStages;
// It's possible for a graph to have only one stage, in which
// case we concatenate both the left and right rounding classes
if (length === 1) {
@@ -162,7 +165,7 @@ export default {
// The first time we hover, we create the object where
// we store all the data to properly highlight the needs.
if (!this.needsObject) {
- const jobs = createJobsHash(this.pipelineData);
+ const jobs = createJobsHash(this.pipelineStages);
this.needsObject = generateJobNeedsDict(jobs) ?? {};
}
@@ -227,7 +230,7 @@ export default {
</template>
</svg>
<div
- v-for="(stage, index) in pipelineData.stages"
+ v-for="(stage, index) in pipelineStages"
:key="`${stage.name}-${index}`"
class="gl-flex-direction-column"
>