From a020d54981ece49e15a4d4688b305a5cd387357d Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 28 Jun 2024 04:02:12 +0530 Subject: [PATCH 01/38] feat: added page for token input --- src/ROUTES.ts | 8 ++++++-- src/SCREENS.ts | 1 + src/components/ConnectToNetSuiteButton/index.tsx | 6 ++---- .../AppNavigator/ModalStackNavigators/index.tsx | 1 + .../linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts | 1 + src/libs/Navigation/linkingConfig/config.ts | 1 + src/libs/Navigation/types.ts | 3 +++ .../accounting/netsuite/NetSuiteTokenInputPage.tsx | 9 +++++++++ 8 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index c4afee12952e..fadf1c6bbb6c 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -922,8 +922,12 @@ const ROUTES = { getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/taxes` as const, }, POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR: { - route: 'settings/workspaces/:policyID/accounting/net-suite/subsidiary-selector', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/net-suite/subsidiary-selector` as const, + route: 'settings/workspaces/:policyID/accounting/netsuite/subsidiary-selector', + getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/subsidiary-selector` as const, + }, + POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT: { + route: 'settings/workspaces/:policyID/accounting/netsuite/token-input', + getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/token-input` as const, }, RESTRICTED_ACTION: { route: 'restricted-action/workspace/:policyID', diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 5ef7f2693512..a12e6234a512 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -273,6 +273,7 @@ const SCREENS = { XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Bill_Payment_Account_Selector', XERO_EXPORT_BANK_ACCOUNT_SELECT: 'Policy_Accounting_Xero_Export_Bank_Account_Select', NETSUITE_SUBSIDIARY_SELECTOR: 'Policy_Accounting_Net_Suite_Subsidiary_Selector', + NETSUITE_TOKEN_INPUT: 'Policy_Accounting_Net_Suite_Token_Input', }, INITIAL: 'Workspace_Initial', PROFILE: 'Workspace_Profile', diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx index fc948503a127..a0cd36671117 100644 --- a/src/components/ConnectToNetSuiteButton/index.tsx +++ b/src/components/ConnectToNetSuiteButton/index.tsx @@ -26,8 +26,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon return; } - // TODO: Will be updated to new token input page - Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID)); + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID)); }} text={translate('workspace.accounting.setup')} style={styles.justifyContentCenter} @@ -39,8 +38,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon onConfirm={() => { removePolicyConnection(policyID, integrationToDisconnect); - // TODO: Will be updated to new token input page - Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID)); + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID)); setIsDisconnectModalOpen(false); }} integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.NETSUITE} diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 6e9782defe4f..8275436b973b 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -319,6 +319,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage').default, [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: () => require('../../../../pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector').default, + [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: () => require('../../../../pages/workspace/accounting/netsuite/NetSuiteTokenInputPage').default, [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default, [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default, [SCREENS.WORKSPACE.TAX_EDIT]: () => require('../../../../pages/workspace/taxes/WorkspaceEditTaxPage').default, diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts index b2a69d3aeb39..1c6022802ce9 100755 --- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts +++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts @@ -56,6 +56,7 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial> = { SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR, SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT, SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR, + SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT, ], [SCREENS.WORKSPACE.TAXES]: [ SCREENS.WORKSPACE.TAXES_SETTINGS, diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 49dcd6f8b246..d0af5f756fda 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -354,6 +354,7 @@ const config: LinkingOptions['config'] = { [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT.route}, [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.route}, [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.route}, + [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.route}, [SCREENS.WORKSPACE.DESCRIPTION]: { path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 164dea5cfffa..9c9a69039dad 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -390,6 +390,9 @@ type SettingsNavigatorParamList = { [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: { policyID: string; }; + [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: { + policyID: string; + }; [SCREENS.GET_ASSISTANCE]: { backTo: Routes; }; diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx new file mode 100644 index 000000000000..212c41367ee3 --- /dev/null +++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx @@ -0,0 +1,9 @@ +import React from 'react'; + +function NetSuiteTokenInputPage() { + return <>Token Input; +} + +NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage'; + +export default NetSuiteTokenInputPage; \ No newline at end of file From b977ffdb8eac5f96f3fc742a1e0493a6034e71c5 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Fri, 28 Jun 2024 04:13:47 +0530 Subject: [PATCH 02/38] feat: added connection layout --- src/components/ConnectionLayout.tsx | 6 +++- src/languages/en.ts | 3 ++ src/languages/es.ts | 3 ++ .../netsuite/NetSuiteTokenInputPage.tsx | 29 +++++++++++++++++-- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx index 7e29da7763c5..cedda2259cc5 100644 --- a/src/components/ConnectionLayout.tsx +++ b/src/components/ConnectionLayout.tsx @@ -60,6 +60,9 @@ type ConnectionLayoutProps = { /** Name of the current connection */ connectionName: ConnectionName; + + /** Allow without connection */ + allowWithoutConnection?: boolean; }; type ConnectionLayoutContentProps = Pick; @@ -91,6 +94,7 @@ function ConnectionLayout({ shouldUseScrollView = true, headerTitleAlreadyTranslated, titleAlreadyTranslated, + allowWithoutConnection = false, }: ConnectionLayoutProps) { const {translate} = useLocalize(); @@ -115,7 +119,7 @@ function ConnectionLayout({ policyID={policyID} accessVariants={accessVariants} featureName={featureName} - shouldBeBlocked={isConnectionEmpty} + shouldBeBlocked={allowWithoutConnection !== true && isConnectionEmpty} > Token Input; +function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) { + const policyID = policy?.id ?? '-1'; + const styles = useThemeStyles(); + + return ( + + Test + + ); } NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage'; -export default NetSuiteTokenInputPage; \ No newline at end of file +export default withPolicyConnections(NetSuiteTokenInputPage); From 3f847a4c0a53fb94b55e31085a601c208d5cfd6f Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Sat, 29 Jun 2024 01:48:38 +0530 Subject: [PATCH 03/38] feat: ui setup for form steps --- src/CONST.ts | 1 + .../ConnectPolicyToNetSuiteParams.ts | 8 +++ src/libs/API/parameters/index.ts | 1 + src/libs/API/types.ts | 2 + .../ModalStackNavigators/index.tsx | 2 +- .../NetSuiteTokenInputPage.tsx | 56 +++++++++++++++++++ .../substeps/NetSuiteTokenInputForm.tsx | 27 +++++++++ .../NetSuiteTokenInputStaticContent.tsx | 27 +++++++++ .../NetSuiteTokenInputStaticContent2.tsx | 27 +++++++++ .../netsuite/NetSuiteTokenInputPage.tsx | 32 ----------- 10 files changed, 150 insertions(+), 33 deletions(-) create mode 100644 src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts create mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx create mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx create mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputStaticContent.tsx create mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputStaticContent2.tsx delete mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx diff --git a/src/CONST.ts b/src/CONST.ts index 233b35e6ac4b..747d93a10f70 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1339,6 +1339,7 @@ const CONST = { NETSUITE_CONFIG: { SUBSIDIARY: 'subsidiary', + TOKEN_INPUT_STEP_NAMES: ['1', '2,', '3', '4', '5'] }, QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE: { diff --git a/src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts b/src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts new file mode 100644 index 000000000000..2608b1831487 --- /dev/null +++ b/src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts @@ -0,0 +1,8 @@ +type ConnectPolicyToNetSuiteParams = { + policyID: string; + accountID: string; + tokenID: string; + tokenSecret: string; +}; + +export default ConnectPolicyToNetSuiteParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 7cd9454bbcff..99977913067b 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -235,3 +235,4 @@ export type {default as UpdateSubscriptionAddNewUsersAutomaticallyParams} from ' export type {default as GenerateSpotnanaTokenParams} from './GenerateSpotnanaTokenParams'; export type {default as UpdateSubscriptionSizeParams} from './UpdateSubscriptionSizeParams'; export type {default as UpdateNetSuiteSubsidiaryParams} from './UpdateNetSuiteSubsidiaryParams'; +export type {default as ConnectPolicyToNetSuiteParams} from './ConnectPolicyToNetSuiteParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 644c77630c14..c81fa867555f 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -230,6 +230,7 @@ const WRITE_COMMANDS = { UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize', UPDATE_NETSUITE_SUBSIDIARY: 'UpdateNetSuiteSubsidiary', CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct', + CONNECT_POLICY_TO_NETSUITE: 'ConnectPolicyToNetSuite', } as const; type WriteCommand = ValueOf; @@ -463,6 +464,7 @@ type WriteCommandParameters = { // Netsuite parameters [WRITE_COMMANDS.UPDATE_NETSUITE_SUBSIDIARY]: Parameters.UpdateNetSuiteSubsidiaryParams; + [WRITE_COMMANDS.CONNECT_POLICY_TO_NETSUITE]: Parameters.ConnectPolicyToNetSuiteParams; }; const READ_COMMANDS = { diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 0e9d2e7f1b5e..e7166f881354 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -319,7 +319,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage').default, [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: () => require('../../../../pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector').default, - [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: () => require('../../../../pages/workspace/accounting/netsuite/NetSuiteTokenInputPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: () => require('../../../../pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage').default, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default, [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () => require('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default, diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx new file mode 100644 index 000000000000..0455b7b577e2 --- /dev/null +++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx @@ -0,0 +1,56 @@ +import ConnectionLayout from '@components/ConnectionLayout'; +import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; +import React from 'react'; +import withPolicyConnections from '@pages/workspace/withPolicyConnections'; +import CONST from '@src/CONST'; +import useThemeStyles from '@hooks/useThemeStyles'; +import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader'; +import { View } from 'react-native'; +import useSubStep from '@hooks/useSubStep'; +import type { SubStepProps } from '@hooks/useSubStep/types'; +import NetSuiteTokenInputStaticContent from './substeps/NetSuiteTokenInputStaticContent'; +import NetSuiteTokenInputStaticContent2 from './substeps/NetSuiteTokenInputStaticContent2'; +import NetSuiteTokenInputForm from './substeps/NetSuiteTokenInputForm'; + +const tokenInputSteps: Array> = [NetSuiteTokenInputStaticContent, NetSuiteTokenInputStaticContent2, NetSuiteTokenInputStaticContent, NetSuiteTokenInputStaticContent2, NetSuiteTokenInputForm]; + +function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) { + const policyID = policy?.id ?? '-1'; + const styles = useThemeStyles(); + + const submit = () => { + alert('Submit'); + }; + + const {componentToRender: SubStep, isEditing, nextScreen, moveTo} = useSubStep({bodyContent: tokenInputSteps, startFrom: 0, onFinished: submit}); + + return ( + + + + + + + ); +} + +NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage'; + +export default withPolicyConnections(NetSuiteTokenInputPage); diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx new file mode 100644 index 000000000000..cc6e3d3bc53a --- /dev/null +++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx @@ -0,0 +1,27 @@ +import React from 'react'; +import {View} from 'react-native'; +import Button from '@components/Button'; +import Text from '@components/Text'; +import type { SubStepProps } from '@hooks/useSubStep/types'; +import useThemeStyles from '@hooks/useThemeStyles'; +import useLocalize from '@hooks/useLocalize'; + +function NetSuiteTokenInputForm({onNext, screenIndex}: SubStepProps) { +const styles = useThemeStyles(); +const {translate} = useLocalize(); + return ( + + Form {screenIndex} +