File tree Expand file tree Collapse file tree 4 files changed +44
-21
lines changed
components/ProcessMessages Expand file tree Collapse file tree 4 files changed +44
-21
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ import { css, jsx } from '@emotion/core'
55import TestMessage from './TestMessage'
66
77interface Props {
8- testStatus : T . TestStatus | null
8+ testStatus ? : T . TestStatus | null
99 processes : T . ProcessEvent [ ]
1010}
1111
Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ import * as React from 'react'
22import * as T from 'typings'
33import { css , jsx } from '@emotion/core'
44import Loading from '../../components/Loading'
5+ import ProcessMessages from 'components/ProcessMessages'
56
67interface Props {
78 text : string
@@ -12,11 +13,19 @@ const styles = {
1213 page : {
1314 position : 'relative' as 'relative' ,
1415 display : 'flex' ,
16+ flexDirection : 'column' ,
1517 alignItems : 'center' ,
1618 justifyContent : 'center' ,
1719 height : '100%' ,
1820 width : '100%' ,
1921 } ,
22+ processes : {
23+ padding : '0 1rem' ,
24+ position : 'fixed' as 'fixed' ,
25+ bottom : 0 ,
26+ left : 0 ,
27+ right : 0 ,
28+ } ,
2029}
2130
2231const LoadingPage = ( { text, processes } : Props ) => {
@@ -37,11 +46,14 @@ const LoadingPage = ({ text, processes }: Props) => {
3746 return null
3847 }
3948
40- const message : string = processes && processes . length ? processes [ 0 ] . title : text
41-
4249 return (
4350 < div css = { styles . page } >
44- < Loading message = { message } />
51+ < Loading message = { text } />
52+ { processes && processes . length && (
53+ < div css = { styles . processes } >
54+ < ProcessMessages processes = { processes } />
55+ </ div >
56+ ) }
4557 </ div >
4658 )
4759}
Original file line number Diff line number Diff line change @@ -29,6 +29,22 @@ export const createMachine = (options: any) => {
2929 processes : [ ] ,
3030 testStatus : null ,
3131 } ,
32+ on : {
33+ // track commands
34+ COMMAND_START : {
35+ actions : [ 'commandStart' ] ,
36+ } ,
37+ COMMAND_SUCCESS : {
38+ actions : [ 'commandSuccess' ] ,
39+ } ,
40+ COMMAND_FAIL : {
41+ actions : [ 'commandFail' ] ,
42+ } ,
43+ ERROR : {
44+ // TODO: missing clearError
45+ actions : [ 'setError' ] ,
46+ } ,
47+ } ,
3248 states : {
3349 Setup : {
3450 initial : 'Startup' ,
@@ -121,22 +137,6 @@ export const createMachine = (options: any) => {
121137 Tutorial : {
122138 id : 'tutorial' ,
123139 initial : 'Level' ,
124- on : {
125- // track commands
126- COMMAND_START : {
127- actions : [ 'commandStart' ] ,
128- } ,
129- COMMAND_SUCCESS : {
130- actions : [ 'commandSuccess' ] ,
131- } ,
132- COMMAND_FAIL : {
133- actions : [ 'commandFail' ] ,
134- } ,
135- ERROR : {
136- // TODO: missing clearError
137- actions : [ 'setError' ] ,
138- } ,
139- } ,
140140 states : {
141141 LoadNext : {
142142 id : 'tutorial-load-next' ,
Original file line number Diff line number Diff line change 11import { storiesOf } from '@storybook/react'
2+ import * as T from '../../typings'
23import React from 'react'
34import LoadingPage from '../src/containers/Loading'
45import SideBarDecorator from './utils/SideBarDecorator'
56
67storiesOf ( 'Components' , module )
78 . addDecorator ( SideBarDecorator )
8- . add ( 'Loading' , ( ) => < LoadingPage text = "Content" context = { { } } /> )
9+ . add ( 'Loading' , ( ) => < LoadingPage text = "Content" /> )
10+ . add ( 'Loading processes' , ( ) => {
11+ const processes : T . ProcessEvent [ ] = [
12+ {
13+ title : 'title' ,
14+ description : 'description...' ,
15+ status : 'RUNNING' ,
16+ } ,
17+ ]
18+ return < LoadingPage text = "Content" processes = { processes } />
19+ } )
You can’t perform that action at this time.
0 commit comments