diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-28 12:17:17 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-28 12:17:17 +0300 |
| commit | 08216d2e58edea388d334077ccfce7d842292319 (patch) | |
| tree | 983ae74112f31e96340c511b6980ed4bded41bdc /app/assets/javascripts | |
| parent | b5b72ed18bcdfe296eaa645c47f670832a4081e4 (diff) | |
Changes after review
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/clusters/stores/clusters_store.js | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 57c605a5960..17a0e1b3071 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -345,7 +345,6 @@ export default { NOTE: Don't forget to update `clusters.scss` min-height for this block and uncomment `application_spec` tests --> - <!-- Add Jupyter row, all other plumbing is complete --> </div> </div> </section> diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js index c18d692ce81..3a4ac09f67c 100644 --- a/app/assets/javascripts/clusters/stores/clusters_store.js +++ b/app/assets/javascripts/clusters/stores/clusters_store.js @@ -92,7 +92,11 @@ export default class ClusterStore { if (appId === INGRESS) { this.state.applications.ingress.externalIp = serverAppEntry.external_ip; } else if (appId === JUPYTER) { - this.state.applications.jupyter.hostname = serverAppEntry.hostname || this.state.applications.ingress.externalIp ? `jupyter.${this.state.applications.ingress.externalIp}.xip.io` : ''; + this.state.applications.jupyter.hostname = + serverAppEntry.hostname || + (this.state.applications.ingress.externalIp + ? `jupyter.${this.state.applications.ingress.externalIp}.xip.io` + : ''); } }); } |