Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7dbcd3e7
Commit
7dbcd3e7
authored
Nov 04, 2018
by
Mike Greiling
Committed by
Thong Kuah
Nov 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide project-specific cluster apps in non-project clusters
parent
284f4dfd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
app/assets/javascripts/clusters/clusters_bundle.js
app/assets/javascripts/clusters/clusters_bundle.js
+4
-2
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+11
-0
app/views/clusters/clusters/show.html.haml
app/views/clusters/clusters/show.html.haml
+1
-0
No files found.
app/assets/javascripts/clusters/clusters_bundle.js
View file @
7dbcd3e7
...
...
@@ -31,6 +31,7 @@ export default class Clusters {
installKnativePath
,
installPrometheusPath
,
managePrometheusPath
,
clusterType
,
clusterStatus
,
clusterStatusReason
,
helpPath
,
...
...
@@ -67,7 +68,7 @@ export default class Clusters {
initDismissableCallout
(
'
.js-cluster-security-warning
'
);
initSettingsPanels
();
setupToggleButtons
(
document
.
querySelector
(
'
.js-cluster-enable-toggle-area
'
));
this
.
initApplications
();
this
.
initApplications
(
clusterType
);
if
(
this
.
store
.
state
.
status
!==
'
created
'
)
{
this
.
updateContainer
(
null
,
this
.
store
.
state
.
status
,
this
.
store
.
state
.
statusReason
);
...
...
@@ -79,7 +80,7 @@ export default class Clusters {
}
}
initApplications
()
{
initApplications
(
type
)
{
const
{
store
}
=
this
;
const
el
=
document
.
querySelector
(
'
#js-cluster-applications
'
);
...
...
@@ -93,6 +94,7 @@ export default class Clusters {
render
(
createElement
)
{
return
createElement
(
Applications
,
{
props
:
{
type
,
applications
:
this
.
state
.
applications
,
helpPath
:
this
.
state
.
helpPath
,
ingressHelpPath
:
this
.
state
.
ingressHelpPath
,
...
...
app/assets/javascripts/clusters/components/applications.vue
View file @
7dbcd3e7
...
...
@@ -21,6 +21,11 @@ export default {
clipboardButton
,
},
props
:
{
type
:
{
type
:
String
,
required
:
false
,
default
:
'
project_type
'
,
},
applications
:
{
type
:
Object
,
required
:
false
,
...
...
@@ -59,6 +64,9 @@ export default {
prometheusLogo
,
}),
computed
:
{
isProjectCluster
()
{
return
this
.
type
===
'
project_type
'
;
},
helmInstalled
()
{
return
(
this
.
applications
.
helm
.
status
===
APPLICATION_STATUS
.
INSTALLED
||
...
...
@@ -281,6 +289,7 @@ export default {
</div>
</application-row>
<application-row
v-if=
"isProjectCluster"
id=
"prometheus"
:logo-url=
"prometheusLogo"
:title=
"applications.prometheus.title"
...
...
@@ -299,6 +308,7 @@ export default {
</div>
</application-row>
<application-row
v-if=
"isProjectCluster"
id=
"runner"
:logo-url=
"gitlabLogo"
:title=
"applications.runner.title"
...
...
@@ -317,6 +327,7 @@ export default {
</div>
</application-row>
<application-row
v-if=
"isProjectCluster"
id=
"jupyter"
:logo-url=
"jupyterhubLogo"
:title=
"applications.jupyter.title"
...
...
app/views/clusters/clusters/show.html.haml
View file @
7dbcd3e7
...
...
@@ -15,6 +15,7 @@
install_jupyter_path:
clusterable
.
install_applications_cluster_path
(
@cluster
,
:jupyter
),
install_knative_path:
clusterable
.
install_applications_cluster_path
(
@cluster
,
:knative
),
toggle_status:
@cluster
.
enabled?
?
'true'
:
'false'
,
cluster_type:
@cluster
.
cluster_type
,
cluster_status:
@cluster
.
status_name
,
cluster_status_reason:
@cluster
.
status_reason
,
help_path:
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'installing-applications'
),
...
...
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