From 7e6a60388b6a00ed203956769407411a1cb53cad Mon Sep 17 00:00:00 2001
From: andrzej <andrzejjamesstepien@gmail.com>
Date: Wed, 25 Sep 2024 12:23:16 +0200
Subject: [PATCH] tweak refresh/notifications

---
 prisma/dev.db                    | Bin 69632 -> 69632 bytes
 src/app/layout.tsx               |   2 +-
 src/app/lib/create.ts            |  25 ++++++------------
 src/app/lib/del.ts               |  43 +++++++++++++++++++------------
 src/app/lib/update.ts            |  28 +++++++++++++++++---
 src/app/lib/validate.ts          |  36 ++++++++++++++++++++++++++
 src/app/publication/create.tsx   |   4 ++-
 src/app/story/create.tsx         |   4 ++-
 src/app/ui/forms/pub.tsx         |  14 +++++-----
 src/app/ui/forms/story.tsx       |  22 +++++++---------
 src/app/ui/tables/data-table.tsx |  21 +++++++++++----
 11 files changed, 134 insertions(+), 65 deletions(-)
 create mode 100644 src/app/lib/validate.ts

diff --git a/prisma/dev.db b/prisma/dev.db
index 403cac693f53040f004b7a783a90a31b0b8027f9..64f78b8a7b45e81c719d477743ca16f02b26d6d8 100644
GIT binary patch
delta 1070
zcma))TWAzl7{||<%U;6H`I}u68#9|sYR2_~m#VnCS_r9CiBO_6wMe0HWF{t{uI}s_
zLLQRng9u_w25%2-f_O)WVWU2%&^8afJXF#bp^ydyp<5xerFn=T_|5J^6%6=&@WJ_?
z|98%BzBB!!O8=;Gu9i;>>D&0k`2K;`itRy7j`7|316AIO)|#bZaV>zK#Zw%^PVovG
zaa~M`YvP8uQK(#hO4R99DobnJerMEqlV7(>c<eQ{UsmuJi+JC+uT&Ugiwm>u)kZ2R
z%s5WsiI_q&Am*_Qd(lZ36vT)a60UH>9*hf98-6<r4aQ!rPy3E((h_yraw$>Iu1Zbn
zbjLzLhLh4)a?!Qj_X)DMN!#S2wP5sFMw7y%W&-GTTsxcXrdYL|q%Zi~f?aQHL_a34
zDHn4Y%gs4iBiD7<iEJgUMlQCsHh<o>Pv1hTba3j+&K|?cIz~?>Z)BZA8O!cEa<I86
zk}jLeQZ!XQ&g$?FD{CT2T3ns>CuF-;M`W|#!RP2o+s%1XXIuGAuVHZK2i2QsV~slf
znbng&;262iF1N(v^$)J7$0Q3&2|j06d`hk=xp+L&WxGa8OLqo;)1&@4xN-+Q>LMvF
z7mprt9LI7U4aZp}ERJ(Hjb8kV7s#L!&v6S^FbNBfaUWy&15e*bi~gzA@T`&Q6(^V)
zR!lj}bsZO2kgKK|lR1|XN|eL|eqj+VnT&ZOBdcx9GmX=Ne6p#g$tNe(ly6TetH^Gs
z318FI<-VqujEY$Six68l4&ob3;2Gxe56+_-zoUqUxP#xY2Q9dYeT1GVtR3Bibr}}m
zjR7Uhxo$2)9}5v!Jg9J=EJkyxCV-`Mz96_7q8l39P)|#6#VlWI)|T9IGF|RUrV7u-
zJ~TE|BF}IJFYzB{F@U?cjh~Rm4|qg#>cu4t<4;2TKZj{nP4MzFG2>gNHmdYxy6M+M
ztW=};l|@P{0q^F_a)T%qn{ld)WS=Eq*80X|x>Qqz*_j%HtM@{@H&n5!F2oog&=|jX
OHpD-9@Fc`P3cdy~tRKz*

