Allow k8s to create Instance Groups.

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

@@ -11,7 +11,6 @@ import useSelected from 'hooks/useSelected';
 import PaginatedTable, {
   HeaderRow,
   HeaderCell,
-  ToolbarAddButton,
   ToolbarDeleteButton,
   getSearchableKeys,
 } from 'components/PaginatedTable';
@@ -27,11 +26,7 @@ const QS_CONFIG = getQSConfig('instance-group', {
   page_size: 20,
 });
 
-function InstanceGroupList({
+function InstanceGroupList() {
-  isKubernetes,
-  isSettingsRequestLoading,
-  settingsRequestError,
-}) {
   const location = useLocation();
   const match = useRouteMatch();
 
@@ -113,8 +108,7 @@ function InstanceGroupList({
   const addContainerGroup = t`Add container group`;
   const addInstanceGroup = t`Add instance group`;
 
-  const addButton =
+  const addButton = (
-    !isSettingsRequestLoading && !isKubernetes ? (
     <AddDropDownButton
       ouiaId="add-instance-group-button"
       key="add"
@@ -139,12 +133,6 @@ function InstanceGroupList({
         </DropdownItem>,
       ]}
     />
-    ) : (
-      <ToolbarAddButton
-        key="add"
-        ouiaId="add-container-group-button"
-        linkTo={`${match.url}/container_group/add`}
-      />
   );
 
   const getDetailUrl = (item) =>
@@ -159,10 +147,8 @@ function InstanceGroupList({
       <PageSection>
         <Card>
           <PaginatedTable
-            contentError={contentError || settingsRequestError}
+            contentError={contentError}
-            hasContentLoading={
+            hasContentLoading={isLoading || deleteLoading}
-              isLoading || deleteLoading || isSettingsRequestLoading
-            }
             items={instanceGroups}
             itemCount={instanceGroupsCount}
             pluralizedItemName={pluralizedItemName}

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

@@ -1,14 +1,8 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { t } from '@lingui/macro';
 import { Route, Switch, useLocation } from 'react-router-dom';
-import { Card, PageSection } from '@patternfly/react-core';
-
-import { useUserProfile } from 'contexts/Config';
-import useRequest from 'hooks/useRequest';
-import { SettingsAPI } from 'api';
 import ScreenHeader from 'components/ScreenHeader';
-import ContentLoading from 'components/ContentLoading';
 import PersistentFilters from 'components/PersistentFilters';
 import InstanceGroupAdd from './InstanceGroupAdd';
 import InstanceGroupList from './InstanceGroupList';
@@ -18,29 +12,6 @@ import ContainerGroup from './ContainerGroup';
 
 function InstanceGroups() {
   const { pathname } = useLocation();
-  const { isSuperUser, isSystemAuditor } = useUserProfile();
-  const userCanReadSettings = isSuperUser || isSystemAuditor;
-
-  const {
-    request: settingsRequest,
-    isLoading: isSettingsRequestLoading,
-    error: settingsRequestError,
-    result: { isKubernetes },
-  } = useRequest(
-    useCallback(async () => {
-      const {
-        data: { IS_K8S },
-      } = await SettingsAPI.readCategory('all');
-      return {
-        isKubernetes: IS_K8S,
-      };
-    }, []),
-    { isKubernetes: false }
-  );
-  useEffect(() => {
-    userCanReadSettings && settingsRequest();
-  }, [settingsRequest, userCanReadSettings]);
-
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
     '/instance_groups': t`Instance Groups`,
     '/instance_groups/add': t`Create new instance group`,
@@ -81,13 +52,6 @@ function InstanceGroups() {
         streamType={streamType}
         breadcrumbConfig={breadcrumbConfig}
       />
-      {isSettingsRequestLoading ? (
-        <PageSection>
-          <Card>
-            <ContentLoading />
-          </Card>
-        </PageSection>
-      ) : (
       <Switch>
         <Route path="/instance_groups/container_group/add">
           <ContainerGroupAdd />
@@ -95,25 +59,18 @@ function InstanceGroups() {
         <Route path="/instance_groups/container_group/:id">
           <ContainerGroup setBreadcrumb={buildBreadcrumbConfig} />
         </Route>
-          {!isKubernetes && (
         <Route path="/instance_groups/add">
           <InstanceGroupAdd />
         </Route>
-          )}
         <Route path="/instance_groups/:id">
           <InstanceGroup setBreadcrumb={buildBreadcrumbConfig} />
         </Route>
         <Route path="/instance_groups">
           <PersistentFilters pageKey="instanceGroups">
-              <InstanceGroupList
+            <InstanceGroupList />
-                isKubernetes={isKubernetes}
-                isSettingsRequestLoading={isSettingsRequestLoading}
-                settingsRequestError={settingsRequestError}
-              />
           </PersistentFilters>
         </Route>
       </Switch>
-      )}
     </>
   );
 }