Skip to content
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.

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

[Example] remove getInitialProps from aws-amplify #13896

Merged
merged 10 commits into from
Jun 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions examples/with-aws-amplify-typescript/pages/todo/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const getStaticPaths = async () => {
graphqlOperation(getTodoList, { id: 'global' })
)) as { data: GetTodoListQuery; errors: any[] }
if (result.errors) {
console.error('Failed to fetch todo.', result.errors)
console.error('Failed to fetch todos paths.', result.errors)
throw new Error(result.errors[0].message)
}
const paths = result.data.getTodoList.todos.items.map(({ id }) => ({
Expand All @@ -35,7 +35,7 @@ export const getStaticProps = async ({ params: { id } }) => {
variables: { id },
})) as { data: GetTodoQuery; errors: any[] }
if (todo.errors) {
console.error(todo.errors)
console.error('Failed to fetch todo.', todo.errors)
throw new Error(todo.errors[0].message)
}
return {
Expand Down
4 changes: 2 additions & 2 deletions examples/with-aws-amplify/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This example shows how to build a server rendered web application with NextJS an

Two routes are implemented :

- `/` : A static route that uses getInitialProps to load data from AppSync and renders it on the server (Code in [pages/index.js](/pages/index.js))
- `/todo/[id]` : A dynamic route that uses getInitialProps and the id from the provided context to load a single todo from AppSync and render it on the server. (Code in [pages/todo/:[id].js](/pages/todo/[id].js))
- `/` : A static route that uses `getStaticProps` to load data from AppSync and renders it on the server (Code in [pages/index.js](/pages/index.js))
- `/todo/[id]` : A dynamic route that uses `getServerSideProps` and the id from the provided context to load a single todo from AppSync and render it on the server. (Code in [pages/todo/:[id].js](/pages/todo/[id].js))

## How to use

Expand Down
14 changes: 5 additions & 9 deletions examples/with-aws-amplify/package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
{
"name": "with-aws-amplify",
"version": "1.0.0",
"description": "",
"scripts": {
"dev": "next",
"build": "next build",
"start": "next start"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"aws-amplify": "1.1.32",
"aws-amplify": "2.1.0",
"immer": "3.1.3",
"nanoid": "2.0.3",
"next": "^9.0.2",
"react": "^16.8.6",
"react-dom": "^16.8.6"
},
"devDependencies": {}
"next": "^latest",
"react": "16.13.1",
"react-dom": "16.13.1"
}
}
40 changes: 24 additions & 16 deletions examples/with-aws-amplify/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,30 +111,38 @@ const App = (props) => {
</div>
)
}
App.getInitialProps = async () => {

export const getStaticProps = async () => {
let result = await API.graphql(
graphqlOperation(getTodoList, { id: 'global' })
)

if (result.errors) {
console.log('Failed to fetch todolist. ', result.errors)
return { todos: [] }
console.log('Failed to fetch todolist.', result.errors)
throw new Error(result.errors[0].message)
}
if (result.data.getTodoList !== null) {
return { todos: result.data.getTodoList.todos.items }
return {
props: {
todos: result.data.getTodoList.todos.items,
},
}
}

try {
await API.graphql(
graphqlOperation(createTodoList, {
input: {
id: 'global',
createdAt: `${Date.now()}`,
},
})
)
} catch (err) {
console.warn(err)
await API.graphql(
graphqlOperation(createTodoList, {
input: {
id: 'global',
createdAt: `${Date.now()}`,
},
})
)

return {
props: {
todos: [],
},
}
return { todos: [] }
}

export default App
45 changes: 28 additions & 17 deletions examples/with-aws-amplify/pages/todo/[id].js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { API, graphqlOperation } from 'aws-amplify'

import { getTodo } from '../../src/graphql/queries'
import { getTodo, getTodoList } from '../../src/graphql/queries'
import config from '../../src/aws-exports'

API.configure(config)
Expand All @@ -14,21 +13,33 @@ const TodoPage = (props) => {
)
}

TodoPage.getInitialProps = async (context) => {
const { id } = context.query
try {
const todo = await API.graphql({
...graphqlOperation(getTodo),
variables: { id },
})
if (todo.errors) {
console.log('Failed to fetch todo. ', todo.errors)
return { todo: {} }
}
return { todo: todo.data.getTodo }
} catch (err) {
console.log('Failed to fetch todo. ', err)
return { todo: {} }
export const getStaticPaths = async () => {
let result = await API.graphql(
graphqlOperation(getTodoList, { id: 'global' })
)
if (result.errors) {
console.log('Failed to fetch todos paths.', result.errors)
throw new Error(result.errors[0].message)
}
const paths = result.data.getTodoList.todos.items.map(({ id }) => ({
params: { id },
}))
return { paths, fallback: false }
}

export const getStaticProps = async ({ params: { id } }) => {
const todo = await API.graphql({
...graphqlOperation(getTodo),
variables: { id },
})
if (todo.errors) {
console.log('Failed to fetch todo.', todo.errors)
throw new Error(todo.errors[0].message)
}
return {
props: {
todo: todo.data.getTodo,
},
}
}

Expand Down