LandingPage/ImagesTable/Wizard: Remove all insights global calls

This commit replaces all calls to the insights.chrome global with calls
to the useChrome() hook (or the useGetEnvironment() custom hook that
wraps useChrome()).

src/App.js

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 
-import useChrome from '@redhat-cloud-services/frontend-components/useChrome';
+import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
 import NotificationsPortal from '@redhat-cloud-services/frontend-components-notifications/NotificationPortal';
 import { useStore } from 'react-redux';
 import { useNavigate } from 'react-router-dom';

src/Components/CreateImageWizard/CreateImageWizard.js

@@ -302,7 +302,7 @@ const getPackageDescription = async (
 };
 
 // map the compose request object to the expected form state
-const requestToState = (composeRequest, distroInfo, isBeta) => {
+const requestToState = (composeRequest, distroInfo, isBeta, isProd) => {
   if (composeRequest) {
     const imageRequest = composeRequest.image_requests[0];
     const uploadRequest = imageRequest.upload_request;
@@ -461,7 +461,7 @@ const requestToState = (composeRequest, distroInfo, isBeta) => {
       formState['subscription-activation-key'] = subscription['activation-key'];
       formState['subscription-organization-id'] = subscription.organization;
 
-      if (insights.chrome.isProd()) {
+      if (isProd) {
         formState['subscription-server-url'] = 'subscription.rhsm.redhat.com';
         formState['subscription-base-url'] = 'https://cdn.redhat.com/';
       } else {
@@ -544,11 +544,16 @@ const CreateImageWizard = () => {
   // This will occur if 'Recreate image' is clicked
   const initialStep = compose?.request ? 'review' : undefined;
 
-  const { isBeta } = useGetEnvironment();
+  const { isBeta, isProd } = useGetEnvironment();
 
   const awsTarget = isBeta() ? awsTargetBeta : awsTargetStable;
   const msAzureTarget = isBeta() ? msAzureTargetBeta : msAzureTargetStable;
-  let initialState = requestToState(composeRequest, distroInfo, isBeta());
+  let initialState = requestToState(
+    composeRequest,
+    distroInfo,
+    isBeta(),
+    isProd()
+  );
   const stepHistory = formStepHistory(composeRequest, isBeta());
 
   initialState

src/Components/CreateImageWizard/formComponents/ActivationKeys.js

@@ -13,8 +13,10 @@ import {
 import PropTypes from 'prop-types';
 
 import { useGetActivationKeysQuery } from '../../../store/apiSlice';
+import { useGetEnvironment } from '../../../Utilities/useGetEnvironment';
 
 const ActivationKeys = ({ label, isRequired, ...props }) => {
+  const { isProd } = useGetEnvironment();
   const { change, getState } = useFormApi();
   const { input } = useFieldApi(props);
   const [isOpen, setIsOpen] = useState(false);
@@ -31,7 +33,7 @@ const ActivationKeys = ({ label, isRequired, ...props }) => {
   } = useGetActivationKeysQuery();
 
   useEffect(() => {
-    if (insights.chrome.isProd()) {
+    if (isProd()) {
       change('subscription-server-url', 'subscription.rhsm.redhat.com');
       change('subscription-base-url', 'https://cdn.redhat.com/');
     } else {

src/Components/CreateImageWizard/formComponents/ReviewStep.js

@@ -7,6 +7,7 @@ import {
   TextContent,
   TextVariants,
 } from '@patternfly/react-core';
+import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
 
 import {
   ContentList,
@@ -24,6 +25,7 @@ import {
 import isRhel from '../../../Utilities/isRhel';
 
 const ReviewStep = () => {
+  const { auth } = useChrome();
   const [isExpandedImageOutput, setIsExpandedImageOutput] = useState(false);
   const [isExpandedTargetEnvs, setIsExpandedTargetEnvs] = useState(false);
   const [isExpandedFSC, setIsExpandedFSC] = useState(false);
@@ -36,7 +38,7 @@ const ReviewStep = () => {
     const registerSystem = getState()?.values?.['register-system'];
     if (registerSystem?.startsWith('register-now')) {
       (async () => {
-        const userData = await insights?.chrome?.auth?.getUser();
+        const userData = await auth?.getUser();
         const id = userData?.identity?.internal?.org_id;
         change('subscription-organization-id', id);
       })();

src/Components/CreateImageWizard/steps/registration.js

@@ -11,6 +11,7 @@ import {
   Title,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon, HelpIcon } from '@patternfly/react-icons';
+import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
 
 import StepTemplate from './stepTemplate';
 
@@ -18,10 +19,11 @@ import CustomButtons from '../formComponents/CustomButtons';
 
 const PopoverActivation = () => {
   const [orgId, setOrgId] = useState(null);
+  const { auth } = useChrome();
 
   useEffect(() => {
     (async () => {
-      const userData = await insights?.chrome?.auth?.getUser();
+      const userData = await auth?.getUser();
       const id = userData?.identity?.internal?.org_id;
       setOrgId(id);
     })();

src/Utilities/useGetEnvironment.js

@@ -1,10 +1,10 @@
 import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
 
 export const useGetEnvironment = () => {
-  const { isBeta, getEnvironment } = useChrome();
+  const { isBeta, isProd, getEnvironment } = useChrome();
   // Expose beta features in the ephemeral environment
   if (isBeta() || getEnvironment() === 'qa') {
-    return { isBeta: () => true };
+    return { isBeta: () => true, isProd: isProd };
   }
-  return { isBeta: () => false };
+  return { isBeta: () => false, isProd: isProd };
 };

src/test/Components/CreateImageWizard/CreateImageWizard.azure.beta.test.js

@@ -12,6 +12,17 @@ import { renderWithReduxRouter } from '../../testUtils';
 
 jest.mock('@redhat-cloud-services/frontend-components/useChrome', () => ({
   useChrome: () => ({
+    auth: {
+      getUser: () => {
+        return {
+          identity: {
+            internal: {
+              org_id: 5,
+            },
+          },
+        };
+      },
+    },
     isBeta: () => true,
     isProd: () => true,
     getEnvironment: () => 'prod',
@@ -41,33 +52,12 @@ describe('Step Upload to Azure', () => {
     jest
       .spyOn(api, 'getRepositories')
       .mockImplementation(() => Promise.resolve(mockRepositoryResults));
-
-    global.insights = {
-      chrome: {
-        auth: {
-          getUser: () => {
-            return {
-              identity: {
-                internal: {
-                  org_id: 5,
-                },
-              },
-            };
-          },
-        },
-      },
-    };
   });
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
-  // restore global mock
-  afterAll(() => {
-    global.insights = undefined;
-  });
-
   const user = userEvent.setup();
   const setUp = async () => {
     renderWithReduxRouter('imagewizard', {});

src/test/Components/CreateImageWizard/CreateImageWizard.beta.test.js

@@ -32,6 +32,17 @@ const mockComposes = {
 
 jest.mock('@redhat-cloud-services/frontend-components/useChrome', () => ({
   useChrome: () => ({
+    auth: {
+      getUser: () => {
+        return {
+          identity: {
+            internal: {
+              org_id: 5,
+            },
+          },
+        };
+      },
+    },
     isBeta: () => true,
     isProd: () => true,
     getEnvironment: () => 'prod',
@@ -159,29 +170,9 @@ const searchForChosenPackages = async (searchbox, searchTerm) => {
   }
 };
 
-// mock the insights dependency
 beforeAll(() => {
   // scrollTo is not defined in jsdom
   window.HTMLElement.prototype.scrollTo = function () {};
-
-  global.insights = {
-    chrome: {
-      auth: {
-        getUser: () => {
-          return {
-            identity: {
-              internal: {
-                org_id: 5,
-              },
-            },
-          };
-        },
-      },
-      isProd: () => {
-        return true;
-      },
-    },
-  };
 });
 
 afterEach(() => {
@@ -189,11 +180,6 @@ afterEach(() => {
   router = undefined;
 });
 
-// restore global mock
-afterAll(() => {
-  global.insights = undefined;
-});
-
 describe('Create Image Wizard', () => {
   test('renders component', () => {
     renderWithReduxRouter('imagewizard', {});

src/test/Components/CreateImageWizard/CreateImageWizard.test.js

@@ -33,6 +33,17 @@ jest
 
 jest.mock('@redhat-cloud-services/frontend-components/useChrome', () => ({
   useChrome: () => ({
+    auth: {
+      getUser: () => {
+        return {
+          identity: {
+            internal: {
+              org_id: 5,
+            },
+          },
+        };
+      },
+    },
     isBeta: () => false,
     isProd: () => true,
     getEnvironment: () => 'prod',
@@ -124,35 +135,9 @@ const searchForChosenPackages = async (searchbox, searchTerm) => {
   }
 };
 
-// mock the insights dependency
 beforeAll(() => {
   // scrollTo is not defined in jsdom
   window.HTMLElement.prototype.scrollTo = function () {};
-
-  global.insights = {
-    chrome: {
-      auth: {
-        getUser: () => {
-          return {
-            identity: {
-              internal: {
-                org_id: 5,
-              },
-            },
-          };
-        },
-      },
-      isBeta: () => {
-        return false;
-      },
-      isProd: () => {
-        return true;
-      },
-      getEnvironment: () => {
-        return 'prod';
-      },
-    },
-  };
 });
 
 afterEach(() => {
@@ -160,11 +145,6 @@ afterEach(() => {
   router = undefined;
 });
 
-// restore global mock
-afterAll(() => {
-  global.insights = undefined;
-});
-
 describe('Create Image Wizard', () => {
   test('renders component', () => {
     renderWithReduxRouter('imagewizard', {});

src/test/Components/LandingPage/LandingPage.test.js

@@ -18,16 +18,6 @@ jest.mock('@redhat-cloud-services/frontend-components/useChrome', () => ({
   }),
 }));
 
-beforeAll(() => {
-  global.insights = {
-    chrome: {
-      isProd: () => {
-        return true;
-      },
-    },
-  };
-});
-
 describe('Landing Page', () => {
   test('renders page heading', async () => {
     renderWithReduxRouter('', {});