Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/ConnectionLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<ConnectionLayoutProps, 'title' | 'titleStyle' | 'children' | 'titleAlreadyTranslated'>;
Expand Down Expand Up @@ -113,7 +113,7 @@ function ConnectionLayout({
shouldLoadForEmptyConnection = false,
onBackButtonPress = () => Navigation.goBack(),
shouldBeBlocked = false,
shouldForceBeBlocked = false,
shouldBeForceBlocked = false,
}: ConnectionLayoutProps) {
const {translate} = useLocalize();

Expand All @@ -137,7 +137,7 @@ function ConnectionLayout({
policyID={policyID}
accessVariants={accessVariants}
featureName={featureName}
shouldBeBlocked={(!!shouldBeBlocked && shouldBlockByConnection) || shouldForceBeBlocked}
shouldBeBlocked={(!!shouldBeBlocked && shouldBlockByConnection) || shouldBeForceBlocked}
>
<ScreenWrapper
enableEdgeToEdgeBottomSafeAreaPadding
Expand Down
20 changes: 20 additions & 0 deletions src/hooks/useSelectionListSearch.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import type {ListItem} from '@components/SelectionList/types';

import tokenizedSearch from '@libs/tokenizedSearch';

import CONST from '@src/CONST';

import useLocalize from './useLocalize';
import useSearchResults from './useSearchResults';

function useSelectionListSearch<T extends ListItem & {value: string}>(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,
};
Comment thread
s77rt marked this conversation as resolved.
Resolved
return {filteredData, textInputOptions};
}
export default useSelectionListSearch;
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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();
Expand All @@ -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) {
Expand Down Expand Up @@ -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}
Comment thread
s77rt marked this conversation as resolved.
Resolved
Comment thread
s77rt marked this conversation as resolved.
Resolved
headerContent={listHeaderComponent}
onBackButtonPress={() => Navigation.goBack()}
title="workspace.rillet.subsidiary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -50,6 +51,7 @@ function RilletBillPaymentAccountPage({policy}: WithPolicyConnectionsProps) {
keyForList: accountItem.code,
isSelected: billPaymentAccountCode === accountItem.code,
})) ?? [];
const {filteredData, textInputOptions} = useSelectionListSearch(data);

const headerContent = (
<View>
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -50,6 +51,7 @@ function RilletExpensifyCardSettlementAccountPage({policy}: WithPolicyConnection
keyForList: bankAccountItem.id,
isSelected: settlementsBankAccountID === bankAccountItem.id,
})) ?? [];
const {filteredData, textInputOptions} = useSelectionListSearch(data);

const headerContent = (
<View>
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -50,6 +51,7 @@ function RilletTravelInvoicingSettlementAccountPage({policy}: WithPolicyConnecti
keyForList: bankAccountItem.id,
isSelected: travelInvoicingSettlementsBankAccountID === bankAccountItem.id,
})) ?? [];
const {filteredData, textInputOptions} = useSelectionListSearch(data);

const headerContent = (
<View>
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function RilletCardAccountCardList({
connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET}
onBackButtonPress={() => Navigation.goBack(backPath)}
shouldBeBlocked
shouldForceBeBlocked={!hasActiveCards}
shouldBeForceBlocked={!hasActiveCards}
>
<View>
<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.rillet.cardAccount.descriptionLevel2')}</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -75,6 +76,7 @@ function RilletCardProgramAccountSelector({
keyForList: accountItem.code,
isSelected: cardProgramAccountCode === accountItem.code,
})) ?? [];
const {filteredData, textInputOptions} = useSelectionListSearch(data);

const headerContent = (
<View>
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -52,6 +53,7 @@ function RilletCompanyCardAccountPage({policy}: WithPolicyConnectionsProps) {
keyForList: accountItem.code,
isSelected: creditCardAccountCode === accountItem.code,
})) ?? [];
const {filteredData, textInputOptions} = useSelectionListSearch(data);

const headerContent = (
<View>
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -45,6 +46,7 @@ function RilletDefaultCompanyCardVendorPage({policy}: WithPolicyConnectionsProps
keyForList: vendorItem.id,
isSelected: defaultCompanyCardVendorID === vendorItem.id,
})) ?? [];
const {filteredData, textInputOptions} = useSelectionListSearch(data);

const headerContent = (
<View>
Expand Down Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions src/types/onyx/Policy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2918,4 +2918,5 @@ export type {
RilletBankAccount,
RilletAutoSync,
RilletSync,
RilletSubsidiary,
};
Loading