Skip to content
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
2 changes: 1 addition & 1 deletion issue-tracker-next-v13/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
}
34 changes: 0 additions & 34 deletions issue-tracker-next-v13/app/MainViewClientComponent.tsx

This file was deleted.

This file was deleted.

47 changes: 32 additions & 15 deletions issue-tracker-next-v13/app/issues/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
import loadSerializableQuery from "src/relay/loadSerializableQuery";
import IssueQueryNode, { IssueQuery } from "__generated__/IssueQuery.graphql";
import IssueViewClientComponent from "./IssueViewClientComponent";
import styles from "styles/Issue.module.css";
import { pageIssueQuery } from "__generated__/pageIssueQuery.graphql";
import fetchQuery from "src/relay/fetchQuery";
import { graphql } from "relay-runtime";
import IssueComponent from "src/components/IssueComponent";
import { Suspense } from "react";
import RelayServerEnvironment from "src/relay/RelayServerEnvironment";

export default async function IssuePage({
params,
}: {
params: { id: string };
}) {
const preloadedQuery = await loadSerializableQuery<
typeof IssueQueryNode,
IssueQuery
>(IssueQueryNode.params, {
owner: "facebook",
name: "relay",
issueNumber: parseInt(params.id, 10),
});

const response = fetchQuery<pageIssueQuery>(
RelayServerEnvironment,
graphql`
query pageIssueQuery(
$owner: String!
$name: String!
$issueNumber: Int!
) {
repository(owner: $owner, name: $name) {
issue(number: $issueNumber) {
...IssueComponentFragment
}
}
}
`,
{
owner: "facebook",
name: "relay",
issueNumber: parseInt(params.id, 10),
}
);
return (
<div className={styles.issue}>
<IssueViewClientComponent preloadedQuery={preloadedQuery} />
</div>
<Suspense fallback={"Loading..."}>
<div className={styles.issue}>
<IssueComponent issue={(await response).repository?.issue ?? null} />
</div>
</Suspense>
);
}
57 changes: 40 additions & 17 deletions issue-tracker-next-v13/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
import loadSerializableQuery from "src/relay/loadSerializableQuery";
import { Suspense } from "react";
import { graphql } from "relay-runtime";
import fetchQuery from "src/relay/fetchQuery";
import styles from "styles/MainView.module.css";
import MainViewQueryNode, {
MainViewQuery,
} from "__generated__/MainViewQuery.graphql";
import MainViewClientComponent from "./MainViewClientComponent";
import { pageMainViewQuery } from "__generated__/pageMainViewQuery.graphql";

import RelayRoot from "src/relay/RelayRoot";

import RelayServerEnvironment from "src/relay/RelayServerEnvironment";
import Issues from "src/components/Issues";

// This is a server only component. FetchQuery is never executed on the client
// we're passing serializable fragment key (+ we include extra information about fetched queries)
// so we can process them on the client (add client components can also
const Page = async () => {
const preloadedQuery = await loadSerializableQuery<
typeof MainViewQueryNode,
MainViewQuery
>(MainViewQueryNode.params, {
owner: "facebook",
name: "relay",
});
const data = await fetchQuery<pageMainViewQuery>(
RelayServerEnvironment,
graphql`
query pageMainViewQuery($owner: String!, $name: String!) {
repository(owner: $owner, name: $name) {
owner {
login
}
name
...IssuesFragment
}
}
`,
{
owner: "facebook",
name: "relay",
}
);

return (
<div className={styles.main}>
<MainViewClientComponent preloadedQuery={preloadedQuery} />
</div>
<Suspense fallback="Loading...">
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should likely be a loading.tsx instead since that will show up earlier than the suspense fallback for pages.

https://beta.nextjs.org/docs/routing/loading-ui. The "Good to know" section:

"Navigation is immediate, even with server-centric routing."

<div className={styles.main}>
<h1>
{data.repository?.owner.login}/{data.repository?.name}
</h1>
<RelayRoot>
<Issues issues={data.repository ?? null} />
</RelayRoot>
</div>
</Suspense>
);
};

export default Page;

export const revalidate = 0;
Loading