Merge pull request #2336 from bryanjenningz/make-dojo-exercises-not-n…

…ullable Make DOJO exercises not nullable and fix React key bug
garageScript · Sep 21, 2022 · c066f24 · c066f24 · vercel · Sep 21, 2022
2 parents 27b9d46 + 3a6f6a6
commit c066f24
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/__dummy__/getExercisesData.ts b/__dummy__/getExercisesData.ts
@@ -87,7 +87,7 @@ const getExercisesData: GetExercisesQuery = {
       },
       description: '```\nlet a = 1\na -= 2\n// what is a?\n```',
       answer: '-1',
-      explanation: '`a -= 2` is a shorter way to write `a = a - 2`'
+      explanation: null
     }
   ]
 }

diff --git a/__tests__/pages/exercises/[lessonSlug].test.js b/__tests__/pages/exercises/[lessonSlug].test.js
@@ -64,10 +64,11 @@ describe('Exercises page', () => {
     // Previous button is not in the document on the first exercise.
     expect(queryByRole('button', { name: 'PREVIOUS' })).not.toBeInTheDocument()
 
-    const skipButton = getByRole('button', { name: 'SKIP' })
+    let skipButton = getByRole('button', { name: 'SKIP' })
     fireEvent.click(skipButton)
     expect(queryByRole('button', { name: 'PREVIOUS' })).toBeInTheDocument()
 
+    skipButton = getByRole('button', { name: 'SKIP' })
     fireEvent.click(skipButton)
     // Skip button should not be in the document because we're on the last exercise now.
     expect(queryByRole('button', { name: 'SKIP' })).not.toBeInTheDocument()

diff --git a/graphql/index.tsx b/graphql/index.tsx
@@ -315,7 +315,7 @@ export type Query = {
   __typename?: 'Query'
   alerts: Array<Alert>
   allUsers?: Maybe<Array<Maybe<User>>>
-  exercises: Array<Maybe<Exercise>>
+  exercises: Array<Exercise>
   getLessonMentors?: Maybe<Array<Maybe<User>>>
   getPreviousSubmissions?: Maybe<Array<Submission>>
   isTokenValid: Scalars['Boolean']
@@ -838,7 +838,7 @@ export type GetExercisesQuery = {
       name: string
       lesson: { __typename?: 'Lesson'; slug: string }
     }
-  } | null>
+  }>
 }
 
 export type GetFlaggedExercisesQueryVariables = Exact<{ [key: string]: never }>
@@ -852,7 +852,7 @@ export type GetFlaggedExercisesQuery = {
       __typename?: 'Module'
       lesson: { __typename?: 'Lesson'; title: string }
     }
-  } | null>
+  }>
 }
 
 export type LessonMentorsQueryVariables = Exact<{
@@ -1780,7 +1780,7 @@ export type QueryResolvers<
     ContextType
   >
   exercises?: Resolver<
-    Array<Maybe<ResolversTypes['Exercise']>>,
+    Array<ResolversTypes['Exercise']>,
     ParentType,
     ContextType
   >

diff --git a/graphql/typeDefs.ts b/graphql/typeDefs.ts
@@ -6,7 +6,7 @@ export default gql`
     session: Session!
     allUsers: [User]
     modules: [Module]!
-    exercises: [Exercise]!
+    exercises: [Exercise!]!
     getLessonMentors(lessonId: Int!): [User]
     userInfo(username: String!): Session
     isTokenValid(cliToken: String!): Boolean!

diff --git a/pages/exercises/[lessonSlug].tsx b/pages/exercises/[lessonSlug].tsx
@@ -54,10 +54,10 @@ const Exercises: React.FC<QueryDataProps<GetExercisesQuery>> = ({
   const currentExercises = exercises
     .filter(exercise => exercise?.module.lesson.slug === slug)
     .map(exercise => ({
-      challengeName: exercise?.module.name!,
-      problem: exercise?.description!,
-      answer: exercise?.answer!,
-      explanation: exercise?.explanation!
+      challengeName: exercise.module.name,
+      problem: exercise.description,
+      answer: exercise.answer,
+      explanation: exercise.explanation || ''
     }))
 
   const exercise = currentExercises[exerciseIndex]
@@ -66,6 +66,7 @@ const Exercises: React.FC<QueryDataProps<GetExercisesQuery>> = ({
     <Layout title={currentLesson.title}>
       {exercise ? (
         <Exercise
+          key={exerciseIndex}
           exercise={exercise}
           setExerciseIndex={setExerciseIndex}
           lessonTitle={currentLesson.title}