Commit85f11a4

committed

update tutorials loading for new api

1 parenta5da2d2 commit85f11a4Copy full SHA for 85f11a4

File tree

+31

-23

lines changed

+31

-23

lines changed

Lines changed: 20 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,26 @@ interface Props {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`const TutorialList = (props: Props) => {`
`12`		`-const onSelect = (tutorial: T.Tutorial) => {`
`13`		`-channel.machineSend({`
`14`		`-type: 'TUTORIAL_START',`
`15`		`-payload: {`
`16`		`-tutorial,`
`17`		`-}`
`18`		`-})`
`19`		`-}`
`20`		`-return (`
`21`		`-<div>`
`22`		`-{props.tutorialList.map((tutorial: T.Tutorial) => (`
`23`		`-<TutorialItem`
`24`		`-key={tutorial.id}`
`25`		`-onSelect={() => onSelect(tutorial)}`
`26`		`-title={tutorial.title \|\| ''}`
`27`		`-text={tutorial.text \|\| ''}`
`28`		`-/>`
`29`		`-))}`
`30`		`-</div>`
`31`		`-)`
	`12`	`+const onSelect = (tutorial: T.Tutorial) => {`
	`13`	`+channel.machineSend({`
	`14`	`+type: 'TUTORIAL_START',`
	`15`	`+payload: {`
	`16`	`+tutorial,`
	`17`	`+ },`
	`18`	`+})`
	`19`	`+}`
	`20`	`+return (`
	`21`	`+<div>`
	`22`	`+{props.tutorialList.map((tutorial: T.Tutorial) => (`
	`23`	`+<TutorialItem`
	`24`	`+key={tutorial.id}`
	`25`	`+onSelect={() => onSelect(tutorial)}`
	`26`	`+title={tutorial.version.summary.title \|\| ''}`
	`27`	`+text={tutorial.version.summary.description \|\| ''}`
	`28`	`+/>`
	`29`	`+))}`
	`30`	`+</div>`
	`31`	`+)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`export default TutorialList`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import * as React from 'react'`
`2`	`2`	`import { useQuery } from '@apollo/react-hooks'`
`3`		`-import * asT from 'typings/graphql'`
	`3`	`+import * asG from 'typings/graphql'`
`4`	`4`	`import * as CR from 'typings'`
`5`	`5`
`6`	`6`	`import queryTutorials from '../../services/apollo/queries/tutorials'`
`@@ -9,7 +9,7 @@ import ErrorView from '../../components/Error'`
`9`	`9`	`import TutorialList from './TutorialList'`
`10`	`10`
`11`	`11`	`interface Props {`
`12`		`- tutorialList:T.Tutorial[]`
	`12`	`+ tutorialList:G.Tutorial[]`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export const NewPage = (props: Props) => (`
`@@ -25,8 +25,12 @@ interface ContainerProps {`
`25`	`25`	`send(action: CR.Action): void`
`26`	`26`	`}`
`27`	`27`
	`28`	`+interface TutorialsData {`
	`29`	`+ tutorials: G.Tutorial[]`
	`30`	`+}`
	`31`	`+`
`28`	`32`	`const NewPageContainer = (props: ContainerProps) => {`
`29`		`- const { data, loading, error } = useQuery(queryTutorials)`
	`33`	`+ const { data, loading, error } = useQuery<TutorialsData>(queryTutorials)`
`30`	`34`	`if (loading) {`
`31`	`35`	`return <Loading />`
`32`	`36`	`}`
`@@ -35,6 +39,10 @@ const NewPageContainer = (props: ContainerProps) => {`
`35`	`39`	`return <ErrorView error={error} />`
`36`	`40`	`}`
`37`	`41`
	`42`	`+ if (!data) {`
	`43`	`+ return null`
	`44`	`+ }`
	`45`	`+`
`38`	`46`	`return (`
`39`	`47`	`<React.Suspense fallback={Loading}>`
`40`	`48`	`<NewPage tutorialList={data.tutorials} />`

Comments

(0)