From 595cf192b7337130cf09d55e77fd0b597c61385c Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 19 Jul 2021 11:29:26 -0400 Subject: [PATCH] Fix relative imports python tools/fixrelative.py awx/ui_next/src npm --prefix=awx/ui_next run lint -- --fix npm --prefix=awx/ui_next run prettier --- awx/ui_next/src/App.jsx | 24 +++++------ awx/ui_next/src/App.test.jsx | 4 +- awx/ui_next/src/api/Base.js | 4 +- awx/ui_next/src/components/About/About.jsx | 2 +- .../AdHocCommands/AdHocCommands.jsx | 6 +-- .../AdHocCommands/AdHocCommands.test.jsx | 10 ++--- .../AdHocCommandsWizard.test.jsx | 2 +- .../AdHocCommands/AdHocCredentialStep.jsx | 8 ++-- .../AdHocCredentialStep.test.jsx | 2 +- .../AdHocCommands/AdHocDetailsStep.jsx | 4 +- .../AdHocCommands/AdHocDetailsStep.test.jsx | 2 +- .../AdHocExecutionEnironmentStep.test.jsx | 2 +- .../AdHocExecutionEnvironmentStep.jsx | 8 ++-- .../AddDropDownButton/AddDropDownButton.jsx | 2 +- .../components/AddRole/AddResourceRole.jsx | 2 +- .../AddRole/AddResourceRole.test.jsx | 2 +- .../components/AddRole/SelectResourceStep.jsx | 6 +-- .../components/AppContainer/AppContainer.jsx | 6 +-- .../AppContainer/AppContainer.test.jsx | 4 +- .../AppContainer/PageHeaderToolbar.jsx | 8 ++-- .../AppContainer/PageHeaderToolbar.test.jsx | 2 +- .../AppContainer/useWsPendingApprovalCount.js | 4 +- .../AssociateModal/AssociateModal.jsx | 6 +-- .../src/components/CodeEditor/CodeEditor.jsx | 2 +- .../components/CodeEditor/CodeEditor.test.jsx | 2 +- .../components/CodeEditor/VariablesDetail.jsx | 7 +--- .../components/CodeEditor/VariablesField.jsx | 2 +- .../components/CodeEditor/VariablesInput.jsx | 2 +- .../components/ContentError/ContentError.jsx | 2 +- .../src/components/CopyButton/CopyButton.jsx | 2 +- .../CredentialChip/CredentialChip.jsx | 4 +- .../DataListToolbar/DataListToolbar.jsx | 4 +- .../components/DeleteButton/DeleteButton.jsx | 2 +- .../DeleteButton/DeleteButton.test.jsx | 2 +- .../DetailList/NumberSinceDetail.jsx | 2 +- .../components/DetailList/UserDateDetail.jsx | 4 +- .../DisassociateButton/DisassociateButton.jsx | 2 +- .../ExecutionEnvironmentDetail.jsx | 6 +-- .../src/components/HostForm/HostForm.jsx | 2 +- .../src/components/HostToggle/HostToggle.jsx | 4 +- .../components/HostToggle/HostToggle.test.jsx | 2 +- .../InstanceToggle/InstanceToggle.jsx | 8 ++-- .../InstanceToggle/InstanceToggle.test.jsx | 2 +- .../JobCancelButton/JobCancelButton.jsx | 4 +- .../JobCancelButton/JobCancelButton.test.jsx | 2 +- .../src/components/JobList/JobList.jsx | 20 +++++----- .../src/components/JobList/JobList.test.jsx | 10 ++--- .../JobList/JobListCancelButton.jsx | 6 +-- .../src/components/JobList/JobListItem.jsx | 4 +- .../src/components/JobList/useWsJobs.js | 6 +-- .../components/LaunchButton/LaunchButton.jsx | 6 +-- .../LaunchButton/LaunchButton.test.jsx | 10 ++--- .../components/LaunchPrompt/LaunchPrompt.jsx | 8 ++-- .../LaunchPrompt/LaunchPrompt.test.jsx | 12 +++--- .../LaunchPrompt/steps/CredentialsStep.jsx | 6 +-- .../steps/CredentialsStep.test.jsx | 2 +- .../LaunchPrompt/steps/InventoryStep.jsx | 6 +-- .../LaunchPrompt/steps/InventoryStep.test.jsx | 2 +- .../LaunchPrompt/steps/PreviewStep.jsx | 6 +-- .../LaunchPrompt/steps/SurveyStep.jsx | 8 ++-- .../steps/useOtherPromptsStep.jsx | 2 +- .../src/components/ListHeader/ListHeader.jsx | 6 +-- .../components/Lookup/ApplicationLookup.jsx | 8 ++-- .../Lookup/ApplicationLookup.test.jsx | 2 +- .../components/Lookup/CredentialLookup.jsx | 10 ++--- .../Lookup/CredentialLookup.test.jsx | 2 +- .../Lookup/ExecutionEnvironmentLookup.jsx | 8 ++-- .../ExecutionEnvironmentLookup.test.jsx | 2 +- .../components/Lookup/HostFilterLookup.jsx | 6 +-- .../Lookup/InstanceGroupsLookup.jsx | 8 ++-- .../src/components/Lookup/InventoryLookup.jsx | 8 ++-- .../Lookup/InventoryLookup.test.jsx | 2 +- awx/ui_next/src/components/Lookup/Lookup.jsx | 4 +- .../src/components/Lookup/Lookup.test.jsx | 2 +- .../Lookup/MultiCredentialsLookup.jsx | 8 ++-- .../Lookup/MultiCredentialsLookup.test.jsx | 2 +- .../components/Lookup/OrganizationLookup.jsx | 10 ++--- .../Lookup/OrganizationLookup.test.jsx | 2 +- .../src/components/Lookup/ProjectLookup.jsx | 12 +++--- .../components/Lookup/ProjectLookup.test.jsx | 2 +- .../components/MultiSelect/TagMultiSelect.jsx | 2 +- .../MultiSelect/useSyncedSelectValue.js | 2 +- .../NotificationList/NotificationList.jsx | 6 +-- .../NotificationList.test.jsx | 2 +- .../components/OptionsList/OptionsList.jsx | 2 +- .../OptionsList/OptionsList.test.jsx | 2 +- .../components/PaginatedTable/HeaderRow.jsx | 2 +- .../PaginatedTable/PaginatedTable.jsx | 5 +-- .../PaginatedTable/ToolbarAddButton.jsx | 2 +- .../PaginatedTable/ToolbarDeleteButton.jsx | 4 +- .../ToolbarDeleteButton.test.jsx | 2 +- .../components/PromptDetail/PromptDetail.jsx | 2 +- .../PromptDetail/PromptJobTemplateDetail.jsx | 2 +- .../PromptDetail/PromptProjectDetail.jsx | 4 +- .../PromptWFJobTemplateDetail.jsx | 2 +- .../DeleteRoleConfirmationModal.jsx | 2 +- .../ResourceAccessList/ResourceAccessList.jsx | 6 +-- .../ResourceAccessList.test.jsx | 3 +- .../ResourceAccessListItem.jsx | 2 +- .../src/components/Schedule/Schedule.jsx | 4 +- .../src/components/Schedule/Schedule.test.jsx | 2 +- .../Schedule/ScheduleAdd/ScheduleAdd.jsx | 14 +++---- .../Schedule/ScheduleAdd/ScheduleAdd.test.jsx | 2 +- .../ScheduleDetail/ScheduleDetail.jsx | 14 +++---- .../ScheduleDetail/ScheduleDetail.test.jsx | 2 +- .../Schedule/ScheduleEdit/ScheduleEdit.jsx | 16 ++++---- .../ScheduleEdit/ScheduleEdit.test.jsx | 4 +- .../Schedule/ScheduleList/ScheduleList.jsx | 8 ++-- .../ScheduleList/ScheduleList.test.jsx | 2 +- .../ScheduleList/ScheduleListItem.jsx | 4 +- .../ScheduleOccurrences.jsx | 2 +- .../ScheduleToggle/ScheduleToggle.jsx | 4 +- .../ScheduleToggle/ScheduleToggle.test.jsx | 2 +- .../Schedule/shared/DateTimePicker.jsx | 2 +- .../shared/FrequencyDetailSubform.jsx | 2 +- .../Schedule/shared/ScheduleForm.jsx | 12 +++--- .../Schedule/shared/ScheduleForm.test.jsx | 4 +- .../shared/SchedulePromptableFields.jsx | 2 +- .../Schedule/shared/buildRuleObj.js | 2 +- .../src/components/Search/AdvancedSearch.jsx | 4 +- awx/ui_next/src/components/Search/Search.jsx | 4 +- awx/ui_next/src/components/Sort/Sort.jsx | 4 +- .../src/components/Sparkline/Sparkline.jsx | 4 +- .../components/TemplateList/TemplateList.jsx | 14 +++---- .../TemplateList/TemplateList.test.jsx | 2 +- .../TemplateList/TemplateListItem.jsx | 10 ++--- .../TemplateList/TemplateListItem.test.jsx | 2 +- .../UserAndTeamAccessAdd.jsx | 4 +- .../UserAndTeamAccessAdd.test.jsx | 2 +- .../getResourceAccessConfig.js | 2 +- .../components/Workflow/WorkflowLegend.jsx | 2 +- .../components/Workflow/WorkflowNodeHelp.jsx | 2 +- .../components/Workflow/WorkflowStartNode.jsx | 2 +- .../Workflow/WorkflowStartNode.test.jsx | 2 +- .../src/components/Workflow/WorkflowTools.jsx | 2 +- awx/ui_next/src/contexts/Config.jsx | 8 ++-- awx/ui_next/src/contexts/Session.jsx | 4 +- awx/ui_next/src/routeConfig.jsx | 40 +++++++++---------- .../screens/ActivityStream/ActivityStream.jsx | 14 +++---- .../ActivityStreamDetailButton.jsx | 6 +-- .../ActivityStream/ActivityStreamListItem.jsx | 4 +- .../Application/Application/Application.jsx | 8 ++-- .../Application/Application.test.jsx | 2 +- .../ApplicationAdd/ApplicationAdd.jsx | 8 ++-- .../ApplicationAdd/ApplicationAdd.test.jsx | 2 +- .../ApplicationDetails/ApplicationDetails.jsx | 18 ++++----- .../ApplicationDetails.test.jsx | 2 +- .../ApplicationEdit/ApplicationEdit.jsx | 4 +- .../ApplicationEdit/ApplicationEdit.test.jsx | 2 +- .../ApplicationTokenList.jsx | 16 ++++---- .../ApplicationTokenList.test.jsx | 2 +- .../ApplicationTokenListItem.jsx | 6 +-- .../src/screens/Application/Applications.jsx | 4 +- .../ApplicationsList/ApplicationList.test.jsx | 2 +- .../ApplicationsList/ApplicationListItem.jsx | 6 +-- .../ApplicationsList/ApplicationsList.jsx | 16 ++++---- .../Application/shared/ApplicationForm.jsx | 14 +++---- .../shared/ApplicationForm.test.jsx | 2 +- .../src/screens/Credential/Credential.jsx | 12 +++--- .../screens/Credential/Credential.test.jsx | 2 +- .../CredentialAdd/CredentialAdd.jsx | 10 ++--- .../CredentialAdd/CredentialAdd.test.jsx | 10 ++--- .../CredentialDetail/CredentialDetail.jsx | 32 +++++++-------- .../CredentialDetail.test.jsx | 2 +- .../CredentialEdit/CredentialEdit.jsx | 14 +++---- .../CredentialEdit/CredentialEdit.test.jsx | 12 +++--- .../CredentialList/CredentialList.jsx | 18 ++++----- .../CredentialList/CredentialList.test.jsx | 2 +- .../CredentialList/CredentialListItem.jsx | 10 ++--- .../CredentialListItem.test.jsx | 2 +- .../src/screens/Credential/Credentials.jsx | 4 +- .../Credential/shared/CredentialForm.jsx | 11 ++--- .../BecomeMethodField.jsx | 2 +- .../CredentialFormFields/CredentialField.jsx | 10 ++--- .../CredentialPluginField.jsx | 4 +- .../CredentialPluginPrompt.jsx | 4 +- .../CredentialPluginPrompt.test.jsx | 2 +- .../CredentialsStep.jsx | 14 +++---- .../CredentialPluginPrompt/MetadataStep.jsx | 18 ++++----- .../CredentialPluginSelected.jsx | 4 +- .../Credential/shared/ExternalTestModal.jsx | 14 +++---- .../shared/ExternalTestModal.test.jsx | 2 +- .../Credential/shared/TypeInputsSubForm.jsx | 6 +-- .../screens/CredentialType/CredentialType.jsx | 10 ++--- .../CredentialType/CredentialType.test.jsx | 2 +- .../CredentialTypeAdd/CredentialTypeAdd.jsx | 6 +-- .../CredentialTypeAdd.test.jsx | 2 +- .../CredentialTypeDetails.jsx | 24 +++++------ .../CredentialTypeDetails.test.jsx | 4 +- .../CredentialTypeEdit/CredentialTypeEdit.jsx | 6 +-- .../CredentialTypeEdit.test.jsx | 2 +- .../CredentialTypeList/CredentialTypeList.jsx | 18 ++++----- .../CredentialTypeList.test.jsx | 2 +- .../CredentialTypeListItem.jsx | 4 +- .../CredentialType/CredentialTypes.jsx | 2 +- .../shared/CredentialTypeForm.jsx | 15 +++---- .../src/screens/Dashboard/Dashboard.jsx | 12 +++--- .../src/screens/Dashboard/Dashboard.test.jsx | 2 +- .../src/screens/Dashboard/DashboardGraph.jsx | 6 +-- .../screens/Dashboard/DashboardGraph.test.jsx | 2 +- .../ExecutionEnvironment.jsx | 10 ++--- .../ExecutionEnvironmentAdd.jsx | 6 +-- .../ExecutionEnvironmentAdd.test.jsx | 2 +- .../ExecutionEnvironmentDetails.jsx | 20 ++++------ .../ExecutionEnvironmentDetails.test.jsx | 2 +- .../ExecutionEnvironmentEdit.jsx | 6 +-- .../ExecutionEnvironmentEdit.test.jsx | 2 +- .../ExecutionEnvironmentList.jsx | 18 ++++----- .../ExecutionEnvironmentList.test.jsx | 12 +++--- .../ExecutionEnvironmentListItem.jsx | 10 ++--- .../ExecutionEnvironmentListItem.test.jsx | 2 +- .../ExecutionEnvironmentTemplateList.jsx | 10 ++--- .../ExecutionEnvironmentTemplateList.test.jsx | 2 +- .../ExecutionEnvironments.jsx | 2 +- .../shared/ExecutionEnvironmentForm.jsx | 22 +++++----- .../shared/ExecutionEnvironmentForm.test.jsx | 2 +- awx/ui_next/src/screens/Host/Host.jsx | 12 +++--- awx/ui_next/src/screens/Host/Host.test.jsx | 2 +- .../src/screens/Host/HostAdd/HostAdd.jsx | 6 +-- .../src/screens/Host/HostAdd/HostAdd.test.jsx | 2 +- .../screens/Host/HostDetail/HostDetail.jsx | 24 +++++------ .../Host/HostDetail/HostDetail.test.jsx | 2 +- .../src/screens/Host/HostEdit/HostEdit.jsx | 6 +-- .../screens/Host/HostEdit/HostEdit.test.jsx | 2 +- .../src/screens/Host/HostFacts/HostFacts.jsx | 16 ++++---- .../screens/Host/HostFacts/HostFacts.test.jsx | 2 +- .../screens/Host/HostGroups/HostGroupItem.jsx | 4 +- .../Host/HostGroups/HostGroupsList.jsx | 20 +++++----- .../Host/HostGroups/HostGroupsList.test.jsx | 2 +- .../src/screens/Host/HostList/HostList.jsx | 20 ++++------ .../screens/Host/HostList/HostList.test.jsx | 2 +- .../screens/Host/HostList/HostListItem.jsx | 10 ++--- .../Host/HostList/SmartInventoryButton.jsx | 2 +- awx/ui_next/src/screens/Host/Hosts.jsx | 4 +- .../screens/InstanceGroup/ContainerGroup.jsx | 12 +++--- .../InstanceGroup/ContainerGroup.test.jsx | 2 +- .../ContainerGroupAdd/ContainerGroupAdd.jsx | 12 +++--- .../ContainerGroupAdd.test.jsx | 2 +- .../ContainerGroupDetails.jsx | 24 +++++------ .../ContainerGroupDetails.test.jsx | 2 +- .../ContainerGroupEdit/ContainerGroupEdit.jsx | 10 ++--- .../ContainerGroupEdit.test.jsx | 2 +- .../screens/InstanceGroup/InstanceGroup.jsx | 12 +++--- .../InstanceGroup/InstanceGroup.test.jsx | 2 +- .../InstanceGroupAdd/InstanceGroupAdd.jsx | 4 +- .../InstanceGroupAdd.test.jsx | 2 +- .../InstanceGroupDetails.jsx | 16 ++++---- .../InstanceGroupDetails.test.jsx | 3 +- .../InstanceGroupEdit/InstanceGroupEdit.jsx | 4 +- .../InstanceGroupEdit.test.jsx | 2 +- .../InstanceGroupList/InstanceGroupList.jsx | 20 +++++----- .../InstanceGroupList.test.jsx | 12 +++--- .../InstanceGroupListItem.jsx | 4 +- .../screens/InstanceGroup/InstanceGroups.jsx | 6 +-- .../InstanceGroup/Instances/InstanceList.jsx | 20 +++++----- .../Instances/InstanceList.test.jsx | 2 +- .../Instances/InstanceListItem.jsx | 18 ++++----- .../Instances/InstanceListItem.test.jsx | 4 +- .../shared/ContainerGroupForm.jsx | 14 +++---- .../shared/InstanceGroupForm.jsx | 8 ++-- .../src/screens/Inventory/Inventories.jsx | 4 +- .../src/screens/Inventory/Inventory.jsx | 12 +++--- .../src/screens/Inventory/Inventory.test.jsx | 2 +- .../Inventory/InventoryAdd/InventoryAdd.jsx | 4 +- .../InventoryAdd/InventoryAdd.test.jsx | 2 +- .../InventoryDetail/InventoryDetail.jsx | 30 ++++++-------- .../InventoryDetail/InventoryDetail.test.jsx | 2 +- .../Inventory/InventoryEdit/InventoryEdit.jsx | 8 ++-- .../InventoryEdit/InventoryEdit.test.jsx | 2 +- .../InventoryGroup/InventoryGroup.jsx | 9 ++--- .../InventoryGroup/InventoryGroup.test.jsx | 2 +- .../InventoryGroupAdd/InventoryGroupAdd.jsx | 2 +- .../InventoryGroupAdd.test.jsx | 2 +- .../InventoryGroupDetail.jsx | 14 +++---- .../InventoryGroupDetail.test.jsx | 2 +- .../InventoryGroupEdit/InventoryGroupEdit.jsx | 2 +- .../InventoryGroupEdit.test.jsx | 2 +- .../InventoryGroupHostAdd.jsx | 6 +-- .../InventoryGroupHostAdd.test.jsx | 2 +- .../InventoryGroupHostList.jsx | 24 +++++------ .../InventoryGroupHostList.test.jsx | 2 +- .../InventoryGroupHostListItem.jsx | 8 ++-- .../InventoryGroups/InventoryGroupItem.jsx | 4 +- .../InventoryGroups/InventoryGroupsList.jsx | 14 +++---- .../InventoryGroupsList.test.jsx | 2 +- .../Inventory/InventoryHost/InventoryHost.jsx | 12 +++--- .../InventoryHost/InventoryHost.test.jsx | 2 +- .../InventoryHostAdd/InventoryHostAdd.jsx | 6 +-- .../InventoryHostAdd.test.jsx | 2 +- .../InventoryHostDetail.jsx | 24 +++++------ .../InventoryHostDetail.test.jsx | 2 +- .../InventoryHostEdit/InventoryHostEdit.jsx | 6 +-- .../InventoryHostEdit.test.jsx | 2 +- .../InventoryHostFacts/InventoryHostFacts.jsx | 16 ++++---- .../InventoryHostFacts.test.jsx | 2 +- .../InventoryHostGroupItem.jsx | 4 +- .../InventoryHostGroups.test.jsx | 2 +- .../InventoryHostGroupsList.jsx | 22 +++++----- .../InventoryHostGroupsList.test.jsx | 2 +- .../InventoryHosts/InventoryHostItem.jsx | 6 +-- .../InventoryHosts/InventoryHostList.jsx | 18 ++++----- .../InventoryHosts/InventoryHostList.test.jsx | 2 +- .../Inventory/InventoryList/InventoryList.jsx | 20 +++++----- .../InventoryList/InventoryList.test.jsx | 6 +-- .../InventoryList/InventoryListItem.jsx | 12 +++--- .../InventoryList/InventoryListItem.test.jsx | 2 +- .../InventoryList/useWsInventories.js | 6 +-- .../InventoryRelatedGroupAdd.jsx | 2 +- .../InventoryRelatedGroupAdd.test.jsx | 2 +- .../InventoryRelatedGroupList.jsx | 24 +++++------ .../InventoryRelatedGroupList.test.jsx | 2 +- .../InventoryRelatedGroupListItem.jsx | 4 +- .../InventorySource/InventorySource.jsx | 18 ++++----- .../InventorySource/InventorySource.test.jsx | 2 +- .../InventorySourceAdd/InventorySourceAdd.jsx | 6 +-- .../InventorySourceAdd.test.jsx | 2 +- .../InventorySourceDetail.jsx | 32 +++++++-------- .../InventorySourceDetail.test.jsx | 10 ++--- .../InventorySourceEdit.jsx | 6 +-- .../InventorySourceEdit.test.jsx | 2 +- .../InventorySources/InventorySourceList.jsx | 18 ++++----- .../InventorySourceList.test.jsx | 2 +- .../InventorySourceListItem.jsx | 8 ++-- .../InventorySources/InventorySources.jsx | 2 +- .../InventorySources/useWsInventorySources.js | 2 +- .../src/screens/Inventory/SmartInventory.jsx | 14 +++---- .../screens/Inventory/SmartInventory.test.jsx | 2 +- .../SmartInventoryAdd/SmartInventoryAdd.jsx | 6 +-- .../SmartInventoryAdd.test.jsx | 6 +-- .../SmartInventoryDetail.jsx | 30 ++++++-------- .../SmartInventoryDetail.test.jsx | 2 +- .../SmartInventoryEdit/SmartInventoryEdit.jsx | 12 +++--- .../SmartInventoryEdit.test.jsx | 6 +-- .../SmartInventoryHost/SmartInventoryHost.jsx | 10 ++--- .../SmartInventoryHost.test.jsx | 2 +- .../SmartInventoryHostDetail.jsx | 14 +++---- .../SmartInventoryHostList.jsx | 16 ++++---- .../SmartInventoryHostList.test.jsx | 2 +- .../SmartInventoryHostListItem.jsx | 4 +- .../SmartInventoryHosts.jsx | 2 +- .../Inventory/shared/InventoryForm.jsx | 17 ++++---- .../Inventory/shared/InventoryGroupForm.jsx | 15 +++---- .../shared/InventoryGroupsDeleteModal.jsx | 10 ++--- .../InventoryGroupsDeleteModal.test.jsx | 2 +- .../Inventory/shared/InventorySourceForm.jsx | 23 +++++------ .../shared/InventorySourceForm.test.jsx | 2 +- .../InventorySourceSubForms/AzureSubForm.jsx | 8 ++-- .../AzureSubForm.test.jsx | 2 +- .../InventorySourceSubForms/EC2SubForm.jsx | 6 +-- .../EC2SubForm.test.jsx | 2 +- .../InventorySourceSubForms/GCESubForm.jsx | 8 ++-- .../GCESubForm.test.jsx | 2 +- .../InsightsSubForm.jsx | 8 ++-- .../InsightsSubForm.test.jsx | 2 +- .../OpenStackSubForm.jsx | 8 ++-- .../OpenStackSubForm.test.jsx | 2 +- .../InventorySourceSubForms/SCMSubForm.jsx | 12 +++--- .../SCMSubForm.test.jsx | 2 +- .../SatelliteSubForm.jsx | 8 ++-- .../SatelliteSubForm.test.jsx | 2 +- .../InventorySourceSubForms/SharedFields.jsx | 15 +++---- .../InventorySourceSubForms/TowerSubForm.jsx | 8 ++-- .../TowerSubForm.test.jsx | 2 +- .../InventorySourceSubForms/VMwareSubForm.jsx | 8 ++-- .../VMwareSubForm.test.jsx | 2 +- .../VirtualizationSubForm.jsx | 8 ++-- .../VirtualizationSubForm.test.jsx | 2 +- .../shared/InventorySourceSyncButton.jsx | 8 ++-- .../shared/InventorySourceSyncButton.test.jsx | 2 +- .../Inventory/shared/SmartInventoryForm.jsx | 31 +++++++------- .../shared/SmartInventoryForm.test.jsx | 6 +-- awx/ui_next/src/screens/Job/Job.jsx | 10 ++--- .../src/screens/Job/JobDetail/JobDetail.jsx | 37 ++++++++--------- .../screens/Job/JobDetail/JobDetail.test.jsx | 2 +- .../screens/Job/JobOutput/HostEventModal.jsx | 8 ++-- .../src/screens/Job/JobOutput/JobOutput.jsx | 36 ++++++++--------- .../screens/Job/JobOutput/JobOutput.test.jsx | 2 +- .../Job/JobOutput/shared/OutputToolbar.jsx | 11 ++--- .../src/screens/Job/JobTypeRedirect.jsx | 8 ++-- awx/ui_next/src/screens/Job/Jobs.jsx | 4 +- .../Job/WorkflowOutput/WorkflowOutput.jsx | 12 +++--- .../WorkflowOutput/WorkflowOutput.test.jsx | 2 +- .../WorkflowOutput/WorkflowOutputGraph.jsx | 10 ++--- .../WorkflowOutputGraph.test.jsx | 2 +- .../Job/WorkflowOutput/WorkflowOutputLink.jsx | 4 +- .../WorkflowOutputLink.test.jsx | 2 +- .../Job/WorkflowOutput/WorkflowOutputNode.jsx | 10 ++--- .../WorkflowOutputNode.test.jsx | 2 +- .../WorkflowOutput/WorkflowOutputToolbar.jsx | 4 +- .../WorkflowOutputToolbar.test.jsx | 2 +- .../Job/WorkflowOutput/useWsWorkflowOutput.js | 4 +- awx/ui_next/src/screens/Job/useWsJob.js | 4 +- awx/ui_next/src/screens/Login/Login.jsx | 10 ++--- awx/ui_next/src/screens/Login/Login.test.jsx | 2 +- .../screens/ManagementJob/ManagementJob.jsx | 16 ++++---- .../LaunchManagementPrompt.jsx | 2 +- .../ManagementJobList/ManagementJobList.jsx | 16 ++++---- .../ManagementJobList.test.jsx | 2 +- .../ManagementJobListItem.jsx | 8 ++-- .../screens/ManagementJob/ManagementJobs.jsx | 2 +- awx/ui_next/src/screens/Metrics/Metrics.jsx | 10 ++--- .../src/screens/Metrics/Metrics.test.jsx | 2 +- awx/ui_next/src/screens/NotFound.jsx | 2 +- .../NotificationTemplate.jsx | 10 ++--- .../NotificationTemplateAdd.jsx | 8 ++-- .../NotificationTemplateDetail.jsx | 16 ++++---- .../NotificationTemplateEdit.jsx | 4 +- .../NotificationTemplateList.jsx | 16 ++++---- .../NotificationTemplateList.test.jsx | 2 +- .../NotificationTemplateListItem.jsx | 16 ++++---- .../NotificationTemplateListItem.test.jsx | 2 +- .../NotificationTemplates.jsx | 2 +- .../shared/CustomMessagesSubForm.jsx | 11 ++--- .../shared/NotificationTemplateForm.jsx | 12 +++--- .../shared/TypeInputsSubForm.jsx | 12 +++--- .../src/screens/Organization/Organization.jsx | 12 +++--- .../Organization/Organization.test.jsx | 4 +- .../OrganizationAdd/OrganizationAdd.jsx | 10 ++--- .../OrganizationAdd/OrganizationAdd.test.jsx | 2 +- .../OrganizationDetail/OrganizationDetail.jsx | 32 +++++++-------- .../OrganizationDetail.test.jsx | 2 +- .../OrganizationEdit/OrganizationEdit.jsx | 4 +- .../OrganizationEdit.test.jsx | 2 +- .../OrganizationExecEnvList.jsx | 10 ++--- .../OrganizationExecEnvList.test.jsx | 2 +- .../OrganizationExecEnvListItem.jsx | 2 +- .../OrganizationList/OrganizationList.jsx | 18 ++++----- .../OrganizationList.test.jsx | 2 +- .../OrganizationList/OrganizationListItem.jsx | 4 +- .../OrganizationTeamList.jsx | 8 ++-- .../OrganizationTeamList.test.jsx | 2 +- .../OrganizationTeamListItem.jsx | 2 +- .../screens/Organization/Organizations.jsx | 4 +- .../Organization/shared/OrganizationForm.jsx | 20 +++++----- .../shared/OrganizationForm.test.jsx | 2 +- awx/ui_next/src/screens/Project/Project.jsx | 18 ++++----- .../src/screens/Project/Project.test.jsx | 4 +- .../screens/Project/ProjectAdd/ProjectAdd.jsx | 4 +- .../Project/ProjectAdd/ProjectAdd.test.jsx | 2 +- .../Project/ProjectDetail/ProjectDetail.jsx | 36 ++++++++--------- .../ProjectDetail/ProjectDetail.test.jsx | 10 ++--- .../Project/ProjectDetail/useWsProject.js | 4 +- .../ProjectDetail/useWsProject.test.jsx | 2 +- .../Project/ProjectEdit/ProjectEdit.jsx | 4 +- .../Project/ProjectEdit/ProjectEdit.test.jsx | 2 +- .../ProjectJobTemplatesList.jsx | 16 ++++---- .../ProjectJobTemplatesListItem.jsx | 8 ++-- .../Project/ProjectList/ProjectList.jsx | 20 +++++----- .../Project/ProjectList/ProjectList.test.jsx | 2 +- .../Project/ProjectList/ProjectListItem.jsx | 26 +++++------- .../ProjectList/ProjectListItem.test.jsx | 2 +- .../Project/ProjectList/useWsProjects.js | 2 +- awx/ui_next/src/screens/Project/Projects.jsx | 2 +- .../screens/Project/shared/ProjectForm.jsx | 25 +++++------- .../Project/shared/ProjectForm.test.jsx | 2 +- .../shared/ProjectSubForms/GitSubForm.jsx | 6 +-- .../ProjectSubForms/InsightsSubForm.jsx | 4 +- .../shared/ProjectSubForms/ManualSubForm.jsx | 10 ++--- .../shared/ProjectSubForms/SharedFields.jsx | 11 ++--- .../Project/shared/ProjectSyncButton.jsx | 8 ++-- .../Project/shared/ProjectSyncButton.test.jsx | 2 +- .../src/screens/Schedule/AllSchedules.jsx | 6 +-- .../src/screens/Setting/AzureAD/AzureAD.jsx | 2 +- .../screens/Setting/AzureAD/AzureAD.test.jsx | 4 +- .../AzureAD/AzureADDetail/AzureADDetail.jsx | 18 ++++----- .../AzureADDetail/AzureADDetail.test.jsx | 4 +- .../AzureAD/AzureADEdit/AzureADEdit.jsx | 18 ++++----- .../AzureAD/AzureADEdit/AzureADEdit.test.jsx | 4 +- .../src/screens/Setting/GitHub/GitHub.jsx | 2 +- .../screens/Setting/GitHub/GitHub.test.jsx | 4 +- .../GitHub/GitHubDetail/GitHubDetail.jsx | 18 ++++----- .../GitHub/GitHubDetail/GitHubDetail.test.jsx | 4 +- .../Setting/GitHub/GitHubEdit/GitHubEdit.jsx | 18 ++++----- .../GitHub/GitHubEdit/GitHubEdit.test.jsx | 4 +- .../GitHubEnterpriseEdit.jsx | 18 ++++----- .../GitHubEnterpriseEdit.test.jsx | 4 +- .../GitHubEnterpriseOrgEdit.jsx | 18 ++++----- .../GitHubEnterpriseOrgEdit.test.jsx | 4 +- .../GitHubEnterpriseTeamEdit.jsx | 18 ++++----- .../GitHubEnterpriseTeamEdit.test.jsx | 4 +- .../GitHub/GitHubOrgEdit/GitHubOrgEdit.jsx | 18 ++++----- .../GitHubOrgEdit/GitHubOrgEdit.test.jsx | 4 +- .../GitHub/GitHubTeamEdit/GitHubTeamEdit.jsx | 18 ++++----- .../GitHubTeamEdit/GitHubTeamEdit.test.jsx | 4 +- .../Setting/GoogleOAuth2/GoogleOAuth2.jsx | 2 +- .../GoogleOAuth2/GoogleOAuth2.test.jsx | 4 +- .../GoogleOAuth2Detail/GoogleOAuth2Detail.jsx | 18 ++++----- .../GoogleOAuth2Detail.test.jsx | 4 +- .../GoogleOAuth2Edit/GoogleOAuth2Edit.jsx | 18 ++++----- .../GoogleOAuth2Edit.test.jsx | 4 +- awx/ui_next/src/screens/Setting/Jobs/Jobs.jsx | 2 +- .../src/screens/Setting/Jobs/Jobs.test.jsx | 2 +- .../Setting/Jobs/JobsDetail/JobsDetail.jsx | 18 ++++----- .../Jobs/JobsDetail/JobsDetail.test.jsx | 4 +- .../Setting/Jobs/JobsEdit/JobsEdit.jsx | 20 +++++----- .../Setting/Jobs/JobsEdit/JobsEdit.test.jsx | 4 +- awx/ui_next/src/screens/Setting/LDAP/LDAP.jsx | 2 +- .../src/screens/Setting/LDAP/LDAP.test.jsx | 4 +- .../Setting/LDAP/LDAPDetail/LDAPDetail.jsx | 18 ++++----- .../LDAP/LDAPDetail/LDAPDetail.test.jsx | 4 +- .../Setting/LDAP/LDAPEdit/LDAPEdit.jsx | 21 +++++----- .../Setting/LDAP/LDAPEdit/LDAPEdit.test.jsx | 4 +- .../src/screens/Setting/Logging/Logging.jsx | 4 +- .../screens/Setting/Logging/Logging.test.jsx | 2 +- .../Logging/LoggingDetail/LoggingDetail.jsx | 18 ++++----- .../LoggingDetail/LoggingDetail.test.jsx | 4 +- .../Logging/LoggingEdit/LoggingEdit.jsx | 20 +++++----- .../Logging/LoggingEdit/LoggingEdit.test.jsx | 4 +- .../MiscAuthentication/MiscAuthentication.jsx | 4 +- .../MiscAuthentication.test.jsx | 2 +- .../MiscAuthenticationDetail.jsx | 18 ++++----- .../MiscAuthenticationDetail.test.jsx | 4 +- .../MiscAuthenticationEdit.jsx | 20 +++++----- .../MiscAuthenticationEdit.test.jsx | 4 +- .../screens/Setting/MiscSystem/MiscSystem.jsx | 4 +- .../Setting/MiscSystem/MiscSystem.test.jsx | 2 +- .../MiscSystemDetail/MiscSystemDetail.jsx | 18 ++++----- .../MiscSystemDetail.test.jsx | 4 +- .../MiscSystemEdit/MiscSystemEdit.jsx | 20 +++++----- .../MiscSystemEdit/MiscSystemEdit.test.jsx | 4 +- .../src/screens/Setting/RADIUS/RADIUS.jsx | 2 +- .../screens/Setting/RADIUS/RADIUS.test.jsx | 4 +- .../RADIUS/RADIUSDetail/RADIUSDetail.jsx | 18 ++++----- .../RADIUS/RADIUSDetail/RADIUSDetail.test.jsx | 4 +- .../Setting/RADIUS/RADIUSEdit/RADIUSEdit.jsx | 20 +++++----- .../RADIUS/RADIUSEdit/RADIUSEdit.test.jsx | 4 +- awx/ui_next/src/screens/Setting/SAML/SAML.jsx | 2 +- .../src/screens/Setting/SAML/SAML.test.jsx | 4 +- .../Setting/SAML/SAMLDetail/SAMLDetail.jsx | 18 ++++----- .../SAML/SAMLDetail/SAMLDetail.test.jsx | 4 +- .../Setting/SAML/SAMLEdit/SAMLEdit.jsx | 18 ++++----- .../Setting/SAML/SAMLEdit/SAMLEdit.test.jsx | 4 +- .../src/screens/Setting/SettingList.jsx | 6 +-- awx/ui_next/src/screens/Setting/Settings.jsx | 14 +++---- .../src/screens/Setting/Settings.test.jsx | 2 +- .../Setting/Subscription/Subscription.jsx | 2 +- .../Subscription/Subscription.test.jsx | 2 +- .../SubscriptionDetail/SubscriptionDetail.jsx | 14 +++---- .../SubscriptionEdit/AnalyticsStep.jsx | 11 ++--- .../SubscriptionEdit/EulaStep.jsx | 2 +- .../SubscriptionEdit/SubscriptionEdit.jsx | 12 +++--- .../SubscriptionEdit.test.jsx | 8 +--- .../SubscriptionEdit/SubscriptionModal.jsx | 14 +++---- .../SubscriptionModal.test.jsx | 2 +- .../SubscriptionEdit/SubscriptionStep.jsx | 10 ++--- .../src/screens/Setting/TACACS/TACACS.jsx | 2 +- .../screens/Setting/TACACS/TACACS.test.jsx | 4 +- .../TACACS/TACACSDetail/TACACSDetail.jsx | 18 ++++----- .../TACACS/TACACSDetail/TACACSDetail.test.jsx | 4 +- .../Setting/TACACS/TACACSEdit/TACACSEdit.jsx | 20 +++++----- .../TACACS/TACACSEdit/TACACSEdit.test.jsx | 4 +- awx/ui_next/src/screens/Setting/UI/UI.jsx | 2 +- .../src/screens/Setting/UI/UI.test.jsx | 4 +- .../screens/Setting/UI/UIDetail/UIDetail.jsx | 18 ++++----- .../Setting/UI/UIDetail/UIDetail.test.jsx | 4 +- .../src/screens/Setting/UI/UIEdit/UIEdit.jsx | 22 +++++----- .../screens/Setting/UI/UIEdit/UIEdit.test.jsx | 4 +- .../screens/Setting/shared/RevertAllAlert.jsx | 2 +- .../Setting/shared/RevertFormActionGroup.jsx | 2 +- .../screens/Setting/shared/SettingDetail.jsx | 4 +- .../screens/Setting/shared/SharedFields.jsx | 20 ++++------ .../screens/Setting/shared/settingUtils.js | 2 +- awx/ui_next/src/screens/Team/Team.jsx | 10 ++--- awx/ui_next/src/screens/Team/Team.test.jsx | 2 +- .../src/screens/Team/TeamAdd/TeamAdd.jsx | 6 +-- .../src/screens/Team/TeamAdd/TeamAdd.test.jsx | 2 +- .../screens/Team/TeamDetail/TeamDetail.jsx | 16 ++++---- .../Team/TeamDetail/TeamDetail.test.jsx | 2 +- .../src/screens/Team/TeamEdit/TeamEdit.jsx | 6 +-- .../screens/Team/TeamEdit/TeamEdit.test.jsx | 2 +- .../src/screens/Team/TeamList/TeamList.jsx | 16 ++++---- .../screens/Team/TeamList/TeamList.test.jsx | 2 +- .../screens/Team/TeamList/TeamListItem.jsx | 4 +- .../screens/Team/TeamRoles/TeamRolesList.jsx | 16 ++++---- .../Team/TeamRoles/TeamRolesList.test.jsx | 2 +- awx/ui_next/src/screens/Team/Teams.jsx | 4 +- .../src/screens/Team/shared/TeamForm.jsx | 10 ++--- .../JobTemplateAdd/JobTemplateAdd.jsx | 4 +- .../JobTemplateAdd/JobTemplateAdd.test.jsx | 12 +++--- .../JobTemplateDetail/JobTemplateDetail.jsx | 30 +++++++------- .../JobTemplateDetail.test.jsx | 2 +- .../JobTemplateEdit/JobTemplateEdit.jsx | 12 +++--- .../JobTemplateEdit/JobTemplateEdit.test.jsx | 12 +++--- .../Template/Survey/MultipleChoiceField.jsx | 2 +- .../screens/Template/Survey/SurveyList.jsx | 8 ++-- .../Template/Survey/SurveyList.test.jsx | 2 +- .../Template/Survey/SurveyListItem.jsx | 2 +- .../Template/Survey/SurveyPreviewModal.jsx | 2 +- .../Template/Survey/SurveyQuestionAdd.jsx | 2 +- .../Template/Survey/SurveyQuestionEdit.jsx | 4 +- .../Template/Survey/SurveyQuestionForm.jsx | 16 ++++---- .../screens/Template/Survey/SurveyToolbar.jsx | 2 +- awx/ui_next/src/screens/Template/Template.jsx | 18 ++++----- .../src/screens/Template/Template.test.jsx | 2 +- .../src/screens/Template/TemplateSurvey.jsx | 10 ++--- .../screens/Template/TemplateSurvey.test.jsx | 2 +- .../src/screens/Template/Templates.jsx | 4 +- .../screens/Template/WorkflowJobTemplate.jsx | 24 +++++------ .../Template/WorkflowJobTemplate.test.jsx | 2 +- .../WorkflowJobTemplateAdd.jsx | 16 +++----- .../WorkflowJobTemplateAdd.test.jsx | 2 +- .../WorkflowJobTemplateDetail.jsx | 30 ++++++-------- .../WorkflowJobTemplateDetail.test.jsx | 2 +- .../WorkflowJobTemplateEdit.jsx | 18 ++++----- .../WorkflowJobTemplateEdit.test.jsx | 4 +- .../Modals/DeleteAllNodesModal.jsx | 4 +- .../Modals/DeleteAllNodesModal.test.jsx | 2 +- .../Modals/LinkModals/LinkAddModal.jsx | 2 +- .../Modals/LinkModals/LinkAddModal.test.jsx | 4 +- .../Modals/LinkModals/LinkDeleteModal.jsx | 4 +- .../LinkModals/LinkDeleteModal.test.jsx | 2 +- .../Modals/LinkModals/LinkEditModal.jsx | 2 +- .../Modals/LinkModals/LinkEditModal.test.jsx | 4 +- .../Modals/LinkModals/LinkModal.jsx | 4 +- .../Modals/LinkModals/LinkModal.test.jsx | 4 +- .../Modals/NodeModals/NodeAddModal.jsx | 4 +- .../Modals/NodeModals/NodeAddModal.test.jsx | 8 ++-- .../Modals/NodeModals/NodeDeleteModal.jsx | 4 +- .../NodeModals/NodeDeleteModal.test.jsx | 2 +- .../Modals/NodeModals/NodeEditModal.jsx | 2 +- .../Modals/NodeModals/NodeEditModal.test.jsx | 8 ++-- .../Modals/NodeModals/NodeModal.jsx | 22 +++++----- .../Modals/NodeModals/NodeModal.test.jsx | 12 +++--- .../NodeTypeStep/InventorySourcesList.jsx | 12 +++--- .../InventorySourcesList.test.jsx | 2 +- .../NodeTypeStep/JobTemplatesList.jsx | 12 +++--- .../NodeTypeStep/JobTemplatesList.test.jsx | 2 +- .../NodeModals/NodeTypeStep/NodeTypeStep.jsx | 17 ++++---- .../NodeTypeStep/NodeTypeStep.test.jsx | 4 +- .../NodeModals/NodeTypeStep/ProjectsList.jsx | 12 +++--- .../NodeTypeStep/ProjectsList.test.jsx | 2 +- .../NodeTypeStep/WorkflowJobTemplatesList.jsx | 12 +++--- .../WorkflowJobTemplatesList.test.jsx | 2 +- .../NodeTypeStep/useNodeTypeStep.jsx | 2 +- .../Modals/NodeModals/NodeViewModal.jsx | 14 +++---- .../Modals/NodeModals/NodeViewModal.test.jsx | 4 +- .../Modals/NodeModals/RunStep.jsx | 2 +- .../Modals/NodeModals/useRunTypeStep.jsx | 2 +- .../Modals/NodeModals/useWorkflowNodeSteps.js | 14 +++---- .../Modals/UnsavedChangesModal.jsx | 2 +- .../Modals/UnsavedChangesModal.test.jsx | 2 +- .../Visualizer.jsx | 28 ++++++------- .../Visualizer.test.jsx | 11 ++--- .../VisualizerGraph.jsx | 6 +-- .../VisualizerGraph.test.jsx | 2 +- .../VisualizerLink.jsx | 6 +-- .../VisualizerLink.test.jsx | 2 +- .../VisualizerNode.jsx | 12 +++--- .../VisualizerNode.test.jsx | 4 +- .../VisualizerStartScreen.jsx | 2 +- .../VisualizerStartScreen.test.jsx | 2 +- .../VisualizerToolbar.jsx | 8 ++-- .../VisualizerToolbar.test.jsx | 2 +- .../WorkflowJobTemplateVisualizerUtils.js | 2 +- .../Template/shared/JobTemplateForm.jsx | 34 ++++++++-------- .../Template/shared/JobTemplateForm.test.jsx | 14 +++---- .../screens/Template/shared/LabelSelect.jsx | 6 +-- .../Template/shared/LabelSelect.test.jsx | 2 +- .../Template/shared/PlaybookSelect.jsx | 4 +- .../Template/shared/PlaybookSelect.test.jsx | 2 +- .../Template/shared/WebhookSubForm.jsx | 16 ++++---- .../Template/shared/WebhookSubForm.test.jsx | 2 +- .../shared/WorkflowJobTemplateForm.jsx | 24 +++++------ .../shared/WorkflowJobTemplateForm.test.jsx | 10 ++--- awx/ui_next/src/screens/User/User.jsx | 8 ++-- awx/ui_next/src/screens/User/User.test.jsx | 2 +- .../src/screens/User/UserAdd/UserAdd.jsx | 4 +- .../src/screens/User/UserAdd/UserAdd.test.jsx | 2 +- .../screens/User/UserDetail/UserDetail.jsx | 16 ++++---- .../User/UserDetail/UserDetail.test.jsx | 2 +- .../src/screens/User/UserEdit/UserEdit.jsx | 4 +- .../screens/User/UserEdit/UserEdit.test.jsx | 2 +- .../src/screens/User/UserList/UserList.jsx | 16 ++++---- .../screens/User/UserList/UserList.test.jsx | 2 +- .../screens/User/UserList/UserListItem.jsx | 4 +- .../UserOrganizationList.jsx | 8 ++-- .../UserOrganizationList.test.jsx | 2 +- .../screens/User/UserRoles/UserRolesList.jsx | 16 ++++---- .../User/UserRoles/UserRolesList.test.jsx | 2 +- .../screens/User/UserTeams/UserTeamList.jsx | 20 +++++----- .../User/UserTeams/UserTeamList.test.jsx | 2 +- .../User/UserTeams/UserTeamListItem.jsx | 2 +- .../src/screens/User/UserToken/UserToken.jsx | 8 ++-- .../screens/User/UserToken/UserToken.test.jsx | 2 +- .../User/UserTokenAdd/UserTokenAdd.jsx | 6 +-- .../User/UserTokenAdd/UserTokenAdd.test.jsx | 2 +- .../User/UserTokenDetail/UserTokenDetail.jsx | 22 +++++----- .../UserTokenDetail/UserTokenDetail.test.jsx | 2 +- .../User/UserTokenList/UserTokenList.jsx | 16 ++++---- .../User/UserTokenList/UserTokenList.test.jsx | 2 +- .../User/UserTokenList/UserTokenListItem.jsx | 4 +- .../screens/User/UserTokens/UserTokens.jsx | 4 +- awx/ui_next/src/screens/User/Users.jsx | 4 +- .../src/screens/User/shared/UserForm.jsx | 14 +++---- .../src/screens/User/shared/UserForm.test.jsx | 2 +- .../src/screens/User/shared/UserTokenForm.jsx | 14 +++---- .../User/shared/UserTokenForm.test.jsx | 2 +- .../WorkflowApproval/WorkflowApproval.jsx | 8 ++-- .../WorkflowApproval.test.jsx | 2 +- .../WorkflowApprovalDetail.jsx | 22 +++++----- .../WorkflowApprovalDetail.test.jsx | 4 +- .../WorkflowApprovalList.jsx | 18 ++++----- .../WorkflowApprovalList.test.jsx | 2 +- .../WorkflowApprovalListApproveButton.jsx | 4 +- .../WorkflowApprovalListDenyButton.jsx | 4 +- .../WorkflowApprovalListItem.jsx | 4 +- .../useWsWorkflowApprovals.js | 4 +- .../WorkflowApproval/WorkflowApprovals.jsx | 2 +- .../WorkflowApprovals.test.jsx | 2 +- .../shared/WorkflowApprovalStatus.jsx | 4 +- .../shared/WorkflowApprovalStatus.test.jsx | 2 +- .../getRelatedResouceDeleteDetails.test.js | 10 ++--- .../util/getRelatedResourceDeleteDetails.js | 2 +- awx/ui_next/src/util/issuePendoIdentity.js | 2 +- awx/ui_next/src/util/jobs.js | 2 +- awx/ui_next/src/util/useBrandName.js | 2 +- 716 files changed, 2488 insertions(+), 2673 deletions(-) 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