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
+20 -16
View File
@@ -2,7 +2,7 @@ import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import jsonpath from "jsonpath";
import { useState, useEffect, useRef } from "react";
import { useState, useEffect, useRef, useCallback } from "react";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import transLookup from "../../data/lookuptranslations.json";
import PaginationControl from "./pagination";
@@ -289,23 +289,27 @@ const DocumentDetails = (props) => {
selectedOption,
fieldSortState,
orderByState,
getDocumentResults,
]);
const getDocumentResults = (pageNumber, orderBy, fieldSort) => {
getSearchDocumentDetailsPaged(
props.incidentid,
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => data)
.then((data) => {
//console.log("getting details", data);
setDocumentDetails(data);
setShowSpinnerState(false);
});
};
const getDocumentResults = useCallback(
(pageNumber, orderBy, fieldSort) => {
getSearchDocumentDetailsPaged(
props.incidentid,
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => data)
.then((data) => {
//console.log("getting details", data);
setDocumentDetails(data);
setShowSpinnerState(false);
});
},
[props.incidentid, selectedOption, setDocumentDetails]
);
const getDocumentDetails = async () => {
let docObj = await getSearchDocumentDetailsPaged(
+2 -3
View File
@@ -73,10 +73,9 @@ export function Textfield(props) {
hint,
} = props;
const required = (value) => (value ? undefined : "Required");
let { t } = useTranslation();
if (name == "pinswg_name") {
let { t } = useTranslation();
return (
<>
<div className="govuk-form-group">
@@ -676,7 +675,7 @@ const RenderRadio = ({
>
{" "}
{custom.hint != false && (
<div class="govuk-hint">{t(custom.hint)}</div>
<div className="govuk-hint">{t(custom.hint)}</div>
)}
{Object.keys(options).map((key, index) => (
<div
+4 -4
View File
@@ -180,13 +180,13 @@ let AboutYou = (props) => {
label={t("newappeal:about-you-on-behalf-label")}
/>
<div className="govuk-form-group">
<details class="govuk-details" data-module="govuk-details">
<summary class="govuk-details__summary">
<span class="govuk-details__summary-text">
<details className="govuk-details" data-module="govuk-details">
<summary className="govuk-details__summary">
<span className="govuk-details__summary-text">
Who can appeal?
</span>
</summary>
<div class="govuk-details__text">
<div className="govuk-details__text">
Only those named as an applicant on the original
application form can submit an appeal. if you are
submitting an appeal on behalf of a company state the
+3 -1
View File
@@ -267,7 +267,9 @@ let BuildSection = (props) => {
<ol className="govuk-list govuk-list--bullet">
{Object.entries(documentListObj).map(
([key, value]) => {
return <li>{value}</li>;
return (
<li key={key}>{value}</li>
);
}
)}
</ol>
+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">
+56 -41
View File
@@ -17,7 +17,7 @@ import {
getAdvancedSearchPaged,
} from "../../actions";
import data from "../../data/collections.json";
import { useState } from "react";
import { useCallback, useState } from "react";
import LoadingOverlay from "react-loading-overlay";
import {
@@ -549,49 +549,58 @@ const SearchResults = (props) => {
)
: pagesCount;
const getSearchPageResults = (pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber);
const getSearchPageResults = useCallback(
(pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber);
if (advancedSearch) {
var searchoObj = Object.assign(
...searchString.map(([key, val]) => ({ [key]: val }))
);
if (advancedSearch) {
var searchoObj = Object.assign(
...searchString.map(([key, val]) => ({ [key]: val }))
);
getAdvancedSearchPaged(
searchoObj,
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => data)
.then((data) => {
//console.log("getting details", data);
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
getAdvancedSearchPaged(
searchoObj,
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => data)
.then((data) => {
//console.log("getting details", data);
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
});
});
});
} else {
getBasicSearchPaged(
searchString,
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => data)
.then((data) => {
//console.log("getting details", data);
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
} else {
getBasicSearchPaged(
searchString,
pageNumber,
orderBy,
fieldSort,
selectedOption
)
.then((data) => data)
.then((data) => {
//console.log("getting details", data);
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
});
});
});
}
};
}
},
[
advancedSearch,
searchString,
selectedOption,
setSearchDetails,
setSearchResults,
]
);
const sortDataBy = (whichField) => {
setOrderbyState(whichField);
@@ -616,7 +625,13 @@ const SearchResults = (props) => {
} else {
setSearchLoaded(true);
}
}, [selectedOption, fieldSortState, orderByState, searchLoaded]);
}, [
selectedOption,
fieldSortState,
orderByState,
searchLoaded,
getSearchPageResults,
]);
// console.log(
// "page is here ",
// currentPage,