From fa47e48a158f72fba9bea0cb723331716f681697 Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Tue, 22 Feb 2022 16:34:30 -0500 Subject: [PATCH] Fixes broken link from User to UserOrg (#11759) --- .../User/UserOrganizations/UserOrganizationList.js | 8 ++++---- .../User/UserOrganizations/UserOrganizationList.test.js | 2 +- .../User/UserOrganizations/UserOrganizationListItem.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.js b/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.js index a4b19840ce..a67ff5fa77 100644 --- a/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.js +++ b/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.js @@ -20,7 +20,7 @@ const QS_CONFIG = getQSConfig('organizations', { function UserOrganizationList() { const location = useLocation(); - const { id: userId } = useParams(); + const { id } = useParams(); const { result: { organizations, count, searchableKeys, relatedSearchableKeys }, @@ -36,8 +36,8 @@ function UserOrganizationList() { }, actions, ] = await Promise.all([ - UsersAPI.readOrganizations(userId, params), - UsersAPI.readOrganizationOptions(), + UsersAPI.readOrganizations(id, params), + UsersAPI.readOrganizationOptions(id), ]); return { searchableKeys: Object.keys(actions.data.actions?.GET || {}).filter( @@ -49,7 +49,7 @@ function UserOrganizationList() { organizations: results, count: orgCount, }; - }, [userId, location.search]), + }, [id, location.search]), { organizations: [], count: 0, diff --git a/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.test.js b/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.test.js index f07c787e79..f62954e175 100644 --- a/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.test.js +++ b/awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.test.js @@ -72,6 +72,6 @@ describe('', () => { page_size: 20, type: 'organization', }); - expect(UsersAPI.readOrganizationOptions).toBeCalled(); + expect(UsersAPI.readOrganizationOptions).toBeCalledWith('1'); }); }); diff --git a/awx/ui/src/screens/User/UserOrganizations/UserOrganizationListItem.js b/awx/ui/src/screens/User/UserOrganizations/UserOrganizationListItem.js index 423131f86e..98535c15dd 100644 --- a/awx/ui/src/screens/User/UserOrganizations/UserOrganizationListItem.js +++ b/awx/ui/src/screens/User/UserOrganizations/UserOrganizationListItem.js @@ -12,7 +12,7 @@ export default function UserOrganizationListItem({ organization }) { > - {organization.name} + {organization.name} {organization.description}