Skip to content
Snippets Groups Projects
Unverified Commit b7763937 authored by Jed Fox's avatar Jed Fox Committed by GitHub
Browse files

Improve behavior of deleted payees/categories/accounts in rules (#617)

parent e6459f30
No related branches found
No related tags found
No related merge requests found
......@@ -110,14 +110,16 @@ export function Value({
} else if (field === 'year') {
return value ? formatDate(parseISO(value), 'yyyy') : null;
} else {
let name = value;
if (data) {
if (data && data.length) {
let item = data.find(item => item.id === value);
if (item) {
name = describe(item);
return describe(item);
} else {
return '(deleted)';
}
} else {
return '';
}
return name;
}
}
}
......@@ -508,15 +510,20 @@ function RulesList({
function mapValue(field, value, { payees, categories, accounts }) {
if (!value) return '';
let object = null;
if (field === 'payee') {
return payees.find(p => p.id === value).name;
object = payees.find(p => p.id === value);
} else if (field === 'category') {
return categories.find(c => c.id === value).name;
object = categories.find(c => c.id === value);
} else if (field === 'account') {
return accounts.find(a => a.id === value).name;
object = accounts.find(a => a.id === value);
} else {
return value;
}
if (object) {
return object.name;
}
return '(deleted)';
}
function ruleToString(rule, data) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment