From 8c09160693b7c1d51bf08f0a69c9b84daea2509d Mon Sep 17 00:00:00 2001
From: vsandvold <vsandvold@gmail.com>
Date: Tue, 14 Feb 2017 11:05:34 +0100
Subject: [PATCH] makes name default sorting

---
 .../src/component/feature/list-component.jsx  |  4 +-
 .../src/component/feature/list-container.jsx  | 64 ++++++++++---------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/frontend/src/component/feature/list-component.jsx b/frontend/src/component/feature/list-component.jsx
index 6d22646955..ab59ba754a 100644
--- a/frontend/src/component/feature/list-component.jsx
+++ b/frontend/src/component/feature/list-component.jsx
@@ -66,7 +66,7 @@ export default class FeatureListComponent extends React.PureComponent {
                     </FABButton>
                 </Link>
             </div>
-            <Card shadow={0} className={commonStyles.fullwidth}>
+            <Card shadow={0} className={commonStyles.fullwidth} style={{ overflow: 'visible' }}>
                 <CardActions>
                     <DropdownButton id="metric" label={`Last ${settings.showLastHour ? 'hour' : 'minute'}`}/>
                     <Menu target="metric" onClick={() => this.toggleMetrics()}
@@ -79,7 +79,7 @@ export default class FeatureListComponent extends React.PureComponent {
                     <DropdownButton id="sorting" label={`By ${settings.sort}`}/>
                     <Menu target="sorting" onClick={(e) => this.setSort(e.target.getAttribute('data-target'))}
                         style={{ width: '168px' }}>
-                        <MenuItem disabled={!settings.sort || settings.sort === 'name'} data-target="name">Name</MenuItem>
+                        <MenuItem disabled={settings.sort === 'name'} data-target="name">Name</MenuItem>
                         <MenuItem disabled={settings.sort === 'enabled'} data-target="enabled">Enabled</MenuItem>
                         <MenuItem disabled={settings.sort === 'created'} data-target="created">Created</MenuItem>
                         <MenuItem disabled={settings.sort === 'strategies'} data-target="strategies">Strategies</MenuItem>
diff --git a/frontend/src/component/feature/list-container.jsx b/frontend/src/component/feature/list-container.jsx
index 6ed902ca72..7cdbadd14f 100644
--- a/frontend/src/component/feature/list-container.jsx
+++ b/frontend/src/component/feature/list-container.jsx
@@ -21,38 +21,40 @@ const mapStateToProps = (state) => {
         );
     }
 
-    if (settings.sort) {
-        if (settings.sort === 'enabled') {
-            features = features.sort((a, b) => (
-                // eslint-disable-next-line
-                a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1
-            ));
-        } else if (settings.sort === 'created') {
-            features = features.sort((a, b) => (
-                new Date(a.createdAt) > new Date(b.createdAt) ? -1 : 1
-            ));
-        } else if (settings.sort === 'name') {
-            features = features.sort((a, b) => {
-                if (a.name < b.name) { return -1; }
-                if (a.name > b.name) { return 1; }
-                return 0;
-            });
-        } else if (settings.sort === 'strategies') {
-            features = features.sort((a, b) => (
-                a.strategies.length > b.strategies.length ? -1 : 1
-            ));
-        } else if (settings.sort === 'metrics') {
-            const target = settings.showLastHour ? featureMetrics.lastHour : featureMetrics.lastMinute;
+    if (!settings.sort) {
+        settings.sort = 'name';
+    }
 
-            features = features.sort((a, b) => {
-                if (!target[a.name]) { return 1; }
-                if (!target[b.name]) { return -1; }
-                if (target[a.name].yes > target[b.name].yes) {
-                    return -1;
-                }
-                return 1;
-            });
-        }
+    if (settings.sort === 'enabled') {
+        features = features.sort((a, b) => (
+            // eslint-disable-next-line
+            a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1
+        ));
+    } else if (settings.sort === 'created') {
+        features = features.sort((a, b) => (
+            new Date(a.createdAt) > new Date(b.createdAt) ? -1 : 1
+        ));
+    } else if (settings.sort === 'name') {
+        features = features.sort((a, b) => {
+            if (a.name < b.name) { return -1; }
+            if (a.name > b.name) { return 1; }
+            return 0;
+        });
+    } else if (settings.sort === 'strategies') {
+        features = features.sort((a, b) => (
+            a.strategies.length > b.strategies.length ? -1 : 1
+        ));
+    } else if (settings.sort === 'metrics') {
+        const target = settings.showLastHour ? featureMetrics.lastHour : featureMetrics.lastMinute;
+
+        features = features.sort((a, b) => {
+            if (!target[a.name]) { return 1; }
+            if (!target[b.name]) { return -1; }
+            if (target[a.name].yes > target[b.name].yes) {
+                return -1;
+            }
+            return 1;
+        });
     }
 
     return {