diff --git a/packages/api/src/elastic/highlights.ts b/packages/api/src/elastic/highlights.ts index 0290e26fd..7bb5803ce 100644 --- a/packages/api/src/elastic/highlights.ts +++ b/packages/api/src/elastic/highlights.ts @@ -206,7 +206,15 @@ export const searchHighlights = async ( ], from, size, - _source: ['title', 'slug', 'url', 'createdAt', 'highlights'], + _source: [ + 'title', + 'slug', + 'url', + 'savedAt', + 'highlights', + 'readingProgressPercent', + 'readingProgressAnchorIndex', + ], } console.log('searching highlights in elastic', JSON.stringify(searchBody)) diff --git a/packages/api/src/elastic/types.ts b/packages/api/src/elastic/types.ts index 64781f93a..4abe889b6 100644 --- a/packages/api/src/elastic/types.ts +++ b/packages/api/src/elastic/types.ts @@ -162,7 +162,7 @@ export interface Highlight { suffix?: string | null annotation?: string | null sharedAt?: Date | null - updatedAt?: Date | null + updatedAt?: Date labels?: Label[] } @@ -219,12 +219,14 @@ export interface SearchItem { uploadFileId?: string | null url: string archivedAt?: Date | null - readingProgressPercent?: number - readingProgressAnchorIndex?: number + readingProgressPercent: number + readingProgressAnchorIndex: number userId: string state?: ArticleSavingRequestStatus language?: string readAt?: Date + savedAt: Date + updatedAt?: Date } const keys = ['_id', 'url', 'slug', 'userId', 'uploadFileId', 'state'] as const diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index cec1a2bf5..ce6ac7269 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -1524,8 +1524,9 @@ export type SearchItem = { publishedAt?: Maybe; quote?: Maybe; readAt?: Maybe; - readingProgressAnchorIndex?: Maybe; - readingProgressPercent?: Maybe; + readingProgressAnchorIndex: Scalars['Int']; + readingProgressPercent: Scalars['Float']; + savedAt: Scalars['Date']; shortId?: Maybe; siteName?: Maybe; slug: Scalars['String']; @@ -1534,7 +1535,7 @@ export type SearchItem = { title: Scalars['String']; unsubHttpUrl?: Maybe; unsubMailTo?: Maybe; - updatedAt: Scalars['Date']; + updatedAt?: Maybe; uploadFileId?: Maybe; url: Scalars['String']; }; @@ -3852,8 +3853,9 @@ export type SearchItemResolvers, ParentType, ContextType>; quote?: Resolver, ParentType, ContextType>; readAt?: Resolver, ParentType, ContextType>; - readingProgressAnchorIndex?: Resolver, ParentType, ContextType>; - readingProgressPercent?: Resolver, ParentType, ContextType>; + readingProgressAnchorIndex?: Resolver; + readingProgressPercent?: Resolver; + savedAt?: Resolver; shortId?: Resolver, ParentType, ContextType>; siteName?: Resolver, ParentType, ContextType>; slug?: Resolver; @@ -3862,7 +3864,7 @@ export type SearchItemResolvers; unsubHttpUrl?: Resolver, ParentType, ContextType>; unsubMailTo?: Resolver, ParentType, ContextType>; - updatedAt?: Resolver; + updatedAt?: Resolver, ParentType, ContextType>; uploadFileId?: Resolver, ParentType, ContextType>; url?: Resolver; __isTypeOf?: IsTypeOfResolverFn; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index d2e31b91e..c219fb5c0 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -1082,8 +1082,9 @@ type SearchItem { publishedAt: Date quote: String readAt: Date - readingProgressAnchorIndex: Int - readingProgressPercent: Float + readingProgressAnchorIndex: Int! + readingProgressPercent: Float! + savedAt: Date! shortId: String siteName: String slug: String! @@ -1092,7 +1093,7 @@ type SearchItem { title: String! unsubHttpUrl: String unsubMailTo: String - updatedAt: Date! + updatedAt: Date uploadFileId: ID url: String! } diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 30aaafb25..1a073713c 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -813,7 +813,7 @@ export const searchResolver = authorized< }, }) - let results: (SearchItemData | Page)[] + let results: SearchItemData[] let totalCount: number const searchType = searchQuery.typeFilter diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index b892466be..8f77763e3 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -1473,10 +1473,10 @@ const schema = gql` pageType: PageType! contentReader: ContentReader! createdAt: Date! - updatedAt: Date! + updatedAt: Date isArchived: Boolean! - readingProgressPercent: Float - readingProgressAnchorIndex: Int + readingProgressPercent: Float! + readingProgressAnchorIndex: Int! author: String image: String description: String @@ -1498,6 +1498,7 @@ const schema = gql` siteName: String language: String readAt: Date + savedAt: Date! } type SearchItemEdge {