From b53b279241661ee2c894be178a1a73373955e182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?=
 <losada.hernandez.victor@gmail.com>
Date: Fri, 20 Sep 2024 20:38:54 +0200
Subject: [PATCH] fix pagination not applying sort

---
 client/homebrew/pages/vaultPage/vaultPage.jsx | 14 ++++++--------
 server/vault.api.js                           |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx
index d8e557286..d761126f7 100644
--- a/client/homebrew/pages/vaultPage/vaultPage.jsx
+++ b/client/homebrew/pages/vaultPage/vaultPage.jsx
@@ -269,9 +269,7 @@ const VaultPage = (props)=>{
                 sortState === optionValue ? `active` : ''  
             }`}
 			>
-				<button onClick={() => {
-					loadPage(1, false, optionValue, oppositeDir)
-					}}>
+			<button onClick={() => loadPage(1, false, optionValue, oppositeDir)}>
                 {optionTitle}
             </button>
             {sortState === optionValue && (
@@ -319,7 +317,7 @@ const VaultPage = (props)=>{
 					className={`pageNumber ${
 						pageState === startPage + index ? 'currentPage' : ''
 					}`}
-					onClick={()=>loadPage(startPage + index)}
+					onClick={()=>loadPage(startPage + index, false, sortState, dirState)}
 				>
 					{startPage + index}
 				</a>
@@ -329,7 +327,7 @@ const VaultPage = (props)=>{
 			<div className='paginationControls'>
 				<button
 					className='previousPage'
-					onClick={()=>loadPage(pageState - 1)}
+					onClick={()=>loadPage(pageState - 1, false, sortState, dirState)}
 					disabled={pageState === startPage}
 				>
 					<i className='fa-solid fa-chevron-left'></i>
@@ -338,7 +336,7 @@ const VaultPage = (props)=>{
 					{startPage > 1 && (
 						<a
 							className='pageNumber firstPage'
-							onClick={()=>loadPage()}
+							onClick={()=>loadPage(1, false, sortState, dirState)}
 						>
 							1 ...
 						</a>
@@ -347,7 +345,7 @@ const VaultPage = (props)=>{
 					{endPage < totalPages && (
 						<a
 							className='pageNumber lastPage'
-							onClick={()=>loadPage(totalPages)}
+							onClick={()=>loadPage(totalPages, false, sortState, dirState)}
 						>
 							... {totalPages}
 						</a>
@@ -355,7 +353,7 @@ const VaultPage = (props)=>{
 				</ol>
 				<button
 					className='nextPage'
-					onClick={()=>loadPage(pageState + 1)}
+					onClick={()=>loadPage(pageState + 1, false, sortState, dirState)}
 					disabled={pageState === totalPages}
 				>
 					<i className='fa-solid fa-chevron-right'></i>
diff --git a/server/vault.api.js b/server/vault.api.js
index 1507402df..f3e0d74ac 100644
--- a/server/vault.api.js
+++ b/server/vault.api.js
@@ -62,8 +62,8 @@ const findBrews = async (req, res)=>{
 	};
 
 	await HomebrewModel.find(combinedQuery, projection)
-		.skip(skip)
 		.sort(sortConditions(sort, dir))
+		.skip(skip)
 		.limit(count)
 		.maxTimeMS(5000)
 		.exec()