External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -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
commit a94a602ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 35 deletions
Show Stats 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) {
return (
<PageSection>
<Card>
<CardBody>
<ContentLoading />
</CardBody>
</Card>
</PageSection>
<CardBody>
<ContentLoading />
</CardBody>
);
}

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 { 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>
)}
</>
);
}

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

@ -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]
),
]);