External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 16:58:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11746 from AlexSCorey/11744-fixValidatorBug

Browse Source 
Fixes validator console error, and routing issue in Instance Groups Branch
This commit is contained in:
Tiago Góes
2022-02-16 12:28:43 -03:00
committed by GitHub
parent 799968460d 170d95aa3c
commit a94a602ccd
3 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.js
View File

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

61
awx/ui/src/screens/InstanceGroup/InstanceGroups.js
View File

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

4
awx/ui/src/screens/InstanceGroup/shared/InstanceGroupForm.js
View File

@@ -24,8 +24,8 @@ function InstanceGroupFormFields({ defaultControlPlane, defaultExecution }) {
const validators = combine([ const validators = combine([
required(null), required(null),
protectedResourceName( 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]
), ),
]); ]);