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

show reps on results for dns search

Browse Source
This commit is contained in:
robbond
2025-07-24 09:21:26 +01:00
parent ab04761677
commit 3ccb96abc5
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/search/dnssearchresults.js
+13 -4
View File
@@ -7,6 +7,7 @@ import { useCallback, useEffect, useState } from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import transLookup from "../../data/lookuptranslations.json"; import transLookup from "../../data/lookuptranslations.json";
import PaginationControl from "./pagination"; import PaginationControl from "./pagination";
import RepsOnResults from "./repsonresults";
import { getBasicDNSSearchPaged, getDNSCoords } from "../../actions"; import { getBasicDNSSearchPaged, getDNSCoords } from "../../actions";
@@ -387,14 +388,16 @@ const DNSSearchResults = (props) => {
var appType = var appType =
router.locale == "cy" router.locale == "cy"
? jsonpath( ? jsonpath({
'$..[?(@.value=="' + path:
'$..[?(@.value=="' +
item[ item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] + ] +
'")].value_cy', '")].value_cy',
transLookup json: transLookup,
) eval: true,
})
: item[ : item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] || "N/A"; ] || "N/A";
@@ -451,6 +454,12 @@ const DNSSearchResults = (props) => {
</span> </span>
{item.title} {item.title}
</Link> </Link>
<RepsOnResults
detailsObj={detailsObj}
appealType={
item.pinswg_appealcasetype
}
/>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
components/utils/index.js
+23 -23
View File
@@ -115,19 +115,19 @@ export const getSearchDetails = async (searchResultsObj) => {
} }
); );
} else { } else {
formMeta?.LogicalCollectionName && // formMeta?.LogicalCollectionName &&
formMeta?.LogicalCollectionName != "pinswg_sipses" && // formMeta?.LogicalCollectionName != "pinswg_sipses" &&
detailsArr.push( detailsArr.push(
getBasicSearchDetails( getBasicSearchDetails(
formMeta.LogicalCollectionName, formMeta.LogicalCollectionName,
searchDetail.title, searchDetail.title,
formMeta.PrimaryIdAttribute, formMeta.PrimaryIdAttribute,
searchDetail.incidentid searchDetail.incidentid
) || { ) || {
"@odata.count": 1, "@odata.count": 1,
"value": [{ "title": searchDetail.title }], "value": [{ "title": searchDetail.title }],
} }
); );
} }
}); });
// Promise.all(detailsArr).then((data) => { // Promise.all(detailsArr).then((data) => {
@@ -180,16 +180,16 @@ export const getSearchDetailsPaged = (searchResultsObj) => {
let formMeta = getFormCollectionByID( let formMeta = getFormCollectionByID(
searchDetail.pinswg_appealcasetype searchDetail.pinswg_appealcasetype
); );
formMeta?.LogicalCollectionName && // formMeta?.LogicalCollectionName &&
formMeta?.LogicalCollectionName != "pinswg_sipses" && // formMeta?.LogicalCollectionName != "pinswg_sipses" &&
detailsArr.push( detailsArr.push(
getBasicSearchDetailsPaged( getBasicSearchDetailsPaged(
formMeta.LogicalCollectionName, formMeta.LogicalCollectionName,
searchDetail.title, searchDetail.title,
formMeta.PrimaryIdAttribute, formMeta.PrimaryIdAttribute,
searchDetail.incidentid searchDetail.incidentid
) )
); );
} }
}); });
return Promise.all(detailsArr); return Promise.all(detailsArr);