From 24cb299ba4aa6f06d461b44e7015202847623383 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Wed, 19 Dec 2018 11:12:05 -0700
Subject: [PATCH] [ML] Fixes sort on Calendars list events column so that it is
 done numerically (#27517)

* Ensure calendar list events col sorted numerically

* update corresponding tests
---
 .../calendars/list/__snapshots__/calendars_list.test.js.snap  | 4 ++--
 .../ml/public/settings/calendars/list/calendars_list.js       | 3 +--
 .../calendars/list/table/__snapshots__/table.test.js.snap     | 1 +
 .../plugins/ml/public/settings/calendars/list/table/table.js  | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/ml/public/settings/calendars/list/__snapshots__/calendars_list.test.js.snap b/x-pack/plugins/ml/public/settings/calendars/list/__snapshots__/calendars_list.test.js.snap
index 2be04c34494e..70c632d1e02a 100644
--- a/x-pack/plugins/ml/public/settings/calendars/list/__snapshots__/calendars_list.test.js.snap
+++ b/x-pack/plugins/ml/public/settings/calendars/list/__snapshots__/calendars_list.test.js.snap
@@ -26,7 +26,7 @@ exports[`CalendarsList Renders calendar list with calendars 1`] = `
                 "start_time": 1486656600000,
               },
             ],
-            "events_length": "1 event",
+            "events_length": 1,
             "job_ids": Array [
               "farequote",
             ],
@@ -44,7 +44,7 @@ exports[`CalendarsList Renders calendar list with calendars 1`] = `
                 "start_time": 1544076000000,
               },
             ],
-            "events_length": "1 event",
+            "events_length": 1,
             "job_ids": Array [
               "test",
             ],
diff --git a/x-pack/plugins/ml/public/settings/calendars/list/calendars_list.js b/x-pack/plugins/ml/public/settings/calendars/list/calendars_list.js
index 25829975edfe..0235199d7388 100644
--- a/x-pack/plugins/ml/public/settings/calendars/list/calendars_list.js
+++ b/x-pack/plugins/ml/public/settings/calendars/list/calendars_list.js
@@ -75,9 +75,8 @@ export class CalendarsList extends Component {
 
   addRequiredFieldsToList = (calendarsList = []) => {
     for (let i = 0; i < calendarsList.length; i++) {
-      const eventLength = calendarsList[i].events.length;
       calendarsList[i].job_ids_string = calendarsList[i].job_ids.join(', ');
-      calendarsList[i].events_length = `${eventLength} ${eventLength === 1 ? 'event' : 'events'}`;
+      calendarsList[i].events_length = calendarsList[i].events.length;
     }
 
     return calendarsList;
diff --git a/x-pack/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap b/x-pack/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap
index 4b3a3dab2f10..f91fdb198f47 100644
--- a/x-pack/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap
+++ b/x-pack/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap
@@ -21,6 +21,7 @@ exports[`CalendarsListTable renders the table with all calendars 1`] = `
         Object {
           "field": "events_length",
           "name": "Events",
+          "render": [Function],
           "sortable": true,
         },
       ]
diff --git a/x-pack/plugins/ml/public/settings/calendars/list/table/table.js b/x-pack/plugins/ml/public/settings/calendars/list/table/table.js
index ea5b02b568ed..c8cea77af366 100644
--- a/x-pack/plugins/ml/public/settings/calendars/list/table/table.js
+++ b/x-pack/plugins/ml/public/settings/calendars/list/table/table.js
@@ -64,7 +64,8 @@ export function CalendarsListTable({
     {
       field: 'events_length',
       name: 'Events',
-      sortable: true
+      sortable: true,
+      render: (eventsLength) => `${eventsLength} ${eventsLength === 1 ? 'event' : 'events'}`
     }
   ];