[Monitoring] Capitalize the license type (elastic#20683)

* Capitalize the license type in monitoring * Revert "Capitalize the license type in monitoring" This reverts commit 38ad3a5. * Pass in the type capitalized * Revert "Pass in the type capitalized" This reverts commit 6a05bb1. * Capitalize type in license status directly so consumers do not need to worry about it
chrisronline · Jul 13, 2018 · 7b5952b · 7b5952b
1 parent 38c4438
commit 7b5952b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...e_management/public/sections/license_dashboard/license_status/license_status.container.js b/...e_management/public/sections/license_dashboard/license_status/license_status.container.js
@@ -10,10 +10,9 @@ import { getLicense, getExpirationDateFormatted, isExpired } from '../../../stor
 
 const mapStateToProps = (state) => {
   const { isActive, type } = getLicense(state);
-  const typeTitleCase = type.charAt(0).toUpperCase() + type.substr(1).toLowerCase();
   return {
     status: isActive ? 'Active' : 'Inactive',
-    type: typeTitleCase,
+    type,
     isExpired: isExpired(state),
     expiryDate: getExpirationDateFormatted(state)
   };

diff --git a/...ins/license_management/public/sections/license_dashboard/license_status/license_status.js b/...ins/license_management/public/sections/license_dashboard/license_status/license_status.js
@@ -18,6 +18,7 @@ import {
 export class LicenseStatus extends React.PureComponent {
   render() {
     const { isExpired, status, type, expiryDate } = this.props;
+    const typeTitleCase = type.charAt(0).toUpperCase() + type.substr(1).toLowerCase();
     let icon;
     let title;
     let message;
@@ -28,7 +29,7 @@ export class LicenseStatus extends React.PureComponent {
           Your license expired on <strong>{expiryDate}</strong>
         </Fragment>
       );
-      title = `Your ${type} license has expired`;
+      title = `Your ${typeTitleCase} license has expired`;
     } else {
       icon = <EuiIcon color="success" type="checkInCircleFilled" />;
       message = expiryDate ? (
@@ -38,7 +39,7 @@ export class LicenseStatus extends React.PureComponent {
       ) : (
         <Fragment>Your license will never expire.</Fragment>
       );
-      title = `Your ${type} license is ${status.toLowerCase()}`;
+      title = `Your ${typeTitleCase} license is ${status.toLowerCase()}`;
     }
     return (
       <div>