Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 21 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 1ac2802c367..8e46df094cb 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
@@ -126,33 +126,22 @@ export default {
     },
   },
   watch: {
-    isPipelineDataEmpty: {
+    pipelineData: {
       immediate: true,
-      handler(isDataEmpty) {
-        if (isDataEmpty) {
+      handler() {
+        if (this.isPipelineDataEmpty) {
           this.reportFailure(EMPTY_PIPELINE_DATA);
-        }
-      },
-    },
-    isInvalidCiConfig: {
-      immediate: true,
-      handler(isInvalid) {
-        if (isInvalid) {
+        } else if (this.isInvalidCiConfig) {
           this.reportFailure(INVALID_CI_CONFIG);
+        } else {
+          this.$nextTick(() => {
+            this.computeGraphDimensions();
+            this.prepareLinkData();
+          });
         }
       },
     },
   },
-  mounted() {
-    if (!this.isPipelineDataEmpty && !this.isInvalidCiConfig) {
-      // This guarantee that all sub-elements are rendered
-      // https://v3.vuejs.org/api/options-lifecycle-hooks.html#mounted
-      this.$nextTick(() => {
-        this.getGraphDimensions();
-        this.prepareLinkData();
-      });
-    }
-  },
   methods: {
     prepareLinkData() {
       try {
@@ -194,7 +183,7 @@ export default {
     removeHighlightNeeds() {
       this.highlightedJob = null;
     },
-    getGraphDimensions() {
+    computeGraphDimensions() {
       this.width = `${this.$refs[this.$options.CONTAINER_REF].scrollWidth}`;
       this.height = `${this.$refs[this.$options.CONTAINER_REF].scrollHeight}`;
     },