From b21db2fd31e92b5f0a15be48386307a915d69bb8 Mon Sep 17 00:00:00 2001
From: "Keith J. Grant" <barkeep@keithjgrant.com>
Date: Fri, 30 Apr 2021 10:23:03 -0700
Subject: [PATCH] fix user list sorting issues; clean up comments

---
 .../User/UserOrganizations/UserOrganizationList.jsx   |  3 +++
 .../src/screens/User/UserRoles/UserRolesList.jsx      |  8 +-------
 .../screens/User/UserRoles/UserRolesListItem.test.jsx | 11 ++---------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.jsx b/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.jsx
index dde9b1fb04..bc6a490cf9 100644
--- a/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.jsx
+++ b/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationList.jsx
@@ -56,6 +56,9 @@ function UserOrganizationList() {
       itemCount={count}
       pluralizedItemName={t`Organizations`}
       qsConfig={QS_CONFIG}
+      toolbarSearchColumns={[
+        { name: t`Name`, key: 'name__icontains', isDefault: true },
+      ]}
       headerRow={
         <HeaderRow qsConfig={QS_CONFIG} isSelectable={false}>
           <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
index dcec93e745..cc35075388 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
@@ -147,17 +147,11 @@ function UserRolesList({ user }) {
             isDefault: true,
           },
         ]}
-        toolbarSortColumns={[
-          {
-            name: t`ID`,
-            key: 'id',
-          },
-        ]}
         toolbarSearchableKeys={searchableKeys}
         toolbarRelatedSearchableKeys={relatedSearchableKeys}
         headerRow={
           <HeaderRow qsConfig={QS_CONFIG} isSelectable={false}>
-            <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+            <HeaderCell>{t`Name`}</HeaderCell>
             <HeaderCell>{t`Type`}</HeaderCell>
             <HeaderCell>{t`Role`}</HeaderCell>
           </HeaderRow>
diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.test.jsx b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.test.jsx
index 70339f2f0f..0b17d35d9c 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.test.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.test.jsx
@@ -44,14 +44,8 @@ describe('<UserRolesListItem/>', () => {
     );
     const cells = wrapper.find('Td');
     expect(cells.at(0).text()).toBe('template delete project');
-    expect(
-      cells.at(1).text()
-      // wrapper.find('PFDataListCell[aria-label="Resource type"]').text()
-    ).toContain('Job Template');
-    expect(
-      cells.at(2).text()
-      // wrapper.find('PFDataListCell[aria-label="Resource role"]').text()
-    ).toContain('Admin');
+    expect(cells.at(1).text()).toContain('Job Template');
+    expect(cells.at(2).text()).toContain('Admin');
   });
 
   test('should render deletable chip', () => {
@@ -103,7 +97,6 @@ describe('<UserRolesListItem/>', () => {
         .find('Td')
         .at(0)
         .text()
-      // wrapper.find('PFDataListCell[aria-label="Resource name"]').text()
     ).toBe('System');
   });
 });