From cbb88bee0957409dbe9e1815c19cd334313dc4df Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Thu, 27 May 2021 09:31:27 +0100 Subject: [PATCH] Embedding; Hide system project notice when embedded --- app/authenticated/project/controller.js | 12 ++++++++++-- app/authenticated/project/template.hbs | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/authenticated/project/controller.js b/app/authenticated/project/controller.js index 50789f35b..efdad1df2 100644 --- a/app/authenticated/project/controller.js +++ b/app/authenticated/project/controller.js @@ -1,7 +1,7 @@ +import Controller from '@ember/controller'; +import { computed, observer } from '@ember/object'; import { alias } from '@ember/object/computed'; import { inject as service } from '@ember/service'; -import { computed, observer } from '@ember/object'; -import Controller from '@ember/controller'; import C from 'ui/utils/constants'; // const NONE = 'none'; @@ -19,12 +19,20 @@ export default Controller.extend({ group: NAMESPACE, nodes: null, expandedInstances: null, + notEmbedded: true, namespaces: alias('scope.currentProject.namespaces'), + + showSystemProjectWarning: computed.and('model.project.isSystemProject', 'notEmbedded'), + init() { this._super(...arguments); this.set('nodes', this.get('store').all('node')); this.set('expandedInstances', []); + + const notEmbedded = window.top === window; + + this.set('notEmbedded', notEmbedded); }, actions: { diff --git a/app/authenticated/project/template.hbs b/app/authenticated/project/template.hbs index 82c10d08c..5cdd6730f 100644 --- a/app/authenticated/project/template.hbs +++ b/app/authenticated/project/template.hbs @@ -1,4 +1,4 @@ -{{#if model.project.isSystemProject}} +{{#if showSystemProjectWarning}} {{#banner-message color='bg-warning m-0'}}

{{t 'clusterDashboard.systemProject' appName=settings.appName}}

{{/banner-message}}