fix(packs): resolve type issue with questions type

Would-You-Bot · Dec 26, 2024 · 9b180c1 · 9b180c1
1 parent 7a1f903
commit 9b180c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/api/packs/route.ts b/app/api/packs/route.ts
@@ -131,10 +131,7 @@ export async function POST(request: NextRequest) {
 	for (const question of preProcessedQuestions) {
 		questions.push({
 			id: uuidv4(),
-			type: (type === 'mixed' ? question.type : type) as Exclude<
-				PackType,
-				'mixed'
-			>,
+			type: question.type,
 			question: question.question
 		})
 	}

diff --git a/app/packs/create/_components/ImportQuestionModal.tsx b/app/packs/create/_components/ImportQuestionModal.tsx
@@ -243,15 +243,16 @@ function ImportDetails({
 	}
 
 	const finishImport = () => {
-		const newQuestions: { type: PackType; question: string }[] = [
-			...currentQuestions
-		]
+		const newQuestions: {
+			type: Exclude<PackType, 'mixed'>
+			question: string
+		}[] = [...currentQuestions]
 
 		for (const [key, value] of Object.entries(questions)) {
 			for (const question of value) {
 				if (question.selected) {
 					newQuestions.push({
-						type: key as PackType,
+						type: key as Exclude<PackType, 'mixed'>,
 						question: question.question
 					})
 				}

diff --git a/utils/zod/schemas.ts b/utils/zod/schemas.ts
@@ -17,10 +17,12 @@ export const questionSchema = z.object({
 		.string()
 		.min(10, 'Make sure your question is at least 10 characters long')
 		.max(300, 'Make sure your question is only 300 characters long'),
-	type: z.nativeEnum(PackType, {
-		required_error: 'Please select a valid question type',
-		message: 'Please select a valid question type'
-	})
+	type: z
+		.nativeEnum(PackType, {
+			required_error: 'Please select a valid question type',
+			message: 'Please select a valid question type'
+		})
+		.refine((type) => type !== 'mixed', 'Question type cannot be mixed')
 })
 
 export const editedPackSchema = z.object({