Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

feat: author can edit his solution (#927)

Ayush Kumar Yadav4a6bece85fa2
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/_actions.ts b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/_actions.ts
index d7e7a0d0..7df24af9 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/_actions.ts
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/_actions.ts
@@ -13,9 +13,34 @@ interface Args {
userId: string;
}
+interface SolutionUpdateArgs {
+ id: number;
+ description: string;
+ slug: string;
+ title: string;
+ userId: string;
+}
+
export const createCacheKeyForSolutions = (slug: string) => `challenge-${slug}-solutions`;
export const createCacheKeyForSharedSolutionsTab = (userId: string) => `${userId}-shared-solutions`;
+export async function updateSolution({ id, description, slug, title, userId }: SolutionUpdateArgs) {
+ const session = await getServerAuthSession();
+ if (!isAuthor(session, userId)) {
+ throw new Error('Only author can delete their solution.');
+ }
+
+ await prisma.sharedSolution.update({
+ where: { id },
+ data: {
+ title,
+ description,
+ },
+ });
+
+ revalidateTag(createCacheKeyForSolutions(slug));
+}
+
export async function postSolution({ challengeId, description, slug, title, userId }: Args) {
const session = await getServerAuthSession();
if (!session) throw new Error('You must be logged in to submit a solution');
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/edit-solution.tsx b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/edit-solution.tsx
new file mode 100644
index 00000000..f004677d
--- /dev/null
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/edit-solution.tsx
@@ -0,0 +1,140 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useSession } from '@repo/auth/react';
+import { Button } from '@repo/ui/components/button';
+import { Form, FormControl, FormField, FormItem, FormMessage } from '@repo/ui/components/form';
+import { Input } from '@repo/ui/components/input';
+import { useToast } from '@repo/ui/components/use-toast';
+import { useTheme } from 'next-themes';
+import { useParams } from 'next/navigation';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import { RichMarkdownEditor } from '~/components/rich-markdown-editor';
+import { createNoProfanitySchemaWithValidate } from '~/utils/antiProfanityZod';
+import type { ChallengeSolution } from '~/app/[locale]/challenge/[slug]/solutions/[solutionId]/page';
+import { updateSolution } from './_actions';
+
+const getDefaultMarkdown = (solution: string) => `
+## Thoughts
+<!-- Any thoughts you might like to share about the problem (within ToS, of course). -->
+
+## Approach
+<!-- Provide some details on how you approached this challenge. -->
+
+
+## Code
+\`\`\`ts
+${solution}
+\`\`\`
+`;
+
+const formSchema = z.object({
+ title: createNoProfanitySchemaWithValidate((zodString) =>
+ zodString.min(5, 'The title must be longer than 5 characters'),
+ ),
+ content: createNoProfanitySchemaWithValidate((zodString) =>
+ zodString.min(30, 'Content must be longer than 30 characters'),
+ ),
+});
+
+export type FormSchema = z.infer<typeof formSchema>;
+
+interface Props {
+ solution: ChallengeSolution;
+ setIsEditing: (isEditing: boolean) => void;
+}
+
+export function EditSolution({ solution, setIsEditing }: Props) {
+ const { slug } = useParams();
+ const session = useSession();
+ const form = useForm<FormSchema>({
+ resolver: zodResolver(formSchema),
+ defaultValues: {
+ title: solution.title,
+ content: getDefaultMarkdown(solution.description),
+ },
+ });
+ const { toast } = useToast();
+
+ const onSubmit = async (data: FormSchema) => {
+ try {
+ await updateSolution({
+ id: solution.id,
+ description: data.content ?? '',
+ slug: slug as string,
+ title: data.title ?? '',
+ userId: session.data?.user.id!,
+ });
+
+ toast({
+ variant: 'success',
+ title: 'Your solution has been updated!',
+ });
+ } catch (error) {
+ toast({
+ variant: 'destructive',
+ title: 'Uh oh! Something went wrong. Please try again.',
+ });
+ } finally {
+ setIsEditing(false);
+ }
+ };
+
+ const { theme } = useTheme();
+ theme === 'dark'
+ ? document.documentElement.setAttribute('data-color-mode', 'dark')
+ : document.documentElement.setAttribute('data-color-mode', 'light');
+
+ return (
+ <Form {...form}>
+ <form className="relative flex h-full flex-col" onSubmit={form.handleSubmit(onSubmit)}>
+ <div className="bg-background/90 dark:bg-muted/90 sticky right-0 top-0 z-10 flex w-full items-center justify-between gap-2 border-b border-zinc-300 bg-opacity-20 p-1 pr-2 backdrop-blur-sm dark:border-zinc-700">
+ <div className="flex-1">
+ <FormField
+ control={form.control}
+ name="title"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input
+ className="rounded-xl border-zinc-300 bg-zinc-100 focus-visible:ring-0 dark:border-zinc-700 dark:bg-zinc-900"
+ {...field}
+ placeholder="Enter a title for your solution."
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </div>
+ <Button
+ className="h-8 rounded-lg bg-white px-3 py-2 text-black hover:bg-zinc-200 focus-visible:bg-zinc-200 dark:bg-zinc-800 dark:text-zinc-300 dark:hover:bg-zinc-700 dark:focus-visible:bg-zinc-700"
+ onClick={() => setIsEditing(false)}
+ type="button"
+ >
+ Cancel
+ </Button>
+ <Button className="h-8 rounded-lg px-3 py-2" type="submit">
+ Update
+ </Button>
+ </div>
+ <div className="flex flex-1 flex-col">
+ <FormField
+ control={form.control}
+ name="content"
+ render={({ field }) => (
+ <FormItem className="flex flex-1 flex-col">
+ <RichMarkdownEditor
+ allowImageUpload
+ value={field.value}
+ // non-split-screen by default
+ onChange={field.onChange}
+ />
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </div>
+ </form>
+ </Form>
+ );
+}
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
index 439f3df2..b8648228 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
@@ -9,7 +9,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/too
import { TypographyLarge } from '@repo/ui/components/typography/large';
import { toast } from '@repo/ui/components/use-toast';
import { UserBadge } from '@repo/ui/components/user-badge';
-import { Calendar, Flag, Pin, Share, X, Trash } from '@repo/ui/icons';
+import { Calendar, Flag, Pin, Share, X, Trash, Pencil } from '@repo/ui/icons';
import clsx from 'clsx';
import Link from 'next/link';
import type { ChallengeSolution } from '~/app/[locale]/challenge/[slug]/solutions/[solutionId]/page';
@@ -20,6 +20,8 @@ import { pinOrUnpinSolution } from './_actions';
import { isAdminOrModerator, isAuthor } from '~/utils/auth-guards';
import { SolutionDeleteDialog } from './delete';
import { useParams } from 'next/navigation';
+import { useState } from 'react';
+import { EditSolution } from './edit-solution';
interface Props {
solution: ChallengeSolution;
@@ -29,6 +31,7 @@ export function SolutionDetails({ solution }: Props) {
const { slug } = useParams();
const { data: session } = useSession();
const showPin = isAdminOrModerator(session);
+ const [isEditing, setIsEditing] = useState(false);
const handlePinClick = async () => {
await pinOrUnpinSolution(solution.id, !solution.isPinned, slug as string);
@@ -130,23 +133,42 @@ export function SolutionDetails({ solution }: Props) {
<Pin className={clsx('h-4 w-4')} />
</Button>
) : null}
+
+ {/* Only author can see edit / delete button */}
{isAuthor(session, solution.userId) ? (
- <SolutionDeleteDialog solution={solution}>
+ <>
<Tooltip>
<TooltipTrigger asChild>
- <Button variant="secondary" size="xs">
- <Trash className="h-4 w-4" />
+ <Button
+ onClick={() => setIsEditing(!isEditing)}
+ variant="secondary"
+ size="xs"
+ >
+ <Pencil className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent>
- <p>Delete</p>
+ <p>Edit</p>
</TooltipContent>
</Tooltip>
- </SolutionDeleteDialog>
+ <SolutionDeleteDialog solution={solution}>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button variant="secondary" size="xs">
+ <Trash className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Delete</p>
+ </TooltipContent>
+ </Tooltip>
+ </SolutionDeleteDialog>
+ </>
) : null}
</div>
</div>
- <Markdown>{solution.description || ''}</Markdown>
+ {!isEditing && <Markdown>{solution.description || ''}</Markdown>}
+ {isEditing ? <EditSolution solution={solution} setIsEditing={setIsEditing} /> : null}
</div>
</div>
</div>