diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
index 39c7d503ec..4a5cf17947 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
@@ -1,11 +1,12 @@
-import React, { Component } from 'react';
-import { withRouter } from 'react-router-dom';
+import React, { useState, useCallback, useEffect } from 'react';
+import { useLocation, useRouteMatch } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 
 import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 
 import { InventoriesAPI } from '@api';
+import useRequest, { useDeleteItems } from '@util/useRequest';
 import AlertModal from '@components/AlertModal';
 import DatalistToolbar from '@components/DataListToolbar';
 import ErrorDetail from '@components/ErrorDetail';
@@ -23,225 +24,172 @@ const QS_CONFIG = getQSConfig('inventory', {
   order_by: 'name',
 });
 
-class InventoriesList extends Component {
-  constructor(props) {
-    super(props);
+function InventoryList({ i18n }) {
+  const location = useLocation();
+  const match = useRouteMatch();
+  const [selected, setSelected] = useState([]);
 
-    this.state = {
-      hasContentLoading: true,
-      contentError: null,
-      deletionError: null,
-      selected: [],
+  const {
+    result: { inventories, itemCount, actions },
+    error: contentError,
+    isLoading,
+    request: fetchInventories,
+  } = useRequest(
+    useCallback(async () => {
+      const params = parseQueryString(QS_CONFIG, location.search);
+      const [response, actionsResponse] = await Promise.all([
+        InventoriesAPI.read(params),
+        InventoriesAPI.readOptions(),
+      ]);
+      return {
+        inventories: response.data.results,
+        itemCount: response.data.count,
+        actions: actionsResponse.data.actions,
+      };
+    }, [location]),
+    {
       inventories: [],
       itemCount: 0,
-    };
-
-    this.loadInventories = this.loadInventories.bind(this);
-    this.handleSelectAll = this.handleSelectAll.bind(this);
-    this.handleSelect = this.handleSelect.bind(this);
-    this.handleInventoryDelete = this.handleInventoryDelete.bind(this);
-    this.handleDeleteErrorClose = this.handleDeleteErrorClose.bind(this);
-  }
-
-  componentDidMount() {
-    this.loadInventories();
-  }
-
-  componentDidUpdate(prevProps) {
-    const { location } = this.props;
-
-    if (location !== prevProps.location) {
-      this.loadInventories();
+      actions: {},
     }
-  }
+  );
 
-  handleDeleteErrorClose() {
-    this.setState({ deletionError: null });
-  }
+  useEffect(() => {
+    fetchInventories();
+  }, [fetchInventories]);
 
-  handleSelectAll(isSelected) {
-    const { inventories } = this.state;
-    const selected = isSelected ? [...inventories] : [];
-    this.setState({ selected });
-  }
+  const isAllSelected =
+    selected.length === inventories.length && selected.length > 0;
+  const {
+    isLoading: isDeleteLoading,
+    deleteItems: deleteTeams,
+    deletionError,
+    clearDeletionError,
+  } = useDeleteItems(
+    useCallback(async () => {
+      return Promise.all(selected.map(team => InventoriesAPI.destroy(team.id)));
+    }, [selected]),
+    {
+      qsConfig: QS_CONFIG,
+      allItemsSelected: isAllSelected,
+      fetchItems: fetchInventories,
+    }
+  );
 
-  handleSelect(inventory) {
-    const { selected } = this.state;
-    if (selected.some(s => s.id === inventory.id)) {
-      this.setState({ selected: selected.filter(s => s.id !== inventory.id) });
+  const handleInventoryDelete = async () => {
+    await deleteTeams();
+    setSelected([]);
+  };
+
+  const hasContentLoading = isDeleteLoading || isLoading;
+  const canAdd = actions && actions.POST;
+
+  const handleSelectAll = isSelected => {
+    setSelected(isSelected ? [...inventories] : []);
+  };
+
+  const handleSelect = row => {
+    if (selected.some(s => s.id === row.id)) {
+      setSelected(selected.filter(s => s.id !== row.id));
     } else {
-      this.setState({ selected: selected.concat(inventory) });
+      setSelected(selected.concat(row));
     }
-  }
+  };
 
-  async handleInventoryDelete() {
-    const { selected, itemCount } = this.state;
-
-    this.setState({ hasContentLoading: true });
-    try {
-      await Promise.all(
-        selected.map(({ id }) => {
-          return InventoriesAPI.destroy(id);
-        })
-      );
-      this.setState({ itemCount: itemCount - selected.length });
-    } catch (err) {
-      this.setState({ deletionError: err });
-    } finally {
-      await this.loadInventories();
-    }
-  }
-
-  async loadInventories() {
-    const { location } = this.props;
-    const { actions: cachedActions } = this.state;
-    const params = parseQueryString(QS_CONFIG, location.search);
-
-    let optionsPromise;
-    if (cachedActions) {
-      optionsPromise = Promise.resolve({ data: { actions: cachedActions } });
-    } else {
-      optionsPromise = InventoriesAPI.readOptions();
-    }
-
-    const promises = Promise.all([InventoriesAPI.read(params), optionsPromise]);
-
-    this.setState({ contentError: null, hasContentLoading: true });
-
-    try {
-      const [
+  const addButton = (
+    <AddDropDownButton
+      key="add"
+      dropdownItems={[
         {
-          data: { count, results },
+          label: i18n._(t`Inventory`),
+          url: `${match.url}/inventory/add/`,
         },
         {
-          data: { actions },
+          label: i18n._(t`Smart Inventory`),
+          url: `${match.url}/smart_inventory/add/`,
         },
-      ] = await promises;
-
-      this.setState({
-        actions,
-        itemCount: count,
-        inventories: results,
-        selected: [],
-      });
-    } catch (err) {
-      this.setState({ contentError: err });
-    } finally {
-      this.setState({ hasContentLoading: false });
-    }
-  }
-
-  render() {
-    const {
-      contentError,
-      hasContentLoading,
-      deletionError,
-      inventories,
-      itemCount,
-      selected,
-      actions,
-    } = this.state;
-    const { match, i18n } = this.props;
-    const canAdd =
-      actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
-    const isAllSelected =
-      selected.length === inventories.length && selected.length !== 0;
-    const addButton = (
-      <AddDropDownButton
-        key="add"
-        dropdownItems={[
-          {
-            label: i18n._(t`Inventory`),
-            url: `${match.url}/inventory/add/`,
-          },
-          {
-            label: i18n._(t`Smart Inventory`),
-            url: `${match.url}/smart_inventory/add/`,
-          },
-        ]}
-      />
-    );
-    return (
-      <PageSection>
-        <Card>
-          <PaginatedDataList
-            contentError={contentError}
-            hasContentLoading={hasContentLoading}
-            items={inventories}
-            itemCount={itemCount}
-            pluralizedItemName={i18n._(t`Inventories`)}
-            qsConfig={QS_CONFIG}
-            onRowClick={this.handleSelect}
-            toolbarSearchColumns={[
-              {
-                name: i18n._(t`Name`),
-                key: 'name',
-                isDefault: true,
-              },
-              {
-                name: i18n._(t`Created By (Username)`),
-                key: 'created_by__username',
-              },
-              {
-                name: i18n._(t`Modified By (Username)`),
-                key: 'modified_by__username',
-              },
-            ]}
-            toolbarSortColumns={[
-              {
-                name: i18n._(t`Name`),
-                key: 'name',
-              },
-            ]}
-            renderToolbar={props => (
-              <DatalistToolbar
-                {...props}
-                showSelectAll
-                showExpandCollapse
-                isAllSelected={isAllSelected}
-                onSelectAll={this.handleSelectAll}
-                qsConfig={QS_CONFIG}
-                additionalControls={[
-                  ...(canAdd ? [addButton] : []),
-                  <ToolbarDeleteButton
-                    key="delete"
-                    onDelete={this.handleInventoryDelete}
-                    itemsToDelete={selected}
-                    pluralizedItemName="Inventories"
-                  />,
-                ]}
-              />
-            )}
-            renderItem={inventory => (
-              <InventoryListItem
-                key={inventory.id}
-                value={inventory.name}
-                inventory={inventory}
-                detailUrl={
-                  inventory.kind === 'smart'
-                    ? `${match.url}/smart_inventory/${inventory.id}/details`
-                    : `${match.url}/inventory/${inventory.id}/details`
-                }
-                onSelect={() => this.handleSelect(inventory)}
-                isSelected={selected.some(row => row.id === inventory.id)}
-              />
-            )}
-            emptyStateControls={canAdd && addButton}
-          />
-        </Card>
-        <AlertModal
-          isOpen={deletionError}
-          variant="error"
-          title={i18n._(t`Error!`)}
-          onClose={this.handleDeleteErrorClose}
-        >
-          {i18n._(t`Failed to delete one or more inventories.`)}
-          <ErrorDetail error={deletionError} />
-        </AlertModal>
-      </PageSection>
-    );
-  }
+      ]}
+    />
+  );
+  return (
+    <PageSection>
+      <Card>
+        <PaginatedDataList
+          contentError={contentError}
+          hasContentLoading={hasContentLoading}
+          items={inventories}
+          itemCount={itemCount}
+          pluralizedItemName={i18n._(t`Inventories`)}
+          qsConfig={QS_CONFIG}
+          onRowClick={handleSelect}
+          toolbarSearchColumns={[
+            {
+              name: i18n._(t`Name`),
+              key: 'name',
+              isDefault: true,
+            },
+            {
+              name: i18n._(t`Created By (Username)`),
+              key: 'created_by__username',
+            },
+            {
+              name: i18n._(t`Modified By (Username)`),
+              key: 'modified_by__username',
+            },
+          ]}
+          toolbarSortColumns={[
+            {
+              name: i18n._(t`Name`),
+              key: 'name',
+            },
+          ]}
+          renderToolbar={props => (
+            <DatalistToolbar
+              {...props}
+              showSelectAll
+              showExpandCollapse
+              isAllSelected={isAllSelected}
+              onSelectAll={handleSelectAll}
+              qsConfig={QS_CONFIG}
+              additionalControls={[
+                ...(canAdd ? [addButton] : []),
+                <ToolbarDeleteButton
+                  key="delete"
+                  onDelete={handleInventoryDelete}
+                  itemsToDelete={selected}
+                  pluralizedItemName="Inventories"
+                />,
+              ]}
+            />
+          )}
+          renderItem={inventory => (
+            <InventoryListItem
+              key={inventory.id}
+              value={inventory.name}
+              inventory={inventory}
+              detailUrl={
+                inventory.kind === 'smart'
+                  ? `${match.url}/smart_inventory/${inventory.id}/details`
+                  : `${match.url}/inventory/${inventory.id}/details`
+              }
+              onSelect={() => handleSelect(inventory)}
+              isSelected={selected.some(row => row.id === inventory.id)}
+            />
+          )}
+          emptyStateControls={canAdd && addButton}
+        />
+      </Card>
+      <AlertModal
+        isOpen={deletionError}
+        variant="error"
+        title={i18n._(t`Error!`)}
+        onClose={clearDeletionError}
+      >
+        {i18n._(t`Failed to delete one or more inventories.`)}
+        <ErrorDetail error={deletionError} />
+      </AlertModal>
+    </PageSection>
+  );
 }
 
-export { InventoriesList as _InventoriesList };
-export default withI18n()(withRouter(InventoriesList));
+export default withI18n()(InventoryList);
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
index 796ae9eff1..ebe630f82c 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
+import { act } from 'react-dom/test-utils';
 import { InventoriesAPI } from '@api';
-import { mountWithContexts, waitForElement } from '@testUtils/enzymeHelpers';
+import { mountWithContexts } from '@testUtils/enzymeHelpers';
 
-import InventoriesList, { _InventoriesList } from './InventoryList';
+import InventoryList from './InventoryList';
 
 jest.mock('@api');
 
@@ -117,7 +118,7 @@ const mockInventories = [
   },
 ];
 
-describe('<InventoriesList />', () => {
+describe('<InventoryList />', () => {
   beforeEach(() => {
     InventoriesAPI.read.mockResolvedValue({
       data: {
@@ -140,186 +141,174 @@ describe('<InventoriesList />', () => {
     jest.clearAllMocks();
   });
 
-  test('initially renders successfully', () => {
-    mountWithContexts(
-      <InventoriesList
-        match={{ path: '/inventories', url: '/inventories' }}
-        location={{ search: '', pathname: '/inventories' }}
-      />
-    );
-  });
-
-  test('Inventories are retrieved from the api and the components finishes loading', async done => {
-    const loadInventories = jest.spyOn(
-      _InventoriesList.prototype,
-      'loadInventories'
-    );
-    const wrapper = mountWithContexts(<InventoriesList />);
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === true
-    );
-    expect(loadInventories).toHaveBeenCalled();
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === false
-    );
-    expect(wrapper.find('InventoryListItem').length).toBe(3);
-    done();
-  });
-
-  test('handleSelect is called when a inventory list item is selected', async done => {
-    const handleSelect = jest.spyOn(_InventoriesList.prototype, 'handleSelect');
-    const wrapper = mountWithContexts(<InventoriesList />);
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === false
-    );
-    await wrapper
-      .find('input#select-inventory-1')
-      .closest('DataListCheck')
-      .props()
-      .onChange();
-    expect(handleSelect).toBeCalled();
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('selected').length === 1
-    );
-    done();
-  });
-
-  test('handleSelectAll is called when a inventory list item is selected', async done => {
-    const handleSelectAll = jest.spyOn(
-      _InventoriesList.prototype,
-      'handleSelectAll'
-    );
-    const wrapper = mountWithContexts(<InventoriesList />);
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === false
-    );
-    wrapper
-      .find('Checkbox#select-all')
-      .props()
-      .onChange(true);
-    expect(handleSelectAll).toBeCalled();
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('selected').length === 3
-    );
-    done();
-  });
-
-  test('delete button is disabled if user does not have delete capabilities on a selected inventory', async done => {
-    const wrapper = mountWithContexts(<InventoriesList />);
-    wrapper.find('InventoriesList').setState({
-      inventories: mockInventories,
-      itemCount: 3,
-      isInitialized: true,
-      selected: mockInventories.slice(0, 2),
+  test('should load and render teams', async () => {
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
     });
-    await waitForElement(
-      wrapper,
-      'ToolbarDeleteButton * button',
-      el => el.getDOMNode().disabled === false
-    );
-    wrapper.find('InventoriesList').setState({
-      selected: mockInventories,
-    });
-    await waitForElement(
-      wrapper,
-      'ToolbarDeleteButton * button',
-      el => el.getDOMNode().disabled === true
-    );
-    done();
+    wrapper.update();
+
+    expect(wrapper.find('InventoryListItem')).toHaveLength(3);
   });
 
-  test('api is called to delete inventories for each selected inventory.', () => {
-    InventoriesAPI.destroy = jest.fn();
-    const wrapper = mountWithContexts(<InventoriesList />);
-    wrapper.find('InventoriesList').setState({
-      inventories: mockInventories,
-      itemCount: 3,
-      isInitialized: true,
-      isModalOpen: true,
-      selected: mockInventories.slice(0, 2),
+  test('should select team when checked', async () => {
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
     });
-    wrapper.find('ToolbarDeleteButton').prop('onDelete')();
+    wrapper.update();
+
+    await act(async () => {
+      wrapper
+        .find('InventoryListItem')
+        .first()
+        .invoke('onSelect')();
+    });
+    wrapper.update();
+
+    expect(
+      wrapper
+        .find('InventoryListItem')
+        .first()
+        .prop('isSelected')
+    ).toEqual(true);
+  });
+
+  test('should select all', async () => {
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
+    });
+    wrapper.update();
+
+    await act(async () => {
+      wrapper.find('DataListToolbar').invoke('onSelectAll')(true);
+    });
+    wrapper.update();
+
+    const items = wrapper.find('InventoryListItem');
+    expect(items).toHaveLength(3);
+    items.forEach(item => {
+      expect(item.prop('isSelected')).toEqual(true);
+    });
+
+    expect(
+      wrapper
+        .find('InventoryListItem')
+        .first()
+        .prop('isSelected')
+    ).toEqual(true);
+  });
+
+  test('should disable delete button', async () => {
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
+    });
+    wrapper.update();
+
+    await act(async () => {
+      wrapper
+        .find('InventoryListItem')
+        .at(2)
+        .invoke('onSelect')();
+    });
+    wrapper.update();
+
+    expect(wrapper.find('ToolbarDeleteButton button').prop('disabled')).toEqual(
+      true
+    );
+  });
+
+  test('should call delete api', async () => {
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
+    });
+    wrapper.update();
+
+    await act(async () => {
+      wrapper
+        .find('InventoryListItem')
+        .at(0)
+        .invoke('onSelect')();
+    });
+    wrapper.update();
+    await act(async () => {
+      wrapper
+        .find('InventoryListItem')
+        .at(1)
+        .invoke('onSelect')();
+    });
+    wrapper.update();
+    await act(async () => {
+      wrapper.find('ToolbarDeleteButton').invoke('onDelete')();
+    });
+
     expect(InventoriesAPI.destroy).toHaveBeenCalledTimes(2);
   });
 
-  test('error is shown when inventory not successfully deleted from api', async done => {
+  test('should show deletion error', async () => {
     InventoriesAPI.destroy.mockRejectedValue(
       new Error({
         response: {
           config: {
             method: 'delete',
-            url: '/api/v2/inventories/1',
+            url: '/api/v2/teams/1',
           },
           data: 'An error occurred',
         },
       })
     );
-    const wrapper = mountWithContexts(<InventoriesList />);
-    wrapper.find('InventoriesList').setState({
-      inventories: mockInventories,
-      itemCount: 1,
-      isInitialized: true,
-      isModalOpen: true,
-      selected: mockInventories.slice(0, 1),
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
     });
-    wrapper.find('ToolbarDeleteButton').prop('onDelete')();
-    await waitForElement(
-      wrapper,
-      'Modal',
-      el => el.props().isOpen === true && el.props().title === 'Error!'
-    );
+    wrapper.update();
+    expect(InventoriesAPI.read).toHaveBeenCalledTimes(1);
+    await act(async () => {
+      wrapper
+        .find('InventoryListItem')
+        .at(0)
+        .invoke('onSelect')();
+    });
+    wrapper.update();
 
-    done();
+    await act(async () => {
+      wrapper.find('ToolbarDeleteButton').invoke('onDelete')();
+    });
+    wrapper.update();
+
+    const modal = wrapper.find('Modal');
+    expect(modal).toHaveLength(1);
+    expect(modal.prop('title')).toEqual('Error!');
   });
 
-  test('Add button shown for users with ability to POST', async done => {
-    const wrapper = mountWithContexts(<InventoriesList />);
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === true
-    );
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === false
-    );
+  test('Add button shown for users without ability to POST', async () => {
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
+    });
+    wrapper.update();
+
     expect(wrapper.find('ToolbarAddButton').length).toBe(1);
-    done();
   });
 
-  test('Add button hidden for users without ability to POST', async done => {
-    InventoriesAPI.readOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {},
+  test('Add button hidden for users without ability to POST', async () => {
+    InventoriesAPI.readOptions = () =>
+      Promise.resolve({
+        data: {
+          actions: {
+            GET: {},
+          },
         },
-      },
+      });
+    let wrapper;
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryList />);
     });
-    const wrapper = mountWithContexts(<InventoriesList />);
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === true
-    );
-    await waitForElement(
-      wrapper,
-      'InventoriesList',
-      el => el.state('hasContentLoading') === false
-    );
+    wrapper.update();
+
     expect(wrapper.find('ToolbarAddButton').length).toBe(0);
-    done();
   });
 });