From 80d0e7c944c967dc2e8048e0cfccd2ee895f7823 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 12 Apr 2023 12:37:22 +0800 Subject: [PATCH] Move pageType to function_resolver --- packages/api/src/resolvers/article/index.ts | 4 +--- packages/api/src/resolvers/function_resolvers.ts | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 041d930c1..abe36814b 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -409,7 +409,7 @@ export const getArticleResolver: ResolverFn< Record, WithDataSourcesContext, QueryArticleArgs -> = async (_obj, { slug, format }, { claims, pubsub }, info) => { +> = async (_obj, { slug, format }, { claims }, info) => { try { if (!claims?.uid) { return { errorCodes: [ArticleErrorCode.Unauthorized] } @@ -950,7 +950,6 @@ export const searchResolver = authorized< originalArticleUrl: r.url, publishedAt: validatedDate(r.publishedAt), ownedByViewer: r.userId === claims.uid, - pageType: r.pageType || PageType.Unknown, siteIcon, } as SearchItem, cursor: endCursor, @@ -1054,7 +1053,6 @@ export const updatesSinceResolver = authorized< p.pageType === PageType.File ? ContentReader.Pdf : ContentReader.Web, - pageType: p.pageType || PageType.Unknown, } as SearchItem, cursor: endCursor, itemID: p.id, diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts index 9d06dac42..4e2228ccb 100644 --- a/packages/api/src/resolvers/function_resolvers.ts +++ b/packages/api/src/resolvers/function_resolvers.ts @@ -559,6 +559,9 @@ export const functionResolvers = { } return item.url }, + pageType(item: SearchItem) { + return item.pageType || PageType.Unknown + }, }, ...resultResolveTypeResolver('Login'), ...resultResolveTypeResolver('LogOut'),