kayodebristol
diff --git a/‎src/channel/index.ts
Lines changed: 9 additions & 3 deletions b/‎src/channel/index.ts
Lines changed: 9 additions & 3 deletions
diff --git a/‎src/services/git/lastHash.test.ts
Lines changed: 56 additions & 0 deletions b/‎src/services/git/lastHash.test.ts
Lines changed: 56 additions & 0 deletions
diff --git a/‎src/services/git/lastHash.ts
Lines changed: 23 additions & 0 deletions b/‎src/services/git/lastHash.ts
Lines changed: 23 additions & 0 deletions
diff --git a/‎src/services/git/lastPass.ts
Lines changed: 0 additions & 12 deletions b/‎src/services/git/lastPass.ts
Lines changed: 0 additions & 12 deletions
diff --git a/‎typings/tutorial.d.ts
Lines changed: 1 addition & 1 deletion b/‎typings/tutorial.d.ts
Lines changed: 1 addition & 1 deletion
@@ -18,6 +18,7 @@ import { openWorkspace, checkWorkspaceEmpty } from '../services/workspace'
 import { showOutput } from '../services/testRunner/output'
 import { exec } from '../services/node'
 import { WORKSPACE_ROOT, TUTORIAL_URL } from '../environment'
+import getLastCommitHash from '../services/git/lastHash'
 
 const readFileAsync = promisify(readFile)
 
@@ -322,11 +323,16 @@ class Channel implements Channel {
         return
       case 'EDITOR_RUN_RESET':
         // reset to timeline
-        // 1. get last pass commit
-        // 2. load timeline until last pass commit
+        const tutorial: TT.Tutorial | null = this.context.tutorial.get()
+        const position: T.Position = this.context.position.get()
+
+        // get last pass commit
+        const hash = getLastCommitHash(position, tutorial?.levels || [])
+
+        // load timeline until last pass commit
+        // TODO: run reset script
 
         // if tutorial.config.reset.command, run it
-        const tutorial: TT.Tutorial | null = this.context.tutorial.get()
         if (tutorial?.config?.reset?.command) {
           await exec({ command: tutorial.config.reset.command })
         }
 
@@ -0,0 +1,56 @@
+import * as TT from '../../../typings/tutorial'
+import * as T from '../../../typings'
+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)
+    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: [
+          {
+            content: '',
+            setup: { commits: ['abcdef1'] },
+          },
+          {
+            id: '1.2',
+            content: '',
+            setup: { commits: ['abcdef2', 'abcdef3'] },
+          },
+        ],
+      },
+    ]
+    const result = getLastCommitHash(position, levels)
+    expect(result).toBe('abcdef3')
+  })
+})
@@ -0,0 +1,23 @@
+import * as TT from '../../../typings/tutorial'
+import * as T from '../../../typings'
+
+const getLastCommitHash = (position: T.Position, levels: TT.Level[]) => {
+  // get previous position
+  const { levelId, stepId } = position
+
+  const level: TT.Level | undefined = levels.find((l) => levelId === l.id)
+  if (!level) {
+    throw new Error(`No level found matching ${levelId}`)
+  }
+  const step = level.steps.find((s) => stepId === s.id)
+  if (!step) {
+    throw new Error(`No step found matching ${stepId}`)
+  }
+  const commits = step.setup.commits
+  if (!commits.length) {
+    throw new Error(`No commits found on step ${stepId}`)
+  }
+  return commits[commits.length - 1]
+}
+
+export default getLastCommitHash
@@ -34,7 +34,7 @@ export type Step = {
   id: string
   content: string
   setup: StepActions
-  solution: Maybe<StepActions>
+  solution?: Maybe<StepActions>
   hints?: string[]
   subtasks?: string[]
 }