From 31ee186d22802b52cb4500bdd51febf58b6b6952 Mon Sep 17 00:00:00 2001 From: Zotov Ivan Yuryevich Date: Tue, 14 Apr 2026 23:25:04 +0300 Subject: [PATCH] refactor: rename gql documents --- src/graphql-documents/categories.gql.ts | 8 +++--- .../home-page.gql.generated.ts | 8 +++--- src/graphql-documents/home-page.gql.ts | 2 +- .../site-config.gql.generated.ts | 8 +++--- src/graphql-documents/site-config.gql.ts | 2 +- src/graphql/graphql.ts | 28 ++++++++++--------- src/lib/cms/contact/types.ts | 6 ++-- src/pages/[slug].astro | 4 +-- src/pages/index.astro | 8 +++--- src/views/HomePage.tsx | 4 +-- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/graphql-documents/categories.gql.ts b/src/graphql-documents/categories.gql.ts index 4ff194b..36b66c1 100644 --- a/src/graphql-documents/categories.gql.ts +++ b/src/graphql-documents/categories.gql.ts @@ -1,8 +1,8 @@ -import gql from "graphql-tag"; +import gql from 'graphql-tag' export const categoriesListDocument = gql` - query CategoriesList { - categories { + query CategoriesList($group: String) { + categories(filters: { group: { eq: $group } }) { documentId slug title @@ -11,4 +11,4 @@ export const categoriesListDocument = gql` badge } } -`; +` diff --git a/src/graphql-documents/home-page.gql.generated.ts b/src/graphql-documents/home-page.gql.generated.ts index 0a57cee..d2f4b9c 100644 --- a/src/graphql-documents/home-page.gql.generated.ts +++ b/src/graphql-documents/home-page.gql.generated.ts @@ -3,11 +3,11 @@ import type { ExecutionResult } from "graphql"; import { execute } from "../graphql/execute"; -import type { HomePageQueryQuery, HomePageQueryQueryVariables } from "../graphql/graphql"; +import type { HomePageQuery, HomePageQueryVariables } from "../graphql/graphql"; import { homePageDocument } from "./home-page.gql"; -export const homePageQueryQuery = { - async execute(variables?: HomePageQueryQueryVariables): Promise> { - return execute(homePageDocument, variables); +export const homePageQuery = { + async execute(variables?: HomePageQueryVariables): Promise> { + return execute(homePageDocument, variables); }, }; diff --git a/src/graphql-documents/home-page.gql.ts b/src/graphql-documents/home-page.gql.ts index 53825a9..b64b25d 100644 --- a/src/graphql-documents/home-page.gql.ts +++ b/src/graphql-documents/home-page.gql.ts @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const homePageDocument = gql` - query HomePageQuery { + query HomePage { homePage { sections { __typename diff --git a/src/graphql-documents/site-config.gql.generated.ts b/src/graphql-documents/site-config.gql.generated.ts index eeedc23..32118c1 100644 --- a/src/graphql-documents/site-config.gql.generated.ts +++ b/src/graphql-documents/site-config.gql.generated.ts @@ -3,11 +3,11 @@ import type { ExecutionResult } from "graphql"; import { execute } from "../graphql/execute"; -import type { SiteConfigQueryQuery, SiteConfigQueryQueryVariables } from "../graphql/graphql"; +import type { SiteConfigQuery, SiteConfigQueryVariables } from "../graphql/graphql"; import { siteConfigDocument } from "./site-config.gql"; -export const siteConfigQueryQuery = { - async execute(variables?: SiteConfigQueryQueryVariables): Promise> { - return execute(siteConfigDocument, variables); +export const siteConfigQuery = { + async execute(variables?: SiteConfigQueryVariables): Promise> { + return execute(siteConfigDocument, variables); }, }; diff --git a/src/graphql-documents/site-config.gql.ts b/src/graphql-documents/site-config.gql.ts index e7f25e1..deba5f5 100644 --- a/src/graphql-documents/site-config.gql.ts +++ b/src/graphql-documents/site-config.gql.ts @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const siteConfigDocument = gql` - query SiteConfigQuery { + query SiteConfig { siteConfig { title description diff --git a/src/graphql/graphql.ts b/src/graphql/graphql.ts index 2941b88..a6a9040 100644 --- a/src/graphql/graphql.ts +++ b/src/graphql/graphql.ts @@ -1554,15 +1554,17 @@ export type VendorRelationResponseCollection = { nodes: Array; }; -export type CategoriesListQueryVariables = Exact<{ [key: string]: never; }>; +export type CategoriesListQueryVariables = Exact<{ + group?: InputMaybe; +}>; export type CategoriesListQuery = { __typename?: 'Query', categories: Array<{ __typename?: 'Category', documentId: string, slug: string, title?: string | null, sortOrder: number, group: Enum_Category_Group, badge?: string | null } | null> }; -export type HomePageQueryQueryVariables = Exact<{ [key: string]: never; }>; +export type HomePageQueryVariables = Exact<{ [key: string]: never; }>; -export type HomePageQueryQuery = { __typename?: 'Query', homePage?: { __typename?: 'HomePage', sections?: Array< +export type HomePageQuery = { __typename?: 'Query', homePage?: { __typename?: 'HomePage', sections?: Array< | { __typename: 'ComponentSectionsAbout', id: string, title?: string | null, description?: string | null, partners?: Array<{ __typename?: 'ComponentSharedString', id: string, value: string } | null> | null, cards?: Array<{ __typename?: 'ComponentCardsAdvantage', id: string, title?: string | null, description?: string | null, color?: { __typename?: 'ComponentSharedColor', value?: Enum_Componentsharedcolor_Value | null } | null, icon?: { __typename?: 'ComponentSharedIcon', value?: Enum_Componentsharedicon_Value | null } | null } | null> | null } | { __typename: 'ComponentSectionsCases', id: string, title?: string | null, description?: string | null, cards?: Array<{ __typename?: 'ComponentCardsCase', id: string, title?: string | null, description?: string | null, pretitle?: string | null, badge?: string | null, footnote?: string | null, color?: { __typename?: 'ComponentSharedColor', value?: Enum_Componentsharedcolor_Value | null } | null, icon?: { __typename?: 'ComponentSharedIcon', value?: Enum_Componentsharedicon_Value | null } | null } | null> | null } | { __typename: 'ComponentSectionsHomeHero', id: string, title?: string | null, description?: string | null, badge?: string | null, stats?: Array<{ __typename?: 'ComponentSharedAttribute', id: string, key?: string | null, value?: string | null } | null> | null } @@ -1571,10 +1573,10 @@ export type HomePageQueryQuery = { __typename?: 'Query', homePage?: { __typename | { __typename: 'Error' } | null> | null } | null }; -export type SiteConfigQueryQueryVariables = Exact<{ [key: string]: never; }>; +export type SiteConfigQueryVariables = Exact<{ [key: string]: never; }>; -export type SiteConfigQueryQuery = { __typename?: 'Query', siteConfig?: { __typename?: 'SiteConfig', title: string, description?: string | null, contacts?: Array<{ __typename?: 'ComponentSharedContact', id: string, type: Enum_Componentsharedcontact_Type, value: string, displayValue?: string | null } | null> | null } | null }; +export type SiteConfigQuery = { __typename?: 'Query', siteConfig?: { __typename?: 'SiteConfig', title: string, description?: string | null, contacts?: Array<{ __typename?: 'ComponentSharedContact', id: string, type: Enum_Componentsharedcontact_Type, value: string, displayValue?: string | null } | null> | null } | null }; export class TypedDocumentString extends String @@ -1596,8 +1598,8 @@ export class TypedDocumentString } export const CategoriesListDocument = new TypedDocumentString(` - query CategoriesList { - categories { + query CategoriesList($group: String) { + categories(filters: {group: {eq: $group}}) { documentId slug title @@ -1607,8 +1609,8 @@ export const CategoriesListDocument = new TypedDocumentString(` } } `) as unknown as TypedDocumentString; -export const HomePageQueryDocument = new TypedDocumentString(` - query HomePageQuery { +export const HomePageDocument = new TypedDocumentString(` + query HomePage { homePage { sections { __typename @@ -1701,9 +1703,9 @@ export const HomePageQueryDocument = new TypedDocumentString(` } } } - `) as unknown as TypedDocumentString; -export const SiteConfigQueryDocument = new TypedDocumentString(` - query SiteConfigQuery { + `) as unknown as TypedDocumentString; +export const SiteConfigDocument = new TypedDocumentString(` + query SiteConfig { siteConfig { title description @@ -1715,4 +1717,4 @@ export const SiteConfigQueryDocument = new TypedDocumentString(` } } } - `) as unknown as TypedDocumentString; \ No newline at end of file + `) as unknown as TypedDocumentString; \ No newline at end of file diff --git a/src/lib/cms/contact/types.ts b/src/lib/cms/contact/types.ts index f8c3ede..fbc4bc5 100644 --- a/src/lib/cms/contact/types.ts +++ b/src/lib/cms/contact/types.ts @@ -1,5 +1,3 @@ -import type { SiteConfigQueryQuery } from '../../../graphql/graphql' +import type { SiteConfigQuery } from '../../../graphql/graphql' -export type SiteConfigContact = NonNullable< - NonNullable['contacts']>[number] -> +export type SiteConfigContact = NonNullable['contacts']>[number]> diff --git a/src/pages/[slug].astro b/src/pages/[slug].astro index 70e30c6..cc29682 100644 --- a/src/pages/[slug].astro +++ b/src/pages/[slug].astro @@ -6,11 +6,11 @@ import { Header } from '../sections/Header' import { Footer } from '../sections/Footer' import { CategoryView } from '../views/CategoryView' import type { SiteConfigContact } from '../lib/cms/contact/types' -import { siteConfigQueryQuery } from '../graphql-documents/site-config.gql.generated' +import { siteConfigQuery } from '../graphql-documents/site-config.gql.generated' export async function getStaticPaths() { const categories = await getCollection('categories') - const siteResult = await siteConfigQueryQuery.execute() + const siteResult = await siteConfigQuery.execute() if (siteResult.errors?.length) { throw new Error(siteResult.errors.map(e => e.message).join(', ')) } diff --git a/src/pages/index.astro b/src/pages/index.astro index 8f92c3b..429396c 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -4,12 +4,12 @@ import '../styles/globals.css' import { Header } from '../sections/Header' import { Footer } from '../sections/Footer' import { HomePage } from '../views/HomePage' -import { homePageQueryQuery } from '../graphql-documents/home-page.gql.generated' -import { siteConfigQueryQuery } from '../graphql-documents/site-config.gql.generated' +import { homePageQuery } from '../graphql-documents/home-page.gql.generated' +import { siteConfigQuery } from '../graphql-documents/site-config.gql.generated' const [homeResult, siteResult] = await Promise.all([ - homePageQueryQuery.execute(), - siteConfigQueryQuery.execute(), + homePageQuery.execute(), + siteConfigQuery.execute(), ]) if (homeResult.errors?.length) { diff --git a/src/views/HomePage.tsx b/src/views/HomePage.tsx index ed26cbc..e080cb4 100644 --- a/src/views/HomePage.tsx +++ b/src/views/HomePage.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import type { HomePageQueryQuery } from '../graphql/graphql' +import type { HomePageQuery } from '../graphql/graphql' import { Hero } from '../sections/Hero' import { Services } from '../sections/Services' import { Solutions } from '../sections/Solutions' @@ -13,7 +13,7 @@ import type { Maybe } from '../lib/types' const HEADER_OFFSET_PX = 85 -type HomePageData = NonNullable +type HomePageData = NonNullable type HomeSection = NonNullable[number]> type HeroSection = Extract