From 2be7fbee09b282f3693f8a460cf4358b6497048d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Thu, 16 Jan 2020 16:18:31 +0100
Subject: [PATCH] Prettify messages to extend time

---
 .../log_text_stream/loading_item_view.tsx     | 80 +++++++++++++++++--
 .../plugins/infra/public/utils/datemath.ts    |  4 +-
 2 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
index 4d59cd9887bf943..c0777c5f6bbdf8e 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
@@ -16,6 +16,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, FormattedTime } from '@kbn/i18n/react';
 import * as React from 'react';
+import { Unit } from '@elastic/datemath';
 
 import euiStyled from '../../../../../../common/eui_styled_components';
 import { LogTextSeparator } from './log_text_separator';
@@ -146,7 +147,7 @@ const ProgressCta: React.FC<Pick<
 
   const extendedRange = extendDatemath(rangeEdge, position === 'start' ? 'before' : 'after');
 
-  if (!extendedRange || extendedRange.value === 'now') {
+  if (!extendedRange || !('diffUnit' in extendedRange)) {
     return null;
   }
 
@@ -160,11 +161,78 @@ const ProgressCta: React.FC<Pick<
       iconType={iconType}
       size="s"
     >
-      <FormattedMessage
-        id="xpack.infra.logs.extendTimeframe"
-        defaultMessage="Extend timeframe {amount} {unit}"
-        values={{ amount: extendedRange.diffAmount, unit: extendedRange.diffUnit }}
-      />
+      <ProgressExtendMessage amount={extendedRange.diffAmount} unit={extendedRange.diffUnit} />
     </EuiButton>
   );
 };
+
+const ProgressExtendMessage: React.FC<{ amount: number; unit: Unit }> = ({ amount, unit }) => {
+  switch (unit) {
+    case 'ms':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} milliseconds"
+          values={{ amount }}
+        />
+      );
+    case 's':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} seconds"
+          values={{ amount }}
+        />
+      );
+    case 'm':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} minutes"
+          values={{ amount }}
+        />
+      );
+    case 'h':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} hours"
+          values={{ amount }}
+        />
+      );
+    case 'd':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} days"
+          values={{ amount }}
+        />
+      );
+    case 'w':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} weeks"
+          values={{ amount }}
+        />
+      );
+    case 'M':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} months"
+          values={{ amount }}
+        />
+      );
+    case 'y':
+      return (
+        <FormattedMessage
+          id="xpack.infra.logs.extendTimeframe"
+          defaultMessage="Extend timeframe {amount} years"
+          values={{ amount }}
+        />
+      );
+    default:
+      throw new TypeError('Unhandled unit: ' + unit);
+  }
+};
diff --git a/x-pack/legacy/plugins/infra/public/utils/datemath.ts b/x-pack/legacy/plugins/infra/public/utils/datemath.ts
index fd7d7a731098cdc..61d74fa8f87d325 100644
--- a/x-pack/legacy/plugins/infra/public/utils/datemath.ts
+++ b/x-pack/legacy/plugins/infra/public/utils/datemath.ts
@@ -67,12 +67,12 @@ export function extendDatemath(
         const MINUTES_LARGE = 10;
         if (mustIncreaseAmount) {
           ratio = parsedAmount >= MINUTES_LARGE ? 0.5 : 1;
-          newAmount = parsedAmount + parsedAmount * ratio;
+          newAmount = parsedAmount + Math.floor(parsedAmount * ratio);
         } else {
           newAmount =
             parsedAmount >= MINUTES_LARGE
               ? Math.floor(parsedAmount / 1.5)
-              : parsedAmount - parsedAmount * 0.5;
+              : parsedAmount - Math.floor(parsedAmount * 0.5);
         }
         break;