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

fix(nova-react-test-utils): bump relay, relax generate types in relay case, add example and docs for working with client extensions #127

Merged
merged 8 commits into from
Oct 25, 2024
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "add example of overriding generate function",
"packageName": "@nova/examples",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@nova-react-2428c3ea-ce99-4fe4-aca6-eda0689d53a3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "bump graphitation packages",
"packageName": "@nova/react",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "relax types for overrding generator",
"packageName": "@nova/react-test-utils",
"email": "[email protected]",
"dependentChangeType": "patch"
}
1 change: 1 addition & 0 deletions packages/examples/codegen.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
overwrite: true
schema:
- "./src/schema.graphql"
- "./src/clientExtensions.graphql"
generates:
src/__generated__/schema.all.interface.ts:
plugins:
Expand Down
15 changes: 8 additions & 7 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"graphql": "^15.5.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-relay": "^17.0.0",
"relay-runtime": "^17.0.0"
"react-relay": "^18.0.0",
sjwilczynski marked this conversation as resolved.
Show resolved Hide resolved
"relay-runtime": "^18.0.0"
},
"devDependencies": {
"@babel/core": "^7.20.2",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
"@graphitation/embedded-document-artefact-loader": "^0.8.0",
"@graphitation/graphql-codegen-typescript-typemap-plugin": "^0.1.6",
"@graphitation/graphql-js-tag": "^0.9.1",
"@graphitation/embedded-document-artefact-loader": "^0.8.5",
"@graphitation/graphql-codegen-typescript-typemap-plugin": "^0.1.9",
"@graphitation/graphql-js-tag": "^0.9.4",
"@graphql-codegen/add": "^4.0.1",
"@graphql-codegen/cli": "^3.2.2",
"@graphql-codegen/typescript": "^3.0.2",
Expand All @@ -54,11 +54,12 @@
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/react-relay": "^16.0.0",
"@types/relay-runtime": "^17.0.0",
"@types/relay-runtime": "^18.0.0",
"esbuild-loader": "^3.0.1",
"monorepo-scripts": "*",
"prop-types": "15.8.1",
"relay-compiler": "^17.0.0",
"relay-compiler": "^18.0.0",
"relay-test-utils": "^18.0.0",
"storybook": "^7.6.19",
"typescript": "^5.6.0"
},
Expand Down
15 changes: 12 additions & 3 deletions packages/examples/relay.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"src": "./src/relay",
"schema": "./src/schema.graphql",
"language": "typescript"
"sources": {
"src/relay": "examples"
},
"projects": {
"examples": {
"language": "typescript",
"schema": "src/schema.graphql",
"schemaExtensions": [
"src/clientExtensions.graphql"
]
}
}
}
18 changes: 18 additions & 0 deletions packages/examples/src/__generated__/schema.all.interface.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions packages/examples/src/clientExtensions.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
extend type Query {
clientExtension: String
viewData: ViewData
}
type ViewData {
viewDataField: String
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 34 additions & 10 deletions packages/examples/src/relay/pure-relay/Feedback.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { graphql } from "react-relay";
import {
getNovaDecorator,
getNovaEnvironmentForStory,
MockPayloadGenerator as PayloadGenerator,
type WithNovaEnvironment,
EventingProvider,
getOperationName,
getOperationType,
type StoryObjWithoutFragmentRefs,
} from "@nova/react-test-utils/relay";
import { MockPayloadGenerator } from "relay-test-utils";
import type { Meta } from "@storybook/react";
import { userEvent, waitFor, within, expect } from "@storybook/test";
import type { TypeMap } from "../../__generated__/schema.all.interface";
Expand All @@ -21,12 +21,23 @@ import { RecordSource, Store } from "relay-runtime";

const schema = getSchema();

const MockPayloadGenerator = new PayloadGenerator(schema);

const novaDecorator = getNovaDecorator(schema, {
getEnvironmentOptions: () => ({
store: new Store(new RecordSource()),
}),
// We add this to verify scenario of using relay's MockPayloadGenerator
generateFunction: (operation, mockResolvers) => {
const result = MockPayloadGenerator.generateWithDefer(
operation,
mockResolvers ?? null,
{
mockClientData: true,
generateDeferredPayload: true,
},
);

return result;
},
});

const meta = {
Expand All @@ -39,11 +50,20 @@ const meta = {
feedback(id: $id) {
...Feedback_feedbackRelayFragment
}
viewData {
...Feedback_viewDataRelayFragment
}
}
`,
variables: { id: "42" },
referenceEntries: {
feedback: (data) => data?.feedback,
viewData: (data) => data?.viewData,
},
resolvers: {
ViewData: () => ({
viewDataField: "View data field",
}),
},
},
} satisfies WithNovaEnvironment<FeedbackStoryRelayQuery, TypeMap>,
Expand Down Expand Up @@ -106,7 +126,7 @@ export const Like: Story = {
const operation = mock.getMostRecentOperation();
await expect(operation).toBeDefined();
});
await mock.resolveMostRecentOperation((operation) => {
mock.resolveMostRecentOperation((operation) => {
return MockPayloadGenerator.generate(operation, likeResolvers);
});
},
Expand All @@ -127,7 +147,7 @@ export const ArtificialFailureToShowcaseDecoratorBehaviorInCaseOfADevCausedError
const operation = mock.getMostRecentOperation();
await expect(operation).toBeDefined();
});
await mock.rejectMostRecentOperation(new Error("Query failed"));
mock.rejectMostRecentOperation(new Error("Query failed"));
},
};

Expand All @@ -152,10 +172,14 @@ export const LikeFailure: Story = {
const operationType = getOperationType(operation);
expect(operationName).toEqual("FeedbackStoryRelayQuery");
expect(operationType).toEqual("query");
await mock.resolveMostRecentOperation((operation) => {
return MockPayloadGenerator.generate(operation, {
Feedback: () => sampleFeedback,
});
mock.resolveMostRecentOperation((operation) => {
return MockPayloadGenerator.generate(
operation,
{
Feedback: () => sampleFeedback,
},
{ mockClientData: true },
);
});
const likeButton = await container.findByRole("button", { name: "Like" });
userEvent.click(likeButton);
Expand All @@ -168,7 +192,7 @@ export const LikeFailure: Story = {
const nextOperationType = getOperationType(nextOperation);
expect(nextOperationName).toEqual("FeedbackComponent_RelayLikeMutation");
expect(nextOperationType).toEqual("mutation");
await mock.rejectMostRecentOperation(new Error("Like failed"));
mock.rejectMostRecentOperation(new Error("Like failed"));
await container.findByText("Something went wrong");
},
};
Expand Down
10 changes: 10 additions & 0 deletions packages/examples/src/relay/pure-relay/Feedback.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ import {
useOnDeleteFeedback,
useFeedbackTelemetry,
} from "../../events/helpers";
import type { Feedback_viewDataRelayFragment$key } from "./__generated__/Feedback_viewDataRelayFragment.graphql";

type Props = {
feedback: Feedback_feedbackRelayFragment$key;
viewData: Feedback_viewDataRelayFragment$key;
};

export const Feedback_feedbackRelayFragment = graphql`
Expand All @@ -21,9 +23,16 @@ export const Feedback_feedbackRelayFragment = graphql`
}
`;

export const Feedback_viewDataRelayFragment = graphql`
fragment Feedback_viewDataRelayFragment on ViewData {
viewDataField
}
`;

export const FeedbackComponent = (props: Props) => {
const [errorMessage, setErrorMessage] = React.useState<string | null>(null);
const feedback = useFragment(Feedback_feedbackRelayFragment, props.feedback);
const viewData = useFragment(Feedback_viewDataRelayFragment, props.viewData);
const [like, isPending] = useMutation<FeedbackComponent_RelayLikeMutation>(
graphql`
mutation FeedbackComponent_RelayLikeMutation($input: FeedbackLikeInput!) {
Expand Down Expand Up @@ -63,6 +72,7 @@ export const FeedbackComponent = (props: Props) => {
<div style={{ color: "red" }}>{errorMessage}</div>
)}
Feedback: {feedback.message.text}
<div>{viewData.viewDataField}</div>
<button
id="likeButton"
disabled={isPending}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading