Merge pull request #766 from rage/no-accept-reject-buttons-for-non-pe…

…er-review-questions No accept reject buttons for non peer review questions
rage · May 17, 2021 · bca2515 · bca2515
2 parents 7a0d1bc + e844c47
commit bca2515
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/packages/backendv2/src/models/quiz_answer.ts b/packages/backendv2/src/models/quiz_answer.ts
@@ -213,8 +213,9 @@ class QuizAnswer extends mixin(BaseModel, [
         .whereIn("deleted", deleteConditions)
         .orderBy([{ column: "created_at", order: order }])
         .page(page, pageSize)
+        .withGraphFetched("quiz.[peerReviewCollections]")
         .withGraphFetched("userQuizState")
-        .withGraphFetched("itemAnswers.[optionAnswers]")
+        .withGraphFetched("itemAnswers.[quizItem, optionAnswers]")
         .withGraphFetched("peerReviews.[answers.[question.[texts]]]")
     } else {
       paginated = await this.query()
@@ -223,8 +224,9 @@ class QuizAnswer extends mixin(BaseModel, [
         .whereIn("status", filters)
         .orderBy([{ column: "created_at", order: order }])
         .page(page, pageSize)
+        .withGraphFetched("quiz.[peerReviewCollections]")
         .withGraphFetched("userQuizState")
-        .withGraphFetched("itemAnswers.[optionAnswers]")
+        .withGraphFetched("itemAnswers.[quizItem, optionAnswers]")
         .withGraphFetched("peerReviews.[answers.[question.[texts]]]")
     }
 

diff --git a/packages/backendv2/src/models/quiz_item_answer.ts b/packages/backendv2/src/models/quiz_item_answer.ts
@@ -1,10 +1,13 @@
 import BaseModel from "./base_model"
 import QuizAnswer from "./quiz_answer"
+import QuizItem from "./quiz_item"
 import QuizOptionAnswer from "./quiz_option_answer"
 
 class QuizItemAnswer extends BaseModel {
   id!: string
+  quizAnswer!: QuizAnswer
   quizItemId!: string
+  quizItem!: QuizItem
   textData!: string
   correct!: boolean
   optionAnswers!: QuizOptionAnswer[]
@@ -16,7 +19,7 @@ class QuizItemAnswer extends BaseModel {
 
   static relationMappings = {
     quizAnswer: {
-      relation: BaseModel.BelongsToOneRelation,
+      relation: BaseModel.HasOneRelation,
       modelClass: QuizAnswer,
       join: {
         from: "quiz_item_answer.quiz_answer_id",
@@ -31,6 +34,14 @@ class QuizItemAnswer extends BaseModel {
         to: "quiz_option_answer.quiz_item_answer_id",
       },
     },
+    quizItem: {
+      relation: BaseModel.HasOneRelation,
+      modelClass: QuizItem,
+      join: {
+        from: "quiz_item_answer.quiz_item_id",
+        to: "quiz_item.id",
+      },
+    },
   }
 }
 

diff --git a/packages/quizzes-dashboard/components/Answer/CardContent/index.tsx b/packages/quizzes-dashboard/components/Answer/CardContent/index.tsx
@@ -204,9 +204,10 @@ export const AnswerContent = ({ answer }: AnswerContentProps) => {
           </>
         )}
       </StatButtonWrapper>
-      {editableAnswerStates.includes(answer.status) && (
-        <ManualReviewField answer={answer} />
-      )}
+      {editableAnswerStates.includes(answer.status) &&
+        answer.quiz.peerReviewCollections.length > 0 && (
+          <ManualReviewField answer={answer} />
+        )}
     </>
   )
 }

diff --git a/packages/quizzes-dashboard/types/Answer.d.ts b/packages/quizzes-dashboard/types/Answer.d.ts
@@ -1,3 +1,5 @@
+import { Quiz } from "./Quiz"
+
 export interface Answer {
   id: string
   quizId: string
@@ -9,6 +11,7 @@ export interface Answer {
   userQuizState: UserQuizState
   itemAnswers: ItemAnswer[]
   peerReviews: PeerReview[]
+  quiz: Quiz
   deleted: boolean
 }