maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[COPYEDIT] Fixed capitalization for Basic and Premium licenses (#18969)

Browse source 
* [COPYEDIT] Fixed capitalization for Basic and Premium licenses

* [COPYEDIT] More fixes for upper case in license text, including one code change
This commit is contained in:
gchaps 2018-05-10 09:31:46 -07:00 committed by GitHub
parent ba080a19ae
commit 7ee5147b26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
View file

@ -1,5 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`LicenseStatus component should display display warning is expired 1`] = `"<div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg class=\\"euiIcon euiIcon--medium euiIcon--danger\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\"><g fill-rule=\\"evenodd\\"><path d=\\"M7.5 2.236L1.618 14h11.764L7.5 2.236zm.894-.447l5.882 11.764A1 1 0 0 1 13.382 15H1.618a1 1 0 0 1-.894-1.447L6.606 1.789a1 1 0 0 1 1.788 0z\\"></path><path d=\\"M7 6h1v5H7zM7 12h1v1H7z\\"></path></g></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h2 class=\\"euiTitle euiTitle--large\\">Your platinum license has expired</h2></div></div></div></div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiText\\"><span class=\\"euiTextColor euiTextColor--subdued\\"><span>Your license expired on <strong></strong></span></span></div></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div></div>"`; exports[`LicenseStatus component should display display warning is expired 1`] = `"<div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg class=\\"euiIcon euiIcon--medium euiIcon--danger\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\"><g fill-rule=\\"evenodd\\"><path d=\\"M7.5 2.236L1.618 14h11.764L7.5 2.236zm.894-.447l5.882 11.764A1 1 0 0 1 13.382 15H1.618a1 1 0 0 1-.894-1.447L6.606 1.789a1 1 0 0 1 1.788 0z\\"></path><path d=\\"M7 6h1v5H7zM7 12h1v1H7z\\"></path></g></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h2 class=\\"euiTitle euiTitle--large\\">Your Platinum license has expired</h2></div></div></div></div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiText\\"><span class=\\"euiTextColor euiTextColor--subdued\\"><span>Your license expired on <strong></strong></span></span></div></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div></div>"`;
exports[`LicenseStatus component should display normally when license is active 1`] = `"<div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg class=\\"euiIcon euiIcon--medium euiIcon--success\\" width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\"><path d=\\"M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zm-1.125-5a.377.377 0 0 0 .266-.11l5.25-5.25a.376.376 0 0 0-.531-.53l-4.985 4.985L4.141 7.36a.376.376 0 0 0-.531.53l3 3c.073.073.17.11.265.11z\\" fill-rule=\\"evenodd\\"></path></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h2 class=\\"euiTitle euiTitle--large\\">Your gold license is active</h2></div></div></div></div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiText\\"><span class=\\"euiTextColor euiTextColor--subdued\\"><span>Your license will expire on <strong>October 12, 2099 7:00 PM EST</strong></span></span></div></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div></div>"`; exports[`LicenseStatus component should display normally when license is active 1`] = `"<div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg class=\\"euiIcon euiIcon--medium euiIcon--success\\" width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\"><path d=\\"M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zm-1.125-5a.377.377 0 0 0 .266-.11l5.25-5.25a.376.376 0 0 0-.531-.53l-4.985 4.985L4.141 7.36a.376.376 0 0 0-.531.53l3 3c.073.073.17.11.265.11z\\" fill-rule=\\"evenodd\\"></path></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h2 class=\\"euiTitle euiTitle--large\\">Your Gold license is active</h2></div></div></div></div><div class=\\"euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiText\\"><span class=\\"euiTextColor euiTextColor--subdued\\"><span>Your license will expire on <strong>October 12, 2099 7:00 PM EST</strong></span></span></div></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div></div>"`;

6
x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap
View file

