From 826b03b78e656fc394a862f26d7bf26ab1bc40b1 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 10 Jun 2020 13:23:26 -0400 Subject: [PATCH] make prettier adjustments to things the pf v4 codemod tool broke --- .../src/components/AlertModal/AlertModal.jsx | 4 +++- .../AnsibleSelect/AnsibleSelect.jsx | 2 +- .../AssociateModal/AssociateModal.jsx | 1 - .../components/ContentEmpty/ContentEmpty.jsx | 4 +++- .../DataListToolbar/DataListToolbar.jsx | 2 +- .../src/components/FormField/FormField.jsx | 8 +++---- .../components/FormField/PasswordField.jsx | 2 +- .../components/FormField/PasswordInput.jsx | 2 +- .../src/components/HostForm/HostForm.jsx | 4 +++- .../LaunchPrompt/steps/OtherPromptsStep.jsx | 4 ++-- .../LaunchPrompt/steps/SurveyStep.jsx | 4 ++-- .../src/components/ListHeader/ListHeader.jsx | 5 +---- .../components/Lookup/CredentialLookup.jsx | 2 +- awx/ui_next/src/components/Lookup/Lookup.jsx | 7 +----- .../components/Lookup/OrganizationLookup.jsx | 2 +- .../src/components/Lookup/ProjectLookup.jsx | 2 +- .../components/PromptDetail/PromptDetail.jsx | 8 ++----- .../PromptInventorySourceDetail.jsx | 12 +++------- .../PromptDetail/PromptJobTemplateDetail.jsx | 16 ++++---------- .../PromptWFJobTemplateDetail.jsx | 4 +--- .../ResourceAccessListItem.jsx | 1 - .../ScheduleDetail/ScheduleDetail.jsx | 8 ++----- .../shared/FrequencyDetailSubform.jsx | 22 ++++++++++++++----- .../Schedule/shared/ScheduleForm.jsx | 18 +++++++++++---- .../src/components/Search/Search.test.jsx | 5 +---- .../components/SelectedList/SelectedList.jsx | 2 +- .../src/screens/AuthSetting/AuthSettings.jsx | 4 +++- .../Credential/shared/CredentialForm.jsx | 4 +++- .../CredentialPluginField.jsx | 2 +- .../GoogleComputeEngineSubForm.jsx | 2 +- .../src/screens/Dashboard/Dashboard.jsx | 4 +++- .../screens/InstanceGroup/InstanceGroups.jsx | 4 +++- .../InventoryDetail/InventoryDetail.jsx | 4 +--- .../InventoryGroupsList.test.jsx | 8 ++----- .../InventorySourceDetail.jsx | 12 +++------- .../Inventory/shared/InventorySourceForm.jsx | 8 +++++-- .../InventorySourceSubForms/SCMSubForm.jsx | 8 +++++-- .../InventorySourceSubForms/SharedFields.jsx | 2 +- .../InventoryScript/InventoryScripts.jsx | 4 +++- .../src/screens/Job/JobDetail/JobDetail.jsx | 4 +--- .../screens/Job/JobOutput/HostEventModal.jsx | 9 ++++++-- .../src/screens/JobsSetting/JobsSettings.jsx | 4 +++- awx/ui_next/src/screens/License/License.jsx | 4 +++- .../screens/ManagementJob/ManagementJobs.jsx | 4 +++- .../NotificationTemplates.jsx | 4 +++- .../OrganizationDetail/OrganizationDetail.jsx | 4 +--- awx/ui_next/src/screens/Portal/Portal.jsx | 4 +++- .../screens/Project/shared/ProjectForm.jsx | 8 +++++-- .../shared/ProjectSubForms/ManualSubForm.jsx | 2 +- .../shared/ProjectSubForms/SharedFields.jsx | 4 +++- .../screens/SystemSetting/SystemSettings.jsx | 4 +++- .../Team/TeamAccess/TeamAccessListItem.jsx | 1 - .../JobTemplateDetail/JobTemplateDetail.jsx | 16 ++++---------- .../Template/Survey/SurveyListItem.jsx | 4 +--- .../WorkflowJobTemplateDetail.jsx | 4 +--- .../Modals/LinkModals/LinkModal.jsx | 1 - .../NodeModals/NodeTypeStep/NodeTypeStep.jsx | 4 ++-- .../Modals/NodeModals/NodeViewModal.jsx | 1 - .../Modals/UnsavedChangesModal.jsx | 1 - .../VisualizerToolbar.jsx | 6 ++++- .../Template/shared/JobTemplateForm.jsx | 8 +++++-- .../src/screens/UISetting/UISettings.jsx | 4 +++- .../User/UserAccess/UserAccessListItem.jsx | 1 - .../src/screens/User/shared/UserForm.jsx | 4 +++- 64 files changed, 169 insertions(+), 158 deletions(-) diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx index 70ed49ab1f..c139c9ea40 100644 --- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx +++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx @@ -63,7 +63,9 @@ function AlertModal({ const customHeader = (
{variant ? variantIcons[variant] : null} - {title} + + {title} +
); diff --git a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx index 69fd9e40bf..4f49268c0a 100644 --- a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx +++ b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx @@ -43,7 +43,7 @@ class AnsibleSelect extends React.Component { onChange={this.onSelectChange} onBlur={onBlur} aria-label={i18n._(t`Select Input`)} - validated={(isValid) ? 'default' : 'error'} + validated={isValid ? 'default' : 'error'} className={className} isDisabled={isDisabled} > diff --git a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx index 94fe8330bb..f084f7e719 100644 --- a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx +++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx @@ -74,7 +74,6 @@ function AssociateModal({ return ( ( - {title || i18n._(t`No items found.`)} + + {title || i18n._(t`No items found.`)} + {message} ); diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx index 4f804ba966..6fdffcfc41 100644 --- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx +++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx @@ -9,7 +9,7 @@ import { ToolbarGroup as _ToolbarGroup, ToolbarItem, ToolbarToggleGroup, - } from '@patternfly/react-core'; +} from '@patternfly/react-core'; import { SearchIcon } from '@patternfly/react-icons'; import ExpandCollapse from '../ExpandCollapse'; import Search from '../Search'; diff --git a/awx/ui_next/src/components/FormField/FormField.jsx b/awx/ui_next/src/components/FormField/FormField.jsx index c9ce488044..0efa21887a 100644 --- a/awx/ui_next/src/components/FormField/FormField.jsx +++ b/awx/ui_next/src/components/FormField/FormField.jsx @@ -29,14 +29,14 @@ function FormField(props) { helperText={helperText} helperTextInvalid={meta.error} isRequired={isRequired} - validated={(isValid) ? 'default' : 'error'} + validated={isValid ? 'default' : 'error'} label={label} >