From 90518733cc0066c92104e338cad951a3d18a40d5 Mon Sep 17 00:00:00 2001 From: Bhargav Ponnapalli Date: Sat, 17 Jul 2021 14:04:24 +0530 Subject: [PATCH] fix types --- schema.graphql | 10 +++++++- ... => VerseNumber_GitaVerseQuery.graphql.ts} | 24 +++++++++---------- src/features/chapters/ChapterById.tsx | 18 +++++++------- src/pages/verse/[verseNumber].tsx | 17 ++++++------- src/types/api.ts | 3 +++ 5 files changed, 42 insertions(+), 30 deletions(-) rename src/__generated__/{VerseOrder_GitaVerseQuery.graphql.ts => VerseNumber_GitaVerseQuery.graphql.ts} (76%) diff --git a/schema.graphql b/schema.graphql index ed7914b..ddb44dd 100644 --- a/schema.graphql +++ b/schema.graphql @@ -4,6 +4,7 @@ schema { type GitaChapterModel { id: ID! name: String + slug: String nameTransliterated: String nameTranslated: String versesCount: Int @@ -34,6 +35,7 @@ type GitaTranslationModel { } type GitaVerseModel { id: ID! + slug: String verseNumber: Int chapterNumber: Int text: String @@ -61,7 +63,13 @@ type Query { first: Int skip: Int ): [GitaChapterModel] - verses(verseNumber: Int, limit: Int, first: Int, skip: Int): [GitaVerseModel] + verses( + verseNumber: Int + verseOrder: Int + limit: Int + first: Int + skip: Int + ): [GitaVerseModel] } directive @cacheControl( maxAge: Int diff --git a/src/__generated__/VerseOrder_GitaVerseQuery.graphql.ts b/src/__generated__/VerseNumber_GitaVerseQuery.graphql.ts similarity index 76% rename from src/__generated__/VerseOrder_GitaVerseQuery.graphql.ts rename to src/__generated__/VerseNumber_GitaVerseQuery.graphql.ts index 924d72f..13c5493 100644 --- a/src/__generated__/VerseOrder_GitaVerseQuery.graphql.ts +++ b/src/__generated__/VerseNumber_GitaVerseQuery.graphql.ts @@ -4,24 +4,24 @@ import { ConcreteRequest } from "relay-runtime"; import { FragmentRefs } from "relay-runtime"; -export type VerseOrder_GitaVerseQueryVariables = { +export type VerseNumber_GitaVerseQueryVariables = { verseNumber?: number | null; }; -export type VerseOrder_GitaVerseQueryResponse = { +export type VerseNumber_GitaVerseQueryResponse = { readonly verses: ReadonlyArray<{ readonly id: string; readonly " $fragmentRefs": FragmentRefs<"VerseById_VerseDataFragment">; } | null> | null; }; -export type VerseOrder_GitaVerseQuery = { - readonly response: VerseOrder_GitaVerseQueryResponse; - readonly variables: VerseOrder_GitaVerseQueryVariables; +export type VerseNumber_GitaVerseQuery = { + readonly response: VerseNumber_GitaVerseQueryResponse; + readonly variables: VerseNumber_GitaVerseQueryVariables; }; /* -query VerseOrder_GitaVerseQuery( +query VerseNumber_GitaVerseQuery( $verseNumber: Int ) { verses(verseNumber: $verseNumber) { @@ -65,7 +65,7 @@ return { "argumentDefinitions": (v0/*: any*/), "kind": "Fragment", "metadata": null, - "name": "VerseOrder_GitaVerseQuery", + "name": "VerseNumber_GitaVerseQuery", "selections": [ { "alias": null, @@ -92,7 +92,7 @@ return { "operation": { "argumentDefinitions": (v0/*: any*/), "kind": "Operation", - "name": "VerseOrder_GitaVerseQuery", + "name": "VerseNumber_GitaVerseQuery", "selections": [ { "alias": null, @@ -130,14 +130,14 @@ return { ] }, "params": { - "cacheID": "b1359f3e3288cbddb5133233eaeb64ff", + "cacheID": "593fb9959c2e1a9a5562e9e4ce46bae8", "id": null, "metadata": {}, - "name": "VerseOrder_GitaVerseQuery", + "name": "VerseNumber_GitaVerseQuery", "operationKind": "query", - "text": "query VerseOrder_GitaVerseQuery(\n $verseNumber: Int\n) {\n verses(verseNumber: $verseNumber) {\n id\n ...VerseById_VerseDataFragment\n }\n}\n\nfragment VerseById_VerseDataFragment on GitaVerseModel {\n id\n text\n verseNumber\n chapterNumber\n}\n" + "text": "query VerseNumber_GitaVerseQuery(\n $verseNumber: Int\n) {\n verses(verseNumber: $verseNumber) {\n id\n ...VerseById_VerseDataFragment\n }\n}\n\nfragment VerseById_VerseDataFragment on GitaVerseModel {\n id\n text\n verseNumber\n chapterNumber\n}\n" } }; })(); -(node as any).hash = 'e06c5eac46dc8010c188dc88d7626fa0'; +(node as any).hash = 'c301f14aa4f68047c76d0c2bc2df5d6c'; export default node; diff --git a/src/features/chapters/ChapterById.tsx b/src/features/chapters/ChapterById.tsx index 2c1faf1..ab3e8db 100644 --- a/src/features/chapters/ChapterById.tsx +++ b/src/features/chapters/ChapterById.tsx @@ -15,17 +15,17 @@ export function ChapterById({ chapterById }: ChapterByIdProps) { graphql` fragment ChapterById_ChapterDataFragment on GitaChapterModel { name - chapterSummary - chapterNumber + chapterSummary + chapterNumber nameTransliterated nameTranslated versesCount nameMeaning - verses { - id - text - verseNumber - } + verses { + id + text + verseNumber + } } `, chapterById @@ -39,7 +39,7 @@ export function ChapterById({ chapterById }: ChapterByIdProps) { chapterNumber, chapterSummary, nameMeaning, - nameTranslation, + nameTranslated, nameTransliterated, verses, } = data; @@ -50,7 +50,7 @@ export function ChapterById({ chapterById }: ChapterByIdProps) {

{chapterSummary}

{nameMeaning}

-

{nameTranslation}

+

{nameTranslated}

{nameTransliterated}

{verses.map((verse) => { diff --git a/src/pages/verse/[verseNumber].tsx b/src/pages/verse/[verseNumber].tsx index 46174c6..0dde500 100644 --- a/src/pages/verse/[verseNumber].tsx +++ b/src/pages/verse/[verseNumber].tsx @@ -5,13 +5,13 @@ import { VerseById } from '@/features/verses/VerseById'; import { graphql, useFragment, usePreloadedQuery } from 'react-relay/hooks'; import { getRelayClientEnvironment } from '@/config/relay/getRelayClientEnvironment'; import { RelayProps, withRelay } from 'relay-nextjs'; -import { VerseOrder_GitaVerseQuery } from '@/__generated__/VerseOrder_GitaVerseQuery.graphql'; +import { VerseNumber_GitaVerseQuery } from '@/__generated__/VerseNumber_GitaVerseQuery.graphql'; import { Layout } from '@/components/Layout'; export interface IChapterPageProps {} const VerseQuery = graphql` - query VerseOrder_GitaVerseQuery($verseNumber: Int) { + query VerseNumber_GitaVerseQuery($verseNumber: Int) { verses(verseNumber: $verseNumber) { id ...VerseById_VerseDataFragment @@ -21,18 +21,18 @@ const VerseQuery = graphql` function HandleData({ preloadedQuery, -}: RelayProps<{}, VerseOrder_GitaVerseQuery>) { - const {verses} = usePreloadedQuery( +}: RelayProps<{}, VerseNumber_GitaVerseQuery>) { + const { verses } = usePreloadedQuery( VerseQuery, preloadedQuery ); if (verses && verses[0]) { return ; } - return null; + return null; } -function VersePage(props: RelayProps<{}, VerseOrder_GitaVerseQuery>) { +function VersePage(props: RelayProps<{}, VerseNumber_GitaVerseQuery>) { return ( @@ -53,9 +53,10 @@ export default withRelay(VersePage, VerseQuery, { }, variablesFromContext: (context) => { const { verseNumber } = context.query; - console.log(verseNumber) + console.log(verseNumber); return { - verseNumber: typeof verseNumber === 'string' ? parseInt(verseNumber) : verse_order, + verseNumber: + typeof verseNumber === 'string' ? parseInt(verseNumber) : verseNumber, }; }, }); diff --git a/src/types/api.ts b/src/types/api.ts index f8116a4..68a6acd 100644 --- a/src/types/api.ts +++ b/src/types/api.ts @@ -21,6 +21,7 @@ export type GitaChapterModel = { readonly __typename?: 'GitaChapterModel'; readonly id: Scalars['ID']; readonly name?: Maybe; + readonly slug?: Maybe; readonly nameTransliterated?: Maybe; readonly nameTranslated?: Maybe; readonly versesCount?: Maybe; @@ -64,6 +65,7 @@ export type GitaTranslationModel = { export type GitaVerseModel = { readonly __typename?: 'GitaVerseModel'; readonly id: Scalars['ID']; + readonly slug?: Maybe; readonly verseNumber?: Maybe; readonly chapterNumber?: Maybe; readonly text?: Maybe; @@ -104,6 +106,7 @@ export type QueryChaptersArgs = { export type QueryVersesArgs = { verseNumber?: Maybe; + verseOrder?: Maybe; limit?: Maybe; first?: Maybe; skip?: Maybe;