Merged PR 2246: refactor reps first slice

Related work items: #22570, #22576, #22577, #22583, #22586, #22587, #22588, #22590, #22591
This commit is contained in:
Robert Bond
2026-04-15 09:28:50 +00:00
parent 15c35d201e
commit ecd6075c3a
9 changed files with 1520 additions and 371 deletions
+155 -197
View File
@@ -37,14 +37,21 @@ import * as CaseTypes from "./summaryTypes"; // ✅ must match filename exactly
import {
capitalizeFirstLetter,
formatDates,
showReps,
hasValidKey,
isObjectNotEmpty,
hasOwnPropertyAndNotNull,
linkedCasesList,
showRepsEnded,
getBilingualText
} from "./summary/utils/helpers";
import {
isConsultationWindowOpen,
isGeneralRepresentationWindowOpen,
canShowRepButtonForAppealType,
getEntryCtaLabelKey,
shouldSuppressBlockedMessage,
getGeneralBlockedEndDate,
isRepresentationPeriodEnded
} from "./summary/utils/representationEntry";
import {
resolveSearchResultsHref,
isDnsRoutePath
@@ -806,16 +813,22 @@ const CaseSummary = (props) => {
appealTypeID
).PrimaryIdAttribute ==
"pinswg_sipscase" &&
showReps(
detailsObj.pinswg_consultationopen,
detailsObj.pinswg_consultationclose
isConsultationWindowOpen(
detailsObj
) && (
<>
{showRepButton(
props
.currentView
.caseReference
.appealType
{canShowRepButtonForAppealType(
{
"appealType":
props
.currentView
.caseReference
.appealType,
"isLPA":
isLPA,
"searchDetailsObj":
props.searchDetailsObj
}
) ? (
<>
<Link
@@ -838,25 +851,27 @@ const CaseSummary = (props) => {
}}
className="govuk-button"
>
{props
.currentView
.caseReference
.appealType ==
846040002
? t(
"case:summary-make-consultation-label"
)
: t(
"case:summary-make-representation-label"
)}
{t(
getEntryCtaLabelKey(
props
.currentView
.caseReference
.appealType
)
)}
</Link>
</>
) : !isLPA &&
props
.currentView
.caseReference
.appealType ==
846040004 ? (
) : shouldSuppressBlockedMessage(
{
"appealType":
props
.currentView
.caseReference
.appealType,
"isLPA":
isLPA
}
) ? (
""
) : (
<>
@@ -899,114 +914,122 @@ const CaseSummary = (props) => {
)}
</>
)}
{(_.has(
detailsObj,
"pinswg_startdate"
) ||
_.has(
detailsObj,
"pinswg_applicationacceptedasvalid"
) ||
_.has(
detailsObj,
"pinswg_startdates"
)) &&
showReps(
detailsObj.pinswg_startdate ||
detailsObj.pinswg_startdates ||
detailsObj.pinswg_applicationacceptedasvalid,
detailsObj.pinswg_finalcommentsduedate ||
detailsObj.pinswg_endofrepresentationperiod
) && (
<>
{showRepButton(
props
.currentView
.caseReference
.appealType
) ? (
<>
<Link
href={{
pathname:
"/myportal/representation",
query: {
case:
currentType ==
"searchResultsObj"
{isGeneralRepresentationWindowOpen(
detailsObj
) && (
<>
{canShowRepButtonForAppealType(
{
"appealType":
props
.currentView
.caseReference
.appealType,
"isLPA":
isLPA,
"searchDetailsObj":
props.searchDetailsObj
}
) ? (
<>
<Link
href={{
pathname:
"/myportal/representation",
query: {
case:
currentType ==
"searchResultsObj"
? detailsObj.ticketnumber
: currentType ==
"watchedCases"
? casesObj.pinswg_title
: currentType ==
"directResultsObj"
? detailsObj.ticketnumber
: currentType ==
"watchedCases"
? casesObj.pinswg_title
: currentType ==
"directResultsObj"
? detailsObj.ticketnumber
: casesObj.reference
}
}}
className="govuk-button"
>
{t(
"case:summary-make-representation-label"
)}
</Link>
</>
) : !isLPA &&
props
.currentView
.caseReference
.appealType ==
846040004 ? (
""
) : (
<>
<div className="govuk-grid-column-full govuk-!-padding-left-0">
<div className="govuk-button-group">
<p className="govuk-body">
{t(
"case:representation-date-passed-label",
{
startDate:
formatDates(
detailsObj.pinswg_startdate
),
endDate:
props
.currentView
.caseReference
.appealType ==
846040019
? formatDates(
detailsObj.pinswg_statementduedate
: casesObj.reference
}
}}
className="govuk-button"
>
{t(
"case:summary-make-representation-label"
)}
</Link>
</>
) : shouldSuppressBlockedMessage(
{
"appealType":
props
.currentView
.caseReference
.appealType,
"isLPA":
isLPA
}
) ? (
""
) : (
<>
<div className="govuk-grid-column-full govuk-!-padding-left-0">
<div className="govuk-button-group">
<p className="govuk-body">
{t(
"case:representation-date-passed-label",
{
startDate:
formatDates(
detailsObj.pinswg_startdate
),
endDate:
props
.currentView
.caseReference
.appealType ==
846040019
? formatDates(
getGeneralBlockedEndDate(
detailsObj,
props
.currentView
.caseReference
.appealType
)
: formatDates(
detailsObj.pinswg_finalcommentsduedate
)
: formatDates(
getGeneralBlockedEndDate(
detailsObj,
props
.currentView
.caseReference
.appealType
)
}
)}
<br />{" "}
{t(
"case:representation-date-passed-additional-label"
)}{" "}
<Link
href={
"mailto:" +
t(
"home:login-contact-email"
)
}
>
{t(
)
}
)}
<br />{" "}
{t(
"case:representation-date-passed-additional-label"
)}{" "}
<Link
href={
"mailto:" +
t(
"home:login-contact-email"
)}
</Link>
</p>
</div>
)
}
>
{t(
"home:login-contact-email"
)}
</Link>
</p>
</div>
</>
)}
</>
)}
</div>
</>
)}
</>
)}
<Link
className="govuk-button govuk-button--secondary"
@@ -1352,9 +1375,8 @@ const CaseSummary = (props) => {
null ||
detailsObj.pinswg_finalcommentsduedate !=
null) &&
showRepsEnded(
detailsObj.pinswg_startdate,
detailsObj.pinswg_finalcommentsduedate
isRepresentationPeriodEnded(
detailsObj
) && (
<div className="govuk-body">
{props.currentView
@@ -2043,70 +2065,6 @@ const CaseSummary = (props) => {
);
}
function showReps(startDate, endDate) {
let date = new Date();
date = new Date(date.toDateString());
const start = new Date(startDate);
const end = new Date(endDate);
return date >= start && date <= end ? true : false;
}
function showRepButton(appealType) {
switch (appealType) {
case 846040012:
case 846040013:
case 846040014:
//for ROW case 846040015:
case 846040020:
case 846040021:
case 846040023:
case 846040024:
return false;
case 846040004:
return isLPA ? true : false;
case 846040015:
return props.searchDetailsObj[0].value[0]
.pinswg_specialistcaseprocess == 846040001
? showReps(
props.searchDetailsObj[0].value[0].pinswg_startdate,
props.searchDetailsObj[0].value[0]
.pinswg_finalcommentsduedate
)
: true;
case 846040018:
let shouldShow =
props.searchDetailsObj[0].value[0]
.pinswg_speacialistcaseprocess == 846040000 && isLPA
? true
: props.searchDetailsObj[0].value[0]
.pinswg_speacialistcaseprocess == 846040001
? true
: false;
return shouldShow;
case 846040019:
return showReps(
props.searchDetailsObj[0].value[0].pinswg_startdate,
props.searchDetailsObj[0].value[0].pinswg_statementduedate
);
default:
return true;
}
}
function showRepsEnded(startDate, endDate) {
let date = new Date();
date = new Date(date.toDateString());
const start = new Date(startDate);
const end = new Date(endDate);
return date > start && date > end ? true : false;
}
if (status == "authenticated" && cookies.pedwWatchCase != null) {
selectWatchedCase(
props.accountDetails.accountDetails.contactid,