diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Configuration/IdConfig.tsx b/src/features/import/components/ImportDialog/Configure/Configuration/IdConfig.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Configuration/IdConfig.tsx rename to src/features/import/components/ImportDialog/Configure/Configuration/IdConfig.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Configuration/OrgConfig.tsx b/src/features/import/components/ImportDialog/Configure/Configuration/OrgConfig.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Configuration/OrgConfig.tsx rename to src/features/import/components/ImportDialog/Configure/Configuration/OrgConfig.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Configuration/OrgConfigRow.tsx b/src/features/import/components/ImportDialog/Configure/Configuration/OrgConfigRow.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Configuration/OrgConfigRow.tsx rename to src/features/import/components/ImportDialog/Configure/Configuration/OrgConfigRow.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Configuration/TagConfig.tsx b/src/features/import/components/ImportDialog/Configure/Configuration/TagConfig.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Configuration/TagConfig.tsx rename to src/features/import/components/ImportDialog/Configure/Configuration/TagConfig.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Configuration/TagConfigRow.tsx b/src/features/import/components/ImportDialog/Configure/Configuration/TagConfigRow.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Configuration/TagConfigRow.tsx rename to src/features/import/components/ImportDialog/Configure/Configuration/TagConfigRow.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Configuration/index.tsx b/src/features/import/components/ImportDialog/Configure/Configuration/index.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Configuration/index.tsx rename to src/features/import/components/ImportDialog/Configure/Configuration/index.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Mapping/MappingRow.tsx b/src/features/import/components/ImportDialog/Configure/Mapping/MappingRow.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Mapping/MappingRow.tsx rename to src/features/import/components/ImportDialog/Configure/Mapping/MappingRow.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Mapping/index.tsx b/src/features/import/components/ImportDialog/Configure/Mapping/index.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Mapping/index.tsx rename to src/features/import/components/ImportDialog/Configure/Mapping/index.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Preview/EmptyPreview.tsx b/src/features/import/components/ImportDialog/Configure/Preview/EmptyPreview.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Preview/EmptyPreview.tsx rename to src/features/import/components/ImportDialog/Configure/Preview/EmptyPreview.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Preview/FieldsPreview.tsx b/src/features/import/components/ImportDialog/Configure/Preview/FieldsPreview.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Preview/FieldsPreview.tsx rename to src/features/import/components/ImportDialog/Configure/Preview/FieldsPreview.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Preview/OrgPreview.tsx b/src/features/import/components/ImportDialog/Configure/Preview/OrgPreview.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Preview/OrgPreview.tsx rename to src/features/import/components/ImportDialog/Configure/Preview/OrgPreview.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Preview/PreviewGrid.tsx b/src/features/import/components/ImportDialog/Configure/Preview/PreviewGrid.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Preview/PreviewGrid.tsx rename to src/features/import/components/ImportDialog/Configure/Preview/PreviewGrid.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Preview/TagsPreview.tsx b/src/features/import/components/ImportDialog/Configure/Preview/TagsPreview.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Preview/TagsPreview.tsx rename to src/features/import/components/ImportDialog/Configure/Preview/TagsPreview.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/Preview/index.tsx b/src/features/import/components/ImportDialog/Configure/Preview/index.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/Preview/index.tsx rename to src/features/import/components/ImportDialog/Configure/Preview/index.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/SheetSettings/index.tsx b/src/features/import/components/ImportDialog/Configure/SheetSettings/index.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/Configure/SheetSettings/index.tsx rename to src/features/import/components/ImportDialog/Configure/SheetSettings/index.tsx diff --git a/src/features/import/components/ImportDialog/Steps/Configure/index.tsx b/src/features/import/components/ImportDialog/Configure/index.tsx similarity index 95% rename from src/features/import/components/ImportDialog/Steps/Configure/index.tsx rename to src/features/import/components/ImportDialog/Configure/index.tsx index 02005fb6cb..71720a69df 100644 --- a/src/features/import/components/ImportDialog/Steps/Configure/index.tsx +++ b/src/features/import/components/ImportDialog/Configure/index.tsx @@ -2,9 +2,9 @@ import { Box } from '@mui/material'; import { FC, useState } from 'react'; import Configuration from './Configuration'; -import ImportFooter from '../../ImportFooter'; -import ImportHeader from '../../ImportHeader'; -import { ImportStep } from '../..'; +import ImportFooter from '../elements/ImportFooter'; +import ImportHeader from '../elements/ImportHeader'; +import { ImportStep } from '..'; import Mapping from './Mapping'; import messageIds from 'features/import/l10n/messageIds'; import Preview from './Preview'; diff --git a/src/features/import/components/ImportDialog/Steps/ParseFile/index.tsx b/src/features/import/components/ImportDialog/ParseFile.tsx similarity index 96% rename from src/features/import/components/ImportDialog/Steps/ParseFile/index.tsx rename to src/features/import/components/ImportDialog/ParseFile.tsx index 0643ce0d24..31f5d1bbdd 100644 --- a/src/features/import/components/ImportDialog/Steps/ParseFile/index.tsx +++ b/src/features/import/components/ImportDialog/ParseFile.tsx @@ -12,10 +12,10 @@ import { } from '@mui/material'; import { CSSProperties, FC, useCallback, useState } from 'react'; -import ImportFooter from '../../ImportFooter'; -import ImportHeader from '../../ImportHeader'; -import messageIds from '../../../../l10n/messageIds'; -import useFileParsing from '../../../../hooks/useFileParsing'; +import ImportFooter from './elements/ImportFooter'; +import ImportHeader from './elements/ImportHeader'; +import messageIds from '../../l10n/messageIds'; +import useFileParsing from '../../hooks/useFileParsing'; import { useMessages } from 'core/i18n'; const sharedProperties: CSSProperties = { diff --git a/src/features/import/components/ImportDialog/Steps/Preflight/index.tsx b/src/features/import/components/ImportDialog/Preflight.tsx similarity index 89% rename from src/features/import/components/ImportDialog/Steps/Preflight/index.tsx rename to src/features/import/components/ImportDialog/Preflight.tsx index 84988ad768..422dabad65 100644 --- a/src/features/import/components/ImportDialog/Steps/Preflight/index.tsx +++ b/src/features/import/components/ImportDialog/Preflight.tsx @@ -7,17 +7,17 @@ import { useTheme, } from '@mui/material'; -import AddedOrgs from '../AddedOrgs'; -import AddedTags from '../AddedTags'; -import ChangedFields from '../ChangedFields'; -import CreatedAndUpdated from '../CreatedAndUpdated'; -import ImportAlert from '../ImportAlert'; -import ImportFooter from '../../ImportFooter'; -import ImportHeader from '../../ImportHeader'; -import { ImportStep } from '../..'; +import AddedOrgs from './elements/AddedOrgs'; +import AddedTags from './elements/AddedTags'; +import ChangedFields from './elements/ChangedFields'; +import CreatedAndUpdated from './elements/CreatedAndUpdated'; +import ImportAlert from './elements/ImportAlert'; +import ImportFooter from './elements/ImportFooter'; +import ImportHeader from './elements/ImportHeader'; +import { ImportStep } from '.'; import messageIds from 'features/import/l10n/messageIds'; import { useNumericRouteParams } from 'core/hooks'; -import usePreflight from '../../../../hooks/usePreflight'; +import usePreflight from '../../hooks/usePreflight'; import { Msg, useMessages } from 'core/i18n'; interface PreflightProps { diff --git a/src/features/import/components/ImportDialog/Steps/StatusReport/index.tsx b/src/features/import/components/ImportDialog/StatusReport.tsx similarity index 85% rename from src/features/import/components/ImportDialog/Steps/StatusReport/index.tsx rename to src/features/import/components/ImportDialog/StatusReport.tsx index f944538f84..fffb6a959d 100644 --- a/src/features/import/components/ImportDialog/Steps/StatusReport/index.tsx +++ b/src/features/import/components/ImportDialog/StatusReport.tsx @@ -1,15 +1,15 @@ import { Box, Stack, Typography } from '@mui/material'; -import AddedOrgs from '../AddedOrgs'; -import AddedTags from '../AddedTags'; -import ChangedFields from '../ChangedFields'; -import CreatedAndUpdated from '../CreatedAndUpdated'; -import ImportFooter from '../../ImportFooter'; -import ImportHeader from '../../ImportHeader'; +import AddedOrgs from './elements/AddedOrgs'; +import AddedTags from './elements/AddedTags'; +import ChangedFields from './elements/ChangedFields'; +import CreatedAndUpdated from './elements/CreatedAndUpdated'; +import ImportFooter from './elements/ImportFooter'; +import ImportHeader from './elements/ImportHeader'; import messageIds from 'features/import/l10n/messageIds'; import { useNumericRouteParams } from 'core/hooks'; -import useStatusReport from '../../../../hooks/useStatusReport'; -import ImportAlert, { ALERT_STATUS } from '../ImportAlert'; +import useStatusReport from '../../hooks/useStatusReport'; +import ImportAlert, { ALERT_STATUS } from './elements/ImportAlert'; import { Msg, useMessages } from 'core/i18n'; interface StatusReportProps { diff --git a/src/features/import/components/ImportDialog/Steps/AddedOrgs.tsx b/src/features/import/components/ImportDialog/elements/AddedOrgs.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/AddedOrgs.tsx rename to src/features/import/components/ImportDialog/elements/AddedOrgs.tsx diff --git a/src/features/import/components/ImportDialog/Steps/AddedTags.tsx b/src/features/import/components/ImportDialog/elements/AddedTags.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/AddedTags.tsx rename to src/features/import/components/ImportDialog/elements/AddedTags.tsx diff --git a/src/features/import/components/ImportDialog/Steps/ChangedFields.tsx b/src/features/import/components/ImportDialog/elements/ChangedFields.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/ChangedFields.tsx rename to src/features/import/components/ImportDialog/elements/ChangedFields.tsx diff --git a/src/features/import/components/ImportDialog/Steps/CreatedAndUpdated.tsx b/src/features/import/components/ImportDialog/elements/CreatedAndUpdated.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/CreatedAndUpdated.tsx rename to src/features/import/components/ImportDialog/elements/CreatedAndUpdated.tsx diff --git a/src/features/import/components/ImportDialog/Steps/ImportAlert.tsx b/src/features/import/components/ImportDialog/elements/ImportAlert.tsx similarity index 100% rename from src/features/import/components/ImportDialog/Steps/ImportAlert.tsx rename to src/features/import/components/ImportDialog/elements/ImportAlert.tsx diff --git a/src/features/import/components/ImportDialog/ImportFooter.tsx b/src/features/import/components/ImportDialog/elements/ImportFooter.tsx similarity index 100% rename from src/features/import/components/ImportDialog/ImportFooter.tsx rename to src/features/import/components/ImportDialog/elements/ImportFooter.tsx diff --git a/src/features/import/components/ImportDialog/ImportHeader.tsx b/src/features/import/components/ImportDialog/elements/ImportHeader.tsx similarity index 95% rename from src/features/import/components/ImportDialog/ImportHeader.tsx rename to src/features/import/components/ImportDialog/elements/ImportHeader.tsx index 9995d3a7a4..27857374c0 100644 --- a/src/features/import/components/ImportDialog/ImportHeader.tsx +++ b/src/features/import/components/ImportDialog/elements/ImportHeader.tsx @@ -9,8 +9,8 @@ import { Typography, } from '@mui/material'; -import { ImportStep } from '.'; -import messageIds from '../../l10n/messageIds'; +import { ImportStep } from '..'; +import messageIds from '../../../l10n/messageIds'; import { Msg } from 'core/i18n'; interface ImportHeaderProps { diff --git a/src/features/import/components/ImportDialog/index.tsx b/src/features/import/components/ImportDialog/index.tsx index 80bab0af0f..80cbf9ab51 100644 --- a/src/features/import/components/ImportDialog/index.tsx +++ b/src/features/import/components/ImportDialog/index.tsx @@ -1,10 +1,10 @@ import { Box, Dialog, useMediaQuery, useTheme } from '@mui/material'; import { FC, useState } from 'react'; -import Configure from './Steps/Configure'; -import ParseFile from './Steps/ParseFile'; -import Preflight from './Steps/Preflight'; -import StatusReport from './Steps/StatusReport'; +import Configure from './Configure'; +import ParseFile from './ParseFile'; +import Preflight from './Preflight'; +import StatusReport from './StatusReport'; export enum ImportStep { PARSE = 0, diff --git a/src/features/import/hooks/usePreflight.ts b/src/features/import/hooks/usePreflight.ts index eda02d1a50..131773788c 100644 --- a/src/features/import/hooks/usePreflight.ts +++ b/src/features/import/hooks/usePreflight.ts @@ -1,7 +1,7 @@ import { CountryCode } from 'libphonenumber-js'; import { useState } from 'react'; -import { ALERT_STATUS } from '../components/ImportDialog/Steps/ImportAlert'; +import { ALERT_STATUS } from '../components/ImportDialog/elements/ImportAlert'; import { importResultAdd } from '../store'; import messageIds from '../l10n/messageIds'; import prepareImportOperations from '../utils/prepareImportOperations'; diff --git a/src/features/import/hooks/useStatusReport.ts b/src/features/import/hooks/useStatusReport.ts index d195df69e7..ca21ec3cc3 100644 --- a/src/features/import/hooks/useStatusReport.ts +++ b/src/features/import/hooks/useStatusReport.ts @@ -1,4 +1,4 @@ -import { ALERT_STATUS } from '../components/ImportDialog/Steps/ImportAlert'; +import { ALERT_STATUS } from '../components/ImportDialog/elements/ImportAlert'; import getAddedOrgsSummary from '../utils/getAddedOrgsSummary'; import messageIds from '../l10n/messageIds'; import { useAppSelector } from 'core/hooks';