diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx index 2601d20e065d..f3519f6272d9 100644 --- a/src/components/ConnectionLayout.tsx +++ b/src/components/ConnectionLayout.tsx @@ -78,7 +78,7 @@ type ConnectionLayoutProps = { shouldBeBlocked?: boolean; /** Whether or not to block user from accessing the page regardless of the connection state */ - shouldForceBeBlocked?: boolean; + shouldBeForceBlocked?: boolean; }; type ConnectionLayoutContentProps = Pick; @@ -113,7 +113,7 @@ function ConnectionLayout({ shouldLoadForEmptyConnection = false, onBackButtonPress = () => Navigation.goBack(), shouldBeBlocked = false, - shouldForceBeBlocked = false, + shouldBeForceBlocked = false, }: ConnectionLayoutProps) { const {translate} = useLocalize(); @@ -137,7 +137,7 @@ function ConnectionLayout({ policyID={policyID} accessVariants={accessVariants} featureName={featureName} - shouldBeBlocked={(!!shouldBeBlocked && shouldBlockByConnection) || shouldForceBeBlocked} + shouldBeBlocked={(!!shouldBeBlocked && shouldBlockByConnection) || shouldBeForceBlocked} > (data: T[]) { + const {translate} = useLocalize(); + const [searchValue, setSearchValue, filteredData] = useSearchResults(data, (item, searchInput) => tokenizedSearch([item], searchInput, () => [item.text ?? '', item.value]).length > 0); + const textInputOptions = { + label: data.length >= CONST.STANDARD_LIST_ITEM_LIMIT ? translate('common.search') : undefined, + value: searchValue, + onChangeText: setSearchValue, + }; + return {filteredData, textInputOptions}; +} +export default useSelectionListSearch; diff --git a/src/pages/workspace/accounting/rillet/RilletSubsidiarySelector.tsx b/src/pages/workspace/accounting/rillet/RilletSubsidiarySelector.tsx index 318371c41c0e..d093ddbe9213 100644 --- a/src/pages/workspace/accounting/rillet/RilletSubsidiarySelector.tsx +++ b/src/pages/workspace/accounting/rillet/RilletSubsidiarySelector.tsx @@ -1,10 +1,12 @@ import BlockingView from '@components/BlockingViews/BlockingView'; +import type {ListItem} from '@components/SelectionList/types'; import SelectionScreen from '@components/SelectionScreen'; import type {SelectorType} from '@components/SelectionScreen'; import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletSubsidiary} from '@libs/actions/connections/Rillet'; @@ -18,10 +20,15 @@ import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnec import variables from '@styles/variables'; import CONST from '@src/CONST'; +import type {RilletSubsidiary} from '@src/types/onyx/Policy'; import React from 'react'; import {View} from 'react-native'; +type SubsidiaryListItem = ListItem & { + value: RilletSubsidiary['id']; +}; + function RilletSubsidiarySelector({policy}: WithPolicyConnectionsProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); @@ -32,14 +39,15 @@ function RilletSubsidiarySelector({policy}: WithPolicyConnectionsProps) { const illustrations = useMemoizedLazyIllustrations(['Telescope']); - const subsidiaryListSections = subsidiaryList - ? subsidiaryList.map((subsidiary) => ({ - text: subsidiary.tradeName, - keyForList: subsidiary.id, - isSelected: subsidiary.id === currentSubsidiaryID, - value: subsidiary.id, + const data: SubsidiaryListItem[] = subsidiaryList + ? subsidiaryList.map((subsidiaryItem) => ({ + text: subsidiaryItem.tradeName, + keyForList: subsidiaryItem.id, + isSelected: subsidiaryItem.id === currentSubsidiaryID, + value: subsidiaryItem.id, })) : []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const updateSubsidiary = ({keyForList, value}: SelectorType) => { if (!keyForList || keyForList === currentSubsidiaryID) { @@ -73,10 +81,11 @@ function RilletSubsidiarySelector({policy}: WithPolicyConnectionsProps) { accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]} featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED} displayName="RilletSubsidiarySelector" - data={subsidiaryListSections} + data={filteredData} + textInputOptions={textInputOptions} connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET} onSelectRow={updateSubsidiary} - initiallyFocusedOptionKey={rilletConfig?.subsidiaryID ?? subsidiaryListSections?.at(0)?.keyForList} + initiallyFocusedOptionKey={rilletConfig?.subsidiaryID} headerContent={listHeaderComponent} onBackButtonPress={() => Navigation.goBack()} title="workspace.rillet.subsidiary" diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx index a97ae9552335..f69d3bcbb401 100644 --- a/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx +++ b/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx @@ -5,6 +5,7 @@ import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletBillPaymentAccount} from '@libs/actions/connections/Rillet'; @@ -50,6 +51,7 @@ function RilletBillPaymentAccountPage({policy}: WithPolicyConnectionsProps) { keyForList: accountItem.code, isSelected: billPaymentAccountCode === accountItem.code, })) ?? []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const headerContent = ( @@ -83,7 +85,8 @@ function RilletBillPaymentAccountPage({policy}: WithPolicyConnectionsProps) { shouldBeBlocked={shouldBeBlocked} displayName="RilletBillPaymentAccountPage" title="workspace.rillet.billPaymentAccount.label" - data={data} + data={filteredData} + textInputOptions={textInputOptions} headerContent={headerContent} listEmptyContent={listEmptyContent} onSelectRow={setBillPaymentAccount} diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx index 5a29e30275b3..11f08bac3ce8 100644 --- a/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx +++ b/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx @@ -5,6 +5,7 @@ import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletSettlementsAccount} from '@libs/actions/connections/Rillet'; @@ -50,6 +51,7 @@ function RilletExpensifyCardSettlementAccountPage({policy}: WithPolicyConnection keyForList: bankAccountItem.id, isSelected: settlementsBankAccountID === bankAccountItem.id, })) ?? []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const headerContent = ( @@ -83,7 +85,8 @@ function RilletExpensifyCardSettlementAccountPage({policy}: WithPolicyConnection shouldBeBlocked={shouldBeBlocked} displayName="RilletExpensifyCardSettlementAccountPage" title="workspace.rillet.settlementAccount.label" - data={data} + data={filteredData} + textInputOptions={textInputOptions} headerContent={headerContent} listEmptyContent={listEmptyContent} onSelectRow={setSettlementsAccount} diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx index f82c306196e8..7451de5fab40 100644 --- a/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx +++ b/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx @@ -5,6 +5,7 @@ import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletTravelInvoicingSettlementsAccount} from '@libs/actions/connections/Rillet'; @@ -50,6 +51,7 @@ function RilletTravelInvoicingSettlementAccountPage({policy}: WithPolicyConnecti keyForList: bankAccountItem.id, isSelected: travelInvoicingSettlementsBankAccountID === bankAccountItem.id, })) ?? []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const headerContent = ( @@ -83,7 +85,8 @@ function RilletTravelInvoicingSettlementAccountPage({policy}: WithPolicyConnecti shouldBeBlocked={shouldBeBlocked} displayName="RilletTravelInvoicingSettlementAccountPage" title="workspace.rillet.travelInvoicingSettlementAccount.label" - data={data} + data={filteredData} + textInputOptions={textInputOptions} headerContent={headerContent} listEmptyContent={listEmptyContent} onSelectRow={setTravelInvoicingSettlementsAccount} diff --git a/src/pages/workspace/accounting/rillet/export/RilletCardAccountCardList.tsx b/src/pages/workspace/accounting/rillet/export/RilletCardAccountCardList.tsx index 7f7e8646a9be..3355d52e2065 100644 --- a/src/pages/workspace/accounting/rillet/export/RilletCardAccountCardList.tsx +++ b/src/pages/workspace/accounting/rillet/export/RilletCardAccountCardList.tsx @@ -62,7 +62,7 @@ function RilletCardAccountCardList({ connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET} onBackButtonPress={() => Navigation.goBack(backPath)} shouldBeBlocked - shouldForceBeBlocked={!hasActiveCards} + shouldBeForceBlocked={!hasActiveCards} > {translate('workspace.rillet.cardAccount.descriptionLevel2')} diff --git a/src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx b/src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx index f9a9d8cc0868..d318f1acff16 100644 --- a/src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx +++ b/src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx @@ -7,6 +7,7 @@ import useCardFeeds from '@hooks/useCardFeeds'; import useCardsLists from '@hooks/useCardsLists'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletCardProgramAccount} from '@libs/actions/connections/Rillet'; @@ -75,6 +76,7 @@ function RilletCardProgramAccountSelector({ keyForList: accountItem.code, isSelected: cardProgramAccountCode === accountItem.code, })) ?? []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const headerContent = ( @@ -110,7 +112,8 @@ function RilletCardProgramAccountSelector({ featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED} displayName="RilletCardProgramAccountSelector" headerTitleAlreadyTranslated={title} - data={data} + data={filteredData} + textInputOptions={textInputOptions} shouldBeBlocked={!hasActiveCards} headerContent={headerContent} listEmptyContent={listEmptyContent} diff --git a/src/pages/workspace/accounting/rillet/export/RilletCompanyCardAccountPage.tsx b/src/pages/workspace/accounting/rillet/export/RilletCompanyCardAccountPage.tsx index 8cdd725b270d..b687953355f6 100644 --- a/src/pages/workspace/accounting/rillet/export/RilletCompanyCardAccountPage.tsx +++ b/src/pages/workspace/accounting/rillet/export/RilletCompanyCardAccountPage.tsx @@ -5,6 +5,7 @@ import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletCreditCardAccount} from '@libs/actions/connections/Rillet'; @@ -52,6 +53,7 @@ function RilletCompanyCardAccountPage({policy}: WithPolicyConnectionsProps) { keyForList: accountItem.code, isSelected: creditCardAccountCode === accountItem.code, })) ?? []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const headerContent = ( @@ -84,7 +86,8 @@ function RilletCompanyCardAccountPage({policy}: WithPolicyConnectionsProps) { featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED} displayName="RilletCompanyCardAccountPage" title="workspace.rillet.companyCardAccount.label" - data={data} + data={filteredData} + textInputOptions={textInputOptions} headerContent={headerContent} listEmptyContent={listEmptyContent} onSelectRow={selectCreditCardAccount} diff --git a/src/pages/workspace/accounting/rillet/export/RilletDefaultCompanyCardVendorPage.tsx b/src/pages/workspace/accounting/rillet/export/RilletDefaultCompanyCardVendorPage.tsx index 81f306ebc6f5..0b3a7918aaad 100644 --- a/src/pages/workspace/accounting/rillet/export/RilletDefaultCompanyCardVendorPage.tsx +++ b/src/pages/workspace/accounting/rillet/export/RilletDefaultCompanyCardVendorPage.tsx @@ -5,6 +5,7 @@ import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; +import useSelectionListSearch from '@hooks/useSelectionListSearch'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearRilletErrorField, updateRilletDefaultVendor} from '@libs/actions/connections/Rillet'; @@ -45,6 +46,7 @@ function RilletDefaultCompanyCardVendorPage({policy}: WithPolicyConnectionsProps keyForList: vendorItem.id, isSelected: defaultCompanyCardVendorID === vendorItem.id, })) ?? []; + const {filteredData, textInputOptions} = useSelectionListSearch(data); const headerContent = ( @@ -77,7 +79,8 @@ function RilletDefaultCompanyCardVendorPage({policy}: WithPolicyConnectionsProps featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED} displayName="RilletDefaultCompanyCardVendorPage" title="workspace.rillet.defaultCompanyCardVendor.label" - data={data} + data={filteredData} + textInputOptions={textInputOptions} headerContent={headerContent} listEmptyContent={listEmptyContent} onSelectRow={selectDefaultVendor} diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts index fb31d3e64a11..b2e068b59646 100644 --- a/src/types/onyx/Policy.ts +++ b/src/types/onyx/Policy.ts @@ -2918,4 +2918,5 @@ export type { RilletBankAccount, RilletAutoSync, RilletSync, + RilletSubsidiary, };