Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-18 09:20:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix nav pagination

Browse source
This commit is contained in:
Daniel D Orlando 2023-04-07 10:16:53 -07:00
parent 5ea8f75f70
commit 9a0e3804fa
2 changed files with 15 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/package-lock.json generated
View file

@ -56,7 +56,6 @@
"tailwindcss-animate": "^1.0.5", "tailwindcss-animate": "^1.0.5",
"tailwindcss-radix": "^2.8.0", "tailwindcss-radix": "^2.8.0",
"url": "^0.11.0", "url": "^0.11.0",
"use-react-screenshot": "github:danny-avila/use-react-screenshot#master",
"uuidv4": "^6.2.13" "uuidv4": "^6.2.13"
}, },
"devDependencies": { "devDependencies": {
@ -13268,19 +13267,6 @@
} }
} }
}, },
"node_modules/use-react-screenshot": {
"version": "3.0.0",
"resolved": "git+ssh://git@github.com/danny-avila/use-react-screenshot.git#59260177849fc8d635170835e2f89ae2a126b7b6",
"license": "MIT",
"engines": {
"node": ">=8",
"npm": ">=5"
},
"peerDependencies": {
"html2canvas": "^1.4.1",
"react": "^18.2.0"
}
},
"node_modules/use-sidecar": { "node_modules/use-sidecar": {
"version": "1.1.2", "version": "1.1.2",
"license": "MIT", "license": "MIT",
@ -21955,11 +21941,6 @@
"use-isomorphic-layout-effect": "^1.1.1" "use-isomorphic-layout-effect": "^1.1.1"
} }
}, },
"use-react-screenshot": {
"version": "git+ssh://git@github.com/danny-avila/use-react-screenshot.git#59260177849fc8d635170835e2f89ae2a126b7b6",
"from": "use-react-screenshot@github:danny-avila/use-react-screenshot#master",
"requires": {}
},
"use-sidecar": { "use-sidecar": {
"version": "1.1.2", "version": "1.1.2",
"requires": { "requires": {

44
client/src/components/Nav/index.jsx
View file

@ -39,28 +39,26 @@ export default function Nav({ navVisible, setNavVisible }) {
const [isFetching, setIsFetching] = useState(false); const [isFetching, setIsFetching] = useState(false);
const onSearchSuccess = (data, expectedPage) => {
console.log('onSearchSuccess', data, expectedPage)
const res = data;
setConversations(res.conversations);
if (expectedPage) {
setPageNumber(expectedPage);
}
setPageNumber(res.pageNumber);
setPages(res.pages);
setIsFetching(false);
searchPlaceholderConversation();
setSearchResultMessages(res.messages);
};
const debouncedSearchTerm = useDebounce(searchQuery, 750); const debouncedSearchTerm = useDebounce(searchQuery, 750);
const searchQueryFn = useSearchQuery(debouncedSearchTerm, 1, { const searchQueryFn = useSearchQuery(debouncedSearchTerm, pageNumber, {
enabled: !!debouncedSearchTerm && enabled: !!debouncedSearchTerm &&
debouncedSearchTerm.length > 0 && debouncedSearchTerm.length > 0 &&
isSearchEnabled && isSearchEnabled &&
isSearching, isSearching,
}); });
const onSearchSuccess = (data, expectedPage) => {
const res = data;
setConversations(res.conversations);
if (expectedPage) {
setPageNumber(expectedPage);
}
setPages(res.pages);
setIsFetching(false);
searchPlaceholderConversation();
setSearchResultMessages(res.messages);
};
useEffect(() => { useEffect(() => {
//we use isInitialLoading here instead of isLoading because query is disabled by default //we use isInitialLoading here instead of isLoading because query is disabled by default
if (searchQueryFn.isInitialLoading) { if (searchQueryFn.isInitialLoading) {
@ -81,24 +79,12 @@ export default function Nav({ navVisible, setNavVisible }) {
const nextPage = async () => { const nextPage = async () => {
moveToTop(); moveToTop();
setPageNumber(pageNumber + 1);
if (!isSearching) {
setPageNumber(prev => prev + 1);
await getConversationsQuery.refetch()
} else {
await fetch(searchQuery, +pageNumber + 1);
}
}; };
const previousPage = async () => { const previousPage = async () => {
moveToTop(); moveToTop();
setPageNumber(pageNumber - 1);
if (!isSearching) {
setPageNumber(prev => prev - 1);
await getConversationsQuery.refetch()
} else {
await fetch(searchQuery, +pageNumber - 1);
}
}; };
useEffect(() => { useEffect(() => {