From 944c32da24d8e0b1dfc4650938d39d18a6e8e8bd Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Thu, 5 Nov 2020 10:43:35 -0500
Subject: [PATCH] resolve cyclical group association

---
 awx/ui_next/src/api/models/Groups.js                     | 6 ++++++
 .../screens/Inventory/InventoryGroup/InventoryGroup.jsx  | 2 +-
 .../InventoryRelatedGroups/InventoryRelatedGroupList.jsx | 9 +++++----
 .../InventoryRelatedGroupList.test.jsx                   | 9 ++++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/awx/ui_next/src/api/models/Groups.js b/awx/ui_next/src/api/models/Groups.js
index a57e5dd3e2..3f9aa928e0 100644
--- a/awx/ui_next/src/api/models/Groups.js
+++ b/awx/ui_next/src/api/models/Groups.js
@@ -48,6 +48,12 @@ class Groups extends Base {
       id: childId,
     });
   }
+
+  readPotentialGroups(id, params) {
+    return this.http.get(`${this.baseUrl}${id}/potential_children/`, {
+      params,
+    });
+  }
 }
 
 export default Groups;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx
index b7554c545a..0221d3afe7 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx
@@ -48,7 +48,7 @@ function InventoryGroup({ i18n, setBreadcrumb, inventory }) {
     {
       name: (
         <>
-          <CaretLeftIcon />
+          <CaretLeftIcon aria-label={i18n._(t`Back to Groups`)} />
           {i18n._(t`Back to Groups`)}
         </>
       ),
diff --git a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
index f59f2fee5e..18e3e2ab3a 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
@@ -73,13 +73,14 @@ function InventoryRelatedGroupList({ i18n }) {
 
   const fetchGroupsToAssociate = useCallback(
     params => {
-      return InventoriesAPI.readGroups(
-        inventoryId,
-        mergeParams(params, { not__id: inventoryId, not__parents: inventoryId })
+      return GroupsAPI.readPotentialGroups(
+        groupId,
+        mergeParams(params, { not__id: groupId, not__parents: groupId })
       );
     },
-    [inventoryId]
+    [groupId]
   );
+
   const associateGroup = useCallback(
     async selectedGroups => {
       try {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.test.jsx
index 13021f5cff..e3879c560a 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.test.jsx
@@ -189,7 +189,7 @@ describe('<InventoryRelatedGroupList />', () => {
   });
 
   test('should associate existing group', async () => {
-    InventoriesAPI.readGroups.mockResolvedValue({
+    GroupsAPI.readPotentialGroups.mockResolvedValue({
       data: { count: mockGroups.length, results: mockGroups },
     });
     await act(async () => {
@@ -204,6 +204,13 @@ describe('<InventoryRelatedGroupList />', () => {
         .find('DropdownItem[aria-label="Add existing group"]')
         .prop('onClick')()
     );
+    expect(GroupsAPI.readPotentialGroups).toBeCalledWith(2, {
+      not__id: 2,
+      not__parents: 2,
+      order_by: 'name',
+      page: 1,
+      page_size: 5,
+    });
     wrapper.update();
     act(() =>
       wrapper.find('CheckboxListItem[name="foo"]').prop('onSelect')({ id: 1 })