edit submission functionality (partial)

This commit is contained in:
andrzej 2024-07-19 17:23:07 +02:00
parent aec413ba7a
commit 5dc1bc803e
6 changed files with 74 additions and 12 deletions

Binary file not shown.

View File

@ -8,7 +8,16 @@ import { Pub, Response, Story } from "@prisma/client";
import SubmissionForm from "app/ui/forms/sub";
export default function CreateSubmissionDialog({ stories, pubs, responses }: ComponentProps<"div"> & { stories: Story[], pubs: Pub[], responses: Response[] }) {
type CreateSubDefaults = {
subId?: number,
storyId: number,
pubId: number,
submitted: Date,
responded: Date,
respoonseId: number
}
export default function CreateSubmissionDialog({ stories, pubs, responses, defaults }: ComponentProps<"div"> & { stories: Story[], pubs: Pub[], responses: Response[], defaults: CreateSubDefaults }) {
return (
<Dialog>
@ -20,7 +29,7 @@ export default function CreateSubmissionDialog({ stories, pubs, responses }: Com
<DialogTitle>New submission</DialogTitle>
<DialogDescription>Create an entry for a new story i.e. a thing you intend to submit for publication.</DialogDescription>
</DialogHeader>
<SubmissionForm createSub={createSub} pubs={pubs} responses={responses} stories={stories} />
<SubmissionForm createSub={createSub} pubs={pubs} responses={responses} stories={stories} defaults={defaults} />
<DialogFooter>
<DialogClose asChild>
</DialogClose>

View File

@ -0,0 +1,40 @@
"use client"
import { createSub } from "app/lib/create"
import { Dialog, DialogHeader, DialogTrigger, DialogContent, DialogClose, DialogTitle, DialogFooter, DialogDescription } from "@/components/ui/dialog";
import { Button } from "@/components/ui/button";
import { ComponentProps } from "react";
import { Pub, Response, Story } from "@prisma/client";
import SubmissionForm from "app/ui/forms/sub";
type CreateSubDefaults = {
subId?: number,
storyId: number,
pubId: number,
submitted: Date,
responded: Date,
respoonseId: number
}
export default function EditSubmissionDialog({ stories, pubs, responses, defaults, children }: ComponentProps<"div"> & { stories: Story[], pubs: Pub[], responses: Response[], defaults: CreateSubDefaults }) {
return (
<Dialog>
<DialogTrigger>
{children}
</DialogTrigger>
<DialogContent>
<DialogHeader>
<DialogTitle>Edit Submission</DialogTitle>
<DialogDescription>Change response status, edit dates etc</DialogDescription>
</DialogHeader>
<SubmissionForm createSub={createSub} pubs={pubs} responses={responses} stories={stories} defaults={defaults} />
<DialogFooter>
<DialogClose asChild>
</DialogClose>
<Button form="subform">Submit</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)
}

View File

@ -17,7 +17,11 @@ export default async function Page() {
const responses = await getResponses()
return (
<div className="container">
<DataTable data={subs} columns={columns} tableName="sub">
<DataTable data={subs} columns={columns} tableName="sub"
stories={stories}
pubs={pubs}
responses={responses}
>
<CreateSubmissionDialog
stories={stories}
pubs={pubs}

View File

@ -33,7 +33,7 @@ import {
} from "@/components/ui/select"
import { useState } from "react"
const FormSchema = z.object({
export const formSchema = z.object({
storyId: z.coerce.number(),
pubId: z.coerce.number(),
submitted: z.date().transform((date) => date.toString()),
@ -66,11 +66,12 @@ const FormSchema = z.object({
)
export default function SubmissionForm({ stories, pubs, responses, createSub }) {
const form = useForm<z.infer<typeof FormSchema>>({
resolver: zodResolver(FormSchema),
export default function SubmissionForm({ stories, pubs, responses, createSub, defaults }) {
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
responseId: responses[0].id
responseId: responses[0].id,
...defaults
}
})
const [isSubCalendarOpen, setIsSubCalendarOpen] = useState(false);
@ -94,7 +95,7 @@ export default function SubmissionForm({ stories, pubs, responses, createSub })
// 2. Define a submit handler.
function onSubmit(values: z.infer<typeof FormSchema>) {
function onSubmit(values: z.infer<typeof formSchema>) {
// Do something with the form values.
// ✅ This will be type-safe and validated.
toast({

View File

@ -46,6 +46,8 @@ import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, Di
import pluralize from "app/lib/pluralize"
import { updateField } from "app/lib/update"
import { tableNameToItemName } from "app/lib/nameMaps"
import { Pub, Response, Story } from "@prisma/client"
import { response } from "express"
export interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[]
@ -57,8 +59,11 @@ export function DataTable<TData, TValue>({
columns,
data,
children,
tableName
}: DataTableProps<TData, TValue> & ComponentProps<"div"> & { tableName: string }) {
tableName,
stories,
pubs,
responses
}: DataTableProps<TData, TValue> & ComponentProps<"div"> & { tableName: string, stories?: Story[], pubs?: Pub[], responses?: Response[] }) {
//STATE
const [sorting, setSorting] = useState<SortingState>([])
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>(
@ -89,7 +94,10 @@ export function DataTable<TData, TValue>({
meta: {
updateTextField: updateField,
tableName,
pathname
pathname,
stories,
pubs,
responses
}
})