From e49a99e0f602ab6b88ecf96ee48c01d180e6f518 Mon Sep 17 00:00:00 2001
From: John Mitchell <jmitchel@Johns-MacBook-Pro-46.local>
Date: Wed, 10 Jun 2020 11:20:07 -0400
Subject: [PATCH] after running pf code mod tool to auto update files to
 conform to v4 and a few manual tweaks

---
 .../src/components/AlertModal/AlertModal.jsx  |   4 +-
 .../AnsibleSelect/AnsibleSelect.jsx           |   2 +-
 .../AssociateModal/AssociateModal.jsx         |   4 +-
 .../CodeMirrorInput/VariablesDetail.jsx       |   2 +-
 .../CodeMirrorInput/VariablesField.jsx        |   2 +-
 .../CodeMirrorInput/VariablesInput.jsx        |   2 +-
 .../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      |   2 +-
 .../LaunchPrompt/steps/OtherPromptsStep.jsx   |   4 +-
 .../LaunchPrompt/steps/SurveyStep.jsx         |   6 +-
 .../components/Lookup/CredentialLookup.jsx    |   2 +-
 awx/ui_next/src/components/Lookup/Lookup.jsx  |   6 +-
 .../components/Lookup/OrganizationLookup.jsx  |   2 +-
 .../src/components/Lookup/ProjectLookup.jsx   |   2 +-
 .../components/MultiSelect/TagMultiSelect.jsx |   4 +-
 .../components/PromptDetail/PromptDetail.jsx  |   4 +-
 .../PromptInventorySourceDetail.jsx           |   6 +-
 .../PromptDetail/PromptJobTemplateDetail.jsx  |   8 +-
 .../PromptWFJobTemplateDetail.jsx             |   2 +-
 .../ResourceAccessListItem.jsx                |   2 +-
 .../src/components/RoutedTabs/RoutedTabs.jsx  |   4 +-
 .../ScheduleDetail/ScheduleDetail.jsx         |   4 +-
 .../ScheduleOccurrences.jsx                   |   2 +-
 .../shared/FrequencyDetailSubform.jsx         |  10 +-
 .../Schedule/shared/ScheduleForm.jsx          |   6 +-
 awx/ui_next/src/components/Search/Search.jsx  |   4 +-
 .../components/SelectedList/SelectedList.jsx  |   2 +-
 .../Credential/shared/CredentialForm.jsx      |   2 +-
 .../CredentialPluginField.jsx                 | 103 +++++++++++++
 .../GoogleComputeEngineSubForm.jsx            | 136 ++++++++++++++++++
 .../InventoryDetail/InventoryDetail.jsx       |   2 +-
 .../InventorySourceDetail.jsx                 |   6 +-
 .../Inventory/shared/InventorySourceForm.jsx  |   2 +-
 .../InventorySourceSubForms/SCMSubForm.jsx    |   6 +-
 .../InventorySourceSubForms/SharedFields.jsx  |   2 +-
 .../src/screens/Job/JobDetail/JobDetail.jsx   |   2 +-
 .../screens/Job/JobOutput/HostEventModal.jsx  |  10 +-
 .../OrganizationDetail/OrganizationDetail.jsx |   2 +-
 .../screens/Project/shared/ProjectForm.jsx    |   2 +-
 .../shared/ProjectSubForms/ManualSubForm.jsx  |   2 +-
 .../Team/TeamAccess/TeamAccessListItem.jsx    |   4 +-
 .../JobTemplateDetail/JobTemplateDetail.jsx   |   8 +-
 .../Template/Survey/SurveyListItem.jsx        |   2 +-
 .../Template/Survey/SurveyPreviewModal.jsx    |   4 +-
 .../WorkflowJobTemplateDetail.jsx             |   2 +-
 .../Modals/LinkModals/LinkAddModal.jsx        |   4 +-
 .../Modals/LinkModals/LinkEditModal.jsx       |   4 +-
 .../Modals/LinkModals/LinkModal.jsx           |   2 +-
 .../NodeModals/NodeTypeStep/NodeTypeStep.jsx  |   4 +-
 .../Modals/NodeModals/NodeViewModal.jsx       |   4 +-
 .../Modals/UnsavedChangesModal.jsx            |   2 +-
 .../VisualizerToolbar.jsx                     |   2 +-
 .../Template/shared/JobTemplateForm.jsx       |   4 +-
 .../screens/Template/shared/LabelSelect.jsx   |   4 +-
 .../User/UserAccess/UserAccessListItem.jsx    |   4 +-
 .../src/screens/User/shared/UserForm.jsx      |   2 +-
 59 files changed, 339 insertions(+), 106 deletions(-)
 create mode 100644 awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
 create mode 100644 awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx

diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx
index b18b3e3285..2c6c9eaed9 100644
--- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx
+++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx
@@ -67,9 +67,9 @@ export default function AlertModal({
   return (
     <Modal
       header={customHeader}
-      isFooterLeftAligned
+      
       isOpen={Boolean(isOpen)}
-      isSmall
+      variant="small"
       title={title}
       {...props}
     >
diff --git a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
index bd348998d1..69fd9e40bf 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`)}
-        isValid={isValid}
+        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 86aa534f12..94fe8330bb 100644
--- a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx
+++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx
@@ -74,8 +74,8 @@ function AssociateModal({
   return (
     <Fragment>
       <Modal
-        isFooterLeftAligned
-        isLarge
+        
+        variant="large"
         title={title}
         isOpen={isModalOpen}
         onClose={handleClose}
diff --git a/awx/ui_next/src/components/CodeMirrorInput/VariablesDetail.jsx b/awx/ui_next/src/components/CodeMirrorInput/VariablesDetail.jsx
index 2db4da49bd..7fbcd63cfa 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/VariablesDetail.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/VariablesDetail.jsx
@@ -39,7 +39,7 @@ function VariablesDetail({ value, label, rows, fullHeight }) {
         fullWidth
         css="grid-column: 1 / -1"
       >
-        <Split gutter="sm">
+        <Split hasGutter>
           <SplitItem>
             <div className="pf-c-form__label">
               <span
diff --git a/awx/ui_next/src/components/CodeMirrorInput/VariablesField.jsx b/awx/ui_next/src/components/CodeMirrorInput/VariablesField.jsx
index 72b4e57f17..f39d413fac 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/VariablesField.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/VariablesField.jsx
@@ -35,7 +35,7 @@ function VariablesField({
   return (
     <div className="pf-c-form__group">
       <FieldHeader>
-        <Split gutter="sm">
+        <Split hasGutter>
           <SplitItem>
             <label htmlFor={id} className="pf-c-form__label">
               <span className="pf-c-form__label-text">{label}</span>
diff --git a/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx b/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx
index 4b2deab789..5f3886e20b 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx
@@ -35,7 +35,7 @@ function VariablesInput(props) {
 
   return (
     <div className={`pf-c-form__group ${className || ''}`}>
-      <Split gutter="sm">
+      <Split hasGutter>
         <SplitItem>
           <label htmlFor={id} className="pf-c-form__label">
             {label}
diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx
index 01dbf2fccd..76e2652a8b 100644
--- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx
@@ -67,7 +67,7 @@ class DataListToolbar extends React.Component {
               </ToolbarItem>
             </ToolbarGroup>
           )}
-          <ToolbarToggleGroup toggleIcon={<SearchIcon />} breakpoint="lg">
+          <ToolbarToggleGroup toggleIcon={<SearchIcon />} show={{ lg: 'show' }}>
             <ToolbarItem>
               <Search
                 qsConfig={qsConfig}
diff --git a/awx/ui_next/src/components/FormField/FormField.jsx b/awx/ui_next/src/components/FormField/FormField.jsx
index 096960ef39..c9ce488044 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}
-          isValid={isValid}
+          validated={(isValid) ? 'default' : 'error'}
           label={label}
         >
           <FieldTooltip content={tooltip} maxWidth={tooltipMaxWidth} />
           <TextArea
             id={id}
             isRequired={isRequired}
-            isValid={isValid}
+            validated={(isValid) ? 'default' : 'error'}
             resizeOrientation="vertical"
             {...rest}
             {...field}
@@ -51,14 +51,14 @@ function FormField(props) {
           helperText={helperText}
           helperTextInvalid={meta.error}
           isRequired={isRequired}
-          isValid={isValid}
+          validated={(isValid) ? 'default' : 'error'}
           label={label}
         >
           <FieldTooltip content={tooltip} maxWidth={tooltipMaxWidth} />
           <TextInput
             id={id}
             isRequired={isRequired}
-            isValid={isValid}
+            validated={(isValid) ? 'default' : 'error'}
             {...rest}
             {...field}
             type={type}
diff --git a/awx/ui_next/src/components/FormField/PasswordField.jsx b/awx/ui_next/src/components/FormField/PasswordField.jsx
index f65aa6d3c4..807ced2102 100644
--- a/awx/ui_next/src/components/FormField/PasswordField.jsx
+++ b/awx/ui_next/src/components/FormField/PasswordField.jsx
@@ -14,7 +14,7 @@ function PasswordField(props) {
       fieldId={id}
       helperTextInvalid={meta.error}
       isRequired={isRequired}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={label}
     >
       <InputGroup>
diff --git a/awx/ui_next/src/components/FormField/PasswordInput.jsx b/awx/ui_next/src/components/FormField/PasswordInput.jsx
index 993ee9a523..6d00663ab9 100644
--- a/awx/ui_next/src/components/FormField/PasswordInput.jsx
+++ b/awx/ui_next/src/components/FormField/PasswordInput.jsx
@@ -44,7 +44,7 @@ function PasswordInput(props) {
         value={field.value === '$encrypted$' ? '' : field.value}
         isDisabled={isDisabled}
         isRequired={isRequired}
-        isValid={isValid}
+        validated={(isValid) ? 'default' : 'error'}
         type={inputType}
         onChange={(_, event) => {
           field.onChange(event);
diff --git a/awx/ui_next/src/components/HostForm/HostForm.jsx b/awx/ui_next/src/components/HostForm/HostForm.jsx
index 8fa1c63bb2..94b3ac8577 100644
--- a/awx/ui_next/src/components/HostForm/HostForm.jsx
+++ b/awx/ui_next/src/components/HostForm/HostForm.jsx
@@ -27,7 +27,7 @@ const InventoryLookupField = withI18n()(({ i18n, host }) => {
       label={i18n._(t`Inventory`)}
       isRequired
       fieldId="inventory-lookup"
-      isValid={!inventoryMeta.touched || !inventoryMeta.error}
+      validated={(!inventoryMeta.touched || !inventoryMeta.error) ? 'default' : 'error'}
       helperTextInvalid={inventoryMeta.error}
     >
       <FieldTooltip
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx
index 61151e5c2e..016c4cef5f 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx
@@ -101,7 +101,7 @@ function JobTypeField({ i18n }) {
     <FormGroup
       fieldId="propmt-job-type"
       label={i18n._(t`Job Type`)}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
     >
       <FieldTooltip
         content={i18n._(t`For job templates, select run to execute the playbook.
@@ -132,7 +132,7 @@ function VerbosityField({ i18n }) {
   return (
     <FormGroup
       fieldId="prompt-verbosity"
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={i18n._(t`Verbosity`)}
     >
       <FieldTooltip
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
index 73da31f76f..a397e80349 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
@@ -96,7 +96,7 @@ function MultipleChoiceField({ question }) {
       fieldId={id}
       helperTextInvalid={meta.error}
       isRequired={question.required}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={question.question_name}
     >
       <FieldTooltip content={question.question_description} />
@@ -124,7 +124,7 @@ function MultiSelectField({ question }) {
       fieldId={id}
       helperTextInvalid={meta.error}
       isRequired={question.required}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={question.question_name}
     >
       <FieldTooltip content={question.question_description} />
@@ -139,7 +139,7 @@ function MultiSelectField({ question }) {
             helpers.setValue(field.value.concat(option));
           }
         }}
-        isExpanded={isOpen}
+        isOpen={isOpen}
         selections={field.value}
       >
         {question.choices.split('\n').map(opt => (
diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
index 07c85e453f..1d005d8880 100644
--- a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
@@ -84,7 +84,7 @@ function CredentialLookup({
     <FormGroup
       fieldId="credential"
       isRequired={required}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={label}
       helperTextInvalid={helperTextInvalid}
     >
diff --git a/awx/ui_next/src/components/Lookup/Lookup.jsx b/awx/ui_next/src/components/Lookup/Lookup.jsx
index 9c0b761bb7..4dcdae0dc2 100644
--- a/awx/ui_next/src/components/Lookup/Lookup.jsx
+++ b/awx/ui_next/src/components/Lookup/Lookup.jsx
@@ -142,8 +142,8 @@ function Lookup(props) {
         </ChipHolder>
       </InputGroup>
       <Modal
-        isFooterLeftAligned
-        isLarge
+        
+        variant="large"
         title={i18n._(t`Select ${header || i18n._(t`Items`)}`)}
         isOpen={isModalOpen}
         onClose={closeModal}
@@ -199,7 +199,7 @@ Lookup.defaultProps = {
     <Chip
       key={item.id}
       onClick={() => removeItem(item)}
-      isReadOnly={!canDelete}
+      
     >
       {item.name}
     </Chip>
diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
index 1290bca495..8a2312a0f3 100644
--- a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
@@ -49,7 +49,7 @@ function OrganizationLookup({
       fieldId="organization"
       helperTextInvalid={helperTextInvalid}
       isRequired={required}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={i18n._(t`Organization`)}
     >
       <Lookup
diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
index 03c6dbbbe3..65034148e5 100644
--- a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
@@ -63,7 +63,7 @@ function ProjectLookup({
       fieldId="project"
       helperTextInvalid={helperTextInvalid}
       isRequired={required}
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={i18n._(t`Project`)}
     >
       {tooltip && <FieldTooltip content={tooltip} />}
diff --git a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx
index 43a4b11c77..473db38932 100644
--- a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx
+++ b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.jsx
@@ -50,8 +50,8 @@ function TagMultiSelect({ onChange, value }) {
         return name;
       }}
       selections={selections}
-      isExpanded={isExpanded}
-      ariaLabelledBy="tag-select"
+      isOpen={isExpanded}
+      aria-labelledby="tag-select"
     >
       {renderOptions(options)}
     </Select>
diff --git a/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
index 8d02bd2cf3..982fe250f5 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
@@ -194,7 +194,7 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
                     totalChips={overrides.job_tags.split(',').length}
                   >
                     {overrides.job_tags.split(',').map(jobTag => (
-                      <Chip key={jobTag} isReadOnly>
+                      <Chip key={jobTag} >
                         {jobTag}
                       </Chip>
                     ))}
@@ -212,7 +212,7 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
                     totalChips={overrides.skip_tags.split(',').length}
                   >
                     {overrides.skip_tags.split(',').map(skipTag => (
-                      <Chip key={skipTag} isReadOnly>
+                      <Chip key={skipTag} >
                         {skipTag}
                       </Chip>
                     ))}
diff --git a/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx
index 46c89b7b4a..2492862a15 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx
@@ -126,7 +126,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
               totalChips={source_regions.split(',').length}
             >
               {source_regions.split(',').map(region => (
-                <Chip key={region} isReadOnly>
+                <Chip key={region} >
                   {region}
                 </Chip>
               ))}
@@ -144,7 +144,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
               totalChips={instance_filters.split(',').length}
             >
               {instance_filters.split(',').map(filter => (
-                <Chip key={filter} isReadOnly>
+                <Chip key={filter} >
                   {filter}
                 </Chip>
               ))}
@@ -159,7 +159,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
           value={
             <ChipGroup numChips={5} totalChips={group_by.split(',').length}>
               {group_by.split(',').map(group => (
-                <Chip key={group} isReadOnly>
+                <Chip key={group} >
                   {group}
                 </Chip>
               ))}
diff --git a/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx
index d0d44272b8..e3b899fbc9 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx
@@ -196,7 +196,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
               totalChips={summary_fields.labels.results.length}
             >
               {summary_fields.labels.results.map(label => (
-                <Chip key={label.id} isReadOnly>
+                <Chip key={label.id} >
                   {label.name}
                 </Chip>
               ))}
@@ -211,7 +211,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           value={
             <ChipGroup numChips={5} totalChips={instance_groups.length}>
               {instance_groups.map(ig => (
-                <Chip key={ig.id} isReadOnly>
+                <Chip key={ig.id} >
                   {ig.name}
                 </Chip>
               ))}
@@ -226,7 +226,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           value={
             <ChipGroup numChips={5} totalChips={job_tags.split(',').length}>
               {job_tags.split(',').map(jobTag => (
-                <Chip key={jobTag} isReadOnly>
+                <Chip key={jobTag} >
                   {jobTag}
                 </Chip>
               ))}
@@ -241,7 +241,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           value={
             <ChipGroup numChips={5} totalChips={skip_tags.split(',').length}>
               {skip_tags.split(',').map(skipTag => (
-                <Chip key={skipTag} isReadOnly>
+                <Chip key={skipTag} >
                   {skipTag}
                 </Chip>
               ))}
diff --git a/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx
index 888f2f78d3..bd9c8843d3 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx
@@ -114,7 +114,7 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
               totalChips={summary_fields.labels.results.length}
             >
               {summary_fields.labels.results.map(label => (
-                <Chip key={label.id} isReadOnly>
+                <Chip key={label.id} >
                   {label.name}
                 </Chip>
               ))}
diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
index 764ca642d3..fcfff13506 100644
--- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
+++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
@@ -59,7 +59,7 @@ class ResourceAccessListItem extends React.Component {
     return (
       <Chip
         key={role.id}
-        isReadOnly={!role.user_capabilities.unattach}
+        
         onClick={() => {
           onRoleDelete(role, accessRecord);
         }}
diff --git a/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx b/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
index a41ac3ea0a..700077e88c 100644
--- a/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
+++ b/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shape, string, number, arrayOf, node, oneOfType } from 'prop-types';
-import { Tab, Tabs } from '@patternfly/react-core';
+import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
 import { useHistory } from 'react-router-dom';
 
 function RoutedTabs(props) {
@@ -36,7 +36,7 @@ function RoutedTabs(props) {
           eventKey={tab.id}
           key={tab.id}
           link={tab.link}
-          title={tab.name}
+          title={<TabTitleText>{tab.name}</TabTitleText>}
         />
       ))}
     </Tabs>
diff --git a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx
index 354a283b09..9391432c22 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx
@@ -194,7 +194,7 @@ function ScheduleDetail({ schedule, i18n }) {
                     totalChips={job_tags.split(',').length}
                   >
                     {job_tags.split(',').map(jobTag => (
-                      <Chip key={jobTag} isReadOnly>
+                      <Chip key={jobTag} >
                         {jobTag}
                       </Chip>
                     ))}
@@ -212,7 +212,7 @@ function ScheduleDetail({ schedule, i18n }) {
                     totalChips={skip_tags.split(',').length}
                   >
                     {skip_tags.split(',').map(skipTag => (
-                      <Chip key={skipTag} isReadOnly>
+                      <Chip key={skipTag} >
                         {skipTag}
                       </Chip>
                     ))}
diff --git a/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx b/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx
index fa7627fddd..5203c149c7 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx
@@ -36,7 +36,7 @@ function ScheduleOccurrences({ preview = { local: [], utc: [] }, i18n }) {
         fullWidth
         css="grid-column: 1 / -1"
       >
-        <Split gutter="sm">
+        <Split hasGutter>
           <SplitItem>
             <OccurrencesLabel>
               <span>{i18n._(t`Occurrences`)}</span>
diff --git a/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx b/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx
index d40976e26a..c11c72c41f 100644
--- a/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx
+++ b/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx
@@ -231,7 +231,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
         fieldId="schedule-run-every"
         helperTextInvalid={intervalMeta.error}
         isRequired
-        isValid={!intervalMeta.touched || !intervalMeta.error}
+        validated={(!intervalMeta.touched || !intervalMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Run every`)}
       >
         <div css="display: flex">
@@ -255,7 +255,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
           fieldId="schedule-days-of-week"
           helperTextInvalid={daysOfWeekMeta.error}
           isRequired
-          isValid={!daysOfWeekMeta.touched || !daysOfWeekMeta.error}
+          validated={(!daysOfWeekMeta.touched || !daysOfWeekMeta.error) ? 'default' : 'error'}
           label={i18n._(t`On days`)}
         >
           <div css="display: flex">
@@ -339,7 +339,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
             fieldId="schedule-run-on"
             helperTextInvalid={runOnMeta.error}
             isRequired
-            isValid={!runOnMeta.touched || !runOnMeta.error}
+            validated={(!runOnMeta.touched || !runOnMeta.error) ? 'default' : 'error'}
             label={i18n._(t`Run on`)}
           >
             <RunOnRadio
@@ -502,7 +502,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
         fieldId="schedule-end"
         helperTextInvalid={endMeta.error}
         isRequired
-        isValid={!endMeta.touched || !endMeta.error}
+        validated={(!endMeta.touched || !endMeta.error) ? 'default' : 'error'}
         label={i18n._(t`End`)}
       >
         <Radio
@@ -556,7 +556,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
           fieldId="schedule-end-datetime"
           helperTextInvalid={endDateTimeMeta.error}
           isRequired
-          isValid={!endDateTimeMeta.touched || !endDateTimeMeta.error}
+          validated={(!endDateTimeMeta.touched || !endDateTimeMeta.error) ? 'default' : 'error'}
           label={i18n._(t`End date/time`)}
         >
           <input
diff --git a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx
index 6597e27ec4..2635f2e9ea 100644
--- a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx
+++ b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx
@@ -104,7 +104,7 @@ function ScheduleFormFields({ i18n, zoneOptions }) {
         fieldId="schedule-start-datetime"
         helperTextInvalid={startDateTimeMeta.error}
         isRequired
-        isValid={!startDateTimeMeta.touched || !startDateTimeMeta.error}
+        validated={(!startDateTimeMeta.touched || !startDateTimeMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Start date/time`)}
       >
         <input
@@ -120,7 +120,7 @@ function ScheduleFormFields({ i18n, zoneOptions }) {
         fieldId="schedule-timezone"
         helperTextInvalid={timezoneMeta.error}
         isRequired
-        isValid={!timezoneMeta.touched || !timezoneMeta.error}
+        validated={(!timezoneMeta.touched || !timezoneMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Local time zone`)}
       >
         <AnsibleSelect
@@ -134,7 +134,7 @@ function ScheduleFormFields({ i18n, zoneOptions }) {
         fieldId="schedule-requency"
         helperTextInvalid={frequencyMeta.error}
         isRequired
-        isValid={!frequencyMeta.touched || !frequencyMeta.error}
+        validated={(!frequencyMeta.touched || !frequencyMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Run frequency`)}
       >
         <AnsibleSelect
diff --git a/awx/ui_next/src/components/Search/Search.jsx b/awx/ui_next/src/components/Search/Search.jsx
index 287c9c11da..0fb59e0806 100644
--- a/awx/ui_next/src/components/Search/Search.jsx
+++ b/awx/ui_next/src/components/Search/Search.jsx
@@ -251,7 +251,7 @@ class Search extends React.Component {
                       const [, ...value] = chip.key.split(':');
                       return value.join(':');
                     })}
-                    isExpanded={isFilterDropdownOpen}
+                    isOpen={isFilterDropdownOpen}
                     placeholderText={`Filter By ${name}`}
                   >
                     {options.map(([optionKey, optionLabel]) => (
@@ -270,7 +270,7 @@ class Search extends React.Component {
                       this.handleFilterBooleanSelect(key, selection)
                     }
                     selections={chipsByKey[key].chips[0]}
-                    isExpanded={isFilterDropdownOpen}
+                    isOpen={isFilterDropdownOpen}
                     placeholderText={`Filter By ${name}`}
                   >
                     <SelectOption key="true" value="true">
diff --git a/awx/ui_next/src/components/SelectedList/SelectedList.jsx b/awx/ui_next/src/components/SelectedList/SelectedList.jsx
index a36eab044a..b13fa96162 100644
--- a/awx/ui_next/src/components/SelectedList/SelectedList.jsx
+++ b/awx/ui_next/src/components/SelectedList/SelectedList.jsx
@@ -30,7 +30,7 @@ class SelectedList extends Component {
     const renderChip =
       renderItemChip ||
       (({ item, removeItem }) => (
-        <Chip key={item.id} onClick={removeItem} isReadOnly={isReadOnly}>
+        <Chip key={item.id} onClick={removeItem} >
           {item[displayKey]}
         </Chip>
       ));
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index de814d2630..e66a2accf0 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -104,7 +104,7 @@ function CredentialFormFields({
         fieldId="credential-credentialType"
         helperTextInvalid={credTypeMeta.error}
         isRequired
-        isValid={!credTypeMeta.touched || !credTypeMeta.error}
+        validated={(!credTypeMeta.touched || !credTypeMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Credential Type`)}
       >
         <AnsibleSelect
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
new file mode 100644
index 0000000000..8ad2d947dc
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
@@ -0,0 +1,103 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { useField } from 'formik';
+import {
+  Button,
+  ButtonVariant,
+  FormGroup,
+  InputGroup,
+  Tooltip,
+} from '@patternfly/react-core';
+import { KeyIcon } from '@patternfly/react-icons';
+import { CredentialPluginPrompt } from './CredentialPluginPrompt';
+import CredentialPluginSelected from './CredentialPluginSelected';
+
+function CredentialPluginField(props) {
+  const {
+    children,
+    id,
+    name,
+    label,
+    validate,
+    isRequired,
+    isDisabled,
+    i18n,
+  } = props;
+  const [showPluginWizard, setShowPluginWizard] = useState(false);
+  const [field, meta, helpers] = useField({ name, validate });
+  const isValid = !(meta.touched && meta.error);
+
+  return (
+    <FormGroup
+      fieldId={id}
+      helperTextInvalid={meta.error}
+      isRequired={isRequired}
+      validated={(isValid) ? 'default' : 'error'}
+      label={label}
+    >
+      {field?.value?.credential ? (
+        <CredentialPluginSelected
+          credential={field?.value?.credential}
+          onClearPlugin={() => helpers.setValue('')}
+          onEditPlugin={() => setShowPluginWizard(true)}
+        />
+      ) : (
+        <InputGroup>
+          {React.cloneElement(children, {
+            ...field,
+            isRequired,
+            onChange: (_, event) => {
+              field.onChange(event);
+            },
+          })}
+          <Tooltip
+            content={i18n._(
+              t`Populate field from an external secret management system`
+            )}
+          >
+            <Button
+              variant={ButtonVariant.control}
+              aria-label={i18n._(
+                t`Populate field from an external secret management system`
+              )}
+              onClick={() => setShowPluginWizard(true)}
+              isDisabled={isDisabled}
+            >
+              <KeyIcon />
+            </Button>
+          </Tooltip>
+        </InputGroup>
+      )}
+      {showPluginWizard && (
+        <CredentialPluginPrompt
+          initialValues={typeof field.value === 'object' ? field.value : {}}
+          onClose={() => setShowPluginWizard(false)}
+          onSubmit={val => {
+            val.touched = true;
+            helpers.setValue(val);
+            setShowPluginWizard(false);
+          }}
+        />
+      )}
+    </FormGroup>
+  );
+}
+
+CredentialPluginField.propTypes = {
+  id: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
+  validate: PropTypes.func,
+  isRequired: PropTypes.bool,
+  isDisabled: PropTypes.bool,
+};
+
+CredentialPluginField.defaultProps = {
+  validate: () => {},
+  isRequired: false,
+  isDisabled: false,
+};
+
+export default withI18n()(CredentialPluginField);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx
new file mode 100644
index 0000000000..89fa0d0230
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx
@@ -0,0 +1,136 @@
+import React, { useState } from 'react';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { useField } from 'formik';
+import {
+  FileUpload,
+  FormGroup,
+  TextArea,
+  TextInput,
+} from '@patternfly/react-core';
+import {
+  FormColumnLayout,
+  FormFullWidthLayout,
+} from '../../../../components/FormLayout';
+import { required } from '../../../../util/validators';
+import { CredentialPluginField } from '../CredentialPlugins';
+
+const GoogleComputeEngineSubForm = ({ i18n }) => {
+  const [fileError, setFileError] = useState(null);
+  const [filename, setFilename] = useState('');
+  const [file, setFile] = useState('');
+  const inputsUsernameHelpers = useField({
+    name: 'inputs.username',
+  })[2];
+  const inputsProjectHelpers = useField({
+    name: 'inputs.project',
+  })[2];
+  const inputsSSHKeyDataHelpers = useField({
+    name: 'inputs.ssh_key_data',
+  })[2];
+
+  return (
+    <FormColumnLayout>
+      <FormGroup
+        fieldId="credential-gce-file"
+        validated={(!fileError) ? 'default' : 'error'}
+        label={i18n._(t`Service account JSON file`)}
+        helperText={i18n._(
+          t`Select a JSON formatted service account key to autopopulate the following fields.`
+        )}
+        helperTextInvalid={fileError}
+      >
+        <FileUpload
+          id="credential-gce-file"
+          value={file}
+          filename={filename}
+          filenamePlaceholder={i18n._(t`Choose a .json file`)}
+          onChange={async value => {
+            if (value) {
+              try {
+                setFile(value);
+                setFilename(value.name);
+                const fileText = await value.text();
+                const fileJSON = JSON.parse(fileText);
+                if (
+                  !fileJSON.client_email &&
+                  !fileJSON.project_id &&
+                  !fileJSON.private_key
+                ) {
+                  setFileError(
+                    i18n._(
+                      t`Expected at least one of client_email, project_id or private_key to be present in the file.`
+                    )
+                  );
+                } else {
+                  inputsUsernameHelpers.setValue(fileJSON.client_email || '');
+                  inputsProjectHelpers.setValue(fileJSON.project_id || '');
+                  inputsSSHKeyDataHelpers.setValue(fileJSON.private_key || '');
+                  setFileError(null);
+                }
+              } catch {
+                setFileError(
+                  i18n._(
+                    t`There was an error parsing the file. Please check the file formatting and try again.`
+                  )
+                );
+              }
+            } else {
+              setFile('');
+              setFilename('');
+              inputsUsernameHelpers.setValue('');
+              inputsProjectHelpers.setValue('');
+              inputsSSHKeyDataHelpers.setValue('');
+              setFileError(null);
+            }
+          }}
+          dropzoneProps={{
+            accept: '.json',
+            onDropRejected: () => {
+              setFileError(
+                i18n._(
+                  t`File upload rejected. Please select a single .json file.`
+                )
+              );
+            },
+          }}
+        />
+      </FormGroup>
+      <CredentialPluginField
+        id="credential-username"
+        label={i18n._(t`Service account email address`)}
+        name="inputs.username"
+        type="email"
+        validate={required(null, i18n)}
+        isRequired
+      >
+        <TextInput id="credential-username" />
+      </CredentialPluginField>
+      <CredentialPluginField
+        id="credential-project"
+        label={i18n._(t`Project`)}
+        name="inputs.project"
+      >
+        <TextInput id="credential-project" />
+      </CredentialPluginField>
+      <FormFullWidthLayout>
+        <CredentialPluginField
+          id="credential-sshKeyData"
+          label={i18n._(t`RSA private key`)}
+          name="inputs.ssh_key_data"
+          type="textarea"
+          validate={required(null, i18n)}
+          isRequired
+        >
+          <TextArea
+            id="credential-sshKeyData"
+            rows={6}
+            resizeOrientation="vertical"
+          />
+        </CredentialPluginField>
+      </FormFullWidthLayout>
+    </FormColumnLayout>
+  );
+};
+
+export default withI18n()(GoogleComputeEngineSubForm);
diff --git a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx
index a4f8a63830..6927df79d4 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx
@@ -81,7 +81,7 @@ function InventoryDetail({ inventory, i18n }) {
           value={
             <ChipGroup numChips={5} totalChips={instanceGroups.length}>
               {instanceGroups.map(ig => (
-                <Chip key={ig.id} isReadOnly>
+                <Chip key={ig.id} >
                   {ig.name}
                 </Chip>
               ))}
diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx
index 919d1ec774..de11a2206e 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx
@@ -248,7 +248,7 @@ function InventorySourceDetail({ inventorySource, i18n }) {
                 totalChips={source_regions.split(',').length}
               >
                 {source_regions.split(',').map(region => (
-                  <Chip key={region} isReadOnly>
+                  <Chip key={region} >
                     {region}
                   </Chip>
                 ))}
@@ -266,7 +266,7 @@ function InventorySourceDetail({ inventorySource, i18n }) {
                 totalChips={instance_filters.split(',').length}
               >
                 {instance_filters.split(',').map(filter => (
-                  <Chip key={filter} isReadOnly>
+                  <Chip key={filter} >
                     {filter}
                   </Chip>
                 ))}
@@ -281,7 +281,7 @@ function InventorySourceDetail({ inventorySource, i18n }) {
             value={
               <ChipGroup numChips={5} totalChips={group_by.split(',').length}>
                 {group_by.split(',').map(group => (
-                  <Chip key={group} isReadOnly>
+                  <Chip key={group} >
                     {group}
                   </Chip>
                 ))}
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
index 6d367aa40c..195353cb6d 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
@@ -117,7 +117,7 @@ const InventorySourceFormFields = ({ sourceOptions, i18n }) => {
         fieldId="source"
         helperTextInvalid={sourceMeta.error}
         isRequired
-        isValid={!sourceMeta.touched || !sourceMeta.error}
+        validated={(!sourceMeta.touched || !sourceMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Source`)}
       >
         <AnsibleSelect
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
index e9fe7f6690..cb655eaaf7 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
@@ -83,10 +83,8 @@ const SCMSubForm = ({ i18n }) => {
       <FormGroup
         fieldId="source_path"
         helperTextInvalid={sourcePathError?.message || sourcePathMeta.error}
-        isValid={
-          (!sourcePathMeta.error || !sourcePathMeta.touched) &&
-          !sourcePathError?.message
-        }
+        validated={((!sourcePathMeta.error || !sourcePathMeta.touched) &&
+          !sourcePathError?.message) ? 'default' : 'error'}
         isRequired
         label={i18n._(t`Inventory file`)}
       >
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx
index 698799ab62..66370d5f12 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx
@@ -229,7 +229,7 @@ export const VerbosityField = withI18n()(({ i18n }) => {
   return (
     <FormGroup
       fieldId="verbosity"
-      isValid={isValid}
+      validated={(isValid) ? 'default' : 'error'}
       label={i18n._(t`Verbosity`)}
     >
       <FieldTooltip
diff --git a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
index dc7a3e0e6b..6749c66946 100644
--- a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
+++ b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
@@ -232,7 +232,7 @@ function JobDetail({ job, i18n }) {
             value={
               <ChipGroup numChips={5} totalChips={labels.results.length}>
                 {labels.results.map(l => (
-                  <Chip key={l.id} isReadOnly>
+                  <Chip key={l.id} >
                     {l.name}
                   </Chip>
                 ))}
diff --git a/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx b/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx
index 7a9f1c9399..58c58c3e9d 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Modal as PFModal, Tab, Tabs as PFTabs } from '@patternfly/react-core';
+import { Modal as PFModal, Tab, Tabs as PFTabs, TabTitleText } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
@@ -147,7 +147,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
         <Tab
           aria-label={i18n._(t`Details tab`)}
           eventKey={0}
-          title={i18n._(t`Details`)}
+          title={<TabTitleText>{i18n._(t`Details`)}</TabTitleText>}
         >
           <DetailList style={{ alignItems: 'center' }} gutter="sm">
             <Detail
@@ -175,7 +175,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
         </Tab>
         <Tab
           eventKey={1}
-          title={i18n._(t`JSON`)}
+            title={<TabTitleText>{i18n._(t`JSON`)}</TabTitleText>}
           aria-label={i18n._(t`JSON tab`)}
         >
           {activeTabKey === 1 && jsonObj ? (
@@ -193,7 +193,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
         </Tab>
         <Tab
           eventKey={2}
-          title={i18n._(t`Standard Out`)}
+          title={<TabTitleText>{i18n._(t`Standard Out`)}</TabTitleText>}
           aria-label={i18n._(t`Standard out tab`)}
         >
           {activeTabKey === 2 && stdOut ? (
@@ -211,7 +211,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
         </Tab>
         <Tab
           eventKey={3}
-          title={i18n._(t`Standard Error`)}
+          title={<TabTitleText>{i18n._(t`Standard Error`)}</TabTitleText>}
           aria-label={i18n._(t`Standard error tab`)}
         >
           {activeTabKey === 3 && stdErr ? (
diff --git a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
index 522607e6d7..79d1f91e8c 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
@@ -105,7 +105,7 @@ function OrganizationDetail({ i18n, organization }) {
             value={
               <ChipGroup numChips={5} totalChips={instanceGroups.length}>
                 {instanceGroups.map(ig => (
-                  <Chip key={ig.id} isReadOnly>
+                  <Chip key={ig.id} >
                     {ig.name}
                   </Chip>
                 ))}
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx
index ac90aeaee2..090ab1c013 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx
@@ -172,7 +172,7 @@ function ProjectFormFields({
         fieldId="project-scm-type"
         helperTextInvalid={scmTypeMeta.error}
         isRequired
-        isValid={!scmTypeMeta.touched || !scmTypeMeta.error}
+        validated={(!scmTypeMeta.touched || !scmTypeMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Source Control Credential Type`)}
       >
         <AnsibleSelect
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx
index 96646238d9..7dc59e4568 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx
@@ -81,7 +81,7 @@ const ManualSubForm = ({
         fieldId="project-local-path"
         helperTextInvalid={pathMeta.error}
         isRequired
-        isValid={!pathMeta.touched || !pathMeta.error}
+        validated={(!pathMeta.touched || !pathMeta.error) ? 'default' : 'error'}
         label={i18n._(t`Playbook Directory`)}
       >
         <FieldTooltip
diff --git a/awx/ui_next/src/screens/Team/TeamAccess/TeamAccessListItem.jsx b/awx/ui_next/src/screens/Team/TeamAccess/TeamAccessListItem.jsx
index 12495c8003..7812e16acc 100644
--- a/awx/ui_next/src/screens/Team/TeamAccess/TeamAccessListItem.jsx
+++ b/awx/ui_next/src/screens/Team/TeamAccess/TeamAccessListItem.jsx
@@ -40,9 +40,7 @@ function TeamAccessListItem({ role, i18n, detailUrl, onSelect }) {
                     label={i18n._(t`Role`)}
                     value={
                       <Chip
-                        isReadOnly={
-                          !role.summary_fields.user_capabilities.unattach
-                        }
+                        
                         key={role.name}
                         aria-label={role.name}
                         onClick={() => onSelect(role)}
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index e369d3467b..646b3e0491 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -304,7 +304,7 @@ function JobTemplateDetail({ i18n, template }) {
                 totalChips={summary_fields.labels.results.length}
               >
                 {summary_fields.labels.results.map(l => (
-                  <Chip key={l.id} isReadOnly>
+                  <Chip key={l.id} >
                     {l.name}
                   </Chip>
                 ))}
@@ -319,7 +319,7 @@ function JobTemplateDetail({ i18n, template }) {
             value={
               <ChipGroup numChips={5} totalChips={instanceGroups.length}>
                 {instanceGroups.map(ig => (
-                  <Chip key={ig.id} isReadOnly>
+                  <Chip key={ig.id} >
                     {ig.name}
                   </Chip>
                 ))}
@@ -334,7 +334,7 @@ function JobTemplateDetail({ i18n, template }) {
             value={
               <ChipGroup numChips={5} totalChips={job_tags.split(',').length}>
                 {job_tags.split(',').map(jobTag => (
-                  <Chip key={jobTag} isReadOnly>
+                  <Chip key={jobTag} >
                     {jobTag}
                   </Chip>
                 ))}
@@ -349,7 +349,7 @@ function JobTemplateDetail({ i18n, template }) {
             value={
               <ChipGroup numChips={5} totalChips={skip_tags.split(',').length}>
                 {skip_tags.split(',').map(skipTag => (
-                  <Chip key={skipTag} isReadOnly>
+                  <Chip key={skipTag} >
                     {skipTag}
                   </Chip>
                 ))}
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
index 7ef1fc3d3c..82df254653 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
@@ -125,7 +125,7 @@ function SurveyListItem({
                     totalChips={question.default.split('\n').length}
                   >
                     {question.default.split('\n').map(chip => (
-                      <Chip key={chip} isReadOnly>
+                      <Chip key={chip} >
                         {chip}
                       </Chip>
                     ))}
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
index e9d8f0a1d2..f8b86f3644 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
@@ -32,7 +32,7 @@ function SurveyPreviewModal({
       title={i18n._(t`Survey Preview`)}
       isOpen={isPreviewModalOpen}
       onClose={() => onToggleModalOpen(false)}
-      isSmall
+      variant="small"
     >
       <Formik initialValues={initialValues}>
         {() => (
@@ -97,7 +97,7 @@ function SurveyPreviewModal({
                       isDisabled
                       isReadOnly
                       variant={SelectVariant.typeaheadMulti}
-                      isExpanded={false}
+                      isOpen={false}
                       selections={q.default.length > 0 && q.default.split('\n')}
                       onToggle={() => {}}
                       aria-label={i18n._(t`Multi-Select`)}
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
index eb768ec5ca..d3f252c5cb 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
@@ -172,7 +172,7 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
                 totalChips={summary_fields.labels.results.length}
               >
                 {summary_fields.labels.results.map(l => (
-                  <Chip key={l.id} isReadOnly>
+                  <Chip key={l.id} >
                     {l.name}
                   </Chip>
                 ))}
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx
index af976cc38f..5d7baf4099 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { BaseSizes, Title } from '@patternfly/react-core';
+import { Title } from '@patternfly/react-core';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { WorkflowDispatchContext } from '../../../../../contexts/Workflow';
@@ -10,7 +10,7 @@ function LinkAddModal({ i18n }) {
   return (
     <LinkModal
       header={
-        <Title headingLevel="h1" size={BaseSizes['2xl']}>
+        <Title headingLevel="h1" size="xl">
           {i18n._(t`Add Link`)}
         </Title>
       }
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx
index d98496487b..8c4259b73a 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { BaseSizes, Title } from '@patternfly/react-core';
+import { Title } from '@patternfly/react-core';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { WorkflowDispatchContext } from '../../../../../contexts/Workflow';
@@ -10,7 +10,7 @@ function LinkEditModal({ i18n }) {
   return (
     <LinkModal
       header={
-        <Title headingLevel="h1" size={BaseSizes['2xl']}>
+        <Title headingLevel="h1" size="xl">
           {i18n._(t`Edit Link`)}
         </Title>
       }
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx
index 0cf4601c4c..8b8f20ef9e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx
@@ -20,7 +20,7 @@ function LinkModal({ header, i18n, onConfirm }) {
       width={600}
       header={header}
       isOpen
-      isFooterLeftAligned
+      
       title={i18n._(t`Workflow Link`)}
       onClose={() => dispatch({ type: 'CANCEL_LINK_MODAL' })}
       actions={[
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx
index 146485d4cb..d3719d0bc2 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx
@@ -131,14 +131,14 @@ function NodeTypeStep({
                       <FormGroup
                         fieldId="approval-name"
                         isRequired
-                        isValid={isValid}
+                        validated={(isValid) ? 'default' : 'error'}
                         label={i18n._(t`Name`)}
                       >
                         <TextInput
                           autoFocus
                           id="approval-name"
                           isRequired
-                          isValid={isValid}
+                          validated={(isValid) ? 'default' : 'error'}
                           type="text"
                           {...field}
                           onChange={(value, evt) => {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx
index 281c7b0368..eeb8b2428c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx
@@ -131,9 +131,9 @@ function NodeViewModal({ i18n }) {
 
   return (
     <Modal
-      isLarge
+      variant="large"
       isOpen
-      isFooterLeftAligned
+      
       title={unifiedJobTemplate.name}
       onClose={() => dispatch({ type: 'SET_NODE_TO_VIEW', value: null })}
       actions={[
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx
index d06803ee53..19d9f981ba 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx
@@ -11,7 +11,7 @@ function UnsavedChangesModal({ i18n, onSaveAndExit, onExit }) {
     <Modal
       width={600}
       isOpen
-      isFooterLeftAligned
+      
       title={i18n._(t`Warning: Unsaved Changes`)}
       onClose={() => dispatch({ type: 'TOGGLE_UNSAVED_CHANGES_MODAL' })}
       actions={[
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
index 7f93f9a315..7d08d086b8 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
@@ -68,7 +68,7 @@ function VisualizerToolbar({
   return (
     <div id="visualizer-toolbar">
       <div css="align-items: center; border-bottom: 1px solid grey; display: flex; height: 56px; padding: 0px 20px;">
-        <Title size="xl" id="visualizer-toolbar-template-name">
+        <Title headingLevel="h2" size="xl" id="visualizer-toolbar-template-name">
           {template.name}
         </Title>
         <div css="align-items: center; display: flex; flex: 1; justify-content: flex-end">
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index 7bd4409fde..767eb27160 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -291,7 +291,7 @@ function JobTemplateForm({
         <FormGroup
           fieldId="template-playbook"
           helperTextInvalid={playbookMeta.error}
-          isValid={!playbookMeta.touched || !playbookMeta.error}
+          validated={(!playbookMeta.touched || !playbookMeta.error) ? 'default' : 'error'}
           isRequired
           label={i18n._(t`Playbook`)}
         >
@@ -381,7 +381,7 @@ function JobTemplateForm({
               <TextInput
                 id="template-limit"
                 {...limitField}
-                isValid={!limitMeta.touched || !limitMeta.error}
+                validated={(!limitMeta.touched || !limitMeta.error) ? 'default' : 'error'}
                 onChange={value => {
                   limitHelpers.setValue(value);
                 }}
diff --git a/awx/ui_next/src/screens/Template/shared/LabelSelect.jsx b/awx/ui_next/src/screens/Template/shared/LabelSelect.jsx
index d1f8de5ecc..539947738f 100644
--- a/awx/ui_next/src/screens/Template/shared/LabelSelect.jsx
+++ b/awx/ui_next/src/screens/Template/shared/LabelSelect.jsx
@@ -83,8 +83,8 @@ function LabelSelect({ value, placeholder, onChange, onError, createText }) {
       }}
       isDisabled={isLoading}
       selections={selections}
-      isExpanded={isExpanded}
-      ariaLabelledBy="label-select"
+      isOpen={isExpanded}
+      aria-labelledby="label-select"
       placeholderText={placeholder}
       createText={createText}
     >
diff --git a/awx/ui_next/src/screens/User/UserAccess/UserAccessListItem.jsx b/awx/ui_next/src/screens/User/UserAccess/UserAccessListItem.jsx
index c06e4cca8d..cf5bd17c79 100644
--- a/awx/ui_next/src/screens/User/UserAccess/UserAccessListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserAccess/UserAccessListItem.jsx
@@ -40,9 +40,7 @@ function UserAccessListItem({ role, i18n, detailUrl, onSelect }) {
                     label={i18n._(t`Role`)}
                     value={
                       <Chip
-                        isReadOnly={
-                          !role.summary_fields.user_capabilities.unattach
-                        }
+                        
                         key={role.name}
                         aria-label={role.name}
                         onClick={() => onSelect(role)}
diff --git a/awx/ui_next/src/screens/User/shared/UserForm.jsx b/awx/ui_next/src/screens/User/shared/UserForm.jsx
index 47294ff105..01c60888e2 100644
--- a/awx/ui_next/src/screens/User/shared/UserForm.jsx
+++ b/awx/ui_next/src/screens/User/shared/UserForm.jsx
@@ -117,7 +117,7 @@ function UserFormFields({ user, i18n }) {
         fieldId="user-type"
         helperTextInvalid={userTypeMeta.error}
         isRequired
-        isValid={!userTypeMeta.touched || !userTypeMeta.error}
+        validated={(!userTypeMeta.touched || !userTypeMeta.error) ? 'default' : 'error'}
         label={i18n._(t`User Type`)}
       >
         <AnsibleSelect