build fix

This commit is contained in:
2022-04-07 08:11:40 +01:00
parent 1410b0bf13
commit d63d87aa3e
6 changed files with 114 additions and 80 deletions
+29 -15
View File
@@ -6,7 +6,7 @@ import jsonpath from "jsonpath";
import _ from "lodash";
import transLookup from "../../data/lookuptranslations.json";
import PaginationControl from "./pagination";
import { useState, useEffect } from "react";
import { useState, useEffect, useCallback } from "react";
import LoadingOverlay from "react-loading-overlay";
import {
getBasicDNSSearchPaged,
@@ -334,21 +334,29 @@ const DNSSearchResults = (props) => {
)
: pagesCount;
const getSearchPageResults = (pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber);
const getSearchPageResults = useCallback(
(pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber);
getBasicDNSSearchPaged(pageNumber, orderBy, fieldSort, selectedOption)
.then((data) => {
return data;
})
.then((data) => {
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
getBasicDNSSearchPaged(
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => {
return data;
})
.then((data) => {
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
});
});
});
};
},
[selectedOption, setSearchDetails, setSearchResults]
);
const sortDataBy = (whichField) => {
setOrderbyState(whichField);
@@ -373,7 +381,13 @@ const DNSSearchResults = (props) => {
} else {
setSearchLoaded(true);
}
}, [selectedOption, fieldSortState, orderByState, searchLoaded]);
}, [
selectedOption,
fieldSortState,
orderByState,
searchLoaded,
getSearchPageResults,
]);
return (
<>
<div className="govuk-grid-row">