reset to position

ShMcK · ShMcK · commit c30e11d8b2f5 · 2020-07-26T21:42:23.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -2,7 +2,7 @@ export { default as onStartup } from './onStartup'
 export { default as onTutorialConfig } from './onTutorialConfig'
 export { default as onTutorialContinueConfig } from './onTutorialContinueConfig'
 export { default as onValidateSetup } from './onValidateSetup'
-export { default as onRunLatestReset } from './onRunLatestReset'
+export { default as onRunReset } from './onRunReset'
 export { default as onErrorPage } from './onErrorPage'
 export { onRunTest, onTestPass } from './onTest'
 export { onSetupActions, onSolutionActions } from './onActions'
diff --git a/src/actions/onRunReset.ts b/src/actions/onRunReset.ts
@@ -3,16 +3,21 @@ import * as TT from 'typings/tutorial'
 import Context from '../services/context/context'
 import { exec } from '../services/node'
 import reset from '../services/reset'
-import getLastCommitHash from '../services/reset/lastHash'
+import getCommitHashByPosition from '../services/reset/lastHash'
+
+type ResetAction = {
+  type: 'LATEST' | 'POSITION'
+  position?: T.Position
+}
 
 // reset to the start of the last test
-const onRunLatestReset = async (context: Context) => {
+const onRunReset = async (action: ResetAction, context: Context) => {
   // reset to timeline
   const tutorial: TT.Tutorial | null = context.tutorial.get()
-  const position: T.Position = context.position.get()
+  const position: T.Position = action.position ? action.position : context.position.get()
 
   // get last pass commit
-  const hash = getLastCommitHash(position, tutorial?.levels || [])
+  const hash: string = getCommitHashByPosition(position, tutorial?.levels || [])
 
   const branch = tutorial?.config.repo.branch
 
@@ -30,4 +35,4 @@ const onRunLatestReset = async (context: Context) => {
   }
 }
 
-export default onRunLatestReset
+export default onRunReset
diff --git a/src/channel.ts b/src/channel.ts
@@ -79,8 +79,11 @@ class Channel implements Channel {
       case 'EDITOR_RUN_TEST':
         actions.onRunTest(action)
         return
-      case 'EDITOR_RUN_RESET':
-        actions.onRunLatestReset(this.context)
+      case 'EDITOR_RUN_RESET_LATEST':
+        actions.onRunReset({ type: 'LATEST' }, this.context)
+        return
+      case 'EDITOR_RUN_RESET_POSITION':
+        actions.onRunReset({ type: 'POSITION', position: action.payload.position }, this.context)
         return
       default:
         logger(`No match for action type: ${actionType}`)
diff --git a/web-app/src/services/state/actions/editor.ts b/web-app/src/services/state/actions/editor.ts
@@ -119,7 +119,7 @@ export default (editorSend: any) => ({
   },
   runReset() {
     editorSend({
-      type: 'EDITOR_RUN_RESET',
+      type: 'EDITOR_RUN_RESET_LATEST',
     })
   },
 })
