From 6ce88fdf4db4541979752c722795518c7b45fd0b Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 17 Dec 2018 13:16:08 -0500
Subject: [PATCH] Separates search dropdown items from sort dropdown items

---
 .../DataListToolbar/DataListToolbar.jsx       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index 80b238be6e..e1d2ea6842 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { I18n } from '@lingui/react';
-import { Trans, t } from '@lingui/macro';
+import { t } from '@lingui/macro';
 import {
   Button,
   Checkbox,
@@ -115,11 +115,21 @@ class DataListToolbar extends React.Component {
       return icon;
     };
 
-    const dropdownItems = columns.filter(({ key }) => key !== searchKey).map(({ key, name }) => (
-      <DropdownItem key={key} component="button">
-        { name }
-      </DropdownItem>
-    ));
+    const searchDropdownItems = columns
+      .filter(({ key }) => key !== searchKey)
+      .map(({ key, name }) => (
+        <DropdownItem key={key} component="button">
+          { name }
+        </DropdownItem>
+      ));
+
+    const sortDropdownItems = columns
+      .filter(({ key, isSortable }) => isSortable && key !== sortedColumnKey)
+      .map(({ key, name }) => (
+        <DropdownItem key={key} component="button">
+          { name }
+        </DropdownItem>
+      ));
 
     return (
       <I18n>
@@ -153,7 +163,7 @@ class DataListToolbar extends React.Component {
                               { searchColumnName }
                             </DropdownToggle>
                           )}
-                          dropdownItems={dropdownItems}
+                          dropdownItems={searchDropdownItems}
                         />
                         <TextInput
                           type="search"
@@ -185,7 +195,7 @@ class DataListToolbar extends React.Component {
                             { sortedColumnName }
                           </DropdownToggle>
                         )}
-                        dropdownItems={dropdownItems}
+                        dropdownItems={sortDropdownItems}
                       />
                     </ToolbarItem>
                     <ToolbarItem>