From 0d17dfcd8770cafd894bfb083977eccd11844552 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 10 May 2021 17:05:11 -0400
Subject: [PATCH] Pass config request through to subscription edit

---
 awx/ui_next/src/contexts/Config.jsx               | 12 +++---------
 .../SubscriptionEdit/SubscriptionEdit.jsx         | 15 +++------------
 .../SubscriptionEdit/SubscriptionEdit.test.jsx    |  4 ++--
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/awx/ui_next/src/contexts/Config.jsx b/awx/ui_next/src/contexts/Config.jsx
index 2468fc05d1..f95e5017a5 100644
--- a/awx/ui_next/src/contexts/Config.jsx
+++ b/awx/ui_next/src/contexts/Config.jsx
@@ -22,13 +22,7 @@ export const useConfig = () => {
 };
 
 export const ConfigProvider = ({ children }) => {
-  const {
-    error: configError,
-    isLoading,
-    request,
-    result: config,
-    setValue: setConfig,
-  } = useRequest(
+  const { error: configError, isLoading, request, result: config } = useRequest(
     useCallback(async () => {
       const [
         { data },
@@ -55,10 +49,10 @@ export const ConfigProvider = ({ children }) => {
     }
   }, [error]);
 
-  const value = useMemo(() => ({ ...config, isLoading, setConfig }), [
+  const value = useMemo(() => ({ ...config, request, isLoading }), [
     config,
+    request,
     isLoading,
-    setConfig,
   ]);
 
   return (
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
index 42a4213478..ef0c8680f9 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
@@ -12,7 +12,7 @@ import {
   WizardContextConsumer,
   WizardFooter,
 } from '@patternfly/react-core';
-import { ConfigAPI, SettingsAPI, MeAPI, RootAPI } from '../../../../api';
+import { ConfigAPI, SettingsAPI, RootAPI } from '../../../../api';
 import useRequest, { useDismissableError } from '../../../../util/useRequest';
 import ContentLoading from '../../../../components/ContentLoading';
 import ContentError from '../../../../components/ContentError';
@@ -91,7 +91,7 @@ const CustomFooter = ({ isSubmitLoading }) => {
 
 function SubscriptionEdit() {
   const history = useHistory();
-  const { license_info, setConfig } = useConfig();
+  const { request: updateConfig, license_info } = useConfig();
   const hasValidKey = Boolean(license_info?.valid_key);
   const subscriptionMgmtRoute = useRouteMatch({
     path: '/subscription_management',
@@ -164,16 +164,7 @@ function SubscriptionEdit() {
         }
       }
 
-      const [
-        { data },
-        {
-          data: {
-            results: [me],
-          },
-        },
-      ] = await Promise.all([ConfigAPI.read(), MeAPI.read()]);
-      const newConfig = { ...data, me };
-      setConfig(newConfig);
+      await updateConfig();
 
       return true;
     }, []) // eslint-disable-line react-hooks/exhaustive-deps
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
index c416917acf..9f69eb9fd5 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
@@ -52,7 +52,7 @@ const emptyConfig = {
   license_info: {
     valid_key: false,
   },
-  setConfig: jest.fn(),
+  request: jest.fn(),
 };
 
 describe('<SubscriptionEdit />', () => {
@@ -268,7 +268,7 @@ describe('<SubscriptionEdit />', () => {
           context: {
             config: {
               mockConfig,
-              setConfig: jest.fn(),
+              request: jest.fn(),
             },
             me: {
               is_superuser: true,