From 170d95aa3cff006eb94e03b8e601b1257d2da99c Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Tue, 15 Feb 2022 10:43:42 -0500
Subject: [PATCH] Fixes validator console error, and routing issue in Instance
 Groups branch

---
 .../ContainerGroupEdit/ContainerGroupEdit.js  | 10 +--
 .../screens/InstanceGroup/InstanceGroups.js   | 61 +++++++++++--------
 .../InstanceGroup/shared/InstanceGroupForm.js |  4 +-
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/awx/ui/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js b/awx/ui/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
index cd90532187..beed121430 100644
--- a/awx/ui/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
+++ b/awx/ui/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
@@ -68,13 +68,9 @@ function ContainerGroupEdit({
 
   if (isLoading) {
     return (
-      <PageSection>
-        <Card>
-          <CardBody>
-            <ContentLoading />
-          </CardBody>
-        </Card>
-      </PageSection>
+      <CardBody>
+        <ContentLoading />
+      </CardBody>
     );
   }
 
diff --git a/awx/ui/src/screens/InstanceGroup/InstanceGroups.js b/awx/ui/src/screens/InstanceGroup/InstanceGroups.js
index e032378136..a4c76e9c82 100644
--- a/awx/ui/src/screens/InstanceGroup/InstanceGroups.js
+++ b/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,35 +82,43 @@ function InstanceGroups() {
         streamType={streamType}
         breadcrumbConfig={breadcrumbConfig}
       />
-      <Switch>
-        <Route path="/instance_groups/container_group/add">
-          <ContainerGroupAdd
-            defaultControlPlane={defaultControlPlane}
-            defaultExecution={defaultExecution}
-          />
-        </Route>
-        <Route path="/instance_groups/container_group/:id">
-          <ContainerGroup setBreadcrumb={buildBreadcrumbConfig} />
-        </Route>
-        {!isSettingsRequestLoading && !isKubernetes && (
-          <Route path="/instance_groups/add">
-            <InstanceGroupAdd
+      {isSettingsRequestLoading ? (
+        <PageSection>
+          <Card>
+            <ContentLoading />
+          </Card>
+        </PageSection>
+      ) : (
+        <Switch>
+          <Route path="/instance_groups/container_group/add">
+            <ContainerGroupAdd
               defaultControlPlane={defaultControlPlane}
               defaultExecution={defaultExecution}
             />
           </Route>
-        )}
-        <Route path="/instance_groups/:id">
-          <InstanceGroup setBreadcrumb={buildBreadcrumbConfig} />
-        </Route>
-        <Route path="/instance_groups">
-          <InstanceGroupList
-            isKubernetes={isKubernetes}
-            isSettingsRequestLoading={isSettingsRequestLoading}
-            settingsRequestError={settingsRequestError}
-          />
-        </Route>
-      </Switch>
+          <Route path="/instance_groups/container_group/:id">
+            <ContainerGroup setBreadcrumb={buildBreadcrumbConfig} />
+          </Route>
+          {!isKubernetes && (
+            <Route path="/instance_groups/add">
+              <InstanceGroupAdd
+                defaultControlPlane={defaultControlPlane}
+                defaultExecution={defaultExecution}
+              />
+            </Route>
+          )}
+          <Route path="/instance_groups/:id">
+            <InstanceGroup setBreadcrumb={buildBreadcrumbConfig} />
+          </Route>
+          <Route path="/instance_groups">
+            <InstanceGroupList
+              isKubernetes={isKubernetes}
+              isSettingsRequestLoading={isSettingsRequestLoading}
+              settingsRequestError={settingsRequestError}
+            />
+          </Route>
+        </Switch>
+      )}
     </>
   );
 }
diff --git a/awx/ui/src/screens/InstanceGroup/shared/InstanceGroupForm.js b/awx/ui/src/screens/InstanceGroup/shared/InstanceGroupForm.js
index a742001dca..c37937db9e 100644
--- a/awx/ui/src/screens/InstanceGroup/shared/InstanceGroupForm.js
+++ b/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]
     ),
   ]);