Merge pull request #11746 from AlexSCorey/11744-fixValidatorBug

Fixes validator console error, and routing issue in Instance Groups Branch

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

@@ -68,13 +68,9 @@ function ContainerGroupEdit({
 
   if (isLoading) {
     return (
-      <PageSection>
-        <Card>
       <CardBody>
         <ContentLoading />
       </CardBody>
-        </Card>
-      </PageSection>
     );
   }
 

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

@@ -2,11 +2,12 @@ import React, { useCallback, useEffect, useState } from 'react';
 
 import { t } from '@lingui/macro';
 import { Route, Switch, useLocation } from 'react-router-dom';
+import { Card, PageSection } from '@patternfly/react-core';
 
 import useRequest from 'hooks/useRequest';
 import { SettingsAPI } from 'api';
-
 import ScreenHeader from 'components/ScreenHeader';
+import ContentLoading from 'components/ContentLoading';
 import InstanceGroupAdd from './InstanceGroupAdd';
 import InstanceGroupList from './InstanceGroupList';
 import InstanceGroup from './InstanceGroup';
@@ -81,6 +82,13 @@ function InstanceGroups() {
         streamType={streamType}
         breadcrumbConfig={breadcrumbConfig}
       />
+      {isSettingsRequestLoading ? (
+        <PageSection>
+          <Card>
+            <ContentLoading />
+          </Card>
+        </PageSection>
+      ) : (
         <Switch>
           <Route path="/instance_groups/container_group/add">
             <ContainerGroupAdd
@@ -91,7 +99,7 @@ function InstanceGroups() {
           <Route path="/instance_groups/container_group/:id">
             <ContainerGroup setBreadcrumb={buildBreadcrumbConfig} />
           </Route>
-        {!isSettingsRequestLoading && !isKubernetes && (
+          {!isKubernetes && (
             <Route path="/instance_groups/add">
               <InstanceGroupAdd
                 defaultControlPlane={defaultControlPlane}
@@ -110,6 +118,7 @@ function InstanceGroups() {
             />
           </Route>
         </Switch>
+      )}
     </>
   );
 }

awx/ui/src/screens/InstanceGroup/shared/InstanceGroupForm.js

@@ -24,8 +24,8 @@ function InstanceGroupFormFields({ defaultControlPlane, defaultExecution }) {
   const validators = combine([
     required(null),
     protectedResourceName(
-      [defaultControlPlane, defaultExecution],
+      t`This is a protected name for Instance Groups. Please use a different name.`,
-      t`This is a protected name for Instance Groups. Please use a different name.`
+      [defaultControlPlane, defaultExecution]
     ),
   ]);