From 9e00337bc141698b3ea1cec9ea9c27720f5207a5 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Fri, 20 Mar 2020 10:10:29 -0400
Subject: [PATCH] Rename useSelected hook and update error modal condition

---
 .../Inventory/InventoryGroupHosts/AssociateModal.jsx   |  8 ++++----
 .../InventoryGroupHosts/InventoryGroupHostList.jsx     |  6 +++---
 .../src/util/{useSelect.jsx => useSelected.jsx}        |  4 ++--
 .../util/{useSelect.test.jsx => useSelected.test.jsx}  | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename awx/ui_next/src/util/{useSelect.jsx => useSelected.jsx} (86%)
 rename awx/ui_next/src/util/{useSelect.test.jsx => useSelected.test.jsx} (93%)

diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/AssociateModal.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/AssociateModal.jsx
index 7af059e799..4efc5a5d00 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/AssociateModal.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/AssociateModal.jsx
@@ -6,7 +6,7 @@ import { Button, Modal } from '@patternfly/react-core';
 import OptionsList from '@components/Lookup/shared/OptionsList';
 import useRequest from '@util/useRequest';
 import { getQSConfig, parseQueryString } from '@util/qs';
-import useSelect from '@util/useSelect';
+import useSelected from '@util/useSelected';
 
 const QS_CONFIG = getQSConfig('associate', {
   page: 1,
@@ -24,7 +24,7 @@ function AssociateModal({
   isModalOpen = false,
 }) {
   const history = useHistory();
-  const { selected, handleSelect } = useSelect([]);
+  const { selected, handleSelect } = useSelected([]);
 
   const {
     request: fetchItems,
@@ -101,7 +101,7 @@ function AssociateModal({
       >
         <OptionsList
           contentError={contentError}
-          deselectItem={item => handleSelect(item)}
+          deselectItem={handleSelect}
           header={header}
           isLoading={isLoading}
           multiple
@@ -109,7 +109,7 @@ function AssociateModal({
           options={items}
           qsConfig={QS_CONFIG}
           readOnly={false}
-          selectItem={item => handleSelect(item)}
+          selectItem={handleSelect}
           value={selected}
           searchColumns={[
             {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
index 499468d654..6410769ff8 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
@@ -9,7 +9,7 @@ import useRequest, {
   useDeleteItems,
   useDismissableError,
 } from '@util/useRequest';
-import useSelect from '@util/useSelect';
+import useSelected from '@util/useSelected';
 import AlertModal from '@components/AlertModal';
 import DataListToolbar from '@components/DataListToolbar';
 import ErrorDetail from '@components/ErrorDetail';
@@ -56,7 +56,7 @@ function InventoryGroupHostList({ i18n }) {
     }
   );
 
-  const { selected, isAllSelected, handleSelect, setSelected } = useSelect(
+  const { selected, isAllSelected, handleSelect, setSelected } = useSelected(
     hosts
   );
 
@@ -211,7 +211,7 @@ function InventoryGroupHostList({ i18n }) {
           title={i18n._(t`Select Hosts`)}
         />
       )}
-      {(associateError || disassociateError) && (
+      {error && (
         <AlertModal
           isOpen={error}
           onClose={dismissError}
diff --git a/awx/ui_next/src/util/useSelect.jsx b/awx/ui_next/src/util/useSelected.jsx
similarity index 86%
rename from awx/ui_next/src/util/useSelect.jsx
rename to awx/ui_next/src/util/useSelected.jsx
index 3084c4aace..05ea65a57a 100644
--- a/awx/ui_next/src/util/useSelect.jsx
+++ b/awx/ui_next/src/util/useSelected.jsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
 /**
- * useSelect hook provides a way to read and update a selected list
+ * useSelected hook provides a way to read and update a selected list
  * Param: array of list items
  * Returns: {
  *  selected: array of selected list items
@@ -11,7 +11,7 @@ import { useState } from 'react';
  * }
  */
 
-export default function useSelect(list = []) {
+export default function useSelected(list = []) {
   const [selected, setSelected] = useState([]);
   const isAllSelected = selected.length > 0 && selected.length === list.length;
 
diff --git a/awx/ui_next/src/util/useSelect.test.jsx b/awx/ui_next/src/util/useSelected.test.jsx
similarity index 93%
rename from awx/ui_next/src/util/useSelect.test.jsx
rename to awx/ui_next/src/util/useSelected.test.jsx
index 91113fe913..14777b6a85 100644
--- a/awx/ui_next/src/util/useSelect.test.jsx
+++ b/awx/ui_next/src/util/useSelected.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
-import useSelect from './useSelect';
+import useSelected from './useSelected';
 
 const array = [{ id: '1' }, { id: '2' }, { id: '3' }];
 
@@ -14,7 +14,7 @@ const testHook = callback => {
   mount(<TestHook callback={callback} />);
 };
 
-describe('useSelect hook', () => {
+describe('useSelected hook', () => {
   let selected;
   let isAllSelected;
   let handleSelect;
@@ -22,7 +22,7 @@ describe('useSelect hook', () => {
 
   test('should return expected initial values', () => {
     testHook(() => {
-      ({ selected, isAllSelected, handleSelect, setSelected } = useSelect());
+      ({ selected, isAllSelected, handleSelect, setSelected } = useSelected());
     });
     expect(selected).toEqual([]);
     expect(isAllSelected).toEqual(false);
@@ -32,7 +32,7 @@ describe('useSelect hook', () => {
 
   test('handleSelect should update and filter selected items', () => {
     testHook(() => {
-      ({ selected, isAllSelected, handleSelect, setSelected } = useSelect());
+      ({ selected, isAllSelected, handleSelect, setSelected } = useSelected());
     });
 
     act(() => {
@@ -48,7 +48,7 @@ describe('useSelect hook', () => {
 
   test('should return expected isAllSelected value', () => {
     testHook(() => {
-      ({ selected, isAllSelected, handleSelect, setSelected } = useSelect(
+      ({ selected, isAllSelected, handleSelect, setSelected } = useSelected(
         array
       ));
     });