diff --git a/awx/ui_next/src/App.jsx b/awx/ui_next/src/App.jsx index 59a8e28cd9..77116d3f8b 100644 --- a/awx/ui_next/src/App.jsx +++ b/awx/ui_next/src/App.jsx @@ -16,21 +16,21 @@ import { ConfigProvider, useAuthorizedPath, useUserProfile, -} from './contexts/Config'; -import { SessionProvider, useSession } from './contexts/Session'; -import AppContainer from './components/AppContainer'; -import Background from './components/Background'; -import ContentError from './components/ContentError'; -import NotFound from './screens/NotFound'; -import Login from './screens/Login'; -import { isAuthenticated } from './util/auth'; -import { getLanguageWithoutRegionCode } from './util/language'; +} from 'contexts/Config'; +import { SessionProvider, useSession } from 'contexts/Session'; +import AppContainer from 'components/AppContainer'; +import Background from 'components/Background'; +import ContentError from 'components/ContentError'; +import NotFound from 'screens/NotFound'; +import Login from 'screens/Login'; +import { isAuthenticated } from 'util/auth'; +import { getLanguageWithoutRegionCode } from 'util/language'; +import Metrics from 'screens/Metrics'; +import SubscriptionEdit from 'screens/Setting/Subscription/SubscriptionEdit'; +import { RootAPI } from 'api'; import { dynamicActivate, locales } from './i18nLoader'; -import Metrics from './screens/Metrics'; import getRouteConfig from './routeConfig'; -import SubscriptionEdit from './screens/Setting/Subscription/SubscriptionEdit'; import { SESSION_REDIRECT_URL } from './constants'; -import { RootAPI } from './api'; function ErrorFallback({ error }) { return ( diff --git a/awx/ui_next/src/App.test.jsx b/awx/ui_next/src/App.test.jsx index a76d9634b5..a8b842714a 100644 --- a/awx/ui_next/src/App.test.jsx +++ b/awx/ui_next/src/App.test.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; +import { RootAPI } from 'api'; +import * as SessionContext from 'contexts/Session'; import { mountWithContexts } from '../testUtils/enzymeHelpers'; -import { RootAPI } from './api'; -import * as SessionContext from './contexts/Session'; import App from './App'; jest.mock('./api'); diff --git a/awx/ui_next/src/api/Base.js b/awx/ui_next/src/api/Base.js index 5081e20ab6..bc38870a8a 100644 --- a/awx/ui_next/src/api/Base.js +++ b/awx/ui_next/src/api/Base.js @@ -1,7 +1,7 @@ import axios from 'axios'; +import { encodeQueryString } from 'util/qs'; +import debounce from 'util/debounce'; import { SESSION_TIMEOUT_KEY } from '../constants'; -import { encodeQueryString } from '../util/qs'; -import debounce from '../util/debounce'; const updateStorage = debounce((key, val) => { window.localStorage.setItem(key, val); diff --git a/awx/ui_next/src/components/About/About.jsx b/awx/ui_next/src/components/About/About.jsx index 64073ddb57..f996fc7457 100644 --- a/awx/ui_next/src/components/About/About.jsx +++ b/awx/ui_next/src/components/About/About.jsx @@ -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 'util/useBrandName'; function About({ version, isOpen, onClose }) { const brandName = useBrandName(); diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx index f85120f8f7..7104cfb6da 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx @@ -5,13 +5,13 @@ import { t } from '@lingui/macro'; import PropTypes from 'prop-types'; import { Button, DropdownItem } from '@patternfly/react-core'; -import useRequest, { useDismissableError } from '../../util/useRequest'; -import { InventoriesAPI, CredentialTypesAPI } from '../../api'; +import useRequest, { useDismissableError } from 'util/useRequest'; +import { InventoriesAPI, CredentialTypesAPI } from 'api'; +import { KebabifiedContext } from 'contexts/Kebabified'; import AlertModal from '../AlertModal'; import ErrorDetail from '../ErrorDetail'; import AdHocCommandsWizard from './AdHocCommandsWizard'; -import { KebabifiedContext } from '../../contexts/Kebabified'; import ContentError from '../ContentError'; function AdHocCommands({ adHocItems, hasListItems, onLaunchLoading }) { diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx index 3e279a92d7..1f201b60e8 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx @@ -1,16 +1,16 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; -import { - mountWithContexts, - waitForElement, -} from '../../../testUtils/enzymeHelpers'; import { CredentialTypesAPI, InventoriesAPI, CredentialsAPI, ExecutionEnvironmentsAPI, RootAPI, -} from '../../api'; +} from 'api'; +import { + mountWithContexts, + waitForElement, +} from '../../../testUtils/enzymeHelpers'; import AdHocCommands from './AdHocCommands'; jest.mock('../../api/models/CredentialTypes'); diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommandsWizard.test.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCommandsWizard.test.jsx index c415df1104..c20da81f4f 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocCommandsWizard.test.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommandsWizard.test.jsx @@ -1,10 +1,10 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; +import { CredentialsAPI, ExecutionEnvironmentsAPI, RootAPI } from 'api'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { CredentialsAPI, ExecutionEnvironmentsAPI, RootAPI } from '../../api'; import AdHocCommandsWizard from './AdHocCommandsWizard'; jest.mock('../../api/models/CredentialTypes'); diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx index 0246bf444d..7389e6a93d 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx @@ -5,14 +5,14 @@ import { t } from '@lingui/macro'; import PropTypes from 'prop-types'; import { useField } from 'formik'; import { Form, FormGroup } from '@patternfly/react-core'; -import { CredentialsAPI } from '../../api'; +import { CredentialsAPI } from 'api'; +import { getQSConfig, parseQueryString, mergeParams } from 'util/qs'; +import useRequest from 'util/useRequest'; +import { required } from 'util/validators'; import Popover from '../Popover'; -import { getQSConfig, parseQueryString, mergeParams } from '../../util/qs'; -import useRequest from '../../util/useRequest'; import ContentError from '../ContentError'; import ContentLoading from '../ContentLoading'; -import { required } from '../../util/validators'; import OptionsList from '../OptionsList'; const QS_CONFIG = getQSConfig('credentials', { diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.test.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.test.jsx index 9513632834..0e54e79158 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.test.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.test.jsx @@ -1,11 +1,11 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { CredentialsAPI } from 'api'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { CredentialsAPI } from '../../api'; import AdHocCredentialStep from './AdHocCredentialStep'; jest.mock('../../api/models/Credentials'); diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx index e97780713a..155f6c77a2 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx @@ -6,6 +6,8 @@ import PropTypes from 'prop-types'; 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 AnsibleSelect from '../AnsibleSelect'; import FormField from '../FormField'; import { VariablesField } from '../CodeEditor'; @@ -15,8 +17,6 @@ import { FormCheckboxLayout, } from '../FormLayout'; import Popover from '../Popover'; -import { required } from '../../util/validators'; -import useBrandName from '../../util/useBrandName'; const TooltipWrapper = styled.div` text-align: left; diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.test.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.test.jsx index e71759f3cd..2a78ffe0d0 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.test.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.test.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { RootAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; -import { RootAPI } from '../../api'; import DetailsStep from './AdHocDetailsStep'; jest.mock('../../api/models/Credentials'); diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnironmentStep.test.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnironmentStep.test.jsx index a78a0a673c..7c2f2c1e36 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnironmentStep.test.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnironmentStep.test.jsx @@ -1,11 +1,11 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { ExecutionEnvironmentsAPI } from 'api'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { ExecutionEnvironmentsAPI } from '../../api'; import AdHocExecutionEnvironmentStep from './AdHocExecutionEnvironmentStep'; jest.mock('../../api/models/ExecutionEnvironments'); diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.jsx index ea0a6ae9b4..d2d4e54029 100644 --- a/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.jsx +++ b/awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.jsx @@ -3,11 +3,11 @@ import { useHistory } from 'react-router-dom'; import { t } from '@lingui/macro'; import { useField } from 'formik'; import { Form, FormGroup } from '@patternfly/react-core'; -import { ExecutionEnvironmentsAPI } from '../../api'; -import Popover from '../Popover'; +import { ExecutionEnvironmentsAPI } from 'api'; -import { parseQueryString, getQSConfig, mergeParams } from '../../util/qs'; -import useRequest from '../../util/useRequest'; +import { parseQueryString, getQSConfig, mergeParams } from 'util/qs'; +import useRequest from 'util/useRequest'; +import Popover from '../Popover'; import ContentError from '../ContentError'; import ContentLoading from '../ContentLoading'; import OptionsList from '../OptionsList'; diff --git a/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx b/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx index 8f5b97ae19..fba404f6d8 100644 --- a/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx +++ b/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx @@ -2,8 +2,8 @@ import React, { useState, useRef, useEffect, Fragment } from 'react'; import { t } from '@lingui/macro'; import PropTypes from 'prop-types'; import { Dropdown, DropdownPosition } from '@patternfly/react-core'; +import { useKebabifiedMenu } from 'contexts/Kebabified'; import { ToolbarAddButton } from '../PaginatedTable'; -import { useKebabifiedMenu } from '../../contexts/Kebabified'; function AddDropDownButton({ dropdownItems, ouiaId }) { const { isKebabified } = useKebabifiedMenu(); diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx index 34bb4a0a9b..9e38dae844 100644 --- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx +++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx @@ -2,11 +2,11 @@ import React, { Fragment, useState, useEffect } from 'react'; import PropTypes from 'prop-types'; import { useHistory } from 'react-router-dom'; import { t } from '@lingui/macro'; +import { TeamsAPI, UsersAPI } from 'api'; import SelectableCard from '../SelectableCard'; import Wizard from '../Wizard'; import SelectResourceStep from './SelectResourceStep'; import SelectRoleStep from './SelectRoleStep'; -import { TeamsAPI, UsersAPI } from '../../api'; const readUsers = async queryParams => UsersAPI.read(Object.assign(queryParams, { is_superuser: false })); diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.test.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.test.jsx index 53c450f0b9..4136d6e54c 100644 --- a/awx/ui_next/src/components/AddRole/AddResourceRole.test.jsx +++ b/awx/ui_next/src/components/AddRole/AddResourceRole.test.jsx @@ -4,12 +4,12 @@ import { shallow } from 'enzyme'; import { createMemoryHistory } from 'history'; import { act } from 'react-dom/test-utils'; +import { TeamsAPI, UsersAPI } from 'api'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; import AddResourceRole, { _AddResourceRole } from './AddResourceRole'; -import { TeamsAPI, UsersAPI } from '../../api'; jest.mock('../../api/models/Teams'); jest.mock('../../api/models/Users'); diff --git a/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx b/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx index abf3b8d10f..dfaefeb16d 100644 --- a/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx +++ b/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx @@ -2,12 +2,12 @@ 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 { SearchColumns, SortColumns } from '../../types'; +import useRequest from 'util/useRequest'; +import { SearchColumns, SortColumns } from 'types'; +import { getQSConfig, parseQueryString } from 'util/qs'; import DataListToolbar from '../DataListToolbar'; import CheckboxListItem from '../CheckboxListItem'; import { SelectedList } from '../SelectedList'; -import { getQSConfig, parseQueryString } from '../../util/qs'; import PaginatedTable, { HeaderCell, HeaderRow } from '../PaginatedTable'; const QS_Config = sortColumns => { diff --git a/awx/ui_next/src/components/AppContainer/AppContainer.jsx b/awx/ui_next/src/components/AppContainer/AppContainer.jsx index 6dd0632af4..d1c31c305a 100644 --- a/awx/ui_next/src/components/AppContainer/AppContainer.jsx +++ b/awx/ui_next/src/components/AppContainer/AppContainer.jsx @@ -15,9 +15,9 @@ import { t, Plural } from '@lingui/macro'; import styled from 'styled-components'; -import { useConfig, useAuthorizedPath } from '../../contexts/Config'; -import { useSession } from '../../contexts/Session'; -import issuePendoIdentity from '../../util/issuePendoIdentity'; +import { useConfig, useAuthorizedPath } from 'contexts/Config'; +import { useSession } from 'contexts/Session'; +import issuePendoIdentity from 'util/issuePendoIdentity'; import About from '../About'; import BrandLogo from './BrandLogo'; import NavExpandableGroup from './NavExpandableGroup'; diff --git a/awx/ui_next/src/components/AppContainer/AppContainer.test.jsx b/awx/ui_next/src/components/AppContainer/AppContainer.test.jsx index ef168f0278..577ee1ba74 100644 --- a/awx/ui_next/src/components/AppContainer/AppContainer.test.jsx +++ b/awx/ui_next/src/components/AppContainer/AppContainer.test.jsx @@ -1,11 +1,11 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; +import { MeAPI, RootAPI } from 'api'; +import { useAuthorizedPath } from 'contexts/Config'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { MeAPI, RootAPI } from '../../api'; -import { useAuthorizedPath } from '../../contexts/Config'; import AppContainer from './AppContainer'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx index c00721f7a8..1682469ef0 100644 --- a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx +++ b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx @@ -20,10 +20,10 @@ import { QuestionCircleIcon, UserIcon, } from '@patternfly/react-icons'; -import { WorkflowApprovalsAPI } from '../../api'; -import useRequest from '../../util/useRequest'; -import getDocsBaseUrl from '../../util/getDocsBaseUrl'; -import { useConfig } from '../../contexts/Config'; +import { WorkflowApprovalsAPI } from 'api'; +import useRequest from 'util/useRequest'; +import getDocsBaseUrl from 'util/getDocsBaseUrl'; +import { useConfig } from 'contexts/Config'; import useWsPendingApprovalCount from './useWsPendingApprovalCount'; const PendingWorkflowApprovals = styled.div` diff --git a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.test.jsx b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.test.jsx index 0966c8bc4e..a326707c04 100644 --- a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.test.jsx +++ b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.test.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; +import { WorkflowApprovalsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import PageHeaderToolbar from './PageHeaderToolbar'; -import { WorkflowApprovalsAPI } from '../../api'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js b/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js index d6b1edde4a..443a311823 100644 --- a/awx/ui_next/src/components/AppContainer/useWsPendingApprovalCount.js +++ b/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 'util/useWebsocket'; +import useThrottle from 'util/useThrottle'; export default function useWsPendingApprovalCount( initialCount, diff --git a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx index 6c388091fc..e959d6395a 100644 --- a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx +++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx @@ -3,10 +3,10 @@ import { useHistory } from 'react-router-dom'; import { t } from '@lingui/macro'; import { Button, Modal } from '@patternfly/react-core'; +import useRequest from 'util/useRequest'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useSelected from 'util/useSelected'; import OptionsList from '../OptionsList'; -import useRequest from '../../util/useRequest'; -import { getQSConfig, parseQueryString } from '../../util/qs'; -import useSelected from '../../util/useSelected'; const QS_CONFIG = (order_by = 'name') => { return getQSConfig('associate', { diff --git a/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx b/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx index 3c36df348c..8aaa0516f0 100644 --- a/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx +++ b/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx @@ -11,7 +11,7 @@ import 'ace-builds/src-noconflict/theme-github'; import { t } from '@lingui/macro'; import styled from 'styled-components'; -import debounce from '../../util/debounce'; +import debounce from 'util/debounce'; config.set('loadWorkerFromBlob', false); diff --git a/awx/ui_next/src/components/CodeEditor/CodeEditor.test.jsx b/awx/ui_next/src/components/CodeEditor/CodeEditor.test.jsx index 69f498d2e3..c83544a788 100644 --- a/awx/ui_next/src/components/CodeEditor/CodeEditor.test.jsx +++ b/awx/ui_next/src/components/CodeEditor/CodeEditor.test.jsx @@ -1,7 +1,7 @@ import React from 'react'; +import debounce from 'util/debounce'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import CodeEditor from './CodeEditor'; -import debounce from '../../util/debounce'; jest.mock('../../util/debounce'); diff --git a/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx b/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx index 55c0fa1883..bd1926b5ea 100644 --- a/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx +++ b/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx @@ -11,15 +11,10 @@ import { Modal, } from '@patternfly/react-core'; import { ExpandArrowsAltIcon } from '@patternfly/react-icons'; +import { yamlToJson, jsonToYaml, isJsonObject, isJsonString } from 'util/yaml'; import { DetailName, DetailValue } from '../DetailList'; import MultiButtonToggle from '../MultiButtonToggle'; import Popover from '../Popover'; -import { - yamlToJson, - jsonToYaml, - isJsonObject, - isJsonString, -} from '../../util/yaml'; import CodeEditor from './CodeEditor'; import { JSON_MODE, YAML_MODE } from './constants'; diff --git a/awx/ui_next/src/components/CodeEditor/VariablesField.jsx b/awx/ui_next/src/components/CodeEditor/VariablesField.jsx index 71b1dc8581..41942d1643 100644 --- a/awx/ui_next/src/components/CodeEditor/VariablesField.jsx +++ b/awx/ui_next/src/components/CodeEditor/VariablesField.jsx @@ -6,9 +6,9 @@ import { useField } from 'formik'; import styled from 'styled-components'; import { Split, SplitItem, Button, Modal } from '@patternfly/react-core'; import { ExpandArrowsAltIcon } from '@patternfly/react-icons'; +import { yamlToJson, jsonToYaml, isJsonString } from 'util/yaml'; import { CheckboxField } from '../FormField'; import MultiButtonToggle from '../MultiButtonToggle'; -import { yamlToJson, jsonToYaml, isJsonString } from '../../util/yaml'; import CodeEditor from './CodeEditor'; import Popover from '../Popover'; import { JSON_MODE, YAML_MODE } from './constants'; diff --git a/awx/ui_next/src/components/CodeEditor/VariablesInput.jsx b/awx/ui_next/src/components/CodeEditor/VariablesInput.jsx index 09c68a7247..c75f6df519 100644 --- a/awx/ui_next/src/components/CodeEditor/VariablesInput.jsx +++ b/awx/ui_next/src/components/CodeEditor/VariablesInput.jsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { string, func, bool, number } from 'prop-types'; import { Split, SplitItem } from '@patternfly/react-core'; import styled from 'styled-components'; -import { yamlToJson, jsonToYaml, isJsonString } from '../../util/yaml'; +import { yamlToJson, jsonToYaml, isJsonString } from 'util/yaml'; import MultiButtonToggle from '../MultiButtonToggle'; import CodeEditor from './CodeEditor'; import { JSON_MODE, YAML_MODE } from './constants'; diff --git a/awx/ui_next/src/components/ContentError/ContentError.jsx b/awx/ui_next/src/components/ContentError/ContentError.jsx index 6ac256ec26..ef05510898 100644 --- a/awx/ui_next/src/components/ContentError/ContentError.jsx +++ b/awx/ui_next/src/components/ContentError/ContentError.jsx @@ -10,7 +10,7 @@ import { EmptyStateBody, } from '@patternfly/react-core'; import { ExclamationTriangleIcon } from '@patternfly/react-icons'; -import { useSession } from '../../contexts/Session'; +import { useSession } from 'contexts/Session'; import ErrorDetail from '../ErrorDetail'; function ContentError({ error, children, isNotFound }) { diff --git a/awx/ui_next/src/components/CopyButton/CopyButton.jsx b/awx/ui_next/src/components/CopyButton/CopyButton.jsx index 6923ee16f0..021f1a8e81 100644 --- a/awx/ui_next/src/components/CopyButton/CopyButton.jsx +++ b/awx/ui_next/src/components/CopyButton/CopyButton.jsx @@ -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 'util/useRequest'; import AlertModal from '../AlertModal'; import ErrorDetail from '../ErrorDetail'; diff --git a/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx b/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx index 04f7894730..0c4780ced6 100644 --- a/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx +++ b/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx @@ -2,8 +2,8 @@ import React from 'react'; import { t } from '@lingui/macro'; import { Chip } from '@patternfly/react-core'; -import { Credential } from '../../types'; -import { toTitleCase } from '../../util/strings'; +import { Credential } from 'types'; +import { toTitleCase } from 'util/strings'; function CredentialChip({ credential, ...props }) { let type; diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx index 57f135d05c..92c33625aa 100644 --- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx +++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx @@ -20,11 +20,11 @@ import { AngleRightIcon, SearchIcon, } from '@patternfly/react-icons'; +import { SearchColumns, SortColumns, QSConfig } from 'types'; +import { KebabifiedProvider } from 'contexts/Kebabified'; import ExpandCollapse from '../ExpandCollapse'; import Search from '../Search'; import Sort from '../Sort'; -import { SearchColumns, SortColumns, QSConfig } from '../../types'; -import { KebabifiedProvider } from '../../contexts/Kebabified'; const ToolbarContent = styled(PFToolbarContent)` & > .pf-c-toolbar__content-section { diff --git a/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx b/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx index 24a7f24fd5..fef07fb892 100644 --- a/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx +++ b/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx @@ -4,8 +4,8 @@ import PropTypes from 'prop-types'; import { t } from '@lingui/macro'; import styled from 'styled-components'; import { Button, Badge, Alert, Tooltip } from '@patternfly/react-core'; +import { getRelatedResourceDeleteCounts } from 'util/getRelatedResourceDeleteDetails'; import AlertModal from '../AlertModal'; -import { getRelatedResourceDeleteCounts } from '../../util/getRelatedResourceDeleteDetails'; import ErrorDetail from '../ErrorDetail'; const WarningMessage = styled(Alert)` diff --git a/awx/ui_next/src/components/DeleteButton/DeleteButton.test.jsx b/awx/ui_next/src/components/DeleteButton/DeleteButton.test.jsx index 966fd9b74b..18f9f47126 100644 --- a/awx/ui_next/src/components/DeleteButton/DeleteButton.test.jsx +++ b/awx/ui_next/src/components/DeleteButton/DeleteButton.test.jsx @@ -1,10 +1,10 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; +import { CredentialsAPI } from 'api'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { CredentialsAPI } from '../../api'; import DeleteButton from './DeleteButton'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/DetailList/NumberSinceDetail.jsx b/awx/ui_next/src/components/DetailList/NumberSinceDetail.jsx index 6f58783fea..66a8e03726 100644 --- a/awx/ui_next/src/components/DetailList/NumberSinceDetail.jsx +++ b/awx/ui_next/src/components/DetailList/NumberSinceDetail.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { node, string } from 'prop-types'; import { t } from '@lingui/macro'; import styled from 'styled-components'; -import { formatDateString } from '../../util/dates'; +import { formatDateString } from 'util/dates'; import _Detail from './Detail'; const Detail = styled(_Detail)` diff --git a/awx/ui_next/src/components/DetailList/UserDateDetail.jsx b/awx/ui_next/src/components/DetailList/UserDateDetail.jsx index 29826175c5..ca42adde3c 100644 --- a/awx/ui_next/src/components/DetailList/UserDateDetail.jsx +++ b/awx/ui_next/src/components/DetailList/UserDateDetail.jsx @@ -3,9 +3,9 @@ import { node, string } from 'prop-types'; import { Trans } from '@lingui/macro'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { formatDateString } from '../../util/dates'; +import { formatDateString } from 'util/dates'; +import { SummaryFieldUser } from 'types'; import _Detail from './Detail'; -import { SummaryFieldUser } from '../../types'; const Detail = styled(_Detail)` word-break: break-word; diff --git a/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx b/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx index 697dc6b304..17b2a9b157 100644 --- a/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx +++ b/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx @@ -4,7 +4,7 @@ import { arrayOf, func, shape, string, oneOfType, number } from 'prop-types'; import { t } from '@lingui/macro'; import { Button, Tooltip, DropdownItem } from '@patternfly/react-core'; import styled from 'styled-components'; -import { KebabifiedContext } from '../../contexts/Kebabified'; +import { KebabifiedContext } from 'contexts/Kebabified'; import AlertModal from '../AlertModal'; diff --git a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx index 7a1f26724c..d59097310f 100644 --- a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx +++ b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx @@ -5,10 +5,10 @@ import { t, Trans } from '@lingui/macro'; import { Popover, Tooltip } from '@patternfly/react-core'; import styled from 'styled-components'; import { ExclamationTriangleIcon as PFExclamationTriangleIcon } from '@patternfly/react-icons'; +import { ExecutionEnvironment } from 'types'; +import getDocsBaseUrl from 'util/getDocsBaseUrl'; +import { useConfig } from 'contexts/Config'; import { Detail } from '../DetailList'; -import { ExecutionEnvironment } from '../../types'; -import getDocsBaseUrl from '../../util/getDocsBaseUrl'; -import { useConfig } from '../../contexts/Config'; const ExclamationTriangleIcon = styled(PFExclamationTriangleIcon)` color: var(--pf-global--warning-color--100); diff --git a/awx/ui_next/src/components/HostForm/HostForm.jsx b/awx/ui_next/src/components/HostForm/HostForm.jsx index fb8f231262..d7b358d5c0 100644 --- a/awx/ui_next/src/components/HostForm/HostForm.jsx +++ b/awx/ui_next/src/components/HostForm/HostForm.jsx @@ -3,13 +3,13 @@ import { bool, func, shape } from 'prop-types'; import { Formik, useField, useFormikContext } from 'formik'; import { t } from '@lingui/macro'; import { Form, FormGroup, Tooltip } from '@patternfly/react-core'; +import { required } from 'util/validators'; import FormField, { FormSubmitError } from '../FormField'; import FormActionGroup from '../FormActionGroup/FormActionGroup'; import { VariablesField } from '../CodeEditor'; import { InventoryLookup } from '../Lookup'; import { FormColumnLayout, FormFullWidthLayout } from '../FormLayout'; import Popover from '../Popover'; -import { required } from '../../util/validators'; const InventoryLookupField = ({ isDisabled }) => { const { setFieldValue, setFieldTouched } = useFormikContext(); diff --git a/awx/ui_next/src/components/HostToggle/HostToggle.jsx b/awx/ui_next/src/components/HostToggle/HostToggle.jsx index 4a7b03d55a..d590583fc9 100644 --- a/awx/ui_next/src/components/HostToggle/HostToggle.jsx +++ b/awx/ui_next/src/components/HostToggle/HostToggle.jsx @@ -3,10 +3,10 @@ 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 { HostsAPI } from 'api'; import AlertModal from '../AlertModal'; import ErrorDetail from '../ErrorDetail'; -import useRequest from '../../util/useRequest'; -import { HostsAPI } from '../../api'; function HostToggle({ className, diff --git a/awx/ui_next/src/components/HostToggle/HostToggle.test.jsx b/awx/ui_next/src/components/HostToggle/HostToggle.test.jsx index 7391036bf2..6c211f7bde 100644 --- a/awx/ui_next/src/components/HostToggle/HostToggle.test.jsx +++ b/awx/ui_next/src/components/HostToggle/HostToggle.test.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; -import { HostsAPI } from '../../api'; +import { HostsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import HostToggle from './HostToggle'; diff --git a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx index 7865d2d312..476c55d694 100644 --- a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx +++ b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx @@ -2,11 +2,11 @@ import React, { useState, useEffect, useCallback } from 'react'; import { t } from '@lingui/macro'; import { Switch, Tooltip } from '@patternfly/react-core'; -import AlertModal from '../AlertModal'; +import useRequest from 'util/useRequest'; +import { InstancesAPI } from 'api'; +import { useConfig } from 'contexts/Config'; import ErrorDetail from '../ErrorDetail'; -import useRequest from '../../util/useRequest'; -import { InstancesAPI } from '../../api'; -import { useConfig } from '../../contexts/Config'; +import AlertModal from '../AlertModal'; function InstanceToggle({ className, fetchInstances, instance, onToggle }) { const { me = {} } = useConfig(); diff --git a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.test.jsx b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.test.jsx index 6ac9dbda7e..bb5ad02065 100644 --- a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.test.jsx +++ b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.test.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; -import { InstancesAPI } from '../../api'; +import { InstancesAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import InstanceToggle from './InstanceToggle'; diff --git a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx index b9098836e5..7e0d470d06 100644 --- a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx +++ b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx @@ -2,8 +2,8 @@ import React, { useCallback, useState } from 'react'; 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 { getJobModel } from 'util/jobs'; +import useRequest, { useDismissableError } from 'util/useRequest'; import AlertModal from '../AlertModal'; import ErrorDetail from '../ErrorDetail'; diff --git a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.test.jsx b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.test.jsx index dd98838ac2..8c381e021c 100644 --- a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.test.jsx +++ b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.test.jsx @@ -6,7 +6,7 @@ import { SystemJobsAPI, WorkflowJobsAPI, JobsAPI, -} from '../../api'; +} from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import JobCancelButton from './JobCancelButton'; diff --git a/awx/ui_next/src/components/JobList/JobList.jsx b/awx/ui_next/src/components/JobList/JobList.jsx index 83e8e8f851..c150f6eea7 100644 --- a/awx/ui_next/src/components/JobList/JobList.jsx +++ b/awx/ui_next/src/components/JobList/JobList.jsx @@ -3,6 +3,16 @@ import { useLocation } from 'react-router-dom'; import { t, Plural } from '@lingui/macro'; import { Card } from '@patternfly/react-core'; +import useRequest, { + useDeleteItems, + useDismissableError, +} from 'util/useRequest'; +import { useConfig } from 'contexts/Config'; +import useSelected from 'util/useSelected'; +import useExpanded from 'util/useExpanded'; +import { isJobRunning, getJobModel } from 'util/jobs'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import { UnifiedJobsAPI } from 'api'; import AlertModal from '../AlertModal'; import DatalistToolbar from '../DataListToolbar'; import ErrorDetail from '../ErrorDetail'; @@ -11,19 +21,9 @@ import PaginatedTable, { HeaderCell, ToolbarDeleteButton, } from '../PaginatedTable'; -import useRequest, { - useDeleteItems, - useDismissableError, -} from '../../util/useRequest'; -import { useConfig } from '../../contexts/Config'; -import useSelected from '../../util/useSelected'; -import useExpanded from '../../util/useExpanded'; -import { isJobRunning, getJobModel } from '../../util/jobs'; -import { getQSConfig, parseQueryString } from '../../util/qs'; import JobListItem from './JobListItem'; import JobListCancelButton from './JobListCancelButton'; import useWsJobs from './useWsJobs'; -import { UnifiedJobsAPI } from '../../api'; function JobList({ defaultParams, showTypeColumn = false }) { const qsConfig = getQSConfig( diff --git a/awx/ui_next/src/components/JobList/JobList.test.jsx b/awx/ui_next/src/components/JobList/JobList.test.jsx index 494c8614db..36b8bd9054 100644 --- a/awx/ui_next/src/components/JobList/JobList.test.jsx +++ b/awx/ui_next/src/components/JobList/JobList.test.jsx @@ -1,9 +1,5 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; -import { - mountWithContexts, - waitForElement, -} from '../../../testUtils/enzymeHelpers'; import { AdHocCommandsAPI, InventoryUpdatesAPI, @@ -12,7 +8,11 @@ import { SystemJobsAPI, UnifiedJobsAPI, WorkflowJobsAPI, -} from '../../api'; +} from 'api'; +import { + mountWithContexts, + waitForElement, +} from '../../../testUtils/enzymeHelpers'; import JobList from './JobList'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx index 225acadf45..05eebaa7cc 100644 --- a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx +++ b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx @@ -3,10 +3,10 @@ import React, { useContext, useEffect, useState } from 'react'; import { t, Plural } from '@lingui/macro'; import { arrayOf, func } from 'prop-types'; import { Button, DropdownItem, Tooltip } from '@patternfly/react-core'; -import { KebabifiedContext } from '../../contexts/Kebabified'; -import { isJobRunning } from '../../util/jobs'; +import { KebabifiedContext } from 'contexts/Kebabified'; +import { isJobRunning } from 'util/jobs'; +import { Job } from 'types'; import AlertModal from '../AlertModal'; -import { Job } from '../../types'; function cannotCancelBecausePermissions(job) { return ( diff --git a/awx/ui_next/src/components/JobList/JobListItem.jsx b/awx/ui_next/src/components/JobList/JobListItem.jsx index 22edb4b8b1..2dfb741c31 100644 --- a/awx/ui_next/src/components/JobList/JobListItem.jsx +++ b/awx/ui_next/src/components/JobList/JobListItem.jsx @@ -6,6 +6,8 @@ import { Button, Chip } from '@patternfly/react-core'; import { Tr, Td, ExpandableRowContent } from '@patternfly/react-table'; import { RocketIcon } from '@patternfly/react-icons'; import styled from 'styled-components'; +import { formatDateString } from 'util/dates'; +import { isJobRunning } from 'util/jobs'; import { ActionsTd, ActionItem } from '../PaginatedTable'; import { LaunchButton, ReLaunchDropDown } from '../LaunchButton'; import StatusLabel from '../StatusLabel'; @@ -13,8 +15,6 @@ import { DetailList, Detail, LaunchedByDetail } from '../DetailList'; import ChipGroup from '../ChipGroup'; import CredentialChip from '../CredentialChip'; import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail'; -import { formatDateString } from '../../util/dates'; -import { isJobRunning } from '../../util/jobs'; import { JOB_TYPE_URL_SEGMENTS } from '../../constants'; import JobCancelButton from '../JobCancelButton'; diff --git a/awx/ui_next/src/components/JobList/useWsJobs.js b/awx/ui_next/src/components/JobList/useWsJobs.js index 4560930818..e2bd5ff137 100644 --- a/awx/ui_next/src/components/JobList/useWsJobs.js +++ b/awx/ui_next/src/components/JobList/useWsJobs.js @@ -1,8 +1,8 @@ import { useState, useEffect } from 'react'; import { useLocation } from 'react-router-dom'; -import useWebsocket from '../../util/useWebsocket'; -import useThrottle from '../../util/useThrottle'; -import { parseQueryString } from '../../util/qs'; +import useWebsocket from 'util/useWebsocket'; +import useThrottle from 'util/useThrottle'; +import { parseQueryString } from 'util/qs'; import sortJobs from './sortJobs'; export default function useWsJobs(initialJobs, fetchJobsById, qsConfig) { diff --git a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx index 16430d803c..cc839a45b9 100644 --- a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx +++ b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx @@ -4,8 +4,6 @@ import { number, shape } from 'prop-types'; import { t } from '@lingui/macro'; -import AlertModal from '../AlertModal'; -import ErrorDetail from '../ErrorDetail'; import { AdHocCommandsAPI, InventorySourcesAPI, @@ -14,7 +12,9 @@ import { ProjectsAPI, WorkflowJobsAPI, WorkflowJobTemplatesAPI, -} from '../../api'; +} from 'api'; +import AlertModal from '../AlertModal'; +import ErrorDetail from '../ErrorDetail'; import LaunchPrompt from '../LaunchPrompt'; function canLaunchWithoutPrompt(launchData) { diff --git a/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx b/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx index ccc02edc04..888523ce62 100644 --- a/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx +++ b/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx @@ -1,10 +1,6 @@ import React from 'react'; import { createMemoryHistory } from 'history'; import { act } from 'react-dom/test-utils'; -import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../testUtils/testUtils'; - -import LaunchButton from './LaunchButton'; import { InventorySourcesAPI, JobsAPI, @@ -12,7 +8,11 @@ import { ProjectsAPI, WorkflowJobsAPI, WorkflowJobTemplatesAPI, -} from '../../api'; +} from 'api'; +import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; +import { sleep } from '../../../testUtils/testUtils'; + +import LaunchButton from './LaunchButton'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx index 9dc05b3ca8..0f2fb1aedf 100644 --- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx @@ -2,11 +2,11 @@ import React, { useState } from 'react'; import { ExpandableSection, Wizard } from '@patternfly/react-core'; import { t } from '@lingui/macro'; import { Formik, useFormikContext } from 'formik'; -import ContentError from '../ContentError'; +import { useDismissableError } from 'util/useRequest'; +import mergeExtraVars from 'util/prompt/mergeExtraVars'; +import getSurveyValues from 'util/prompt/getSurveyValues'; import ContentLoading from '../ContentLoading'; -import { useDismissableError } from '../../util/useRequest'; -import mergeExtraVars from '../../util/prompt/mergeExtraVars'; -import getSurveyValues from '../../util/prompt/getSurveyValues'; +import ContentError from '../ContentError'; import useLaunchSteps from './useLaunchSteps'; import AlertModal from '../AlertModal'; diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx index 366437fdf7..27263d479c 100644 --- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx @@ -1,5 +1,11 @@ import React from 'react'; import { act, isElementOfType } from 'react-dom/test-utils'; +import { + InventoriesAPI, + CredentialsAPI, + CredentialTypesAPI, + JobTemplatesAPI, +} from 'api'; import { mountWithContexts, waitForElement, @@ -10,12 +16,6 @@ import CredentialsStep from './steps/CredentialsStep'; import CredentialPasswordsStep from './steps/CredentialPasswordsStep'; import OtherPromptsStep from './steps/OtherPromptsStep'; import PreviewStep from './steps/PreviewStep'; -import { - InventoriesAPI, - CredentialsAPI, - CredentialTypesAPI, - JobTemplatesAPI, -} from '../../api'; jest.mock('../../api/models/Inventories'); jest.mock('../../api/models/CredentialTypes'); diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx index dd6ebefc9c..e04efda7a6 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx @@ -6,14 +6,14 @@ import { t } from '@lingui/macro'; import { useField } from 'formik'; import styled from 'styled-components'; import { Alert, ToolbarItem } from '@patternfly/react-core'; -import { CredentialsAPI, CredentialTypesAPI } from '../../../api'; +import { CredentialsAPI, CredentialTypesAPI } from 'api'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useRequest from 'util/useRequest'; import AnsibleSelect from '../../AnsibleSelect'; import OptionsList from '../../OptionsList'; import ContentLoading from '../../ContentLoading'; import CredentialChip from '../../CredentialChip'; import ContentError from '../../ContentError'; -import { getQSConfig, parseQueryString } from '../../../util/qs'; -import useRequest from '../../../util/useRequest'; import credentialsValidator from './credentialsValidator'; const CredentialErrorAlert = styled(Alert)` diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.test.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.test.jsx index 3b6855f0b9..e826346876 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.test.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { CredentialsAPI, CredentialTypesAPI } from 'api'; import { mountWithContexts } from '../../../../testUtils/enzymeHelpers'; import CredentialsStep from './CredentialsStep'; -import { CredentialsAPI, CredentialTypesAPI } from '../../../api'; jest.mock('../../../api/models/CredentialTypes'); jest.mock('../../../api/models/Credentials'); diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx index 123a157cdb..d391b326c5 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx @@ -5,9 +5,9 @@ import { t } from '@lingui/macro'; import { useField } from 'formik'; 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 { InventoriesAPI } from 'api'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useRequest from 'util/useRequest'; import OptionsList from '../../OptionsList'; import ContentLoading from '../../ContentLoading'; import ContentError from '../../ContentError'; diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.test.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.test.jsx index e7ca020efa..72e4291d69 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.test.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { InventoriesAPI } from 'api'; import { mountWithContexts } from '../../../../testUtils/enzymeHelpers'; import InventoryStep from './InventoryStep'; -import { InventoriesAPI } from '../../../api'; jest.mock('../../../api/models/Inventories'); diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx index e4bc717ec4..4a33c8cdb5 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx @@ -6,10 +6,8 @@ import { t } from '@lingui/macro'; import { useFormikContext } from 'formik'; import yaml from 'js-yaml'; -import mergeExtraVars, { - maskPasswords, -} from '../../../util/prompt/mergeExtraVars'; -import getSurveyValues from '../../../util/prompt/getSurveyValues'; +import mergeExtraVars, { maskPasswords } from 'util/prompt/mergeExtraVars'; +import getSurveyValues from 'util/prompt/getSurveyValues'; import PromptDetail from '../../PromptDetail'; const ExclamationCircleIcon = styled(PFExclamationCircleIcon)` diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx index 07d96b335d..d840dbe80d 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx @@ -8,8 +8,6 @@ import { SelectOption, SelectVariant, } from '@patternfly/react-core'; -import FormField from '../../FormField'; -import Popover from '../../Popover'; import { required, minMaxValue, @@ -17,8 +15,10 @@ import { minLength, integer, combine, -} from '../../../util/validators'; -import { Survey } from '../../../types'; +} from 'util/validators'; +import { Survey } from 'types'; +import FormField from '../../FormField'; +import Popover from '../../Popover'; function SurveyStep({ surveyConfig }) { const fieldTypes = { diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx index d874d32995..6603d4bf48 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { t } from '@lingui/macro'; import { useField } from 'formik'; -import { jsonToYaml, yamlToJson } from '../../../util/yaml'; +import { jsonToYaml, yamlToJson } from 'util/yaml'; import OtherPromptsStep from './OtherPromptsStep'; import StepName from './StepName'; diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.jsx index b974f1d410..1e7264762d 100644 --- a/awx/ui_next/src/components/ListHeader/ListHeader.jsx +++ b/awx/ui_next/src/components/ListHeader/ListHeader.jsx @@ -3,15 +3,15 @@ import PropTypes from 'prop-types'; import { withRouter } from 'react-router-dom'; import styled from 'styled-components'; import { Toolbar, ToolbarContent } from '@patternfly/react-core'; -import DataListToolbar from '../DataListToolbar'; import { parseQueryString, mergeParams, removeParams, updateQueryString, -} from '../../util/qs'; -import { QSConfig, SearchColumns, SortColumns } from '../../types'; +} from 'util/qs'; +import { QSConfig, SearchColumns, SortColumns } from 'types'; +import DataListToolbar from '../DataListToolbar'; const EmptyStateControlsWrapper = styled.div` display: flex; diff --git a/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx b/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx index a1ab723c70..6a5b98d1b6 100644 --- a/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx +++ b/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx @@ -3,12 +3,12 @@ import { func, node, string } from 'prop-types'; import { withRouter, useLocation } from 'react-router-dom'; import { t } from '@lingui/macro'; import { FormGroup } from '@patternfly/react-core'; -import { ApplicationsAPI } from '../../api'; -import { Application } from '../../types'; -import { getQSConfig, parseQueryString } from '../../util/qs'; +import { ApplicationsAPI } from 'api'; +import { Application } from 'types'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useRequest from 'util/useRequest'; import Lookup from './Lookup'; import OptionsList from '../OptionsList'; -import useRequest from '../../util/useRequest'; import LookupErrorMessage from './shared/LookupErrorMessage'; const QS_CONFIG = getQSConfig('applications', { diff --git a/awx/ui_next/src/components/Lookup/ApplicationLookup.test.jsx b/awx/ui_next/src/components/Lookup/ApplicationLookup.test.jsx index 10eac993bb..9c9cb6b481 100644 --- a/awx/ui_next/src/components/Lookup/ApplicationLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/ApplicationLookup.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { ApplicationsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import ApplicationLookup from './ApplicationLookup'; -import { ApplicationsAPI } from '../../api'; jest.mock('../../api'); const application = { diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx index 97edad1d97..68b1c00eeb 100644 --- a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx +++ b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx @@ -12,14 +12,14 @@ import { import { t } from '@lingui/macro'; import { FormGroup } from '@patternfly/react-core'; -import { CredentialsAPI } from '../../api'; -import { Credential } from '../../types'; -import { getQSConfig, parseQueryString, mergeParams } from '../../util/qs'; +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 Popover from '../Popover'; import Lookup from './Lookup'; import OptionsList from '../OptionsList'; -import useAutoPopulateLookup from '../../util/useAutoPopulateLookup'; -import useRequest from '../../util/useRequest'; import LookupErrorMessage from './shared/LookupErrorMessage'; const QS_CONFIG = getQSConfig('credentials', { diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.test.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.test.jsx index 7ed5910816..3a5c8bdaee 100644 --- a/awx/ui_next/src/components/Lookup/CredentialLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/CredentialLookup.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { CredentialsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import CredentialLookup, { _CredentialLookup } from './CredentialLookup'; -import { CredentialsAPI } from '../../api'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx index 524b4f7cad..0d4de7dec7 100644 --- a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx +++ b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx @@ -3,12 +3,12 @@ import { string, func, bool, oneOfType, number } from 'prop-types'; import { useLocation } from 'react-router-dom'; import { t } from '@lingui/macro'; import { FormGroup, Tooltip } from '@patternfly/react-core'; -import { ExecutionEnvironmentsAPI, ProjectsAPI } from '../../api'; -import { ExecutionEnvironment } from '../../types'; -import { getQSConfig, parseQueryString, mergeParams } from '../../util/qs'; +import { ExecutionEnvironmentsAPI, ProjectsAPI } from 'api'; +import { ExecutionEnvironment } from 'types'; +import { getQSConfig, parseQueryString, mergeParams } from 'util/qs'; +import useRequest from 'util/useRequest'; import Popover from '../Popover'; import OptionsList from '../OptionsList'; -import useRequest from '../../util/useRequest'; import Lookup from './Lookup'; import LookupErrorMessage from './shared/LookupErrorMessage'; diff --git a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.test.jsx b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.test.jsx index 339f8235f7..d110059a9b 100644 --- a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { ExecutionEnvironmentsAPI, ProjectsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import ExecutionEnvironmentLookup from './ExecutionEnvironmentLookup'; -import { ExecutionEnvironmentsAPI, ProjectsAPI } from '../../api'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx b/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx index cb1c6411ee..ee232aecbb 100644 --- a/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx +++ b/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx @@ -14,15 +14,15 @@ import { Modal, Tooltip, } from '@patternfly/react-core'; +import { HostsAPI } from 'api'; +import { getQSConfig, mergeParams, parseQueryString } from 'util/qs'; +import useRequest, { useDismissableError } from 'util/useRequest'; import ChipGroup from '../ChipGroup'; import Popover from '../Popover'; import DataListToolbar from '../DataListToolbar'; import LookupErrorMessage from './shared/LookupErrorMessage'; import PaginatedTable, { HeaderCell, HeaderRow } from '../PaginatedTable'; import HostListItem from './HostListItem'; -import { HostsAPI } from '../../api'; -import { getQSConfig, mergeParams, parseQueryString } from '../../util/qs'; -import useRequest, { useDismissableError } from '../../util/useRequest'; import { removeDefaultParams, removeNamespacedKeys, diff --git a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx index c3bfa74b4e..96f9e857b0 100644 --- a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx +++ b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx @@ -4,12 +4,12 @@ import { withRouter } from 'react-router-dom'; import { t, Trans } from '@lingui/macro'; import { FormGroup } from '@patternfly/react-core'; -import { InstanceGroupsAPI } from '../../api'; -import { InstanceGroup } from '../../types'; -import { getQSConfig, parseQueryString } from '../../util/qs'; +import { InstanceGroupsAPI } from 'api'; +import { InstanceGroup } from 'types'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useRequest from 'util/useRequest'; import Popover from '../Popover'; import OptionsList from '../OptionsList'; -import useRequest from '../../util/useRequest'; import Lookup from './Lookup'; import LookupErrorMessage from './shared/LookupErrorMessage'; diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx index be18418972..d5947af4d0 100644 --- a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx +++ b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx @@ -2,12 +2,12 @@ import React, { useCallback, useEffect } from 'react'; import { func, bool, string } from 'prop-types'; import { withRouter } from 'react-router-dom'; import { t } from '@lingui/macro'; -import { InventoriesAPI } from '../../api'; -import { Inventory } from '../../types'; +import { InventoriesAPI } from 'api'; +import { Inventory } from 'types'; +import useRequest from 'util/useRequest'; +import { getQSConfig, parseQueryString, mergeParams } from 'util/qs'; import Lookup from './Lookup'; import OptionsList from '../OptionsList'; -import useRequest from '../../util/useRequest'; -import { getQSConfig, parseQueryString, mergeParams } from '../../util/qs'; import LookupErrorMessage from './shared/LookupErrorMessage'; import FieldWithPrompt from '../FieldWithPrompt'; diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.test.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.test.jsx index 765ad87bf7..7c20846d32 100644 --- a/awx/ui_next/src/components/Lookup/InventoryLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/InventoryLookup.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { InventoriesAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import InventoryLookup from './InventoryLookup'; -import { InventoriesAPI } from '../../api'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/Lookup/Lookup.jsx b/awx/ui_next/src/components/Lookup/Lookup.jsx index 1114006c3e..d8865373b9 100644 --- a/awx/ui_next/src/components/Lookup/Lookup.jsx +++ b/awx/ui_next/src/components/Lookup/Lookup.jsx @@ -22,10 +22,10 @@ import { } from '@patternfly/react-core'; import { t } from '@lingui/macro'; import styled from 'styled-components'; -import useDebounce from '../../util/useDebounce'; +import useDebounce from 'util/useDebounce'; +import { QSConfig } from 'types'; import ChipGroup from '../ChipGroup'; import reducer, { initReducer } from './shared/reducer'; -import { QSConfig } from '../../types'; const ChipHolder = styled.div` --pf-c-form-control--Height: auto; diff --git a/awx/ui_next/src/components/Lookup/Lookup.test.jsx b/awx/ui_next/src/components/Lookup/Lookup.test.jsx index 801589f73b..6d44dfae73 100644 --- a/awx/ui_next/src/components/Lookup/Lookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/Lookup.test.jsx @@ -2,11 +2,11 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { getQSConfig } from 'util/qs'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { getQSConfig } from '../../util/qs'; import Lookup from './Lookup'; /** diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx index e54a53ca21..dbad506f98 100644 --- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx +++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx @@ -4,14 +4,14 @@ import { withRouter } from 'react-router-dom'; import PropTypes from 'prop-types'; import { t } from '@lingui/macro'; import { ToolbarItem, Alert } from '@patternfly/react-core'; -import { CredentialsAPI, CredentialTypesAPI } from '../../api'; +import { CredentialsAPI, CredentialTypesAPI } from 'api'; +import useRequest from 'util/useRequest'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useIsMounted from 'util/useIsMounted'; import AnsibleSelect from '../AnsibleSelect'; import CredentialChip from '../CredentialChip'; import OptionsList from '../OptionsList'; -import useRequest from '../../util/useRequest'; -import { getQSConfig, parseQueryString } from '../../util/qs'; import Lookup from './Lookup'; -import useIsMounted from '../../util/useIsMounted'; const QS_CONFIG = getQSConfig('credentials', { page: 1, diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.test.jsx b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.test.jsx index 0cfb3a66b5..45f0485614 100644 --- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.test.jsx @@ -1,12 +1,12 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { CredentialsAPI, CredentialTypesAPI } from 'api'; import { mountWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; import MultiCredentialsLookup from './MultiCredentialsLookup'; -import { CredentialsAPI, CredentialTypesAPI } from '../../api'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx index 1741a900ca..347907d629 100644 --- a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx +++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx @@ -3,11 +3,11 @@ import { node, func, bool, string } from 'prop-types'; import { withRouter } from 'react-router-dom'; import { t } from '@lingui/macro'; 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 { OrganizationsAPI } from 'api'; +import { Organization } from 'types'; +import { getQSConfig, parseQueryString } from 'util/qs'; +import useRequest from 'util/useRequest'; +import useAutoPopulateLookup from 'util/useAutoPopulateLookup'; import OptionsList from '../OptionsList'; import Lookup from './Lookup'; import LookupErrorMessage from './shared/LookupErrorMessage'; diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.test.jsx b/awx/ui_next/src/components/Lookup/OrganizationLookup.test.jsx index 873310120e..76309446fe 100644 --- a/awx/ui_next/src/components/Lookup/OrganizationLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { OrganizationsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; import OrganizationLookup, { _OrganizationLookup } from './OrganizationLookup'; -import { OrganizationsAPI } from '../../api'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx index 2774a86eaf..7e96fcc768 100644 --- a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx +++ b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx @@ -3,13 +3,13 @@ import { node, string, func, bool } from 'prop-types'; import { withRouter } from 'react-router-dom'; import { t } from '@lingui/macro'; import { FormGroup } from '@patternfly/react-core'; -import { ProjectsAPI } from '../../api'; -import { Project } from '../../types'; -import Popover from '../Popover'; +import { ProjectsAPI } from 'api'; +import { Project } from 'types'; +import useAutoPopulateLookup from 'util/useAutoPopulateLookup'; +import useRequest from 'util/useRequest'; +import { getQSConfig, parseQueryString } from 'util/qs'; import OptionsList from '../OptionsList'; -import useAutoPopulateLookup from '../../util/useAutoPopulateLookup'; -import useRequest from '../../util/useRequest'; -import { getQSConfig, parseQueryString } from '../../util/qs'; +import Popover from '../Popover'; import Lookup from './Lookup'; import LookupErrorMessage from './shared/LookupErrorMessage'; diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.test.jsx b/awx/ui_next/src/components/Lookup/ProjectLookup.test.jsx index 94430074f6..a714ef4c5c 100644 --- a/awx/ui_next/src/components/Lookup/ProjectLookup.test.jsx +++ b/awx/ui_next/src/components/Lookup/ProjectLookup.test.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { Formik } from 'formik'; +import { ProjectsAPI } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; -import { ProjectsAPI } from '../../api'; import ProjectLookup from './ProjectLookup'; jest.mock('../../api'); diff --git a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx index 6452992123..c1e3d54ad5 100644 --- a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx +++ b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { func, string } from 'prop-types'; import { t } from '@lingui/macro'; import { Select, SelectOption, SelectVariant } from '@patternfly/react-core'; -import { arrayToString, stringToArray } from '../../util/strings'; +import { arrayToString, stringToArray } from 'util/strings'; function TagMultiSelect({ onChange, value }) { const selections = stringToArray(value); diff --git a/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js b/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js index 1b4c46195d..6244e55c2a 100644 --- a/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js +++ b/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 'util/useIsMounted'; /* Hook for using PatternFly's