Refactored queries to use customMutationOptions wrapper function for mutations. Also put all queryOptions inside grouped files instead of a single one. Fixed imports.

Author: Nils-Kolvenbach

src/renderer/components/asset-diff.tsx

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 
+import { AssetTeaser } from '@renderer/components/asset-teaser';
 import {
   DiffContainer,
   DiffContainerSkeleton,
@@ -9,8 +10,6 @@ import { queryOptions } from '@renderer/queries';
 
 import { type GitCommit, type Project } from '@elek-io/core';
 
-import { AssetTeaser } from './asset-teaser';
-
 export function AssetDiff({
   project,
   commit,

src/renderer/components/asset-teaser.tsx

@@ -1,5 +1,4 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useProject } from '@root/src/renderer/hooks/useProject';
 import { useMutation } from '@tanstack/react-query';
 import {
   DownloadIcon,
@@ -62,6 +61,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from '@renderer/components/ui/tooltip';
+import { useProject } from '@renderer/hooks/useProject';
 import { cn, formatBytes } from '@renderer/lib/utils';
 import { queryOptions } from '@renderer/queries';
 

src/renderer/components/commit-author.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import { useProject } from '@root/src/renderer/hooks/useProject';
 import type { ReactElement } from 'react';
 
 import { Avatar } from '@renderer/components/ui/avatar';
+import { useProject } from '@renderer/hooks/useProject';
 
 import { type GitCommit } from '@elek-io/core';
 

src/renderer/components/entry-diff.tsx

@@ -6,6 +6,7 @@ import {
   DiffContainer,
   DiffContainerSkeleton,
 } from '@renderer/components/diff-container';
+import { EntryForm } from '@renderer/components/forms/entry-form';
 import { useQueryNoError } from '@renderer/hooks/useQueryNoError';
 import { queryOptions } from '@renderer/queries';
 
@@ -16,8 +17,6 @@ import {
   type UpdateEntryProps,
 } from '@elek-io/core';
 
-import { EntryForm } from './forms/entry-form';
-
 export function EntryDiff({
   project,
   commit,

src/renderer/queries/client.ts

@@ -1,90 +1,12 @@
 import { QueryClient } from '@tanstack/react-query';
-import { toast } from 'sonner';
-import z from 'zod';
-
-import { objectTypeSchema } from '@elek-io/core';
-
-const logableMutationMetaSchema = z.object({
-  method: z.enum(['create', 'update', 'delete', 'clone']),
-  objectType: objectTypeSchema,
-});
 
 /**
- * Tanstack Query instance with agressive caching and
- * automatic display of a toast notification whenever a mutation succeeds or fails
- *
- * The display of a notification depends on the availability of the meta object with
- * method and objectType keys, which needs to be set on all mutationOptions inside
- * the `./options.ts` file.
- *
- * Additionally it logs all mutations with Core to enable full E2E debugging.
+ * Tanstack Query instance with agressive caching
  */
 export const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
       staleTime: Infinity,
     },
-    mutations: {
-      onSuccess: async (data, variables, result, context) => {
-        const logableMutationMeta = logableMutationMetaSchema.safeParse(
-          context.meta
-        );
-
-        if (logableMutationMeta.success) {
-          toast.success(
-            `${logableMutationMeta.data.method} ${logableMutationMeta.data.objectType}`
-          );
-
-          await window.ipc.core.logger.info({
-            source: 'desktop',
-            message: `Successfully ${logableMutationMeta.data.method}ed ${logableMutationMeta.data.objectType}`,
-            meta: {
-              ...logableMutationMeta.data,
-            },
-          });
-        } else {
-          await window.ipc.core.logger.error({
-            source: 'desktop',
-            message: 'Detected mutation without meta',
-            meta: {
-              data,
-              variables,
-              result,
-              context,
-            },
-          });
-        }
-      },
-      onError: async (error, variables, result, context) => {
-        const logableMutationMeta = logableMutationMetaSchema.safeParse(
-          context.meta
-        );
-
-        if (logableMutationMeta.success) {
-          toast.error(
-            `${logableMutationMeta.data.method} ${logableMutationMeta.data.objectType}`
-          );
-
-          await window.ipc.core.logger.error({
-            source: 'desktop',
-            message: `Failed to ${logableMutationMeta.data.method} ${logableMutationMeta.data.objectType}`,
-            meta: {
-              ...logableMutationMeta.data,
-            },
-          });
-        } else {
-          await window.ipc.core.logger.error({
-            source: 'desktop',
-            message: 'Detected mutation without meta',
-            meta: {
-              error,
-              variables,
-              result,
-              context,
-            },
-          });
-        }
-      },
-    },
   },
 });