update subtask schema

ShMcK · ShMcK · commit ed664e341acb · 2020-07-05T16:12:51.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/services/testRunner/index.ts b/src/services/testRunner/index.ts
@@ -112,7 +112,7 @@ const createTestRunner = (data: TT.Tutorial, callbacks: Callbacks) => {
           summary: tap.summary,
         }
 
-        if (step.setup.subtasks) {
+        if (step.subtasks) {
           const subtaskSummary = parseSubtasks(tap.summary, position.stepId || '')
 
           callbacks.onFail(position, {
diff --git a/typings/tutorial.d.ts b/typings/tutorial.d.ts
@@ -27,8 +27,8 @@ export type Step = {
   content: string
   setup: StepActions
   solution: Maybe<StepActions>
-  subtasks?: { [index: number]: boolean }
   hints?: string[]
+  subtasks?: string[]
 }
 
 /** A tutorial for use in VSCode CodeRoad */
@@ -52,7 +52,6 @@ export type StepActions = {
   files?: string[]
   watchers?: string[]
   filter?: string
-  subtasks?: string[]
 }
 
 export interface TestRunnerArgs {
diff --git a/web-app/src/containers/Tutorial/components/Level.tsx b/web-app/src/containers/Tutorial/components/Level.tsx
@@ -199,8 +199,8 @@ const Level = ({
                   return null
                 }
                 let subtasks = null
-                if (step?.setup?.subtasks) {
-                  subtasks = step.setup.subtasks.map((subtask: string, subtaskIndex: number) => ({
+                if (step?.subtasks) {
+                  subtasks = step.subtasks.map((subtask: string, subtaskIndex: number) => ({
                     name: subtask,
                     pass: !!(testStatus?.summary ? testStatus.summary[subtaskIndex] : false),
                   }))
diff --git a/web-app/src/services/state/actions/editor.ts b/web-app/src/services/state/actions/editor.ts
@@ -57,7 +57,7 @@ export default (editorSend: any) => ({
         },
       })
 
-      if (step.setup.subtasks) {
+      if (step.subtasks) {
         // load subtask summary by running tests and parsing result
         editorSend({
           type: 'EDITOR_RUN_TEST',

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ const createTestRunner = (data: TT.Tutorial, callbacks: Callbacks) => {`
`112`	`112`	`summary: tap.summary,`
`113`	`113`	`}`
`114`	`114`
`115`		`- if (step.setup.subtasks) {`
	`115`	`+ if (step.subtasks) {`
`116`	`116`	`const subtaskSummary = parseSubtasks(tap.summary, position.stepId \|\| '')`
`117`	`117`
`118`	`118`	`callbacks.onFail(position, {`