From 46b6fda9dbf3e87aebc7e65d207feae0c764169a Mon Sep 17 00:00:00 2001 From: regexowl Date: Fri, 11 Oct 2024 10:30:12 +0200 Subject: [PATCH] src: Resolve last remaining circular dependency Nothing added, nothing removed, stuff moved around a bit. --- src/Components/CreateImageWizard/CreateImageWizard.tsx | 3 ++- .../CreateImageWizard/steps/FileSystem/FileSystemTable.tsx | 2 +- src/Components/CreateImageWizard/steps/FileSystem/index.tsx | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx index 95a3f29b..68a127fe 100644 --- a/src/Components/CreateImageWizard/CreateImageWizard.tsx +++ b/src/Components/CreateImageWizard/CreateImageWizard.tsx @@ -14,7 +14,8 @@ import { useFlag } from '@unleash/proxy-client-react'; import { useNavigate, useSearchParams } from 'react-router-dom'; import DetailsStep from './steps/Details'; -import FileSystemStep, { FileSystemContext } from './steps/FileSystem'; +import FileSystemStep from './steps/FileSystem'; +import { FileSystemContext } from './steps/FileSystem/FileSystemTable'; import FirstBootStep from './steps/FirstBoot'; import ImageOutputStep from './steps/ImageOutput'; import OscapStep from './steps/Oscap'; diff --git a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx index d6099d3a..6c02310c 100644 --- a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx +++ b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx @@ -35,7 +35,7 @@ import { import { useFilesystemValidation } from '../../utilities/useValidation'; import { HookValidatedInput } from '../../ValidatedTextInput'; -import { FileSystemContext } from '.'; +export const FileSystemContext = React.createContext(true); export const MinimumSizePopover = () => { return ( diff --git a/src/Components/CreateImageWizard/steps/FileSystem/index.tsx b/src/Components/CreateImageWizard/steps/FileSystem/index.tsx index dd6db235..dec12b6e 100644 --- a/src/Components/CreateImageWizard/steps/FileSystem/index.tsx +++ b/src/Components/CreateImageWizard/steps/FileSystem/index.tsx @@ -11,8 +11,6 @@ import { selectFileSystemConfigurationType } from '../../../../store/wizardSlice import { useHasSpecificTargetOnly } from '../../utilities/hasSpecificTargetOnly'; export type FileSystemConfigurationType = 'automatic' | 'manual'; -export const FileSystemContext = React.createContext(true); - const FileSystemStep = () => { const fileSystemConfigurationType = useAppSelector( selectFileSystemConfigurationType