Skip to content

A local-first personal finance app

Extracted rule editor outside of the modal and into its own component (#5518)

Matiss Janis Aboltins6bf2f581a371
diff --git a/packages/desktop-client/src/components/filters/AppliedFilters.tsx b/packages/desktop-client/src/components/filters/AppliedFilters.tsx
index 3f0ff1cb69..f0c21e5e76 100644
--- a/packages/desktop-client/src/components/filters/AppliedFilters.tsx
+++ b/packages/desktop-client/src/components/filters/AppliedFilters.tsx
@@ -14,7 +14,7 @@ type AppliedFiltersProps = {
newFilter: RuleConditionEntity,
) => void;
onDelete: (filter: RuleConditionEntity) => void;
- conditionsOp: string;
+ conditionsOp: 'and' | 'or';
onConditionsOpChange: (value: 'and' | 'or') => void;
};
diff --git a/packages/desktop-client/src/components/filters/ConditionsOpMenu.tsx b/packages/desktop-client/src/components/filters/ConditionsOpMenu.tsx
index c3ce1591cb..537db20b8f 100644
--- a/packages/desktop-client/src/components/filters/ConditionsOpMenu.tsx
+++ b/packages/desktop-client/src/components/filters/ConditionsOpMenu.tsx
@@ -6,14 +6,14 @@ import { View } from '@actual-app/components/view';
import { type RuleConditionEntity } from 'loot-core/types/models';
-import { FieldSelect } from '@desktop-client/components/modals/EditRuleModal';
+import { FieldSelect } from '@desktop-client/components/rules/RuleEditor';
export function ConditionsOpMenu({
conditionsOp,
onChange,
conditions,
}: {
- conditionsOp: string;
+ conditionsOp: 'and' | 'or';
onChange: (value: 'and' | 'or') => void;
conditions: RuleConditionEntity[];
}) {
diff --git a/packages/desktop-client/src/components/modals/EditRuleModal.jsx b/packages/desktop-client/src/components/modals/EditRuleModal.jsx
index 9b0b0dc5cd..7345c46619 100644
--- a/packages/desktop-client/src/components/modals/EditRuleModal.jsx
+++ b/packages/desktop-client/src/components/modals/EditRuleModal.jsx
@@ -1,1056 +1,20 @@
-import React, { useState, useEffect, useRef, useMemo } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
-import { Button } from '@actual-app/components/button';
-import {
- SvgDelete,
- SvgAdd,
- SvgSubtract,
-} from '@actual-app/components/icons/v0';
-import {
- SvgAlignLeft,
- SvgCode,
- SvgInformationOutline,
-} from '@actual-app/components/icons/v1';
-import { Menu } from '@actual-app/components/menu';
-import { Select } from '@actual-app/components/select';
-import { Stack } from '@actual-app/components/stack';
-import { styles } from '@actual-app/components/styles';
-import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
-import { Tooltip } from '@actual-app/components/tooltip';
-import { View } from '@actual-app/components/view';
-import { css } from '@emotion/css';
-import { v4 as uuid } from 'uuid';
-
-import { send } from 'loot-core/platform/client/fetch';
-import * as monthUtils from 'loot-core/shared/months';
-import { q } from 'loot-core/shared/query';
-import {
- mapField,
- friendlyOp,
- getFieldError,
- parse,
- unparse,
- makeValue,
- FIELD_TYPES,
- getAllocationMethods,
- isValidOp,
- getValidOps,
-} from 'loot-core/shared/rules';
-import {
- integerToCurrency,
- integerToAmount,
- amountToInteger,
-} from 'loot-core/shared/util';
import {
Modal,
ModalCloseButton,
ModalHeader,
} from '@desktop-client/components/common/Modal';
-import { StatusBadge } from '@desktop-client/components/schedules/StatusBadge';
-import { SimpleTransactionsTable } from '@desktop-client/components/transactions/SimpleTransactionsTable';
-import { BetweenAmountInput } from '@desktop-client/components/util/AmountInput';
-import { DisplayId } from '@desktop-client/components/util/DisplayId';
-import { GenericInput } from '@desktop-client/components/util/GenericInput';
-import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
-import { useFeatureFlag } from '@desktop-client/hooks/useFeatureFlag';
-import { useSchedules } from '@desktop-client/hooks/useSchedules';
-import {
- useSelected,
- SelectedProvider,
-} from '@desktop-client/hooks/useSelected';
-import { aqlQuery } from '@desktop-client/queries/aqlQuery';
-import { initiallyLoadPayees } from '@desktop-client/queries/queriesSlice';
-import { useDispatch } from '@desktop-client/redux';
-import { enableUndo, disableUndo } from '@desktop-client/undo';
-
-function updateValue(array, value, update) {
- return array.map(v => (v === value ? update() : v));
-}
-
-function applyErrors(array, errorsArray) {
- return array.map((item, i) => {
- return { ...item, error: errorsArray[i] };
- });
-}
-
-function getTransactionFields(conditions, actions) {
- const fields = ['date'];
-
- if (conditions.find(c => c.field === 'imported_payee')) {
- fields.push('imported_payee');
- }
-
- fields.push('payee');
-
- if (actions.find(a => a.field === 'category')) {
- fields.push('category');
- } else if (
- actions.length > 0 &&
- !['payee', 'date', 'amount'].includes(actions[0].field)
- ) {
- fields.push(actions[0].field);
- }
-
- fields.push('amount');
-
- return fields;
-}
-
-export function FieldSelect({ fields, style, value, onChange }) {
- return (
- <View style={style} data-testid="field-select">
- <Select
- bare
- options={fields}
- value={value}
- onChange={onChange}
- className={css({
- color: theme.pageTextPositive,
- '&[data-hovered]': { color: theme.pageTextPositive },
- })}
- />
- </View>
- );
-}
-
-export function OpSelect({
- ops,
- type,
- style,
- value,
- formatOp = friendlyOp,
- onChange,
-}) {
- const opOptions = useMemo(() => {
- const options = ops
- // We don't support the `contains`, `doesNotContain`, `matches` operators
- // for the id type rules yet
- // TODO: Add matches op support for payees, accounts, categories.
- .filter(op =>
- type === 'id'
- ? !['contains', 'matches', 'doesNotContain', 'hasTags'].includes(op)
- : true,
- )
- .map(op => [op, formatOp(op, type)]);
-
- if (type === 'string' || type === 'id') {
- options.splice(Math.ceil(options.length / 2), 0, Menu.line);
- }
-
- return options;
- }, [formatOp, ops, type]);
-
- return (
- <View data-testid="op-select">
- <Select
- bare
- options={opOptions}
- value={value}
- onChange={value => onChange('op', value)}
- style={style}
- />
- </View>
- );
-}
-
-function SplitAmountMethodSelect({ options, style, value, onChange }) {
- return (
- <View
- style={{ color: theme.pageTextPositive, ...style }}
- data-testid="field-select"
- >
- <Select
- bare
- options={options}
- value={value}
- onChange={value => onChange('method', value)}
- />
- </View>
- );
-}
-
-function EditorButtons({ onAdd, onDelete }) {
- const { t } = useTranslation();
- return (
- <>
- {onDelete && (
- <Button
- variant="bare"
- onPress={onDelete}
- style={{ padding: 7 }}
- aria-label={t('Delete entry')}
- >
- <SvgSubtract style={{ width: 8, height: 8, color: 'inherit' }} />
- </Button>
- )}
- {onAdd && (
- <Button
- variant="bare"
- onPress={onAdd}
- style={{ padding: 7 }}
- aria-label={t('Add entry')}
- >
- <SvgAdd style={{ width: 10, height: 10, color: 'inherit' }} />
- </Button>
- )}
- </>
- );
-}
-
-function FieldError({ type }) {
- return (
- <Text
- style={{
- fontSize: 12,
- textAlign: 'center',
- color: theme.errorText,
- marginBottom: 5,
- }}
- >
- {getFieldError(type)}
- </Text>
- );
-}
-
-function Editor({ error, style, children }) {
- return (
- <View style={style} data-testid="editor-row">
- <Stack direction="row" align="center" spacing={1}>
- {children}
- </Stack>
- {error && <FieldError type={error} />}
- </View>
- );
-}
-
-function ConditionEditor({
- ops,
- condition,
- editorStyle,
- isSchedule,
- onChange,
- onDelete,
- onAdd,
-}) {
- const {
- field: originalField,
- op,
- value,
- type,
- options,
- error,
- inputKey,
- } = condition;
-
- const translatedConditions = useMemo(() => {
- const retValue = [...conditionFields];
-
- if (retValue && retValue.length > 0) {
- retValue.forEach(field => {
- field[1] = mapField(field[0]);
- });
- }
-
- return retValue;
- }, []);
-
- let field = originalField;
- if (field === 'amount' && options) {
- if (options.inflow) {
- field = 'amount-inflow';
- } else if (options.outflow) {
- field = 'amount-outflow';
- }
- }
-
- let valueEditor;
- if (type === 'number' && op === 'isbetween') {
- valueEditor = (
- <BetweenAmountInput
- key={inputKey}
- defaultValue={value}
- onChange={v => onChange('value', v)}
- />
- );
- } else {
- valueEditor = (
- <GenericInput
- key={inputKey}
- field={field}
- type={type}
- value={value}
- op={op}
- multi={op === 'oneOf' || op === 'notOneOf'}
- onChange={v => onChange('value', v)}
- numberFormatType="currency"
- />
- );
- }
-
- return (
- <Editor style={editorStyle} error={error}>
- <FieldSelect
- fields={translatedConditions}
- value={field}
- onChange={value => onChange('field', value)}
- />
- <OpSelect ops={ops} value={op} type={type} onChange={onChange} />
-
- <View style={{ flex: 1 }}>{valueEditor}</View>
-
- <Stack direction="row">
- <EditorButtons
- onAdd={onAdd}
- onDelete={isSchedule && field === 'date' ? null : onDelete}
- />
- </Stack>
- </Editor>
- );
-}
-
-function formatAmount(amount) {
- if (!amount) {
- return integerToCurrency(0);
- } else if (typeof amount === 'number') {
- return integerToCurrency(amount);
- } else {
- return `${integerToCurrency(amount.num1)} to ${integerToCurrency(
- amount.num2,
- )}`;
- }
-}
-
-function ScheduleDescription({ id }) {
- const dateFormat = useDateFormat() || 'MM/dd/yyyy';
- const scheduleQuery = useMemo(
- () => q('schedules').filter({ id }).select('*'),
- [id],
- );
- const {
- schedules,
- statusLabels,
- isLoading: isSchedulesLoading,
- } = useSchedules({ query: scheduleQuery });
-
- if (isSchedulesLoading) {
- return null;
- }
-
- if (schedules.length === 0) {
- return <View style={{ flex: 1 }}>{id}</View>;
- }
-
- const [schedule] = schedules;
- const status = schedule && statusLabels.get(schedule.id);
-
- return (
- <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
- <View style={{ marginRight: 15, flexDirection: 'row' }}>
- <Text
- style={{
- whiteSpace: 'nowrap',
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- }}
- >
- <Trans>Payee:</Trans>{' '}
- <DisplayId
- type="payees"
- id={schedule._payee}
- noneColor={theme.pageTextLight}
- />
- </Text>
- <Text style={{ margin: '0 5px' }}> — </Text>
- <Text style={{ flexShrink: 0 }}>
- <Trans>Amount:</Trans> {formatAmount(schedule._amount)}
- </Text>
- <Text style={{ margin: '0 5px' }}> — </Text>
- <Text style={{ flexShrink: 0 }}>
- <Trans>
- Next: {{ month: monthUtils.format(schedule.next_date, dateFormat) }}
- </Trans>
- </Text>
- </View>
- <StatusBadge status={status} />
- </View>
- );
-}
-
-function getActionFields() {
- return [
- 'category',
- 'payee',
- 'payee_name',
- 'notes',
- 'cleared',
- 'account',
- 'date',
- 'amount',
- ].map(field => [field, mapField(field)]);
-}
-const parentOnlyFields = ['amount', 'cleared', 'account', 'date'];
-function getSplitActionFields() {
- return getActionFields().filter(
- ([field]) => !parentOnlyFields.includes(field),
- );
-}
-function getAllocationMethodOptions() {
- return Object.entries(getAllocationMethods());
-}
-function ActionEditor({ action, editorStyle, onChange, onDelete, onAdd }) {
- const { t } = useTranslation();
- const {
- field,
- op,
- value,
- type,
- error,
- inputKey = 'initial',
- options,
- } = action;
-
- const templated = options?.template !== undefined;
-
- // Even if the feature flag is disabled, we still want to be able to turn off templating
- const actionTemplating = useFeatureFlag('actionTemplating');
- const isTemplatingEnabled = actionTemplating || templated;
-
- const fields = (
- options?.splitIndex ? getSplitActionFields() : getActionFields()
- ).filter(([s]) => actionTemplating || !s.includes('_name') || field === s);
-
- return (
- <Editor style={editorStyle} error={error}>
- {op === 'set' ? (
- <>
- <OpSelect
- ops={['set', 'prepend-notes', 'append-notes']}
- value={op}
- onChange={onChange}
- />
-
- <FieldSelect
- fields={fields}
- value={field}
- onChange={value => onChange('field', value)}
- />
-
- <View style={{ flex: 1 }}>
- <GenericInput
- key={inputKey}
- field={field}
- type={templated ? 'string' : type}
- op={op}
- value={options?.template ?? value}
- onChange={v => onChange('value', v)}
- numberFormatType="currency"
- />
- </View>
- {/*Due to that these fields have id's as value it is not helpful to have templating here*/}
- {isTemplatingEnabled &&
- ['payee', 'category', 'account'].indexOf(field) === -1 && (
- <Button
- variant="bare"
- style={{
- padding: 5,
- }}
- aria-label={
- templated ? t('Disable templating') : t('Enable templating')
- }
- onPress={() => onChange('template', !templated)}
- >
- {templated ? (
- <SvgCode
- style={{ width: 12, height: 12, color: 'inherit' }}
- />
- ) : (
- <SvgAlignLeft
- style={{ width: 12, height: 12, color: 'inherit' }}
- />
- )}
- </Button>
- )}
- </>
- ) : op === 'set-split-amount' ? (
- <>
- <View style={{ padding: '5px 10px', lineHeight: '1em' }}>
- {t('allocate')}
- </View>
-
- <SplitAmountMethodSelect
- options={getAllocationMethodOptions()}
- value={options.method}
- onChange={onChange}
- />
-
- <View style={{ flex: 1 }}>
- {options.method !== 'remainder' && (
- <GenericInput
- key={inputKey}
- field={field}
- op={op}
- type="number"
- numberFormatType={
- options.method === 'fixed-percent' ? 'percentage' : 'currency'
- }
- value={value}
- onChange={v => onChange('value', v)}
- />
- )}
- </View>
- </>
- ) : op === 'link-schedule' ? (
- <>
- <View
- style={{
- padding: '5px 10px',
- color: theme.pageTextPositive,
- }}
- >
- {friendlyOp(op)}
- </View>
- <ScheduleDescription id={value || null} />
- </>
- ) : op === 'prepend-notes' || op === 'append-notes' ? (
- <>
- <OpSelect
- ops={['set', 'prepend-notes', 'append-notes']}
- value={op}
- onChange={onChange}
- />
-
- <View style={{ flex: 1 }}>
- <GenericInput
- key={inputKey}
- field={field}
- type="string"
- op={op}
- value={value}
- onChange={v => onChange('value', v)}
- />
- </View>
- </>
- ) : null}
-
- <Stack direction="row">
- <EditorButtons
- onAdd={onAdd}
- onDelete={
- (op === 'set' || op === 'prepend-notes' || op === 'append-notes') &&
- onDelete
- }
- />
- </Stack>
- </Editor>
- );
-}
-
-function StageInfo() {
- return (
- <View style={{ position: 'relative', marginLeft: 5 }}>
- <Tooltip
- content={
- <Trans>
- The stage of a rule allows you to force a specific order. Pre rules
- always run first, and post rules always run last. Within each stage
- rules are automatically ordered from least to most specific.
- </Trans>
- }
- placement="bottom start"
- style={{
- ...styles.tooltip,
- padding: 10,
- color: theme.pageTextLight,
- maxWidth: 450,
- lineHeight: 1.5,
- }}
- >
- <SvgInformationOutline
- style={{ width: 11, height: 11, color: theme.pageTextLight }}
- />
- </Tooltip>
- </View>
- );
-}
-
-function StageButton({ selected, children, style, onSelect }) {
- return (
- <Button
- variant="bare"
- style={{
- fontSize: 'inherit',
- ...(selected && {
- backgroundColor: theme.pillBackgroundSelected,
- ':hover': { backgroundColor: theme.pillBackgroundSelected },
- }),
- ...style,
- }}
- onPress={onSelect}
- >
- {children}
- </Button>
- );
-}
-
-function newInput(item) {
- return { ...item, inputKey: uuid() };
-}
-
-function ConditionsList({
- conditionsOp,
- conditions,
- editorStyle,
- isSchedule,
- onChangeConditions,
-}) {
- function addCondition(index) {
- if (conditionFields && conditionFields.length > 0) {
- conditionFields.forEach(field => {
- field[1] = mapField(field[0]);
- });
- }
-
- // (remove the inflow and outflow pseudo-fields since they’d be a pain to get right)
- let fields = conditionFields
- .map(f => f[0])
- .filter(f => f !== 'amount-inflow' && f !== 'amount-outflow');
-
- // suggest a sensible next field: the same if 'or' or different if 'and'
- if (conditions.length && conditionsOp === 'or') {
- fields = [conditions[0].field];
- } else {
- fields = fields.filter(
- f => !conditions.some(c => c.field.includes(f) || f.includes(c.field)),
- );
- }
- const field = fields[0] || 'payee';
-
- const copy = [...conditions];
- copy.splice(index + 1, 0, {
- type: FIELD_TYPES.get(field),
- field,
- op: 'is',
- value: null,
- inputKey: uuid(),
- });
- onChangeConditions(copy);
- }
-
- function addInitialCondition() {
- addCondition(-1);
- }
-
- function removeCondition(cond) {
- onChangeConditions(conditions.filter(c => c !== cond));
- }
-
- function updateCondition(cond, field, value) {
- onChangeConditions(
- updateValue(conditions, cond, () => {
- if (field === 'field') {
- const newCond = { field: value };
-
- if (value === 'amount-inflow') {
- newCond.field = 'amount';
- newCond.options = { inflow: true };
- } else if (value === 'amount-outflow') {
- newCond.field = 'amount';
- newCond.options = { outflow: true };
- }
-
- newCond.type = FIELD_TYPES.get(newCond.field);
-
- const prevType = FIELD_TYPES.get(cond.field);
- if (
- (prevType === 'string' || prevType === 'number') &&
- prevType === newCond.type &&
- cond.op !== 'isbetween' &&
- isValidOp(newCond.field, cond.op)
- ) {
- // Don't clear the value & op if the type is string/number and
- // the type hasn't changed
- newCond.op = cond.op;
- return newInput(makeValue(cond.value, newCond));
- } else {
- newCond.op = getValidOps(newCond.field)[0];
- return newInput(makeValue(null, newCond));
- }
- } else if (field === 'op') {
- const op = value;
-
- // Switching between oneOf and other operators is a
- // special-case. It changes the input type, so we need to
- // clear the value
- if (
- cond.op !== 'oneOf' &&
- cond.op !== 'notOneOf' &&
- (op === 'oneOf' || op === 'notOneOf')
- ) {
- return newInput(
- makeValue(cond.value != null ? [cond.value] : [], {
- ...cond,
- op: value,
- }),
- );
- } else if (
- (cond.op === 'oneOf' || cond.op === 'notOneOf') &&
- op !== 'oneOf' &&
- op !== 'notOneOf'
- ) {
- return newInput(
- makeValue(cond.value.length > 0 ? cond.value[0] : null, {
- ...cond,
- op: value,
- }),
- );
- } else if (cond.op !== 'isbetween' && op === 'isbetween') {
- // TODO: I don't think we need `makeValue` anymore. It
- // tries to parse the value as a float and we had to
- // special-case isbetween. I don't know why we need that
- // behavior and we can probably get rid of `makeValue`
- return makeValue(
- {
- num1: amountToInteger(cond.value),
- num2: amountToInteger(cond.value),
- },
- { ...cond, op: value },
- );
- } else if (cond.op === 'isbetween' && op !== 'isbetween') {
- return makeValue(integerToAmount(cond.value.num1 || 0), {
- ...cond,
- op: value,
- });
- } else {
- return { ...cond, op: value };
- }
- } else if (field === 'value') {
- return makeValue(value, cond);
- }
-
- return cond;
- }),
- );
- }
-
- return conditions.length === 0 ? (
- <Button style={{ alignSelf: 'flex-start' }} onPress={addInitialCondition}>
- <Trans>Add condition</Trans>
- </Button>
- ) : (
- <Stack spacing={2} data-testid="condition-list">
- {conditions.map((cond, i) => {
- let ops = getValidOps(cond.field);
-
- // Hack for now, these ops should be the only ones available
- // for recurring dates
- if (cond.type === 'date' && cond.value && cond.value.frequency) {
- ops = ['is', 'isapprox'];
- } else if (
- cond.options &&
- (cond.options.inflow || cond.options.outflow)
- ) {
- ops = ops.filter(op => op !== 'isbetween');
- }
-
- return (
- <View key={i}>
- <ConditionEditor
- editorStyle={editorStyle}
- ops={ops}
- condition={cond}
- isSchedule={isSchedule}
- onChange={(name, value) => {
- updateCondition(cond, name, value);
- }}
- onDelete={() => removeCondition(cond)}
- onAdd={() => addCondition(i)}
- />
- </View>
- );
- })}
- </Stack>
- );
-}
-
-const getActions = splits => splits.flatMap(s => s.actions);
-const getUnparsedActions = splits => getActions(splits).map(unparse);
-
-// TODO:
-// * Dont touch child transactions?
-
-const conditionFields = [
- 'imported_payee',
- 'account',
- 'category',
- 'date',
- 'payee',
- 'notes',
- 'amount',
-]
- .map(field => [field, mapField(field)])
- .concat([
- ['amount-inflow', mapField('amount', { inflow: true })],
- ['amount-outflow', mapField('amount', { outflow: true })],
- ]);
+import { RuleEditor } from '@desktop-client/components/rules/RuleEditor';
export function EditRuleModal({
rule: defaultRule,
onSave: originalOnSave = undefined,
}) {
const { t } = useTranslation();
- const [conditions, setConditions] = useState(
- defaultRule.conditions.map(parse).map(c => ({ ...c, inputKey: uuid() })),
- );
- const [actionSplits, setActionSplits] = useState(() => {
- const parsedActions = defaultRule.actions.map(parse);
- return parsedActions.reduce(
- (acc, action) => {
- const splitIndex = action.options?.splitIndex ?? 0;
- acc[splitIndex] = acc[splitIndex] ?? { id: uuid(), actions: [] };
- acc[splitIndex].actions.push({ ...action, inputKey: uuid() });
- return acc;
- },
- // The pre-split group is always there
- [{ id: uuid(), actions: [] }],
- );
- });
- const [stage, setStage] = useState(defaultRule.stage);
- const [conditionsOp, setConditionsOp] = useState(defaultRule.conditionsOp);
- const [transactions, setTransactions] = useState([]);
- const dispatch = useDispatch();
- const scrollableEl = useRef();
-
- const isSchedule = getActions(actionSplits).some(
- action => action.op === 'link-schedule',
- );
-
- useEffect(() => {
- dispatch(initiallyLoadPayees());
-
- // Disable undo while this modal is open
- disableUndo();
- return () => enableUndo();
- }, [dispatch]);
-
- useEffect(() => {
- // Flash the scrollbar
- if (scrollableEl.current) {
- const el = scrollableEl.current;
- const top = el.scrollTop;
- el.scrollTop = top + 1;
- el.scrollTop = top;
- }
-
- // Run it here
- async function run() {
- const { filters } = await send('make-filters-from-conditions', {
- conditions: conditions.map(unparse),
- });
-
- if (filters.length > 0) {
- const conditionsOpKey = conditionsOp === 'or' ? '$or' : '$and';
- const parentOnlyCondition =
- actionSplits.length > 1 ? { is_child: false } : {};
- const { data: transactions } = await aqlQuery(
- q('transactions')
- .filter({ [conditionsOpKey]: filters, ...parentOnlyCondition })
- .select('*'),
- );
- setTransactions(transactions);
- } else {
- setTransactions([]);
- }
- }
- run();
- }, [actionSplits, conditions, conditionsOp]);
-
- const selectedInst = useSelected('transactions', transactions, []);
-
- function addInitialAction() {
- addActionToSplitAfterIndex(0, -1);
- }
-
- function addActionToSplitAfterIndex(splitIndex, actionIndex) {
- let newAction;
- if (splitIndex && !actionSplits[splitIndex]?.actions?.length) {
- actionSplits[splitIndex] = { id: uuid(), actions: [] };
- newAction = {
- op: 'set-split-amount',
- options: { method: 'remainder', splitIndex },
- value: null,
- inputKey: uuid(),
- };
- } else {
- const fieldsArray =
- splitIndex === 0 ? getActionFields() : getSplitActionFields();
- let fields = fieldsArray.map(f => f[0]);
- for (const action of actionSplits[splitIndex].actions) {
- fields = fields.filter(f => f !== action.field);
- }
- const field = fields[0] || 'category';
- newAction = {
- type: FIELD_TYPES.get(field),
- field,
- op: 'set',
- value: null,
- options: { splitIndex },
- inputKey: uuid(),
- };
- }
-
- const actionsCopy = [...actionSplits[splitIndex].actions];
- actionsCopy.splice(actionIndex + 1, 0, newAction);
- const copy = [...actionSplits];
- copy[splitIndex] = { ...actionSplits[splitIndex], actions: actionsCopy };
- setActionSplits(copy);
- }
-
- function onChangeAction(action, field, value) {
- setActionSplits(
- actionSplits.map(({ id, actions }) => ({
- id,
- actions: updateValue(actions, action, () => {
- const a = { ...action };
-
- if (field === 'method') {
- a.options = { ...a.options, method: value };
- } else if (field === 'template') {
- if (value) {
- a.options = { ...a.options, template: a.value };
- } else {
- a.options = { ...a.options, template: undefined };
- if (a.type !== 'string') a.value = null;
- }
- } else {
- a[field] = value;
- if (a.options?.template !== undefined) {
- a.options = {
- ...a.options,
- template: value,
- };
- }
-
- if (field === 'field') {
- a.type = FIELD_TYPES.get(a.field);
- a.value = null;
- a.options = { ...a.options, template: undefined };
- return newInput(a);
- } else if (field === 'op') {
- a.value = null;
- a.inputKey = '' + Math.random();
- a.options = { ...a.options, template: undefined };
- return newInput(a);
- }
- }
-
- return a;
- }),
- })),
- );
- }
-
- function onChangeStage(stage) {
- setStage(stage);
- }
-
- function onChangeConditionsOp(value) {
- setConditionsOp(value);
- }
-
- function onRemoveAction(action) {
- setActionSplits(splits =>
- splits.map(({ id, actions }) => ({
- id,
- actions: actions.filter(a => a !== action),
- })),
- );
- }
-
- function onRemoveSplit(splitIndexToRemove) {
- setActionSplits(splits => {
- const copy = [];
- splits.forEach(({ id }, index) => {
- if (index === splitIndexToRemove) {
- return;
- }
- copy.push({ id, actions: [] });
- });
- getActions(splits).forEach(action => {
- const currentSplitIndex = action.options?.splitIndex ?? 0;
- if (currentSplitIndex === splitIndexToRemove) {
- return;
- }
- const newSplitIndex =
- currentSplitIndex > splitIndexToRemove
- ? currentSplitIndex - 1
- : currentSplitIndex;
- copy[newSplitIndex].actions.push({
- ...action,
- options: { ...action.options, splitIndex: newSplitIndex },
- });
- });
- return copy;
- });
- }
-
- function onApply() {
- const selectedTransactions = transactions.filter(({ id }) =>
- selectedInst.items.has(id),
- );
- send('rule-apply-actions', {
- transactions: selectedTransactions,
- actions: getUnparsedActions(actionSplits),
- }).then(() => {
- // This makes it refetch the transactions
- setActionSplits([...actionSplits]);
- });
- }
-
- async function onSave(close) {
- const rule = {
- ...defaultRule,
- stage,
- conditionsOp,
- conditions: conditions.map(unparse),
- actions: getUnparsedActions(actionSplits),
- };
-
- const method = rule.id ? 'rule-update' : 'rule-add';
- const { error, id: newId } = await send(method, rule);
-
- if (error) {
- if (error.conditionErrors) {
- setConditions(applyErrors(conditions, error.conditionErrors));
- }
-
- if (error.actionErrors) {
- let usedErrorIdx = 0;
- setActionSplits(
- actionSplits.map(item => ({
- ...item,
- actions: item.actions.map(action => ({
- ...action,
- error: error.actionErrors[usedErrorIdx++] ?? null,
- })),
- })),
- );
- }
- } else {
- // If adding a rule, we got back an id
- if (newId) {
- rule.id = newId;
- }
-
- originalOnSave?.(rule);
- close();
- }
- }
-
- // Enable editing existing split rules even if the feature has since been disabled.
- const showSplitButton = actionSplits.length > 0;
return (
<Modal name="edit-rule">
@@ -1060,7 +24,10 @@ export function EditRuleModal({
title={t('Rule')}
rightContent={<ModalCloseButton onPress={close} />}
/>
- <View
+ <RuleEditor
+ rule={defaultRule}
+ onSave={originalOnSave}
+ onCancel={close}
style={{
maxWidth: '100%',
width: 900,
@@ -1071,250 +38,7 @@ export function EditRuleModal({
overflow: 'hidden',
color: theme.pageTextLight,
}}
- >
- <View
- style={{
- flexDirection: 'row',
- alignItems: 'center',
- marginBottom: 15,
- padding: '0 20px',
- }}
- >
- <Text style={{ marginRight: 15 }}>
- <Trans>Stage of rule:</Trans>
- </Text>
-
- <Stack direction="row" align="center" spacing={1}>
- <StageButton
- selected={stage === 'pre'}
- onSelect={() => onChangeStage('pre')}
- >
- <Trans>Pre</Trans>
- </StageButton>
- <StageButton
- selected={stage === null}
- onSelect={() => onChangeStage(null)}
- >
- <Trans>Default</Trans>
- </StageButton>
- <StageButton
- selected={stage === 'post'}
- onSelect={() => onChangeStage('post')}
- >
- <Trans>Post</Trans>
- </StageButton>
-
- <StageInfo />
- </Stack>
- </View>
-
- <View
- innerRef={scrollableEl}
- style={{
- borderBottom: '1px solid ' + theme.tableBorder,
- padding: 20,
- overflow: 'auto',
- maxHeight: 'calc(100% - 300px)',
- }}
- >
- <View style={{ flexShrink: 0 }}>
- <View style={{ marginBottom: 30 }}>
- <Text style={{ marginBottom: 15 }}>
- <Trans>
- If{' '}
- <FieldSelect
- data-testid="conditions-op"
- style={{ display: 'inline-flex' }}
- fields={[
- ['and', t('all')],
- ['or', t('any')],
- ]}
- value={conditionsOp}
- onChange={onChangeConditionsOp}
- />
- {{ allOrAny: '' }} of these conditions match:
- </Trans>
- </Text>
-
- <ConditionsList
- conditionsOp={conditionsOp}
- conditions={conditions}
- editorStyle={styles.editorPill}
- isSchedule={isSchedule}
- onChangeConditions={conds => setConditions(conds)}
- />
- </View>
-
- <Text style={{ marginBottom: 15 }}>
- <Trans>Then apply these actions:</Trans>
- </Text>
- <View style={{ flex: 1 }}>
- {actionSplits.length === 0 && (
- <Button
- style={{ alignSelf: 'flex-start' }}
- onPress={addInitialAction}
- >
- <Trans>Add action</Trans>
- </Button>
- )}
- <Stack spacing={2} data-testid="action-split-list">
- {actionSplits.map(({ id, actions }, splitIndex) => (
- <View
- key={id}
- nativeStyle={
- actionSplits.length > 1
- ? {
- borderColor: theme.tableBorder,
- borderWidth: '1px',
- borderRadius: '5px',
- padding: '5px',
- }
- : {}
- }
- >
- {actionSplits.length > 1 && (
- <Stack
- direction="row"
- justify="space-between"
- spacing={1}
- >
- <Text
- style={{
- ...styles.smallText,
- marginBottom: '10px',
- }}
- >
- {splitIndex === 0
- ? t('Apply to all')
- : `${t('Split')} ${splitIndex}`}
- </Text>
- {splitIndex && (
- <Button
- variant="bare"
- onPress={() => onRemoveSplit(splitIndex)}
- style={{
- width: 20,
- height: 20,
- }}
- aria-label={t('Delete split')}
- >
- <SvgDelete
- style={{
- width: 8,
- height: 8,
- color: 'inherit',
- }}
- />
- </Button>
- )}
- </Stack>
- )}
- <Stack spacing={2} data-testid="action-list">
- {actions.map((action, actionIndex) => (
- <View key={actionIndex}>
- <ActionEditor
- ops={[
- 'set',
- 'link-schedule',
- 'prepend-notes',
- 'append-notes',
- ]}
- action={action}
- editorStyle={styles.editorPill}
- onChange={(name, value) => {
- onChangeAction(action, name, value);
- }}
- onDelete={() => onRemoveAction(action)}
- onAdd={() =>
- addActionToSplitAfterIndex(
- splitIndex,
- actionIndex,
- )
- }
- />
- </View>
- ))}
- </Stack>
-
- {actions.length === 0 && (
- <Button
- style={{ alignSelf: 'flex-start', marginTop: 5 }}
- onPress={() =>
- addActionToSplitAfterIndex(splitIndex, -1)
- }
- >
- <Trans>Add action</Trans>
- </Button>
- )}
- </View>
- ))}
- </Stack>
- {showSplitButton && (
- <Button
- style={{ alignSelf: 'flex-start', marginTop: 15 }}
- onPress={() => {
- addActionToSplitAfterIndex(actionSplits.length, -1);
- }}
- data-testid="add-split-transactions"
- >
- {actionSplits.length > 1
- ? t('Add another split')
- : t('Split into multiple transactions')}
- </Button>
- )}
- </View>
- </View>
- </View>
-
- <SelectedProvider instance={selectedInst}>
- <View style={{ padding: '20px', flex: 1 }}>
- <View
- style={{
- flexDirection: 'row',
- alignItems: 'center',
- marginBottom: 12,
- }}
- >
- <Text style={{ color: theme.pageTextLight, marginBottom: 0 }}>
- <Trans>This rule applies to these transactions:</Trans>
- </Text>
-
- <View style={{ flex: 1 }} />
- <Button
- isDisabled={selectedInst.items.size === 0}
- onPress={onApply}
- >
- <Trans>Apply actions</Trans> ({selectedInst.items.size})
- </Button>
- </View>
-
- <SimpleTransactionsTable
- transactions={transactions}
- fields={getTransactionFields(
- conditions,
- getActions(actionSplits),
- )}
- style={{
- border: '1px solid ' + theme.tableBorder,
- borderRadius: '6px 6px 0 0',
- }}
- />
-
- <Stack
- direction="row"
- justify="flex-end"
- style={{ marginTop: 20 }}
- >
- <Button onClick={close}>
- <Trans>Cancel</Trans>
- </Button>
- <Button variant="primary" onPress={() => onSave(close)}>
- <Trans>Save</Trans>
- </Button>
- </Stack>
- </View>
- </SelectedProvider>
- </View>
+ />
</>
)}
</Modal>
diff --git a/packages/desktop-client/src/components/reports/reports/Summary.tsx b/packages/desktop-client/src/components/reports/reports/Summary.tsx
index 943f855ffd..30edc3648c 100644
--- a/packages/desktop-client/src/components/reports/reports/Summary.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Summary.tsx
@@ -28,7 +28,6 @@ import { AppliedFilters } from '@desktop-client/components/filters/AppliedFilter
import { FilterButton } from '@desktop-client/components/filters/FiltersMenu';
import { Checkbox } from '@desktop-client/components/forms';
import { MobileBackButton } from '@desktop-client/components/mobile/MobileBackButton';
-import { FieldSelect } from '@desktop-client/components/modals/EditRuleModal';
import {
MobilePageHeader,
Page,
@@ -42,6 +41,7 @@ import { calculateTimeRange } from '@desktop-client/components/reports/reportRan
import { summarySpreadsheet } from '@desktop-client/components/reports/spreadsheets/summary-spreadsheet';
import { useReport } from '@desktop-client/components/reports/useReport';
import { fromDateRepr } from '@desktop-client/components/reports/util';
+import { FieldSelect } from '@desktop-client/components/rules/RuleEditor';
import { useFormat } from '@desktop-client/hooks/useFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
diff --git a/packages/desktop-client/src/components/rules/RuleEditor.tsx b/packages/desktop-client/src/components/rules/RuleEditor.tsx
new file mode 100644
index 0000000000..c361d32fea
--- /dev/null
+++ b/packages/desktop-client/src/components/rules/RuleEditor.tsx
@@ -0,0 +1,1383 @@
+// @ts-strict-ignore
+import {
+ useState,
+ useEffect,
+ useRef,
+ useMemo,
+ type CSSProperties,
+ type ReactNode,
+} from 'react';
+import { useTranslation, Trans } from 'react-i18next';
+
+import { Button } from '@actual-app/components/button';
+import {
+ SvgDelete,
+ SvgAdd,
+ SvgSubtract,
+} from '@actual-app/components/icons/v0';
+import {
+ SvgAlignLeft,
+ SvgCode,
+ SvgInformationOutline,
+} from '@actual-app/components/icons/v1';
+import { Menu } from '@actual-app/components/menu';
+import { Select } from '@actual-app/components/select';
+import { Stack } from '@actual-app/components/stack';
+import { styles } from '@actual-app/components/styles';
+import { Text } from '@actual-app/components/text';
+import { theme } from '@actual-app/components/theme';
+import { Tooltip } from '@actual-app/components/tooltip';
+import { View } from '@actual-app/components/view';
+import { css } from '@emotion/css';
+import { v4 as uuid } from 'uuid';
+
+import { send } from 'loot-core/platform/client/fetch';
+import * as monthUtils from 'loot-core/shared/months';
+import { q } from 'loot-core/shared/query';
+import {
+ mapField,
+ friendlyOp,
+ getFieldError,
+ parse,
+ unparse,
+ makeValue,
+ FIELD_TYPES,
+ getAllocationMethods,
+ isValidOp,
+ getValidOps,
+} from 'loot-core/shared/rules';
+import {
+ integerToCurrency,
+ integerToAmount,
+ amountToInteger,
+} from 'loot-core/shared/util';
+import {
+ type RuleEntity,
+ type NewRuleEntity,
+ type RuleActionEntity,
+} from 'loot-core/types/models';
+
+import { StatusBadge } from '@desktop-client/components/schedules/StatusBadge';
+import { SimpleTransactionsTable } from '@desktop-client/components/transactions/SimpleTransactionsTable';
+import { BetweenAmountInput } from '@desktop-client/components/util/AmountInput';
+import { DisplayId } from '@desktop-client/components/util/DisplayId';
+import { GenericInput } from '@desktop-client/components/util/GenericInput';
+import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
+import { useFeatureFlag } from '@desktop-client/hooks/useFeatureFlag';
+import { useSchedules } from '@desktop-client/hooks/useSchedules';
+import {
+ useSelected,
+ SelectedProvider,
+} from '@desktop-client/hooks/useSelected';
+import { aqlQuery } from '@desktop-client/queries/aqlQuery';
+import { initiallyLoadPayees } from '@desktop-client/queries/queriesSlice';
+import { useDispatch } from '@desktop-client/redux';
+import { enableUndo, disableUndo } from '@desktop-client/undo';
+
+function updateValue(array, value, update) {
+ return array.map(v => (v === value ? update() : v));
+}
+
+function applyErrors(array, errorsArray) {
+ return array.map((item, i) => {
+ return { ...item, error: errorsArray[i] };
+ });
+}
+
+function getTransactionFields(conditions, actions) {
+ const fields = ['date'];
+
+ if (conditions.find(c => c.field === 'imported_payee')) {
+ fields.push('imported_payee');
+ }
+
+ fields.push('payee');
+
+ if (actions.find(a => a.field === 'category')) {
+ fields.push('category');
+ } else if (
+ actions.length > 0 &&
+ !['payee', 'date', 'amount'].includes(actions[0].field)
+ ) {
+ fields.push(actions[0].field);
+ }
+
+ fields.push('amount');
+
+ return fields;
+}
+
+type FieldSelectProps<T extends string> = {
+ fields: [T, string][];
+ style?: CSSProperties;
+ value: T;
+ onChange: (value: T) => void;
+};
+
+export function FieldSelect<T extends string>({
+ fields,
+ style,
+ value,
+ onChange,
+}: FieldSelectProps<T>) {
+ return (
+ <View style={style} data-testid="field-select">
+ <Select
+ bare
+ options={fields}
+ value={value}
+ onChange={onChange}
+ className={css({
+ color: theme.pageTextPositive,
+ '&[data-hovered]': { color: theme.pageTextPositive },
+ })}
+ />
+ </View>
+ );
+}
+
+type OpSelectProps<T extends string> = {
+ ops: T[];
+ type?: string;
+ style?: CSSProperties;
+ value: T;
+ formatOp?: (op: string, type: string) => string;
+ onChange: (name: string, value: T) => void;
+};
+
+export function OpSelect<T extends string>({
+ ops,
+ type,
+ style,
+ value,
+ formatOp = friendlyOp,
+ onChange,
+}: OpSelectProps<T>) {
+ const opOptions = useMemo(() => {
+ const options = ops
+ // We don't support the `contains`, `doesNotContain`, `matches` operators
+ // for the id type rules yet
+ // TODO: Add matches op support for payees, accounts, categories.
+ .filter(op =>
+ type === 'id'
+ ? !['contains', 'matches', 'doesNotContain', 'hasTags'].includes(op)
+ : true,
+ )
+ .map(op => [op, formatOp(op, type)]);
+
+ if (type === 'string' || type === 'id') {
+ // @ts-expect-error fix this
+ options.splice(Math.ceil(options.length / 2), 0, Menu.line);
+ }
+
+ return options;
+ }, [formatOp, ops, type]);
+
+ return (
+ <View data-testid="op-select">
+ <Select
+ bare
+ // @ts-expect-error fix this
+ options={opOptions}
+ value={value}
+ onChange={value => onChange('op', value)}
+ style={style}
+ />
+ </View>
+ );
+}
+
+type SplitAmountMethodSelectProps = {
+ options: [string, string][];
+ style?: CSSProperties;
+ value: string;
+ onChange: (name: string, value: string) => void;
+};
+function SplitAmountMethodSelect({
+ options,
+ style,
+ value,
+ onChange,
+}: SplitAmountMethodSelectProps) {
+ return (
+ <View
+ style={{ color: theme.pageTextPositive, ...style }}
+ data-testid="field-select"
+ >
+ <Select
+ bare
+ options={options}
+ value={value}
+ onChange={value => onChange('method', value)}
+ />
+ </View>
+ );
+}
+
+function EditorButtons({ onAdd, onDelete }) {
+ const { t } = useTranslation();
+ return (
+ <>
+ {onDelete && (
+ <Button
+ variant="bare"
+ onPress={onDelete}
+ style={{ padding: 7 }}
+ aria-label={t('Delete entry')}
+ >
+ <SvgSubtract style={{ width: 8, height: 8, color: 'inherit' }} />
+ </Button>
+ )}
+ {onAdd && (
+ <Button
+ variant="bare"
+ onPress={onAdd}
+ style={{ padding: 7 }}
+ aria-label={t('Add entry')}
+ >
+ <SvgAdd style={{ width: 10, height: 10, color: 'inherit' }} />
+ </Button>
+ )}
+ </>
+ );
+}
+
+function FieldError({ type }) {
+ return (
+ <Text
+ style={{
+ fontSize: 12,
+ textAlign: 'center',
+ color: theme.errorText,
+ marginBottom: 5,
+ }}
+ >
+ {getFieldError(type)}
+ </Text>
+ );
+}
+
+function Editor({ error, style, children }) {
+ return (
+ <View style={style} data-testid="editor-row">
+ <Stack direction="row" align="center" spacing={1}>
+ {children}
+ </Stack>
+ {error && <FieldError type={error} />}
+ </View>
+ );
+}
+
+function ConditionEditor({
+ ops,
+ condition,
+ editorStyle,
+ isSchedule,
+ onChange,
+ onDelete,
+ onAdd,
+}) {
+ const {
+ field: originalField,
+ op,
+ value,
+ type,
+ options,
+ error,
+ inputKey,
+ } = condition;
+
+ const translatedConditions = useMemo(() => {
+ const retValue = [...conditionFields];
+
+ if (retValue && retValue.length > 0) {
+ retValue.forEach(field => {
+ field[1] = mapField(field[0]);
+ });
+ }
+
+ return retValue;
+ }, []);
+
+ let field = originalField;
+ if (field === 'amount' && options) {
+ if (options.inflow) {
+ field = 'amount-inflow';
+ } else if (options.outflow) {
+ field = 'amount-outflow';
+ }
+ }
+
+ let valueEditor;
+ if (type === 'number' && op === 'isbetween') {
+ valueEditor = (
+ <BetweenAmountInput
+ key={inputKey}
+ defaultValue={value}
+ onChange={v => onChange('value', v)}
+ />
+ );
+ } else {
+ valueEditor = (
+ // @ts-expect-error fix this
+ <GenericInput
+ key={inputKey}
+ field={field}
+ type={type}
+ value={value}
+ op={op}
+ multi={op === 'oneOf' || op === 'notOneOf'}
+ onChange={v => onChange('value', v)}
+ numberFormatType="currency"
+ />
+ );
+ }
+
+ return (
+ <Editor style={editorStyle} error={error}>
+ <FieldSelect
+ // @ts-expect-error fix this
+ fields={translatedConditions}
+ value={field}
+ onChange={value => onChange('field', value)}
+ />
+ <OpSelect ops={ops} value={op} type={type} onChange={onChange} />
+
+ <View style={{ flex: 1 }}>{valueEditor}</View>
+
+ <Stack direction="row">
+ <EditorButtons
+ onAdd={onAdd}
+ onDelete={isSchedule && field === 'date' ? null : onDelete}
+ />
+ </Stack>
+ </Editor>
+ );
+}
+
+function formatAmount(amount) {
+ if (!amount) {
+ return integerToCurrency(0);
+ } else if (typeof amount === 'number') {
+ return integerToCurrency(amount);
+ } else {
+ return `${integerToCurrency(amount.num1)} to ${integerToCurrency(
+ amount.num2,
+ )}`;
+ }
+}
+
+function ScheduleDescription({ id }) {
+ const dateFormat = useDateFormat() || 'MM/dd/yyyy';
+ const scheduleQuery = useMemo(
+ () => q('schedules').filter({ id }).select('*'),
+ [id],
+ );
+ const {
+ schedules,
+ statusLabels,
+ isLoading: isSchedulesLoading,
+ } = useSchedules({ query: scheduleQuery });
+
+ if (isSchedulesLoading) {
+ return null;
+ }
+
+ if (schedules.length === 0) {
+ return <View style={{ flex: 1 }}>{id}</View>;
+ }
+
+ const [schedule] = schedules;
+ const status = schedule && statusLabels.get(schedule.id);
+
+ return (
+ <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
+ <View style={{ marginRight: 15, flexDirection: 'row' }}>
+ <Text
+ style={{
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ }}
+ >
+ <Trans>Payee:</Trans>{' '}
+ <DisplayId
+ type="payees"
+ id={schedule._payee}
+ noneColor={theme.pageTextLight}
+ />
+ </Text>
+ <Text style={{ margin: '0 5px' }}> — </Text>
+ <Text style={{ flexShrink: 0 }}>
+ <Trans>Amount:</Trans> {formatAmount(schedule._amount)}
+ </Text>
+ <Text style={{ margin: '0 5px' }}> — </Text>
+ <Text style={{ flexShrink: 0 }}>
+ <Trans>
+ Next: {{ month: monthUtils.format(schedule.next_date, dateFormat) }}
+ </Trans>
+ </Text>
+ </View>
+ {/* @ts-expect-error fix this */}
+ <StatusBadge status={status} />
+ </View>
+ );
+}
+
+function getActionFields() {
+ return [
+ 'category',
+ 'payee',
+ 'payee_name',
+ 'notes',
+ 'cleared',
+ 'account',
+ 'date',
+ 'amount',
+ ].map(field => [field, mapField(field)]);
+}
+const parentOnlyFields = ['amount', 'cleared', 'account', 'date'];
+function getSplitActionFields() {
+ return getActionFields().filter(
+ ([field]) => !parentOnlyFields.includes(field),
+ );
+}
+function getAllocationMethodOptions() {
+ return Object.entries(getAllocationMethods());
+}
+
+type ActionEditorProps = {
+ action: RuleActionEntity & {
+ field: string;
+ type: string;
+ error: unknown;
+ inputKey?: string;
+ };
+ editorStyle: CSSProperties;
+ onChange: (name: string, value: unknown) => void;
+ onDelete: () => void;
+ onAdd: () => void;
+};
+function ActionEditor({
+ action,
+ editorStyle,
+ onChange,
+ onDelete,
+ onAdd,
+}: ActionEditorProps) {
+ const { t } = useTranslation();
+ const {
+ field,
+ op,
+ value,
+ type,
+ error,
+ inputKey = 'initial',
+ // @ts-expect-error fix this
+ options,
+ } = action;
+
+ const templated = options?.template !== undefined;
+
+ // Even if the feature flag is disabled, we still want to be able to turn off templating
+ const actionTemplating = useFeatureFlag('actionTemplating');
+ const isTemplatingEnabled = actionTemplating || templated;
+
+ const fields = (
+ options?.splitIndex ? getSplitActionFields() : getActionFields()
+ ).filter(([s]) => actionTemplating || !s.includes('_name') || field === s);
+
+ return (
+ <Editor style={editorStyle} error={error}>
+ {op === 'set' ? (
+ <>
+ <OpSelect
+ ops={['set', 'prepend-notes', 'append-notes']}
+ value={op}
+ onChange={onChange}
+ />
+
+ <FieldSelect
+ // @ts-expect-error fix this
+ fields={fields}
+ value={field}
+ onChange={value => onChange('field', value)}
+ />
+
+ <View style={{ flex: 1 }}>
+ {/* @ts-expect-error fix this */}
+ <GenericInput
+ key={inputKey}
+ field={field}
+ type={templated ? 'string' : type}
+ op={op}
+ value={options?.template ?? value}
+ onChange={v => onChange('value', v)}
+ numberFormatType="currency"
+ />
+ </View>
+ {/*Due to that these fields have id's as value it is not helpful to have templating here*/}
+ {isTemplatingEnabled &&
+ ['payee', 'category', 'account'].indexOf(field) === -1 && (
+ <Button
+ variant="bare"
+ style={{
+ padding: 5,
+ }}
+ aria-label={
+ templated ? t('Disable templating') : t('Enable templating')
+ }
+ onPress={() => onChange('template', !templated)}
+ >
+ {templated ? (
+ <SvgCode
+ style={{ width: 12, height: 12, color: 'inherit' }}
+ />
+ ) : (
+ <SvgAlignLeft
+ style={{ width: 12, height: 12, color: 'inherit' }}
+ />
+ )}
+ </Button>
+ )}
+ </>
+ ) : op === 'set-split-amount' ? (
+ <>
+ <View style={{ padding: '5px 10px', lineHeight: '1em' }}>
+ {t('allocate')}
+ </View>
+
+ <SplitAmountMethodSelect
+ options={getAllocationMethodOptions()}
+ value={options.method}
+ onChange={onChange}
+ />
+
+ <View style={{ flex: 1 }}>
+ {options.method !== 'remainder' && (
+ // @ts-expect-error fix this
+ <GenericInput
+ key={inputKey}
+ field={field}
+ op={op}
+ type="number"
+ numberFormatType={
+ options.method === 'fixed-percent' ? 'percentage' : 'currency'
+ }
+ value={value}
+ onChange={v => onChange('value', v)}
+ />
+ )}
+ </View>
+ </>
+ ) : op === 'link-schedule' ? (
+ <>
+ <View
+ style={{
+ padding: '5px 10px',
+ color: theme.pageTextPositive,
+ }}
+ >
+ {friendlyOp(op)}
+ </View>
+ <ScheduleDescription id={value || null} />
+ </>
+ ) : op === 'prepend-notes' || op === 'append-notes' ? (
+ <>
+ <OpSelect
+ ops={['set', 'prepend-notes', 'append-notes']}
+ value={op}
+ onChange={onChange}
+ />
+
+ <View style={{ flex: 1 }}>
+ {/* @ts-expect-error fix this */}
+ <GenericInput
+ key={inputKey}
+ field={field}
+ type="string"
+ op={op}
+ value={value}
+ onChange={v => onChange('value', v)}
+ />
+ </View>
+ </>
+ ) : null}
+
+ <Stack direction="row">
+ <EditorButtons
+ onAdd={onAdd}
+ onDelete={
+ (op === 'set' || op === 'prepend-notes' || op === 'append-notes') &&
+ onDelete
+ }
+ />
+ </Stack>
+ </Editor>
+ );
+}
+
+function StageInfo() {
+ return (
+ <View style={{ position: 'relative', marginLeft: 5 }}>
+ <Tooltip
+ content={
+ <Trans>
+ The stage of a rule allows you to force a specific order. Pre rules
+ always run first, and post rules always run last. Within each stage
+ rules are automatically ordered from least to most specific.
+ </Trans>
+ }
+ placement="bottom start"
+ style={{
+ ...styles.tooltip,
+ padding: 10,
+ color: theme.pageTextLight,
+ maxWidth: 450,
+ lineHeight: 1.5,
+ }}
+ >
+ <SvgInformationOutline
+ style={{ width: 11, height: 11, color: theme.pageTextLight }}
+ />
+ </Tooltip>
+ </View>
+ );
+}
+
+type StageButtonProps = {
+ selected: boolean;
+ children: ReactNode;
+ style?: CSSProperties;
+ onSelect: () => void;
+};
+function StageButton({
+ selected,
+ children,
+ style,
+ onSelect,
+}: StageButtonProps) {
+ return (
+ <Button
+ variant="bare"
+ style={{
+ fontSize: 'inherit',
+ ...(selected && {
+ backgroundColor: theme.pillBackgroundSelected,
+ ':hover': { backgroundColor: theme.pillBackgroundSelected },
+ }),
+ ...style,
+ }}
+ onPress={onSelect}
+ >
+ {children}
+ </Button>
+ );
+}
+
+function newInput(item) {
+ return { ...item, inputKey: uuid() };
+}
+
+function ConditionsList({
+ conditionsOp,
+ conditions,
+ editorStyle,
+ isSchedule,
+ onChangeConditions,
+}) {
+ function addCondition(index) {
+ if (conditionFields && conditionFields.length > 0) {
+ conditionFields.forEach(field => {
+ field[1] = mapField(field[0]);
+ });
+ }
+
+ // (remove the inflow and outflow pseudo-fields since they’d be a pain to get right)
+ let fields = conditionFields
+ .map(f => f[0])
+ .filter(f => f !== 'amount-inflow' && f !== 'amount-outflow');
+
+ // suggest a sensible next field: the same if 'or' or different if 'and'
+ if (conditions.length && conditionsOp === 'or') {
+ fields = [conditions[0].field];
+ } else {
+ fields = fields.filter(
+ f => !conditions.some(c => c.field.includes(f) || f.includes(c.field)),
+ );
+ }
+ const field = fields[0] || 'payee';
+
+ const copy = [...conditions];
+ copy.splice(index + 1, 0, {
+ type: FIELD_TYPES.get(field),
+ field,
+ op: 'is',
+ value: null,
+ inputKey: uuid(),
+ });
+ onChangeConditions(copy);
+ }
+
+ function addInitialCondition() {
+ addCondition(-1);
+ }
+
+ function removeCondition(cond) {
+ onChangeConditions(conditions.filter(c => c !== cond));
+ }
+
+ function updateCondition(cond, field, value) {
+ onChangeConditions(
+ updateValue(conditions, cond, () => {
+ if (field === 'field') {
+ const newCond = { field: value };
+
+ if (value === 'amount-inflow') {
+ newCond.field = 'amount';
+ // @ts-expect-error fix this
+ newCond.options = { inflow: true };
+ } else if (value === 'amount-outflow') {
+ newCond.field = 'amount';
+ // @ts-expect-error fix this
+ newCond.options = { outflow: true };
+ }
+
+ // @ts-expect-error fix this
+ newCond.type = FIELD_TYPES.get(newCond.field);
+
+ const prevType = FIELD_TYPES.get(cond.field);
+ if (
+ (prevType === 'string' || prevType === 'number') &&
+ // @ts-expect-error fix this
+ prevType === newCond.type &&
+ cond.op !== 'isbetween' &&
+ isValidOp(newCond.field, cond.op)
+ ) {
+ // Don't clear the value & op if the type is string/number and
+ // the type hasn't changed
+ // @ts-expect-error fix this
+ newCond.op = cond.op;
+ return newInput(makeValue(cond.value, newCond));
+ } else {
+ // @ts-expect-error fix this
+ newCond.op = getValidOps(newCond.field)[0];
+ return newInput(makeValue(null, newCond));
+ }
+ } else if (field === 'op') {
+ const op = value;
+
+ // Switching between oneOf and other operators is a
+ // special-case. It changes the input type, so we need to
+ // clear the value
+ if (
+ cond.op !== 'oneOf' &&
+ cond.op !== 'notOneOf' &&
+ (op === 'oneOf' || op === 'notOneOf')
+ ) {
+ return newInput(
+ makeValue(cond.value != null ? [cond.value] : [], {
+ ...cond,
+ op: value,
+ }),
+ );
+ } else if (
+ (cond.op === 'oneOf' || cond.op === 'notOneOf') &&
+ op !== 'oneOf' &&
+ op !== 'notOneOf'
+ ) {
+ return newInput(
+ makeValue(cond.value.length > 0 ? cond.value[0] : null, {
+ ...cond,
+ op: value,
+ }),
+ );
+ } else if (cond.op !== 'isbetween' && op === 'isbetween') {
+ // TODO: I don't think we need `makeValue` anymore. It
+ // tries to parse the value as a float and we had to
+ // special-case isbetween. I don't know why we need that
+ // behavior and we can probably get rid of `makeValue`
+ return makeValue(
+ {
+ num1: amountToInteger(cond.value),
+ num2: amountToInteger(cond.value),
+ },
+ { ...cond, op: value },
+ );
+ } else if (cond.op === 'isbetween' && op !== 'isbetween') {
+ return makeValue(integerToAmount(cond.value.num1 || 0), {
+ ...cond,
+ op: value,
+ });
+ } else {
+ return { ...cond, op: value };
+ }
+ } else if (field === 'value') {
+ return makeValue(value, cond);
+ }
+
+ return cond;
+ }),
+ );
+ }
+
+ return conditions.length === 0 ? (
+ <Button style={{ alignSelf: 'flex-start' }} onPress={addInitialCondition}>
+ <Trans>Add condition</Trans>
+ </Button>
+ ) : (
+ <Stack spacing={2} data-testid="condition-list">
+ {conditions.map((cond, i) => {
+ let ops = getValidOps(cond.field);
+
+ // Hack for now, these ops should be the only ones available
+ // for recurring dates
+ if (cond.type === 'date' && cond.value && cond.value.frequency) {
+ ops = ['is', 'isapprox'];
+ } else if (
+ cond.options &&
+ (cond.options.inflow || cond.options.outflow)
+ ) {
+ ops = ops.filter(op => op !== 'isbetween');
+ }
+
+ return (
+ <View key={i}>
+ <ConditionEditor
+ editorStyle={editorStyle}
+ ops={ops}
+ condition={cond}
+ isSchedule={isSchedule}
+ onChange={(name, value) => {
+ updateCondition(cond, name, value);
+ }}
+ onDelete={() => removeCondition(cond)}
+ onAdd={() => addCondition(i)}
+ />
+ </View>
+ );
+ })}
+ </Stack>
+ );
+}
+
+const getActions = splits => splits.flatMap(s => s.actions);
+const getUnparsedActions = splits => getActions(splits).map(unparse);
+
+// TODO:
+// * Dont touch child transactions?
+
+const conditionFields = [
+ 'imported_payee',
+ 'account',
+ 'category',
+ 'date',
+ 'payee',
+ 'notes',
+ 'amount',
+]
+ .map(field => [field, mapField(field)])
+ .concat([
+ ['amount-inflow', mapField('amount', { inflow: true })],
+ ['amount-outflow', mapField('amount', { outflow: true })],
+ ]);
+
+type RuleEditorProps = {
+ rule: RuleEntity | NewRuleEntity;
+ onSave: (rule: RuleEntity | NewRuleEntity) => Promise<void>;
+ onCancel?: () => void;
+ style?: CSSProperties;
+};
+
+export function RuleEditor({
+ rule: defaultRule,
+ onSave: originalOnSave = undefined,
+ onCancel,
+ style,
+}: RuleEditorProps) {
+ const { t } = useTranslation();
+ const [conditions, setConditions] = useState(
+ defaultRule.conditions.map(parse).map(c => ({ ...c, inputKey: uuid() })),
+ );
+ const [actionSplits, setActionSplits] = useState(() => {
+ const parsedActions = defaultRule.actions.map(parse);
+ return parsedActions.reduce(
+ (acc, action) => {
+ const splitIndex = action.options?.splitIndex ?? 0;
+ acc[splitIndex] = acc[splitIndex] ?? { id: uuid(), actions: [] };
+ acc[splitIndex].actions.push({ ...action, inputKey: uuid() });
+ return acc;
+ },
+ // The pre-split group is always there
+ [{ id: uuid(), actions: [] }],
+ );
+ });
+ const [stage, setStage] = useState(defaultRule.stage);
+ const [conditionsOp, setConditionsOp] = useState(defaultRule.conditionsOp);
+ const [transactions, setTransactions] = useState([]);
+ const dispatch = useDispatch();
+ const scrollableEl = useRef(undefined);
+
+ const isSchedule = getActions(actionSplits).some(
+ action => action.op === 'link-schedule',
+ );
+
+ useEffect(() => {
+ dispatch(initiallyLoadPayees());
+
+ // Disable undo while this modal is open
+ disableUndo();
+ return () => enableUndo();
+ }, [dispatch]);
+
+ useEffect(() => {
+ // Flash the scrollbar
+ if (scrollableEl.current) {
+ const el = scrollableEl.current;
+ const top = el.scrollTop;
+ el.scrollTop = top + 1;
+ el.scrollTop = top;
+ }
+
+ // Run it here
+ async function run() {
+ const { filters } = await send('make-filters-from-conditions', {
+ conditions: conditions.map(unparse),
+ });
+
+ if (filters.length > 0) {
+ const conditionsOpKey = conditionsOp === 'or' ? '$or' : '$and';
+ const parentOnlyCondition =
+ actionSplits.length > 1 ? { is_child: false } : {};
+ const { data: transactions } = await aqlQuery(
+ q('transactions')
+ .filter({ [conditionsOpKey]: filters, ...parentOnlyCondition })
+ .select('*'),
+ );
+ setTransactions(transactions);
+ } else {
+ setTransactions([]);
+ }
+ }
+ run();
+ }, [actionSplits, conditions, conditionsOp]);
+
+ const selectedInst = useSelected('transactions', transactions, []);
+
+ function addInitialAction() {
+ addActionToSplitAfterIndex(0, -1);
+ }
+
+ function addActionToSplitAfterIndex(splitIndex, actionIndex) {
+ let newAction;
+ if (splitIndex && !actionSplits[splitIndex]?.actions?.length) {
+ actionSplits[splitIndex] = { id: uuid(), actions: [] };
+ newAction = {
+ op: 'set-split-amount',
+ options: { method: 'remainder', splitIndex },
+ value: null,
+ inputKey: uuid(),
+ };
+ } else {
+ const fieldsArray =
+ splitIndex === 0 ? getActionFields() : getSplitActionFields();
+ let fields = fieldsArray.map(f => f[0]);
+ for (const action of actionSplits[splitIndex].actions) {
+ fields = fields.filter(f => f !== action.field);
+ }
+ const field = fields[0] || 'category';
+ newAction = {
+ type: FIELD_TYPES.get(field),
+ field,
+ op: 'set',
+ value: null,
+ options: { splitIndex },
+ inputKey: uuid(),
+ };
+ }
+
+ const actionsCopy = [...actionSplits[splitIndex].actions];
+ actionsCopy.splice(actionIndex + 1, 0, newAction);
+ const copy = [...actionSplits];
+ copy[splitIndex] = { ...actionSplits[splitIndex], actions: actionsCopy };
+ setActionSplits(copy);
+ }
+
+ function onChangeAction(action, field, value) {
+ setActionSplits(
+ actionSplits.map(({ id, actions }) => ({
+ id,
+ actions: updateValue(actions, action, () => {
+ const a = { ...action };
+
+ if (field === 'method') {
+ a.options = { ...a.options, method: value };
+ } else if (field === 'template') {
+ if (value) {
+ a.options = { ...a.options, template: a.value };
+ } else {
+ a.options = { ...a.options, template: undefined };
+ if (a.type !== 'string') a.value = null;
+ }
+ } else {
+ a[field] = value;
+ if (a.options?.template !== undefined) {
+ a.options = {
+ ...a.options,
+ template: value,
+ };
+ }
+
+ if (field === 'field') {
+ a.type = FIELD_TYPES.get(a.field);
+ a.value = null;
+ a.options = { ...a.options, template: undefined };
+ return newInput(a);
+ } else if (field === 'op') {
+ a.value = null;
+ a.inputKey = '' + Math.random();
+ a.options = { ...a.options, template: undefined };
+ return newInput(a);
+ }
+ }
+
+ return a;
+ }),
+ })),
+ );
+ }
+
+ function onChangeStage(stage) {
+ setStage(stage);
+ }
+
+ function onChangeConditionsOp(value) {
+ setConditionsOp(value);
+ }
+
+ function onRemoveAction(action) {
+ setActionSplits(splits =>
+ splits.map(({ id, actions }) => ({
+ id,
+ actions: actions.filter(a => a !== action),
+ })),
+ );
+ }
+
+ function onRemoveSplit(splitIndexToRemove) {
+ setActionSplits(splits => {
+ const copy = [];
+ splits.forEach(({ id }, index) => {
+ if (index === splitIndexToRemove) {
+ return;
+ }
+ copy.push({ id, actions: [] });
+ });
+ getActions(splits).forEach(action => {
+ const currentSplitIndex = action.options?.splitIndex ?? 0;
+ if (currentSplitIndex === splitIndexToRemove) {
+ return;
+ }
+ const newSplitIndex =
+ currentSplitIndex > splitIndexToRemove
+ ? currentSplitIndex - 1
+ : currentSplitIndex;
+ copy[newSplitIndex].actions.push({
+ ...action,
+ options: { ...action.options, splitIndex: newSplitIndex },
+ });
+ });
+ return copy;
+ });
+ }
+
+ function onApply() {
+ const selectedTransactions = transactions.filter(({ id }) =>
+ selectedInst.items.has(id),
+ );
+ send('rule-apply-actions', {
+ transactions: selectedTransactions,
+ actions: getUnparsedActions(actionSplits),
+ }).then(() => {
+ // This makes it refetch the transactions
+ setActionSplits([...actionSplits]);
+ });
+ }
+
+ async function onSave(close) {
+ const rule = {
+ ...defaultRule,
+ stage,
+ conditionsOp,
+ conditions: conditions.map(unparse),
+ actions: getUnparsedActions(actionSplits),
+ };
+
+ // @ts-expect-error fix this
+ const method = rule.id ? 'rule-update' : 'rule-add';
+ // @ts-expect-error fix this
+ const { error, id: newId } = await send(method, rule);
+
+ if (error) {
+ // @ts-expect-error fix this
+ if (error.conditionErrors) {
+ // @ts-expect-error fix this
+ setConditions(applyErrors(conditions, error.conditionErrors));
+ }
+
+ // @ts-expect-error fix this
+ if (error.actionErrors) {
+ let usedErrorIdx = 0;
+ setActionSplits(
+ actionSplits.map(item => ({
+ ...item,
+ actions: item.actions.map(action => ({
+ ...action,
+ // @ts-expect-error fix this
+ error: error.actionErrors[usedErrorIdx++] ?? null,
+ })),
+ })),
+ );
+ }
+ } else {
+ // If adding a rule, we got back an id
+ if (newId) {
+ // @ts-expect-error fix this
+ rule.id = newId;
+ }
+
+ // @ts-expect-error fix this
+ originalOnSave?.(rule);
+ close();
+ }
+ }
+
+ // Enable editing existing split rules even if the feature has since been disabled.
+ const showSplitButton = actionSplits.length > 0;
+
+ return (
+ <View style={style}>
+ <View
+ style={{
+ flexDirection: 'row',
+ alignItems: 'center',
+ marginBottom: 15,
+ padding: '0 20px',
+ }}
+ >
+ <Text style={{ marginRight: 15 }}>
+ <Trans>Stage of rule:</Trans>
+ </Text>
+
+ <Stack direction="row" align="center" spacing={1}>
+ <StageButton
+ selected={stage === 'pre'}
+ onSelect={() => onChangeStage('pre')}
+ >
+ <Trans>Pre</Trans>
+ </StageButton>
+ <StageButton
+ selected={stage === null}
+ onSelect={() => onChangeStage(null)}
+ >
+ <Trans>Default</Trans>
+ </StageButton>
+ <StageButton
+ selected={stage === 'post'}
+ onSelect={() => onChangeStage('post')}
+ >
+ <Trans>Post</Trans>
+ </StageButton>
+
+ <StageInfo />
+ </Stack>
+ </View>
+
+ <View
+ innerRef={scrollableEl}
+ style={{
+ borderBottom: '1px solid ' + theme.tableBorder,
+ padding: 20,
+ overflow: 'auto',
+ maxHeight: 'calc(100% - 300px)',
+ }}
+ >
+ <View style={{ flexShrink: 0 }}>
+ <View style={{ marginBottom: 30 }}>
+ <Text style={{ marginBottom: 15 }}>
+ <Trans>
+ If{' '}
+ <FieldSelect
+ data-testid="conditions-op"
+ style={{ display: 'inline-flex' }}
+ fields={[
+ ['and', t('all')],
+ ['or', t('any')],
+ ]}
+ value={conditionsOp}
+ onChange={onChangeConditionsOp}
+ />
+ {{ allOrAny: '' }} of these conditions match:
+ </Trans>
+ </Text>
+
+ <ConditionsList
+ conditionsOp={conditionsOp}
+ conditions={conditions}
+ editorStyle={styles.editorPill}
+ isSchedule={isSchedule}
+ onChangeConditions={conds => setConditions(conds)}
+ />
+ </View>
+
+ <Text style={{ marginBottom: 15 }}>
+ <Trans>Then apply these actions:</Trans>
+ </Text>
+ <View style={{ flex: 1 }}>
+ {actionSplits.length === 0 && (
+ <Button
+ style={{ alignSelf: 'flex-start' }}
+ onPress={addInitialAction}
+ >
+ <Trans>Add action</Trans>
+ </Button>
+ )}
+ <Stack spacing={2} data-testid="action-split-list">
+ {actionSplits.map(({ id, actions }, splitIndex) => (
+ <View
+ key={id}
+ nativeStyle={
+ actionSplits.length > 1
+ ? {
+ borderColor: theme.tableBorder,
+ borderWidth: '1px',
+ borderRadius: '5px',
+ padding: '5px',
+ }
+ : {}
+ }
+ >
+ {actionSplits.length > 1 && (
+ <Stack direction="row" justify="space-between" spacing={1}>
+ <Text
+ style={{
+ ...styles.smallText,
+ marginBottom: '10px',
+ }}
+ >
+ {splitIndex === 0
+ ? t('Apply to all')
+ : `${t('Split')} ${splitIndex}`}
+ </Text>
+ {splitIndex && (
+ <Button
+ variant="bare"
+ onPress={() => onRemoveSplit(splitIndex)}
+ style={{
+ width: 20,
+ height: 20,
+ }}
+ aria-label={t('Delete split')}
+ >
+ <SvgDelete
+ style={{
+ width: 8,
+ height: 8,
+ color: 'inherit',
+ }}
+ />
+ </Button>
+ )}
+ </Stack>
+ )}
+ <Stack spacing={2} data-testid="action-list">
+ {actions.map((action, actionIndex) => (
+ <View key={actionIndex}>
+ <ActionEditor
+ action={action}
+ editorStyle={styles.editorPill}
+ onChange={(name, value) => {
+ onChangeAction(action, name, value);
+ }}
+ onDelete={() => onRemoveAction(action)}
+ onAdd={() =>
+ addActionToSplitAfterIndex(splitIndex, actionIndex)
+ }
+ />
+ </View>
+ ))}
+ </Stack>
+
+ {actions.length === 0 && (
+ <Button
+ style={{ alignSelf: 'flex-start', marginTop: 5 }}
+ onPress={() => addActionToSplitAfterIndex(splitIndex, -1)}
+ >
+ <Trans>Add action</Trans>
+ </Button>
+ )}
+ </View>
+ ))}
+ </Stack>
+ {showSplitButton && (
+ <Button
+ style={{ alignSelf: 'flex-start', marginTop: 15 }}
+ onPress={() => {
+ addActionToSplitAfterIndex(actionSplits.length, -1);
+ }}
+ data-testid="add-split-transactions"
+ >
+ {actionSplits.length > 1
+ ? t('Add another split')
+ : t('Split into multiple transactions')}
+ </Button>
+ )}
+ </View>
+ </View>
+ </View>
+
+ <SelectedProvider instance={selectedInst}>
+ <View style={{ padding: '20px', flex: 1 }}>
+ <View
+ style={{
+ flexDirection: 'row',
+ alignItems: 'center',
+ marginBottom: 12,
+ }}
+ >
+ <Text style={{ color: theme.pageTextLight, marginBottom: 0 }}>
+ <Trans>This rule applies to these transactions:</Trans>
+ </Text>
+
+ <View style={{ flex: 1 }} />
+ <Button
+ isDisabled={selectedInst.items.size === 0}
+ onPress={onApply}
+ >
+ <Trans>Apply actions</Trans> ({selectedInst.items.size})
+ </Button>
+ </View>
+
+ {/* @ts-expect-error fix this */}
+ <SimpleTransactionsTable
+ transactions={transactions}
+ fields={getTransactionFields(conditions, getActions(actionSplits))}
+ style={{
+ border: '1px solid ' + theme.tableBorder,
+ borderRadius: '6px 6px 0 0',
+ }}
+ />
+
+ <Stack direction="row" justify="flex-end" style={{ marginTop: 20 }}>
+ <Button onClick={onCancel}>
+ <Trans>Cancel</Trans>
+ </Button>
+ <Button variant="primary" onPress={() => onSave(onCancel)}>
+ <Trans>Save</Trans>
+ </Button>
+ </Stack>
+ </View>
+ </SelectedProvider>
+ </View>
+ );
+}
diff --git a/packages/desktop-client/src/components/schedules/ScheduleDetails.tsx b/packages/desktop-client/src/components/schedules/ScheduleDetails.tsx
index 49e52b46fa..0e9bcd7d40 100644
--- a/packages/desktop-client/src/components/schedules/ScheduleDetails.tsx
+++ b/packages/desktop-client/src/components/schedules/ScheduleDetails.tsx
@@ -33,7 +33,7 @@ import {
FormLabel,
Checkbox,
} from '@desktop-client/components/forms';
-import { OpSelect } from '@desktop-client/components/modals/EditRuleModal';
+import { OpSelect } from '@desktop-client/components/rules/RuleEditor';
import { DateSelect } from '@desktop-client/components/select/DateSelect';
import { RecurringSchedulePicker } from '@desktop-client/components/select/RecurringSchedulePicker';
import { SelectedItemsButton } from '@desktop-client/components/table';
@@ -674,10 +674,11 @@ export function ScheduleDetails({ id, transaction }: ScheduleDetailsProps) {
htmlFor="amount-field"
style={{ margin: 0, flex: 1 }}
/>
- {/* @ts-expect-error should be auto-patched once GenericInput is converted to TS */}
<OpSelect
ops={['isapprox', 'is', 'isbetween']}
- value={state.fields.amountOp}
+ value={
+ state.fields.amountOp as 'isapprox' | 'is' | 'isbetween'
+ }
formatOp={op => {
switch (op) {
case 'is':
diff --git a/upcoming-release-notes/5518.md b/upcoming-release-notes/5518.md
new file mode 100644
index 0000000000..8ec98c4d24
--- /dev/null
+++ b/upcoming-release-notes/5518.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Make rule editor component reusable outside a modal window