PR feedback

actualbudget · Jan 18, 2025 · 5cdbd82 · 5cdbd82
1 parent 9da5774
commit 5cdbd82
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 20 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -718,7 +718,7 @@ class AccountInternal extends PureComponent<
     }
 
     const { data } = await runQuery(
-      this.paged?.query
+      this.paged.query
         .options({ splits: 'none' })
         .select([{ balance: { $sumOver: '$amount' } }]),
     );
@@ -936,7 +936,7 @@ class AccountInternal extends PureComponent<
     }
 
     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
@@ -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/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
@@ -12,15 +12,11 @@ export interface AdminHandlers {
 
   'user-add': (
     user: Omit<UserEntity, 'id'>,
-  ) => Promise<
-    { error?: string; id?: undefined } | { error?: undefined; id: string }
-  >;
+  ) => Promise<{ error: string } | { id: string }>;
 
   'user-update': (
     user: Omit<UserEntity, 'id'>,
-  ) => Promise<
-    { error?: string; id?: undefined } | { error?: undefined; 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
@@ -1,3 +1,5 @@
+import { QueryState } from 'loot-core/shared/query';
+
 import { getNormalisedString } from '../../shared/normalisation';
 
 // @ts-strict-ignore
@@ -1005,11 +1007,7 @@ export type SchemaConfig = {
     | Record<string, unknown>
     | ((name: string, config: { withDead; isJoin; tableOptions }) => unknown);
   tableFilters?: (name: string) => unknown[];
-  customizeQuery?: <
-    T extends { table: string; orderExpressions: readonly 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
@@ -45,7 +45,7 @@ export interface RulesHandlers {
 
   'rules-get': () => Promise<RuleEntity[]>;
 
-  'rule-get': (arg: { id: string }) => Promise<RuleEntity>;
+  'rule-get': (arg: { id: RuleEntity['id'] }) => Promise<RuleEntity>;
 
   'rules-run': (arg: {
     transaction: TransactionEntity;

diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts
@@ -141,7 +141,8 @@ export interface ServerHandlers {
 
   'create-query': (arg: { sheetName; name; query }) => Promise<unknown>;
 
-  query: (query: Query) => Promise<{ data: unknown; dependencies: string[] }>;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  query: (query: Query) => Promise<{ data: any; dependencies: string[] }>;
 
   'account-update': (arg: { id; name }) => Promise<unknown>;