handle reset when no steps or earlier levels

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

Author: ShMcK

src/actions/onRunReset.ts

@@ -17,7 +17,7 @@ const onRunReset = async (action: ResetAction, context: Context) => {
   const position: T.Position = action.position ? action.position : context.position.get()
 
   // get last pass commit
-  const hash: string = getCommitHashByPosition(position, tutorial?.levels || [])
+  const hash: string = getCommitHashByPosition(position, tutorial)
 
   const branch = tutorial?.config.repo.branch
 

src/services/reset/lastHash.test.ts

@@ -5,52 +5,83 @@ import getLastCommitHash from './lastHash'
 describe('lastHash', () => {
   it('should grab the last passing hash from a step', () => {
     const position: T.Position = { levelId: '1', stepId: '1.2' }
-    const levels: TT.Level[] = [
-      {
-        id: '1',
-        title: '',
-        summary: '',
-        content: '',
-        steps: [
-          {
-            id: '1.1',
-            content: '',
-            setup: { commits: ['abcdef1'] },
-          },
-          {
-            id: '1.2',
-            content: '',
-            setup: { commits: ['abcdef2'] },
-          },
-        ],
-      },
-    ]
-    const result = getLastCommitHash(position, levels)
+    // @ts-ignore
+    const tutorial: TT.Tutorial = {
+      levels: [
+        {
+          id: '1',
+          title: '',
+          summary: '',
+          content: '',
+          steps: [
+            {
+              id: '1.1',
+              content: '',
+              setup: { commits: ['abcdef1'] },
+            },
+            {
+              id: '1.2',
+              content: '',
+              setup: { commits: ['abcdef2'] },
+            },
+          ],
+        },
+      ],
+    }
+    const result = getLastCommitHash(position, tutorial)
     expect(result).toBe('abcdef2')
   })
   it('should grab the last passing hash from a step with several commits', () => {
     const position: T.Position = { levelId: '1', stepId: '1.2' }
-    const levels: TT.Level[] = [
-      {
-        id: '1',
-        title: '',
-        summary: '',
-        content: '',
-        steps: [
-          {
-            id: '1.1',
-            content: '',
-            setup: { commits: ['abcdef1'] },
-          },
-          {
-            id: '1.2',
-            content: '',
-            setup: { commits: ['abcdef2', 'abcdef3'] },
+    // @ts-ignore
+    const tutorial: TT.Tutorial = {
+      levels: [
+        {
+          id: '1',
+          title: '',
+          summary: '',
+          content: '',
+          steps: [
+            {
+              id: '1.1',
+              content: '',
+              setup: { commits: ['abcdef1'] },
+            },
+            {
+              id: '1.2',
+              content: '',
+              setup: { commits: ['abcdef2', 'abcdef3'] },
+            },
+          ],
+        },
+      ],
+    }
+    const result = getLastCommitHash(position, tutorial)
+    expect(result).toBe('abcdef3')
+  })
+  it('should grab the last passing hash when level has no steps', () => {
+    const position: T.Position = { levelId: '1', stepId: null }
+    // @ts-ignore
+    const tutorial: TT.Tutorial = {
+      config: {
+        // @ts-ignore
+        testRunner: {
+          setup: {
+            commits: ['abcdef2', 'abcdef3'],
           },
-        ],
+        },
       },
-    ]
-    const result = getLastCommitHash(position, levels)
+      levels: [
+        {
+          id: '1',
+          title: '',
+          summary: '',
+          content: '',
+          steps: [],
+        },
+      ],
+    }
+    const result = getLastCommitHash(position, tutorial)
     expect(result).toBe('abcdef3')
   })
 })

src/services/reset/lastHash.ts

@@ -1,14 +1,42 @@
 import * as TT from '../../../typings/tutorial'
 import * as T from '../../../typings'
 
-const getLastCommitHash = (position: T.Position, levels: TT.Level[]) => {
+const getLastCommitHash = (position: T.Position, tutorial: TT.Tutorial | null) => {
+  if (!tutorial) {
+    throw new Error('No tutorial found')
+  }
+  const { levels } = tutorial
   // get previous position
   const { levelId, stepId } = position
 
-  const level: TT.Level | undefined = levels.find((l) => levelId === l.id)
+  let level: TT.Level | undefined = levels.find((l) => levelId === l.id)
   if (!level) {
     throw new Error(`No level found matching ${levelId}`)
   }
+
+  // handle a level with no steps
+  if (!level.steps || !level.steps.length) {
+    if (level.setup && level.setup.commits) {
+      // return level commit
+      const levelCommits = level.setup.commits
+      return levelCommits[levelCommits.length - 1]
+    } else {
+      // is there a previous level?
+      // @ts-ignore
+      const levelIndex = levels.findIndex((l: TT.Level) => level.id === l.id)
+      if (levelIndex > 0) {
+        level = levels[levelIndex - 1]
+      } else {
+        // use init commit
+        const configCommits = tutorial.config.testRunner.setup?.commits
+        if (!configCommits) {
+          throw new Error('No commits found to reset back to')
+        }
+        return configCommits[configCommits.length - 1]
+      }
+    }
+  }
+
   const step = level.steps.find((s) => stepId === s.id)
   if (!step) {
     throw new Error(`No step found matching ${stepId}`)