diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx index 4c35fc4e..b367fe4b 100644 --- a/src/Components/CreateImageWizard/CreateImageWizard.tsx +++ b/src/Components/CreateImageWizard/CreateImageWizard.tsx @@ -10,7 +10,6 @@ import { PageSection, } from '@patternfly/react-core'; import { WizardStepType } from '@patternfly/react-core/dist/esm/components/Wizard'; -import { useFlag } from '@unleash/proxy-client-react'; import { useNavigate, useSearchParams } from 'react-router-dom'; import DetailsStep from './steps/Details'; @@ -65,6 +64,7 @@ import { addImageType, } from '../../store/wizardSlice'; import { resolveRelPath } from '../../Utilities/path'; +import { useFlag } from '../../Utilities/useGetEnvironment'; import { useGetEnvironment } from '../../Utilities/useGetEnvironment'; import { ImageBuilderHeader } from '../sharedComponents/ImageBuilderHeader'; diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx index 7ea0819c..02985504 100644 --- a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx +++ b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx @@ -13,7 +13,6 @@ import { useWizardContext, } from '@patternfly/react-core'; import { ArrowRightIcon } from '@patternfly/react-icons'; -import { useFlag } from '@unleash/proxy-client-react'; import { ContentList, diff --git a/src/Components/LandingPage/LandingPage.tsx b/src/Components/LandingPage/LandingPage.tsx index 7b94951f..88b7614a 100644 --- a/src/Components/LandingPage/LandingPage.tsx +++ b/src/Components/LandingPage/LandingPage.tsx @@ -18,7 +18,6 @@ import { ToolbarContent, } from '@patternfly/react-core'; import { ExternalLinkAltIcon, HelpIcon } from '@patternfly/react-icons'; -import { useFlag } from '@unleash/proxy-client-react'; import { Outlet, useLocation, useNavigate } from 'react-router-dom'; import './LandingPage.scss'; @@ -28,6 +27,7 @@ import { NewAlert } from './NewAlert'; import { MANAGING_WITH_DNF_URL, OSTREE_URL } from '../../constants'; import { manageEdgeImagesUrlName } from '../../Utilities/edge'; import { resolveRelPath } from '../../Utilities/path'; +import { useFlag } from '../../Utilities/useGetEnvironment'; import BlueprintsSidebar from '../Blueprints/BlueprintsSideBar'; import EdgeImagesTable from '../edge/ImagesTable'; import ImagesTable from '../ImagesTable/ImagesTable'; diff --git a/src/Router.tsx b/src/Router.tsx index 4f323914..7b2bd614 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,14 @@ import React, { lazy, Suspense } from 'react'; -import { useFlag } from '@unleash/proxy-client-react'; import { Route, Routes } from 'react-router-dom'; import EdgeImageDetail from './Components/edge/ImageDetails'; import ShareImageModal from './Components/ShareImageModal/ShareImageModal'; import { manageEdgeImagesUrlName } from './Utilities/edge'; -import { useFlagWithEphemDefault } from './Utilities/useGetEnvironment'; +import { + useFlag, + useFlagWithEphemDefault, +} from './Utilities/useGetEnvironment'; const LandingPage = lazy(() => import('./Components/LandingPage/LandingPage')); const ImportImageWizard = lazy( diff --git a/src/Utilities/useGetEnvironment.ts b/src/Utilities/useGetEnvironment.ts index 9c660383..3ec3d1bc 100644 --- a/src/Utilities/useGetEnvironment.ts +++ b/src/Utilities/useGetEnvironment.ts @@ -1,5 +1,5 @@ import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome'; -import { useFlag } from '@unleash/proxy-client-react'; +import { useFlag as useUnleashFlag } from '@unleash/proxy-client-react'; export const useGetEnvironment = () => { const { isBeta, isProd, getEnvironment } = useChrome(); @@ -24,5 +24,14 @@ export const useFlagWithEphemDefault = ( ): boolean => { const getFlag = useFlag(flag); const { getEnvironment } = useChrome(); + if (process.env.IS_ON_PREMISE) { + return false; + } return (getEnvironment() === 'qa' && ephemDefault) || getFlag; }; + +// Since some of these flags are only relevant to +// the service, we need a way of bypassing this for on-prem +export const useFlag = !process.env.IS_ON_PREMISE + ? useUnleashFlag + : () => false; diff --git a/src/test/Components/edge/ImageDetails.test.tsx b/src/test/Components/edge/ImageDetails.test.tsx index dcb247fa..e1a3ffd6 100644 --- a/src/test/Components/edge/ImageDetails.test.tsx +++ b/src/test/Components/edge/ImageDetails.test.tsx @@ -1,4 +1,4 @@ -import { useFlag } from '@unleash/proxy-client-react'; +import { useFlag } from '../../../Utilities/useGetEnvironment'; describe('mocking unleash calls', () => { test('the ege local image table is set to true', () => {