fix landing page and ImageBuilderHeader to support cockpit

osbuild · Sep 17, 2024 · df91224 · df91224
1 parent 024d940
commit df91224
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Components/LandingPage/LandingPage.tsx b/src/Components/LandingPage/LandingPage.tsx
@@ -28,6 +28,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 { getFeatureFlag } from '../../Utilities/useGetEnvironment';
 import BlueprintsSidebar from '../Blueprints/BlueprintsSideBar';
 import EdgeImagesTable from '../edge/ImagesTable';
 import ImagesTable from '../ImagesTable/ImagesTable';
@@ -54,8 +55,7 @@ export const LandingPage = () => {
  }
  setActiveTabKey(tabIndex);
  };
-
- const edgeParityFlag = useFlag('edgeParity.image-list');
+ const edgeParityFlag = getFeatureFlag('edgeParity.image-list', useFlag);
 
  const imageList = (
  <>

diff --git a/src/Components/sharedComponents/ImageBuilderHeader.tsx b/src/Components/sharedComponents/ImageBuilderHeader.tsx
@@ -26,7 +26,10 @@ import {
 } from '../../constants';
 import { resolveRelPath } from '../../Utilities/path';
 import './ImageBuilderHeader.scss';
-import { useFlagWithEphemDefault } from '../../Utilities/useGetEnvironment';
+import {
+ getFeatureFlag,
+ useFlagWithEphemDefault,
+} from '../../Utilities/useGetEnvironment';
 import { ImportBlueprintModal } from '../Blueprints/ImportBlueprintModal';
 
 type ImageBuilderHeaderPropTypes = {
@@ -94,8 +97,9 @@ export const ImageBuilderHeader = ({
  inWizard,
 }: ImageBuilderHeaderPropTypes) => {
  const navigate = useNavigate();
- const importExportFlag = useFlagWithEphemDefault(
- 'image-builder.import.enabled'
+ const importExportFlag = getFeatureFlag(
+ 'image-builder.import.enabled',
+ useFlagWithEphemDefault
  );
  const [showImportModal, setShowImportModal] = useState(false);
  const isOnBlueprintsTab = activeTab === 0;