fix: Casting id in project edit lead to error

vogelino · May 8, 2024 · a939bc6 · a939bc6
1 parent ad217e0
commit a939bc6
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 123 deletions.
diff --git a/src/app/(resource-pages)/@modal/(.)clients/edit/[id]/page.tsx b/src/app/(resource-pages)/@modal/(.)clients/edit/[id]/page.tsx
@@ -14,7 +14,7 @@ export default async function ClientEditModalRoute({
  const record = await db.query.clients.findFirst({
  where: eq(clients.id, +id),
  });
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["project", id],
  queryFn: () => record,
  });

diff --git a/src/app/(resource-pages)/@modal/(.)expenses/edit/[id]/page.tsx b/src/app/(resource-pages)/@modal/(.)expenses/edit/[id]/page.tsx
@@ -11,7 +11,7 @@ export default async function ExpenseEditModalRoute({
 }) {
  const record = await getExpense(+id);
  if (!record) return null;
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["project", `${id}`],
  queryFn: () => record,
  });

diff --git a/src/app/(resource-pages)/@modal/(.)projects/edit/[id]/page.tsx b/src/app/(resource-pages)/@modal/(.)projects/edit/[id]/page.tsx
@@ -18,7 +18,7 @@ export default async function ProjectEditModalRoute({
  const record = await db.query.projects.findFirst({
  where: eq(projects.id, +id),
  });
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["project", id],
  queryFn: () => record,
  });

diff --git a/src/app/(resource-pages)/clients/edit/[id]/page.tsx b/src/app/(resource-pages)/clients/edit/[id]/page.tsx
@@ -18,7 +18,7 @@ export default async function ClientEditPageRoute({
  const record = await db.query.clients.findFirst({
  where: eq(clients.id, +id),
  });
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["clients", `${id}`],
  queryFn: () => record,
  });

diff --git a/src/app/(resource-pages)/clients/page.tsx b/src/app/(resource-pages)/clients/page.tsx
@@ -4,8 +4,8 @@ import { HydrationBoundary, dehydrate } from "@tanstack/react-query";
 import ClientList from "./page.client";
 
 export const dynamic = "force-dynamic";
