diff --git a/src/CONST/index.ts b/src/CONST/index.ts index f95f82031b13..d51e7ffc7982 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -2641,7 +2641,15 @@ const CONST = { JOBS: 'jobs', }, }, - NETSUITE_ADD_CUSTOM_LIST_STEP_NAMES: ['1', '2,', '3', '4'], + NETSUITE_ADD_CUSTOM_LIST: { + STEP_INDEX_LIST: ['1', '2', '3', '4'], + PAGE_NAME: { + NAME: 'name', + FIELD_ID: 'field-id', + MAPPING_TITLE: 'mapping-title', + CONFIRM: 'confirm', + }, + }, NETSUITE_ADD_CUSTOM_SEGMENT_STEP_NAMES: ['1', '2,', '3', '4', '5', '6,'], }, diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 1927333078e2..8126e028011d 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -3449,8 +3449,16 @@ const ROUTES = { }, }, POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD: { - route: 'workspaces/:policyID/accounting/netsuite/import/custom-list/new', - getRoute: (policyID: string) => `workspaces/${policyID}/accounting/netsuite/import/custom-list/new` as const, + route: 'workspaces/:policyID/accounting/netsuite/import/custom-list/new/:subPage?/:action?', + getRoute: (policyID: string | undefined, subPage?: string, action?: 'edit') => { + if (!policyID) { + Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD route'); + } + if (!subPage) { + return `workspaces/${policyID}/accounting/netsuite/import/custom-list/new` as const; + } + return `workspaces/${policyID}/accounting/netsuite/import/custom-list/new/${subPage}${action ? `/${action}` : ''}` as const; + }, }, POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD: { route: 'workspaces/:policyID/accounting/netsuite/import/custom-segment/new', diff --git a/src/hooks/useNetSuiteImportAddCustomListForm.ts b/src/hooks/useNetSuiteImportAddCustomListForm.ts index aeb37d54b3ba..39d4c5cb88f0 100644 --- a/src/hooks/useNetSuiteImportAddCustomListForm.ts +++ b/src/hooks/useNetSuiteImportAddCustomListForm.ts @@ -2,9 +2,9 @@ import type {FormOnyxKeys} from '@components/Form/types'; import type {OnyxFormKey} from '@src/ONYXKEYS'; import ONYXKEYS from '@src/ONYXKEYS'; import useStepFormSubmit from './useStepFormSubmit'; -import type {SubStepProps} from './useSubStep/types'; +import type {SubPageProps} from './useSubPage/types'; -type UseNetSuiteImportAddCustomListFormSubmitParams = Pick & { +type UseNetSuiteImportAddCustomListFormSubmitParams = Pick & { formId?: OnyxFormKey; fieldIds: Array>; shouldSaveDraft: boolean; diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 422034738020..f3109bc9d7f9 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -91,6 +91,9 @@ const OPTIONS_PER_SCREEN: Partial [SCREENS.MISSING_PERSONAL_DETAILS]: { animationTypeForReplace: 'push', }, + [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD]: { + animationTypeForReplace: 'push', + }, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: { animationTypeForReplace: 'push', }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 10bba5849f93..b764d3c40386 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -972,6 +972,8 @@ type SettingsNavigatorParamList = { }; [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD]: { policyID: string; + subPage?: string; + action?: 'edit'; }; [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD]: { policyID: string; diff --git a/src/libs/actions/connections/NetSuiteCommands.ts b/src/libs/actions/connections/NetSuiteCommands.ts index f1aa13731995..8d817ea72c71 100644 --- a/src/libs/actions/connections/NetSuiteCommands.ts +++ b/src/libs/actions/connections/NetSuiteCommands.ts @@ -583,12 +583,16 @@ function updateNetSuiteCrossSubsidiaryCustomersConfiguration(policyID: string, i } function updateNetSuiteCustomSegments( - policyID: string, + policyID: string | undefined, records: NetSuiteCustomSegment[], oldRecords: NetSuiteCustomSegment[], modifiedSegmentID: string, pendingAction: OnyxCommon.PendingAction, ) { + if (!policyID) { + return; + } + const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS, records, oldRecords, modifiedSegmentID, pendingAction); API.write( @@ -601,7 +605,17 @@ function updateNetSuiteCustomSegments( ); } -function updateNetSuiteCustomLists(policyID: string, records: NetSuiteCustomList[], oldRecords: NetSuiteCustomList[], modifiedListID: string, pendingAction: OnyxCommon.PendingAction) { +function updateNetSuiteCustomLists( + policyID: string | undefined, + records: NetSuiteCustomList[], + oldRecords: NetSuiteCustomList[], + modifiedListID: string, + pendingAction: OnyxCommon.PendingAction, +) { + if (!policyID) { + return; + } + const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS, records, oldRecords, modifiedListID, pendingAction); API.write( WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_LISTS, diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx index 4eaa91158f54..ee552a478e70 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx @@ -1,15 +1,15 @@ import React, {useCallback, useMemo, useRef} from 'react'; -import type {ForwardedRef} from 'react'; import {InteractionManager, View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import ConnectionLayout from '@components/ConnectionLayout'; import type {FormRef} from '@components/Form/types'; -import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader'; -import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader'; -import useSubStep from '@hooks/useSubStep'; +import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; +import InteractiveStepSubPageHeader from '@components/InteractiveStepSubPageHeader'; +import ScreenWrapper from '@components/ScreenWrapper'; +import useSubPage from '@hooks/useSubPage'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; -import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; +import type {CustomFieldSubPageWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import {updateNetSuiteCustomLists} from '@userActions/connections/NetSuiteCommands'; import {clearDraftValues} from '@userActions/FormActions'; import CONST from '@src/CONST'; @@ -19,22 +19,27 @@ import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm'; import type {NetSuiteCustomFieldForm} from '@src/types/form/NetSuiteCustomFieldForm'; import type {Policy} from '@src/types/onyx'; import {getCustomListInitialSubstep, getSubstepValues} from './customUtils'; -import ChooseCustomListStep from './substeps/ChooseCustomListStep'; -import ConfirmCustomListStep from './substeps/ConfirmCustomListStep'; -import CustomListMappingStep from './substeps/CustomListMappingStep'; -import TransactionFieldIDStep from './substeps/TransactionFieldIDStep'; +import ChooseCustomListStep from './subPages/ChooseCustomListStep'; +import ConfirmCustomListStep from './subPages/ConfirmCustomListStep'; +import CustomListMappingStep from './subPages/CustomListMappingStep'; +import TransactionFieldIDStep from './subPages/TransactionFieldIDStep'; type NetSuiteImportAddCustomListContentProps = { policy: OnyxEntry; + policyIDParam: string | undefined; draftValues: OnyxEntry; }; -const formSteps = [ChooseCustomListStep, TransactionFieldIDStep, CustomListMappingStep, ConfirmCustomListStep]; +const pages = [ + {pageName: CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_LIST.PAGE_NAME.NAME, component: ChooseCustomListStep}, + {pageName: CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_LIST.PAGE_NAME.FIELD_ID, component: TransactionFieldIDStep}, + {pageName: CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_LIST.PAGE_NAME.MAPPING_TITLE, component: CustomListMappingStep}, + {pageName: CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_LIST.PAGE_NAME.CONFIRM, component: ConfirmCustomListStep}, +]; -function NetSuiteImportAddCustomListContent({policy, draftValues}: NetSuiteImportAddCustomListContentProps) { - const policyID = policy?.id ?? '-1'; +function NetSuiteImportAddCustomListContent({policy, draftValues, policyIDParam}: NetSuiteImportAddCustomListContentProps) { + const policyID = policy?.id; const styles = useThemeStyles(); - const ref: ForwardedRef = useRef(null); const formRef = useRef(null); const values = useMemo(() => getSubstepValues(draftValues), [draftValues]); @@ -66,45 +71,48 @@ function NetSuiteImportAddCustomListContent({policy, draftValues}: NetSuiteImpor }); }, [values, customLists, policyID]); - const { - componentToRender: SubStep, - isEditing, - nextScreen, - prevScreen, - screenIndex, - moveTo, - goToTheLastStep, - } = useSubStep({ - bodyContent: formSteps, + const {CurrentPage, isEditing, nextPage, prevPage, pageIndex, moveTo, isRedirecting} = useSubPage({ + pages, startFrom, onFinished: handleFinishStep, + buildRoute: (pageName, action) => ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD.getRoute(policyIDParam, pageName, action), }); + const goBackToConfirmStep = () => { + Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD.getRoute(policyIDParam, CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_LIST.PAGE_NAME.CONFIRM)); + }; + const handleBackButtonPress = () => { if (isEditing) { - goToTheLastStep(); + goBackToConfirmStep(); return; } // Clicking back on the first screen should go back to listing - if (screenIndex === CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER) { + if (pageIndex === CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER) { clearDraftValues(ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM); Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS)); return; } - ref.current?.movePrevious(); formRef.current?.resetErrors(); - prevScreen(); + prevPage(); }; const handleNextScreen = useCallback(() => { if (isEditing) { - goToTheLastStep(); + goBackToConfirmStep(); return; } - ref.current?.moveNext(); - nextScreen(); - }, [goToTheLastStep, isEditing, nextScreen]); + nextPage(); + }, [isEditing, goBackToConfirmStep, nextPage]); + + if (isRedirecting) { + return ( + + + + ); + } return ( - - ); diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx index 270df070fab4..d7ad8b47732c 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx @@ -21,12 +21,12 @@ import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm'; import type {NetSuiteCustomFieldForm} from '@src/types/form/NetSuiteCustomFieldForm'; import type {Policy} from '@src/types/onyx'; import {getCustomSegmentInitialSubstep, getSubstepValues} from './customUtils'; -import ChooseSegmentTypeStep from './substeps/ChooseSegmentTypeStep'; -import ConfirmCustomSegmentStep from './substeps/ConfirmCustomSegmentList'; -import CustomSegmentInternalIdStep from './substeps/CustomSegmentInternalIdStep'; -import CustomSegmentMappingStep from './substeps/CustomSegmentMappingStep'; -import CustomSegmentNameStep from './substeps/CustomSegmentNameStep'; -import CustomSegmentScriptIdStep from './substeps/CustomSegmentScriptIdStep'; +import ChooseSegmentTypeStep from './subPages/ChooseSegmentTypeStep'; +import ConfirmCustomSegmentStep from './subPages/ConfirmCustomSegmentList'; +import CustomSegmentInternalIdStep from './subPages/CustomSegmentInternalIdStep'; +import CustomSegmentMappingStep from './subPages/CustomSegmentMappingStep'; +import CustomSegmentNameStep from './subPages/CustomSegmentNameStep'; +import CustomSegmentScriptIdStep from './subPages/CustomSegmentScriptIdStep'; type NetSuiteImportAddCustomSegmentContentProps = { policy: OnyxEntry; @@ -36,7 +36,7 @@ type NetSuiteImportAddCustomSegmentContentProps = { const formSteps = [ChooseSegmentTypeStep, CustomSegmentNameStep, CustomSegmentInternalIdStep, CustomSegmentScriptIdStep, CustomSegmentMappingStep, ConfirmCustomSegmentStep]; function NetSuiteImportAddCustomSegmentContent({policy, draftValues}: NetSuiteImportAddCustomSegmentContentProps) { - const policyID = policy?.id ?? '-1'; + const policyID = policy?.id; const styles = useThemeStyles(); const ref: ForwardedRef = useRef(null); const formRef = useRef(null); @@ -132,7 +132,6 @@ function NetSuiteImportAddCustomSegmentContent({policy, draftValues}: NetSuiteIm onNext={handleNextScreen} onMove={moveTo} screenIndex={screenIndex} - policyID={policyID} policy={policy} importCustomField={CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS} customSegmentType={customSegmentType} diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseCustomListStep.tsx similarity index 95% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseCustomListStep.tsx index 4ab3671d1c3b..de58b07829a1 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseCustomListStep.tsx @@ -8,13 +8,13 @@ import useNetSuiteImportAddCustomListFormSubmit from '@hooks/useNetSuiteImportAd import useThemeStyles from '@hooks/useThemeStyles'; import {getFieldRequiredErrors} from '@libs/ValidationUtils'; import NetSuiteCustomListPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker'; -import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; +import type {CustomFieldSubPageWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import ONYXKEYS from '@src/ONYXKEYS'; import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm'; const STEP_FIELDS = [INPUT_IDS.LIST_NAME, INPUT_IDS.INTERNAL_ID]; -function ChooseCustomListStep({policy, onNext, isEditing, netSuiteCustomFieldFormValues}: CustomFieldSubStepWithPolicy) { +function ChooseCustomListStep({policy, onNext, isEditing, netSuiteCustomFieldFormValues}: CustomFieldSubPageWithPolicy) { const styles = useThemeStyles(); const {translate} = useLocalize(); diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseSegmentTypeStep.tsx similarity index 95% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseSegmentTypeStep.tsx index ad7515822152..ccf482aed343 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseSegmentTypeStep.tsx @@ -7,7 +7,7 @@ import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useNetSuiteImportAddCustomSegmentFormSubmit from '@hooks/useNetSuiteImportAddCustomSegmentForm'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as ValidationUtils from '@libs/ValidationUtils'; +import {isRequiredFulfilled} from '@libs/ValidationUtils'; import NetSuiteCustomSegmentMappingPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomSegmentMappingPicker'; import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import type CONST from '@src/CONST'; @@ -24,7 +24,7 @@ function ChooseSegmentTypeStep({onNext, setCustomSegmentType, isEditing, netSuit (values: FormOnyxValues): FormInputErrors => { const errors: FormInputErrors = {}; - if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.SEGMENT_TYPE])) { + if (!isRequiredFulfilled(values[INPUT_IDS.SEGMENT_TYPE])) { errors[INPUT_IDS.SEGMENT_TYPE] = translate('common.error.pleaseSelectOne'); } diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ConfirmCustomListStep.tsx similarity index 95% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ConfirmCustomListStep.tsx index 63c8f542943d..4e9070f53449 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ConfirmCustomListStep.tsx @@ -8,11 +8,11 @@ import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddi import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useThemeStyles from '@hooks/useThemeStyles'; -import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; +import type {CustomFieldSubPageWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import type {TranslationPaths} from '@src/languages/types'; import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm'; -function ConfirmCustomListStep({onMove, netSuiteCustomFieldFormValues: values, onNext}: CustomFieldSubStepWithPolicy) { +function ConfirmCustomListStep({onMove, netSuiteCustomFieldFormValues: values, onNext}: CustomFieldSubPageWithPolicy) { const styles = useThemeStyles(); const {translate} = useLocalize(); const {isOffline} = useNetwork(); diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ConfirmCustomSegmentList.tsx similarity index 100% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ConfirmCustomSegmentList.tsx diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomListMappingStep.tsx similarity index 93% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomListMappingStep.tsx index f3a5b8700f5f..e1a807538f67 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomListMappingStep.tsx @@ -6,9 +6,9 @@ import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useNetSuiteImportAddCustomListFormSubmit from '@hooks/useNetSuiteImportAddCustomListForm'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as ValidationUtils from '@libs/ValidationUtils'; +import {isRequiredFulfilled} from '@libs/ValidationUtils'; import NetSuiteCustomFieldMappingPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker'; -import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; +import type {CustomFieldSubPageWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -16,7 +16,7 @@ import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm'; const STEP_FIELDS = [INPUT_IDS.MAPPING]; -function CustomListMappingStep({importCustomField, customSegmentType, onNext, isEditing, netSuiteCustomFieldFormValues}: CustomFieldSubStepWithPolicy) { +function CustomListMappingStep({importCustomField, customSegmentType, onNext, isEditing, netSuiteCustomFieldFormValues}: CustomFieldSubPageWithPolicy) { const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -24,7 +24,7 @@ function CustomListMappingStep({importCustomField, customSegmentType, onNext, is (values: FormOnyxValues): FormInputErrors => { const errors: FormInputErrors = {}; - if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.MAPPING])) { + if (!isRequiredFulfilled(values[INPUT_IDS.MAPPING])) { errors[INPUT_IDS.MAPPING] = translate('common.error.pleaseSelectOne'); } diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentInternalIdStep.tsx similarity index 100% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentInternalIdStep.tsx diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentMappingStep.tsx similarity index 96% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentMappingStep.tsx index 5c982003e50f..e99eaa2402fb 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentMappingStep.tsx @@ -6,7 +6,7 @@ import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useNetSuiteImportAddCustomSegmentFormSubmit from '@hooks/useNetSuiteImportAddCustomSegmentForm'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as ValidationUtils from '@libs/ValidationUtils'; +import {isRequiredFulfilled} from '@libs/ValidationUtils'; import NetSuiteCustomFieldMappingPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker'; import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import CONST from '@src/CONST'; @@ -24,7 +24,7 @@ function CustomSegmentMappingStep({importCustomField, customSegmentType, onNext, const validate = useCallback( (values: FormOnyxValues): FormInputErrors => { const errors: FormInputErrors = {}; - if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.MAPPING])) { + if (!isRequiredFulfilled(values[INPUT_IDS.MAPPING])) { errors[INPUT_IDS.MAPPING] = translate('common.error.pleaseSelectOne'); } return errors; diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentNameStep.tsx similarity index 100% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentNameStep.tsx diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentScriptIdStep.tsx similarity index 100% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/CustomSegmentScriptIdStep.tsx diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/TransactionFieldIDStep.tsx similarity index 96% rename from src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx rename to src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/TransactionFieldIDStep.tsx index 3929d1f8cda5..2c8e720a8d29 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/TransactionFieldIDStep.tsx @@ -12,14 +12,14 @@ import useNetSuiteImportAddCustomListFormSubmit from '@hooks/useNetSuiteImportAd import useThemeStyles from '@hooks/useThemeStyles'; import Parser from '@libs/Parser'; import {isRequiredFulfilled} from '@libs/ValidationUtils'; -import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types'; +import type {CustomFieldSubPageWithPolicy} from '@pages/workspace/accounting/netsuite/types'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm'; const STEP_FIELDS = [INPUT_IDS.TRANSACTION_FIELD_ID]; -function TransactionFieldIDStep({onNext, isEditing, netSuiteCustomFieldFormValues, customLists}: CustomFieldSubStepWithPolicy) { +function TransactionFieldIDStep({onNext, isEditing, netSuiteCustomFieldFormValues, customLists}: CustomFieldSubPageWithPolicy) { const styles = useThemeStyles(); const {translate} = useLocalize(); const {inputCallbackRef} = useAutoFocusInput(); diff --git a/src/pages/workspace/accounting/netsuite/types.ts b/src/pages/workspace/accounting/netsuite/types.ts index 61f9ef5c1041..725140abf5d0 100644 --- a/src/pages/workspace/accounting/netsuite/types.ts +++ b/src/pages/workspace/accounting/netsuite/types.ts @@ -79,9 +79,27 @@ type ExpenseRouteParams = { }; type CustomFieldSubStepWithPolicy = SubStepProps & { - /** Policy ID of the current policy */ - policyID: string; + /** Current policy in the form steps */ + policy: Policy | undefined; + + /** Whether the page is a custom segment or custom list */ + importCustomField: ValueOf; + + /** Whether the record is custom segment or custom record */ + customSegmentType?: ValueOf; + + /** Callback to update the current segment type of the record */ + setCustomSegmentType?: (segmentType: ValueOf) => void; + + /** NetSuiteCustomFieldForm values */ + netSuiteCustomFieldFormValues: NetSuiteCustomFieldForm; + + customSegments?: NetSuiteCustomSegment[]; + + customLists?: NetSuiteCustomList[]; +}; +type CustomFieldSubPageWithPolicy = SubPageProps & { /** Current policy in the form steps */ policy: Policy | undefined; @@ -117,6 +135,7 @@ export type { AccordionItem, ExpenseRouteParams, CustomFieldSubStepWithPolicy, + CustomFieldSubPageWithPolicy, CustomListSelectorType, ExtendedMenuItemWithSubscribedSettings, CustomSubPageTokenInputProps,