From 1c6f6fd1d7f60e4231283c843103cb61164b25ba Mon Sep 17 00:00:00 2001 From: situchan Date: Thu, 15 Jan 2026 17:59:06 +0600 Subject: [PATCH 01/27] Expense rules phase 2 --- src/CONST/index.ts | 18 ++ src/ONYXKEYS.ts | 3 + src/ROUTES.ts | 7 + src/SCREENS.ts | 9 + src/components/Rule/RuleBooleanBase.tsx | 101 +++++++++ src/components/Rule/RuleTextBase.tsx | 76 +++++++ src/components/Rule/TextBase.tsx | 78 +++++++ .../Search/SearchFilterPageFooterButtons.tsx | 16 +- .../Search/SearchSingleSelectionPicker.tsx | 21 +- src/languages/en.ts | 27 +++ .../API/parameters/SetNameValuePairParams.ts | 3 +- src/libs/ExpenseRuleUtils.ts | 20 +- .../ModalStackNavigators/index.tsx | 9 + .../RELATIONS/SETTINGS_TO_RHP.ts | 12 +- src/libs/Navigation/linkingConfig/config.ts | 12 + src/libs/StringUtils/index.ts | 5 + src/libs/actions/User.ts | 11 + .../SearchFiltersCategoryPage.tsx | 1 + src/pages/settings/InitialSettingsPage.tsx | 7 + src/pages/settings/Rules/AddRule.tsx | 209 ++++++++++++++++++ src/pages/settings/Rules/AddRulePage.tsx | 28 +++ src/pages/settings/Rules/ExpenseRulesPage.tsx | 162 ++++++++++++-- .../settings/Rules/Fields/AddBillablePage.tsx | 14 ++ .../settings/Rules/Fields/AddCategoryPage.tsx | 80 +++++++ .../Rules/Fields/AddDescriptionPage.tsx | 17 ++ .../settings/Rules/Fields/AddMerchantPage.tsx | 18 ++ .../Rules/Fields/AddReimbursablePage.tsx | 14 ++ .../Rules/Fields/AddRenameMerchantPage.tsx | 17 ++ .../settings/Rules/Fields/AddReportPage.tsx | 17 ++ .../settings/Rules/Fields/AddTagPage.tsx | 72 ++++++ src/types/form/ExpenseRuleForm.ts | 26 +++ src/types/form/index.ts | 1 + src/types/onyx/ExpenseRule.ts | 3 + 33 files changed, 1074 insertions(+), 40 deletions(-) create mode 100644 src/components/Rule/RuleBooleanBase.tsx create mode 100644 src/components/Rule/RuleTextBase.tsx create mode 100644 src/components/Rule/TextBase.tsx create mode 100644 src/pages/settings/Rules/AddRule.tsx create mode 100644 src/pages/settings/Rules/AddRulePage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddBillablePage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddCategoryPage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddDescriptionPage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddMerchantPage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddReimbursablePage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddRenameMerchantPage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddReportPage.tsx create mode 100644 src/pages/settings/Rules/Fields/AddTagPage.tsx create mode 100644 src/types/form/ExpenseRuleForm.ts diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 79a6c40c91e0..7496c5352f2e 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -3697,6 +3697,24 @@ const CONST = { INVOICING: 'invoicing2018', }, }, + EXPENSE_RULES: { + FIELDS: { + BILLABLE: 'billable', + CATEGORY: 'category', + DESCRIPTION: 'comment', + CREATE_REPORT: 'createReport', + MERCHANT: 'merchantToMatch', + RENAME_MERCHANT: 'merchant', + REIMBURSABLE: 'reimbursable', + REPORT: 'report', + TAG: 'tag', + TAX: 'tax', + }, + BULK_ACTION_TYPES: { + EDIT: 'edit', + DELETE: 'delete', + }, + }, get SUBSCRIPTION_PRICES() { return { diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 47dbc171a2b7..f5fda6ac7c02 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -977,6 +977,8 @@ const ONYXKEYS = { CREATE_DOMAIN_FORM_DRAFT: 'createDomainFormDraft', SPLIT_EXPENSE_EDIT_DATES: 'splitExpenseEditDates', SPLIT_EXPENSE_EDIT_DATES_DRAFT: 'splitExpenseEditDatesDraft', + EXPENSE_RULE_FORM: 'expenseRuleForm', + EXPENSE_RULE_FORM_DRAFT: 'expenseRuleFormDraft', }, DERIVED: { REPORT_ATTRIBUTES: 'reportAttributes', @@ -1093,6 +1095,7 @@ type OnyxFormValuesMapping = { [ONYXKEYS.FORMS.ENABLE_GLOBAL_REIMBURSEMENTS]: FormTypes.EnableGlobalReimbursementsForm; [ONYXKEYS.FORMS.CREATE_DOMAIN_FORM]: FormTypes.CreateDomainForm; [ONYXKEYS.FORMS.SPLIT_EXPENSE_EDIT_DATES]: FormTypes.SplitExpenseEditDateForm; + [ONYXKEYS.FORMS.EXPENSE_RULE_FORM]: FormTypes.ExpenseRuleForm; }; type OnyxFormDraftValuesMapping = { diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 7b92bc292b9b..14ee41a526f0 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -13,6 +13,7 @@ import type {IOURequestType} from './libs/actions/IOU'; import Log from './libs/Log'; import type {RootNavigatorParamList} from './libs/Navigation/types'; import type {ReimbursementAccountStepToOpen} from './libs/ReimbursementAccountUtils'; +import StringUtils from './libs/StringUtils'; import {getUrlWithParams} from './libs/Url'; import SCREENS from './SCREENS'; import type {Screen} from './SCREENS'; @@ -376,6 +377,12 @@ const ROUTES = { getRoute: (cardID: string) => `settings/wallet/card/${cardID}/activate` as const, }, SETTINGS_RULES: 'settings/rules', + SETTINGS_RULES_ADD: { + route: 'settings/rules/new/:field?', + getRoute: (field?: ValueOf) => { + return `settings/rules/new/${field ? StringUtils.camelToHyphenCase(field) : ''}` as const; + }, + }, SETTINGS_LEGAL_NAME: 'settings/profile/legal-name', SETTINGS_DATE_OF_BIRTH: 'settings/profile/date-of-birth', SETTINGS_PHONE_NUMBER: 'settings/profile/phone', diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 989a9ae3fe92..fa0922dcc6ff 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -150,6 +150,15 @@ const SCREENS = { RULES: { ROOT: 'Settings_Rules', + ADD: 'Settings_Rules_Add', + ADD_MERCHANT: 'Settings_Rules_Add_Merchant', + ADD_RENAME_MERCHANT: 'Settings_Rules_Add_Rename_Merchant', + ADD_CATEGORY: 'Settings_Rules_Add_Category', + ADD_TAG: 'Settings_Rules_Add_Tag', + ADD_DESCRIPTION: 'Settings_Rules_Add_Description', + ADD_REIMBURSABLE: 'Settings_Rules_Add_Reimbursable', + ADD_BILLABLE: 'Settings_Rules_Add_Billable', + ADD_REPORT: 'Settings_Rules_Add_Report', }, WALLET: { diff --git a/src/components/Rule/RuleBooleanBase.tsx b/src/components/Rule/RuleBooleanBase.tsx new file mode 100644 index 000000000000..3a2163b12608 --- /dev/null +++ b/src/components/Rule/RuleBooleanBase.tsx @@ -0,0 +1,101 @@ +import React, {useCallback, useMemo, useState} from 'react'; +import {View} from 'react-native'; +import type {ValueOf} from 'type-fest'; +import FixedFooter from '@components/FixedFooter'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import SearchFilterPageFooterButtons from '@components/Search/SearchFilterPageFooterButtons'; +import SelectionList from '@components/SelectionList'; +import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem'; +import type {ListItem} from '@components/SelectionList/ListItem/types'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {updateDraftRule} from '@libs/actions/User'; +import Navigation from '@libs/Navigation/Navigation'; +import CONST from '@src/CONST'; +import type {TranslationPaths} from '@src/languages/types'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import type {InputID} from '@src/types/form/ExpenseRuleForm'; + +type BooleanFilterItem = ListItem & { + value: ValueOf; +}; + +type RuleBooleanBasePageProps = { + /** The key from boolean-based InputID */ + fieldID: InputID; + + /** The translation key for the page title */ + titleKey: TranslationPaths; +}; + +const booleanValues = Object.values(CONST.SEARCH.BOOLEAN); + +function RuleBooleanBasePage({fieldID, titleKey}: RuleBooleanBasePageProps) { + const {translate} = useLocalize(); + const [form] = useOnyx(ONYXKEYS.FORMS.EXPENSE_RULE_FORM, {canBeMissing: true}); + const styles = useThemeStyles(); + + const [selectedItem, setSelectedItem] = useState(() => { + return ( + booleanValues.find((value) => { + if (!form?.[fieldID]) { + return false; + } + const booleanValue = form[fieldID] === 'true' ? CONST.SEARCH.BOOLEAN.YES : CONST.SEARCH.BOOLEAN.NO; + return booleanValue === value; + }) ?? null + ); + }); + + const items = useMemo(() => { + return booleanValues.map((value) => ({ + value, + keyForList: value, + text: translate(`common.${value}`), + isSelected: selectedItem === value, + })); + }, [selectedItem, translate]); + + const onSelectItem = useCallback((selectedValue: BooleanFilterItem) => { + const newValue = selectedValue.isSelected ? null : selectedValue.value; + setSelectedItem(newValue); + }, []); + + const applyChanges = () => { + updateDraftRule({[fieldID]: selectedItem === CONST.SEARCH.BOOLEAN.YES ? 'true' : 'false'}); + Navigation.goBack(ROUTES.SETTINGS_RULES_ADD.getRoute()); + }; + + return ( + + { + Navigation.goBack(ROUTES.SETTINGS_RULES_ADD.getRoute()); + }} + /> + + + + + + + + ); +} + +export default RuleBooleanBasePage; diff --git a/src/components/Rule/RuleTextBase.tsx b/src/components/Rule/RuleTextBase.tsx new file mode 100644 index 000000000000..1f50a235adea --- /dev/null +++ b/src/components/Rule/RuleTextBase.tsx @@ -0,0 +1,76 @@ +import React from 'react'; +import type {FormOnyxValues} from '@components/Form/types'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {updateDraftRule} from '@libs/actions/User'; +import Navigation from '@libs/Navigation/Navigation'; +import CONST from '@src/CONST'; +import type {TranslationPaths} from '@src/languages/types'; +import type ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import type {InputID} from '@src/types/form/ExpenseRuleForm'; +import TextBase from './TextBase'; + +// Text-based field IDs that accept string input +type RuleTextBaseProps = { + /** The key from text-based InputID */ + fieldID: InputID; + + /** The translation key for the page title and input label if labelKey is missing */ + titleKey: TranslationPaths; + + /** The translation key for the input label */ + labelKey?: TranslationPaths; + + /** Test ID for the screen wrapper */ + testID: string; + + /** The translation key for the hint text to display below the TextInput */ + hintKey?: TranslationPaths; + + /** Whter this field is required */ + isRequired?: boolean; + + /** The character limit for the input */ + characterLimit?: number; +}; + +function RuleTextBase({fieldID, hintKey, isRequired, titleKey, labelKey, testID, characterLimit = CONST.MERCHANT_NAME_MAX_BYTES}: RuleTextBaseProps) { + const {translate} = useLocalize(); + const styles = useThemeStyles(); + + const onSave = (values: FormOnyxValues) => { + updateDraftRule(values); + Navigation.goBack(ROUTES.SETTINGS_RULES_ADD.getRoute()); + }; + + return ( + + { + Navigation.goBack(ROUTES.SETTINGS_RULES_ADD.getRoute()); + }} + /> + + + ); +} + +export default RuleTextBase; diff --git a/src/components/Rule/TextBase.tsx b/src/components/Rule/TextBase.tsx new file mode 100644 index 000000000000..b96531f88762 --- /dev/null +++ b/src/components/Rule/TextBase.tsx @@ -0,0 +1,78 @@ +import React from 'react'; +import {View} from 'react-native'; +import FormProvider from '@components/Form/FormProvider'; +import InputWrapper from '@components/Form/InputWrapper'; +import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; +import TextInput from '@components/TextInput'; +import useAutoFocusInput from '@hooks/useAutoFocusInput'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {isRequiredFulfilled, isValidInputLength} from '@libs/ValidationUtils'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {InputID} from '@src/types/form/ExpenseRuleForm'; + +type TextBaseProps = { + fieldID: InputID; + hint?: string; + isRequired?: boolean; + title: string; + label: string; + characterLimit?: number; + onSubmit: (values: FormOnyxValues) => void; +}; + +function TextBase({fieldID, hint, isRequired, title, label, onSubmit, characterLimit = CONST.MERCHANT_NAME_MAX_BYTES}: TextBaseProps) { + const {translate} = useLocalize(); + const [form] = useOnyx(ONYXKEYS.FORMS.EXPENSE_RULE_FORM, {canBeMissing: true}); + const styles = useThemeStyles(); + + const currentValue = form?.[fieldID] ?? ''; + const {inputCallbackRef} = useAutoFocusInput(); + + const validate = (values: FormOnyxValues) => { + const errors: FormInputErrors = {}; + const fieldValue = values[fieldID] ?? ''; + const trimmedValue = fieldValue.trim(); + + if (isRequired && !isRequiredFulfilled(fieldValue)) { + errors[fieldID] = translate('common.error.fieldRequired'); + } else { + const {isValid, byteLength} = isValidInputLength(trimmedValue, characterLimit); + + if (!isValid) { + errors[fieldID] = translate('common.error.characterLimitExceedCounter', byteLength, characterLimit); + } + } + + return errors; + }; + + return ( + + + + + + ); +} + +export default TextBase; diff --git a/src/components/Search/SearchFilterPageFooterButtons.tsx b/src/components/Search/SearchFilterPageFooterButtons.tsx index dc6b23a0709a..ef93781a8d1f 100644 --- a/src/components/Search/SearchFilterPageFooterButtons.tsx +++ b/src/components/Search/SearchFilterPageFooterButtons.tsx @@ -6,7 +6,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; type SearchFilterPageFooterButtonsProps = { /** Function to reset changes made in the filter */ - resetChanges: () => void; + resetChanges?: () => void; /** Function to apply changes made in the filter */ applyChanges: () => void; @@ -18,12 +18,14 @@ function SearchFilterPageFooterButtons({resetChanges, applyChanges}: SearchFilte return ( -