BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
218e7223
Unverified
Commit
218e7223
authored
Feb 21, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review
parent
95d8b8ac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
13 deletions
+15
-13
applications.vue
app/assets/javascripts/clusters/components/applications.vue
+11
-7
constants.js
app/assets/javascripts/clusters/constants.js
+1
-0
clusters_store.js
app/assets/javascripts/clusters/stores/clusters_store.js
+2
-1
applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+1
-5
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
218e7223
...
...
@@ -5,6 +5,7 @@
import
clipboardButton
from
'../../vue_shared/components/clipboard_button.vue'
;
import
{
APPLICATION_INSTALLED
,
INGRESS
,
}
from
'../constants'
;
export
default
{
...
...
@@ -53,6 +54,9 @@
false
,
);
},
ingressId
()
{
return
INGRESS
;
},
ingressInstalled
()
{
return
this
.
applications
.
ingress
.
status
===
APPLICATION_INSTALLED
;
},
...
...
@@ -150,7 +154,7 @@
</div>
</application-row>
<application-row
id=
"ingress
"
:id=
"ingressId
"
:title=
"applications.ingress.title"
title-link=
"https://kubernetes.io/docs/concepts/services-networking/ingress/"
:status=
"applications.ingress.status"
...
...
@@ -167,7 +171,7 @@
<template
v-if=
"ingressInstalled"
>
<div
class=
"form-group"
>
<label
for=
"i
pA
ddress"
>
<label
for=
"i
ngress-ip-a
ddress"
>
{{
s__
(
"ClusterIntegration| Ingress IP Address"
)
}}
</label>
<div
...
...
@@ -176,7 +180,7 @@
>
<input
type=
"text"
id=
"i
pA
ddress"
id=
"i
ngress-ip-a
ddress"
class=
"form-control js-ip-address"
:placeholder=
"ingressExternalIp"
readonly
...
...
@@ -210,7 +214,7 @@
target=
"_blank"
rel=
"noopener noreferrer"
>
{{
__
(
"More information"
)
}}
{{
__
(
'More information'
)
}}
</a>
</p>
...
...
@@ -223,16 +227,16 @@
target=
"_blank"
rel=
"noopener noreferrer"
>
{{
__
(
"More information"
)
}}
{{
__
(
'More information'
)
}}
</a>
</p>
</
template
>
<
template
<
div
v-else
v-html=
"ingressDescription"
>
</
template
>
</
div
>
</div>
</application-row>
<application-row
...
...
app/assets/javascripts/clusters/constants.js
View file @
218e7223
...
...
@@ -10,3 +10,4 @@ export const APPLICATION_ERROR = 'errored';
export
const
REQUEST_LOADING
=
'request-loading'
;
export
const
REQUEST_SUCCESS
=
'request-success'
;
export
const
REQUEST_FAILURE
=
'request-failure'
;
export
const
INGRESS
=
'ingress'
;
app/assets/javascripts/clusters/stores/clusters_store.js
View file @
218e7223
import
{
s__
}
from
'../../locale'
;
import
{
INGRESS
}
from
'../constants'
;
export
default
class
ClusterStore
{
constructor
()
{
...
...
@@ -80,7 +81,7 @@ export default class ClusterStore {
statusReason
,
};
if
(
appId
===
'ingress'
)
{
if
(
appId
===
INGRESS
)
{
this
.
state
.
applications
.
ingress
.
externalIp
=
serverAppEntry
.
external_ip
;
}
});
...
...
spec/javascripts/clusters/components/applications_spec.js
View file @
218e7223
...
...
@@ -88,11 +88,7 @@ describe('Applications', () => {
vm
.
$el
.
querySelector
(
'.js-ip-address'
).
getAttribute
(
'placeholder'
),
).
toEqual
(
'?'
);
expect
(
vm
.
$el
.
querySelector
(
'.js-no-ip-message'
).
textContent
.
replace
(
/
\n(\s)
+/g
,
' '
).
trim
(),
).
toEqual
(
'The IP address is still in the process of being assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information'
,
);
expect
(
vm
.
$el
.
querySelector
(
'.js-no-ip-message'
)).
not
.
toBe
(
null
);
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment