External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Pass config request through to subscription edit

Browse Source
This commit is contained in:
mabashian
2021-05-10 17:05:11 -04:00
parent 91134b2537
commit 0d17dfcd87
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui_next/src/contexts/Config.jsx
View File

@@ -22,13 +22,7 @@ export const useConfig = () => {
}; };
export const ConfigProvider = ({ children }) => { export const ConfigProvider = ({ children }) => {
const { const { error: configError, isLoading, request, result: config } = useRequest(
error: configError,
isLoading,
request,
result: config,
setValue: setConfig,
} = useRequest(
useCallback(async () => { useCallback(async () => {
const [ const [
{ data }, { data },
@@ -55,10 +49,10 @@ export const ConfigProvider = ({ children }) => {
} }
}, [error]); }, [error]);
const value = useMemo(() => ({ ...config, isLoading, setConfig }), [ const value = useMemo(() => ({ ...config, request, isLoading }), [
config, config,
request,
isLoading, isLoading,
setConfig,
]); ]);
return ( return (

15
awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
View File

@@ -12,7 +12,7 @@ import {
WizardContextConsumer, WizardContextConsumer,
WizardFooter, WizardFooter,
} from '@patternfly/react-core'; } from '@patternfly/react-core';
import { ConfigAPI, SettingsAPI, MeAPI, RootAPI } from '../../../../api'; import { ConfigAPI, SettingsAPI, RootAPI } from '../../../../api';
import useRequest, { useDismissableError } from '../../../../util/useRequest'; import useRequest, { useDismissableError } from '../../../../util/useRequest';
import ContentLoading from '../../../../components/ContentLoading'; import ContentLoading from '../../../../components/ContentLoading';
import ContentError from '../../../../components/ContentError'; import ContentError from '../../../../components/ContentError';
@@ -91,7 +91,7 @@ const CustomFooter = ({ isSubmitLoading }) => {
function SubscriptionEdit() { function SubscriptionEdit() {
const history = useHistory(); const history = useHistory();
const { license_info, setConfig } = useConfig(); const { request: updateConfig, license_info } = useConfig();
const hasValidKey = Boolean(license_info?.valid_key); const hasValidKey = Boolean(license_info?.valid_key);
const subscriptionMgmtRoute = useRouteMatch({ const subscriptionMgmtRoute = useRouteMatch({
path: '/subscription_management', path: '/subscription_management',
@@ -164,16 +164,7 @@ function SubscriptionEdit() {
} }
} }
const [ await updateConfig();
{ data },
{
data: {
results: [me],
},
},
] = await Promise.all([ConfigAPI.read(), MeAPI.read()]);
const newConfig = { ...data, me };
setConfig(newConfig);
return true; return true;
}, []) // eslint-disable-line react-hooks/exhaustive-deps }, []) // eslint-disable-line react-hooks/exhaustive-deps

4
awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
View File

@@ -52,7 +52,7 @@ const emptyConfig = {
license_info: { license_info: {
valid_key: false, valid_key: false,
}, },
setConfig: jest.fn(), request: jest.fn(),
}; };
describe('<SubscriptionEdit />', () => { describe('<SubscriptionEdit />', () => {
@@ -268,7 +268,7 @@ describe('<SubscriptionEdit />', () => {
context: { context: {
config: { config: {
mockConfig, mockConfig,
setConfig: jest.fn(), request: jest.fn(),
}, },
me: { me: {
is_superuser: true, is_superuser: true,