Skip to content

Feature/remove progress #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Aug 1, 2020
Merged

Feature/remove progress #414

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7766d82
remove progress progress
ShMcK Jul 31, 2020
79f0fba
setup getProgress tests
ShMcK Jul 31, 2020
7340962
fix getProgress issue
ShMcK Jul 31, 2020
63fbbf7
remove unused actions
ShMcK Jul 31, 2020
0e81b82
sync position when loading next
ShMcK Jul 31, 2020
16accb5
load to exact point on continue
ShMcK Jul 31, 2020
fae55a8
remove unusued
ShMcK Jul 31, 2020
99a6f70
remove progress selectors
ShMcK Jul 31, 2020
3983bda
fix issue when continue history is unusable
ShMcK Aug 1, 2020
17e968f
remove progress progress (progressing)
ShMcK Aug 1, 2020
bd96f17
remove unused states
ShMcK Aug 1, 2020
aad32f3
fix issues with stepNext
ShMcK Aug 1, 2020
23082a4
working version without progress
ShMcK Aug 1, 2020
3cffd7f
fix stepNext tests
ShMcK Aug 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unused states 
Signed-off-by: shmck <[email protected]>
  • Loading branch information
@ShMcK
ShMcK committed Aug 1, 2020
commit bd96f17c23a1ce6a7b7e7eb68475e46ffdd70b45
2 changes: 0 additions & 2 deletions typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ export interface MachineStateSchema {
Load: {}
Normal: {}
TestRunning: {}
TestPass: {}
TestFail: {}
StepNext: {}
LevelComplete: {}
LoadNext: {}
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/containers/Tutorial/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const styles = {
interface PageProps {
context: T.MachineContext
send(action: T.Action): void
state: string // 'Normal' | 'TestRunning' | 'TestFail' | 'TestPass' | 'Level.LevelComplete'
state: string // 'Normal' | 'TestRunning' | 'Level.LevelComplete'
}

/**
Expand Down
19 changes: 4 additions & 15 deletions web-app/src/services/state/machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,30 +180,19 @@ export const createMachine = (options: any) => {
onEntry: ['testStart'],
on: {
TEST_PASS: {
target: 'TestPass',
actions: ['testPass'],
target: 'StepNext',
actions: ['testPass', 'updateStepPosition'],
},
TEST_FAIL: {
target: 'TestFail',
target: 'Normal',
actions: ['testFail'],
},
TEST_ERROR: {
target: 'TestFail',
target: 'Normal',
actions: ['testFail'],
},
},
},
TestPass: {
onExit: ['updateStepPosition'],
after: {
0: 'StepNext',
},
},
TestFail: {
after: {
0: 'Normal',
},
},
StepNext: {
onEntry: ['stepNext'],
on: {
Expand Down