diff --git a/prisma/dev.db b/prisma/dev.db index 4dcac18..4524a66 100644 Binary files a/prisma/dev.db and b/prisma/dev.db differ diff --git a/src/app/lib/create.ts b/src/app/lib/create.ts index cf41f49..1d1e3ec 100644 --- a/src/app/lib/create.ts +++ b/src/app/lib/create.ts @@ -1,12 +1,12 @@ "use server" -import { Genre } from "@prisma/client" +import { Genre, Story } from "@prisma/client" import prisma from "./db" import { revalidatePath } from "next/cache" import { redirect } from "next/navigation" -export async function createStory(data) { +export async function createStory(data: Story & { genres: number[] }) { "use server" - const genresArray = data.genres.map((e: Genre) => { return { id: e } }) + const genresArray = data.genres.map((e) => { return { id: e } }) const res = await prisma.story.create({ data: { title: data.title, diff --git a/src/app/lib/update.ts b/src/app/lib/update.ts new file mode 100644 index 0000000..16d983b --- /dev/null +++ b/src/app/lib/update.ts @@ -0,0 +1,32 @@ +"use server" +import { Genre, Story } from "@prisma/client" +import { StoryWithGenres } from "app/story/page" +import prisma from "./db" +import { revalidatePath } from "next/cache" +import { redirect } from "next/navigation" + +export async function updateStory(data: Story & { genres: number[] }) { + const genresArray = data.genres.map((e) => { return { id: e } }) + + const res = await prisma.story.update({ + where: { id: data.id }, + data: { + title: data.title, + word_count: data.word_count, + genres: { set: genresArray } + } + }) + console.log(`updated story: ${res}`) + revalidatePath("/story") + redirect("/story") +} + +export async function updateTextField({ text, table, column, id }: { text: string, table: string, column: string, id: number }) { + const res = prisma[table].update({ + where: { id }, + data: { + [column]: text + } + }) +} + diff --git a/src/app/story/columns.tsx b/src/app/story/columns.tsx index 90a9d6d..3b77f7f 100644 --- a/src/app/story/columns.tsx +++ b/src/app/story/columns.tsx @@ -5,6 +5,7 @@ import { ArrowUpDown } from "lucide-react" import { Button } from "@/components/ui/button" import GenreBadges from "app/ui/genreBadges" import { actions } from "app/ui/tables/actions" +import { TextInputCell } from "app/ui/inputs/textInput" const columnHelper = createColumnHelper() @@ -23,6 +24,7 @@ export const columns: ColumnDef[] = [ ) }, + cell: TextInputCell }, { diff --git a/src/app/story/create.tsx b/src/app/story/create.tsx index d61a499..912ab0a 100644 --- a/src/app/story/create.tsx +++ b/src/app/story/create.tsx @@ -19,7 +19,7 @@ export default function CreateStoryDialog({ genres }: ComponentProps<"div"> & { New story Create an entry for a new story i.e. a thing you intend to submit for publication. - + diff --git a/src/app/story/page.tsx b/src/app/story/page.tsx index 4d94658..a75734b 100644 --- a/src/app/story/page.tsx +++ b/src/app/story/page.tsx @@ -23,6 +23,7 @@ export default async function Page() {
+ {/* TODO - EDIT STORY DIALOG */}
) diff --git a/src/app/tailwind.css b/src/app/tailwind.css index c0fc71c..3e9ce40 100644 --- a/src/app/tailwind.css +++ b/src/app/tailwind.css @@ -1072,6 +1072,10 @@ body { align-items: flex-start; } +.items-end { + align-items: flex-end; +} + .items-center { align-items: center; } @@ -1427,6 +1431,10 @@ body { padding-top: 0.25rem; } +.pt-2 { + padding-top: 0.5rem; +} + .text-left { text-align: left; } diff --git a/src/app/ui/forms/story.tsx b/src/app/ui/forms/story.tsx index 60e04cd..068731a 100644 --- a/src/app/ui/forms/story.tsx +++ b/src/app/ui/forms/story.tsx @@ -21,31 +21,33 @@ import { PopoverContent, } from "@/components/ui/popover" import { ComponentProps } from "react" -import { Genre } from "@prisma/client" +import { Genre, Story } from "@prisma/client" import { randomStoryTitle } from "app/lib/shortStoryTitleGenerator" import { usePathname } from "next/navigation" import GenrePicker from "./genrePicker" +import { StoryWithGenres } from "app/story/page" const formSchema = z.object({ + id: z.number().optional(), title: z.string().min(2).max(50), word_count: z.coerce.number().min(100), genres: z.array(z.number()) }) -export default function StoryForm({ genres, createStory, className }: ComponentProps<"div"> & { genres: Array, createStory: (data: any) => void }) { - // 1. Define your form. +export default function StoryForm({ genres, createStory, className, existingData }: ComponentProps<"div"> & { genres: Array, createStory: (data: any) => void, existingData: Story & { genres: number[] } | null }) { const form = useForm>({ resolver: zodResolver(formSchema), defaultValues: { - title: "", - word_count: 0, - genres: [] + id: existingData?.id, + title: existingData?.title ?? "", + word_count: existingData?.word_count ?? 500, + genres: existingData?.genres ?? [] }, }) - // 2. Define a submit handler. + + + function onSubmit(values: z.infer) { - // Do something with the form values. - // ✅ This will be type-safe and validated. toast({ title: "You submitted the following values:", description: ( diff --git a/src/app/ui/inputs/textInput.tsx b/src/app/ui/inputs/textInput.tsx new file mode 100644 index 0000000..1b97451 --- /dev/null +++ b/src/app/ui/inputs/textInput.tsx @@ -0,0 +1,34 @@ +import { Cell, Table } from "@tanstack/react-table" +import { useState, useEffect } from "react" +import { Input } from "@/components/ui/input" +import { Button } from "@/components/ui/button" +import { Check, CircleX } from "lucide-react" + +export const TextInputCell = ({ getValue, row }) => { + const initialValue = getValue() + useEffect(() => { + setValue(initialValue) + }, [initialValue]) + const [value, setValue] = useState("") + const [isActive, setIsActive] = useState(false) + + return (
setIsActive(prev => !prev)} + > + {isActive ? +
+ setValue(e.target.value)} + onBlur={() => setIsActive(false)} + autoFocus={true} + /> +
+ + +
+
+ :

{value}

+ } +
) +} diff --git a/src/app/ui/tables/contextMenu.tsx b/src/app/ui/tables/contextMenu.tsx index 95c9477..c237519 100644 --- a/src/app/ui/tables/contextMenu.tsx +++ b/src/app/ui/tables/contextMenu.tsx @@ -13,9 +13,12 @@ export default function FormContextMenu({ pathname, row, selectedRows, deselect {pathname !== "/submission" && selectedRows.length <= 1 ? - - Inspect - + <> + + Inspect + + Edit + : "" } { diff --git a/src/app/ui/tables/data-table.tsx b/src/app/ui/tables/data-table.tsx index b9df8de..a984c1b 100644 --- a/src/app/ui/tables/data-table.tsx +++ b/src/app/ui/tables/data-table.tsx @@ -44,6 +44,7 @@ import { deleteRecords } from "app/lib/del" import { Pathname } from "app/types" import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTrigger } from "@/components/ui/dialog" import pluralize from "app/lib/pluralize" +import { updateTextField } from "app/lib/update" interface DataTableProps { columns: ColumnDef[] @@ -55,7 +56,7 @@ export function DataTable({ columns, data, children -}: DataTableProps & ComponentProps<"div"> & { type: "publication" | "submission" | "story" | "genre" | "response" }) { +}: DataTableProps & ComponentProps<"div">) { //STATE const [sorting, setSorting] = useState([]) const [columnFilters, setColumnFilters] = useState( @@ -80,6 +81,12 @@ export function DataTable({ sorting, columnFilters, columnVisibility, + }, + //this is where you put arbitrary functions etc to make them accessible via the table api + meta: { + updateTextField, + //TODO - move select row action here so it can be accessed from within a cell + selectRow: () => { } } }) @@ -247,6 +254,7 @@ export function DataTable({ size="sm" onClick={() => table.previousPage()} disabled={!table.getCanPreviousPage()} + onBlur={true} > Previous