From ba65b67aaa812bf7e98131e848b99899da8193b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Thu, 1 Nov 2018 14:05:53 -0300
Subject: [PATCH] Location sort based on Country first and city

---
 src/components/EnhancedTable.js         | 2 ++
 src/components/pages/AmbassadorsPage.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/EnhancedTable.js b/src/components/EnhancedTable.js
index 8eb820d..141465c 100644
--- a/src/components/EnhancedTable.js
+++ b/src/components/EnhancedTable.js
@@ -81,6 +81,8 @@ class EnhancedTable extends Component {
         };
       }).sort(sortBy('name'))
     };
+
+    this.handleRequestSort('', this.props.orderBy);
   }
 
   handleRequestSort = (event, property) => {
diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js
index 9b34dd7..0c8b90a 100644
--- a/src/components/pages/AmbassadorsPage.js
+++ b/src/components/pages/AmbassadorsPage.js
@@ -244,7 +244,7 @@ class AmbassadorsPage extends Component {
   addLocationSearchText(cities){
     let searchText = '';
     cities.forEach((location) => {
-      searchText += `${(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())} - ${countries.getName(location.country)} `;
+      searchText += `${countries.getName(location.country)} - ${(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())}`;
     });
 
     return searchText;
@@ -394,7 +394,7 @@ class AmbassadorsPage extends Component {
                 <EnhancedTable
                   columnData={columnData}
                   data={data}
-                  orderBy="location"
+                  orderBy="Location"
                   showSearchColumns={false}
                   rowsPerPage={10}
                   isAdmin={false}