robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fix

Browse Source
This commit is contained in:
robbond
2022-04-07 08:11:40 +01:00
parent 1410b0bf13
commit d63d87aa3e
6 changed files with 114 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/documents.js
+20 -16
View File
@@ -2,7 +2,7 @@ import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import jsonpath from "jsonpath"; 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 { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import transLookup from "../../data/lookuptranslations.json"; import transLookup from "../../data/lookuptranslations.json";
import PaginationControl from "./pagination"; import PaginationControl from "./pagination";
@@ -289,23 +289,27 @@ const DocumentDetails = (props) => {
selectedOption, selectedOption,
fieldSortState, fieldSortState,
orderByState, orderByState,
getDocumentResults,
]); ]);
const getDocumentResults = (pageNumber, orderBy, fieldSort) => { const getDocumentResults = useCallback(
getSearchDocumentDetailsPaged( (pageNumber, orderBy, fieldSort) => {
props.incidentid, getSearchDocumentDetailsPaged(
pageNumber, props.incidentid,
orderBy, pageNumber,
fieldSort, orderBy,
selectedOption fieldSort,
) selectedOption
.then((data) => data) )
.then((data) => { .then((data) => data)
//console.log("getting details", data); .then((data) => {
setDocumentDetails(data); //console.log("getting details", data);
setShowSpinnerState(false); setDocumentDetails(data);
}); setShowSpinnerState(false);
}; });
},
[props.incidentid, selectedOption, setDocumentDetails]
);
const getDocumentDetails = async () => { const getDocumentDetails = async () => {
let docObj = await getSearchDocumentDetailsPaged( let docObj = await getSearchDocumentDetailsPaged(
components/elements/index.js
+2 -3
View File
@@ -73,10 +73,9 @@ export function Textfield(props) {
hint, hint,
} = props; } = props;
const required = (value) => (value ? undefined : "Required"); const required = (value) => (value ? undefined : "Required");
let { t } = useTranslation();
if (name == "pinswg_name") { if (name == "pinswg_name") {
let { t } = useTranslation();
return ( return (
<> <>
<div className="govuk-form-group"> <div className="govuk-form-group">
@@ -676,7 +675,7 @@ const RenderRadio = ({
> >
{" "} {" "}
{custom.hint != false && ( {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) => ( {Object.keys(options).map((key, index) => (
<div <div
components/newappeal/aboutyou.js
+4 -4
View File
@@ -180,13 +180,13 @@ let AboutYou = (props) => {
label={t("newappeal:about-you-on-behalf-label")} label={t("newappeal:about-you-on-behalf-label")}
/> />
<div className="govuk-form-group"> <div className="govuk-form-group">
<details class="govuk-details" data-module="govuk-details"> <details className="govuk-details" data-module="govuk-details">
<summary class="govuk-details__summary"> <summary className="govuk-details__summary">
<span class="govuk-details__summary-text"> <span className="govuk-details__summary-text">
Who can appeal? Who can appeal?
</span> </span>
</summary> </summary>
<div class="govuk-details__text"> <div className="govuk-details__text">
Only those named as an applicant on the original Only those named as an applicant on the original
application form can submit an appeal. if you are application form can submit an appeal. if you are
submitting an appeal on behalf of a company state the submitting an appeal on behalf of a company state the
components/newappeal/buildsection.js
+3 -1
View File
@@ -267,7 +267,9 @@ let BuildSection = (props) => {
<ol className="govuk-list govuk-list--bullet"> <ol className="govuk-list govuk-list--bullet">
{Object.entries(documentListObj).map( {Object.entries(documentListObj).map(
([key, value]) => { ([key, value]) => {
return <li>{value}</li>; return (
<li key={key}>{value}</li>
);
} }
)} )}
</ol> </ol>
components/search/dnssearchresults.js
+29 -15
View File
@@ -6,7 +6,7 @@ import jsonpath from "jsonpath";
import _ from "lodash"; import _ from "lodash";
import transLookup from "../../data/lookuptranslations.json"; import transLookup from "../../data/lookuptranslations.json";
import PaginationControl from "./pagination"; import PaginationControl from "./pagination";
import { useState, useEffect } from "react"; import { useState, useEffect, useCallback } from "react";
import LoadingOverlay from "react-loading-overlay"; import LoadingOverlay from "react-loading-overlay";
import { import {
getBasicDNSSearchPaged, getBasicDNSSearchPaged,
@@ -334,21 +334,29 @@ const DNSSearchResults = (props) => {
) )
: pagesCount; : pagesCount;
const getSearchPageResults = (pageNumber, orderBy, fieldSort) => { const getSearchPageResults = useCallback(
//console.log(advancedSearch, searchString, pageNumber); (pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber);
getBasicDNSSearchPaged(pageNumber, orderBy, fieldSort, selectedOption) getBasicDNSSearchPaged(
.then((data) => { pageNumber,
return data; orderBy,
}) fieldSort,
.then((data) => { selectedOption
setSearchResults(data); )
return getSearchDetailsPaged(data).then((data) => { .then((data) => {
setSearchDetails(data); return data;
setShowSpinnerState(false); })
.then((data) => {
setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
});
}); });
}); },
}; [selectedOption, setSearchDetails, setSearchResults]
);
const sortDataBy = (whichField) => { const sortDataBy = (whichField) => {
setOrderbyState(whichField); setOrderbyState(whichField);
@@ -373,7 +381,13 @@ const DNSSearchResults = (props) => {
} else { } else {
setSearchLoaded(true); setSearchLoaded(true);
} }
}, [selectedOption, fieldSortState, orderByState, searchLoaded]); }, [
selectedOption,
fieldSortState,
orderByState,
searchLoaded,
getSearchPageResults,
]);
return ( return (
<> <>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
components/search/searchresults.js
+56 -41
View File
@@ -17,7 +17,7 @@ import {
getAdvancedSearchPaged, getAdvancedSearchPaged,
} from "../../actions"; } from "../../actions";
import data from "../../data/collections.json"; import data from "../../data/collections.json";
import { useState } from "react"; import { useCallback, useState } from "react";
import LoadingOverlay from "react-loading-overlay"; import LoadingOverlay from "react-loading-overlay";
import { import {
@@ -549,49 +549,58 @@ const SearchResults = (props) => {
) )
: pagesCount; : pagesCount;
const getSearchPageResults = (pageNumber, orderBy, fieldSort) => { const getSearchPageResults = useCallback(
//console.log(advancedSearch, searchString, pageNumber); (pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber);
if (advancedSearch) { if (advancedSearch) {
var searchoObj = Object.assign( var searchoObj = Object.assign(
...searchString.map(([key, val]) => ({ [key]: val })) ...searchString.map(([key, val]) => ({ [key]: val }))
); );
getAdvancedSearchPaged( getAdvancedSearchPaged(
searchoObj, searchoObj,
pageNumber, pageNumber,
orderBy, orderBy,
fieldSort, fieldSort,
selectedOption selectedOption
) )
.then((data) => data) .then((data) => data)
.then((data) => { .then((data) => {
//console.log("getting details", data); //console.log("getting details", data);
setSearchResults(data); setSearchResults(data);
return getSearchDetailsPaged(data).then((data) => { return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data); setSearchDetails(data);
setShowSpinnerState(false); setShowSpinnerState(false);
});
}); });
}); } else {
} else { getBasicSearchPaged(
getBasicSearchPaged( searchString,
searchString, pageNumber,
pageNumber, orderBy,
orderBy, fieldSort,
fieldSort, selectedOption
selectedOption )
) .then((data) => data)
.then((data) => data) .then((data) => {
.then((data) => { //console.log("getting details", data);
//console.log("getting details", data); setSearchResults(data);
setSearchResults(data); return getSearchDetailsPaged(data).then((data) => {
return getSearchDetailsPaged(data).then((data) => { setSearchDetails(data);
setSearchDetails(data); setShowSpinnerState(false);
setShowSpinnerState(false); });
}); });
}); }
} },
}; [
advancedSearch,
searchString,
selectedOption,
setSearchDetails,
setSearchResults,
]
);
const sortDataBy = (whichField) => { const sortDataBy = (whichField) => {
setOrderbyState(whichField); setOrderbyState(whichField);
@@ -616,7 +625,13 @@ const SearchResults = (props) => {
} else { } else {
setSearchLoaded(true); setSearchLoaded(true);
} }
}, [selectedOption, fieldSortState, orderByState, searchLoaded]); }, [
selectedOption,
fieldSortState,
orderByState,
searchLoaded,
getSearchPageResults,
]);
// console.log( // console.log(
// "page is here ", // "page is here ",
// currentPage, // currentPage,