From ee0d671b8c85b8568474c506b798b805389529ac Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 20 Mar 2018 12:55:54 -0700
Subject: [PATCH 1/2] Add ability to specify initial sorting to
 EuiInMemoryTable

---
 CHANGELOG.md                                  |  2 +-
 .../src/views/tables/in_memory/in_memory.js   |  9 +++-
 .../src/views/tables/in_memory/props_info.js  |  6 +--
 .../in_memory_table.test.js.snap              | 41 +++++++++++++++++++
 src/components/basic_table/in_memory_table.js | 13 ++++--
 .../basic_table/in_memory_table.test.js       | 31 ++++++++++++++
 6 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ded728de110..91cd0a3e5fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # [`master`](https://github.com/elastic/eui/tree/master)
 
-No public interface changes since `0.0.32`.
+- Added initial sorting option to `EuiInMemoryTable`
 
 # [`0.0.32`](https://github.com/elastic/eui/tree/v0.0.32)
 
diff --git a/src-docs/src/views/tables/in_memory/in_memory.js b/src-docs/src/views/tables/in_memory/in_memory.js
index bd2c1069cc7..7c79af01daf 100644
--- a/src-docs/src/views/tables/in_memory/in_memory.js
+++ b/src-docs/src/views/tables/in_memory/in_memory.js
@@ -70,12 +70,19 @@ export const Table = () => {
     sortable: true
   }];
 
+  const sorting = {
+    sort: {
+      field: 'dateOfBirth',
+      direction: 'desc',
+    }
+  };
+
   return (
     <EuiInMemoryTable
       items={store.users}
       columns={columns}
       pagination={true}
-      sorting={true}
+      sorting={sorting}
     />
   );
 };
diff --git a/src-docs/src/views/tables/in_memory/props_info.js b/src-docs/src/views/tables/in_memory/props_info.js
index 53d6d5ae9dd..4086813622e 100644
--- a/src-docs/src/views/tables/in_memory/props_info.js
+++ b/src-docs/src/views/tables/in_memory/props_info.js
@@ -2,7 +2,7 @@ import { omit } from '../../../../../src/services/objects';
 import { propsInfo as basicPropsInfo } from '../basic/props_info';
 import { propsInfo as searchBarPropsInfo } from '../../search_bar/props_info';
 
-const basicTableProps = omit(basicPropsInfo, [ 'EuiBasicTable', 'Pagination', 'Sorting' ]);
+const basicTableProps = omit(basicPropsInfo, [ 'EuiBasicTable', 'Pagination' ]);
 const searchBarProps = omit(searchBarPropsInfo, [ 'EuiSearchBar' ]);
 
 export const propsInfo = {
@@ -39,9 +39,9 @@ export const propsInfo = {
           type: { name: 'boolean | #Pagination' }
         },
         sorting: {
-          description: 'Enables/disables sorting',
+          description: 'Enables/disables sorting. Can be an object that configures initial sorting when enabled',
           required: false,
-          type: { name: 'boolean' }
+          type: { name: 'boolean | #Sorting' }
         },
         search: {
           description: 'Configures a search bar for the table',
diff --git a/src/components/basic_table/__snapshots__/in_memory_table.test.js.snap b/src/components/basic_table/__snapshots__/in_memory_table.test.js.snap
index e53d33fcbf1..bf7b0366d4d 100644
--- a/src/components/basic_table/__snapshots__/in_memory_table.test.js.snap
+++ b/src/components/basic_table/__snapshots__/in_memory_table.test.js.snap
@@ -17,6 +17,47 @@ exports[`EuiInMemoryTable empty array 1`] = `
 />
 `;
 
+exports[`EuiInMemoryTable with initial sorting 1`] = `
+<EuiBasicTable
+  columns={
+    Array [
+      Object {
+        "description": "description",
+        "field": "name",
+        "name": "Name",
+        "sortable": true,
+      },
+    ]
+  }
+  items={
+    Array [
+      Object {
+        "id": "3",
+        "name": "name3",
+      },
+      Object {
+        "id": "2",
+        "name": "name2",
+      },
+      Object {
+        "id": "1",
+        "name": "name1",
+      },
+    ]
+  }
+  noItemsMessage="No items found"
+  onChange={[Function]}
+  sorting={
+    Object {
+      "sort": Object {
+        "direction": "desc",
+        "field": "name",
+      },
+    }
+  }
+/>
+`;
+
 exports[`EuiInMemoryTable with items 1`] = `
 <EuiBasicTable
   columns={
diff --git a/src/components/basic_table/in_memory_table.js b/src/components/basic_table/in_memory_table.js
index 42af25861c3..8c40489a057 100644
--- a/src/components/basic_table/in_memory_table.js
+++ b/src/components/basic_table/in_memory_table.js
@@ -9,7 +9,7 @@ import {
   defaults as paginationBarDefaults
 } from './pagination_bar';
 import { isBoolean, isString } from '../../services/predicate';
-import { Comparators } from '../../services/sort';
+import { Comparators, PropertySortType } from '../../services/sort';
 import {
   Query,
   QueryType,
@@ -40,7 +40,12 @@ const InMemoryTablePropTypes = {
       pageSizeOptions: PropTypes.arrayOf(PropTypes.number)
     })
   ]),
-  sorting: PropTypes.bool,
+  sorting: PropTypes.oneOfType([
+    PropTypes.bool,
+    PropTypes.shape({
+      sort: PropertySortType
+    })
+  ]),
   selection: SelectionType
 };
 
@@ -81,7 +86,7 @@ const getInitialPagination = (pagination) => {
 };
 
 const getInitialSorting = (sorting) => {
-  if (!sorting) {
+  if (!sorting || !sorting.sort) {
     return {
       sortField: undefined,
       sortDirection: undefined,
@@ -91,7 +96,7 @@ const getInitialSorting = (sorting) => {
   const {
     field: sortField,
     direction: sortDirection,
-  } = sorting;
+  } = sorting.sort;
 
   return {
     sortField,
diff --git a/src/components/basic_table/in_memory_table.test.js b/src/components/basic_table/in_memory_table.test.js
index ba007533bcf..8761cc6f05c 100644
--- a/src/components/basic_table/in_memory_table.test.js
+++ b/src/components/basic_table/in_memory_table.test.js
@@ -226,6 +226,37 @@ describe('EuiInMemoryTable', () => {
     expect(component).toMatchSnapshot();
   });
 
+  test('with initial sorting', () => {
+
+    const props = {
+      ...requiredProps,
+      items: [
+        { id: '1', name: 'name1' },
+        { id: '2', name: 'name2' },
+        { id: '3', name: 'name3' }
+      ],
+      columns: [
+        {
+          field: 'name',
+          name: 'Name',
+          description: 'description',
+          sortable: true
+        }
+      ],
+      sorting: {
+        sort: {
+          field: 'name',
+          direction: 'desc'
+        }
+      }
+    };
+    const component = shallow(
+      <EuiInMemoryTable {...props} />
+    );
+
+    expect(component).toMatchSnapshot();
+  });
+
   test('with pagination and selection', () => {
 
     const props = {

From bba493fc351c17507ee31a766b92249e93a8d42b Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 20 Mar 2018 13:09:48 -0700
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91cd0a3e5fe..98d28bc6c7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # [`master`](https://github.com/elastic/eui/tree/master)
 
-- Added initial sorting option to `EuiInMemoryTable`
+- Added initial sorting option to `EuiInMemoryTable` ([#547](https://github.com/elastic/eui/pull/547))
 
 # [`0.0.32`](https://github.com/elastic/eui/tree/v0.0.32)