Commitb4dff54

committed

load json file

1 parentf85afd1 commitb4dff54Copy full SHA for b4dff54

File tree

+26

-17

lines changed

+26

-17

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import Loading from '../Loading'`
`5`	`5`
`6`	`6`	`interfaceProps{`
`7`	`7`	`url:string`
`8`		`-onSetDataFromUrl(data:TT.Tutorial):void`
	`8`	`+onLoadSummary(data:TT.Tutorial):void`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`constLoadTutorialSummary=(props:Props)=>{`
`@@ -20,7 +20,7 @@ const LoadTutorialSummary = (props: Props) => {`
`20`	`20`	`if(!data){`
`21`	`21`	`return<div>No data returned for tutorial</div>`
`22`	`22`	`}`
`23`		`-props.onSetDataFromUrl(data)`
	`23`	`+props.onLoadSummary(data)`
`24`	`24`	`returnnull`
`25`	`25`	`}`
`26`	`26`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import*asTTfrom'typings/tutorial'`
`1`	`2`	`import*asReactfrom'react'`
`2`	`3`	`import{Radio}from'@alifd/next'`
`3`	`4`	`importTutorialSelectfrom'./forms/TutorialSelect'`
`@@ -16,7 +17,8 @@ interface Props {`
`16`	`17`	`tab:string`
`17`	`18`	`setTab(tab:'list'\|'url'):void`
`18`	`19`	`url:string\|null`
`19`		`-onTutorialLoad(url:string):void`
	`20`	`+onTutorialLoadFromUrl(url:string):void`
	`21`	`+onLoadSummary(data:TT.Tutorial\|null):void`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`constSelectTutorialForm=(props:Props)=>{`
`@@ -35,9 +37,9 @@ const SelectTutorialForm = (props: Props) => {`
`35`	`37`	`</Radio.Group>`
`36`	`38`	`<br/>`
`37`	`39`	`<br/>`
`38`		`-{props.tab==='list'&&<TutorialSelectonTutorialLoad={props.onTutorialLoad}/>}`
`39`		`-{props.tab==='url'&&<TutorialUrlonTutorialLoad={props.onTutorialLoad}defaultUrl={props.url\|\|''}/>}`
`40`		`-{props.tab==='file'&&<TutorialFileonTutorialLoad={props.onTutorialLoad}/>}`
	`40`	`+{props.tab==='list'&&<TutorialSelectonTutorialLoad={props.onTutorialLoadFromUrl}/>}`
	`41`	`+{props.tab==='url'&&<TutorialUrlonTutorialLoad={props.onTutorialLoadFromUrl}defaultUrl={props.url\|\|''}/>}`
	`42`	`+{props.tab==='file'&&<TutorialFileonLoadSummary={props.onLoadSummary}/>}`
`41`	`43`	`</div>`
`42`	`44`	`)`
`43`	`45`	`}`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`	`1`	`import*asReactfrom'react'`
	`2`	`+import*asTTfrom'typings/tutorial'`
`2`	`3`	`import{Form}from'@alifd/next'`
`3`	`4`
`4`	`5`	`constFormItem=Form.Item`
`5`	`6`
`6`	`7`	`interfaceProps{`
`7`		`-onTutorialLoad(url:string):void`
	`8`	`+onLoadSummary(data:TT.Tutorial):void`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`constTutorialFile=(props:Props)=>{`
`11`		`-const[json,setJson]=React.useState<JSON\|null>(null)`
`12`		`-`
`13`	`12`	`constonChange=(evt:any)=>{`
`14`	`13`	`constfiles=evt.target.files`
`15`	`14`
`@@ -20,9 +19,9 @@ const TutorialFile = (props: Props) => {`
`20`	`19`	`constuploadedFile=files[0]`
`21`	`20`	`constreader=newFileReader()`
`22`	`21`	`reader.onload=(e:any)=>{`
`23`		`-// TODO: handle errors frombad JSON`
`24`		`-constfileJson:JSON=JSON.parse(e.target.result)`
`25`		`-setJson(fileJson)`
	`22`	`+// TODO: handle errors frominvalid JSON`
	`23`	`+constfileJson:TT.Tutorial=JSON.parse(e.target.result)`
	`24`	`+props.onLoadSummary(fileJson)`
`26`	`25`	`}`
`27`	`26`	`reader.readAsText(uploadedFile)`
`28`	`27`	`}`
`@@ -32,7 +31,7 @@ const TutorialFile = (props: Props) => {`
`32`	`31`	`<FormItemlabel="Load coderoad config.json">`
`33`	`32`	`<inputtype="file"accept="application/json"onChange={onChange}/>`
`34`	`33`	`</FormItem>`
`35`		`-  `
	`34`	`+<br/>`
`36`	`35`	`</Form>`
`37`	`36`	`)`
`38`	`37`	`}`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ const SelectTutorialPage = (props: Props) => {`
`34`	`34`	`},`
`35`	`35`	`})`
`36`	`36`	`}`
`37`		`-constonTutorialLoad=(url:string)=>{`
	`37`	`+constonTutorialLoadFromUrl=(url:string)=>{`
`38`	`38`	`setUrl(url)`
`39`	`39`	`setPage('loading')`
`40`	`40`	`}`
`41`		`-constonSetDataFromUrl=(d:TT.Tutorial)=>{`
	`41`	`+constonLoadSummary=(d:TT.Tutorial)=>{`
`42`	`42`	`setData(d)`
`43`	`43`	`setPage('summary')`
`44`	`44`	`}`
`@@ -48,8 +48,16 @@ const SelectTutorialPage = (props: Props) => {`
`48`	`48`	`}`
`49`	`49`	`return(`
`50`	`50`	`<divcss={styles.page}>`
`51`		`-{page==='form'&&<SelectTutorialFormurl={url}onTutorialLoad={onTutorialLoad}tab={tab}setTab={setTab}/>}`
`52`		`-{page==='loading'&&url&&<LoadTutorialSummaryurl={url}onSetDataFromUrl={onSetDataFromUrl}/>}`
	`51`	`+{page==='form'&&(`
	`52`	`+<SelectTutorialForm`
	`53`	`+url={url}`
	`54`	`+onLoadSummary={onLoadSummary}`
	`55`	`+onTutorialLoadFromUrl={onTutorialLoadFromUrl}`
	`56`	`+tab={tab}`
	`57`	`+setTab={setTab}`
	`58`	`+/>`
	`59`	`+)}`
	`60`	`+{page==='loading'&&url&&<LoadTutorialSummaryurl={url}onLoadSummary={onLoadSummary}/>}`
`53`	`61`	`{page==='summary'&&data&&<TutorialOverviewonNext={onNext}tutorial={data}onClear={onClear}/>}`
`54`	`62`	`</div>`
`55`	`63`	`)`

Comments

(0)