Merge pull request #413 from coderoad/fix/admin-review

ShMcK · web-flow · commit 4c8eb65748ca · 2020-07-27T20:22:37.000-07:00
Fix/admin review
diff --git a/web-app/src/containers/Tutorial/containers/Review.tsx b/web-app/src/containers/Tutorial/containers/Review.tsx
@@ -93,16 +93,19 @@ const ReviewPage = (props: Props) => {
                   return show(step.status) ? (
                     <div key={step.id}>
                       {adminMode && (
-                        <div css={styles.adminNav}>
-                          <Button
-                            type="normal"
-                            warning
-                            onClick={() => props.onResetToPosition({ levelId: level.id, stepId: step.id })}
-                          >
-                            {step.id}&nbsp;
-                            <Icon type="refresh" />
-                          </Button>
-                        </div>
+                        <>
+                          <div css={styles.adminNav}>
+                            <Button
+                              type="normal"
+                              warning
+                              onClick={() => props.onResetToPosition({ levelId: level.id, stepId: step.id })}
+                            >
+                              {step.id}&nbsp;
+                              <Icon type="refresh" />
+                            </Button>
+                          </div>
+                          <br />
+                        </>
                       )}
                       <Step
                         key={step.id}
diff --git a/web-app/src/containers/Tutorial/formatLevels.ts b/web-app/src/containers/Tutorial/formatLevels.ts
@@ -37,6 +37,7 @@ const formatLevels = ({ progress, position, levels, testStatus }: Input): Output
     stepIndex = levels[levelIndex].steps.length
   }
 
+  // current level
   const levelUI: T.LevelUI = {
     ...currentLevel,
     status: progress.levels[position.levelId] ? 'COMPLETE' : 'ACTIVE',
@@ -80,6 +81,7 @@ const formatLevels = ({ progress, position, levels, testStatus }: Input): Output
     }),
   }
 
+  // flag all levels before as complete
   const completed: T.LevelUI[] = levels.slice(0, levelIndex).map((level: TT.Level) => ({
     ...level,
     status: 'COMPLETE',
@@ -90,6 +92,7 @@ const formatLevels = ({ progress, position, levels, testStatus }: Input): Output
     })),
   }))
 
+  // flag all levels after as incomplete
   const incompleted: T.LevelUI[] = levels.slice(levelIndex + 1, levels.length).map((level: TT.Level) => ({
     ...level,
     status: 'INCOMPLETE',
diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts
@@ -141,6 +141,12 @@ export const createMachine = (options: any) => {
         Tutorial: {
           id: 'tutorial',
           initial: 'Level',
+          on: {
+            RUN_RESET_TO_POSITION: {
+              actions: ['runResetToPosition'],
+              target: 'Tutorial.Level',
+            },
+          },
           states: {
             Level: {
               initial: 'Load',
@@ -171,9 +177,6 @@ export const createMachine = (options: any) => {
                     RUN_RESET: {
                       actions: ['runReset'],
                     },
-                    RUN_RESET_TO_POSITION: {
-                      actions: ['runResetToPosition'],
-                    },
                     KEY_PRESS_ENTER: {
                       actions: ['runTest'],
                     },
