Merge pull request #610 from aznashwan/licensing-message-strings

Clarify licensing status tooltips.

src/components/organisms/DashboardContent/modules/LicenceModule/LicenceModule.tsx

@@ -149,14 +149,14 @@ class LicenceModule extends React.Component<Props> {
           current: info.currentPerformedReplicas,
           total: info.currentAvailableReplicas,
           label: 'Current Replicas',
-          info: 'The number of replicas performed with current licence over the number of replicas available in current licence',
+          info: 'The number of replicas consumed over the number of replicas available in all currently active licences (including non-activated floating licences)',
         },
         {
           color: Palette.alert,
           current: info.lifetimePerformedReplicas,
           total: info.lifetimeAvailableReplicas,
           label: 'Lifetime Replicas',
-          info: 'The number of lifetime performed replicas over the number of lifetime available replicas',
+          info: 'The number of replicas perfomred over the number of replicas licenced from all licences (including expired licences)',
         },
       ],
       [
@@ -165,14 +165,14 @@ class LicenceModule extends React.Component<Props> {
           current: info.currentPerformedMigrations,
           total: info.currentAvailableMigrations,
           label: 'Current Migrations',
-          info: 'The number of migrations performed with current licence over the number of migrations available in current licence',
+          info: 'The number of migrations consumed over the number of migrations available in all currently active licences (including non-activated floating licences)',
         },
         {
           color: Palette.primary,
           current: info.lifetimePerformedMigrations,
           total: info.lifetimeAvailableMigrations,
           label: 'Lifetime Migrations',
-          info: 'The number of lifetime performed migrations over the number of lifetime available migrations',
+          info: 'The number of migrations performed over the number of migrations licenced from all licences (including expired licences)',
         },
       ],
     ]

src/sources/LincenceSource.ts

@@ -42,8 +42,8 @@ class LicenceSource {
       latestLicenceExpiryDate: new Date(root.latest_licence_expiry_time),
       currentPerformedMigrations: root.current_performed_migrations,
       currentPerformedReplicas: root.current_performed_replicas,
-      lifetimePerformedMigrations: root.lifetime_perfomed_migrations,
-      lifetimePerformedReplicas: root.lifetime_perfomed_replicas,
+      lifetimePerformedMigrations: root.lifetime_performed_migrations,
+      lifetimePerformedReplicas: root.lifetime_performed_replicas,
       currentAvailableMigrations: root.current_available_migrations,
       currentAvailableReplicas: root.current_available_replicas,
       lifetimeAvailableMigrations: root.lifetime_available_migrations,