delta 712
zcmXYtPe@cz6vpp;@7|ela^9zoh~vD`SI%{`fs(PkXv8o?SQtW^re_T*SYzts!bMs^
z6y=Ov`nND$L`eh|Q@N-XHH-d1X^Vsi1a}rlK^udh`<`*&`#9&^bNJmeF~=t6SRqWO
zrp>){>hZD3E`OUhpa<!}TyLfP(G{xo8zm3k87nxAr12Lo(T02YZj_3Zt@jOCI-1r9
zk<s*R<_~ZpU!_}ERRt%-jdYDw?>Cl1IFC=pGCBa1j7>D+CwkoYsy19O;%Fdot(z!|
zYWry6z_69<&yI{*$!uoC8qHeWL-z5E)zN1UoRZ5^U9?|r&nIg!Pr_QecKL9B#_Al*
z_F8>g&*enExq%Q;qqXS&M|<p(Lj%KVSt>P_^$SMin|w=?kzhoN=<7p+nM}qW$pmnQ
zRKuny;1X_N3GcCqbF#b;<~CF)*f^v;Thly4co`FV88uBF(JAGE2bF0tR;7wD9&!?a
z6*)T_Kf%JPCU~8y=|XWCR8#jN#6vZ<Q?)D}b6O^Ea;8jfDr3SATfw9#`Y?khSi=Ve
z^9$E;5o1`#b3DXZ96}0rQNoepuDLzfomV@f9#%%FDH^?uI$#mkwOG(~UDR#mB81O!
zdLhx^rc9Xbm<TJb3dQH#k9et8UtC+*VI``O({KfU@EaSL#3MYwTjcN>FYpZG3gHgE
z;R`<E7OriDx>Y-5ZZ&AF5gz60OQvu%7Id}BQBmipoL_CS+%!Un>!zy?O1TT-Q5YMm
gA&au7K05B(w!hv-D4h%tnz(t@M>`jne6-d34{;Hm8vp<R

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index fed526e..a42e354 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -33,7 +33,7 @@ export default function RootLayout({
         >
           <div id="layout-container" className="md:p-4 w-screen h-screen mt-2 md:mt-6 flex justify-center">
             <div className="w-full md:w-5/6 flex flex-col md:flex-row">
-              <div id="sidebar" className=" flex flex-row md:flex-col w-full justify-between"> <header className="">
+              <div id="sidebar" className=" flex flex-row md:flex-col  justify-between"> <header className="">
                 <h1 className="font-black text-4xl text-primary-foreground bg-primary antialiased w-full p-2 rounded-tl-3xl pl-6 pr-4 hidden md:block">SubMan</h1>
                 <p className="mt-2 mx-1 text-sm antialiased w-40 hidden md:block">The self-hosted literary submission tracker.</p>
               </header>
diff --git a/src/app/lib/create.ts b/src/app/lib/create.ts
index 6b90dc9..d0f2d2b 100644
--- a/src/app/lib/create.ts
+++ b/src/app/lib/create.ts
@@ -7,26 +7,16 @@ import { z } from "zod"
 import { storySchema } from "app/ui/forms/schemas"
 import { pubSchema } from "app/ui/forms/schemas"
 import { subSchema } from "app/ui/forms/schemas"
+import { prepGenreData, prepStoryData } from "./validate"
 
 //TODO - data validation, error handling, unauthorized access handling
 
-export async function createStory(data: Story & { genres: number[] }): Promise<Story | undefined> {
+export async function createStory(data: Story & { genres: number[] }): Promise<Story | boolean | undefined> {
 	// will return undefined if middleware authorization fails
 	"use server"
-	//Prepare data
-	const genresArray = data.genres.map((e) => { return { id: e } })
-	const storyData = {
-		title: data.title,
-		word_count: data.word_count,
-	}
-	//prepare schemas
-	const schema = storySchema.omit({ id: true, genres: true })
-	const genreSchema = z.object({ id: z.number() })
-	const genresSchema = z.array(genreSchema)
 	try {
-		//validate
-		schema.safeParse(storyData)
-		genresSchema.safeParse(genresArray)
+		const storyData = await prepStoryData(data)
+		const genresArray = await prepGenreData(data.genres)
 
 		//submit
 		const res = await prisma.story.create({ data: storyData })
@@ -40,12 +30,13 @@ export async function createStory(data: Story & { genres: number[] }): Promise<S
 		return res
 	} catch (error) {
 		console.error(error)
-		return undefined
+		return false
 	}
+
 }
 
 
-export async function createPub(data: Pub & { genres: number[] }): Promise<Pub | undefined> {
+export async function createPub(data: Pub & { genres: number[] }): Promise<Pub | boolean | undefined> {
 	"use server"
 	//prepare data
 	const pubData = {
@@ -79,7 +70,7 @@ export async function createPub(data: Pub & { genres: number[] }): Promise<Pub |
 		return genresRes
 	} catch (error) {
 		console.error(error)
-		return undefined
+		return false
 	}
 
 }
diff --git a/src/app/lib/del.ts b/src/app/lib/del.ts
index 7e38300..499551a 100644
--- a/src/app/lib/del.ts
+++ b/src/app/lib/del.ts
@@ -10,24 +10,33 @@ const tableMap = {
 	"/submission": "sub"
 }
 
-export async function deleteRecord(id: number, pathname: Pathname) {
+export async function deleteRecord(id: number, pathname: Pathname): Promise<undefined | boolean> {
 	const table = tableMap[pathname]
-	const res = await prisma[table].delete({ where: { id } })
-	console.log(`deleted from ${table}: ${res.id}`)
-	console.log("revalidating: " + pathname)
-	revalidatePath(pathname)
-	redirect(pathname)
-}
-
-export async function deleteRecords(ids: number[], pathname: "/story" | "/publication" | "/submission") {
-	const table = tableMap[pathname]
-	ids.forEach(async (id) => {
-		const res = await prisma[table].delete({
-			where: { id }
-		})
+	try {
+		const res = await prisma[table].delete({ where: { id } })
 		console.log(`deleted from ${table}: ${res.id}`)
-	})
-	revalidatePath(pathname)
-	redirect(pathname)
+		revalidatePath(pathname)
+		return true
+	} catch (error) {
+		console.error(error)
+		return undefined
+	}
+}
+
+export async function deleteRecords(ids: number[], pathname: "/story" | "/publication" | "/submission"): Promise<boolean | undefined> {
+	try {
+		const table = tableMap[pathname]
+		ids.forEach(async (id) => {
+			const res = await prisma[table].delete({
+				where: { id }
+			})
+			console.log(`deleted from ${table}: ${res.id}`)
+		})
+		revalidatePath(pathname)
+		return true
+	} catch (error) {
+		console.error(error)
+		return undefined
+	}
 }
 
diff --git a/src/app/lib/update.ts b/src/app/lib/update.ts
index 88c4807..e9c38be 100644
--- a/src/app/lib/update.ts
+++ b/src/app/lib/update.ts
@@ -1,9 +1,10 @@
 "use server"
-import { Genre, Sub } from "@prisma/client"
+import { Genre, Story, Sub } from "@prisma/client"
 import prisma from "./db"
 import { revalidatePath } from "next/cache"
 import { redirect } from "next/navigation"
-import { subSchema } from "app/ui/forms/schemas"
+import { storySchema, subSchema } from "app/ui/forms/schemas"
+import { z } from "zod"
 
 
 export async function updateField({ datum, table, column, id, pathname }: { datum?: string | number | Genre[], table: string, column: string, id: number, pathname: string }) {
@@ -56,7 +57,28 @@ export async function updateSub(data: Sub): Promise<Sub | undefined> {
 }
 
 
-
+export async function updateStory(data: Story & { genres: number[] }): Promise<Story | undefined> {
+	"use server"
+	//prepare data
+	const genresArray = data.genres.map((e) => { return { id: e } })
+	const storyData = {
+		title: data.title,
+		word_count: data.word_count,
+	}
+	//prepare schemas
+	const schema = storySchema.omit({ id: true, genres: true })
+	const genreSchema = z.object({ id: z.number() })
+	const genresSchema = z.array(genreSchema)
+	try {
+		//validate
+		schema.safeParse(storyData)
+		genresSchema.safeParse(genresArray)
+
+	} catch (error) {
+		console.error(error)
+		return undefined
+	}
+}
 
 
 
diff --git a/src/app/lib/validate.ts b/src/app/lib/validate.ts
new file mode 100644
index 0000000..8b1bdb1
--- /dev/null
+++ b/src/app/lib/validate.ts
@@ -0,0 +1,36 @@
+import { z } from "zod";
+import { storySchema } from "app/ui/forms/schemas";
+import { Story } from "@prisma/client";
+
+//schemas
+
+const schema = storySchema.omit({ id: true, genres: true })
+const genreSchema = z.object({ id: z.number() })
+const genresSchema = z.array(genreSchema)
+
+export async function prepStoryData(data: Story & { genres: number[] }): Promise<{ title: string, word_count: number }> {
+	const storyData = {
+		title: data.title,
+		word_count: data.word_count,
+	}
+	//prepare schemas
+
+	//throw an error if validation fails
+	schema.safeParse(storyData)
+
+	return storyData
+}
+
+export async function prepGenreData(data: number[]): Promise<{ id: number }[]> {
+	"use server"
+
+	//prepare data
+	const genresArray = data.map((e) => { return { id: e } })
+
+	//prepare schemas
+
+	//throws error if validation fails
+	genresSchema.safeParse(genresArray)
+	return genresArray
+
+}
diff --git a/src/app/publication/create.tsx b/src/app/publication/create.tsx
index 1946173..91ef6ed 100644
--- a/src/app/publication/create.tsx
+++ b/src/app/publication/create.tsx
@@ -25,7 +25,9 @@ export default function CreatePubDialog({ genres }: ComponentProps<"div"> & { ge
         </DialogHeader>
         <PubForm createPub={createPub} genres={genres} />
         <DialogFooter>
-          <Button form="pubform">Submit</Button>
+          <DialogClose >
+            <Button form="pubform">Submit</Button>
+          </DialogClose>
         </DialogFooter>
 
       </DialogContent>
diff --git a/src/app/story/create.tsx b/src/app/story/create.tsx
index 13baed7..7651e80 100644
--- a/src/app/story/create.tsx
+++ b/src/app/story/create.tsx
@@ -25,7 +25,9 @@ export default function CreateStoryDialog({ genres }: ComponentProps<"div"> & {
         </DialogHeader>
         <StoryForm createStory={createStory} genres={genres} existingData={null} />
         <DialogFooter>
-          <Button form="storyform">Submit</Button>
+          <DialogClose>
+            <Button form="storyform">Submit</Button>
+          </DialogClose>
         </DialogFooter>
 
       </DialogContent>
diff --git a/src/app/ui/forms/pub.tsx b/src/app/ui/forms/pub.tsx
index 149db14..3c75149 100644
--- a/src/app/ui/forms/pub.tsx
+++ b/src/app/ui/forms/pub.tsx
@@ -20,6 +20,7 @@ import { ComponentProps } from "react"
 import { Genre } from "@prisma/client"
 import GenrePicker from "./genrePicker"
 import { pubSchema } from "./schemas"
+import { useRouter } from "next/navigation"
 
 export default function PubForm({ genres, createPub, className }: ComponentProps<"div"> & { genres: Array<Genre>, createPub: (data: any) => void }) {
 	const form = useForm<z.infer<typeof pubSchema>>({
@@ -32,21 +33,20 @@ export default function PubForm({ genres, createPub, className }: ComponentProps
 		},
 	})
 
+	const router = useRouter()
+
 	async function onSubmit(values: z.infer<typeof pubSchema>) {
 		try {
 			const res = await createPub(values)
-			if (res === undefined) throw new Error("something went wrong")
-			toast({
-				title: "Successfuly submitted:",
-				description: values.title
-			})
+			if (!res) throw new Error("something went wrong")
+			toast({ title: "Successfully submitted:", description: values.title })
+			router.refresh()
 		} catch (error) {
 			toast({
-				title: "UH-OH",
+				title: "Oh dear... ",
 				description: error.message
 			})
 		}
-		window.location.reload()
 	}
 
 	function onErrors(errors) {
diff --git a/src/app/ui/forms/story.tsx b/src/app/ui/forms/story.tsx
index a689a9f..37db8de 100644
--- a/src/app/ui/forms/story.tsx
+++ b/src/app/ui/forms/story.tsx
@@ -19,6 +19,7 @@ import { ComponentProps } from "react"
 import { Genre, Story } from "@prisma/client"
 import { randomStoryTitle } from "app/lib/shortStoryTitleGenerator"
 import GenrePicker from "./genrePicker"
+import { useRouter } from "next/navigation"
 
 export const formSchema = z.object({
 	id: z.number().optional(),
@@ -27,35 +28,30 @@ export const formSchema = z.object({
 	genres: z.array(z.number())
 })
 
-export default function StoryForm({ genres, createStory, className, existingData }: ComponentProps<"div"> & { genres: Array<Genre>, createStory: (data: any) => void, existingData: Story & { genres: number[] } | null }) {
+export default function StoryForm({ genres, createStory, className }: ComponentProps<"div"> & { genres: Array<Genre>, createStory: (data: any) => void, className: string }) {
 	const form = useForm<z.infer<typeof formSchema>>({
 		resolver: zodResolver(formSchema),
 		defaultValues: {
-			id: existingData?.id,
-			title: existingData?.title ?? "",
-			word_count: existingData?.word_count ?? 500,
-			genres: existingData?.genres ?? []
+			word_count: 500,
+			genres: []
 		},
 	})
 
-
+	const router = useRouter()
 
 	async function onSubmit(values: z.infer<typeof formSchema>) {
 		try {
 			const res = await createStory(values)
 			//server actions return undefined if middleware authentication fails
-			if (res === undefined) throw new Error("something went wrong")
-			toast({
-				title: "Successfully submitted:",
-				description: values.title,
-			})
+			if (!res) throw new Error("something went wrong")
+			toast({ title: "Sucessfully submitted:", description: values.title })
+			router.refresh()
 		} catch (error) {
 			toast({
-				title: "UH-OH",
+				title: "Oh dear... ",
 				description: error.message
 			})
 		}
-		window.location.reload()
 	}
 
 
diff --git a/src/app/ui/tables/data-table.tsx b/src/app/ui/tables/data-table.tsx
index 4765b7c..8833fa6 100644
--- a/src/app/ui/tables/data-table.tsx
+++ b/src/app/ui/tables/data-table.tsx
@@ -39,7 +39,7 @@ import {
   TableRow,
 } from "@/components/ui/table"
 import { EyeIcon, Trash2 } from "lucide-react"
-import { usePathname } from "next/navigation"
+import { usePathname, useSearchParams } from "next/navigation"
 import FormContextMenu from "./contextMenu"
 import { deleteRecord, deleteRecords } from "app/lib/del"
 import { Pathname } from "app/types"
@@ -50,6 +50,8 @@ import { tableNameToItemName } from "app/lib/nameMaps"
 import { Genre, Pub, Response, Story } from "@prisma/client"
 import EditSubmissionDialog from "app/submission/edit"
 import { DialogTitle } from "@radix-ui/react-dialog"
+import { toast } from "@/components/ui/use-toast"
+import { useRouter } from "next/navigation"
 
 export interface DataTableProps<TData, TValue> {
   columns: ColumnDef<TData, TValue>[]
@@ -119,6 +121,9 @@ export function DataTable<TData, TValue>({
   }
 
 
+
+  const router = useRouter()
+
   const [filterBy, setFilterBy] = useState(table.getAllColumns()[0])
   const [isContextMenuOpen, setIsContextMenuOpen] = useState(false)
   return (<>
@@ -181,8 +186,11 @@ export function DataTable<TData, TValue>({
           <DialogFooter>
             <DialogClose asChild>
               <Button variant="destructive"
-                onClick={() => {
-                  deleteRecord(dialogRow.original.id, pathname)
+                onClick={async () => {
+                  const res = await deleteRecord(dialogRow.original.id, pathname)
+                  if (!res) toast({ title: "Oh dear...", description: "Failed to delete." })
+                  if (res) toast({ title: "Successfully deleted record of id:", description: dialogRow.original.id })
+                  router.refresh()
                 }}>Yes, delete it!
               </Button>
             </DialogClose>
@@ -206,11 +214,14 @@ export function DataTable<TData, TValue>({
           <DialogFooter>
             <DialogClose asChild>
               <Button variant="destructive"
-                onClick={() => {
+                onClick={async () => {
                   const selectedRows = table.getState().rowSelection
                   const rowIds = Object.keys(selectedRows)
                   const recordIds = rowIds.map(id => Number(table.getRow(id).original.id))
-                  deleteRecords(recordIds, pathname)
+                  const res = await deleteRecords(recordIds, pathname)
+                  if (!res) toast({ title: "Oh dear...", description: "Failed to delete." })
+                  if (res) toast({ title: "Sucessfully deleted records of id:", description: JSON.stringify(recordIds) })
+                  router.refresh()
                 }}>
                 Yes, delete them!</Button>
             </DialogClose>