Skip to content

A local-first personal finance app

Fix `send` types in a number of places (2/2) (#4147)

Julian Dominguez-Schatza97471557bfd
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
index 643a11286b..1ce83b9089 100644
--- a/packages/desktop-client/src/components/accounts/Account.tsx
+++ b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -480,7 +480,11 @@ class AccountInternal extends PureComponent<
}
fetchAllIds = async () => {
- const { data } = await runQuery(this.paged?.query.select('id'));
+ if (!this.paged) {
+ return [];
+ }
+
+ const { data } = await runQuery(this.paged.query.select('id'));
// Remember, this is the `grouped` split type so we need to deal
// with the `subtransactions` property
return data.reduce((arr: string[], t: TransactionEntity) => {
@@ -709,12 +713,12 @@ class AccountInternal extends PureComponent<
};
async calculateBalances() {
- if (!this.canCalculateBalance()) {
+ if (!this.canCalculateBalance() || !this.paged) {
return null;
}
const { data } = await runQuery(
- this.paged?.query
+ this.paged.query
.options({ splits: 'none' })
.select([{ balance: { $sumOver: '$amount' } }]),
);
@@ -930,8 +934,12 @@ class AccountInternal extends PureComponent<
}
getFilteredAmount = async () => {
+ if (!this.paged) {
+ return 0;
+ }
+
const { data: amount } = await runQuery(
- this.paged?.query.calculate({ $sum: '$amount' }),
+ this.paged.query.calculate({ $sum: '$amount' }),
);
return amount;
};
diff --git a/packages/desktop-client/src/components/modals/EditUser.tsx b/packages/desktop-client/src/components/modals/EditUser.tsx
index 5fdb1d71a3..5fff56987f 100644
--- a/packages/desktop-client/src/components/modals/EditUser.tsx
+++ b/packages/desktop-client/src/components/modals/EditUser.tsx
@@ -83,14 +83,14 @@ function useSaveUser() {
user: User,
setError: (error: string) => void,
): Promise<boolean> {
- const res = (await send(method, user)) || {};
- if (!res['error']) {
- const newId = res['id'];
+ const res = await send(method, user);
+ if (!('error' in res)) {
+ const newId = res.id;
if (newId) {
user.id = newId;
}
} else {
- const error = res['error'];
+ const error = res.error;
setError(getUserDirectoryErrors(error));
if (error === 'token-expired') {
dispatch(
diff --git a/packages/desktop-client/src/components/reports/Overview.tsx b/packages/desktop-client/src/components/reports/Overview.tsx
index f3e467c747..61a9ab1c94 100644
--- a/packages/desktop-client/src/components/reports/Overview.tsx
+++ b/packages/desktop-client/src/components/reports/Overview.tsx
@@ -247,7 +247,7 @@ export function Overview() {
const res = await send('dashboard-import', { filepath });
setIsImporting(false);
- if (res.error) {
+ if ('error' in res) {
switch (res.error) {
case 'json-parse-error':
dispatch(
diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
index eaae2bfb8d..b95969135d 100644
--- a/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
+++ b/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
@@ -234,7 +234,11 @@ function reducer(state: ReducerState, action: ReducerAction): ReducerState {
}
}
-function SchedulePreview({ previewDates }: { previewDates: Date[] }) {
+function SchedulePreview({
+ previewDates,
+}: {
+ previewDates: string[] | string;
+}) {
const dateFormat = (useDateFormat() || 'MM/dd/yyyy')
.replace('MM', 'M')
.replace('dd', 'd');
@@ -369,7 +373,9 @@ function RecurringScheduleTooltip({
onSave: (config: RecurConfig) => void;
}) {
const { t } = useTranslation();
- const [previewDates, setPreviewDates] = useState(null);
+ const [previewDates, setPreviewDates] = useState<string[] | string | null>(
+ null,
+ );
const { FREQUENCY_OPTIONS } = useFrequencyOptions();
diff --git a/packages/loot-core/src/client/actions/budgets.ts b/packages/loot-core/src/client/actions/budgets.ts
index f95bf260e0..ab549a2351 100644
--- a/packages/loot-core/src/client/actions/budgets.ts
+++ b/packages/loot-core/src/client/actions/budgets.ts
@@ -148,14 +148,11 @@ export function createBudget({ testMode = false, demoMode = false } = {}) {
};
}
-export function validateBudgetName(name: string): {
- valid: boolean;
- message?: string;
-} {
+export function validateBudgetName(name: string) {
return send('validate-budget-name', { name });
}
-export function uniqueBudgetName(name: string): string {
+export function uniqueBudgetName(name: string) {
return send('unique-budget-name', { name });
}
diff --git a/packages/loot-core/src/client/actions/prefs.ts b/packages/loot-core/src/client/actions/prefs.ts
index 137010a18f..713c66bd51 100644
--- a/packages/loot-core/src/client/actions/prefs.ts
+++ b/packages/loot-core/src/client/actions/prefs.ts
@@ -43,7 +43,7 @@ export function loadPrefs() {
);
// We need to load translations before the app renders
- setI18NextLanguage(globalPrefs.language);
+ setI18NextLanguage(globalPrefs.language ?? '');
return prefs;
};
diff --git a/packages/loot-core/src/client/data-hooks/transactions.ts b/packages/loot-core/src/client/data-hooks/transactions.ts
index 8c76510a45..dd35d0de22 100644
--- a/packages/loot-core/src/client/data-hooks/transactions.ts
+++ b/packages/loot-core/src/client/data-hooks/transactions.ts
@@ -248,7 +248,7 @@ export function usePreviewTransactions(): UsePreviewTransactionsResult {
if (!isUnmounted) {
const withDefaults = newTrans.map(t => ({
...t,
- category: statuses.get(t.schedule),
+ category: t.schedule != null ? statuses.get(t.schedule) : undefined,
schedule: t.schedule,
subtransactions: t.subtransactions?.map(
(st: TransactionEntity) => ({
diff --git a/packages/loot-core/src/client/query-helpers.ts b/packages/loot-core/src/client/query-helpers.ts
index 7df1646109..1f5ebed926 100644
--- a/packages/loot-core/src/client/query-helpers.ts
+++ b/packages/loot-core/src/client/query-helpers.ts
@@ -3,7 +3,7 @@ import { listen, send } from '../platform/client/fetch';
import { once } from '../shared/async';
import { getPrimaryOrderBy, type Query } from '../shared/query';
-export async function runQuery(query) {
+export async function runQuery(query: Query) {
return send('query', query.serialize());
}
@@ -207,7 +207,7 @@ export class LiveQuery<TResponse = unknown> {
protected fetchData = async (
runQuery: () => Promise<{
data: Data<TResponse>;
- dependencies: Set<string>;
+ dependencies: string[];
}>,
) => {
// TODO: precompile queries, or cache compilation results on the
diff --git a/packages/loot-core/src/platform/client/fetch/index.d.ts b/packages/loot-core/src/platform/client/fetch/index.d.ts
index 417f4f917d..d6e4d4a31c 100644
--- a/packages/loot-core/src/platform/client/fetch/index.d.ts
+++ b/packages/loot-core/src/platform/client/fetch/index.d.ts
@@ -41,7 +41,8 @@ export type Unlisten = typeof unlisten;
/** Mock functions */
export function initServer(handlers: {
query: (query: { table: string; selectExpressions: unknown }) => Promise<{
- data: unknown;
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ data: any;
dependencies: string[];
}>;
getCell?: () => { value: number };
diff --git a/packages/loot-core/src/server/admin/types/handlers.ts b/packages/loot-core/src/server/admin/types/handlers.ts
index ec99a41592..359471820b 100644
--- a/packages/loot-core/src/server/admin/types/handlers.ts
+++ b/packages/loot-core/src/server/admin/types/handlers.ts
@@ -6,15 +6,17 @@ export interface AdminHandlers {
'user-delete-all': (
ids: string[],
- ) => Promise<{ someDeletionsFailed: boolean; ids?: number[] }>;
+ ) => Promise<
+ { someDeletionsFailed: boolean; ids?: number[] } | { error: string }
+ >;
'user-add': (
user: Omit<UserEntity, 'id'>,
- ) => Promise<{ error?: string } | { id: string }>;
+ ) => Promise<{ error: string } | { id: string }>;
'user-update': (
user: Omit<UserEntity, 'id'>,
- ) => Promise<{ error?: string } | { id: string }>;
+ ) => Promise<{ error: string } | { id: string }>;
'access-add': (
user: NewUserAccessEntity,
diff --git a/packages/loot-core/src/server/aql/compiler.ts b/packages/loot-core/src/server/aql/compiler.ts
index 61c0a875ca..02ae4ffdd1 100644
--- a/packages/loot-core/src/server/aql/compiler.ts
+++ b/packages/loot-core/src/server/aql/compiler.ts
@@ -1,4 +1,5 @@
import { getNormalisedString } from '../../shared/normalisation';
+import { QueryState } from '../../shared/query';
// @ts-strict-ignore
let _uid = 0;
@@ -1005,9 +1006,7 @@ export type SchemaConfig = {
| Record<string, unknown>
| ((name: string, config: { withDead; isJoin; tableOptions }) => unknown);
tableFilters?: (name: string) => unknown[];
- customizeQuery?: <T extends { table: string; orderExpressions: unknown[] }>(
- queryString: T,
- ) => T;
+ customizeQuery?: (queryString: QueryState) => QueryState;
views?: Record<
string,
{
diff --git a/packages/loot-core/src/server/rules/types/handlers.ts b/packages/loot-core/src/server/rules/types/handlers.ts
index 7884f6e4cd..766c45f2be 100644
--- a/packages/loot-core/src/server/rules/types/handlers.ts
+++ b/packages/loot-core/src/server/rules/types/handlers.ts
@@ -45,9 +45,9 @@ export interface RulesHandlers {
'rules-get': () => Promise<RuleEntity[]>;
- // TODO: change return value to `RuleEntity`
- 'rule-get': (arg: { id: string }) => Promise<unknown>;
+ 'rule-get': (arg: { id: RuleEntity['id'] }) => Promise<RuleEntity>;
- // TODO: change types to `TransactionEntity`
- 'rules-run': (arg: { transaction }) => Promise<unknown>;
+ 'rules-run': (arg: {
+ transaction: TransactionEntity;
+ }) => Promise<TransactionEntity>;
}
diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.ts
index a61f762cbc..7016d6f627 100644
--- a/packages/loot-core/src/server/schedules/app.ts
+++ b/packages/loot-core/src/server/schedules/app.ts
@@ -306,6 +306,8 @@ export async function updateSchedule({
await db.updateWithSchema('schedules', schedule);
});
+
+ return schedule.id;
}
export async function deleteSchedule({ id }) {
diff --git a/packages/loot-core/src/server/schedules/types/handlers.ts b/packages/loot-core/src/server/schedules/types/handlers.ts
index 3cfa706d13..42218e1bd9 100644
--- a/packages/loot-core/src/server/schedules/types/handlers.ts
+++ b/packages/loot-core/src/server/schedules/types/handlers.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { DiscoverScheduleEntity } from '../../../types/models';
+import { DiscoverScheduleEntity, ScheduleEntity } from '../../../types/models';
export interface SchedulesHandlers {
'schedule/create': (arg: {
@@ -15,13 +15,17 @@ export interface SchedulesHandlers {
schedule;
conditions?;
resetNextDate?: boolean;
- }) => Promise<void>;
+ }) => Promise<ScheduleEntity['id']>;
- 'schedule/delete': (arg: { id: string }) => Promise<void>;
+ 'schedule/delete': (arg: { id: ScheduleEntity['id'] }) => Promise<void>;
- 'schedule/skip-next-date': (arg: { id: string }) => Promise<void>;
+ 'schedule/skip-next-date': (arg: {
+ id: ScheduleEntity['id'];
+ }) => Promise<void>;
- 'schedule/post-transaction': (arg: { id: string }) => Promise<void>;
+ 'schedule/post-transaction': (arg: {
+ id: ScheduleEntity['id'];
+ }) => Promise<void>;
'schedule/force-run-service': () => Promise<unknown>;
diff --git a/packages/loot-core/src/types/models/simplefin.d.ts b/packages/loot-core/src/types/models/simplefin.d.ts
index c4c7f97579..cd76cb7ba1 100644
--- a/packages/loot-core/src/types/models/simplefin.d.ts
+++ b/packages/loot-core/src/types/models/simplefin.d.ts
@@ -2,6 +2,7 @@ import { AccountEntity } from './account';
import { BankSyncResponse } from './bank-sync';
export type SimpleFinOrganization = {
+ id: string;
name: string;
domain: string;
};
@@ -9,6 +10,7 @@ export type SimpleFinOrganization = {
export type SimpleFinAccount = {
id: string;
name: string;
+ balance: number;
org: SimpleFinOrganization;
};
diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts
index 3007a8735a..7156ce2eb6 100644
--- a/packages/loot-core/src/types/server-handlers.d.ts
+++ b/packages/loot-core/src/types/server-handlers.d.ts
@@ -52,7 +52,7 @@ export interface ServerHandlers {
payees;
}) => Promise<unknown>;
- 'transactions-export-query': (arg: { query: QueryState }) => Promise<unknown>;
+ 'transactions-export-query': (arg: { query: QueryState }) => Promise<string>;
'get-categories': () => Promise<{
grouped: Array<CategoryGroupEntity>;
@@ -109,7 +109,7 @@ export interface ServerHandlers {
'payees-get': () => Promise<PayeeEntity[]>;
- 'payees-get-rule-counts': () => Promise<unknown>;
+ 'payees-get-rule-counts': () => Promise<Record<PayeeEntity['id'], number>>;
'payees-merge': (arg: { targetId; mergeIds }) => Promise<void>;
@@ -141,7 +141,8 @@ export interface ServerHandlers {
'create-query': (arg: { sheetName; name; query }) => Promise<unknown>;
- query: (query: Query) => Promise<{ data: unknown; dependencies }>;
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ query: (query: Query) => Promise<{ data: any; dependencies: string[] }>;
'account-update': (arg: { id; name }) => Promise<unknown>;
@@ -182,7 +183,10 @@ export interface ServerHandlers {
'account-move': (arg: { id; targetId }) => Promise<unknown>;
- 'secret-set': (arg: { name: string; value: string | null }) => Promise<null>;
+ 'secret-set': (arg: {
+ name: string;
+ value: string | null;
+ }) => Promise<{ error?: string; reason?: string }>;
'secret-check': (arg: string) => Promise<string | { error?: string }>;
'gocardless-poll-web-token': (arg: {
@@ -196,7 +200,11 @@ export interface ServerHandlers {
'simplefin-status': () => Promise<{ configured: boolean }>;
- 'simplefin-accounts': () => Promise<{ accounts: SimpleFinAccount[] }>;
+ 'simplefin-accounts': () => Promise<{
+ accounts?: SimpleFinAccount[];
+ error_code?: string;
+ reason?: string;
+ }>;
'simplefin-batch-sync': ({ ids }: { ids: string[] }) => Promise<
{
@@ -326,7 +334,7 @@ export interface ServerHandlers {
return_url;
loginMethod?: 'openid';
},
- ) => Promise<{ error?: string }>;
+ ) => Promise<{ error?: string; redirect_url?: string }>;
'subscribe-sign-out': () => Promise<'ok'>;
diff --git a/upcoming-release-notes/4147.md b/upcoming-release-notes/4147.md
new file mode 100644
index 0000000000..7dc1a4012e
--- /dev/null
+++ b/upcoming-release-notes/4147.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [jfdoming]
+---
+
+Fix `send` types in a number of places (2/2)