Merge pull request #4633 from hashicorp/jo-upgrade-copy

UI: Update copy for upgrade modal
This commit is contained in:
Joshua Ogle 2018-05-25 17:20:11 -06:00 committed by GitHub
commit 95978c208f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 11 deletions

View file

@ -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);

View file

@ -12,7 +12,7 @@
You can upgrade to {{minimumEdition}} to unlock additional collaboration and security features
</p>
<p>
{{#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}}

View file

@ -50,7 +50,7 @@
</h3>
{{#if (not version.hasPerfReplication)}}
<p class="help has-text-grey-dark">
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}}
</p>
{{else}}
<p class="help has-text-grey-dark">
@ -100,7 +100,7 @@
</h3>
{{#if (not version.hasPerfReplication)}}
<p class="help has-text-grey-dark">
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}}
</p>
{{else}}
<p class="help has-text-grey-dark">

View file

@ -5,7 +5,7 @@
Performance Replication is a feature of Vault Enterprise Premium.
</p>
<p class="has-text-centered">
{{#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}}

View file

@ -2,7 +2,7 @@
<div class="modal-background"></div>
<div class="modal-content">
<h2 class="title upgrade-overlay-title is-2 has-text-white">
Vault Enterprise
Try Vault Enterprise Free for 30 Days
</h2>
<h3 class="title is-5 has-text-white">
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.
</p>
<div class="columns">
<div class="column is-flex">
@ -62,14 +62,14 @@
<li>Sentinel Integration</li>
<li>Control Groups</li>
<li>Seal Wrap / FIPS 140-2 Compliance</li>
<li>Gold support: 24x7 support w/SLA</li>
<li>Gold support: 24&times;7 support w/SLA</li>
</ul>
</div>
</div>
</div>
<p class="has-text-centered">
<a href="https://www.hashicorp.com/go/vault-enterprise" class="button is-primary has-icon-right" target="_blank">
Request Info
<a href="https://hashicorp.com/products/vault/trial?source={{trackingSource}}" class="button is-primary has-icon-right" target="_blank" rel="noreferrer noopener">
Start Trial
{{i-con glyph="chevron-right"}}
</a>
</p>

View file

@ -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^="https://hashicorp.com/products/vault/trial?source=vaultui"]').length,
1,
'contains info link'
);