summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/clusters
diff options
context:
space:
mode:
authorJacques Erasmus <jerasmus@gitlab.com>2019-03-14 19:03:21 +0000
committerMike Greiling <mike@pixelcog.com>2019-03-14 19:03:21 +0000
commita635989097454494b4519ee620a217cb1170af45 (patch)
treeb852e09f4eff5062c3c8f0401d67dbf99e3cbedd /app/assets/javascripts/clusters
parentf2379a4a7c6b0f9e8fba11fb7e9dfa061f2ceb0e (diff)
downloadgitlab-ce-a635989097454494b4519ee620a217cb1170af45.tar.gz
Show loading spinner for Ingress/Knative IP
Show a loading spinner while Ingress/Knative IP is being assigned
Diffstat (limited to 'app/assets/javascripts/clusters')
-rw-r--r--app/assets/javascripts/clusters/components/applications.vue22
1 files changed, 14 insertions, 8 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 13e8617c515..5b206b82fe0 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -1,6 +1,7 @@
<script>
import _ from 'underscore';
import helmInstallIllustration from '@gitlab/svgs/dist/illustrations/kubernetes-installation.svg';
+import { GlLoadingIcon } from '@gitlab/ui';
import elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png';
import gitlabLogo from 'images/cluster_app_logos/gitlab.png';
import helmLogo from 'images/cluster_app_logos/helm.png';
@@ -23,6 +24,7 @@ export default {
applicationRow,
clipboardButton,
LoadingButton,
+ GlLoadingIcon,
},
props: {
type: {
@@ -296,7 +298,12 @@ export default {
/>
</span>
</div>
- <input v-else type="text" class="form-control js-endpoint" readonly value="?" />
+ <div v-else class="input-group">
+ <input type="text" class="form-control js-endpoint" readonly />
+ <gl-loading-icon
+ class="position-absolute align-self-center ml-2 js-ingress-ip-loading-icon"
+ />
+ </div>
<p class="form-text text-muted">
{{
s__(`ClusterIntegration|Point a wildcard DNS to this
@@ -545,13 +552,12 @@ export default {
/>
</span>
</div>
- <input
- v-else
- type="text"
- class="form-control js-knative-endpoint"
- readonly
- value="?"
- />
+ <div v-else class="input-group">
+ <input type="text" class="form-control js-endpoint" readonly />
+ <gl-loading-icon
+ class="position-absolute align-self-center ml-2 js-knative-ip-loading-icon"
+ />
+ </div>
</div>
<p class="form-text text-muted col-12">