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.

Sign up for GitHub

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 type for codegen #578

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Fix type for codegen #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5d9c5d
fix: convert Thumbnail to tsx to make graphql-codegen happy
MrOrz Sep 29, 2024
5a2f69c
fix(components): Thumbnail prop type
MrOrz Sep 29, 2024
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
18 changes: 11 additions & 7 deletions components/Thumbnail.js → components/Thumbnail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import gql from 'graphql-tag';
import { t } from 'ttag';
import { makeStyles } from '@material-ui/core/styles';
import { ThumbnailArticleDataFragment } from 'typegen/graphql';
import cx from 'clsx';

import { ellipsis } from 'lib/text';
Expand All @@ -12,18 +13,21 @@ const useStyles = makeStyles(() => ({
},
}));

/**
*
* @param {ThumbnailArticleData} props.article
* @param {string} props.className - for replaced elements like image and video
*/
function Thumbnail({ article, className }) {
type Props = {
article: ThumbnailArticleDataFragment;
className?: string;
};

function Thumbnail({
article,
className /* for replaced elements like image and video */,
}: Props) {
const classes = useStyles();
const thumbnailCls = cx(classes.thumbnail, className);

switch (article.articleType) {
case 'IMAGE': {
const altText = ellipsis(article.text ?? '', { wordCount: 40 });
const altText = ellipsis(article.text || '', { wordCount: 40 });
return (
<img
className={thumbnailCls}
Expand Down
9 changes: 7 additions & 2 deletions typegen/gql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
* Therefore it is highly recommended to use the babel-plugin for production.
*/
const documents = {
"\n fragment CooccurrenceSectionData on Cooccurrence {\n createdAt\n articles {\n id\n articleType\n text\n }\n }\n ": types.CooccurrenceSectionDataFragmentDoc,
"\n fragment CooccurrenceSectionData on Cooccurrence {\n createdAt\n articles {\n id\n articleType\n text\n ...ThumbnailArticleData\n }\n }\n \n ": types.CooccurrenceSectionDataFragmentDoc,
"\n fragment ThumbnailArticleData on Article {\n articleType\n text\n thumbnailUrl: attachmentUrl(variant: THUMBNAIL)\n }\n ": types.ThumbnailArticleDataFragmentDoc,
"\n fragment HighlightFields on Highlights {\n text\n reference\n hyperlinks {\n title\n summary\n }\n }\n": types.HighlightFieldsFragmentDoc,
};

Expand All @@ -34,7 +35,11 @@ export function graphql(source: string): unknown;
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n fragment CooccurrenceSectionData on Cooccurrence {\n createdAt\n articles {\n id\n articleType\n text\n }\n }\n "): (typeof documents)["\n fragment CooccurrenceSectionData on Cooccurrence {\n createdAt\n articles {\n id\n articleType\n text\n }\n }\n "];
export function graphql(source: "\n fragment CooccurrenceSectionData on Cooccurrence {\n createdAt\n articles {\n id\n articleType\n text\n ...ThumbnailArticleData\n }\n }\n \n "): (typeof documents)["\n fragment CooccurrenceSectionData on Cooccurrence {\n createdAt\n articles {\n id\n articleType\n text\n ...ThumbnailArticleData\n }\n }\n \n "];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n fragment ThumbnailArticleData on Article {\n articleType\n text\n thumbnailUrl: attachmentUrl(variant: THUMBNAIL)\n }\n "): (typeof documents)["\n fragment ThumbnailArticleData on Article {\n articleType\n text\n thumbnailUrl: attachmentUrl(variant: THUMBNAIL)\n }\n "];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
Expand Down
28 changes: 24 additions & 4 deletions typegen/graphql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ export type Article = Node & {
attachmentUrl?: Maybe<Scalars['String']>;
/** Number of normal article categories */
categoryCount: Scalars['Int'];
/** Transcript contributors of the article */
contributors: Array<Contributor>;
cooccurrences?: Maybe<Array<Cooccurrence>>;
/** May be null for legacy articles */
createdAt?: Maybe<Scalars['String']>;
Expand All @@ -186,6 +188,8 @@ export type Article = Node & {
stats?: Maybe<Array<Maybe<Analytics>>>;
status: ReplyRequestStatusEnum;
text?: Maybe<Scalars['String']>;
/** Time when the article was last transcribed */
transcribedAt?: Maybe<Scalars['String']>;
updatedAt?: Maybe<Scalars['String']>;
/** The user submitted this article */
user?: Maybe<User>;
Expand Down Expand Up @@ -624,6 +628,8 @@ export type Reply = Node & {
reference?: Maybe<Scalars['String']>;
/** Replies that has similar text or references of this current reply */
similarReplies: ReplyConnection;
/** The status of this reply, calculated from its author and article replies. */
status: ArticleReplyStatusEnum;
text?: Maybe<Scalars['String']>;
type: ReplyTypeEnum;
/** The user submitted this reply version */
Expand Down Expand Up @@ -700,6 +706,15 @@ export enum AttachmentVariantEnum {
Thumbnail = 'THUMBNAIL'
}

export type Contributor = {
__typename?: 'Contributor';
appId: Scalars['String'];
updatedAt?: Maybe<Scalars['String']>;
/** The user who contributed to this article. */
user?: Maybe<User>;
userId: Scalars['String'];
};

export type Cooccurrence = Node & {
__typename?: 'Cooccurrence';
appId: Scalars['String'];
Expand Down Expand Up @@ -1056,6 +1071,8 @@ export type ListArticleFilter = {
selfOnly?: InputMaybe<Scalars['Boolean']>;
/** Returns only articles with the specified statuses */
statuses?: InputMaybe<Array<ArticleStatusEnum>>;
/** Show only articles with(out) article transcript contributed by specified user */
transcribedBy?: InputMaybe<UserAndExistInput>;
/** Specifies how the transcript of `mediaUrl` can be used to search. Can only specify `transcript` when `mediaUrl` is specified. */
transcript?: InputMaybe<TranscriptFilter>;
/** Show only articles created by the specific user. */
Expand All @@ -1067,8 +1084,8 @@ export type ListArticleFilter = {
export type UserAndExistInput = {
/**
*
* When true (or not specified), return only entries with the specified user's involvement.
* When false, return only entries that the specified user did not involve.
* When true (or not specified), return only entries with the specified user's involvement.
* When false, return only entries that the specified user did not involve.
*
*/
exists?: InputMaybe<Scalars['Boolean']>;
Expand Down Expand Up @@ -1460,9 +1477,12 @@ export type MutationResult = {
id?: Maybe<Scalars['String']>;
};

export type CooccurrenceSectionDataFragment = { __typename?: 'Cooccurrence', createdAt: string, articles: Array<{ __typename?: 'Article', id: string, articleType: ArticleTypeEnum, text?: string | null }> };
export type CooccurrenceSectionDataFragment = { __typename?: 'Cooccurrence', createdAt: string, articles: Array<{ __typename?: 'Article', id: string, articleType: ArticleTypeEnum, text?: string | null, thumbnailUrl?: string | null }> };

export type ThumbnailArticleDataFragment = { __typename?: 'Article', articleType: ArticleTypeEnum, text?: string | null, thumbnailUrl?: string | null };

export type HighlightFieldsFragment = { __typename?: 'Highlights', text?: string | null, reference?: string | null, hyperlinks?: Array<{ __typename?: 'Hyperlink', title?: string | null, summary?: string | null } | null> | null };

export const CooccurrenceSectionDataFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CooccurrenceSectionData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Cooccurrence"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"articles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"articleType"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}}]} as unknown as DocumentNode<CooccurrenceSectionDataFragment, unknown>;
export const ThumbnailArticleDataFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ThumbnailArticleData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Article"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"articleType"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","alias":{"kind":"Name","value":"thumbnailUrl"},"name":{"kind":"Name","value":"attachmentUrl"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"variant"},"value":{"kind":"EnumValue","value":"THUMBNAIL"}}]}]}}]} as unknown as DocumentNode<ThumbnailArticleDataFragment, unknown>;
export const CooccurrenceSectionDataFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CooccurrenceSectionData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Cooccurrence"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"articles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"articleType"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ThumbnailArticleData"}}]}}]}},...ThumbnailArticleDataFragmentDoc.definitions]} as unknown as DocumentNode<CooccurrenceSectionDataFragment, unknown>;
export const HighlightFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Highlights"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"reference"}},{"kind":"Field","name":{"kind":"Name","value":"hyperlinks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"summary"}}]}}]}}]} as unknown as DocumentNode<HighlightFieldsFragment, unknown>;
Loading