From fcdf8a5ac1bab4e59ff7313b35413ddc55b5ead7 Mon Sep 17 00:00:00 2001 From: Joshua Ogle Date: Thu, 24 May 2018 13:03:39 -0600 Subject: [PATCH 1/3] UI: Update copy for upgrade modal --- ui/app/components/upgrade-link.js | 10 ++++++++++ ui/app/templates/components/upgrade-page.hbs | 2 +- ui/app/templates/partials/replication/enable.hbs | 4 ++-- .../partials/replication/replication-mode-summary.hbs | 2 +- ui/app/templates/partials/upgrade-overlay.hbs | 10 +++++----- ui/tests/integration/components/upgrade-link-test.js | 4 ++-- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ui/app/components/upgrade-link.js b/ui/app/components/upgrade-link.js index 979838c682..95dd2dcf15 100644 --- a/ui/app/components/upgrade-link.js +++ b/ui/app/components/upgrade-link.js @@ -1,9 +1,19 @@ import Ember from 'ember'; +const { computed } = Ember; + export default Ember.Component.extend({ isAnimated: false, isActive: false, tagName: 'span', + trackingSource: computed('pageName', function() { + let trackingSource = "vaultui"; + let pageName = this.get('pageName'); + if (pageName) { + trackingSource = trackingSource + "_" + encodeURIComponent(pageName); + } + return trackingSource; + }), actions: { openOverlay() { this.set('isActive', true); diff --git a/ui/app/templates/components/upgrade-page.hbs b/ui/app/templates/components/upgrade-page.hbs index c5c9039f73..9b72e66297 100644 --- a/ui/app/templates/components/upgrade-page.hbs +++ b/ui/app/templates/components/upgrade-page.hbs @@ -12,7 +12,7 @@ You can upgrade to {{minimumEdition}} to unlock additional collaboration and security features

- {{#upgrade-link linkClass="button is-ghost has-icon-right" data-test-upgrade-link="true"}} + {{#upgrade-link linkClass="button is-ghost has-icon-right" data-test-upgrade-link="true" pageName=featureName}} Vault Enterprise {{i-con glyph="chevron-right"}} {{/upgrade-link}} diff --git a/ui/app/templates/partials/replication/enable.hbs b/ui/app/templates/partials/replication/enable.hbs index cf91fd2ce2..983b28ec2c 100644 --- a/ui/app/templates/partials/replication/enable.hbs +++ b/ui/app/templates/partials/replication/enable.hbs @@ -50,7 +50,7 @@ {{#if (not version.hasPerfReplication)}}

- Performance Replication is a feature of {{#upgrade-link}}Vault Enterprise Premium{{/upgrade-link}} + Performance Replication is a feature of {{#upgrade-link pageName="Performance Replication"}}Vault Enterprise Premium{{/upgrade-link}}

{{else}}

@@ -100,7 +100,7 @@ {{#if (not version.hasPerfReplication)}}

- Performance Replication is a feature of {{#upgrade-link}}Vault Enterprise Premium{{/upgrade-link}} + Performance Replication is a feature of {{#upgrade-link pageName="Performance Replication"}}Vault Enterprise Premium{{/upgrade-link}}

{{else}}

diff --git a/ui/app/templates/partials/replication/replication-mode-summary.hbs b/ui/app/templates/partials/replication/replication-mode-summary.hbs index 4377a49cde..8ddc5be675 100644 --- a/ui/app/templates/partials/replication/replication-mode-summary.hbs +++ b/ui/app/templates/partials/replication/replication-mode-summary.hbs @@ -5,7 +5,7 @@ Performance Replication is a feature of Vault Enterprise Premium.

- {{#upgrade-link linkClass="button is-ghost has-icon-right"}} + {{#upgrade-link linkClass="button is-ghost has-icon-right" pageName="Performance Replication"}} Learn more {{i-con glyph="chevron-right"}} {{/upgrade-link}} diff --git a/ui/app/templates/partials/upgrade-overlay.hbs b/ui/app/templates/partials/upgrade-overlay.hbs index 678a92de2d..16f461279e 100644 --- a/ui/app/templates/partials/upgrade-overlay.hbs +++ b/ui/app/templates/partials/upgrade-overlay.hbs @@ -2,7 +2,7 @@

- Vault Enterprise + Try Vault Enterprise Free for 30 Days

Collaborate on secrets management and access @@ -11,7 +11,7 @@ Vault Enterprise has features to help unify disparate users and roles, use collaboration workflows, and disaster recovery for system recovery, provide governance over secrets management and access with multi-factor - authentication. Choose the plan that is right for your team. + authentication. You'll have access to all the features below.

@@ -62,14 +62,14 @@
  • Sentinel Integration
  • Control Groups
  • Seal Wrap / FIPS 140-2 Compliance
    • -
  • Gold support: 24x7 support w/SLA
    • +
  • Gold support: 24×7 support w/SLA

    • - - Request Info + + Start Trial {{i-con glyph="chevron-right"}}

    diff --git a/ui/tests/integration/components/upgrade-link-test.js b/ui/tests/integration/components/upgrade-link-test.js index 8db46a7b7c..6b67c4aa28 100644 --- a/ui/tests/integration/components/upgrade-link-test.js +++ b/ui/tests/integration/components/upgrade-link-test.js @@ -16,11 +16,11 @@ test('it renders with overlay', function(assert) { assert.equal(this.$('.upgrade-link-container button').text().trim(), 'upgrade', 'renders link content'); assert.equal( this.$('#modal-wormhole .upgrade-overlay-title').text().trim(), - 'Vault Enterprise', + 'Try Vault Enterprise Free for 30 Days', 'contains overlay content' ); assert.equal( - this.$('#modal-wormhole a[href^="https://www.hashicorp.com/go/vault-enterprise"]').length, + this.$('#modal-wormhole a[href^="http://hashicorp.com/products/vault/trial?source=vaultui"]').length, 1, 'contains info link' ); From 90a9a9a0baa1bc256571ba8d1255eaeeb55c2b58 Mon Sep 17 00:00:00 2001 From: Joshua Ogle Date: Fri, 25 May 2018 13:17:02 -0600 Subject: [PATCH 2/3] Update upgrade link --- ui/app/templates/partials/upgrade-overlay.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/templates/partials/upgrade-overlay.hbs b/ui/app/templates/partials/upgrade-overlay.hbs index 16f461279e..f2c7e91ee1 100644 --- a/ui/app/templates/partials/upgrade-overlay.hbs +++ b/ui/app/templates/partials/upgrade-overlay.hbs @@ -68,7 +68,7 @@

    - + Start Trial {{i-con glyph="chevron-right"}} From c87f6ea62a16aa144070917eb4ef07424ced600a Mon Sep 17 00:00:00 2001 From: Joshua Ogle Date: Fri, 25 May 2018 16:23:54 -0600 Subject: [PATCH 3/3] Fix upgrade link --- ui/tests/integration/components/upgrade-link-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/tests/integration/components/upgrade-link-test.js b/ui/tests/integration/components/upgrade-link-test.js index 6b67c4aa28..c2e64f8c4e 100644 --- a/ui/tests/integration/components/upgrade-link-test.js +++ b/ui/tests/integration/components/upgrade-link-test.js @@ -20,7 +20,7 @@ test('it renders with overlay', function(assert) { 'contains overlay content' ); assert.equal( - this.$('#modal-wormhole a[href^="http://hashicorp.com/products/vault/trial?source=vaultui"]').length, + this.$('#modal-wormhole a[href^="https://hashicorp.com/products/vault/trial?source=vaultui"]').length, 1, 'contains info link' );