From d63d87aa3e6c272d47e20f932cf2fa7d49e0c393 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Thu, 7 Apr 2022 08:11:40 +0100 Subject: [PATCH] build fix --- components/case/documents.js | 36 +++++----- components/elements/index.js | 5 +- components/newappeal/aboutyou.js | 8 +-- components/newappeal/buildsection.js | 4 +- components/search/dnssearchresults.js | 44 +++++++----- components/search/searchresults.js | 97 ++++++++++++++++----------- 6 files changed, 114 insertions(+), 80 deletions(-) diff --git a/components/case/documents.js b/components/case/documents.js index f02e1d8f..e1ec2df1 100644 --- a/components/case/documents.js +++ b/components/case/documents.js @@ -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( diff --git a/components/elements/index.js b/components/elements/index.js index afde1d02..3c7aa921 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -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 ( <>
@@ -676,7 +675,7 @@ const RenderRadio = ({ > {" "} {custom.hint != false && ( -
{t(custom.hint)}
+
{t(custom.hint)}
)} {Object.keys(options).map((key, index) => (
{ label={t("newappeal:about-you-on-behalf-label")} />
-
- - +
+ + Who can appeal? -
+
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 diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js index 57cf7228..28edc2f6 100644 --- a/components/newappeal/buildsection.js +++ b/components/newappeal/buildsection.js @@ -267,7 +267,9 @@ let BuildSection = (props) => {
    {Object.entries(documentListObj).map( ([key, value]) => { - return
  1. {value}
    2. ; + return ( +
  2. {value}
    3. + ); } )}
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index 8eb0ef67..3a7ad521 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -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 ( <>
diff --git a/components/search/searchresults.js b/components/search/searchresults.js index 2f60eb7d..9acda3a0 100644 --- a/components/search/searchresults.js +++ b/components/search/searchresults.js @@ -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,