Merge branch 'Development' into 7375-sort-by-columns

This commit is contained in:
2022-01-31 12:17:35 +00:00
11 changed files with 568 additions and 513 deletions
+6 -14
View File
@@ -9,7 +9,7 @@ const PaginationControl = (props) => {
searchString,
searchResultsObj,
currentPage,
// spinnerState,
spinnerState,
getSearchPageResults,
} = props;
let { t } = useTranslation();
@@ -83,12 +83,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
// spinnerState(),
getSearchPageResults(
currentPage - 1,
orderBy,
fieldSort
);
spinnerState(),
getSearchPageResults(currentPage - 1);
}}
>
{t("common:previous-link-button")}
@@ -120,7 +116,7 @@ const PaginationControl = (props) => {
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
onClick={() => {
// spinnerState();
spinnerState();
console.log(i + 1);
getSearchPageResults(
i + 1,
@@ -139,12 +135,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
// spinnerState(),
getSearchPageResults(
currentPage + 1,
orderBy,
fieldSort
);
spinnerState(),
getSearchPageResults(currentPage + 1);
}}
>
{t("common:next-link-button")}