Skip to content

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

fix invalid submission id (#308)

bautistaaa2cb69e646c7e
diff --git a/src/app/challenge/[id]/submissions/[submissionId]/error.tsx b/src/app/challenge/[id]/submissions/[submissionId]/error.tsx
new file mode 100644
index 00000000..4b0d0e4b
--- /dev/null
+++ b/src/app/challenge/[id]/submissions/[submissionId]/error.tsx
@@ -0,0 +1,22 @@
+'use client'; // Error components must be Client Components
+
+import { Button } from '~/components/ui/button';
+import Text from '~/components/ui/typography/typography';
+
+export default function Error({ reset }: { reset: () => void }) {
+ return (
+ <div className="container flex h-full flex-col items-center justify-center">
+ <Text intent="h2" className="mb-6">
+ Something went wrong!
+ </Text>
+ <Button
+ onClick={
+ // Attempt to recover by trying to re-render the segment
+ () => reset()
+ }
+ >
+ Try again
+ </Button>
+ </div>
+ );
+}
diff --git a/src/app/challenge/[id]/submissions/[submissionId]/page.tsx b/src/app/challenge/[id]/submissions/[submissionId]/page.tsx
index 28125189..a8d06314 100644
--- a/src/app/challenge/[id]/submissions/[submissionId]/page.tsx
+++ b/src/app/challenge/[id]/submissions/[submissionId]/page.tsx
@@ -2,18 +2,21 @@ import { notFound } from 'next/navigation';
import { getServerAuthSession } from '~/server/auth';
import { Submissions } from '~/components/challenge/submissions';
-import { getChallengeSubmissions } from '../page';
+import { getChallengeSubmissions } from '../getChallengeSubmissions';
interface Props {
params: {
id: string;
+ submissionId: string;
};
}
-export default async function SubmissionPage({ params: { id } }: Props) {
+export default async function SubmissionPage({ params: { id, submissionId } }: Props) {
const session = await getServerAuthSession();
const submissions = await getChallengeSubmissions(session?.user.id ?? '', id);
- if (!submissions) {
+ const isValidSubmission = submissions?.some((submission) => submission.id === +submissionId);
+
+ if (!isValidSubmission) {
return notFound();
}
diff --git a/src/app/challenge/[id]/submissions/getChallengeSubmissions.ts b/src/app/challenge/[id]/submissions/getChallengeSubmissions.ts
new file mode 100644
index 00000000..bace4086
--- /dev/null
+++ b/src/app/challenge/[id]/submissions/getChallengeSubmissions.ts
@@ -0,0 +1,16 @@
+import { cache } from 'react';
+import { prisma } from '~/server/db';
+
+export type ChallengeSubmissions = NonNullable<Awaited<ReturnType<typeof getChallengeSubmissions>>>;
+export const getChallengeSubmissions = cache(async (userId: string, challengeId: string) => {
+ const solutions = await prisma.submission.findMany({
+ where: { challengeId: +challengeId, userId },
+ orderBy: [
+ {
+ createdAt: 'desc',
+ },
+ ],
+ });
+
+ return solutions;
+});
diff --git a/src/app/challenge/[id]/submissions/page.tsx b/src/app/challenge/[id]/submissions/page.tsx
index 9fb46f57..f1f24482 100644
--- a/src/app/challenge/[id]/submissions/page.tsx
+++ b/src/app/challenge/[id]/submissions/page.tsx
@@ -1,8 +1,7 @@
import { notFound } from 'next/navigation';
-import { cache } from 'react';
import { Submissions } from '~/components/challenge/submissions';
import { getServerAuthSession } from '~/server/auth';
-import { prisma } from '~/server/db';
+import { getChallengeSubmissions } from './getChallengeSubmissions';
interface Props {
params: {
@@ -20,17 +19,3 @@ export default async function SubmissionPage({ params: { id } }: Props) {
return <Submissions submissions={submissions} />;
}
-
-export type ChallengeSubmissions = NonNullable<Awaited<ReturnType<typeof getChallengeSubmissions>>>;
-export const getChallengeSubmissions = cache(async (userId: string, challengeId: string) => {
- const solutions = await prisma.submission.findMany({
- where: { challengeId: +challengeId, userId },
- orderBy: [
- {
- createdAt: 'desc',
- },
- ],
- });
-
- return solutions;
-});
diff --git a/src/components/challenge/submissions/index.tsx b/src/components/challenge/submissions/index.tsx
index 55a467c3..e0a71ff1 100644
--- a/src/components/challenge/submissions/index.tsx
+++ b/src/components/challenge/submissions/index.tsx
@@ -6,7 +6,7 @@ import { getRelativeTime } from '~/utils/relativeTime';
import Link from 'next/link';
import { useMemo, useState } from 'react';
-import type { ChallengeSubmissions } from '~/app/challenge/[id]/submissions/page';
+import type { ChallengeSubmissions } from '~/app/challenge/[id]/submissions/getChallengeSubmissions';
import NoSubmissions from './nosubmissions';
interface Props {