-export default function ClientsPageServer() {
- serverQueryClient.prefetchQuery({
+export default async function ClientsPageServer() {
+ await serverQueryClient.prefetchQuery({
  queryKey: ["clients"],
  queryFn: () => db.query.clients.findMany(),
  });

diff --git a/src/app/(resource-pages)/expenses/edit/[id]/page.tsx b/src/app/(resource-pages)/expenses/edit/[id]/page.tsx
@@ -15,7 +15,7 @@ export default async function ExpenseEditPageRoute({
 }) {
  const record = await getExpense(+id);
  if (!record) return null;
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["expenses", `${id}`],
  queryFn: () => record,
  });

diff --git a/src/app/(resource-pages)/expenses/page.tsx b/src/app/(resource-pages)/expenses/page.tsx
@@ -5,7 +5,7 @@ import ExpensesPage from "./ExpensesPage";
 
 export const dynamic = "force-dynamic";
 export default async function ExpensesPageServer() {
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["clients"],
  queryFn: getExpenses,
  });

diff --git a/src/app/(resource-pages)/projects/edit/[id]/page.tsx b/src/app/(resource-pages)/projects/edit/[id]/page.tsx
@@ -9,12 +9,12 @@ import { SaveIcon } from "lucide-react";
 import Link from "next/link";
 
 export const dynamic = "force-dynamic";
-export default function ProjectEditPageRoute({
+export default async function ProjectEditPageRoute({
  params: { id },
 }: {
  params: { id: string };
 }) {
- serverQueryClient.prefetchQuery({
+ await serverQueryClient.prefetchQuery({
  queryKey: ["projects", `${id}`],
  queryFn: () =>
  db.query.projects.findFirst({

diff --git a/src/app/(resource-pages)/projects/page.tsx b/src/app/(resource-pages)/projects/page.tsx
@@ -4,8 +4,8 @@ import { HydrationBoundary, dehydrate } from "@tanstack/react-query";
 import ProjectsList from "./page.client";
 
 export const dynamic = "force-dynamic";
-export default function ProjectsPageServer() {
- serverQueryClient.prefetchQuery({
+export default async function ProjectsPageServer() {
+ await serverQueryClient.prefetchQuery({
  queryKey: ["projects"],
  queryFn: () => db.query.projects.findMany(),
  });

diff --git a/src/components/ClientDisplay.tsx b/src/components/ClientDisplay.tsx
diff --git a/src/components/ExpenseEdit.tsx b/src/components/ExpenseEdit.tsx
@@ -5,10 +5,10 @@ import FormInputWrapper from "@/components/FormInputWrapper";
 import { PillText } from "@/components/PillText";
 import CurrencyInput from "@/components/ui/currency-input";
 import {
- type ExpenseType,
  expenseCategoryEnum,
  expenseRateEnum,
  expenseTypeEnum,
+ type ExpenseType,
 } from "@/db/schema";
 import env from "@/env";
 import useExpense from "@/utility/data/useExpense";
@@ -88,7 +88,7 @@ export default function ExpenseEdit({
  onSubmit={handleSubmit((values) => {
  if (id) {
  editMutation.mutate({
- id: +id,
+ id,
  ...values,
  type,
  category,

diff --git a/src/components/ProjectDisplay.tsx b/src/components/ProjectDisplay.tsx
diff --git a/src/utility/data/useClientEdit.ts b/src/utility/data/useClientEdit.ts
@@ -1,9 +1,9 @@
 "use client";
 
 import {
- type ClientType,
- type ResourceType,
- clientInsertSchema,
+ clientInsertSchema,
+ type ClientType,
+ type ResourceType,
 } from "@/db/schema";
 import createMutationHook from "./createMutationHook";
 import createQueryFunction, { type ActionType } from "./createQueryFunction";
@@ -13,24 +13,24 @@ const action: ActionType = "edit";
 const inputZodSchema = clientInsertSchema;
 
 const useClientEdit = createMutationHook<ClientType[]>({
- resourceName,
- action,
- inputZodSchema,
- mutationFn: createQueryFunction<void>({
- resourceName,
- action,
- inputZodSchema,
- }),
- createOptimisticDataEntry,
+ resourceName,
+ action,
+ inputZodSchema,
+ mutationFn: createQueryFunction<void>({
+ resourceName,
+ action,
+ inputZodSchema,
+ }),
+ createOptimisticDataEntry,
 });
 
 export default useClientEdit;
 
 function createOptimisticDataEntry(
- oldData: ClientType[] | undefined,
- editedData: ClientType,
+ oldData: ClientType[] | undefined,
+ editedData: ClientType
 ) {
- return (oldData || []).filter((c) =>
- c.id === editedData.id ? { ...c, ...editedData } : c,
- );
+ return (oldData || []).map((c) =>
+ c.id === editedData.id ? { ...c, ...editedData } : c
+ );
 }
diff --git a/src/utility/data/useExpenseEdit.ts b/src/utility/data/useExpenseEdit.ts
@@ -1,10 +1,10 @@
 "use client";
 
 import {
- type ExpenseType,
- type ExpenseWithMonthlyCLPPriceType,
- type ResourceType,
- expenseInsertSchema,
+ expenseInsertSchema,
+ type ExpenseType,
+ type ExpenseWithMonthlyCLPPriceType,
+ type ResourceType,
 } from "@/db/schema";
 import createMutationHook from "./createMutationHook";
 import createQueryFunction, { type ActionType } from "./createQueryFunction";
@@ -14,24 +14,24 @@ const action: ActionType = "edit";
 const inputZodSchema = expenseInsertSchema;
 
 const useClientEdit = createMutationHook<ExpenseWithMonthlyCLPPriceType[]>({
- resourceName,
- action,
- inputZodSchema,
- mutationFn: createQueryFunction<void>({
- resourceName,
- action,
- inputZodSchema,
- }),
- createOptimisticDataEntry,
+ resourceName,
+ action,
+ inputZodSchema,
+ mutationFn: createQueryFunction<void>({
+ resourceName,
+ action,
+ inputZodSchema,
+ }),
+ createOptimisticDataEntry,
 });
 
 export default useClientEdit;
 
 function createOptimisticDataEntry(
- oldData: ExpenseWithMonthlyCLPPriceType[] | undefined,
- editedData: ExpenseType,
+ oldData: ExpenseWithMonthlyCLPPriceType[] | undefined,
+ editedData: ExpenseType
 ) {
- return (oldData || []).filter((c) =>
- c.id === editedData.id ? { ...c, ...editedData } : c,
- );
+ return (oldData || []).map((c) =>
+ c.id === editedData.id ? { ...c, ...editedData } : c
+ );
 }
diff --git a/src/utility/data/useProjectEdit.ts b/src/utility/data/useProjectEdit.ts
@@ -1,10 +1,10 @@
 "use client";
 
 import {
- type ExpenseType,
- type ExpenseWithMonthlyCLPPriceType,
- type ResourceType,
- projectInsertSchema,
+ projectInsertSchema,
+ type ExpenseType,
+ type ExpenseWithMonthlyCLPPriceType,
+ type ResourceType,
 } from "@/db/schema";
 import createMutationHook from "./createMutationHook";
 import createQueryFunction, { type ActionType } from "./createQueryFunction";
@@ -14,24 +14,24 @@ const action: ActionType = "edit";
 const inputZodSchema = projectInsertSchema;
 
 const useProjectEdit = createMutationHook<ExpenseWithMonthlyCLPPriceType[]>({
- resourceName,
- action,
- inputZodSchema,
- mutationFn: createQueryFunction<void>({
- resourceName,
- action,
- inputZodSchema,
- }),
- createOptimisticDataEntry,
+ resourceName,
+ action,
+ inputZodSchema,
+ mutationFn: createQueryFunction<void>({
+ resourceName,
+ action,
+ inputZodSchema,
+ }),
+ createOptimisticDataEntry,
 });
 
 export default useProjectEdit;
 
 function createOptimisticDataEntry(
- oldData: ExpenseWithMonthlyCLPPriceType[] | undefined,
- editedData: ExpenseType,
+ oldData: ExpenseWithMonthlyCLPPriceType[] | undefined,
+ editedData: ExpenseType
 ) {
- return (oldData || []).filter((c) =>
- c.id === editedData.id ? { ...c, ...editedData } : c,
- );
+ return (oldData || []).map((c) =>
+ c.id === editedData.id ? { ...c, ...editedData } : c
+ );
 }