From b5942df18dd4b2772e132250daa3ce523d52f3b2 Mon Sep 17 00:00:00 2001 From: cyrbuzz Date: Tue, 28 Nov 2023 10:06:25 +0800 Subject: [PATCH 1/2] fix: home search --- src/hooks/useLocalProjects.ts | 6 ++++-- src/pages/explorer/Home/Home.tsx | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/hooks/useLocalProjects.ts b/src/hooks/useLocalProjects.ts index 9fc392f69..2d56d3c8d 100644 --- a/src/hooks/useLocalProjects.ts +++ b/src/hooks/useLocalProjects.ts @@ -46,9 +46,12 @@ export const useLocalProjects = () => { const res = await getProjects({ variables: { offset: length, - orderBy: [ProjectsOrderBy.ID_DESC], + orderBy: [ProjectsOrderBy.ID_ASC], ids: [], }, + defaultOptions: { + fetchPolicy: 'network-only', + }, }); if (res.data?.projects?.nodes) { @@ -68,7 +71,6 @@ export const useLocalProjects = () => { const mergered = uniqWith([...projects.current, ...projectsWithMetadata], (x, y) => x.id === y.id); projects.current = mergered; await localforage.setItem(cacheKey, mergered); - if (mergered.length >= res.data.projects.totalCount) { loading.current = false; return; diff --git a/src/pages/explorer/Home/Home.tsx b/src/pages/explorer/Home/Home.tsx index ba581f5e4..35d96a663 100644 --- a/src/pages/explorer/Home/Home.tsx +++ b/src/pages/explorer/Home/Home.tsx @@ -95,7 +95,7 @@ const Home: React.FC = () => { } else { setInSearchMode(false); } - console.warn(options); + const api = searchKeywords.length ? getProjectBySearch : getProjects; const params = searchKeywords.length @@ -198,7 +198,7 @@ const Home: React.FC = () => { })} - {inSearchMode && !projects.length && ( + {inSearchMode && !loading && !projects.length && (
No projects match your search
From 50e01342db839cb3b8749a618b41c447258cb8d7 Mon Sep 17 00:00:00 2001 From: cyrbuzz Date: Tue, 28 Nov 2023 10:16:53 +0800 Subject: [PATCH 2/2] feat: add disable when loading --- src/pages/explorer/Home/Home.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/explorer/Home/Home.tsx b/src/pages/explorer/Home/Home.tsx index 35d96a663..cf51744b6 100644 --- a/src/pages/explorer/Home/Home.tsx +++ b/src/pages/explorer/Home/Home.tsx @@ -166,6 +166,7 @@ const Home: React.FC = () => { mutate(res); } }} + disabled={loading} onChange={(e) => { setSearchKeywords(e.target.value); }}