diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx index 8baa8fe062..b69d7eda98 100644 --- a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx +++ b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx @@ -98,8 +98,7 @@ function InventorySourceDetail({ inventorySource, i18n }) { }; const deleteDetailsRequests = relatedResourceDeleteRequests.inventorySource( - inventorySource.inventory, - inventorySource + inventorySource.id ); const VERBOSITY = { diff --git a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.jsx b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.jsx index 991e447cf1..7492001686 100644 --- a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.jsx +++ b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.jsx @@ -145,8 +145,7 @@ function InventorySourceList({ i18n }) { const listUrl = `/inventories/${inventoryType}/${id}/sources/`; const deleteDetailsRequests = relatedResourceDeleteRequests.inventorySource( - id, - selected[0] + selected[0]?.id ); return ( <> diff --git a/awx/ui_next/src/util/getRelatedResouceDeleteDetails.test.js b/awx/ui_next/src/util/getRelatedResouceDeleteDetails.test.js index 52e20c9768..d104ffe7bf 100644 --- a/awx/ui_next/src/util/getRelatedResouceDeleteDetails.test.js +++ b/awx/ui_next/src/util/getRelatedResouceDeleteDetails.test.js @@ -91,9 +91,8 @@ describe('delete details', () => { await getRelatedResourceDeleteCounts( relatedResourceDeleteRequests.inventorySource(1) ); - expect(InventoriesAPI.updateSources).toBeCalledWith(1); expect(WorkflowJobTemplateNodesAPI.read).toBeCalledWith({ - unified_job_template: 2, + unified_job_template: 1, }); }); @@ -105,11 +104,11 @@ describe('delete details', () => { }); test('should call return error for inventory source list', async () => { - InventoriesAPI.updateSources.mockRejectedValue({ + WorkflowJobTemplateNodesAPI.read.mockRejectedValue({ response: { config: { - method: 'post', - url: '/api/v2/inventories/1/ad_hoc_commands', + method: 'get', + url: '/api/v2/workflow_job_template_nodesP', }, data: 'An error occurred', status: 403, @@ -119,7 +118,6 @@ describe('delete details', () => { relatedResourceDeleteRequests.inventorySource(1) ); - expect(InventoriesAPI.updateSources).toBeCalledWith(1); expect(error).toBeDefined(); }); diff --git a/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js b/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js index 4fa95425d9..dbcd62080e 100644 --- a/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js +++ b/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js @@ -113,37 +113,20 @@ export const relatedResourceDeleteRequests = { }, ], - inventorySource: (inventoryId, inventorySource) => [ + inventorySource: inventorySourceId => [ { - request: async () => { - try { - const { data } = await InventoriesAPI.updateSources(inventoryId); - - const results = await Promise.all( - data.map(async datum => - WorkflowJobTemplateNodesAPI.read({ - unified_job_template: datum.inventory_source, - }) - ) - ); - const total = results.reduce( - ({ data: { count: acc } }, { data: { count: cur } }) => acc + cur, - { data: { count: 0 } } - ); - - return { data: { count: total } }; - } catch (err) { - throw new Error(err); - } - }, + request: async () => + WorkflowJobTemplateNodesAPI.read({ + unified_job_template: inventorySourceId, + }), label: i18n._(t`Workflow Job Template Nodes`), }, { - request: async () => InventorySourcesAPI.readGroups(inventorySource.id), + request: async () => InventorySourcesAPI.readGroups(inventorySourceId), label: i18n._(t`Groups`), }, { - request: async () => InventorySourcesAPI.readHosts(inventorySource.id), + request: async () => InventorySourcesAPI.readHosts(inventorySourceId), label: i18n._(t`Hosts`), }, ],