sorting on documents

components/search/searchresults.js

@@ -74,6 +74,9 @@ const SearchResults = (props) => {
             : setShowSpinnerState(true);
     };
 
+    const [orderByState, setOrderbyState] = useState("createdon");
+    const [fieldSortState, setfieldSortState] = useState("asc");
+
     const cookies = parseCookies();
 
     const selectWatchedCase = (loggedInUser, incidentID, appealType) => {
@@ -526,14 +529,12 @@ const SearchResults = (props) => {
     const getSearchPageResults = (pageNumber, orderBy, fieldSort) => {
         //console.log(advancedSearch, searchString, pageNumber);
 
-        console.log("got this ", fieldSortState + " " + orderByState);
-
         if (advancedSearch) {
             var searchoObj = Object.assign(
                 ...searchString.map(([key, val]) => ({ [key]: val }))
             );
 
-            getAdvancedSearchPaged(searchoObj, pageNumber)
+            getAdvancedSearchPaged(searchoObj, pageNumber, orderBy, fieldSort)
                 .then((data) => data)
                 .then((data) => {
                     //console.log("getting details", data);
@@ -545,13 +546,10 @@ const SearchResults = (props) => {
                 });
         } else {
             getBasicSearchPaged(searchString, pageNumber, orderBy, fieldSort)
-                .then((data) => {
-                    //console.log(data);
-                    setSearchResults(data);
-                    return data;
-                })
+                .then((data) => data)
                 .then((data) => {
                     //console.log("getting details", data);
+                    setSearchResults(data);
                     return getSearchDetailsPaged(data).then((data) => {
                         setSearchDetails(data);
                         setShowSpinnerState(false);
@@ -560,28 +558,24 @@ const SearchResults = (props) => {
         }
     };
 
-    const [orderByState, setOrderbyState] = useState("createdon");
-    const [fieldSortState, setfieldSortState] = useState("desc");
-
     const sortDataBy = (whichField) => {
-        console.log(whichField);
-        orderByState == "createdon"
-            ? setOrderbyState(whichField)
-            : setOrderbyState(whichField);
+        setOrderbyState(whichField);
+        setfieldSortState("asc");
 
-        fieldSortState == "desc"
-            ? setfieldSortState("asc")
-            : setfieldSortState("desc");
-
-        console.log(currentPage, orderByState + " " + fieldSortState);
-        getSearchPageResults(currentPage, orderByState, fieldSortState);
+        getSearchPageResults(1, whichField, fieldSortState);
+        whichField == orderByState
+            ? fieldSortState == "desc"
+                ? setfieldSortState("asc")
+                : setfieldSortState("desc")
+            : setfieldSortState("asc");
+        setShowSpinnerState(true);
     };
 
-    console.log(
-        "page is here ",
-        currentPage,
-        orderByState + " " + fieldSortState
-    );
+    // console.log(
+    //     "page is here ",
+    //     currentPage,
+    //     orderByState + " " + fieldSortState
+    // );
 
     return (
         <>