@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`RevertToBasic component should display when license is about to expire 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Revert to basic license</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>You’ll revert to our free features and lose access to Security, Machine Learning and other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">platinum features</a>.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Revert to basic</span></span></button></span></div></div>"`; exports[`RevertToBasic component should display when license is about to expire 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Revert to Basic license</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>You’ll revert to our free features and lose access to security, machine learning and other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Platinum features</a>.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Revert to Basic</span></span></button></span></div></div>"`;
exports[`RevertToBasic component should display when license is expired 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Revert to basic license</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>You’ll revert to our free features and lose access to Security, Machine Learning and other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">platinum features</a>.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Revert to basic</span></span></button></span></div></div>"`; exports[`RevertToBasic component should display when license is expired 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Revert to Basic license</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>You’ll revert to our free features and lose access to security, machine learning and other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Platinum features</a>.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Revert to Basic</span></span></button></span></div></div>"`;
exports[`RevertToBasic component should display when trial is active 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Revert to basic license</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>You’ll revert to our free features and lose access to Security, Machine Learning and other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">platinum features</a>.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Revert to basic</span></span></button></span></div></div>"`; exports[`RevertToBasic component should display when trial is active 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Revert to Basic license</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>You’ll revert to our free features and lose access to security, machine learning and other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Platinum features</a>.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Revert to Basic</span></span></button></span></div></div>"`;

6
x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
View file

@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`StartTrial component when trial is allowed display for basic license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>Experience what Security, Machine Learning, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">platinum features</a> have to offer.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></span></div></div>"`; exports[`StartTrial component when trial is allowed display for basic license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>Experience what security, machine learning, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Platinum features</a> have to offer.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></span></div></div>"`;
exports[`StartTrial component when trial is allowed should display for expired platinum license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>Experience what Security, Machine Learning, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">platinum features</a> have to offer.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></span></div></div>"`; exports[`StartTrial component when trial is allowed should display for expired platinum license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>Experience what security, machine learning, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Platinum features</a> have to offer.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></span></div></div>"`;
exports[`StartTrial component when trial is allowed should display for gold license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>Experience what Security, Machine Learning, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">platinum features</a> have to offer.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></span></div></div>"`; exports[`StartTrial component when trial is allowed should display for gold license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><span class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--medium euiCard__title\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\"><p><span>Experience what security, machine learning, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions/xpack\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Platinum features</a> have to offer.</span></p></div></span><span class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></span></div></div>"`;

3
x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js
View file

@ -10,9 +10,10 @@ import { getLicense, getExpirationDateFormatted, isExpired } from '../../../stor
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
const { isActive, type } = getLicense(state); const { isActive, type } = getLicense(state);
const typeTitleCase = type.charAt(0).toUpperCase() + type.substr(1).toLowerCase();
return { return {
status: isActive ? 'Active' : 'Inactive', status: isActive ? 'Active' : 'Inactive',
type, type: typeTitleCase,
isExpired: isExpired(state), isExpired: isExpired(state),
expiryDate: getExpirationDateFormatted(state) expiryDate: getExpirationDateFormatted(state)
}; };

10
x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js
View file

@ -64,13 +64,13 @@ export class RevertToBasic extends React.PureComponent {
} }
const description = ( const description = (
<span> <span>
You’ll revert to our free features and lose access to Security, Machine You’ll revert to our free features and lose access to security, machine
Learning and other{' '} learning and other{' '}
<EuiLink <EuiLink
href="https://www.elastic.co/subscriptions/xpack" href="https://www.elastic.co/subscriptions/xpack"
target="_blank" target="_blank"
> >
platinum features Platinum features
</EuiLink>. </EuiLink>.
</span> </span>
); );
@ -79,11 +79,11 @@ export class RevertToBasic extends React.PureComponent {
<EuiFlexItem> <EuiFlexItem>
{this.acknowledgeModal()} {this.acknowledgeModal()}
<EuiCard <EuiCard
title="Revert to basic license" title="Revert to Basic license"
description={description} description={description}
footer={ footer={
<EuiButton onClick={() => startBasicLicense(licenseType)}> <EuiButton onClick={() => startBasicLicense(licenseType)}>
Revert to basic Revert to Basic
</EuiButton> </EuiButton>
} }
/> />

14
x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js
View file

@ -49,22 +49,22 @@ export class StartTrial extends React.PureComponent {
<div> <div>
<EuiText> <EuiText>
<p> <p>
This trial is for the full set of Elastic{' '} This trial is for the full set of{' '}
<EuiLink <EuiLink
href="https://www.elastic.co/subscriptions/xpack" href="https://www.elastic.co/subscriptions/xpack"
target="_blank" target="_blank"
> >
platinum features Platinum features
</EuiLink>. You&apos;ll get immediate access to: </EuiLink> of the Elastic Stack. You&apos;ll get immediate access to:
</p> </p>
<ul> <ul>
<li>Machine learning</li> <li>Machine learning</li>
<li>Alerting</li> <li>Alerting</li>
<li>Graph</li> <li>Graph capabilities</li>
<li>JDBC connectivity for SQL</li> <li>JDBC connectivity for SQL</li>
</ul> </ul>
<p> <p>
Security features, such authentication (native, AD/LDAP, SAML, Security features, such as authentication (native, AD/LDAP, SAML,
PKI), role-based access control, and auditing, require PKI), role-based access control, and auditing, require
configuration. See the{' '} configuration. See the{' '}
<EuiLink <EuiLink
@ -98,12 +98,12 @@ export class StartTrial extends React.PureComponent {
} }
const description = ( const description = (
<span> <span>
Experience what Security, Machine Learning, and all our other{' '} Experience what security, machine learning, and all our other{' '}
<EuiLink <EuiLink
href="https://www.elastic.co/subscriptions/xpack" href="https://www.elastic.co/subscriptions/xpack"
target="_blank" target="_blank"
> >
platinum features Platinum features
</EuiLink>{' '} </EuiLink>{' '}
have to offer. have to offer.
</span> </span>