diff --git a/src/lib/graphql/generated/apollo-helpers.ts b/src/lib/graphql/generated/apollo-helpers.ts index a54b2f42..6cd7aa9d 100644 --- a/src/lib/graphql/generated/apollo-helpers.ts +++ b/src/lib/graphql/generated/apollo-helpers.ts @@ -1,7 +1,7 @@ import { FieldPolicy, FieldReadFunction, TypePolicies, TypePolicy } from '@apollo/client/cache'; import { GetChaptersQuery } from "@/lib/graphql/generated/graphql.ts"; -export type AboutPayloadKeySpecifier = ('buildTime' | 'buildType' | 'discord' | 'github' | 'name' | 'revision' | 'version' | AboutPayloadKeySpecifier)[]; -export type AboutPayloadFieldPolicy = { +export type AboutServerPayloadKeySpecifier = ('buildTime' | 'buildType' | 'discord' | 'github' | 'name' | 'revision' | 'version' | AboutServerPayloadKeySpecifier)[]; +export type AboutServerPayloadFieldPolicy = { buildTime?: FieldPolicy | FieldReadFunction, buildType?: FieldPolicy | FieldReadFunction, discord?: FieldPolicy | FieldReadFunction, @@ -490,7 +490,7 @@ export type PartialSettingsTypeFieldPolicy = { webUIInterface?: FieldPolicy | FieldReadFunction, webUIUpdateCheckInterval?: FieldPolicy | FieldReadFunction }; -export type QueryKeySpecifier = ('about' | 'categories' | 'category' | 'chapter' | 'chapters' | 'checkForServerUpdates' | 'checkForWebUIUpdate' | 'downloadStatus' | 'extension' | 'extensions' | 'getWebUIUpdateStatus' | 'lastUpdateTimestamp' | 'manga' | 'mangas' | 'meta' | 'metas' | 'restoreStatus' | 'settings' | 'source' | 'sources' | 'updateStatus' | 'validateBackup' | QueryKeySpecifier)[]; +export type QueryKeySpecifier = ('aboutServer' | 'aboutWebUI' | 'categories' | 'category' | 'chapter' | 'chapters' | 'checkForServerUpdates' | 'checkForWebUIUpdate' | 'downloadStatus' | 'extension' | 'extensions' | 'getWebUIUpdateStatus' | 'lastUpdateTimestamp' | 'manga' | 'mangas' | 'meta' | 'metas' | 'restoreStatus' | 'settings' | 'source' | 'sources' | 'updateStatus' | 'validateBackup' | QueryKeySpecifier)[]; export type QueryFieldPolicy = { about?: FieldPolicy | FieldReadFunction, categories?: FieldPolicy | FieldReadFunction, @@ -832,9 +832,9 @@ export type WebUIUpdateStatusFieldPolicy = { state?: FieldPolicy | FieldReadFunction }; export type StrictTypedTypePolicies = { - AboutPayload?: Omit & { - keyFields?: false | AboutPayloadKeySpecifier | (() => undefined | AboutPayloadKeySpecifier), - fields?: AboutPayloadFieldPolicy, + AboutServerPayload?: Omit & { + keyFields?: false | AboutServerPayloadKeySpecifier | (() => undefined | AboutServerPayloadKeySpecifier), + fields?: AboutServerPayloadFieldPolicy, }, BackupRestoreStatus?: Omit & { keyFields?: false | BackupRestoreStatusKeySpecifier | (() => undefined | BackupRestoreStatusKeySpecifier), diff --git a/src/lib/graphql/generated/graphql.ts b/src/lib/graphql/generated/graphql.ts index ff4688fb..871625de 100644 --- a/src/lib/graphql/generated/graphql.ts +++ b/src/lib/graphql/generated/graphql.ts @@ -17,8 +17,8 @@ export type Scalars = { Upload: { input: any; output: any; } }; -export type AboutPayload = { - __typename?: 'AboutPayload'; +export type AboutServerPayload = { + __typename?: 'AboutServerPayload'; buildTime: Scalars['LongString']['output']; buildType: Scalars['String']['output']; discord: Scalars['String']['output']; @@ -1293,7 +1293,8 @@ export type Preference = CheckBoxPreference | EditTextPreference | ListPreferenc export type Query = { __typename?: 'Query'; - about: AboutPayload; + aboutServer: AboutServerPayload; + aboutWebUI: WebUiUpdateInfo; categories: CategoryNodeList; category: CategoryType; chapter: ChapterType; @@ -2578,7 +2579,7 @@ export type GetMangasQuery = { __typename?: 'Query', mangas: { __typename?: 'Man export type GetAboutQueryVariables = Exact<{ [key: string]: never; }>; -export type GetAboutQuery = { __typename?: 'Query', about: { __typename?: 'AboutPayload', buildTime: any, buildType: string, discord: string, github: string, name: string, revision: string, version: string } }; +export type GetAboutQuery = { __typename?: 'Query', aboutServer: { __typename?: 'AboutServerPayload', buildTime: any, buildType: string, discord: string, github: string, name: string, revision: string, version: string } }; export type CheckForServerUpdatesQueryVariables = Exact<{ [key: string]: never; }>; diff --git a/src/lib/graphql/queries/ServerInfoQuery.ts b/src/lib/graphql/queries/ServerInfoQuery.ts index 8d10ea2f..91d469d0 100644 --- a/src/lib/graphql/queries/ServerInfoQuery.ts +++ b/src/lib/graphql/queries/ServerInfoQuery.ts @@ -11,7 +11,7 @@ import { WEBUI_UPDATE_INFO, WEBUI_UPDATE_STATUS } from '@/lib/graphql/Fragments' export const GET_ABOUT = gql` query GET_ABOUT { - about { + aboutServer { buildTime buildType discord diff --git a/src/lib/requests/client/GraphQLClient.ts b/src/lib/requests/client/GraphQLClient.ts index 952f1eb0..3473fb76 100644 --- a/src/lib/requests/client/GraphQLClient.ts +++ b/src/lib/requests/client/GraphQLClient.ts @@ -25,7 +25,8 @@ import { StrictTypedTypePolicies } from '@/lib/graphql/generated/apollo-helpers. const typePolicies: StrictTypedTypePolicies = { GlobalMetaType: { keyFields: ['key'] }, ExtensionType: { keyFields: ['apkName'] }, - AboutPayload: { keyFields: [] }, + AboutServerPayload: { keyFields: [] }, + WebUIUpdateInfo: { keyFields: [] }, SettingsType: { keyFields: [] }, Query: { fields: { diff --git a/src/screens/settings/About.tsx b/src/screens/settings/About.tsx index 3d0f5fcc..63ac4c64 100644 --- a/src/screens/settings/About.tsx +++ b/src/screens/settings/About.tsx @@ -26,7 +26,7 @@ export function About() { }, [t]); const { data } = requestManager.useGetAbout(); - const about = data?.about; + const about = data?.aboutServer; useSetDefaultBackTo('settings'); diff --git a/tools/scripts/codegenFormatter.ts b/tools/scripts/codegenFormatter.ts index 741db792..607c7d32 100644 --- a/tools/scripts/codegenFormatter.ts +++ b/tools/scripts/codegenFormatter.ts @@ -58,7 +58,8 @@ import { GetChaptersQuery } from "@/lib/graphql/generated/graphql.ts";`, const fixTypingOfQueryTypePolicies = format( addImports, `export type QueryFieldPolicy = { -\tabout?: FieldPolicy | FieldReadFunction, +\taboutServer?: FieldPolicy | FieldReadFunction, +\taboutWebUI?: FieldPolicy | FieldReadFunction, \tcategories?: FieldPolicy | FieldReadFunction, \tcategory?: FieldPolicy | FieldReadFunction, \tchapter?: FieldPolicy | FieldReadFunction,