Commit 7dbcd3e7 authored by Mike Greiling's avatar Mike Greiling Committed by Thong Kuah

Hide project-specific cluster apps in non-project clusters

parent 284f4dfd
...@@ -31,6 +31,7 @@ export default class Clusters { ...@@ -31,6 +31,7 @@ export default class Clusters {
installKnativePath, installKnativePath,
installPrometheusPath, installPrometheusPath,
managePrometheusPath, managePrometheusPath,
clusterType,
clusterStatus, clusterStatus,
clusterStatusReason, clusterStatusReason,
helpPath, helpPath,
...@@ -67,7 +68,7 @@ export default class Clusters { ...@@ -67,7 +68,7 @@ export default class Clusters {
initDismissableCallout('.js-cluster-security-warning'); initDismissableCallout('.js-cluster-security-warning');
initSettingsPanels(); initSettingsPanels();
setupToggleButtons(document.querySelector('.js-cluster-enable-toggle-area')); setupToggleButtons(document.querySelector('.js-cluster-enable-toggle-area'));
this.initApplications(); this.initApplications(clusterType);
if (this.store.state.status !== 'created') { if (this.store.state.status !== 'created') {
this.updateContainer(null, this.store.state.status, this.store.state.statusReason); this.updateContainer(null, this.store.state.status, this.store.state.statusReason);
...@@ -79,7 +80,7 @@ export default class Clusters { ...@@ -79,7 +80,7 @@ export default class Clusters {
} }
} }
initApplications() { initApplications(type) {
const { store } = this; const { store } = this;
const el = document.querySelector('#js-cluster-applications'); const el = document.querySelector('#js-cluster-applications');
...@@ -93,6 +94,7 @@ export default class Clusters { ...@@ -93,6 +94,7 @@ export default class Clusters {
render(createElement) { render(createElement) {
return createElement(Applications, { return createElement(Applications, {
props: { props: {
type,
applications: this.state.applications, applications: this.state.applications,
helpPath: this.state.helpPath, helpPath: this.state.helpPath,
ingressHelpPath: this.state.ingressHelpPath, ingressHelpPath: this.state.ingressHelpPath,
......
...@@ -21,6 +21,11 @@ export default { ...@@ -21,6 +21,11 @@ export default {
clipboardButton, clipboardButton,
}, },
props: { props: {
type: {
type: String,
required: false,
default: 'project_type',
},
applications: { applications: {
type: Object, type: Object,
required: false, required: false,
...@@ -59,6 +64,9 @@ export default { ...@@ -59,6 +64,9 @@ export default {
prometheusLogo, prometheusLogo,
}), }),
computed: { computed: {
isProjectCluster() {
return this.type === 'project_type';
},
helmInstalled() { helmInstalled() {
return ( return (
this.applications.helm.status === APPLICATION_STATUS.INSTALLED || this.applications.helm.status === APPLICATION_STATUS.INSTALLED ||
...@@ -281,6 +289,7 @@ export default { ...@@ -281,6 +289,7 @@ export default {
</div> </div>
</application-row> </application-row>
<application-row <application-row
v-if="isProjectCluster"
id="prometheus" id="prometheus"
:logo-url="prometheusLogo" :logo-url="prometheusLogo"
:title="applications.prometheus.title" :title="applications.prometheus.title"
...@@ -299,6 +308,7 @@ export default { ...@@ -299,6 +308,7 @@ export default {
</div> </div>
</application-row> </application-row>
<application-row <application-row
v-if="isProjectCluster"
id="runner" id="runner"
:logo-url="gitlabLogo" :logo-url="gitlabLogo"
:title="applications.runner.title" :title="applications.runner.title"
...@@ -317,6 +327,7 @@ export default { ...@@ -317,6 +327,7 @@ export default {
</div> </div>
</application-row> </application-row>
<application-row <application-row
v-if="isProjectCluster"
id="jupyter" id="jupyter"
:logo-url="jupyterhubLogo" :logo-url="jupyterhubLogo"
:title="applications.jupyter.title" :title="applications.jupyter.title"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
install_jupyter_path: clusterable.install_applications_cluster_path(@cluster, :jupyter), install_jupyter_path: clusterable.install_applications_cluster_path(@cluster, :jupyter),
install_knative_path: clusterable.install_applications_cluster_path(@cluster, :knative), install_knative_path: clusterable.install_applications_cluster_path(@cluster, :knative),
toggle_status: @cluster.enabled? ? 'true': 'false', toggle_status: @cluster.enabled? ? 'true': 'false',
cluster_type: @cluster.cluster_type,
cluster_status: @cluster.status_name, cluster_status: @cluster.status_name,
cluster_status_reason: @cluster.status_reason, cluster_status_reason: @cluster.status_reason,
help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications'), help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment