Revert "💜 Cc 7187/purple banner for linking existing clusters (#20275)"

This reverts commit 5119667.
hashicorp · Mar 11, 2024 · 560b2cf · 560b2cf
1 parent 731f276
commit 560b2cf
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 222 deletions.
diff --git a/.changelog/20275.txt b/.changelog/20275.txt
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
@@ -11,7 +11,7 @@ export default class HashiCorpConsul extends Component {
   @service('env') env;
 
   get consulVersion() {
-    const suffix = this.env.isEnterprise ? '+ent' : '';
+    const suffix = !['', 'oss'].includes(this.env.var('CONSUL_BINARY_TYPE')) ? '+ent' : '';
     return `${this.env.var('CONSUL_VERSION')}${suffix}`;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs
diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js
diff --git a/ui/packages/consul-ui/app/services/env.js b/ui/packages/consul-ui/app/services/env.js
@@ -7,9 +7,6 @@ import Service from '@ember/service';
 import { env } from 'consul-ui/env';
 
 export default class EnvService extends Service {
-  get isEnterprise() {
-    return !['', 'oss'].includes(this.var('CONSUL_BINARY_TYPE'));
-  }
   // deprecated
   // TODO: Remove this elsewhere in the app and use var instead
   env(key) {

diff --git a/ui/packages/consul-ui/app/services/hcp-link-status.js b/ui/packages/consul-ui/app/services/hcp-link-status.js
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss
@@ -18,9 +18,6 @@ html[data-route^='dc.services.instance'] .app-view > header dl {
   margin-bottom: 23px;
   margin-right: 50px;
 }
-html[data-route^='dc.services.index'] .link-to-hcp-banner {
-  margin: 0 -48px;
-}
 html[data-route^='dc.services.instance'] .app-view > header dt {
   font-weight: var(--token-typography-font-weight-bold);
 }

diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
@@ -62,7 +62,7 @@ as |route|>
   (or route.params.nspace route.model.user.token.Namespace 'default')
 
 as |sort filters items partition nspace|}}
-    <LinkToHcpBanner/>
+
   <AppView>
     <BlockSlot @name="header">
         <h1>

diff --git a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js b/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js
diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js
diff --git a/ui/packages/consul-ui/translations/components/link-to-hcp-banner/en-us.yaml b/ui/packages/consul-ui/translations/components/link-to-hcp-banner/en-us.yaml