copy update and test update

elastic · Jan 15, 2021 · 80ee68f · 80ee68f
1 parent 64878d3
commit 80ee68f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/...nt/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts b/...nt/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts
@@ -326,8 +326,8 @@ describe('Conversion of absolute policy timing to relative timing', () => {
           )
         ).toEqual({
           total: 'Forever',
-          hot: 'At least 30 days',
-          warm: 'At least 4 days',
+          hot: '30 days',
+          warm: '4 days',
           cold: 'Forever',
         });
       });
@@ -349,7 +349,7 @@ describe('Conversion of absolute policy timing to relative timing', () => {
               },
             })
           )
-        ).toEqual({ total: 'Forever', hot: 'At least 34 days', warm: undefined, cold: 'Forever' });
+        ).toEqual({ total: 'Forever', hot: '34 days', warm: undefined, cold: 'Forever' });
       });
     });
 
@@ -372,8 +372,8 @@ describe('Conversion of absolute policy timing to relative timing', () => {
             })
           )
         ).toEqual({
-          total: 'At least 30 days',
-          hot: 'At least 30 days',
+          total: '30 days',
+          hot: '30 days',
           warm: undefined,
           cold: undefined,
         });
@@ -401,9 +401,9 @@ describe('Conversion of absolute policy timing to relative timing', () => {
             })
           )
         ).toEqual({
-          total: 'At least 30 days',
-          hot: 'At least 24 days',
-          warm: 'At least 6 days',
+          total: '30 days',
+          hot: '24 days',
+          warm: '6 days',
           cold: undefined,
         });
       });
@@ -434,9 +434,9 @@ describe('Conversion of absolute policy timing to relative timing', () => {
             })
           )
         ).toEqual({
-          total: 'At least 61 days',
-          hot: 'At least 24 days',
-          warm: 'At least 37 days',
+          total: '61 days',
+          hot: '24 days',
+          warm: '37 days',
           cold: 'Less than a day',
         });
       });
@@ -463,8 +463,8 @@ describe('Conversion of absolute policy timing to relative timing', () => {
             })
           )
         ).toEqual({
-          total: 'At least 61 days',
-          hot: 'At least 61 days',
+          total: '61 days',
+          hot: '61 days',
           warm: undefined,
           cold: 'Less than a day',
         });
@@ -496,8 +496,8 @@ describe('Conversion of absolute policy timing to relative timing', () => {
             })
           )
         ).toEqual({
-          total: 'At least 61 days',
-          hot: 'At least 61 days',
+          total: '61 days',
+          hot: '61 days',
           warm: 'Less than a day',
           cold: 'Less than a day',
         });

diff --git a/...agement/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts b/...agement/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
@@ -96,9 +96,9 @@ const getPhaseMinAgeInMilliseconds = (phase: { min_age: string }): number => {
   let milliseconds: number;
   const { units, size } = splitSizeAndUnits(phase.min_age);
   if (units === 'micros') {
-    milliseconds = parseInt(size, 10) * 1e3;
+    milliseconds = parseInt(size, 10) / 1e3;
   } else if (units === 'nanos') {
-    milliseconds = parseInt(size, 10) * 1e6;
+    milliseconds = parseInt(size, 10) / 1e6;
   } else {
     milliseconds = moment.duration(size, units as any).asMilliseconds();
   }
@@ -161,13 +161,7 @@ const millisecondsToDays = (milliseconds?: number): string | undefined => {
   const days = milliseconds / 8.64e7;
   return days < 1
     ? i18nTexts.lessThanADay
-    : i18n.translate('xpack.indexLifecycleMgmt.relativeTiming.amountOfDays', {
-        defaultMessage: 'At least {amount} {plurualisedDay}',
-        values: {
-          amount: Math.floor(days),
-          plurualisedDay: days === 1 ? i18nTexts.day : i18nTexts.days,
-        },
-      });
+    : `${Math.floor(days)} ${days === 1 ? i18nTexts.day : i18nTexts.days}`;
 };
 
 export const normalizeTimingsToHumanReadable = ({