diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 12:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 12:09:43 +0300 |
commit | f5050253469fc0961c02deec0e698ad62bdd9de5 (patch) | |
tree | 30bbd8f8b556fd5b730f0123921138ee1d6bdaa2 /app/assets/javascripts/pipelines/mixins | |
parent | f6cdec670b9b757fc2225a2c6627ab79765e5b8a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines/mixins')
-rw-r--r-- | app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js index 1d9366f26df..f987c8f1dd4 100644 --- a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js +++ b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js @@ -27,9 +27,9 @@ export default { * @param {String} resetStoreKey Store key for the visible pipeline that will need to be reset * @param {Object} pipeline The clicked pipeline */ - clickPipeline(parentPipeline, pipeline, openMethod, closeMethod) { + clickPipeline(pipeline, openMethod, closeMethod) { if (!pipeline.isExpanded) { - this.mediator.store[openMethod](parentPipeline, pipeline); + this.mediator.store[openMethod](pipeline); this.mediator.store.toggleLoading(pipeline); this.mediator.poll.stop(); @@ -41,21 +41,14 @@ export default { this.mediator.poll.enable({ data: this.mediator.getExpandedParameters() }); } }, - clickTriggeredByPipeline(parentPipeline, pipeline) { - this.clickPipeline( - parentPipeline, - pipeline, - 'openTriggeredByPipeline', - 'closeTriggeredByPipeline', - ); + resetTriggeredPipelines(parentPipeline, pipeline) { + this.mediator.store.resetTriggeredPipelines(parentPipeline, pipeline); }, - clickTriggeredPipeline(parentPipeline, pipeline) { - this.clickPipeline( - parentPipeline, - pipeline, - 'openTriggeredPipeline', - 'closeTriggeredPipeline', - ); + clickTriggeredByPipeline(pipeline) { + this.clickPipeline(pipeline, 'openPipeline', 'closePipeline'); + }, + clickTriggeredPipeline(pipeline) { + this.clickPipeline(pipeline, 'openPipeline', 'closePipeline'); }, requestRefreshPipelineGraph() { // When an action is clicked |