Merge pull request Expensify#88445 from Expensify/lucien/fix-netsuite-intacct-broken-connections

Exclude broken reusable connections for NetSuite/Sage Intacct

Author: francoisl

src/components/ConnectToNetSuiteFlow/index.tsx

@@ -1,5 +1,6 @@
 import React, {useEffect, useState} from 'react';
 import PopoverMenu from '@components/PopoverMenu';
+import useHasReusablePoliciesConnectedTo from '@hooks/useHasReusablePoliciesConnectedTo';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -12,13 +13,12 @@ import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import {hasPoliciesConnectedToNetSuiteSelector} from '@src/selectors/Policy';
 import type {ConnectToNetSuiteFlowProps} from './types';
 
 function ConnectToNetSuiteFlow({policyID}: ConnectToNetSuiteFlowProps) {
     const {translate} = useLocalize();
 
-    const [hasPoliciesConnectedToNetSuite] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: hasPoliciesConnectedToNetSuiteSelector});
+    const hasReusablePoliciesConnectedToNetSuite = useHasReusablePoliciesConnectedTo(CONST.POLICY.CONNECTIONS.NAME.NETSUITE, policyID);
 
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use the correct modal type
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -54,7 +54,7 @@ function ConnectToNetSuiteFlow({policyID}: ConnectToNetSuiteFlowProps) {
     ];
 
     useEffect(() => {
-        if (shouldGoToCredentialsPage || !hasPoliciesConnectedToNetSuite) {
+        if (shouldGoToCredentialsPage || !hasReusablePoliciesConnectedToNetSuite) {
             Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID, getInitialSubPageForNetsuiteTokenInput(policy)));
             return;
         }

src/components/ConnectToQuickbooksDesktopFlow/index.tsx

@@ -1,12 +1,13 @@
 import {useEffect} from 'react';
-import useReusablePoliciesConnectedToQBD from '@hooks/useReusablePoliciesConnectedToQBD';
+import useHasReusablePoliciesConnectedTo from '@hooks/useHasReusablePoliciesConnectedTo';
 import Navigation from '@libs/Navigation/Navigation';
 import getQuickbooksDesktopSetupEntryRoute from '@pages/workspace/accounting/qbd/utils';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {ConnectToQuickbooksDesktopFlowProps} from './types';
 
 function ConnectToQuickbooksDesktopFlow({policyID}: ConnectToQuickbooksDesktopFlowProps) {
-    const {hasReusablePoliciesConnectedToQBD} = useReusablePoliciesConnectedToQBD(policyID);
+    const hasReusablePoliciesConnectedToQBD = useHasReusablePoliciesConnectedTo(CONST.POLICY.CONNECTIONS.NAME.QBD, policyID);
 
     useEffect(() => {
         if (hasReusablePoliciesConnectedToQBD) {

src/components/ConnectToSageIntacctFlow/index.tsx

@@ -1,5 +1,5 @@
 import {useEffect} from 'react';
-import useHasPoliciesConnectedToSageIntacct from '@hooks/useHasPoliciesConnectedToSageIntacct';
+import useHasReusablePoliciesConnectedTo from '@hooks/useHasReusablePoliciesConnectedTo';
 import useOnyx from '@hooks/useOnyx';
 import {isAuthenticationError} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
@@ -12,7 +12,7 @@ type ConnectToSageIntacctFlowProps = {
 };
 
 function ConnectToSageIntacctFlow({policyID}: ConnectToSageIntacctFlowProps) {
-    const hasPoliciesConnectedToSageIntacct = useHasPoliciesConnectedToSageIntacct();
+    const hasReusablePoliciesConnectedToSageIntacct = useHasReusablePoliciesConnectedTo(CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT, policyID);
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
     const shouldGoToEnterCredentials = isAuthenticationError(policy, CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT);
 
@@ -21,7 +21,7 @@ function ConnectToSageIntacctFlow({policyID}: ConnectToSageIntacctFlowProps) {
             Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.getRoute(policyID));
             return;
         }
-        if (!hasPoliciesConnectedToSageIntacct) {
+        if (!hasReusablePoliciesConnectedToSageIntacct) {
             Navigation.navigate(`${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.SAGE_INTACCT_PREREQUISITES.path}`);
             return;
         }

src/hooks/useAdminPoliciesConnectedToNetSuite.ts

@@ -0,0 +1,14 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {hasReusablePoliciesConnectedToSelector} from '@src/selectors/Policy';
+import type {ReusablePolicyConnectionName} from '@src/selectors/Policy';
+import type {Policy} from '@src/types/onyx';
+import useOnyx from './useOnyx';
+
+function useHasReusablePoliciesConnectedTo(connectionName: ReusablePolicyConnectionName, policyID: string | undefined) {
+    const selector = (policies: OnyxCollection<Policy>) => hasReusablePoliciesConnectedToSelector(policies, connectionName, policyID);
+    const [hasReusablePoliciesConnectedTo] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector});
+    return !!hasReusablePoliciesConnectedTo;
+}
+
+export default useHasReusablePoliciesConnectedTo;

src/hooks/useAdminPoliciesConnectedToSageIntacct.ts

@@ -0,0 +1,16 @@
+import ONYXKEYS from '@src/ONYXKEYS';
+import {reusablePoliciesConnectedToSelector} from '@src/selectors/Policy';
+import type {ReusablePolicyConnectionName} from '@src/selectors/Policy';
+import useOnyx from './useOnyx';
+
+function useReusablePoliciesConnectedTo(connectionName: ReusablePolicyConnectionName, policyID: string | undefined) {
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const reusablePoliciesConnectedTo = reusablePoliciesConnectedToSelector(policies, connectionName, policyID);
+
+    return {
+        hasReusablePoliciesConnectedTo: reusablePoliciesConnectedTo.length > 0,
+        reusablePoliciesConnectedTo,
+    };
+}
+
+export default useReusablePoliciesConnectedTo;

src/hooks/useHasPoliciesConnectedToSageIntacct.ts

@@ -3,14 +3,14 @@ import type {RefObject} from 'react';
 import type {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
-import useHasPoliciesConnectedToSageIntacct from '@hooks/useHasPoliciesConnectedToSageIntacct';
+import useHasReusablePoliciesConnectedTo from '@hooks/useHasReusablePoliciesConnectedTo';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
-import useReusablePoliciesConnectedToQBD from '@hooks/useReusablePoliciesConnectedToQBD';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
 import {isControlPolicy} from '@libs/PolicyUtils';
 import {getAccountingIntegrationData} from '@pages/workspace/accounting/utils';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type Policy from '@src/types/onyx/Policy';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
@@ -30,8 +30,8 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
     const {translate} = useLocalize();
     const policyID = policy?.id;
     const accountingIcons = useMemoizedLazyExpensifyIcons(['IntacctSquare', 'QBOSquare', 'XeroSquare', 'NetSuiteSquare', 'QBDSquare']);
-    const hasPoliciesConnectedToSageIntacct = useHasPoliciesConnectedToSageIntacct();
-    const {hasReusablePoliciesConnectedToQBD} = useReusablePoliciesConnectedToQBD(policyID);
+    const hasReusablePoliciesConnectedToSageIntacct = useHasReusablePoliciesConnectedTo(CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT, policyID);
+    const hasReusablePoliciesConnectedToQBD = useHasReusablePoliciesConnectedTo(CONST.POLICY.CONNECTIONS.NAME.QBD, policyID);
 
     const startIntegrationFlow = useCallback(
         (newActiveIntegration: ActiveIntegration) => {
@@ -43,7 +43,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
                 newActiveIntegration.name,
                 policyID,
                 translate,
-                {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasReusablePoliciesConnectedToQBD},
+                {sageIntacct: hasReusablePoliciesConnectedToSageIntacct, qbd: hasReusablePoliciesConnectedToQBD},
                 undefined,
                 undefined,
                 newActiveIntegration.integrationToDisconnect,
@@ -63,7 +63,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
                 key: Math.random(),
             });
         },
-        [policy, policyID, translate, hasPoliciesConnectedToSageIntacct, hasReusablePoliciesConnectedToQBD, accountingIcons],
+        [policy, policyID, translate, hasReusablePoliciesConnectedToSageIntacct, hasReusablePoliciesConnectedToQBD, accountingIcons],
     );
 
     const closeConfirmationModal = () => {
@@ -103,7 +103,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
             activeIntegration.name,
             policyID,
             translate,
-            {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasReusablePoliciesConnectedToQBD},
+            {sageIntacct: hasReusablePoliciesConnectedToSageIntacct, qbd: hasReusablePoliciesConnectedToQBD},
             policy,
             activeIntegration.key,
             undefined,