Skip to content

A local-first personal finance app

[Redux] Rename queriesSlice to transactionsSlice (#5598)

Joel Jeremy Marquez68f0b05aed06
diff --git a/packages/desktop-client/src/accounts/accountsSlice.ts b/packages/desktop-client/src/accounts/accountsSlice.ts
index a5f77b754a..3ead561df3 100644
--- a/packages/desktop-client/src/accounts/accountsSlice.ts
+++ b/packages/desktop-client/src/accounts/accountsSlice.ts
@@ -16,9 +16,9 @@ import {
import { resetApp } from '@desktop-client/app/appSlice';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { markPayeesDirty } from '@desktop-client/payees/payeesSlice';
-import { setNewTransactions } from '@desktop-client/queries/queriesSlice';
import { createAppAsyncThunk } from '@desktop-client/redux';
import { type AppDispatch } from '@desktop-client/redux/store';
+import { setNewTransactions } from '@desktop-client/transactions/transactionsSlice';
const sliceName = 'account';
@@ -520,6 +520,97 @@ export const moveAccount = createAppAsyncThunk(
},
);
+type ImportPreviewTransactionsPayload = {
+ accountId: string;
+ transactions: TransactionEntity[];
+};
+
+export const importPreviewTransactions = createAppAsyncThunk(
+ `${sliceName}/importPreviewTransactions`,
+ async (
+ { accountId, transactions }: ImportPreviewTransactionsPayload,
+ { dispatch },
+ ) => {
+ const { errors = [], updatedPreview } = await send('transactions-import', {
+ accountId,
+ transactions,
+ isPreview: true,
+ });
+
+ errors.forEach(error => {
+ dispatch(
+ addNotification({
+ notification: {
+ type: 'error',
+ message: error.message,
+ },
+ }),
+ );
+ });
+
+ return updatedPreview;
+ },
+);
+
+type ImportTransactionsPayload = {
+ accountId: string;
+ transactions: TransactionEntity[];
+ reconcile: boolean;
+};
+
+export const importTransactions = createAppAsyncThunk(
+ `${sliceName}/importTransactions`,
+ async (
+ { accountId, transactions, reconcile }: ImportTransactionsPayload,
+ { dispatch },
+ ) => {
+ if (!reconcile) {
+ await send('api/transactions-add', {
+ accountId,
+ transactions,
+ });
+
+ return true;
+ }
+
+ const {
+ errors = [],
+ added,
+ updated,
+ } = await send('transactions-import', {
+ accountId,
+ transactions,
+ isPreview: false,
+ });
+
+ errors.forEach(error => {
+ dispatch(
+ addNotification({
+ notification: {
+ type: 'error',
+ message: error.message,
+ },
+ }),
+ );
+ });
+
+ dispatch(
+ setNewTransactions({
+ newTransactions: added,
+ matchedTransactions: updated,
+ }),
+ );
+
+ dispatch(
+ markUpdatedAccounts({
+ ids: added.length > 0 ? [accountId] : [],
+ }),
+ );
+
+ return added.length > 0 || updated.length > 0;
+ },
+);
+
export const getAccountsById = memoizeOne(
(accounts: AccountEntity[] | null | undefined) => groupById(accounts),
);
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
index 2e13bf44ad..ba069eaac7 100644
--- a/packages/desktop-client/src/components/accounts/Account.tsx
+++ b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -85,9 +85,9 @@ import {
pagedQuery,
type PagedQuery,
} from '@desktop-client/queries/pagedQuery';
-import { updateNewTransactions } from '@desktop-client/queries/queriesSlice';
import { useSelector, useDispatch } from '@desktop-client/redux';
import { type AppDispatch } from '@desktop-client/redux/store';
+import { updateNewTransactions } from '@desktop-client/transactions/transactionsSlice';
type ConditionEntity = Partial<RuleConditionEntity> | TransactionFilterEntity;
@@ -1932,9 +1932,11 @@ export function Account() {
const location = useLocation();
const { grouped: categoryGroups } = useCategories();
- const newTransactions = useSelector(state => state.queries.newTransactions);
+ const newTransactions = useSelector(
+ state => state.transactions.newTransactions,
+ );
const matchedTransactions = useSelector(
- state => state.queries.matchedTransactions,
+ state => state.transactions.matchedTransactions,
);
const accounts = useAccounts();
const payees = usePayees();
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
index 0a08ec5ef1..09a39b6a57 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
@@ -79,8 +79,8 @@ import {
} from '@desktop-client/hooks/useSingleActiveEditForm';
import { pushModal } from '@desktop-client/modals/modalsSlice';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
-import { setLastTransaction } from '@desktop-client/queries/queriesSlice';
import { useSelector, useDispatch } from '@desktop-client/redux';
+import { setLastTransaction } from '@desktop-client/transactions/transactionsSlice';
function getFieldName(transactionId, field) {
return `${field}-${transactionId}`;
@@ -1349,7 +1349,9 @@ function TransactionEditUnconnected({
export const TransactionEdit = props => {
const { list: categories } = useCategories();
const payees = usePayees();
- const lastTransaction = useSelector(state => state.queries.lastTransaction);
+ const lastTransaction = useSelector(
+ state => state.transactions.lastTransaction,
+ );
const accounts = useAccounts();
const dateFormat = useDateFormat() || 'MM/dd/yyyy';
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx
index dd7df8709b..1c2568612e 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx
@@ -95,7 +95,9 @@ export function TransactionListItem({
const transferAccount = useAccount(payee?.transfer_acct || '');
const isPreview = isPreviewId(transaction?.id || '');
- const newTransactions = useSelector(state => state.queries.newTransactions);
+ const newTransactions = useSelector(
+ state => state.transactions.newTransactions,
+ );
const { longPressProps } = useLongPress({
accessibilityDescription: 'Long press to select multiple transactions',
diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx
index e40c00e58b..e6793173aa 100644
--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx
+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx
@@ -27,6 +27,10 @@ import {
stripCsvImportTransaction,
} from './utils';
+import {
+ importPreviewTransactions,
+ importTransactions,
+} from '@desktop-client/accounts/accountsSlice';
import {
Modal,
ModalCloseButton,
@@ -41,10 +45,6 @@ import { useCategories } from '@desktop-client/hooks/useCategories';
import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
import { useSyncedPrefs } from '@desktop-client/hooks/useSyncedPrefs';
import { reloadPayees } from '@desktop-client/payees/payeesSlice';
-import {
- importPreviewTransactions,
- importTransactions,
-} from '@desktop-client/queries/queriesSlice';
import { useDispatch } from '@desktop-client/redux';
function getFileType(filepath) {
diff --git a/packages/desktop-client/src/components/util/GenericInput.jsx b/packages/desktop-client/src/components/util/GenericInput.jsx
index fb7120cca0..c976c99a1f 100644
--- a/packages/desktop-client/src/components/util/GenericInput.jsx
+++ b/packages/desktop-client/src/components/util/GenericInput.jsx
@@ -24,7 +24,7 @@ import { useCategories } from '@desktop-client/hooks/useCategories';
import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
import { useReports } from '@desktop-client/hooks/useReports';
import { pushModal } from '@desktop-client/modals/modalsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch } from '@desktop-client/redux';
export function GenericInput({
field,
@@ -43,7 +43,6 @@ export function GenericInput({
const { t } = useTranslation();
const { grouped: categoryGroups } = useCategories();
const { data: savedReports } = useReports();
- const saved = useSelector(state => state.queries.saved);
const dateFormat = useDateFormat() || 'MM/dd/yyyy';
// Helper function to open autocomplete modal with safe event handling
@@ -196,7 +195,6 @@ export function GenericInput({
content = (
<FilterAutocomplete
type={autocompleteType}
- saved={saved}
value={value}
openOnFocus={true}
onSelect={onChange}
diff --git a/packages/desktop-client/src/index.tsx b/packages/desktop-client/src/index.tsx
index 7ef9a3ba6a..e5191232ee 100644
--- a/packages/desktop-client/src/index.tsx
+++ b/packages/desktop-client/src/index.tsx
@@ -31,8 +31,9 @@ import * as notificationsSlice from './notifications/notificationsSlice';
import * as payeesSlice from './payees/payeesSlice';
import * as prefsSlice from './prefs/prefsSlice';
import { aqlQuery } from './queries/aqlQuery';
-import * as queriesSlice from './queries/queriesSlice';
import { store } from './redux/store';
+import * as tagsSlice from './tags/tagsSlice';
+import * as transactionsSlice from './transactions/transactionsSlice';
import { redo, undo } from './undo';
import * as usersSlice from './users/usersSlice';
@@ -46,7 +47,8 @@ const boundActions = bindActionCreators(
...notificationsSlice.actions,
...payeesSlice.actions,
...prefsSlice.actions,
- ...queriesSlice.actions,
+ ...transactionsSlice.actions,
+ ...tagsSlice.actions,
...usersSlice.actions,
},
store.dispatch,
diff --git a/packages/desktop-client/src/queries/queriesSlice.ts b/packages/desktop-client/src/queries/queriesSlice.ts
deleted file mode 100644
index 3268954eea..0000000000
--- a/packages/desktop-client/src/queries/queriesSlice.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-// @ts-strict-ignore
-import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
-
-import { send } from 'loot-core/platform/client/fetch';
-import { type TransactionEntity } from 'loot-core/types/models';
-
-import { markUpdatedAccounts } from '@desktop-client/accounts/accountsSlice';
-import { resetApp } from '@desktop-client/app/appSlice';
-import { addNotification } from '@desktop-client/notifications/notificationsSlice';
-import { createAppAsyncThunk } from '@desktop-client/redux';
-
-const sliceName = 'queries';
-
-type QueriesState = {
- newTransactions: Array<TransactionEntity['id']>;
- matchedTransactions: Array<TransactionEntity['id']>;
- lastTransaction: TransactionEntity | null;
-};
-
-const initialState: QueriesState = {
- newTransactions: [],
- matchedTransactions: [],
- lastTransaction: null,
-};
-
-type SetNewTransactionsPayload = {
- newTransactions: Array<TransactionEntity['id']>;
- matchedTransactions: Array<TransactionEntity['id']>;
-};
-
-type UpdateNewTransactionsPayload = {
- id: TransactionEntity['id'];
-};
-
-type SetLastTransactionPayload = {
- transaction: TransactionEntity;
-};
-
-const queriesSlice = createSlice({
- name: sliceName,
- initialState,
- reducers: {
- setNewTransactions(
- state,
- action: PayloadAction<SetNewTransactionsPayload>,
- ) {
- state.newTransactions = action.payload.newTransactions
- ? [...state.newTransactions, ...action.payload.newTransactions]
- : state.newTransactions;
-
- state.matchedTransactions = action.payload.matchedTransactions
- ? [...state.matchedTransactions, ...action.payload.matchedTransactions]
- : state.matchedTransactions;
- },
- updateNewTransactions(
- state,
- action: PayloadAction<UpdateNewTransactionsPayload>,
- ) {
- state.newTransactions = state.newTransactions.filter(
- id => id !== action.payload.id,
- );
- state.matchedTransactions = state.matchedTransactions.filter(
- id => id !== action.payload.id,
- );
- },
- setLastTransaction(
- state,
- action: PayloadAction<SetLastTransactionPayload>,
- ) {
- state.lastTransaction = action.payload.transaction;
- },
- },
- extraReducers: builder => {
- builder.addCase(resetApp, () => initialState);
- },
-});
-
-// Transaction actions
-
-type ImportPreviewTransactionsPayload = {
- accountId: string;
- transactions: TransactionEntity[];
-};
-
-export const importPreviewTransactions = createAppAsyncThunk(
- `${sliceName}/importPreviewTransactions`,
- async (
- { accountId, transactions }: ImportPreviewTransactionsPayload,
- { dispatch },
- ) => {
- const { errors = [], updatedPreview } = await send('transactions-import', {
- accountId,
- transactions,
- isPreview: true,
- });
-
- errors.forEach(error => {
- dispatch(
- addNotification({
- notification: {
- type: 'error',
- message: error.message,
- },
- }),
- );
- });
-
- return updatedPreview;
- },
-);
-
-type ImportTransactionsPayload = {
- accountId: string;
- transactions: TransactionEntity[];
- reconcile: boolean;
-};
-
-export const importTransactions = createAppAsyncThunk(
- `${sliceName}/importTransactions`,
- async (
- { accountId, transactions, reconcile }: ImportTransactionsPayload,
- { dispatch },
- ) => {
- if (!reconcile) {
- await send('api/transactions-add', {
- accountId,
- transactions,
- });
-
- return true;
- }
-
- const {
- errors = [],
- added,
- updated,
- } = await send('transactions-import', {
- accountId,
- transactions,
- isPreview: false,
- });
-
- errors.forEach(error => {
- dispatch(
- addNotification({
- notification: {
- type: 'error',
- message: error.message,
- },
- }),
- );
- });
-
- const { setNewTransactions } = queriesSlice.actions;
-
- dispatch(
- setNewTransactions({
- newTransactions: added,
- matchedTransactions: updated,
- }),
- );
-
- dispatch(
- markUpdatedAccounts({
- ids: added.length > 0 ? [accountId] : [],
- }),
- );
-
- return added.length > 0 || updated.length > 0;
- },
-);
-
-// Slice exports
-
-export const { name, reducer, getInitialState } = queriesSlice;
-export const actions = {
- ...queriesSlice.actions,
- importPreviewTransactions,
- importTransactions,
-};
-
-export const { setNewTransactions, updateNewTransactions, setLastTransaction } =
- queriesSlice.actions;
diff --git a/packages/desktop-client/src/redux/mock.tsx b/packages/desktop-client/src/redux/mock.tsx
index 81a46573d6..192846ef77 100644
--- a/packages/desktop-client/src/redux/mock.tsx
+++ b/packages/desktop-client/src/redux/mock.tsx
@@ -37,14 +37,14 @@ import {
name as prefsSliceName,
reducer as prefsSliceReducer,
} from '@desktop-client/prefs/prefsSlice';
-import {
- name as queriesSliceName,
- reducer as queriesSliceReducer,
-} from '@desktop-client/queries/queriesSlice';
import {
name as tagsSliceName,
reducer as tagsSliceReducer,
} from '@desktop-client/tags/tagsSlice';
+import {
+ name as transactionsSliceName,
+ reducer as transactionsSliceReducer,
+} from '@desktop-client/transactions/transactionsSlice';
import {
name as usersSliceName,
reducer as usersSliceReducer,
@@ -59,7 +59,7 @@ const appReducer = combineReducers({
[notificationsSliceName]: notificationsSliceReducer,
[payeesSliceName]: payeesSliceReducer,
[prefsSliceName]: prefsSliceReducer,
- [queriesSliceName]: queriesSliceReducer,
+ [transactionsSliceName]: transactionsSliceReducer,
[tagsSliceName]: tagsSliceReducer,
[usersSliceName]: usersSliceReducer,
});
diff --git a/packages/desktop-client/src/redux/store.ts b/packages/desktop-client/src/redux/store.ts
index f22a155216..783306905f 100644
--- a/packages/desktop-client/src/redux/store.ts
+++ b/packages/desktop-client/src/redux/store.ts
@@ -38,14 +38,14 @@ import {
name as prefsSliceName,
reducer as prefsSliceReducer,
} from '@desktop-client/prefs/prefsSlice';
-import {
- name as queriesSliceName,
- reducer as queriesSliceReducer,
-} from '@desktop-client/queries/queriesSlice';
import {
name as tagsSliceName,
reducer as tagsSliceReducer,
} from '@desktop-client/tags/tagsSlice';
+import {
+ name as transactionsSliceName,
+ reducer as transactionsSliceReducer,
+} from '@desktop-client/transactions/transactionsSlice';
import {
name as usersSliceName,
reducer as usersSliceReducer,
@@ -60,7 +60,7 @@ const rootReducer = combineReducers({
[notificationsSliceName]: notificationsSliceReducer,
[payeesSliceName]: payeesSliceReducer,
[prefsSliceName]: prefsSliceReducer,
- [queriesSliceName]: queriesSliceReducer,
+ [transactionsSliceName]: transactionsSliceReducer,
[tagsSliceName]: tagsSliceReducer,
[usersSliceName]: usersSliceReducer,
});
diff --git a/packages/desktop-client/src/transactions/transactionsSlice.ts b/packages/desktop-client/src/transactions/transactionsSlice.ts
new file mode 100644
index 0000000000..f4bd5f05c3
--- /dev/null
+++ b/packages/desktop-client/src/transactions/transactionsSlice.ts
@@ -0,0 +1,79 @@
+import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
+
+import { type TransactionEntity } from 'loot-core/types/models';
+
+import { resetApp } from '@desktop-client/app/appSlice';
+
+const sliceName = 'transactions';
+
+type TransactionsState = {
+ newTransactions: Array<TransactionEntity['id']>;
+ matchedTransactions: Array<TransactionEntity['id']>;
+ lastTransaction: TransactionEntity | null;
+};
+
+const initialState: TransactionsState = {
+ newTransactions: [],
+ matchedTransactions: [],
+ lastTransaction: null,
+};
+
+type SetNewTransactionsPayload = {
+ newTransactions: Array<TransactionEntity['id']>;
+ matchedTransactions: Array<TransactionEntity['id']>;
+};
+
+type UpdateNewTransactionsPayload = {
+ id: TransactionEntity['id'];
+};
+
+type SetLastTransactionPayload = {
+ transaction: TransactionEntity;
+};
+
+const transactionsSlice = createSlice({
+ name: sliceName,
+ initialState,
+ reducers: {
+ setNewTransactions(
+ state,
+ action: PayloadAction<SetNewTransactionsPayload>,
+ ) {
+ state.newTransactions = action.payload.newTransactions
+ ? [...state.newTransactions, ...action.payload.newTransactions]
+ : state.newTransactions;
+
+ state.matchedTransactions = action.payload.matchedTransactions
+ ? [...state.matchedTransactions, ...action.payload.matchedTransactions]
+ : state.matchedTransactions;
+ },
+ updateNewTransactions(
+ state,
+ action: PayloadAction<UpdateNewTransactionsPayload>,
+ ) {
+ state.newTransactions = state.newTransactions.filter(
+ id => id !== action.payload.id,
+ );
+ state.matchedTransactions = state.matchedTransactions.filter(
+ id => id !== action.payload.id,
+ );
+ },
+ setLastTransaction(
+ state,
+ action: PayloadAction<SetLastTransactionPayload>,
+ ) {
+ state.lastTransaction = action.payload.transaction;
+ },
+ },
+ extraReducers: builder => {
+ builder.addCase(resetApp, () => initialState);
+ },
+});
+
+export const { name, reducer, getInitialState } = transactionsSlice;
+export const actions = {
+ ...transactionsSlice.actions,
+};
+
+export const { setNewTransactions, updateNewTransactions, setLastTransaction } =
+ transactionsSlice.actions;
diff --git a/upcoming-release-notes/5598.md b/upcoming-release-notes/5598.md
new file mode 100644
index 0000000000..921a18f6b7
--- /dev/null
+++ b/upcoming-release-notes/5598.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+[Redux] Rename queriesSlice to transactionsSlice