diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-06 15:14:42 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-06 15:14:42 +0000 |
| commit | 0cf721bdd2752d20340c96e00e990936887c478c (patch) | |
| tree | ef3cafea5cdb2670d10df9380ce942f353a4c9fe /app/assets/javascripts | |
| parent | e232ebf7a14283e2cbf7620d8b101cce69a96b4a (diff) | |
| download | gitlab-ce-0cf721bdd2752d20340c96e00e990936887c478c.tar.gz | |
Disable stop environment button while deployment is running
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index 57c52a2016a..2a8380f5f2b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -65,6 +65,14 @@ export default { deployedText() { return this.$options.deployedTextMap[this.deployment.status]; }, + isDeployInProgress() { + return this.deployment.status === 'running'; + }, + deployInProgressTooltip() { + return this.isDeployInProgress + ? __('Stopping this environment is currently not possible as a deployment is in progress') + : ''; + }, shouldRenderDropdown() { return ( this.enableCiEnvironmentsStatusChanges && @@ -183,15 +191,23 @@ export default { css-class="js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inlin" /> </template> - <loading-button + <span v-if="deployment.stop_url" - :loading="isStopping" - container-class="btn btn-default btn-sm inline prepend-left-4" - title="Stop environment" - @click="stopEnvironment" + v-tooltip + :title="deployInProgressTooltip" + class="d-inline-block" + tabindex="0" > - <icon name="stop" /> - </loading-button> + <loading-button + :loading="isStopping" + :disabled="isDeployInProgress" + :title="__('Stop environment')" + container-class="js-stop-env btn btn-default btn-sm inline prepend-left-4" + @click="stopEnvironment" + > + <icon name="stop" /> + </loading-button> + </span> </div> </div> </div> |