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

pagination on dns results fix

Browse Source
This commit is contained in:
robbond
2022-02-09 13:49:56 +00:00
parent d1d86742ef
commit 42c0934c2c
5 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+8 -7
View File
@@ -4,7 +4,7 @@ ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
//ESNR Tenant //ESNR Tenant
TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502 TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
//WGO Tenant //WGO Tenant
TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5 //TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
GRANT_TYPE = "client_credentials" GRANT_TYPE = "client_credentials"
HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
@@ -37,11 +37,11 @@ RELAYPATH = "test-pedw-hc"
//Prod Oauth WGO //Prod Oauth WGO
CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc //CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~ //CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~
RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ //RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
RELAYURI = "prod-pedw-ns.servicebus.windows.net" //RELAYURI = "prod-pedw-ns.servicebus.windows.net"
RELAYPATH = "prod-pedw-hc" //RELAYPATH = "prod-pedw-hc"
GOOGLE_TAG_MANAGER = GTM-T78CBC3 GOOGLE_TAG_MANAGER = GTM-T78CBC3
@@ -63,7 +63,8 @@ I18N_DOMAIN = "cymru.local"
GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration" GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration"
GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS
GG_REDIRECT_URI = "http://localhost:3000" //GG_REDIRECT_URI = "http://localhost:3000"
GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales"
NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000" NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000"
actions/index.js
+11 -2
View File
@@ -183,7 +183,12 @@ export const getBasicDNSSearch = (searchString) => {
}); });
}; };
export const getBasicDNSSearchPaged = (pageNumber, orderBy, fieldSort) => { export const getBasicDNSSearchPaged = (
pageNumber,
orderBy,
fieldSort,
showNumberOfRecords
) => {
return axios return axios
.get( .get(
"/api/endpoint/getbasicdnssearchpaged_api?pageNumber=" + "/api/endpoint/getbasicdnssearchpaged_api?pageNumber=" +
@@ -191,7 +196,9 @@ export const getBasicDNSSearchPaged = (pageNumber, orderBy, fieldSort) => {
"&orderby=" + "&orderby=" +
orderBy + orderBy +
"&fieldSort=" + "&fieldSort=" +
fieldSort fieldSort +
"&showNumberOfRecords=" +
showNumberOfRecords
) )
.then((res) => res.data) .then((res) => res.data)
.catch((error) => { .catch((error) => {
@@ -775,6 +782,8 @@ export const updateCase = async (
data: data, data: data,
}; };
console.log(data);
return axios(config) return axios(config)
.then((res) => { .then((res) => {
return res.data; return res.data;
components/search/dnssearchresults.js
+33 -26
View File
@@ -38,6 +38,7 @@ const DNSSearchResults = (props) => {
var resultsArr = searchResultsObj.value || []; var resultsArr = searchResultsObj.value || [];
const [searchLoaded, setSearchLoaded] = useState(false);
const [showSpinnerState, setShowSpinnerState] = useState(false); const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => { let spinnerState = () => {
@@ -311,7 +312,7 @@ const DNSSearchResults = (props) => {
const getSearchPageResults = (pageNumber, orderBy, fieldSort) => { const getSearchPageResults = (pageNumber, orderBy, fieldSort) => {
//console.log(advancedSearch, searchString, pageNumber); //console.log(advancedSearch, searchString, pageNumber);
getBasicDNSSearchPaged(pageNumber, orderBy, fieldSort) getBasicDNSSearchPaged(pageNumber, orderBy, fieldSort, selectedOption)
.then((data) => { .then((data) => {
return data; return data;
}) })
@@ -338,9 +339,13 @@ const DNSSearchResults = (props) => {
}; };
useEffect(() => { useEffect(() => {
if (selectedOption) { if (searchLoaded) {
setShowSpinnerState(true); if (selectedOption) {
getSearchPageResults(1, orderByState, fieldSortState); setShowSpinnerState(true);
getSearchPageResults(1, orderByState, fieldSortState);
}
} else {
setSearchLoaded(true);
} }
}, [selectedOption]); }, [selectedOption]);
return ( return (
@@ -362,29 +367,31 @@ const DNSSearchResults = (props) => {
</ul> </ul>
</div> </div>
</div> </div>
<div id="recordCountSelect" className="govuk-grid-row"> {searchResultsObj["@odata.count"] > 5 && (
<div className="govuk-form-group"> <div id="recordCountSelect" className="govuk-grid-row">
<label className="govuk-label-s " htmlFor="sort"> <div className="govuk-form-group">
{t("search:searchresults-show-records-label-a")} <label className="govuk-label-s " htmlFor="sort">
<select {t("search:searchresults-show-records-label-a")}
onChange={(e) => { <select
setSelectedOption(e.target.value); onChange={(e) => {
}} setSelectedOption(e.target.value);
value={selectedOption} }}
className="govuk-select" value={selectedOption}
id="showNumberOfRecords" className="govuk-select"
name="showNumberOfRecords" id="showNumberOfRecords"
> name="showNumberOfRecords"
<option value="5">5</option> >
<option value="10">10</option> <option value="5">5</option>
<option value="20">20</option> <option value="10">10</option>
<option value="30">30</option> <option value="20">20</option>
<option value="50">50</option> <option value="30">30</option>
</select>{" "} <option value="50">50</option>
{t("search:searchresults-show-records-label-b")} </select>{" "}
</label> {t("search:searchresults-show-records-label-b")}
</label>
</div>
</div> </div>
</div> )}
{resultsArr.length > 0 ? ( {resultsArr.length > 0 ? (
ResultsView(resultsArr) ResultsView(resultsArr)
) : ( ) : (
pages/api/endpoint/getbasicdnssearchpaged_api.js
+3 -2
View File
@@ -1,7 +1,7 @@
import axios from "axios"; import axios from "axios";
import CryptoJS from "crypto-js"; import CryptoJS from "crypto-js";
import _ from "lodash"; import _ from "lodash";
import { getToken, azureHeadersPaged } from "../../../actions"; import { getToken, azureHeadersPagedCustom } from "../../../actions";
const WORDKEY = process.env.HASHKEY; const WORDKEY = process.env.HASHKEY;
@@ -27,6 +27,7 @@ export default async function ApiProxy(req, res) {
var orderby = req.query.orderby; var orderby = req.query.orderby;
var fieldSort = req.query.fieldSort; var fieldSort = req.query.fieldSort;
var showNumberOfRecords = req.query.showNumberOfRecords;
var queryUrl = var queryUrl =
"incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=" + "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=" +
@@ -41,7 +42,7 @@ export default async function ApiProxy(req, res) {
return axios return axios
.get( .get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
azureHeadersPaged(token.access_token) azureHeadersPagedCustom(token.access_token, showNumberOfRecords)
) )
.then(({ data }) => { .then(({ data }) => {
var dataStr; var dataStr;
pages/api/endpoint/getlpa_api.js
-1
View File
@@ -32,7 +32,6 @@ export default async function ApiProxy(req, res) {
azureHeaders(token.access_token) azureHeaders(token.access_token)
) )
.then(({ data }) => { .then(({ data }) => {
console.log(data);
res.status(200).json(data); res.status(200).json(data);
}) })
.catch(({ err }) => { .catch(({ err }) => {