From d18feb7e55cc6ea5c4a764402347f65821eee6f6 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 23 Apr 2024 11:40:37 +0800 Subject: [PATCH] fix: do not fetch content for search on Web --- .../web/lib/networking/queries/search.tsx | 17 ++++++++-- .../queries/useGetLibraryItemsQuery.tsx | 31 +++++++++++++------ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/packages/web/lib/networking/queries/search.tsx b/packages/web/lib/networking/queries/search.tsx index fa6ec85d5..cd19944ee 100644 --- a/packages/web/lib/networking/queries/search.tsx +++ b/packages/web/lib/networking/queries/search.tsx @@ -5,15 +5,27 @@ import { LibraryItemsData } from './useGetLibraryItemsQuery' export type LibraryItemsQueryInput = { limit?: number searchQuery?: string + includeContent?: boolean } export async function searchQuery({ limit = 10, searchQuery, + includeContent = false, }: LibraryItemsQueryInput): Promise { const query = gql` - query Search($after: String, $first: Int, $query: String) { - search(first: $first, after: $after, query: $query) { + query Search( + $after: String + $first: Int + $query: String + $includeContent: Boolean + ) { + search( + first: $first + after: $after + query: $query + includeContent: $includeContent + ) { ... on SearchSuccess { edges { cursor @@ -69,6 +81,7 @@ export async function searchQuery({ const variables = { first: limit, query: searchQuery, + includeContent, } try { diff --git a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx index 3434df3dc..a8699993d 100644 --- a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx +++ b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx @@ -1,20 +1,18 @@ import { gql } from 'graphql-request' import useSWRInfinite from 'swr/infinite' -import { gqlFetcher } from '../networkHelpers' -import { PageType, State } from '../fragments/articleFragment' -import { ContentReader } from '../fragments/articleFragment' -import { setLinkArchivedMutation } from '../mutations/setLinkArchivedMutation' -import { deleteLinkMutation } from '../mutations/deleteLinkMutation' -import { unsubscribeMutation } from '../mutations/unsubscribeMutation' -import { articleReadingProgressMutation } from '../mutations/articleReadingProgressMutation' -import { Label } from './../fragments/labelFragment' import { showErrorToast, showSuccessToast, showSuccessToastWithUndo, } from '../../toastHelpers' +import { ContentReader, PageType, State } from '../fragments/articleFragment' import { Highlight, highlightFragment } from '../fragments/highlightFragment' +import { articleReadingProgressMutation } from '../mutations/articleReadingProgressMutation' +import { deleteLinkMutation } from '../mutations/deleteLinkMutation' +import { setLinkArchivedMutation } from '../mutations/setLinkArchivedMutation' import { updatePageMutation } from '../mutations/updatePageMutation' +import { gqlFetcher } from '../networkHelpers' +import { Label } from './../fragments/labelFragment' export interface ReadableItem { id: string @@ -27,6 +25,7 @@ export type LibraryItemsQueryInput = { sortDescending: boolean searchQuery?: string cursor?: string + includeContent?: boolean } type LibraryItemsQueryResponse = { @@ -148,10 +147,21 @@ export function useGetLibraryItemsQuery({ sortDescending, searchQuery, cursor, + includeContent = false, }: LibraryItemsQueryInput): LibraryItemsQueryResponse { const query = gql` - query Search($after: String, $first: Int, $query: String) { - search(first: $first, after: $after, query: $query) { + query Search( + $after: String + $first: Int + $query: String + $includeContent: Boolean + ) { + search( + first: $first + after: $after + query: $query + includeContent: $includeContent + ) { ... on SearchSuccess { edges { cursor @@ -227,6 +237,7 @@ export function useGetLibraryItemsQuery({ after: cursor, first: limit, query: searchQuery, + includeContent, } const { data, error, mutate, size, setSize, isValidating } = useSWRInfinite(