diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-25 16:45:08 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-25 17:16:42 +0300 |
| commit | 1d6adc27c5c2cec7d62fa4e659e6d5b34888e6a1 (patch) | |
| tree | 27df3173b0dba91315052376085ca0e634034e08 /app/assets/javascripts | |
| parent | 2ca00a360507055f49819ec2c6db7e9a2de15b5f (diff) | |
Handle disabled button state in backend
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/clusters/components/application_row.vue | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index ff4fd0b118c..30567993322 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -52,11 +52,6 @@ type: String, required: false, }, - disableInstallButton: { - type: Boolean, - required: false, - default: false, - }, installApplicationRequestParams: { type: Object, required: false, @@ -77,7 +72,7 @@ // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but // we already made a request to install and are just waiting for the real-time // to sync up. - return this.disableInstallButton || (this.status !== APPLICATION_INSTALLABLE + return (this.status !== APPLICATION_INSTALLABLE && this.status !== APPLICATION_ERROR) || this.requestStatus === REQUEST_LOADING || this.requestStatus === REQUEST_SUCCESS; diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 5b127c7911c..57c605a5960 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -292,7 +292,6 @@ export default { :status-reason="applications.jupyter.statusReason" :request-status="applications.jupyter.requestStatus" :request-reason="applications.jupyter.requestReason" - :disable-install-button="!ingressInstalled" :install-application-request-params="{ hostname: applications.jupyter.hostname }" > <div slot="description"> @@ -304,7 +303,7 @@ export default { or a scientific research group.`) }} </p> - <template v-if="ingressInstalled"> + <template v-if="ingressExternalIp"> <div class="form-group"> <label for="jupyter-hostname"> {{ s__('ClusterIntegration|Jupyter Hostname') }} |