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
08216d2e
Unverified
Commit
08216d2e
authored
May 28, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review
parent
b5b72ed1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
15 deletions
+34
-15
applications.vue
app/assets/javascripts/clusters/components/applications.vue
+0
-1
clusters_store.js
app/assets/javascripts/clusters/stores/clusters_store.js
+5
-1
clusters.scss
app/assets/stylesheets/pages/clusters.scss
+1
-1
applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+28
-12
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
08216d2e
...
...
@@ -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>
...
...
app/assets/javascripts/clusters/stores/clusters_store.js
View file @
08216d2e
...
...
@@ -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`
:
''
);
}
});
}
...
...
app/assets/stylesheets/pages/clusters.scss
View file @
08216d2e
...
...
@@ -6,7 +6,7 @@
.cluster-applications-table
{
// Wait for the Vue to kick-in and render the applications block
min-height
:
500
px
;
min-height
:
628
px
;
}
.clusters-dropdown-menu
{
...
...
spec/javascripts/clusters/components/applications_spec.js
View file @
08216d2e
...
...
@@ -128,21 +128,37 @@ describe('Applications', () => {
expect
(
vm
.
$el
.
querySelector
(
'.js-hostname'
).
getAttribute
(
'readonly'
)).
toEqual
(
null
);
});
});
describe
(
'with ingress & jupyter installed'
,
()
=>
{
it
(
'renders readonly input'
,
()
=>
{
vm
=
mountComponent
(
Applications
,
{
applications
:
{
helm
:
{
title
:
'Helm Tiller'
,
status
:
'installed'
},
ingress
:
{
title
:
'Ingress'
,
status
:
'installed'
,
externalIp
:
'1.1.1.1'
},
runner
:
{
title
:
'GitLab Runner'
},
prometheus
:
{
title
:
'Prometheus'
},
jupyter
:
{
title
:
'JupyterHub'
,
status
:
'installed'
,
hostname
:
''
},
},
});
describe
(
'with ingress installed without external ip'
,
()
=>
{
it
(
'does not render hostname input'
,
()
=>
{
vm
=
mountComponent
(
Applications
,
{
applications
:
{
helm
:
{
title
:
'Helm Tiller'
,
status
:
'installed'
},
ingress
:
{
title
:
'Ingress'
,
status
:
'installed'
},
runner
:
{
title
:
'GitLab Runner'
},
prometheus
:
{
title
:
'Prometheus'
},
jupyter
:
{
title
:
'JupyterHub'
,
hostname
:
''
,
status
:
'installable'
},
},
});
expect
(
vm
.
$el
.
querySelector
(
'.js-hostname'
)).
toBe
(
null
);
});
});
expect
(
vm
.
$el
.
querySelector
(
'.js-hostname'
).
getAttribute
(
'readonly'
)).
toEqual
(
'readonly'
);
describe
(
'with ingress & jupyter installed'
,
()
=>
{
it
(
'renders readonly input'
,
()
=>
{
vm
=
mountComponent
(
Applications
,
{
applications
:
{
helm
:
{
title
:
'Helm Tiller'
,
status
:
'installed'
},
ingress
:
{
title
:
'Ingress'
,
status
:
'installed'
,
externalIp
:
'1.1.1.1'
},
runner
:
{
title
:
'GitLab Runner'
},
prometheus
:
{
title
:
'Prometheus'
},
jupyter
:
{
title
:
'JupyterHub'
,
status
:
'installed'
,
hostname
:
''
},
},
});
expect
(
vm
.
$el
.
querySelector
(
'.js-hostname'
).
getAttribute
(
'readonly'
)).
toEqual
(
'readonly'
);
});
});
...
...
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