Skip to content

A local-first personal finance app

Add “Show unused payees” button (#1011)

SudoCerb1305335f0a73
diff --git a/.gitignore b/.gitignore
index 66fb303b2f..849d42c0e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ export-2020-01-10.csv
!.yarn/releases
!.yarn/sdks
!.yarn/versions
+
+# VSCode
+.vscode
diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.js b/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
index 6c86e2cc3d..a83b521abc 100644
--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
@@ -20,8 +20,14 @@ function ManagePayeesWithData({
}) {
let [payees, setPayees] = useState(initialPayees);
let [ruleCounts, setRuleCounts] = useState({ value: new Map() });
+ let [orphans, setOrphans] = useState({ value: new Map() });
let payeesRef = useRef();
+ async function refetchOrphanedPayees() {
+ let orphs = await send('payees-get-orphaned');
+ setOrphans(orphs);
+ }
+
async function refetchRuleCounts() {
let counts = await send('payees-get-rule-counts');
counts = new Map(Object.entries(counts));
@@ -41,6 +47,7 @@ function ManagePayeesWithData({
}
refetchRuleCounts();
+ refetchOrphanedPayees();
}
loadData();
@@ -63,6 +70,7 @@ function ManagePayeesWithData({
}
setPayees(await getPayees());
+ refetchOrphanedPayees();
if (
(meta && meta.targetId) ||
@@ -116,16 +124,29 @@ function ManagePayeesWithData({
modalProps={modalProps}
payees={payees}
ruleCounts={ruleCounts.value}
+ orphanedPayees={orphans}
categoryGroups={categoryGroups}
initialSelectedIds={initialSelectedIds}
lastUndoState={lastUndoState}
onBatchChange={changes => {
send('payees-batch-change', changes);
setPayees(applyChanges(changes, payees));
+ setOrphans(applyChanges(changes, orphans));
}}
onMerge={async ([targetId, ...mergeIds]) => {
await send('payees-merge', { targetId, mergeIds });
+ let targetIdIsOrphan = orphans.map(o => o.id).includes(targetId);
+ let mergeIdsOrphans = mergeIds.filter(m =>
+ orphans.map(o => o.id).includes(m),
+ );
+
+ if (targetIdIsOrphan && mergeIdsOrphans.length !== mergeIds.length) {
+ // there is a non-orphan in mergeIds, target can be removed from orphan arr
+ orphans = orphans.filter(o => o.id !== targetId);
+ }
+ orphans = orphans.filter(o => !mergeIds.includes(o.id));
+
let result = payees.filter(p => !mergeIds.includes(p.id));
mergeIds.forEach(id => {
let count = ruleCounts.value.get(id) || 0;
@@ -136,6 +157,7 @@ function ManagePayeesWithData({
});
setPayees(result);
+ setOrphans(orphans);
setRuleCounts({ value: ruleCounts.value });
}}
onViewRules={onViewRules}
diff --git a/packages/desktop-client/src/components/payees/index.js b/packages/desktop-client/src/components/payees/index.js
index 4a75e3f909..ce152cf7bc 100644
--- a/packages/desktop-client/src/components/payees/index.js
+++ b/packages/desktop-client/src/components/payees/index.js
@@ -342,6 +342,7 @@ export const ManagePayees = forwardRef(
modalProps,
payees,
ruleCounts,
+ orphanedPayees,
categoryGroups,
initialSelectedIds,
ruleActions,
@@ -357,16 +358,22 @@ export const ManagePayees = forwardRef(
let table = useRef(null);
let scrollTo = useRef(null);
let resetAnimation = useRef(false);
-
- let filteredPayees = useMemo(
- () =>
- filter === ''
- ? payees
- : payees.filter(p =>
- p.name.toLowerCase().includes(filter.toLowerCase()),
- ),
- [payees, filter],
- );
+ const [orphanedOnly, setOrphanedOnly] = useState(false);
+
+ let filteredPayees = useMemo(() => {
+ let filtered = payees;
+ if (filter) {
+ filtered = filtered.filter(p =>
+ p.name.toLowerCase().includes(filter.toLowerCase()),
+ );
+ }
+ if (orphanedOnly) {
+ filtered = filtered.filter(p =>
+ orphanedPayees.map(o => o.id).includes(p.id),
+ );
+ }
+ return filtered;
+ }, [payees, filter, orphanedOnly]);
let selected = useSelected('payees', filteredPayees, initialSelectedIds);
@@ -505,6 +512,23 @@ export const ManagePayees = forwardRef(
</View>
)}
</Component>
+ <View>
+ <Button
+ bare
+ style={{
+ marginRight: '10px',
+ }}
+ disabled={!(orphanedPayees.length > 0) && !orphanedOnly}
+ onClick={() => {
+ setOrphanedOnly(!orphanedOnly);
+ const filterInput = document.getElementById('filter-input');
+ applyFilter(filterInput.value);
+ tableNavigator.onEdit(null);
+ }}
+ >
+ {orphanedOnly ? 'Show all payees' : 'Show unused payees'}
+ </Button>
+ </View>
<View style={{ flex: 1 }} />
<Input
placeholder="Filter payees..."
diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
index a68a64e216..0a1e4b48e4 100644
--- a/packages/loot-core/src/server/db/index.ts
+++ b/packages/loot-core/src/server/db/index.ts
@@ -511,6 +511,15 @@ export function getPayees() {
`);
}
+export function syncGetOrphanedPayees() {
+ return all(`
+ SELECT p.id FROM payees p
+ LEFT JOIN payee_mapping pm ON pm.id = p.id
+ LEFT JOIN v_transactions_internal_alive t ON t.payee = pm.targetId
+ WHERE p.tombstone = 0 AND p.transfer_acct IS NULL AND t.id IS NULL
+`);
+}
+
export async function getOrphanedPayees() {
let rows = await all(`
SELECT p.id FROM payees p
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index ac508c2182..73a9cc98b0 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -452,6 +452,10 @@ handlers['payees-get'] = async function () {
return db.getPayees();
};
+handlers['payees-get-orphaned'] = async function () {
+ return db.syncGetOrphanedPayees();
+};
+
handlers['payees-get-rule-counts'] = async function () {
let payeeCounts = {};
diff --git a/upcoming-release-notes/1011.md b/upcoming-release-notes/1011.md
new file mode 100644
index 0000000000..624813fbc7
--- /dev/null
+++ b/upcoming-release-notes/1011.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [sudoCerb]
+---
+
+Add ability to filter the Manage Payees screen to show orphaned payees only.