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:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-06 17:48:44 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2017-11-06 17:52:17 +0300
commitf3a3566edc8fe24337b9df163f4699785061bb38 (patch)
tree9f4c8c5ab31a0e789f2fd796d73642ccad86383c /app/assets/javascripts/clusters/components/application_row.vue
parent001de85e7c6f86423aca0d245fdc83c57b374630 (diff)
Add support for not_installable/scheduled and to not show created banner
Diffstat (limited to 'app/assets/javascripts/clusters/components/application_row.vue')
-rw-r--r--app/assets/javascripts/clusters/components/application_row.vue7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index f8d53fcc4b7..9c5ff39534f 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -3,6 +3,8 @@ import { s__ } from '../../locale';
import eventHub from '../event_hub';
import loadingButton from '../../vue_shared/components/loading_button.vue';
import {
+ APPLICATION_NOT_INSTALLABLE,
+ APPLICATION_SCHEDULED,
APPLICATION_INSTALLABLE,
APPLICATION_INSTALLING,
APPLICATION_INSTALLED,
@@ -59,6 +61,7 @@ export default {
},
installButtonLoading() {
return !this.status ||
+ this.status === APPLICATION_SCHEDULED ||
this.status === APPLICATION_INSTALLING ||
this.requestStatus === REQUEST_LOADING;
},
@@ -72,9 +75,9 @@ export default {
},
installButtonLabel() {
let label;
- if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR) {
+ if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR || this.status === APPLICATION_NOT_INSTALLABLE) {
label = s__('ClusterIntegration|Install');
- } else if (this.status === APPLICATION_INSTALLING) {
+ } else if (this.status === APPLICATION_SCHEDULED || this.status === APPLICATION_INSTALLING) {
label = s__('ClusterIntegration|Installing');
} else if (this.status === APPLICATION_INSTALLED) {
label = s__('ClusterIntegration|Installed');