From 2fab20e082e64b2c565d4a73c59f21e7cd3f3fc0 Mon Sep 17 00:00:00 2001 From: Joshua Ogle Date: Fri, 14 Jun 2019 15:46:18 -0600 Subject: [PATCH] UI: Remove upgrade modal (#6871) * Remove upgrade-link component * Hide enterprrise links from OSS * Don't show sidebar if they can't use the options --- ui/app/components/edition-badge.js | 18 --- ui/app/styles/components/empty-state.scss | 2 +- ui/app/styles/components/upgrade-overlay.scss | 63 ---------- ui/app/styles/core.scss | 1 - ui/app/templates/components/edition-badge.hbs | 4 - ui/app/templates/partials/status/cluster.hbs | 109 ++++++++---------- ui/app/templates/vault.hbs | 7 +- ui/app/templates/vault/cluster/access.hbs | 16 +-- ui/app/templates/vault/cluster/policies.hbs | 74 +++++------- .../vault/cluster/policies/index.hbs | 2 + ui/app/templates/vault/cluster/policy.hbs | 42 +++---- ui/lib/core/addon/components/upgrade-link.js | 44 ------- ui/lib/core/addon/components/upgrade-page.js | 2 +- .../templates/components/empty-state.hbs | 2 +- .../components/replication-mode-summary.hbs | 10 +- .../templates/components/upgrade-link.hbs | 79 ------------- .../templates/components/upgrade-page.hbs | 29 ++--- ui/lib/core/app/components/upgrade-link.js | 1 - .../components/replication-summary.hbs | 21 ++-- ui/public/edition-enterprise.svg | 17 --- ui/public/edition-oss.svg | 17 --- ui/public/vault-hex.svg | 8 -- .../components/edition-badge-test.js | 22 ---- .../components/upgrade-link-test.js | 48 -------- .../components/upgrade-page-test.js | 32 +++-- 25 files changed, 162 insertions(+), 508 deletions(-) delete mode 100644 ui/app/components/edition-badge.js delete mode 100644 ui/app/styles/components/upgrade-overlay.scss delete mode 100644 ui/app/templates/components/edition-badge.hbs delete mode 100644 ui/lib/core/addon/components/upgrade-link.js delete mode 100644 ui/lib/core/addon/templates/components/upgrade-link.hbs delete mode 100644 ui/lib/core/app/components/upgrade-link.js delete mode 100644 ui/public/edition-enterprise.svg delete mode 100644 ui/public/edition-oss.svg delete mode 100644 ui/public/vault-hex.svg delete mode 100644 ui/tests/integration/components/edition-badge-test.js delete mode 100644 ui/tests/integration/components/upgrade-link-test.js diff --git a/ui/app/components/edition-badge.js b/ui/app/components/edition-badge.js deleted file mode 100644 index 025f657be6..0000000000 --- a/ui/app/components/edition-badge.js +++ /dev/null @@ -1,18 +0,0 @@ -import { computed } from '@ember/object'; -import Component from '@ember/component'; - -export default Component.extend({ - tagName: 'span', - classNames: 'tag is-outlined edition-badge', - attributeBindings: ['edition:aria-label'], - icon: computed('edition', function() { - const edition = this.get('edition'); - const entEditions = ['Enterprise', 'Premium', 'Pro']; - - if (entEditions.includes(edition)) { - return 'edition-enterprise'; - } else { - return 'edition-oss'; - } - }), -}); diff --git a/ui/app/styles/components/empty-state.scss b/ui/app/styles/components/empty-state.scss index 2cb489aae0..b023403cfa 100644 --- a/ui/app/styles/components/empty-state.scss +++ b/ui/app/styles/components/empty-state.scss @@ -2,7 +2,7 @@ align-items: center; color: $grey; display: flex; - background: $ui-gray-050; + background: $ui-gray-010; justify-content: center; padding: $spacing-xxl $spacing-s; box-shadow: 0 -2px 0 -1px $ui-gray-300; diff --git a/ui/app/styles/components/upgrade-overlay.scss b/ui/app/styles/components/upgrade-overlay.scss deleted file mode 100644 index f5770064ac..0000000000 --- a/ui/app/styles/components/upgrade-overlay.scss +++ /dev/null @@ -1,63 +0,0 @@ -.upgrade-overlay { - font-size: 1rem; - opacity: 0; - text-align: left; - transition: opacity $speed-slow; - will-change: opacity; - z-index: 300; - - &.is-animated { - opacity: 1; - } - - .modal-background { - background-image: url('/ui/vault-hex.svg'), linear-gradient(90deg, #191a1c, #1b212d); - opacity: 0.97; - } - - .modal-content { - overflow: auto; - overflow-x: hidden; - transform: translateY(20%) scale(0.9); - transition: transform $speed-slow; - will-change: transform; - } - - &.is-animated { - .modal-content { - transform: translateY(0) scale(1); - } - } - - .upgrade-overlay-title { - border-bottom: 1px solid $grey; - padding-bottom: $size-10; - - .icon { - width: 32px; - - #edition-enterprise-hexagon { - fill: $white; - } - } - } - - .columns { - margin-bottom: $size-4; - margin-top: $size-4; - } - - .column { - display: flex; - - .box { - border-radius: $radius; - box-shadow: inset 0 0 0 1px $grey; - width: 100%; - } - } - - li { - list-style: inside disc; - } -} diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index 0eb83f62b4..654221e12b 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -81,7 +81,6 @@ @import './components/toolbar'; @import './components/tool-tip'; @import './components/unseal-warning'; -@import './components/upgrade-overlay'; @import './components/ui-wizard'; @import './components/vault-loading'; diff --git a/ui/app/templates/components/edition-badge.hbs b/ui/app/templates/components/edition-badge.hbs deleted file mode 100644 index 28bf3e6b50..0000000000 --- a/ui/app/templates/components/edition-badge.hbs +++ /dev/null @@ -1,4 +0,0 @@ -{{#if icon}} - -{{/if}} -{{edition}} diff --git a/ui/app/templates/partials/status/cluster.hbs b/ui/app/templates/partials/status/cluster.hbs index e3bf8b5fe3..abed797612 100644 --- a/ui/app/templates/partials/status/cluster.hbs +++ b/ui/app/templates/partials/status/cluster.hbs @@ -1,76 +1,67 @@
- {{#if (and activeCluster.unsealed auth.currentToken)}} - {{#if (has-permission 'status' routeParams='replication')}} - +
+ {{/if}} {{/if}} - {{/if}} - {{#unless version.isOSS}} {{#if (has-permission 'status' routeParams='license')}}