Relocate hooks to hooks directory

mkdir awx/ui_next/src/hooks
mv awx/ui_next/src/util/use* awx/ui_next/src/hooks/
find ./awx/ui_next/src -type f -exec sed -i -e 's/util\/use/hooks\/use/g' {} \;
find ./awx/ui_next/src/hooks -type f -exec sed -i -e 's/from \x27\.\//from \x27util\//g' {} \;
find ./awx/ui_next/src/hooks -type f -exec sed -i -e 's/from \x27util\/use/from \x27\.\/use/g' {} \;
npm --prefix=awx/ui_next run lint -- --fix
npm --prefix=awx/ui_next run prettier

awx/ui_next/CONTRIBUTING.md

@@ -156,6 +156,7 @@ Inside these folders, the internal structure is:
 - **/api** - All classes used to interact with API's are found here. See [AWX REST API Interaction](#awx-rest-api-interaction) for more information.
 - **/components** - All generic components that are meant to be used in multiple contexts throughout awx. Things like buttons, tabs go here.
 - **/contexts** - Components which utilize react's context api.
+- **/hooks** - Custom react [hooks](https://reactjs.org/docs/hooks-custom.html)
 - **/locales** - [Internationalization](#internationalization) config and source files.
 - **/screens** - Based on the various routes of awx.
   - **/shared** - Components that are meant to be used specifically by a particular route, but might be sharable across pages of that route. For example, a form component which is used on both add and edit screens.

awx/ui_next/src/components/About/About.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { t } from '@lingui/macro';
 import { AboutModal } from '@patternfly/react-core';
-import useBrandName from 'util/useBrandName';
+import useBrandName from 'hooks/useBrandName';
 
 function About({ version, isOpen, onClose }) {
   const brandName = useBrandName();

awx/ui_next/src/components/About/About.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import About from './About';
 
-jest.mock('../../util/useBrandName', () => ({
+jest.mock('../../hooks/useBrandName', () => ({
   __esModule: true,
   default: () => ({
     current: 'AWX',

awx/ui_next/src/components/AdHocCommands/AdHocCommands.js

@@ -5,7 +5,7 @@ import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, DropdownItem } from '@patternfly/react-core';
 
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { InventoriesAPI, CredentialTypesAPI } from 'api';
 
 import { KebabifiedContext } from 'contexts/Kebabified';

awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.js

@@ -7,7 +7,7 @@ import { useField } from 'formik';
 import { Form, FormGroup } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import Popover from '../Popover';
 

awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.js

@@ -7,7 +7,7 @@ import { useField } from 'formik';
 import { Form, FormGroup, Switch, Checkbox } from '@patternfly/react-core';
 import styled from 'styled-components';
 import { required } from 'util/validators';
-import useBrandName from 'util/useBrandName';
+import useBrandName from 'hooks/useBrandName';
 import AnsibleSelect from '../AnsibleSelect';
 import FormField from '../FormField';
 import { VariablesField } from '../CodeEditor';

awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.js

@@ -6,7 +6,7 @@ import { Form, FormGroup } from '@patternfly/react-core';
 import { ExecutionEnvironmentsAPI } from 'api';
 
 import { parseQueryString, getQSConfig, mergeParams } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import ContentError from '../ContentError';
 import ContentLoading from '../ContentLoading';

awx/ui_next/src/components/AddRole/SelectResourceStep.js

@@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SearchColumns, SortColumns } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import DataListToolbar from '../DataListToolbar';

awx/ui_next/src/components/AppContainer/PageHeaderToolbar.js

@@ -21,7 +21,7 @@ import {
   UserIcon,
 } from '@patternfly/react-icons';
 import { WorkflowApprovalsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import getDocsBaseUrl from 'util/getDocsBaseUrl';
 import { useConfig } from 'contexts/Config';
 import useWsPendingApprovalCount from './useWsPendingApprovalCount';

awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
-import useWebsocket from 'util/useWebsocket';
-import useThrottle from 'util/useThrottle';
+import useWebsocket from 'hooks/useWebsocket';
+import useThrottle from 'hooks/useThrottle';
 
 export default function useWsPendingApprovalCount(
   initialCount,

awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.test.js

@@ -23,7 +23,7 @@ describe('useWsPendingApprovalCount hook', () => {
       Jest mock timers don’t play well with jest-websocket-mock,
       so we'll stub out throttling to resolve immediately
     */
-    jest.mock('../../util/useThrottle', () => ({
+    jest.mock('../../hooks/useThrottle', () => ({
       __esModule: true,
       default: jest.fn(val => val),
     }));

awx/ui_next/src/components/AssociateModal/AssociateModal.js

@@ -3,9 +3,9 @@ import { useHistory } from 'react-router-dom';
 
 import { t } from '@lingui/macro';
 import { Button, Modal } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import OptionsList from '../OptionsList';
 
 const QS_CONFIG = (order_by = 'name') => {

awx/ui_next/src/components/CopyButton/CopyButton.js

@@ -3,7 +3,7 @@ import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import { CopyIcon } from '@patternfly/react-icons';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
 

awx/ui_next/src/components/HostToggle/HostToggle.js

@@ -3,7 +3,7 @@ import React, { Fragment, useState, useEffect, useCallback } from 'react';
 
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { HostsAPI } from 'api';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';

awx/ui_next/src/components/InstanceToggle/InstanceToggle.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InstancesAPI } from 'api';
 import { useConfig } from 'contexts/Config';
 import ErrorDetail from '../ErrorDetail';

awx/ui_next/src/components/JobCancelButton/JobCancelButton.js

@@ -3,7 +3,7 @@ import { t } from '@lingui/macro';
 import { MinusCircleIcon } from '@patternfly/react-icons';
 import { Button, Tooltip } from '@patternfly/react-core';
 import { getJobModel } from 'util/jobs';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
 

awx/ui_next/src/components/JobList/JobList.js

@@ -6,10 +6,10 @@ import { Card } from '@patternfly/react-core';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
+} from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
-import useSelected from 'util/useSelected';
-import useExpanded from 'util/useExpanded';
+import useSelected from 'hooks/useSelected';
+import useExpanded from 'hooks/useExpanded';
 import { isJobRunning, getJobModel } from 'util/jobs';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { UnifiedJobsAPI } from 'api';

awx/ui_next/src/components/JobList/useWsJobs.js

@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import useWebsocket from 'util/useWebsocket';
-import useThrottle from 'util/useThrottle';
+import useWebsocket from 'hooks/useWebsocket';
+import useThrottle from 'hooks/useThrottle';
 import { parseQueryString } from 'util/qs';
 import sortJobs from './sortJobs';
 

awx/ui_next/src/components/JobList/useWsJobs.test.js

@@ -21,7 +21,7 @@ describe('useWsJobs hook', () => {
       Jest mock timers don’t play well with jest-websocket-mock,
       so we'll stub out throttling to resolve immediately
     */
-    jest.mock('../../util/useThrottle', () => ({
+    jest.mock('../../hooks/useThrottle', () => ({
       __esModule: true,
       default: jest.fn(val => val),
     }));

awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ExpandableSection, Wizard } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import { Formik, useFormikContext } from 'formik';
-import { useDismissableError } from 'util/useRequest';
+import { useDismissableError } from 'hooks/useRequest';
 import mergeExtraVars from 'util/prompt/mergeExtraVars';
 import getSurveyValues from 'util/prompt/getSurveyValues';
 import ContentLoading from '../ContentLoading';

awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.js

@@ -8,7 +8,7 @@ import styled from 'styled-components';
 import { Alert, ToolbarItem } from '@patternfly/react-core';
 import { CredentialsAPI, CredentialTypesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import AnsibleSelect from '../../AnsibleSelect';
 import OptionsList from '../../OptionsList';
 import ContentLoading from '../../ContentLoading';

awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.js

@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Alert } from '@patternfly/react-core';
 import { InventoriesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import OptionsList from '../../OptionsList';
 import ContentLoading from '../../ContentLoading';
 import ContentError from '../../ContentError';

awx/ui_next/src/components/Lookup/ApplicationLookup.js

@@ -6,7 +6,7 @@ import { FormGroup } from '@patternfly/react-core';
 import { ApplicationsAPI } from 'api';
 import { Application } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Lookup from './Lookup';
 import OptionsList from '../OptionsList';
 import LookupErrorMessage from './shared/LookupErrorMessage';

awx/ui_next/src/components/Lookup/CredentialLookup.js

@@ -15,8 +15,8 @@ import { FormGroup } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
 import { Credential } from 'types';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useAutoPopulateLookup from 'util/useAutoPopulateLookup';
-import useRequest from 'util/useRequest';
+import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import Lookup from './Lookup';
 import OptionsList from '../OptionsList';

awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.js

@@ -6,7 +6,7 @@ import { FormGroup, Tooltip } from '@patternfly/react-core';
 import { ExecutionEnvironmentsAPI, ProjectsAPI } from 'api';
 import { ExecutionEnvironment } from 'types';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import OptionsList from '../OptionsList';
 

awx/ui_next/src/components/Lookup/HostFilterLookup.js

@@ -16,7 +16,7 @@ import {
 } from '@patternfly/react-core';
 import { HostsAPI } from 'api';
 import { getQSConfig, mergeParams, parseQueryString } from 'util/qs';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import ChipGroup from '../ChipGroup';
 import Popover from '../Popover';
 import DataListToolbar from '../DataListToolbar';

awx/ui_next/src/components/Lookup/InstanceGroupsLookup.js

@@ -7,7 +7,7 @@ import { FormGroup } from '@patternfly/react-core';
 import { InstanceGroupsAPI } from 'api';
 import { InstanceGroup } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import Popover from '../Popover';
 import OptionsList from '../OptionsList';
 import Lookup from './Lookup';

awx/ui_next/src/components/Lookup/InventoryLookup.js

@@ -4,7 +4,7 @@ import { withRouter } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { InventoriesAPI } from 'api';
 import { Inventory } from 'types';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
 import Lookup from './Lookup';
 import OptionsList from '../OptionsList';

awx/ui_next/src/components/Lookup/Lookup.js

@@ -22,7 +22,7 @@ import {
 } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
-import useDebounce from 'util/useDebounce';
+import useDebounce from 'hooks/useDebounce';
 import { QSConfig } from 'types';
 import ChipGroup from '../ChipGroup';
 import reducer, { initReducer } from './shared/reducer';

awx/ui_next/src/components/Lookup/MultiCredentialsLookup.js

@@ -5,9 +5,9 @@ import PropTypes from 'prop-types';
 import { t } from '@lingui/macro';
 import { ToolbarItem, Alert } from '@patternfly/react-core';
 import { CredentialsAPI, CredentialTypesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 import AnsibleSelect from '../AnsibleSelect';
 import CredentialChip from '../CredentialChip';
 import OptionsList from '../OptionsList';

awx/ui_next/src/components/Lookup/OrganizationLookup.js

@@ -6,8 +6,8 @@ import { FormGroup } from '@patternfly/react-core';
 import { OrganizationsAPI } from 'api';
 import { Organization } from 'types';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
-import useAutoPopulateLookup from 'util/useAutoPopulateLookup';
+import useRequest from 'hooks/useRequest';
+import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
 import OptionsList from '../OptionsList';
 import Lookup from './Lookup';
 import LookupErrorMessage from './shared/LookupErrorMessage';

awx/ui_next/src/components/Lookup/ProjectLookup.js

@@ -5,8 +5,8 @@ import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { ProjectsAPI } from 'api';
 import { Project } from 'types';
-import useAutoPopulateLookup from 'util/useAutoPopulateLookup';
-import useRequest from 'util/useRequest';
+import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import OptionsList from '../OptionsList';
 import Popover from '../Popover';

awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import useIsMounted from 'util/useIsMounted';
+import useIsMounted from 'hooks/useIsMounted';
 
 /*
   Hook for using PatternFly's <Select> component when a pre-existing value

awx/ui_next/src/components/NotificationList/NotificationList.js

@@ -4,7 +4,7 @@ import { number, shape, bool } from 'prop-types';
 
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { NotificationTemplatesAPI } from 'api';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';

awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.js

@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { RolesAPI, TeamsAPI, UsersAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import AddResourceRole from '../AddRole/AddResourceRole';
 import AlertModal from '../AlertModal';
 import DataListToolbar from '../DataListToolbar';

awx/ui_next/src/components/Schedule/Schedule.js

@@ -11,7 +11,7 @@ import {
 } from 'react-router-dom';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { SchedulesAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import RoutedTabs from '../RoutedTabs';
 import ContentError from '../ContentError';
 import ContentLoading from '../ContentLoading';

awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.js

@@ -8,7 +8,7 @@ import { t } from '@lingui/macro';
 import { Chip, Divider, Title, Button } from '@patternfly/react-core';
 import { Schedule } from 'types';
 import { formatDateString } from 'util/dates';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { JobTemplatesAPI, SchedulesAPI, WorkflowJobTemplatesAPI } from 'api';
 import { parseVariableField, jsonToYaml } from 'util/yaml';
 import AlertModal from '../../AlertModal';

awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.js

@@ -4,8 +4,8 @@ import { bool, func } from 'prop-types';
 
 import { t } from '@lingui/macro';
 import { SchedulesAPI } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import AlertModal from '../../AlertModal';
 import ErrorDetail from '../../ErrorDetail';

awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.js

@@ -3,7 +3,7 @@ import React, { Fragment, useState, useEffect, useCallback } from 'react';
 
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SchedulesAPI } from 'api';
 import AlertModal from '../../AlertModal';
 import ErrorDetail from '../../ErrorDetail';

awx/ui_next/src/components/Schedule/shared/ScheduleForm.js

@@ -14,7 +14,7 @@ import {
 import { Config } from 'contexts/Config';
 import { SchedulesAPI } from 'api';
 import { dateToInputDateTime } from 'util/dates';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 import { parseVariableField } from 'util/yaml';
 import AnsibleSelect from '../../AnsibleSelect';

awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ExpandableSection, Wizard } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import { useFormikContext } from 'formik';
-import { useDismissableError } from 'util/useRequest';
+import { useDismissableError } from 'hooks/useRequest';
 import AlertModal from '../../AlertModal';
 import ContentError from '../../ContentError';
 import ContentLoading from '../../ContentLoading';

awx/ui_next/src/components/TemplateList/TemplateList.js

@@ -7,11 +7,11 @@ import {
   UnifiedJobTemplatesAPI,
   WorkflowJobTemplatesAPI,
 } from 'api';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
-import useExpanded from 'util/useExpanded';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
+import useExpanded from 'hooks/useExpanded';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useWsTemplates from 'util/useWsTemplates';
+import useWsTemplates from 'hooks/useWsTemplates';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import AlertModal from '../AlertModal';
 import DatalistToolbar from '../DataListToolbar';

awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.js

@@ -2,8 +2,8 @@ import React, { useState, useCallback } from 'react';
 import { t } from '@lingui/macro';
 import { useParams } from 'react-router-dom';
 import styled from 'styled-components';
-import useRequest from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import SelectableCard from '../SelectableCard';
 import Wizard from '../Wizard/Wizard';
 import SelectResourceStep from '../AddRole/SelectResourceStep';

awx/ui_next/src/contexts/Config.js

@@ -4,7 +4,7 @@ import { useRouteMatch } from 'react-router-dom';
 import { t } from '@lingui/macro';
 
 import { ConfigAPI, MeAPI, UsersAPI, OrganizationsAPI } from 'api';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
 import { useSession } from './Session';

awx/ui_next/src/hooks/useRequest.js

@@ -1,6 +1,6 @@
 import { useEffect, useState, useCallback } from 'react';
 import { useLocation, useHistory } from 'react-router-dom';
-import { parseQueryString, updateQueryString } from './qs';
+import { parseQueryString, updateQueryString } from 'util/qs';
 import useIsMounted from './useIsMounted';
 
 /*

awx/ui_next/src/screens/ActivityStream/ActivityStream.js

@@ -18,7 +18,7 @@ import PaginatedTable, {
   HeaderRow,
   HeaderCell,
 } from 'components/PaginatedTable';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { getQSConfig, parseQueryString, updateQueryString } from 'util/qs';
 import { ActivityStreamAPI } from 'api';
 

awx/ui_next/src/screens/Application/Application/Application.js

@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { ApplicationsAPI } from 'api';
 import ContentError from 'components/ContentError';
 import RoutedTabs from 'components/RoutedTabs';

awx/ui_next/src/screens/Application/ApplicationAdd/ApplicationAdd.js

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
 import { Card, PageSection } from '@patternfly/react-core';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import { ApplicationsAPI } from 'api';
 import { CardBody } from 'components/Card';

awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.js

@@ -4,7 +4,7 @@ import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
 
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';

awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.js

@@ -11,8 +11,8 @@ import { getQSConfig, parseQueryString } from 'util/qs';
 import { TokensAPI, ApplicationsAPI } from 'api';
 import ErrorDetail from 'components/ErrorDetail';
 import AlertModal from 'components/AlertModal';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import DatalistToolbar from 'components/DataListToolbar';
 import ApplicationTokenListItem from './ApplicationTokenListItem';
 

awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.js

@@ -5,7 +5,7 @@ import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { Card, PageSection } from '@patternfly/react-core';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import ErrorDetail from 'components/ErrorDetail';
 import AlertModal from 'components/AlertModal';
 
@@ -17,7 +17,7 @@ import PaginatedTable, {
   ToolbarDeleteButton,
   ToolbarAddButton,
 } from 'components/PaginatedTable';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 
 import ApplicationListItem from './ApplicationListItem';
 

awx/ui_next/src/screens/Credential/Credential.js

@@ -12,7 +12,7 @@ import {
   Redirect,
   Link,
 } from 'react-router-dom';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { ResourceAccessList } from 'components/ResourceAccessList';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';

awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.js

@@ -9,7 +9,7 @@ import {
   CredentialTypesAPI,
   CredentialsAPI,
 } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import CredentialForm from '../shared/CredentialForm';
 
 function CredentialAdd({ me }) {

awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.js

@@ -21,7 +21,7 @@ import CredentialChip from 'components/CredentialChip';
 import ErrorDetail from 'components/ErrorDetail';
 import { CredentialsAPI, CredentialTypesAPI } from 'api';
 import { Credential } from 'types';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 
 const PluginInputMetadata = styled.div`

awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.js

@@ -10,7 +10,7 @@ import {
 } from 'api';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { useConfig } from 'contexts/Config';
 import { Credential } from 'types';
 import CredentialForm from '../shared/CredentialForm';

awx/ui_next/src/screens/Credential/CredentialList/CredentialList.js

@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 import { t, Plural } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
-import useSelected from 'util/useSelected';
+import useSelected from 'hooks/useSelected';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';
 import DataListToolbar from 'components/DataListToolbar';
@@ -13,7 +13,7 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useRequest, { useDeleteItems } from 'util/useRequest';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
 import { getQSConfig, parseQueryString } from 'util/qs';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 import CredentialListItem from './CredentialListItem';

awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.js

@@ -10,7 +10,7 @@ import {
   WizardFooter,
 } from '@patternfly/react-core';
 import { CredentialsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import CredentialsStep from './CredentialsStep';
 import MetadataStep from './MetadataStep';
 import { CredentialPluginTestAlert } from '..';

awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.js

@@ -8,7 +8,7 @@ import CheckboxListItem from 'components/CheckboxListItem';
 import ContentError from 'components/ContentError';
 import DataListToolbar from 'components/DataListToolbar';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import PaginatedTable, {
   HeaderCell,
   HeaderRow,

awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.js

@@ -9,7 +9,7 @@ import ContentLoading from 'components/ContentLoading';
 import FormField from 'components/FormField';
 import { FormFullWidthLayout } from 'components/FormLayout';
 import Popover from 'components/Popover';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { required } from 'util/validators';
 
 function MetadataStep() {

awx/ui_next/src/screens/Credential/shared/ExternalTestModal.js

@@ -10,7 +10,7 @@ import FormField from 'components/FormField';
 import { FormFullWidthLayout } from 'components/FormLayout';
 import Popover from 'components/Popover';
 import { required } from 'util/validators';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { CredentialPluginTestAlert } from './CredentialPlugins';
 
 function ExternalTestModal({

awx/ui_next/src/screens/CredentialType/CredentialType.js

@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { CredentialTypesAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';

awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.js

@@ -9,7 +9,7 @@ import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
 import DeleteButton from 'components/DeleteButton';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { CredentialTypesAPI } from 'api';
 import { jsonToYaml } from 'util/yaml';
 import {

awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.js

@@ -6,8 +6,8 @@ import { Card, PageSection } from '@patternfly/react-core';
 
 import { CredentialTypesAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,

awx/ui_next/src/screens/Dashboard/Dashboard.js

@@ -10,7 +10,7 @@ import {
   TabTitleText,
 } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DashboardAPI } from 'api';
 import ScreenHeader from 'components/ScreenHeader';
 import JobList from 'components/JobList';

awx/ui_next/src/screens/Dashboard/DashboardGraph.js

@@ -13,7 +13,7 @@ import {
   SelectOption,
 } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { DashboardAPI } from 'api';
 import ContentLoading from 'components/ContentLoading';
 import LineChart from './shared/LineChart';

awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.js

@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { ExecutionEnvironmentsAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';

awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js

@@ -8,7 +8,7 @@ import AlertModal from 'components/AlertModal';
 import { CardBody, CardActionsRow } from 'components/Card';
 import DeleteButton from 'components/DeleteButton';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { toTitleCase } from 'util/strings';
 import { ExecutionEnvironmentsAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';

awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentList.js

@@ -5,8 +5,8 @@ import { Card, PageSection } from '@patternfly/react-core';
 
 import { ExecutionEnvironmentsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,

awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.js

@@ -6,7 +6,7 @@ import { Card } from '@patternfly/react-core';
 
 import { ExecutionEnvironmentsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import DatalistToolbar from 'components/DataListToolbar';
 import PaginatedTable, {
   HeaderCell,

awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.js

@@ -13,7 +13,7 @@ import { OrganizationLookup } from 'components/Lookup';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import { required } from 'util/validators';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 
 function ExecutionEnvironmentFormFields({
   me,

awx/ui_next/src/screens/Host/Host.js

@@ -16,7 +16,7 @@ import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import JobList from 'components/JobList';
 import { HostsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import HostFacts from './HostFacts';
 import HostDetail from './HostDetail';
 import HostEdit from './HostEdit';

awx/ui_next/src/screens/Host/HostFacts/HostFacts.js

@@ -7,7 +7,7 @@ import { DetailList } from 'components/DetailList';
 import { VariablesDetail } from 'components/CodeEditor';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { HostsAPI } from 'api';
 
 function HostFacts({ host }) {

awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.js

@@ -6,8 +6,8 @@ import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
 import useRequest, {
   useDismissableError,
   useDeleteItems,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { HostsAPI, InventoriesAPI } from 'api';
 import AlertModal from 'components/AlertModal';
 import ErrorDetail from 'components/ErrorDetail';

awx/ui_next/src/screens/Host/HostList/HostList.js

@@ -12,8 +12,8 @@ import PaginatedTable, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from 'components/PaginatedTable';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { encodeQueryString, getQSConfig, parseQueryString } from 'util/qs';
 
 import HostListItem from './HostListItem';

awx/ui_next/src/screens/InstanceGroup/ContainerGroup.js

@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InstanceGroupsAPI, SettingsAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';

awx/ui_next/src/screens/InstanceGroup/ContainerGroupAdd/ContainerGroupAdd.js

@@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
 
 import { CardBody } from 'components/Card';
 import { InstanceGroupsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import { jsonToYaml, isJsonString } from 'util/yaml';

awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.js

@@ -10,7 +10,7 @@ import ErrorDetail from 'components/ErrorDetail';
 import { CardBody, CardActionsRow } from 'components/Card';
 import DeleteButton from 'components/DeleteButton';
 import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { jsonToYaml, isJsonString } from 'util/yaml';
 import { InstanceGroupsAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';

awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js

@@ -4,7 +4,7 @@ import { Card, PageSection } from '@patternfly/react-core';
 
 import { CardBody } from 'components/Card';
 import { InstanceGroupsAPI } from 'api';
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import ContentError from 'components/ContentError';
 import ContentLoading from 'components/ContentLoading';
 import ContainerGroupForm from '../shared/ContainerGroupForm';

awx/ui_next/src/screens/InstanceGroup/InstanceGroup.js

@@ -12,7 +12,7 @@ import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { InstanceGroupsAPI, SettingsAPI } from 'api';
 import RoutedTabs from 'components/RoutedTabs';
 import ContentError from 'components/ContentError';

awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.js

@@ -15,7 +15,7 @@ import {
   UserDateDetail,
   DetailBadge,
 } from 'components/DetailList';
-import useRequest, { useDismissableError } from 'util/useRequest';
+import useRequest, { useDismissableError } from 'hooks/useRequest';
 import { InstanceGroupsAPI } from 'api';
 import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
 

awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.js

@@ -6,8 +6,8 @@ import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
 
 import { InstanceGroupsAPI, SettingsAPI } from 'api';
 import { getQSConfig, parseQueryString } from 'util/qs';
-import useRequest, { useDeleteItems } from 'util/useRequest';
-import useSelected from 'util/useSelected';
+import useRequest, { useDeleteItems } from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,

awx/ui_next/src/screens/InstanceGroup/InstanceGroups.js

@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
-import useRequest from 'util/useRequest';
+import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
 
 import ScreenHeader from 'components/ScreenHeader';

awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.js

@@ -18,8 +18,8 @@ import ErrorDetail from 'components/ErrorDetail';
 import useRequest, {
   useDeleteItems,
   useDismissableError,
-} from 'util/useRequest';
-import useSelected from 'util/useSelected';
+} from 'hooks/useRequest';
+import useSelected from 'hooks/useSelected';
 import { InstanceGroupsAPI, InstancesAPI } from 'api';
 import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';