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..cf51744b6 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 @@ -166,6 +166,7 @@ const Home: React.FC = () => { mutate(res); } }} + disabled={loading} onChange={(e) => { setSearchKeywords(e.target.value); }} @@ -198,7 +199,7 @@ const Home: React.FC = () => { })} - {inSearchMode && !projects.length && ( + {inSearchMode && !loading && !projects.length && (