A local-first personal finance app
[Enhancement] Make transaction list sortable by cleared status (#1994)
jaarasys-henria86007e392fbd
diff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.pngindex b14f414c3d..f80ae8f280 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.pngindex 3f6f471d4b..a4ea1871f8 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.pngindex e50c6e5873..dfe9e61345 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-4-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-4-chromium-linux.pngindex 1c74772fe7..e1e4e17226 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-4-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-4-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.pngindex c43e9ef2b8..8b33b6d930 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.pngindex 756c2af3e3..0b1cc7296d 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.pngindex 7e96d9aeb3..0260f564a9 100644Binary files a/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png b/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.pngindex ed751ec7c3..ac4910e8d9 100644Binary files a/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.pngindex e9937af9be..7f2acfdc77 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.pngindex 6cbbc44bb6..b387125493 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.pngindex f485ee8b8f..b218023a6d 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.pngindex 0ad95ebab4..c161ae84b5 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.pngindex 045d052203..1cbbe2758e 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.pngindex aa786be5f8..a5ee1a8654 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-5-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-5-chromium-linux.pngindex e4ca93c6c4..68fb938cc3 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-5-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-5-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-6-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-6-chromium-linux.pngindex 8f1debec75..f0690b648b 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-6-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-category-6-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-5-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-5-chromium-linux.pngindex 293150a32b..78c9eed056 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-5-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-5-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-6-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-6-chromium-linux.pngindex 56800cdbd7..50938e2297 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-6-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-6-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/accounts/Account.jsx b/packages/desktop-client/src/components/accounts/Account.jsxindex 85c5867206..1fb7e32a11 100644--- a/packages/desktop-client/src/components/accounts/Account.jsx+++ b/packages/desktop-client/src/components/accounts/Account.jsx@@ -1199,6 +1199,7 @@ class AccountInternal extends PureComponent {applySort = (field, ascDesc, prevField, prevAscDesc) => {const filters = this.state.filters;+ const isFiltered = filters.length > 0;const sortField = getField(!field ? this.state.sort.field : field);const sortAscDesc = !ascDesc ? this.state.sort.ascDesc : ascDesc;const sortPrevField = getField(@@ -1208,34 +1209,78 @@ class AccountInternal extends PureComponent {? this.state.sort.prevAscDesc: prevAscDesc;- if (!field) {- //no sort was made (called by applyFilters)- this.currentQuery = this.currentQuery.orderBy({+ const sortCurrentQuery = function (that, sortField, sortAscDesc) {+ if (sortField === 'cleared') {+ that.currentQuery = that.currentQuery.orderBy({+ reconciled: sortAscDesc,+ });+ }++ that.currentQuery = that.currentQuery.orderBy({[sortField]: sortAscDesc,});- } else {- //sort called directly- if (filters.length > 0) {- //if filters already exist then apply them- this.applyFilters([...filters]);- this.currentQuery = this.currentQuery.orderBy({- [sortField]: sortAscDesc,+ };++ const sortRootQuery = function (that, sortField, sortAscDesc) {+ if (sortField === 'cleared') {+ that.currentQuery = that.rootQuery.orderBy({+ reconciled: sortAscDesc,+ });+ that.currentQuery = that.currentQuery.orderBy({+ cleared: sortAscDesc,});} else {- //no filters exist make new rootquery- this.currentQuery = this.rootQuery.orderBy({+ that.currentQuery = that.rootQuery.orderBy({[sortField]: sortAscDesc,});}- }- if (sortPrevField) {- //apply previos sort if it exists- this.currentQuery = this.currentQuery.orderBy({+ };++ // sort by previously used sort field, if any+ const maybeSortByPreviousField = function (+ that,+ sortPrevField,+ sortPrevAscDesc,+ ) {+ if (!sortPrevField) {+ return;+ }++ if (sortPrevField === 'cleared') {+ that.currentQuery = that.currentQuery.orderBy({+ reconciled: sortPrevAscDesc,+ });+ }++ that.currentQuery = that.currentQuery.orderBy({[sortPrevField]: sortPrevAscDesc,});+ };++ switch (true) {+ // called by applyFilters to sort an already filtered result+ case !field:+ sortCurrentQuery(this, sortField, sortAscDesc);+ break;++ // called directly from UI by sorting a column.+ // active filters need to be applied before sorting+ case isFiltered:+ this.applyFilters([...filters]);+ sortCurrentQuery(this, sortField, sortAscDesc);+ break;++ // called directly from UI by sorting a column.+ // no active filters, start a new root query.+ case !isFiltered:+ sortRootQuery(this, sortField, sortAscDesc);+ break;++ default:}- this.updateQuery(this.currentQuery, this.state.filters.length > 0);+ maybeSortByPreviousField(this, sortPrevField, sortPrevAscDesc);+ this.updateQuery(this.currentQuery, isFiltered);};onSort = (headerClicked, ascDesc) => {diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx b/packages/desktop-client/src/components/transactions/TransactionsTable.jsxindex 69e53337c4..0472fa4824 100644--- a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.jsx@@ -368,7 +368,23 @@ const TransactionHeader = memo(}/>{showBalance && <Cell value="Balance" width={88} textAlign="right" />}- {showCleared && <Field width={23} truncate={false} />}++ {showCleared && (+ <HeaderCell+ value="✓"+ width={23}+ alignItems="center"+ id="cleared"+ icon={field === 'cleared' ? ascDesc : 'clickable'}+ onClick={() => {+ onSort(+ 'cleared',+ selectAscDesc(field, ascDesc, 'cleared', 'asc'),+ );+ }}+ />+ )}+<Cell value="" width={5 + (scrollWidth ?? 0)} /></Row>);diff --git a/upcoming-release-notes/1994.md b/upcoming-release-notes/1994.mdnew file mode 100644index 0000000000..79bb0c3c62--- /dev/null+++ b/upcoming-release-notes/1994.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [jaarasys-henria]+---++Make transaction list sortable by cleared status