From a2d5d9e3207cc42f80a26d4da5f75d8a5ac18646 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 23 Nov 2020 12:31:32 -0500
Subject: [PATCH] Display 'System' for user role resource name when
 summary_fields.resource_name not present

---
 .../User/UserRoles/UserRolesListItem.jsx      | 16 ++++++++------
 .../User/UserRoles/UserRolesListItem.test.jsx | 21 ++++++++++++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx
index 31e3df94d9..8f47315efa 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx
@@ -18,12 +18,16 @@ function UserRolesListItem({ role, i18n, detailUrl, onSelect }) {
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="name" aria-label={i18n._(t`resource name`)}>
-              <Link to={`${detailUrl}`} id={labelId}>
-                <b>{role.summary_fields.resource_name}</b>
-              </Link>
+            <DataListCell key="name" aria-label={i18n._(t`Resource name`)}>
+              {role.summary_fields.resource_name ? (
+                <Link to={`${detailUrl}`} id={labelId}>
+                  <b>{role.summary_fields.resource_name}</b>
+                </Link>
+              ) : (
+                <b>{i18n._(t`System`)}</b>
+              )}
             </DataListCell>,
-            <DataListCell key="type" aria-label={i18n._(t`resource type`)}>
+            <DataListCell key="type" aria-label={i18n._(t`Resource type`)}>
               {role.summary_fields && (
                 <DetailList stacked>
                   <Detail
@@ -33,7 +37,7 @@ function UserRolesListItem({ role, i18n, detailUrl, onSelect }) {
                 </DetailList>
               )}
             </DataListCell>,
-            <DataListCell key="role" aria-label={i18n._(t`resource role`)}>
+            <DataListCell key="role" aria-label={i18n._(t`Resource role`)}>
               {role.name && (
                 <DetailList stacked>
                   <Detail
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 5bedd6c4d4..21cd4b6974 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.test.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.test.jsx
@@ -35,13 +35,13 @@ describe('<UserRolesListItem/>', () => {
       />
     );
     expect(
-      wrapper.find('PFDataListCell[aria-label="resource name"]').text()
+      wrapper.find('PFDataListCell[aria-label="Resource name"]').text()
     ).toBe('template delete project');
     expect(
-      wrapper.find('PFDataListCell[aria-label="resource type"]').text()
+      wrapper.find('PFDataListCell[aria-label="Resource type"]').text()
     ).toContain('Job Template');
     expect(
-      wrapper.find('PFDataListCell[aria-label="resource role"]').text()
+      wrapper.find('PFDataListCell[aria-label="Resource role"]').text()
     ).toContain('Admin');
   });
   test('should render deletable chip', () => {
@@ -63,4 +63,19 @@ describe('<UserRolesListItem/>', () => {
     );
     expect(wrapper.find('Chip').prop('isReadOnly')).toBe(true);
   });
+  test('should display System as name when no resource_name is present in summary_fields', () => {
+    wrapper = mountWithContexts(
+      <UserRolesListItem
+        role={{
+          ...role,
+          summary_fields: {
+            user_capabilities: { unattach: false },
+          },
+        }}
+      />
+    );
+    expect(
+      wrapper.find('PFDataListCell[aria-label="Resource name"]').text()
+    ).toBe('System');
+  });
 });