diff --git a/.clinerules/refactor-branch-rules.md b/.clinerules/refactor-branch-rules.md index cd7f45b3..666a41c9 100644 --- a/.clinerules/refactor-branch-rules.md +++ b/.clinerules/refactor-branch-rules.md @@ -2,15 +2,18 @@ ## Purpose -This file defines the active working rules for this refactor branch. +This file defines the active working rules for the **refactor branch**. -This branch is focused on **safe, behaviour-preserving refactor of the new appeal flow**. +This branch is focused on **safe, behaviour-preserving refactor of portal journeys**, including: + +- New Appeal Flow (completed baseline) +- Representations Flow (active refactor stream) --- ## Core Rule (Highest Priority) -Do not change live S78 behaviour unless explicitly instructed. +Do not change live behaviour unless explicitly instructed. Refactor = improve structure, not behaviour. @@ -18,30 +21,62 @@ Refactor = improve structure, not behaviour. ## Primary Objectives -1. Make the new appeal flow easier to understand and maintain +1. Make core portal journeys easier to understand and maintain 2. Reduce risk when making future changes -3. Prepare the system for multiple appeal types -4. Improve separation of concerns (UI, workflow, data, integrations) +3. Improve separation of concerns (UI, workflow, data, integrations) +4. Prepare flows for future extensibility (e.g. multiple appeal types, additional journey types) + +--- + +## Active Refactor Streams + +### Completed + +- New Appeal Flow (S78) + +### Active + +- Representations Flow + +Each stream must follow **slice-based, behaviour-preserving refactor discipline**. --- ## Non-Negotiable Rules - Preserve all current user journeys: - - start appeal - - save and exit - - resume appeal - - upload documents - - check answers - - submit appeal - - confirmation -- Do not: - - change payload structures - - change validation rules - - change business logic - - hardcode logic that is currently dynamic/config-driven - - mix refactor with feature work +### Appeals + +- start appeal +- save and exit +- resume appeal +- upload documents +- check answers +- submit appeal +- confirmation + +### Representations + +- start from case summary CTA +- select capacity +- select representation type +- enter content / upload files +- check answers +- submit representation +- completion + +--- + +Do not: + +- change payload structures +- change validation rules +- change business logic +- change route/query behaviour +- change navigation or side-effect sequencing +- introduce EN/CY drift +- mix refactor with feature work --- @@ -62,6 +97,41 @@ Always: - Prefer small PRs (<400 LOC where possible) - Avoid large multi-concern changes - Split work into safe slices +- One slice = one branch = one commit + +--- + +## Branch Model (Critical) + +### Branch Roles + +- `SIPS-Development` + - BAU branch + - ongoing feature and bugfix work + - must remain stable + +- `refactor` + - integration branch for refactor work + - all refactor slices merge here first + +- feature branches (short-lived) + - created from `refactor` + - one per slice + - merged back into `refactor` + +--- + +### Flow + +SIPS-Development +↓ +refactor +↓ +feature/slice-x +↓ +refactor +↓ (when stable & validated) +SIPS-Development --- @@ -70,30 +140,25 @@ Always: ### Default context (only load these): - `context/refactor-branch-charter.md` -- `context/newappeal-refactor-guardrails.md` - `context/architecture.md` - `context/domain-flows.md` -### Only load additional context when needed: +### Only load when needed: -- integrations → `integration-map.md` -- testing gaps → `test-coverage-map.md` -- release concerns → `runbook.md` -- specific work plan → `context/plans/*` +- appeal work → `newappeal-refactor-guardrails.md` +- representation work → `representations-refactor-guardrails.md` +- plans → `context/plans/*` ### Never load by default: - all context files -- onboarding or overview docs +- onboarding docs - all templates -- memory-bank contents --- ## Templates Usage -Templates are optional helpers. - - Use only ONE template when needed - Do not load all templates - Do not treat templates as baseline context @@ -110,25 +175,41 @@ Templates are optional helpers. --- -## Testing & Validation Expectations +## Regression Safety Rule (Critical) -Minimum: +This is a live system. All refactor work must prove behaviour is unchanged. -- `npm run lint` -- targeted manual verification -- EN/CY checks (if user-facing) -- negative-path checks (for sensitive flows) +Before completing any slice: -Before changing critical logic: +### Appeals -- add or update regression protection where possible +- start appeal +- save and exit +- resume +- upload +- check answers +- submit +- confirmation + +### Representations + +- navigate from case summary → make representation +- complete full journey +- submit successfully +- confirmation shown + +Also: + +- verify EN/CY parity +- verify no navigation or state regressions + +If regression cannot be ruled out: +→ do not proceed --- ## When Unsure -If any uncertainty exists: - 1. Choose the safest option 2. Do not change behaviour 3. Call out assumptions @@ -142,87 +223,12 @@ A successful change: - preserves behaviour - reduces complexity -- improves clarity or structure +- improves clarity - is small and safe to merge -- does not introduce regression risk +- introduces no regression risk --- ## One-Line Rule -If in doubt: - > Keep behaviour the same, reduce risk, and make the smallest safe change. - ---- - -## Documentation Rule (Minimal and Targeted) - -Only document information that is necessary to safely understand or change the system later. - -Document: - -- key decisions (why something was changed) -- non-obvious behaviour -- risks or constraints (what must not be changed) -- important assumptions - -Do not document: - -- obvious code behaviour -- step-by-step implementation details -- temporary or experimental work -- duplicated explanations across files - -Prefer short, focused notes over long explanations. - -If unsure: - -> Will someone break the system in the future if this is not written down? - -If yes → document it -If no → do not document it - -Documentation should be minimal, high-signal, and never outweigh the value of the code itself. - -## Branch Safety Rule - -This refactor stream uses the `refactor` branch as its working base branch. - -For refactor work: - -- do all implementation from the `refactor` branch or a short-lived feature branch created from `refactor` -- do not implement refactor work directly on `SIPS-Development` - -`SIPS-Development` remains the BAU integration branch. -Refactor changes may be merged into `SIPS-Development` only when proven safe. - -If branch context is unclear, stop and confirm before making changes. - -## Branch Model - -- `SIPS-Development` = BAU branch -- `refactor` = refactor integration branch -- optional short-lived working branches for individual slices should be created from `refactor` - -## Regression Safety Rule (Critical) - -This is a live system. All refactor work must prove behaviour is unchanged. - -Before completing any slice: - -- verify core journey behaviour has not changed -- verify protected flows still work: - - save and exit - - resume appeal - - upload documents - - check answers - - submit appeal - - confirmation - -- verify EN/CY parity for any affected areas - -A slice is NOT complete until regression behaviour is confirmed. - -If regression cannot be confidently ruled out: -→ do not proceed to next slice diff --git a/components/case/representation/elements/RepresentationActionButtons.js b/components/case/representation/elements/RepresentationActionButtons.js new file mode 100644 index 00000000..8bc5ee9c --- /dev/null +++ b/components/case/representation/elements/RepresentationActionButtons.js @@ -0,0 +1,42 @@ +const RepresentationActionButtons = ({ + t, + locale, + isSaving, + isContinueDisabled, + onSaveExit +}) => { + return ( +
+
+ + + {isSaving ? ( + + {locale == "cy" ? "Nôl data" : "Saving data"} + {locale + + ) : ( + + )} +
+
+ ); +}; + +export default RepresentationActionButtons; diff --git a/components/case/representation/elements/RepresentationTypeSelectorBlock.js b/components/case/representation/elements/RepresentationTypeSelectorBlock.js new file mode 100644 index 00000000..38bde62b --- /dev/null +++ b/components/case/representation/elements/RepresentationTypeSelectorBlock.js @@ -0,0 +1,49 @@ +import { Field } from "redux-form"; + +import { RenderPickList } from "../representationElements"; + +const RepresentationTypeSelectorBlock = ({ + t, + headingText, + kindLabelText, + isTypeSelected, + selectedTypeDisplay, + optionsArr, + validate, + errorMsg +}) => { + return ( +
+
+ {!isTypeSelected ? ( + <> +

{headingText}

+ + + + + + ) : ( + + )} +
+
+ ); +}; + +export default RepresentationTypeSelectorBlock; diff --git a/components/case/representation/index.js b/components/case/representation/index.js index a67d1e1e..239b4f5a 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -33,6 +33,25 @@ import RepLPACapacitySelection from "./representationLPACapacitySelection"; import RepLandOwner from "./representationLandowner"; import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement"; import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78"; +import RepresentationFlowFormStage from "./shell/RepresentationFlowFormStage"; +import { + getQuestionnaireNextSection, + resolveJourneyStageFlags, + resolveRepresentationControlKey, + resolveSubmitTransition +} from "./utils/stepResolution"; +import { + findDetailsObjForSubmit, + findDetailsObjForView, + findResultsObjForCurrentReference, + resolveInitialCaseDataSources, + resolveSubmitCaseDetailsSource +} from "./utils/dataResolution"; +import { + buildRepresentationUpdateBody, + buildSubmitEnrichedValues, + runFinalisationSequence +} from "./utils/finalisationBoundary"; let MakeRepresentation = (props) => { let { t } = useTranslation(); @@ -105,6 +124,11 @@ let MakeRepresentation = (props) => { : false; const isNRW = currentView.caseReference?.isNRW; + const { showCheckStage } = resolveJourneyStageFlags({ + "representationSubmit": currentView.representationSubmit, + "representationSubmitConfirmation": + currentView.representationSubmitConfirmation + }); const setRepFileName = (values) => { if ( @@ -250,52 +274,31 @@ let MakeRepresentation = (props) => { const isEditState = router.query.state === "edit"; const hasState = router.query.hasOwnProperty("state"); - const getCaseDetailsObj = () => { - if (hasState) { - return isEditState - ? props.props.myRepresentations.myRepresentations - : props.props.searchResultsObj.searchDetailsObj; - } - return props.currentType === "watchedCases" - ? props.props.watchedCases.watchedCasesDetails - : props.props.searchResultsObj.searchDetailsObj; - }; + const { caseDetailsSource, caseResultsSource } = + resolveInitialCaseDataSources({ + hasState, + isEditState, + currentType: props.currentType, + myRepresentations: props.props.myRepresentations.myRepresentations, + searchDetailsObj: props.props.searchResultsObj.searchDetailsObj, + searchResultsObj: props.props.searchResultsObj.searchResultsObj, + watchedCasesDetails: props.props.watchedCases.watchedCasesDetails + }); - const getCaseResultsObj = () => { - if (hasState) { - return isEditState - ? props.props.myRepresentations.myRepresentations - : props.props.searchResultsObj.searchResultsObj; - } - return props.currentType === "watchedCases" - ? props.props.watchedCases.watchedCasesDetails - : props.props.searchResultsObj.searchResultsObj; - }; - - const setCaseDetailsObj = getCaseDetailsObj(); - const setCaseResultsObj = getCaseResultsObj(); - - let resultsObj = jsonpath({ - path: `$..[?(@ && @.ticketnumber=="${currentView.caseReference.currentReference}")]`, - json: setCaseResultsObj, - eval: true - })[0]; + let resultsObj = findResultsObjForCurrentReference({ + "currentReference": currentView.caseReference.currentReference, + "caseResultsSource": caseResultsSource + }); // let detailsObj; - if (hasState && isEditState) { - detailsObj = jsonpath({ - path: `$..[?(@ && @.repfile_name=="${router.query.created}")]`, - json: setCaseDetailsObj, - eval: true - })[0]; - } else { - detailsObj = jsonpath({ - path: `$..[?(@ && @.ticketnumber=="${currentView.caseReference.ticketnumber}")]`, - json: setCaseDetailsObj, - eval: true - })[0]; - } + detailsObj = findDetailsObjForView({ + hasState, + isEditState, + "queryCreated": router.query.created, + "ticketnumber": currentView.caseReference.ticketnumber, + "caseDetailsSource": caseDetailsSource + }); const safeDetailsObj = detailsObj || {}; const safeResultsObj = resultsObj || {}; @@ -586,19 +589,16 @@ let MakeRepresentation = (props) => { setCurrentReference }; - const getNormalizedCapacity = () => { - const rawCapacity = - currentView.representationCapacity || - currentView.caseReference?.repDetails?.representationCapacity || - "false"; - return rawCapacity.toLowerCase(); - }; + const { controlKey } = resolveRepresentationControlKey({ + "isLPA": isLPA, + "representationCapacity": currentView.representationCapacity, + "repDetailsCapacity": + currentView.caseReference?.repDetails?.representationCapacity, + "appealType": appealType, + "normalizeCapacity": normalizeCapacity + }); - if ( - isLPA && - (!currentView.representationCapacity || - currentView.representationCapacity === "") - ) { + if (controlKey === "lpa-capacity-selection") { return ( { ); } - const capacity = normalizeCapacity(getNormalizedCapacity()); - - switch (capacity) { - case "appellant": { + switch (controlKey) { + case "capacity-appellant": { const Component = appealType === 846040002 ? ConsultationAppellant @@ -634,7 +632,7 @@ let MakeRepresentation = (props) => { ); } - case "lpa": { + case "capacity-lpa": { return ( { ); } - case "agent": { + case "capacity-agent": { const Component = appealType === 846040002 ? ConsultationAgent : RepAgent; return ( @@ -663,7 +661,7 @@ let MakeRepresentation = (props) => { ); } - case "interestedparty": { + case "capacity-interestedparty": { const Component = appealType === 846040002 ? ConsultationInterestedPartyPerson @@ -678,7 +676,7 @@ let MakeRepresentation = (props) => { ); } - case "landowner": { + case "capacity-landowner": { return ( { ] }; - let updateBody = setRepFileName(formattedValues); - - // Clean and sanitize the body - const sanitizedBody = Object.entries(updateBody).reduce( - (acc, [key, val]) => { - if (val !== null && val !== undefined && !key.startsWith("_")) { - acc[key] = val; - } - return acc; - }, - {} - ); - - // Normalize "Yes"/"No" to booleans - const stringified = JSON.stringify(sanitizedBody) - .replace(/:"Yes"/g, ":true") - .replace(/:"No"/g, ":false"); - updateBody = JSON.parse(stringified); + const updateBody = buildRepresentationUpdateBody({ + formattedValues, + setRepFileName + }); const sendEmailIfNeeded = () => { if (sendSavedEmail) { @@ -957,24 +941,20 @@ let MakeRepresentation = (props) => { return; } - // Determine case data source - const getCaseDetailsSource = () => { - if (router.query?.state === "edit") { - return props.props.myRepresentations.myRepresentations; - } - return props.currentType === "watchedCases" - ? props.props.watchedCases.watchedCasesDetails - : props.props.searchResultsObj.searchDetailsObj; - }; - - const setCaseDetailsObj = getCaseDetailsSource(); + const caseDetailsSource = resolveSubmitCaseDetailsSource({ + "isEditState": router.query?.state === "edit", + "currentType": props.currentType, + "myRepresentations": + props.props.myRepresentations.myRepresentations, + "watchedCasesDetails": props.props.watchedCases.watchedCasesDetails, + "searchDetailsObj": props.props.searchResultsObj.searchDetailsObj + }); // Find correct case details - let detailsObj = jsonpath({ - path: `$..[?(@ && @.ticketnumber=="${ticketnumber}")]`, - json: setCaseDetailsObj, - eval: true - })[0]; + let detailsObj = findDetailsObjForSubmit({ + ticketnumber, + caseDetailsSource + }); // Cancel submit status if editing if (router.query?.state === "edit") { @@ -988,23 +968,6 @@ let MakeRepresentation = (props) => { ) { const formValues = formObj.representationForm.values; - const buildSiteAddress = () => { - const { - pinswg_siteaddressline1, - pinswg_siteaddressline2, - pinswg_siteaddresstown, - pinswg_siteaddresspostcode - } = detailsObj; - return [ - pinswg_siteaddressline1, - pinswg_siteaddressline2, - pinswg_siteaddresstown, - pinswg_siteaddresspostcode - ] - .filter(Boolean) - .join(" "); - }; - const representationCapacity = router.query?.state === "edit" ? props.props.currentView.representationCapacity @@ -1012,55 +975,19 @@ let MakeRepresentation = (props) => { ? "LPA" : values.representationCapacity; - Object.assign(values, { - ...formValues, - containerID: props.props.accountDetails.containerID, - appealType: - appealType || caseReferenceObj.repDetails.appealType, - incidentID: - caseReferenceObj.incidentid || - caseReferenceObj.repDetails.incidentid, - caseRef: caseReferenceObj.currentReference, - casereference: caseReferenceObj.currentReference, - pinswg_questionnaireduedate: - detailsObj.pinswg_questionnaireduedate, - pinswg_endofrepresentationperiod: - detailsObj.pinswg_endofrepresentationperiod, - pinswg_applicationacceptedasvalid: - detailsObj.pinswg_applicationacceptedasvalid, - pinswg_statementduedate: detailsObj.pinswg_statementduedate, - pinswg_statementsduedate: detailsObj.pinswg_statementsduedate, - pinswg_finalcommentsduedate: - detailsObj.pinswg_finalcommentsduedate, - pinswg_name: caseReferenceObj.currentReference, - firstname: accountDetails.firstname, - lastname: accountDetails.lastname, - emailAddress: accountDetails.emailaddress1, - siteAddress: buildSiteAddress(), - pinswg_siteaddressline1: detailsObj.pinswg_siteaddressline1, - pinswg_siteaddressline2: detailsObj.pinswg_siteaddressline2, - pinswg_siteaddresstown: detailsObj.pinswg_siteaddresstown, - pinswg_siteaddresspostcode: - detailsObj.pinswg_siteaddresspostcode, - pinswg_lpareference: resultsObj?.pinswg_lpareference, - _pinswg_appellant_value: detailsObj._pinswg_appellant_value, - "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue": - detailsObj[ - "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue" - ], - _pinswg_localplanningauthority_value: - detailsObj._pinswg_localplanningauthority_value || - detailsObj._pinswg_associatedlpa_value, - "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue": - detailsObj[ - "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" - ] || - detailsObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ], - representationCapacity, - locale: router.locale - }); + Object.assign( + values, + buildSubmitEnrichedValues({ + formValues, + accountDetails, + appealType, + caseReferenceObj, + detailsObj, + resultsObj, + representationCapacity, + locale: router.locale + }) + ); } const shouldSubmit = !currentView.representationSubmit; @@ -1078,19 +1005,20 @@ let MakeRepresentation = (props) => { : normalizeCapacity(values.representationCapacity); setRepresentationCapacity(capacity); } else { - if (repType === "Questionnaire") { - if ( - questionnaireCount !== 0 && - showQuestionnaireSection < questionnaireCount - ) { - setShowQuestionnaireSection( - showQuestionnaireSection + 1 - ); - updateRepresentation(values, false, false); - } else { - updateRepresentation(values, false, false); - setRepresentationSubmit(true); - } + const submitTransition = resolveSubmitTransition({ + "representationType": repType, + "showQuestionnaireSection": showQuestionnaireSection, + "questionnaireCount": questionnaireCount + }); + + if (submitTransition === "advanceQuestionnaire") { + setShowQuestionnaireSection( + getQuestionnaireNextSection( + showQuestionnaireSection, + questionnaireCount + ) + ); + updateRepresentation(values, false, false); } else { updateRepresentation(values, false, false); setRepresentationSubmit(true); @@ -1113,19 +1041,19 @@ let MakeRepresentation = (props) => { } // Final PDF & upload - setFinaliseAppealProcess(true); - generateRepPDF( + runFinalisationSequence({ values, - props.props.accountDetails.containerID, - props.currentView.caseReference.currentReference - ).then((data) => { + containerID: props.props.accountDetails.containerID, + currentReference: + props.currentView.caseReference.currentReference, + setFinaliseAppealProcess, + generateRepPDF, + updateLinks, + uploadRepresentationFiles, + setRepresentationSubmit, + setRepresentationSubmitConfirmation + }).then((data) => { console.log(data, ""); - if (data.status === "success") { - values = updateLinks(values); - uploadRepresentationFiles(values); - setRepresentationSubmit(true); - setRepresentationSubmitConfirmation(true); - } }); } }; @@ -1252,7 +1180,7 @@ let MakeRepresentation = (props) => { return (
- {currentView.representationSubmit ? ( + {showCheckStage ? ( { docsOffline={docsOffline} /> ) : ( - <> -

- {appealIsConsultation - ? t( - "myrepresentations:make-a-consultation-on-label" - ) - : t( - "myrepresentations:make-a-representation-on-label" - )}{" "} - {currentView.caseReference.currentReference}{" "} -

-
-
- {whichControl()} -
- -
-
-
-

- {t( - "myrepresentations:timetable-title" - )} -

-
-
- {appealIsLocalImpact - ? t( - "myrepresentations:local-impact-report" - ) - : t( - "myrepresentations:questionnaire-due-label" - )} - :{" "} - - {renderDueDate()} - -
- - {!appealIsConsultation && - renderStatementsDue()} - - {renderMarineImpact()} - - {renderConsultationClose()} - - {renderFinalCommentsDue()} -
-
-
- - {isQuestionnaire && whichProgress()} -
-
- + )}
diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js index 14368697..6773b6aa 100644 --- a/components/case/representation/representationAgent.js +++ b/components/case/representation/representationAgent.js @@ -8,16 +8,17 @@ import { bytesToSize, getThumbnailIconByExtension } from "../../utils"; import { FileUploadField, RenderCondtionalRadioList, - RenderPickList, RenderRichMultiline, - shouldDisableButton, + shouldDisableButton } from "./representationElements"; +import RepresentationActionButtons from "./elements/RepresentationActionButtons"; +import RepresentationTypeSelectorBlock from "./elements/RepresentationTypeSelectorBlock"; import { useDropzone } from "react-dropzone"; import { setRepresentationCapacity, setRepresentationSubmit, - setFilesForRepresentations, + setFilesForRepresentations } from "../../../store/currentView/action"; const RepAgent = (props) => { @@ -35,7 +36,7 @@ const RepAgent = (props) => { updateRepresentation, setSavingStatus, savingStatus, - setFilesForRepresentations, + setFilesForRepresentations } = props; const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); @@ -63,58 +64,44 @@ const RepAgent = (props) => { )); const required = (value) => (value ? undefined : "Required"); + const hasTypeSelectionInline = + typeof formObj.representationForm.values.representationType == + "undefined" && props.representationType != "Select..."; + + const selectedRepresentationTypeDisplay = + router.locale == "cy" + ? formObj.representationForm.values.representationType == + "Questionnaire" + ? "Holiadur" + : formObj.representationForm.values.representationType == + "Statement" + ? "Datganiad" + : formObj.representationForm.values.representationType == + "Final comments" + ? "Sylwadau terfynol" + : formObj.representationForm.values.representationType + : formObj.representationForm.values.representationType; + + const handleSaveExit = () => { + let valuesObj = props.props.props.form[props.form].values || {}; + + delete valuesObj["_pinswg_appellant_value"]; + + updateRepresentation(valuesObj, false, true); + }; + return ( <> -
-
- {typeof formObj.representationForm.values - .representationType == "undefined" && - props.representationType != "Select..." ? ( - <> -

- {t( - "myrepresentations:representation-from-an-agent-heading" - )} -

- - - - - - ) : ( - - )} -
-
+ {(typeof props.representationType != "undefined" || typeof formObj.representationForm.values .representationType != "undefined") && ( @@ -242,62 +229,16 @@ const RepAgent = (props) => { )} {typeof formObj.representationForm.values.representationType != "undefined" && ( -
-
- - - {savingStatus ? ( - - {router.locale == "cy" - ? "Nôl data" - : "Saving data"} - { - - ) : ( - - )} -
-
+ )} ); @@ -310,7 +251,7 @@ const mapDispatchToProps = (dispatch) => ({ setFilesForRepresentations: (fileList) => { dispatch(setFilesForRepresentations(fileList)); - }, + } }); export default connect( @@ -320,6 +261,6 @@ export default connect( reduxForm({ form: "representationForm", enableReinitialize: true, - destroyOnUnmount: false, + destroyOnUnmount: false })(RepAgent) ); diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js index 59b51e25..290697f2 100644 --- a/components/case/representation/representationAppellant.js +++ b/components/case/representation/representationAppellant.js @@ -9,14 +9,16 @@ import { FileUploadField, RenderPickList, RenderRichMultiline, - shouldDisableButton, + shouldDisableButton } from "./representationElements"; +import RepresentationActionButtons from "./elements/RepresentationActionButtons"; +import RepresentationTypeSelectorBlock from "./elements/RepresentationTypeSelectorBlock"; import { useDropzone } from "react-dropzone"; import { setRepresentationCapacity, setRepresentationSubmit, - setFilesForRepresentations, + setFilesForRepresentations } from "../../../store/currentView/action"; const RepAppellant = (props) => { @@ -34,7 +36,7 @@ const RepAppellant = (props) => { updateRepresentation, setSavingStatus, savingStatus, - setFilesForRepresentations, + setFilesForRepresentations } = props; const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); @@ -62,56 +64,44 @@ const RepAppellant = (props) => { index === self.findIndex((t) => t.name === value.name) ); + const hasTypeSelectionInline = + typeof formObj.representationForm.values.representationType == + "undefined" && props.representationType != "Select..."; + + const selectedRepresentationTypeDisplay = + router.locale == "cy" + ? formObj.representationForm.values.representationType == + "Questionnaire" + ? "Holiadur" + : formObj.representationForm.values.representationType == + "Statement" + ? "Datganiad" + : formObj.representationForm.values.representationType == + "Final comments" + ? "Sylwadau terfynol" + : formObj.representationForm.values.representationType + : formObj.representationForm.values.representationType; + + const handleSaveExit = () => { + let valuesObj = props.props.props.form[props.form].values || {}; + + delete valuesObj["_pinswg_appellant_value"]; + + updateRepresentation(valuesObj, false, true); + }; + return ( <> -
-
- {typeof formObj.representationForm.values - .representationType == "undefined" && - props.representationType != "Select..." ? ( - <> -

- {t( - "myrepresentations:representation-from-an-appellant-heading" - )} -

- - - - ) : ( - - )} -
-
+ {(typeof props.representationType != "undefined" || typeof formObj.representationForm.values .representationType != "undefined") && ( @@ -232,62 +222,16 @@ const RepAppellant = (props) => { {typeof formObj.representationForm.values.representationType != "undefined" && ( -
-
- - - {savingStatus ? ( - - {router.locale == "cy" - ? "Nôl data" - : "Saving data"} - { - - ) : ( - - )} -
-
+ )} ); @@ -303,7 +247,7 @@ const mapDispatchToProps = (dispatch) => { setFilesForRepresentations: (fileList) => { dispatch(setFilesForRepresentations(fileList)); - }, + } }; }; @@ -314,6 +258,6 @@ export default connect( reduxForm({ form: "representationForm", enableReinitialize: true, - destroyOnUnmount: false, + destroyOnUnmount: false })(RepAppellant) ); diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js index cbd53f81..67011a7e 100644 --- a/components/case/representation/representationCompleteSubmit.js +++ b/components/case/representation/representationCompleteSubmit.js @@ -61,6 +61,13 @@ const RepCompleteSubmit = (props) => { repFormData = updateLinks(repFormData); + const representationOnBehalfOfDisplay = + repFormData.representationOnBehalfOf === "Yes" + ? t("myrepresentations:questionnaire-yes") + : repFormData.representationOnBehalfOf === "No" + ? t("myrepresentations:questionnaire-no") + : repFormData.representationOnBehalfOf; + //const repDate = new Date(); // let day = repDate.getDate(); @@ -406,7 +413,7 @@ const RepCompleteSubmit = (props) => {
{ - repFormData.representationOnBehalfOf + representationOnBehalfOfDisplay }
diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js index d59ffda3..8f418db6 100644 --- a/components/case/representation/representationElements.js +++ b/components/case/representation/representationElements.js @@ -258,6 +258,26 @@ export const RenderCondtionalRadioList = ({ }) => { const required = (value) => (value ? undefined : "Required"); let { t } = useTranslation(); + + const yesValue = t("myrepresentations:questionnaire-yes"); + const noValue = t("myrepresentations:questionnaire-no"); + + const normalizeYesNo = (rawValue) => { + if (rawValue === true) return "Yes"; + if (rawValue === false) return "No"; + if (rawValue === "Yes" || rawValue === yesValue) return "Yes"; + if (rawValue === "No" || rawValue === noValue) return "No"; + return rawValue; + }; + + const isYesSelected = normalizeYesNo(value) === "Yes"; + + const requiredIfYes = (fieldValue, allValues) => { + const selectedValue = normalizeYesNo(allValues?.[id]); + return selectedValue === "Yes" && !String(fieldValue || "").trim() + ? "Required" + : undefined; + }; return ( <>
- {Object.keys(options).map((key, index) => ( -
+ {Object.keys(options).map((key, index) => { + const normalizedOptionValue = normalizeYesNo( + options[key] + ); + + return (
- - -
- {value == "Yes" && options[key] == "Yes" && (
-
+
+ {options[key] == "Yes" + ? t( + "myrepresentations:questionnaire-yes" + ) + : t( + "myrepresentations:questionnaire-no" + )} +
- )} -
- ))} + {isYesSelected && + normalizedOptionValue === "Yes" && ( +
+
+ + +
+
+ )} +
+ ); + })}
diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js index 63c21ab7..36ff8656 100644 --- a/components/case/representation/representationInterestedPartyPerson.js +++ b/components/case/representation/representationInterestedPartyPerson.js @@ -8,10 +8,11 @@ import { bytesToSize, getThumbnailIconByExtension } from "../../utils"; import { FileUploadField, RenderCondtionalRadioList, - RenderPickList, RenderRichMultiline, shouldDisableButton } from "./representationElements"; +import RepresentationActionButtons from "./elements/RepresentationActionButtons"; +import RepresentationTypeSelectorBlock from "./elements/RepresentationTypeSelectorBlock"; import { useDropzone } from "react-dropzone"; import { @@ -62,63 +63,47 @@ const RepInterestedPartyPerson = (props) => { {file.path} - {file.size} bytes )); + + const hasTypeSelectionInline = + typeof formObj.representationForm.values.representationType == + "undefined" && props.representationType != "Select..."; + + const selectedRepresentationTypeDisplay = + router.locale == "cy" + ? formObj.representationForm.values.representationType == + "Questionnaire" + ? "Holiadur" + : formObj.representationForm.values.representationType == + "Statement" + ? "Datganiad" + : formObj.representationForm.values.representationType == + "Final comments" + ? "Sylwadau terfynol" + : formObj.representationForm.values.representationType + : formObj.representationForm.values.representationType; + + const handleSaveExit = () => { + let valuesObj = props.props.props.form[props.form].values || {}; + + delete valuesObj["_pinswg_appellant_value"]; + + updateRepresentation(valuesObj, false, true); + }; + return ( <> -
-
- {typeof formObj.representationForm.values - .representationType == "undefined" && - props.representationType != "Select..." ? ( - <> -

- {t( - "myrepresentations:consultation-from-an-interested-person-heading" - )} -

- - - - - - ) : ( - - )} -
-
+ {(typeof props.representationType != "undefined" || typeof formObj.representationForm.values .representationType != "undefined") && ( @@ -129,12 +114,7 @@ const RepInterestedPartyPerson = (props) => { name="representationOnBehalfOf" datafieldname="representationOnBehalfOf" // label="In what capacity do you wish to make representations on this case?" - options={[ - t( - "myrepresentations:questionnaire-yes" - ), - t("myrepresentations:questionnaire-no") - ]} + options={["Yes", "No"]} id="representationOnBehalfOf" className="govuk-radios__input" errorMsg={t( @@ -235,80 +215,16 @@ const RepInterestedPartyPerson = (props) => { )} {typeof formObj.representationForm.values.representationType != "undefined" && ( -
-
- - {/* - { - setRepresentationCapacity(); - props.updateField( - "representationForm", - "representationCapacity", - "" - ); - props.updateField( - "representationForm", - "representationType", - "" - ); - }} - className="govuk-link" - > - {t("case:summary-back-button-label")} - */} - {savingStatus ? ( - - {router.locale == "cy" - ? "Nôl data" - : "Saving data"} - { - - ) : ( - - )} -
-
+ )} ); diff --git a/components/case/representation/shell/RepresentationFlowFormStage.js b/components/case/representation/shell/RepresentationFlowFormStage.js new file mode 100644 index 00000000..24a1c423 --- /dev/null +++ b/components/case/representation/shell/RepresentationFlowFormStage.js @@ -0,0 +1,50 @@ +import RepresentationTimetablePanel from "./RepresentationTimetablePanel"; + +const RepresentationFlowFormStage = ({ + t, + appealIsConsultation, + currentReference, + whichControl, + appealIsLocalImpact, + renderDueDate, + renderStatementsDue, + renderMarineImpact, + renderConsultationClose, + renderFinalCommentsDue, + isQuestionnaire, + whichProgress +}) => { + return ( + <> +

+ {appealIsConsultation + ? t("myrepresentations:make-a-consultation-on-label") + : t( + "myrepresentations:make-a-representation-on-label" + )}{" "} + {currentReference}{" "} +

+ +
+
+ {whichControl()} +
+ + +
+ + ); +}; + +export default RepresentationFlowFormStage; diff --git a/components/case/representation/shell/RepresentationTimetablePanel.js b/components/case/representation/shell/RepresentationTimetablePanel.js new file mode 100644 index 00000000..b9169690 --- /dev/null +++ b/components/case/representation/shell/RepresentationTimetablePanel.js @@ -0,0 +1,49 @@ +const RepresentationTimetablePanel = ({ + t, + appealIsConsultation, + appealIsLocalImpact, + renderDueDate, + renderStatementsDue, + renderMarineImpact, + renderConsultationClose, + renderFinalCommentsDue, + isQuestionnaire, + whichProgress +}) => { + return ( +
+
+
+

+ {t("myrepresentations:timetable-title")} +

+
+
+ {appealIsLocalImpact + ? t("myrepresentations:local-impact-report") + : t( + "myrepresentations:questionnaire-due-label" + )} + :{" "} + + {renderDueDate()} + +
+ + {!appealIsConsultation && renderStatementsDue()} + + {renderMarineImpact()} + + {renderConsultationClose()} + + {renderFinalCommentsDue()} +
+
+
+ + {isQuestionnaire && whichProgress()} +
+ ); +}; + +export default RepresentationTimetablePanel; diff --git a/components/case/representation/utils/dataResolution.js b/components/case/representation/utils/dataResolution.js new file mode 100644 index 00000000..75409420 --- /dev/null +++ b/components/case/representation/utils/dataResolution.js @@ -0,0 +1,93 @@ +import { JSONPath as jsonpath } from "jsonpath-plus"; + +export const resolveInitialCaseDataSources = ({ + hasState, + isEditState, + currentType, + myRepresentations, + searchDetailsObj, + searchResultsObj, + watchedCasesDetails +}) => { + if (hasState) { + return { + "caseDetailsSource": isEditState + ? myRepresentations + : searchDetailsObj, + "caseResultsSource": isEditState + ? myRepresentations + : searchResultsObj + }; + } + + return { + "caseDetailsSource": + currentType === "watchedCases" + ? watchedCasesDetails + : searchDetailsObj, + "caseResultsSource": + currentType === "watchedCases" + ? watchedCasesDetails + : searchResultsObj + }; +}; + +export const findResultsObjForCurrentReference = ({ + currentReference, + caseResultsSource +}) => { + return jsonpath({ + path: `$..[?(@ && @.ticketnumber=="${currentReference}")]`, + "json": caseResultsSource, + "eval": true + })[0]; +}; + +export const findDetailsObjForView = ({ + hasState, + isEditState, + queryCreated, + ticketnumber, + caseDetailsSource +}) => { + if (hasState && isEditState) { + return jsonpath({ + path: `$..[?(@ && @.repfile_name=="${queryCreated}")]`, + "json": caseDetailsSource, + "eval": true + })[0]; + } + + return jsonpath({ + path: `$..[?(@ && @.ticketnumber=="${ticketnumber}")]`, + "json": caseDetailsSource, + "eval": true + })[0]; +}; + +export const resolveSubmitCaseDetailsSource = ({ + isEditState, + currentType, + myRepresentations, + watchedCasesDetails, + searchDetailsObj +}) => { + if (isEditState) { + return myRepresentations; + } + + return currentType === "watchedCases" + ? watchedCasesDetails + : searchDetailsObj; +}; + +export const findDetailsObjForSubmit = ({ + ticketnumber, + caseDetailsSource +}) => { + return jsonpath({ + path: `$..[?(@ && @.ticketnumber=="${ticketnumber}")]`, + "json": caseDetailsSource, + "eval": true + })[0]; +}; diff --git a/components/case/representation/utils/finalisationBoundary.js b/components/case/representation/utils/finalisationBoundary.js new file mode 100644 index 00000000..ef2a0aee --- /dev/null +++ b/components/case/representation/utils/finalisationBoundary.js @@ -0,0 +1,126 @@ +export const buildRepresentationUpdateBody = ({ + formattedValues, + setRepFileName +}) => { + let updateBody = setRepFileName(formattedValues); + + const sanitizedBody = Object.entries(updateBody).reduce( + (acc, [key, val]) => { + if (val !== null && val !== undefined && !key.startsWith("_")) { + acc[key] = val; + } + return acc; + }, + {} + ); + + const stringified = JSON.stringify(sanitizedBody) + .replace(/:"Yes"/g, ":true") + .replace(/:"No"/g, ":false"); + + updateBody = JSON.parse(stringified); + + return updateBody; +}; + +export const buildSubmitEnrichedValues = ({ + formValues, + accountDetails, + appealType, + caseReferenceObj, + detailsObj, + resultsObj, + representationCapacity, + locale +}) => { + const buildSiteAddress = () => { + const { + pinswg_siteaddressline1, + pinswg_siteaddressline2, + pinswg_siteaddresstown, + pinswg_siteaddresspostcode + } = detailsObj; + + return [ + pinswg_siteaddressline1, + pinswg_siteaddressline2, + pinswg_siteaddresstown, + pinswg_siteaddresspostcode + ] + .filter(Boolean) + .join(" "); + }; + + return { + ...formValues, + containerID: accountDetails.containerID, + appealType: appealType || caseReferenceObj.repDetails.appealType, + incidentID: + caseReferenceObj.incidentid || + caseReferenceObj.repDetails.incidentid, + caseRef: caseReferenceObj.currentReference, + casereference: caseReferenceObj.currentReference, + pinswg_questionnaireduedate: detailsObj.pinswg_questionnaireduedate, + pinswg_endofrepresentationperiod: + detailsObj.pinswg_endofrepresentationperiod, + pinswg_applicationacceptedasvalid: + detailsObj.pinswg_applicationacceptedasvalid, + pinswg_statementduedate: detailsObj.pinswg_statementduedate, + pinswg_statementsduedate: detailsObj.pinswg_statementsduedate, + pinswg_finalcommentsduedate: detailsObj.pinswg_finalcommentsduedate, + pinswg_name: caseReferenceObj.currentReference, + firstname: accountDetails.firstname, + lastname: accountDetails.lastname, + emailAddress: accountDetails.emailaddress1, + siteAddress: buildSiteAddress(), + pinswg_siteaddressline1: detailsObj.pinswg_siteaddressline1, + pinswg_siteaddressline2: detailsObj.pinswg_siteaddressline2, + pinswg_siteaddresstown: detailsObj.pinswg_siteaddresstown, + pinswg_siteaddresspostcode: detailsObj.pinswg_siteaddresspostcode, + pinswg_lpareference: resultsObj?.pinswg_lpareference, + _pinswg_appellant_value: detailsObj._pinswg_appellant_value, + "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue": + detailsObj[ + "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue" + ], + _pinswg_localplanningauthority_value: + detailsObj._pinswg_localplanningauthority_value || + detailsObj._pinswg_associatedlpa_value, + "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue": + detailsObj[ + "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" + ] || + detailsObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ], + representationCapacity, + locale + }; +}; + +export const runFinalisationSequence = ({ + values, + containerID, + currentReference, + setFinaliseAppealProcess, + generateRepPDF, + updateLinks, + uploadRepresentationFiles, + setRepresentationSubmit, + setRepresentationSubmitConfirmation +}) => { + setFinaliseAppealProcess(true); + + return generateRepPDF(values, containerID, currentReference).then( + (data) => { + if (data.status === "success") { + const updatedValues = updateLinks(values); + uploadRepresentationFiles(updatedValues); + setRepresentationSubmit(true); + setRepresentationSubmitConfirmation(true); + } + + return data; + } + ); +}; diff --git a/components/case/representation/utils/stepResolution.js b/components/case/representation/utils/stepResolution.js new file mode 100644 index 00000000..4353c462 --- /dev/null +++ b/components/case/representation/utils/stepResolution.js @@ -0,0 +1,73 @@ +export const resolveJourneyStageFlags = ({ + representationSubmit, + representationSubmitConfirmation +}) => { + const showCheckStage = + representationSubmit === true || representationSubmit === "true"; + const showCompletionStage = + representationSubmitConfirmation === true || + representationSubmitConfirmation === "true"; + + return { + showFormStage: !showCheckStage, + showCheckStage, + showCompletionStage + }; +}; + +export const resolveRepresentationControlKey = ({ + isLPA, + representationCapacity, + repDetailsCapacity, + appealType, + normalizeCapacity +}) => { + if (isLPA && (!representationCapacity || representationCapacity === "")) { + return { + controlKey: "lpa-capacity-selection", + normalizedCapacity: "" + }; + } + + const rawCapacity = representationCapacity || repDetailsCapacity || "false"; + const normalizedCapacity = normalizeCapacity(rawCapacity.toLowerCase()); + + return { + controlKey: `capacity-${normalizedCapacity}`, + normalizedCapacity + }; +}; + +export const resolveSubmitTransition = ({ + representationType, + showQuestionnaireSection, + questionnaireCount +}) => { + if (representationType !== "Questionnaire") { + return "goToCheck"; + } + + if ( + questionnaireCount !== 0 && + showQuestionnaireSection < questionnaireCount + ) { + return "advanceQuestionnaire"; + } + + return "goToCheck"; +}; + +export const getQuestionnaireNextSection = ( + currentSection, + questionnaireCount +) => { + if (questionnaireCount !== 0 && currentSection < questionnaireCount) { + return currentSection + 1; + } + + return currentSection; +}; + +export const getQuestionnairePreviousSection = (currentSection) => { + return currentSection > 1 ? currentSection - 1 : currentSection; +}; diff --git a/components/case/summary.js b/components/case/summary.js index 660b874d..90e718c3 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -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 + } ) ? ( <> { }} 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 + ) + )} - ) : !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 - ) ? ( - <> - + {canShowRepButtonForAppealType( + { + "appealType": + props + .currentView + .caseReference + .appealType, + "isLPA": + isLPA, + "searchDetailsObj": + props.searchDetailsObj + } + ) ? ( + <> + - {t( - "case:summary-make-representation-label" - )} - - - ) : !isLPA && - props - .currentView - .caseReference - .appealType == - 846040004 ? ( - "" - ) : ( - <> -
-
-

- {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" + )} + + + ) : shouldSuppressBlockedMessage( + { + "appealType": + props + .currentView + .caseReference + .appealType, + "isLPA": + isLPA + } + ) ? ( + "" + ) : ( + <> +

+
+

+ {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 ) - } - )} -
{" "} - {t( - "case:representation-date-passed-additional-label" - )}{" "} - - {t( + ) + } + )} +
{" "} + {t( + "case:representation-date-passed-additional-label" + )}{" "} + -

-
+ ) + } + > + {t( + "home:login-contact-email" + )} + +

- - )} - - )} +
+ + )} + + )} { null || detailsObj.pinswg_finalcommentsduedate != null) && - showRepsEnded( - detailsObj.pinswg_startdate, - detailsObj.pinswg_finalcommentsduedate + isRepresentationPeriodEnded( + detailsObj ) && (
{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, diff --git a/components/case/summary/components/SummaryCard.js b/components/case/summary/components/SummaryCard.js new file mode 100644 index 00000000..cceb7789 --- /dev/null +++ b/components/case/summary/components/SummaryCard.js @@ -0,0 +1,24 @@ +const SummaryCard = ({ + id, + title, + headingTag = "h2", + headingClassName = "govuk-heading-m govuk-!-margin-bottom-7", + children +}) => { + const HeadingTag = headingTag; + + return ( +
+
+
+ + {title} + + {children} +
+
+
+ ); +}; + +export default SummaryCard; diff --git a/components/case/summary/components/SummaryRow.js b/components/case/summary/components/SummaryRow.js new file mode 100644 index 00000000..d683cc4c --- /dev/null +++ b/components/case/summary/components/SummaryRow.js @@ -0,0 +1,15 @@ +const SummaryRow = ({ + label, + value, + keyClassName = "govuk-summary-list__key", + valueClassName = "govuk-summary-list__value" +}) => { + return ( +
+
{label}
+
{value}
+
+ ); +}; + +export default SummaryRow; diff --git a/components/case/summary/utils/representationEntry.js b/components/case/summary/utils/representationEntry.js new file mode 100644 index 00000000..d9b052ab --- /dev/null +++ b/components/case/summary/utils/representationEntry.js @@ -0,0 +1,117 @@ +export function showRepsLocal(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; +} + +export function showRepsEndedLocal(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; +} + +export function isConsultationWindowOpen(detailsObj) { + return showRepsLocal( + detailsObj.pinswg_consultationopen, + detailsObj.pinswg_consultationclose + ); +} + +export function isGeneralRepresentationWindowOpen(detailsObj) { + return ( + (Object.prototype.hasOwnProperty.call(detailsObj, "pinswg_startdate") || + Object.prototype.hasOwnProperty.call( + detailsObj, + "pinswg_applicationacceptedasvalid" + ) || + Object.prototype.hasOwnProperty.call( + detailsObj, + "pinswg_startdates" + )) && + showRepsLocal( + detailsObj.pinswg_startdate || + detailsObj.pinswg_startdates || + detailsObj.pinswg_applicationacceptedasvalid, + detailsObj.pinswg_finalcommentsduedate || + detailsObj.pinswg_endofrepresentationperiod + ) + ); +} + +export function canShowRepButtonForAppealType({ + appealType, + isLPA, + searchDetailsObj +}) { + 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 searchDetailsObj[0].value[0].pinswg_specialistcaseprocess == + 846040001 + ? showRepsLocal( + searchDetailsObj[0].value[0].pinswg_startdate, + searchDetailsObj[0].value[0].pinswg_finalcommentsduedate + ) + : true; + + case 846040018: + let shouldShow = + searchDetailsObj[0].value[0].pinswg_speacialistcaseprocess == + 846040000 && isLPA + ? true + : searchDetailsObj[0].value[0] + .pinswg_speacialistcaseprocess == 846040001 + ? true + : false; + + return shouldShow; + + case 846040019: + return showRepsLocal( + searchDetailsObj[0].value[0].pinswg_startdate, + searchDetailsObj[0].value[0].pinswg_statementduedate + ); + + default: + return true; + } +} + +export function getEntryCtaLabelKey(appealType) { + return appealType == 846040002 + ? "case:summary-make-consultation-label" + : "case:summary-make-representation-label"; +} + +export function shouldSuppressBlockedMessage({ appealType, isLPA }) { + return !isLPA && appealType == 846040004; +} + +export function getGeneralBlockedEndDate(detailsObj, appealType) { + return appealType == 846040019 + ? detailsObj.pinswg_statementduedate + : detailsObj.pinswg_finalcommentsduedate; +} + +export function isRepresentationPeriodEnded(detailsObj) { + return showRepsEndedLocal( + detailsObj.pinswg_startdate, + detailsObj.pinswg_finalcommentsduedate + ); +} diff --git a/components/case/summaryTypes/pinswg_advertsid.js b/components/case/summaryTypes/pinswg_advertsid.js index 4780d17c..fc899e68 100644 --- a/components/case/summaryTypes/pinswg_advertsid.js +++ b/components/case/summaryTypes/pinswg_advertsid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_advertsid = (props) => { let { t } = useTranslation(); @@ -13,431 +15,350 @@ const Pinswg_advertsid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
+ ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> -
-
- Specialist Case Process -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + -
+ ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> -
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + -
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
+ ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> -
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
+ "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + +
+ -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( + -
+ ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements + ) + ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateoftheevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateoftheevent - ) - ? formatDates( - detailsObj.pinswg_startdateoftheevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
-
-
+ + + +
); diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js index ba4ce00e..e50f5142 100644 --- a/components/case/summaryTypes/pinswg_callinss77id.js +++ b/components/case/summaryTypes/pinswg_callinss77id.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_callinss77id = (props) => { let { t } = useTranslation(); @@ -13,291 +15,241 @@ const Pinswg_callinss77id = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + -
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate + "case:summary-case-link-status-not-linked" ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {/*
+ : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} +
+ + +
+ + + {/*
{t( "case:summary-date-exported-to-iss-label" @@ -323,95 +275,75 @@ const Pinswg_callinss77id = (props) => {
*/} -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( + + -
-
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_otherpartiesstatement" + ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatement - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatement - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_otherpartiesstatements" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatements - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatements - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {/*
+ ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> + + {/*
{t( "case:summary-inquiry-evidence-date-label" @@ -436,81 +368,56 @@ const Pinswg_callinss77id = (props) => { )}
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateofevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateofevent - ) - ? formatDates( - detailsObj.pinswg_startdateofevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
-
-
+ + + + +
); diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js index bebd21c3..d552a000 100644 --- a/components/case/summaryTypes/pinswg_commonlandid.js +++ b/components/case/summaryTypes/pinswg_commonlandid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_commonlandid = (props) => { let { t } = useTranslation(); @@ -13,412 +15,338 @@ const Pinswg_commonlandid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + -
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
-
- {t( - "case:summary-case-relevant-authoritylabel" - )} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.pinswg_lpa=="' + - detailsObj.pinswg_relevantauthorityname + - '")].value_cy', - json: transLookup, - eval: true, - }) - : jsonpath({ - path: - '$..[?(@ && @.pinswg_lpa=="' + - detailsObj.pinswg_relevantauthorityname + - '")].value', - json: transLookup, - eval: true, - }) || - t( - "case:summary-no-date-entered-label" - )} -
-
-
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
+ "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + + +
+ -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementsduedate - ) - ? formatDates( - detailsObj.pinswg_statementsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( + -
+ ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements + ) + ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {/*
+ + {/*
{t( "case:summary-inquiry-evidence-date-label" @@ -443,82 +371,57 @@ const Pinswg_commonlandid = (props) => { )}
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_starttimeoftheevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_starttimeoftheevent - ) - ? formatDates( - detailsObj.pinswg_starttimeoftheevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
-
-
+ + + +
); diff --git a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js index 91f6c14a..b7384d22 100644 --- a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js +++ b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_communityinfrastructurelevyid = (props) => { let { t } = useTranslation(); @@ -13,406 +15,327 @@ const Pinswg_communityinfrastructurelevyid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + -
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( + "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} +
+
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} +
+ + +
+ + -
+ ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements + ) + ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateoftheevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateoftheevent - ) - ? formatDates( - detailsObj.pinswg_startdateoftheevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
-
+ + + +
); diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js index 8549d427..b6eae8f5 100644 --- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js +++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_compulsorypurchaseordersid = (props) => { let { t } = useTranslation(); @@ -13,392 +15,320 @@ const Pinswg_compulsorypurchaseordersid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
+ ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> -
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
-
- {t( - "case:summary-case-relevant-authoritylabel" - )} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.pinswg_lpa=="' + - detailsObj.pinswg_relevantauthorityname + - '")].value_cy', - json: transLookup, - eval: true, - }) - : jsonpath({ - path: - '$..[?(@ && @.pinswg_lpa=="' + - detailsObj.pinswg_relevantauthorityname + - '")].value', - json: transLookup, - eval: true, - }) || - t( - "case:summary-no-date-entered-label" - )} -
-
-
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
+ "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + + +
+ -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( + -
+ ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements + ) + ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {/*
+ + {/*
{t( "case:summary-inquiry-evidence-date-label" @@ -423,82 +353,57 @@ const Pinswg_compulsorypurchaseordersid = (props) => { )}
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateofevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateofevent - ) - ? formatDates( - detailsObj.pinswg_startdateofevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
-
-
+ + + +
); diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js index d8e93f16..3fe26e99 100644 --- a/components/case/summaryTypes/pinswg_dnsid.js +++ b/components/case/summaryTypes/pinswg_dnsid.js @@ -3,6 +3,8 @@ import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; import GoogleMapComponent from "../../mapping/"; @@ -92,12 +94,13 @@ const Pinswg_dnsid = (props) => {
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + { ] || t( "case:summary-no-date-entered-label", - )} -
-
+ ) + + } + + /> {detailsObj.pinswg_webaddress != null && ( -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -154,16 +160,19 @@ const Pinswg_dnsid = (props) => { ) || t( "case:summary-no-date-entered-label", - )} -
-
+ ) + + } + + /> )} -
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + { }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t( + ] || "" + + } + + /> + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj[ @@ -200,15 +212,18 @@ const Pinswg_dnsid = (props) => { ] || t( "case:summary-to-be-confirmed-label", - )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + ) + + } + + /> + { ] || t( "case:summary-to-be-confirmed-label", - )} -
-
- {/*
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + ) + + } + + /> + {/* { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
*/} - {/*
-
- {t( + ) + } + /> */} + {/* -
- - {_.has(casesObj, "_ownerid_value") + value={ + _.has(casesObj, "_ownerid_value") ? casesObj[ "_ownerid_value@OData.Community.Display.V1.FormattedValue" ] - : ""} -
-
*/} -
-
- {t( + : "" + } + /> */} + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -284,17 +297,20 @@ const Pinswg_dnsid = (props) => { }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t( + ] || "" + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_startdateofevent", ) @@ -309,15 +325,18 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-no-information-to-date-label", - )} -
-
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-to-be-confirmed-label", - )} -
-
+ ) + + } + + />
{t("case:summary-decision-label")} @@ -367,14 +388,15 @@ const Pinswg_dnsid = (props) => { */}
-
-
- {t( + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofdecision", ) @@ -389,9 +411,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-no-information-to-date-label", - )} -
-
+ ) + + } + + /> {casesObj.numberofchildincidents > 0 && (
@@ -434,14 +458,12 @@ const Pinswg_dnsid = (props) => { ) : ( "" )} - {/*
-
- {t( + {/* -
- {router.locale == "cy" + value={ + router.locale == "cy" ? jsonpath({path: '$..[?(@ && @.value=="' + detailsObj.pinswg_recommendation + @@ -449,9 +471,9 @@ const Pinswg_dnsid = (props) => { transLookup, ) - : detailsObj.pinswg_recommendation} -
-
*/} + : detailsObj.pinswg_recommendation + } + /> */}
@@ -463,14 +485,12 @@ const Pinswg_dnsid = (props) => { {t("case:summary-dates-label")}
- {/*
-
- {t( + {/* {" "} -
- {_.has( + value={ + _.has( detailsObj, "pinswg_validnoticeofintentiontosubmitanapplicati" ) @@ -485,17 +505,18 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
*/} -
-
- {t( + ) + } + /> */} + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_writtenacceptanceofnotification", ) @@ -510,17 +531,20 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_deadlineforsubmissionofapplication", ) @@ -535,17 +559,20 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofsubmissionofapplication", ) @@ -560,9 +587,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> {_.has( detailsObj, "pinswg_applicationacceptedasvalid", @@ -570,14 +599,15 @@ const Pinswg_dnsid = (props) => { !_.isEmpty( detailsObj.pinswg_applicationrejectedasinvalid, ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_applicationacceptedasvalid, ) ? formatDates( @@ -585,9 +615,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> )} {_.has( detailsObj, @@ -596,14 +628,15 @@ const Pinswg_dnsid = (props) => { !_.isEmpty( detailsObj.pinswg_applicationrejectedasinvalid, ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_applicationrejectedasinvalid, ) ? formatDates( @@ -611,18 +644,21 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> )} -
-
- {t( + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_endofrepresentationperiod", ) @@ -637,9 +673,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> {_.has( detailsObj, @@ -648,14 +686,15 @@ const Pinswg_dnsid = (props) => { !_.isEmpty( detailsObj.pinswg_dateofrequesttovarytheapplication, ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_dateofrequesttovarytheapplication, ) ? formatDates( @@ -663,9 +702,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> )} {_.has( @@ -682,14 +723,15 @@ const Pinswg_dnsid = (props) => { _.isEmpty( detailsObj.pinswg_rejectrequesttovaryapplication, ) ? ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_confirmrequesttovaryapplication, ) ? formatDates( @@ -697,9 +739,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> ) : ( "" ))} @@ -717,14 +761,15 @@ const Pinswg_dnsid = (props) => { _.isEmpty( detailsObj.pinswg_confirmrequesttovaryapplication, ) ? ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_rejectrequesttovaryapplication, ) ? formatDates( @@ -732,9 +777,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> ) : ( "" ))} @@ -745,14 +792,15 @@ const Pinswg_dnsid = (props) => { !_.isEmpty( detailsObj.pinswg_suspensionstartdates, ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_suspensionstartdates, ) ? formatDates( @@ -760,19 +808,25 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> )} -
-
- {t( + -
- {_.has( + + + value={ + + + _.has( detailsObj, "pinswg_suspensionenddates", ) @@ -787,15 +841,20 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
-
-
- {t("case:summary-report-due-by")} -
-
- {_.has( + ) + + + } + + + /> + { ) : t( "case:summary-awaiting-information-label", - )} -
-
- {/*
-
- {t("case:summary-suspension-dates")} -
-
- {_.has( + ) + + } + + /> + {/* { ) : t( "case:summary-no-date-entered-label" - )} -
-
*/} -
-
- {t( + ) + } + /> */} + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_inspectorreportsubmittedtowelshgovernment", ) @@ -858,9 +918,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> {_.has( detailsObj, "pinswg_withdrawndate", @@ -868,14 +930,15 @@ const Pinswg_dnsid = (props) => { !_.isEmpty( detailsObj.pinswg_withdrawndate, ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_withdrawndate, ) ? formatDates( @@ -883,9 +946,11 @@ const Pinswg_dnsid = (props) => { ) : t( "case:summary-awaiting-information-label", - )} -
-
+ ) + + } + + /> )}
diff --git a/components/case/summaryTypes/pinswg_electricityactid.js b/components/case/summaryTypes/pinswg_electricityactid.js index f3919b04..c5b862bb 100644 --- a/components/case/summaryTypes/pinswg_electricityactid.js +++ b/components/case/summaryTypes/pinswg_electricityactid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_electricityactid = (props) => { let { t } = useTranslation(); @@ -59,12 +61,13 @@ const Pinswg_electricityactid = (props) => {
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + { ] || t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + ) + + } + + /> + { }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t( + ] || "" + + } + + /> + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj[ @@ -125,9 +134,11 @@ const Pinswg_electricityactid = (props) => { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
+ ) + + } + + />
{t( @@ -145,12 +156,13 @@ const Pinswg_electricityactid = (props) => { : ""}
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + { }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t( + ] || "" + + } + + /> + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -186,15 +201,18 @@ const Pinswg_electricityactid = (props) => { }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + ] || "" + + } + + /> + { ] || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + />
{t("case:summary-decision-label")} @@ -287,14 +307,15 @@ const Pinswg_electricityactid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -306,18 +327,21 @@ const Pinswg_electricityactid = (props) => { : detailsObj.pinswg_recommendation || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> {detailsObj.pinswg_webaddress != null && ( -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -329,9 +353,11 @@ const Pinswg_electricityactid = (props) => { : detailsObj.pinswg_webaddress || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> )}
@@ -344,12 +370,13 @@ const Pinswg_electricityactid = (props) => { {t("case:summary-dates-label")}
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_casedecisiondate" ) @@ -389,18 +419,24 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) -
-
- {t( + } + + /> + + -
- {_.has( + + + value={ + + + _.has( detailsObj, "pinswg_applicationacceptedasvalid" ) @@ -415,17 +451,22 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + + } + + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_applicationrejectedasinvalid" ) @@ -440,17 +481,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_confirmrequesttovaryapplication" ) @@ -465,17 +509,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofdecision" ) @@ -490,17 +537,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofrequesttovarytheapplication" ) @@ -515,17 +565,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofsubmissionofapplication" ) @@ -540,17 +593,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateprojectpublishedonwebsite" ) @@ -565,17 +621,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_deadlineforsubmissionofapplication" ) @@ -590,17 +649,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_endofrepresentationperiod" ) @@ -615,17 +677,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_inspectorreportsubmittedtowelshgovernment" ) @@ -640,17 +705,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_procedureconfirmed" ) @@ -665,17 +733,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_rejectrequesttovaryapplication" ) @@ -690,15 +761,18 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-report-due-by")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-suspension-dates")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_suspensionenddates" ) @@ -761,17 +841,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_suspensionstartdates" ) @@ -786,17 +869,20 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_validnoticeofintentiontosubmitanapplicati" ) @@ -811,15 +897,18 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-withdrawn-date")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_writtenacceptanceofnotification" ) @@ -859,9 +951,11 @@ const Pinswg_electricityactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + />
diff --git a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js index 94c84cea..e4da5a54 100644 --- a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js +++ b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_enforcementlistedbuildingconseid = (props) => { let { t } = useTranslation(); @@ -13,383 +15,313 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + -
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
+ "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + +
+ -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( + -
+ ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements + ) + ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {/*
+ + {/*
{t( "case:summary-inquiry-evidence-date-label" @@ -414,82 +346,57 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { )}
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateofevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateofevent - ) - ? formatDates( - detailsObj.pinswg_startdateofevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
-
-
+ + + +
); diff --git a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js index 1e713049..146bbb87 100644 --- a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js +++ b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_enforcementnoticeappeals174id = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -229,22 +222,18 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { "" )}
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -296,17 +286,19 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -322,17 +314,19 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -361,17 +355,19 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -387,16 +383,14 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -412,14 +406,12 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateoftheevent" ) @@ -461,14 +454,14 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js index 7faeef9e..f05ea672 100644 --- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js +++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_environmentalpermittingid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_environmentalpermittingid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_environmentalpermittingid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -228,14 +221,13 @@ const Pinswg_environmentalpermittingid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.pinswg_lpa=="' + @@ -255,25 +247,21 @@ const Pinswg_environmentalpermittingid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -325,17 +314,19 @@ const Pinswg_environmentalpermittingid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -351,17 +342,19 @@ const Pinswg_environmentalpermittingid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -390,17 +383,19 @@ const Pinswg_environmentalpermittingid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -416,16 +411,14 @@ const Pinswg_environmentalpermittingid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -441,14 +434,12 @@ const Pinswg_environmentalpermittingid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateofevent" ) @@ -490,14 +482,14 @@ const Pinswg_environmentalpermittingid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js index c962a7fd..761bc8b8 100644 --- a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js +++ b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_harbourrevisionorderid = (props) => { let { t } = useTranslation(); @@ -59,12 +61,13 @@ const Pinswg_harbourrevisionorderid = (props) => {
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + { ] || t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + ) + + } + + /> + { }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t( + ] || "" + + } + + /> + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj[ @@ -125,9 +134,11 @@ const Pinswg_harbourrevisionorderid = (props) => { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
+ ) + + } + + />
{t( @@ -145,12 +156,13 @@ const Pinswg_harbourrevisionorderid = (props) => { : ""}
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + { }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + ] || "" + + } + + /> + { ] || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + />
{t("case:summary-decision-label")} @@ -264,14 +281,15 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -283,18 +301,21 @@ const Pinswg_harbourrevisionorderid = (props) => { : detailsObj.pinswg_recommendation || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> {detailsObj.pinswg_webaddress != null && ( -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -306,9 +327,11 @@ const Pinswg_harbourrevisionorderid = (props) => { : detailsObj.pinswg_webaddress || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> )}
@@ -321,12 +344,13 @@ const Pinswg_harbourrevisionorderid = (props) => { {t("case:summary-dates-label")}
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_casedecisiondate" ) @@ -366,18 +393,24 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) -
-
- {t( + } + + /> + + -
- {_.has( + + + value={ + + + _.has( detailsObj, "pinswg_applicationacceptedasvalid" ) @@ -392,17 +425,22 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + + } + + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_applicationrejectedasinvalid" ) @@ -417,17 +455,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_confirmrequesttovaryapplication" ) @@ -442,17 +483,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofdecision" ) @@ -467,17 +511,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofrequesttovarytheapplication" ) @@ -492,17 +539,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofsubmissionofapplication" ) @@ -517,17 +567,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateprojectpublishedonwebsite" ) @@ -542,17 +595,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_deadlineforsubmissionofapplication" ) @@ -567,17 +623,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_endofrepresentationperiod" ) @@ -592,17 +651,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_inspectorreportsubmittedtowelshgovernment" ) @@ -617,17 +679,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_procedureconfirmed" ) @@ -642,17 +707,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_rejectrequesttovaryapplication" ) @@ -667,15 +735,18 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-report-due-by")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-suspension-dates")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_suspensionenddates" ) @@ -738,17 +815,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_suspensionstartdates" ) @@ -763,17 +843,20 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_validnoticeofintentiontosubmitanapplicati" ) @@ -788,15 +871,18 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-withdrawn-date")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_writtenacceptanceofnotification" ) @@ -836,9 +925,11 @@ const Pinswg_harbourrevisionorderid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + />
diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js index d1b348da..4f3c1222 100644 --- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js +++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,15 +41,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- Specialist Case Process -
-
- {router.locale == "cy" + /> + + { : detailsObj[ "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -251,14 +249,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.pinswg_lpa=="' + @@ -278,25 +275,21 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -348,17 +342,19 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -374,17 +370,19 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -413,17 +411,19 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -439,16 +439,14 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -464,14 +462,12 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateoftheevent" ) @@ -513,14 +510,14 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_householderappealhasid.js b/components/case/summaryTypes/pinswg_householderappealhasid.js index 13f57a48..e6ebeff8 100644 --- a/components/case/summaryTypes/pinswg_householderappealhasid.js +++ b/components/case/summaryTypes/pinswg_householderappealhasid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_householderappealhasid = (props) => { let { t } = useTranslation(); @@ -13,411 +15,322 @@ const Pinswg_householderappealhasid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + -
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + transLookup + ) + : detailsObj[ + "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-to-be-confirmed-label") + } + /> + -
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || "" + } + /> + -
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate + "case:summary-case-link-status-not-linked" ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + +
+ -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( + + + -
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" + ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstmt ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ ? formatDates( + detailsObj.pinswg_otherpartiesstmt + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + } + /> + -
-
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateofevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateofevent - ) - ? formatDates( - detailsObj.pinswg_startdateofevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
-
-
+ + + +
); diff --git a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js index d41b4303..c771b662 100644 --- a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js +++ b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_lawfuldevelopmentcertificatappid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -229,22 +222,18 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { "" )}
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -296,17 +286,19 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -322,17 +314,19 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -361,17 +355,19 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -387,16 +383,14 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -412,14 +406,12 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateoftheevent" ) @@ -461,14 +454,14 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_ldpid.js b/components/case/summaryTypes/pinswg_ldpid.js index 772a69c7..998e0177 100644 --- a/components/case/summaryTypes/pinswg_ldpid.js +++ b/components/case/summaryTypes/pinswg_ldpid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_ldpid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_ldpid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_ldpid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + /> + + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -208,22 +205,18 @@ const Pinswg_ldpid = (props) => { "" )}
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -275,17 +269,19 @@ const Pinswg_ldpid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -301,17 +297,19 @@ const Pinswg_ldpid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -340,17 +338,19 @@ const Pinswg_ldpid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -366,16 +366,14 @@ const Pinswg_ldpid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -391,14 +389,12 @@ const Pinswg_ldpid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateofevent" ) @@ -440,14 +437,14 @@ const Pinswg_ldpid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js index e715c0fe..112ecd17 100644 --- a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js +++ b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_listedbuildingandconservationrid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -229,22 +222,18 @@ const Pinswg_listedbuildingandconservationrid = (props) => { "" )}
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -296,17 +286,19 @@ const Pinswg_listedbuildingandconservationrid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -322,17 +314,19 @@ const Pinswg_listedbuildingandconservationrid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -361,17 +355,19 @@ const Pinswg_listedbuildingandconservationrid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -387,16 +383,14 @@ const Pinswg_listedbuildingandconservationrid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -412,14 +406,12 @@ const Pinswg_listedbuildingandconservationrid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_starttimeofevent" ) @@ -461,14 +454,14 @@ const Pinswg_listedbuildingandconservationrid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js index 5b00ec2f..7f57ab0b 100644 --- a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js +++ b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_maintenanceoflands217id = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_maintenanceoflands217id = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_maintenanceoflands217id = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -229,22 +222,18 @@ const Pinswg_maintenanceoflands217id = (props) => { "" )}
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -296,17 +286,19 @@ const Pinswg_maintenanceoflands217id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -322,17 +314,19 @@ const Pinswg_maintenanceoflands217id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -361,17 +355,19 @@ const Pinswg_maintenanceoflands217id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -387,16 +383,14 @@ const Pinswg_maintenanceoflands217id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -412,14 +406,12 @@ const Pinswg_maintenanceoflands217id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateofevent" ) @@ -461,14 +454,14 @@ const Pinswg_maintenanceoflands217id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js index dc159628..36f54836 100644 --- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js +++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_miscellaneouscasewordid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_miscellaneouscasewordid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -228,14 +221,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.pinswg_lpa=="' + @@ -255,25 +247,21 @@ const Pinswg_miscellaneouscasewordid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -325,17 +314,19 @@ const Pinswg_miscellaneouscasewordid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -351,17 +342,19 @@ const Pinswg_miscellaneouscasewordid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -390,17 +383,19 @@ const Pinswg_miscellaneouscasewordid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -416,16 +411,14 @@ const Pinswg_miscellaneouscasewordid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -441,14 +434,12 @@ const Pinswg_miscellaneouscasewordid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateofevent" ) @@ -490,14 +482,14 @@ const Pinswg_miscellaneouscasewordid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_nonvalidationid.js b/components/case/summaryTypes/pinswg_nonvalidationid.js index 64dd529b..7c442217 100644 --- a/components/case/summaryTypes/pinswg_nonvalidationid.js +++ b/components/case/summaryTypes/pinswg_nonvalidationid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_nonvalidationid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,18 @@ const Pinswg_nonvalidationid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -42,15 +42,18 @@ const Pinswg_nonvalidationid = (props) => { ] || t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + ) + + } + + /> + { }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
+ ] || "" - {/*
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + } + + /> + + {/* { }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
*/} -
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + ] || "" + } + /> */} + { ] || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + />
{t("case:summary-decision-label")} @@ -144,22 +150,20 @@ const Pinswg_nonvalidationid = (props) => {
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_validdate") + + +
+ { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) -
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + } + + /> + + { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + + } + + + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_planningappeals78id.js b/components/case/summaryTypes/pinswg_planningappeals78id.js index 27098810..cd48711f 100644 --- a/components/case/summaryTypes/pinswg_planningappeals78id.js +++ b/components/case/summaryTypes/pinswg_planningappeals78id.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_planningappeals78id = (props) => { let { t } = useTranslation(); @@ -13,352 +15,342 @@ const Pinswg_planningappeals78id = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ - "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-to-be-confirmed-label" - )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_dicision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ - "pinswg_dicision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + - {/* + label={t("case:summary-lpa-label")} + + value={ + + router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + + } + + /> + + + + +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ + "pinswg_dicision@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_dicision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} + +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate - ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ -
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ label={t("case:summary-decision-date-label")} -
-
- {t( - "case:summary-statement-interested-party-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ value={ - {/*
-
- {t( + _.has(detailsObj, "pinswg_casedecisiondate") + ? !_.isEmpty( + detailsObj.pinswg_casedecisiondate + ) + ? formatDates( + detailsObj.pinswg_casedecisiondate + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + + } + + /> + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} +
+
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + +
+ + + + + + + {/* -
- {_.has( + value={ + _.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -386,43 +378,45 @@ const Pinswg_planningappeals78id = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
*/} - -
-
- {t( - "case:summary-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- {/*
-
- {t( + } + /> */} + + + {/* -
- {_.has( + value={ + _.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -437,15 +431,13 @@ const Pinswg_planningappeals78id = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
*/} - {/*
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + ) + } + /> */} + {/* { ) : t( "case:summary-no-date-entered-label" - )} -
-
*/} - -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_startdatetimeiftheevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdatetimeiftheevent ) - ? formatDates( - detailsObj.pinswg_startdatetimeiftheevent - ) - : t( - "case:summary-no-date-entered-label" - ) + } + /> */} + + + {detailsObj.pinswg_typeofevent == 846040002 || + detailsObj.pinswg_typeofevent == 846040007 || + detailsObj.pinswg_typeofevent == 846040012 || + detailsObj.pinswg_typeofevent == 846040009 ? ( + -
- {detailsObj.pinswg_typeofevent == 846040002 || - detailsObj.pinswg_typeofevent == 846040007 || - detailsObj.pinswg_typeofevent == 846040012 || - detailsObj.pinswg_typeofevent == 846040009 ? ( -
-
- {t( - "case:summary-start-event-time-label" - )} -
+ ) + : t( + "case:summary-no-date-entered-label" + ) -
- {_.has( - detailsObj, - "pinswg_startdatetimeiftheevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdatetimeiftheevent - ) - ? formatDates( - detailsObj.pinswg_startdatetimeiftheevent, - true - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- ) : ( - "" - )} - -
-
-
+ } + + /> + ) : ( + "" + )} + + ); diff --git a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js index 6561c998..10b5a037 100644 --- a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js +++ b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_planningconditionss73s79id = (props) => { let { t } = useTranslation(); @@ -13,390 +15,390 @@ const Pinswg_planningconditionss73s79id = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

- -
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ + +
+ -
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - detailsObj[ - "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : detailsObj[ - "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-to-be-confirmed-label" - )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ - "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true, - }) - : detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-information-to-date-label" - )} + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t("case:summary-no-date-entered-label") + } + /> + - {/* + label={t("case:summary-lpa-label")} + + value={ + + router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || "" + + } + + /> + + + + +
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath({ + path: + '$..[?(@ && @.value=="' + + detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy', + json: transLookup, + eval: true + }) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-information-to-date-label" + )} + +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
- {casesObj.numberofchildincidents > 0 && ( -
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- )} - {casesObj.numberofchildincidents > 0 ? ( -
-
- {t( - "case:summary-linked-cases-label" - )} -
-
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} -
-
- ) : ( - "" - )} -
+
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate + {casesObj.numberofchildincidents > 0 && ( +
+
+ {t("case:summary-case-link-status-label")} +
+
+ {_.has(casesObj, ["numberofchildincidents"]) + ? casesObj.numberofchildincidents > 0 + ? t( + "case:summary-case-link-status-linked" ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) : t( - "case:summary-no-date-entered-label" - )} -
-
+ "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} + +
+ )} + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t("case:summary-linked-cases-label")} +
+
+ {linkedCasesList( + props.currentView.linkedCaseReferences + )} +
+
+ ) : ( + "" + )} + + + +
+ -
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ label={t("case:summary-start-date-label")} -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ value={ -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_otherpartiesstatement" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatement - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatement - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_otherpartiesstatements" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatements - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatements - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ _.has(detailsObj, "pinswg_startdate") + ? !_.isEmpty(detailsObj.pinswg_startdate) + ? formatDates( + detailsObj.pinswg_startdate + ) + : t( + "case:summary-no-date-entered-label" + ) + : _.has(detailsObj, "pinswg_startdates") + ? !_.isEmpty(detailsObj.pinswg_startdates) + ? formatDates( + detailsObj.pinswg_startdates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( + } + + /> + + + + + + -
- {/*
-
- {t( + ? !_.isEmpty( + detailsObj.pinswg_otherpartiesstatements + ) + ? formatDates( + detailsObj.pinswg_otherpartiesstatements + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + + + } + + + /> + + + {/* -
- {_.has( + value={ + _.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -411,85 +413,80 @@ const Pinswg_planningconditionss73s79id = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested ) - ? formatDates( - detailsObj.pinswg_dateeventrequested - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
+ } + /> */} + -
- {t( - "case:summary-start-event-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_startdateofevent" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdateofevent - ) - ? formatDates( - detailsObj.pinswg_startdateofevent - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( - detailsObj.pinswg_casedecisiondate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- + label={t("case:summary-event-date-label")} + + value={ + + _.has(detailsObj, "pinswg_dateeventrequested") + ? !_.isEmpty( + detailsObj.pinswg_dateeventrequested + ) + ? formatDates( + detailsObj.pinswg_dateeventrequested + ) + : t( + "case:summary-no-date-entered-label" + ) + : t("case:summary-no-date-entered-label") + + } + + /> + + + + + ); diff --git a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js index dfbd39cf..0cdf0bdc 100644 --- a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js +++ b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_planningobligationappeals106id = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_planningobligationappeals106id = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_planningobligationappeals106id = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -229,22 +222,18 @@ const Pinswg_planningobligationappeals106id = (props) => { "" )}
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -296,17 +286,19 @@ const Pinswg_planningobligationappeals106id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -322,17 +314,19 @@ const Pinswg_planningobligationappeals106id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -361,17 +355,19 @@ const Pinswg_planningobligationappeals106id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -387,16 +383,14 @@ const Pinswg_planningobligationappeals106id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -412,14 +406,12 @@ const Pinswg_planningobligationappeals106id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateoftheevent" ) @@ -461,14 +454,14 @@ const Pinswg_planningobligationappeals106id = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js index 134851b2..f9b4341d 100644 --- a/components/case/summaryTypes/pinswg_rowid.js +++ b/components/case/summaryTypes/pinswg_rowid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_rowid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_rowid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,15 +41,16 @@ const Pinswg_rowid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- Specialist Case Process -
-
- {router.locale == "cy" + /> + + { : detailsObj[ "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -251,14 +249,13 @@ const Pinswg_rowid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.pinswg_lpa=="' + @@ -278,25 +275,21 @@ const Pinswg_rowid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -348,17 +342,19 @@ const Pinswg_rowid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -374,17 +370,19 @@ const Pinswg_rowid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -413,17 +411,19 @@ const Pinswg_rowid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -439,16 +439,14 @@ const Pinswg_rowid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -464,14 +462,12 @@ const Pinswg_rowid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateoftheevent" ) @@ -513,14 +510,14 @@ const Pinswg_rowid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/components/case/summaryTypes/pinswg_sipscase.js b/components/case/summaryTypes/pinswg_sipscase.js index 4b3a306f..2145f5fc 100644 --- a/components/case/summaryTypes/pinswg_sipscase.js +++ b/components/case/summaryTypes/pinswg_sipscase.js @@ -3,6 +3,8 @@ import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; import GoogleMapComponent from "../../mapping"; @@ -83,12 +85,13 @@ const Pinswg_sipscase = (props) => {
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + { ] || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> {hasValidKey( detailsObj, "_pinswg_projecttype_value" ) && ( -
-
- Project Type -
-
- {router.locale == "cy" + { ] || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> )} {detailsObj.pinswg_webaddress != null && ( -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj.pinswg_webaddress + @@ -169,9 +178,11 @@ const Pinswg_sipscase = (props) => { ) || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> )} {/*
@@ -199,12 +210,13 @@ const Pinswg_sipscase = (props) => { ] || ""}
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
-
-
- ES Submitted -
-
- {router.locale == "cy" + ) + + } + + /> + { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
-
-
- Deemed Marine License Applied for -
-
- {router.locale == "cy" + ) + + } + + /> + { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
+ ) - {/*
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + } + + /> + + {/* { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
*/} - {/*
-
- {t( + ) + } + /> */} + {/* -
- - {_.has(casesObj, "_ownerid_value") + value={ + _.has(casesObj, "_ownerid_value") ? casesObj[ "_ownerid_value@OData.Community.Display.V1.FormattedValue" ] - : ""} -
-
*/} - {/*
-
- {t( + : "" + } + /> */} + {/* -
- {router.locale == "cy" + value={ + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj[ @@ -321,17 +334,18 @@ const Pinswg_sipscase = (props) => { ) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t( + ] || "" + } + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_startdateofevent" ) @@ -346,15 +360,18 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-no-information-to-date-label" - )} -
-
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-to-be-confirmed-label" - )} -
-
*/} + ) + + } + + /> */}
{t("case:summary-decision-label")} @@ -402,14 +421,15 @@ const Pinswg_sipscase = (props) => { */}
-
-
- {t( + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofdecision" ) @@ -424,9 +444,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-no-information-to-date-label" - )} -
-
+ ) + + } + + /> {casesObj.numberofchildincidents > 0 && (
@@ -469,14 +491,12 @@ const Pinswg_sipscase = (props) => { ) : ( "" )} - {/*
-
- {t( + {/* -
- {router.locale == "cy" + value={ + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj.pinswg_recommendation + @@ -484,9 +504,9 @@ const Pinswg_sipscase = (props) => { transLookup, ) - : detailsObj.pinswg_recommendation} -
-
*/} + : detailsObj.pinswg_recommendation + } + /> */}
@@ -504,14 +524,15 @@ const Pinswg_sipscase = (props) => { )}
-
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_validnoticeofintentiontosubmit" ) @@ -526,17 +547,20 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_writtenacceptanceofnotification" ) @@ -551,17 +575,20 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_deadlineforsubmissionofapplication" ) @@ -576,9 +603,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + />
{(hasValidKey( @@ -605,14 +634,15 @@ const Pinswg_sipscase = (props) => { detailsObj, "pinswg_validationdeadlineextension" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_validationdeadlineextension" ) @@ -627,22 +657,25 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {hasValidKey( detailsObj, "pinswg_casesuspensionstartdate" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_casesuspensionstartdate" ) @@ -657,22 +690,25 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {hasValidKey( detailsObj, "pinswg_casesuspensionenddate" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_casesuspensionenddate" ) @@ -687,9 +723,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} @@ -718,14 +756,15 @@ const Pinswg_sipscase = (props) => { detailsObj, "pinswg_reportissuedtowelshministers" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_reportissuedtowelshministers" ) @@ -740,22 +779,25 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {hasValidKey( detailsObj, "pinswg_decisionissuedtoapplicant" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_decisionissuedtoapplicant" ) @@ -770,22 +812,25 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {hasValidKey( detailsObj, "pinswg_decisionoutcome" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_decisionoutcome" ) @@ -800,9 +845,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} @@ -824,14 +871,15 @@ const Pinswg_sipscase = (props) => { detailsObj, "pinswg_redetermination" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_redetermination@OData.Community.Display.V1.FormattedValue" ) @@ -848,22 +896,25 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {hasValidKey( detailsObj, "pinswg_redeterminationconsultationdeadline" ) && ( -
-
- {t( + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_redeterminationconsultationdeadline" ) @@ -878,9 +929,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} @@ -892,12 +945,13 @@ const Pinswg_sipscase = (props) => {
-
-
- Screening start date -
{" "} -
- {_.has( + { ) : t( "case:summary-awaiting-information-label" - )} -
-
-
-
- EIA target date -
{" "} -
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> {hasValidKey( detailsObj, "pinswg_targetextended" ) && ( -
-
- Target Extended -
{" "} -
- {_.has( + { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} -
-
- Direction Issued Date -
{" "} -
- {_.has( + { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> {hasValidKey( detailsObj, "pinswg_eiarequired" ) && ( -
-
- {t( + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_eiarequired" ) @@ -1017,9 +1083,11 @@ const Pinswg_sipscase = (props) => { : "No" : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )}
*/} @@ -1029,12 +1097,13 @@ const Pinswg_sipscase = (props) => {
-
-
- Scoping Start Date -
{" "} -
- {_.has( + { ) : t( "case:summary-awaiting-information-label" - )} -
-
-
-
- Scoping Target Date -
{" "} -
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> {hasValidKey( detailsObj, "pinswg_scopingtargetextended" ) && ( -
-
- Scoping Target Extended -
-
- {_.has( + { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} -
-
- Scoping Outcome Issued Date -
{" "} -
- {_.has( + { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + />
*/} {/*
-
-
- {t( + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofsubmissionofapplication" ) @@ -1151,9 +1232,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> {_.has( detailsObj, "pinswg_applicationacceptedasvalid" @@ -1161,14 +1244,15 @@ const Pinswg_sipscase = (props) => { !_.isEmpty( detailsObj.pinswg_applicationrejectedasinvalid ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_applicationacceptedasvalid ) ? formatDates( @@ -1176,9 +1260,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {_.has( detailsObj, @@ -1187,14 +1273,15 @@ const Pinswg_sipscase = (props) => { !_.isEmpty( detailsObj.pinswg_applicationrejectedasinvalid ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_applicationrejectedasinvalid ) ? formatDates( @@ -1202,18 +1289,21 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} -
-
- {t( + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_endofrepresentationperiod" ) @@ -1228,9 +1318,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> {_.has( detailsObj, @@ -1239,14 +1331,15 @@ const Pinswg_sipscase = (props) => { !_.isEmpty( detailsObj.pinswg_dateofrequesttovarytheapplication ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_dateofrequesttovarytheapplication ) ? formatDates( @@ -1254,9 +1347,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} {_.has( @@ -1273,14 +1368,15 @@ const Pinswg_sipscase = (props) => { _.isEmpty( detailsObj.pinswg_rejectrequesttovaryapplication ) ? ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_confirmrequesttovaryapplication ) ? formatDates( @@ -1288,9 +1384,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> ) : ( "" ))} @@ -1308,14 +1406,15 @@ const Pinswg_sipscase = (props) => { _.isEmpty( detailsObj.pinswg_confirmrequesttovaryapplication ) ? ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_rejectrequesttovaryapplication ) ? formatDates( @@ -1323,9 +1422,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> ) : ( "" ))} @@ -1336,14 +1437,15 @@ const Pinswg_sipscase = (props) => { !_.isEmpty( detailsObj.pinswg_suspensionstartdates ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_suspensionstartdates ) ? formatDates( @@ -1351,19 +1453,25 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )} -
-
- {t( + -
- {_.has( + + + value={ + + + _.has( detailsObj, "pinswg_suspensionenddates" ) @@ -1378,15 +1486,20 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
-
-
- {t("case:summary-report-due-by")} -
-
- {_.has( + ) + + + } + + + /> + { ) : t( "case:summary-awaiting-information-label" - )} -
-
-
-
- {t("case:summary-suspension-dates")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_inspectorreportsubmittedtowelshgovernment" ) @@ -1449,9 +1568,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> {_.has( detailsObj, "pinswg_withdrawndate" @@ -1459,14 +1580,15 @@ const Pinswg_sipscase = (props) => { !_.isEmpty( detailsObj.pinswg_withdrawndate ) && ( -
-
- {t( + -
- {!_.isEmpty( + + value={ + + !_.isEmpty( detailsObj.pinswg_withdrawndate ) ? formatDates( @@ -1474,9 +1596,11 @@ const Pinswg_sipscase = (props) => { ) : t( "case:summary-awaiting-information-label" - )} -
-
+ ) + + } + + /> )}
*/} diff --git a/components/case/summaryTypes/pinswg_transportandworkactid.js b/components/case/summaryTypes/pinswg_transportandworkactid.js index 4b57bd1d..f6aaaa65 100644 --- a/components/case/summaryTypes/pinswg_transportandworkactid.js +++ b/components/case/summaryTypes/pinswg_transportandworkactid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_transportandworkactid = (props) => { let { t } = useTranslation(); @@ -59,12 +61,13 @@ const Pinswg_transportandworkactid = (props) => {
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + { ] || t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + detailsObj[ @@ -104,18 +110,24 @@ const Pinswg_transportandworkactid = (props) => { ] || t( "case:summary-to-be-confirmed-label" - )} -
-
+ ) -
-
- {t( + } + + /> + + -
- {router.locale == "cy" + + + value={ + + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -127,18 +139,23 @@ const Pinswg_transportandworkactid = (props) => { : detailsObj.pinswg_recommendation || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + + } + + + /> {detailsObj.pinswg_webaddress != null && ( -
-
- {t( + -
- {router.locale == "cy" + + value={ + + router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -150,9 +167,11 @@ const Pinswg_transportandworkactid = (props) => { : detailsObj.pinswg_webaddress || t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + /> )}
@@ -165,12 +184,13 @@ const Pinswg_transportandworkactid = (props) => { {t("case:summary-dates-label")}
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_casedecisiondate" ) @@ -210,18 +233,24 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) -
-
- {t( + } + + /> + + -
- {_.has( + + + value={ + + + _.has( detailsObj, "pinswg_applicationacceptedasvalid" ) @@ -236,17 +265,22 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + + } + + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_applicationrejectedasinvalid" ) @@ -261,17 +295,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_confirmrequesttovaryapplication" ) @@ -286,17 +323,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofdecision" ) @@ -311,17 +351,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofrequesttovarytheapplication" ) @@ -336,17 +379,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateofsubmissionofapplication" ) @@ -361,17 +407,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_dateprojectpublishedonwebsite" ) @@ -386,17 +435,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_deadlineforsubmissionofapplication" ) @@ -411,17 +463,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_endofrepresentationperiod" ) @@ -436,17 +491,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_inspectorreportsubmittedtowelshgovernment" ) @@ -461,17 +519,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_procedureconfirmed" ) @@ -486,17 +547,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_rejectrequesttovaryapplication" ) @@ -511,15 +575,18 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-report-due-by")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-suspension-dates")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_suspensionenddates" ) @@ -582,17 +655,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_suspensionstartdates" ) @@ -607,17 +683,20 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + {" "} -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_validnoticeofintentiontosubmitanapplicati" ) @@ -632,15 +711,18 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-withdrawn-date")} -
-
- {_.has( + ) + + } + + /> + { ) : t( "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( + ) + + } + + /> + -
- {_.has( + + value={ + + _.has( detailsObj, "pinswg_writtenacceptanceofnotification" ) @@ -680,9 +765,11 @@ const Pinswg_transportandworkactid = (props) => { ) : t( "case:summary-no-date-entered-label" - )} -
-
+ ) + + } + + />
diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js index 71675f1d..965b4e13 100644 --- a/components/case/summaryTypes/pinswg_wayleaveid.js +++ b/components/case/summaryTypes/pinswg_wayleaveid.js @@ -3,6 +3,8 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; +import SummaryCard from "../summary/components/SummaryCard"; +import SummaryRow from "../summary/components/SummaryRow"; const Pinswg_wayleaveid = (props) => { let { t } = useTranslation(); @@ -13,20 +15,16 @@ const Pinswg_wayleaveid = (props) => { return (
-
-
-
-

- {t("case:summary-case-details-label")} -

+ +
+ -
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" + label={t("case:summary-case-type-label")} + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.value=="' + @@ -43,14 +41,13 @@ const Pinswg_wayleaveid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" + + /> + { : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-eia-required-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-to-be-confirmed-label" )} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-type-of-event-label")} -
-
- {router.locale == "cy" + + /> + { : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" + + /> + { t( "case:summary-no-date-entered-label" )} -
-
+ + />
{t("case:summary-decision-label")} @@ -228,14 +221,13 @@ const Pinswg_wayleaveid = (props) => { ) : ( "" )} -
-
- {t( + -
- {router.locale == "cy" + + value={router.locale == "cy" ? jsonpath({ path: '$..[?(@ && @.pinswg_lpa=="' + @@ -255,25 +247,21 @@ const Pinswg_wayleaveid = (props) => { t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") + + +
+ { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_questionnaireduedate" ) @@ -325,17 +314,19 @@ const Pinswg_wayleaveid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_statementduedate" ) @@ -351,17 +342,19 @@ const Pinswg_wayleaveid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_otherpartiesstatement" ) @@ -390,17 +383,19 @@ const Pinswg_wayleaveid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_finalcommentsduedate" ) @@ -416,16 +411,14 @@ const Pinswg_wayleaveid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
- {/*
-
- {t( + + + /> + {/* -
- {_.has( + value={_.has( detailsObj, "pinswg_proofsofevidencewrittenstatementsofeviden" ) @@ -441,14 +434,12 @@ const Pinswg_wayleaveid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
*/} -
-
- {t("case:summary-event-date-label")} -
-
- {_.has( + /> */} + { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t( + /> + + -
- {_.has( + + + value={_.has( detailsObj, "pinswg_startdateofevent" ) @@ -490,14 +482,14 @@ const Pinswg_wayleaveid = (props) => { : t( "case:summary-no-date-entered-label" )} -
-
-
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( + + + /> + { : t( "case:summary-no-date-entered-label" )} -
-
+ + />
-
-
-
+
); diff --git a/context/newappeal-refactor-current-state.md b/context/newappeal-refactor-current-state.md new file mode 100644 index 00000000..28cbe8dd --- /dev/null +++ b/context/newappeal-refactor-current-state.md @@ -0,0 +1,354 @@ +# New Appeal Refactor — Current State of Play + +## Purpose + +This note updates the earlier **pre-refactor analysis** with the **current state after the Slice 1–8 refactor stream**. + +Scope remains the new appeal flow areas: + +- `pages/newappeal/**` +- `components/newappeal/**` + +--- + +## Executive summary + +The planned refactor stream has been completed through **Slice 8** on the `refactor` branch integration line. + +- Behaviour-preserving objective has been maintained (S78 flow) +- Core journeys remained stable through regression checks +- Structural clarity has improved in the highest-risk areas +- The codebase is in a safer state for future controlled change + +--- + +## Slice completion status (current) + +All planned slices are complete: + +1. Slice 1 — XML/Form derivation extraction ✅ +2. Slice 2a — Payload cleanup helpers ✅ +3. Slice 2b — File merge/dedupe helpers ✅ +4. Slice 3 — Side-effect facade wrappers ✅ +5. Slice 4 — BuildSection UI extraction ✅ +6. Slice 5 — BuildCheckSection UI extraction ✅ +7. Slice 6 — BuildCheckRow formatter-map cleanup ✅ +8. Slice 7 — Nested prop-boundary simplification ✅ +9. Slice 8 — Start flow readability cleanup (`createCase` / `aboutyou`) ✅ + +Tracker reference: `context/refactor-tracker.md` + +--- + +## What changed overall + +### Structural improvements delivered + +- Repeated XML/form derivation logic moved into dedicated lib helpers +- Payload shaping and file-list merge/dedupe logic normalized into focused helpers +- Side effects wrapped behind clearer journey-effect boundaries +- Large UI-heavy files split with clearer presentational structure (Slices 4–5) +- Check-row formatting logic simplified into more maintainable mapping style +- Deep nested prop access reduced with local boundary aliases +- Start-flow components (`createCase`, `aboutyou`) made easier to read using local predicates/aliases + +### What was intentionally preserved + +- Business rules (including S78 behaviour) +- HASCAS mapping behaviour +- Appellant/agent branching behaviour +- Field names/IDs and payload shape +- Redirect/query construction (`lpa`, `apt`, `id`) +- Validation messages/rules +- Navigation and side-effect ordering/timing +- EN/CY parity + +--- + +## Current architecture quality (post-stream) + +### Stronger than before + +- Better separation between derivation/formatting/helpers and component rendering +- Reduced duplication in payload/file processing paths +- Safer change surfaces in `buildsection`, `buildchecksection`, and start flow +- Improved readability of high-churn components + +### Still sensitive / needs caution + +- `buildsection.js` and `buildchecksection.js` remain central orchestration points +- Save/resume and submit/finalise paths still require strict regression discipline +- Some legacy patterns/comments remain and can obscure intent + +--- + +## Risk position now + +### Risks reduced + +- Regression risk from duplicated transformation logic +- Coupling risk from deep nested prop traversal +- Reviewability risk in large mixed-concern components +- Formatting-logic drift risk in check-answers rendering + +### Risks still present (manageable) + +- Live-flow sensitivity for save/resume/upload/submit remains inherently high +- Manual regression burden is still significant for confidence +- Further cleanup must continue to avoid behaviour changes + +--- + +## Deferred follow-up items (post-stream) + +These are **not part of Slice 1–8** and should be handled as separate scoped work: + +1. Add/expand targeted automated regression coverage for protected journeys +2. Remove stale/commented legacy code in touched components (safe cleanup slices) +3. Document critical invariants for save/resume/submit paths in a concise maintainer note +4. Continue incremental decomposition of remaining orchestration-heavy components only if behaviour can be proven unchanged + +--- + +## Validation position + +Regression evidence recorded across slices indicates preserved behaviour for: + +- Start appeal and section navigation +- Save and exit +- Resume +- Upload and file handling +- Check answers rendering +- Submit/finalisation +- Confirmation/email paths +- EN/CY parity +- CRM insertion smoke +- Lint baseline (warnings-only, no new blocking errors) + +--- + +## Conclusion + +Compared to the earlier analysis, the new appeal flow is now in a materially safer and more maintainable state while preserving live behaviour. + +The planned refactor stream (Slices 1–8) is complete. Any additional improvements should proceed as new, tightly scoped, behaviour-preserving slices. + +--- + +## What should be done next + +## 1) Stabilise and release safely (immediate) + +Before any merge into `SIPS-Development`, run a formal readiness pass on `refactor`: + +1. `npm run lint` (confirm no new blocking issues) +2. Full protected-journey manual regression: + - start appeal + - save and exit + - resume + - upload documents + - check answers + - submit + - confirmation +3. EN/CY parity pass on touched paths +4. Negative-path checks on validation and conditional branches +5. CRM insertion smoke validation +6. Rollback verification (revert path by merge commit) + +If any check fails, fix in a separate, minimal safety slice. + +## 2) Close out stream documentation (short, high-signal) + +Add a concise closeout note (or PR summary block) that captures: + +- stream scope and completed slices +- behaviour-preservation statement +- validation evidence references +- known constraints that must not change in future work + +Keep this short and avoid duplicating implementation detail. + +## 3) Start a post-stream backlog (separate from Slice 1–8) + +Create a small follow-up backlog of **new, independent slices** (do not reopen completed slices): + +- automated regression coverage for protected journeys +- safe removal of stale commented/dead code +- targeted cleanup of remaining orchestration hotspots (`buildsection`, `buildchecksection`) only when backed by tests/regression checks +- brief maintainer notes for critical invariants (payload shape, route/query contract, side-effect ordering) + +## 4) Recommended execution order for follow-ups + +Safest sequence: + +1. Release-readiness and merge safety checks +2. Regression automation improvements +3. Documentation/invariant notes +4. Small structural cleanups in high-risk files (one concern per slice) + +## 5) Guardrails for all next work + +Continue to enforce refactor-branch rules: + +- no business-rule changes +- no payload/field-name/query-shape drift +- no side-effect timing/order changes unless explicitly scoped and proven safe +- preserve EN/CY parity +- keep slices small, reversible, and independently testable + +--- + +## Potential improvements to logic and functionality (future work) + +These items are intentionally listed as **future enhancements** (not part of completed refactor slices). + +Any item that changes user-facing behaviour, business rules, or decision logic should be delivered as product-approved feature work with explicit regression protection. + +## 1) Validation and data-quality improvements + +- Strengthen cross-field validation where dependencies are currently implicit (for example, conditional requirements tied to prior answers). +- Introduce clearer, field-level validation feedback for complex text/rich-text inputs. +- Add stricter normalization for user-entered contact data (format quality, consistency) while preserving accepted legacy cases. + +## 2) Save/resume robustness + +- Add structured save/resume integrity checks to detect and recover from partial or stale payloads. +- Improve diagnostics around resume hydration mismatches (field missing, incompatible shape, stale section state). +- Add explicit handling for interrupted upload/save sequences to reduce user recovery friction. + +## 3) Upload/document experience and safety + +- Improve duplicate-document handling feedback (clear user messaging when dedupe occurs). +- Provide more explicit upload status and retry outcomes for failed or partial uploads. +- Add stronger document-type validation messaging and edge-case handling for borderline file metadata. + +## 4) Submit/finalisation resilience + +- Add clearer user-safe fallback states for finalisation failures (e.g., PDF generation or downstream completion messaging failures). +- Improve idempotency safeguards in final submission steps to reduce accidental duplicate side effects. +- Strengthen auditability of submit transitions for operational support/debugging. + +## 5) Start-flow usability enhancements + +- Improve guidance for appeal-type selection and conditional HASCAS confirmation to reduce user error. +- Consider smarter defaults/prefill where policy allows, especially for known user profile/contact fields. +- Improve branch-specific helper copy for appellant vs agent pathways. + +## 6) Performance and maintainability improvements + +- Reduce repeated in-component derivation cost by introducing safe memoization where values are stable. +- Continue incremental decomposition of remaining orchestration-heavy components into testable units. +- Expand targeted automated tests (journey-level + high-risk utility-level) to lower regression burden. + +## 7) Recommended delivery model for these improvements + +- Treat each enhancement area as a separate, tightly scoped slice. +- Prioritise by user risk and operational impact: + 1. save/resume robustness + 2. submit/finalisation resilience + 3. validation/data-quality improvements + 4. upload/document UX resilience + 5. usability/performance refinements + +- For each slice, require: + - explicit statement of intended behaviour change (or confirmation of no change) + - EN/CY parity checks + - negative-path checks + - rollback plan + +--- + +## Evolving this into a multi-appeal-type platform (beyond S78) + +To move from an S78-focused journey to a reusable **new appeal platform**, the safest path is to keep S78 as the baseline contract and introduce platform capabilities in additive slices. + +## Platform principles + +- Keep **S78 as reference behaviour** (do not regress) +- Drive variation via **configuration and schema**, not hardcoded branching +- Keep a stable core runtime for: + - start/resume/save + - section rendering + - validation execution + - upload/check/submit/finalise +- Isolate appeal-type specifics behind explicit adapters + +## Recommended platform workstreams + +## 1) Appeal-type definition contract + +Define a typed “appeal definition” model for each appeal type, covering: + +- metadata (id, route key, labels, EN/CY text references) +- section order and visibility rules +- field/validation rules +- required-doc rules +- submission/finalisation behaviour flags + +Start by expressing S78 in this contract first, then add new appeal types using the same contract. + +## 2) Start-flow strategy model + +Generalise `createCase`/`aboutyou` into a strategy-driven start flow: + +- shared start-flow shell +- per-appeal-type start-step configuration +- clear branching policy hooks (e.g., HASCAS-style gates as config) + +This avoids adding new hardcoded conditions per appeal type. + +## 3) Validation engine boundary + +Move towards a validation layer that consumes appeal-definition rules: + +- common validator primitives +- per-appeal rule sets loaded by appeal type +- explicit cross-field dependency maps + +Preserve existing messages/behaviour for S78 while introducing extension points. + +## 4) Section and field rendering registry + +Introduce a registry pattern for section/field rendering rules: + +- field-type renderer map (already partially established) +- appeal-type-specific section decorators where needed +- strict fallback behaviour for unsupported fields + +This enables incremental onboarding of new forms without rewriting core flow components. + +## 5) Submission and integration adapters + +Define adapter interfaces for variation points: + +- payload mapping by appeal type +- finalisation actions by appeal type +- notification templates by appeal type/locale + +Core workflow should call adapters, not branch inline by appeal type. + +## 6) Platform test matrix and release gates + +Adopt a matrix-driven regression model: + +- rows: appeal types +- columns: protected journeys + EN/CY parity + negative paths + +Require S78 baseline pass + new-type pass before release. + +## Suggested delivery sequence (safe) + +1. Define appeal-type contract (S78 only) +2. Map current S78 start flow to strategy model (no behaviour change) +3. Introduce validation/section registries behind existing behaviour +4. Add adapter boundaries for submit/finalise integrations +5. Pilot one additional appeal type behind feature flag/config gating +6. Expand matrix automation and observability + +## Guardrails while platformising + +- Do not change S78 business behaviour unintentionally +- No payload/field/query contract drift for existing types +- Preserve save/resume compatibility +- Preserve EN/CY parity across all onboarded types +- Keep rollout incremental with clear rollback per slice diff --git a/context/refactor-branch-charter.md b/context/refactor-branch-charter.md index 25b24b8b..4b8cbb08 100644 --- a/context/refactor-branch-charter.md +++ b/context/refactor-branch-charter.md @@ -1,90 +1,161 @@ -# Refactor Branch Charter — New Appeal Flow +# Refactor Branch Charter — Portal Journeys ## Purpose -This branch exists to safely refactor the live new appeal flow so it is easier to maintain, safer to change, and better prepared to support additional appeal types beyond the current S78 planning appeal flow. +This branch exists to safely refactor **core portal journeys** so they are: + +- easier to maintain +- safer to change +- better structured for future extensibility This is a **behaviour-preserving refactor branch**, not a feature branch. +--- + ## Primary Goal -Create a safer internal structure for the new appeal flow while preserving current live behaviour for the S78 appeal journey. +Improve internal structure of portal workflows while preserving all current live behaviour. -## Why This Branch Exists - -The current new appeal implementation has grown over time to meet business need and now contains a mix of: - -- page composition -- flow orchestration -- XML-driven form rendering -- validation -- file/document handling -- progress/save logic -- submission/finalisation logic -- integration shaping for CRM, PDF generation, and notifications - -This branch exists to improve those boundaries incrementally without disrupting the live service. +--- ## Scope -In scope: +### In Scope -- behaviour-preserving refactor of `pages/newappeal/**` and `components/newappeal/**` -- extraction of reusable workflow logic from UI-heavy components -- improved boundaries between rendering, workflow, and integration logic -- regression test coverage for critical S78 journeys -- preparing the codebase for future appeal-type extensibility +- behaviour-preserving refactor of: + - new appeal flow (`pages/newappeal/**`, `components/newappeal/**`) + - representations flow (case summary → representation journey) +- extraction of reusable workflow logic +- improved separation between: + - UI + - workflow orchestration + - data fetching + - integrations +- preparation for future extensibility -Out of scope unless explicitly requested: +--- + +### Out of Scope - business rule changes -- visual redesign -- broad framework/library migration -- replacing working dynamic form behaviour with hardcoded appeal-specific logic -- changes to live BAU behaviour beyond strictly necessary bug fixes +- UI redesign +- payload/schema changes +- replacing dynamic/config-driven logic with hardcoding +- feature delivery mixed with refactor work -## Branch Relationship to BAU +--- -- BAU continues on `SIPS-Development` -- this branch is the protected refactor lane -- safe, proven slices may be merged back into `SIPS-Development` when ready -- urgent live fixes should go to `SIPS-Development` first, then be synced into this branch +## Branch Model + +### Roles + +- `SIPS-Development` + - BAU branch + - ongoing production work + +- `refactor` + - refactor integration branch + +- feature branches + - created from `refactor` + - one per slice + +--- + +### Flow + +SIPS-Development → refactor → slice branches → refactor → SIPS-Development + +--- + +## Refactor Streams + +### 1. New Appeal Flow (Completed) + +- Slice-based refactor (Slices 1–8) +- Behaviour preserved (S78) +- Improved structure and maintainability + +This serves as the **reference model for future refactors** + +--- + +### 2. Representations Flow (Active) + +Scope includes: + +- Case summary entry (CTA logic) +- Representation journey: + - capacity selection + - representation type + - content entry + - file upload + - check answers + - submission + - completion +- SSR/data loading and Redux hydration +- integration points (CRM, blob storage) + +--- ## Non-Negotiable Principles -1. Preserve live S78 behaviour unless explicitly told otherwise. -2. Prefer extraction over rewrite. -3. Prefer small, mergeable slices over long-lived hidden change. -4. Add or update regression protection before changing critical flow logic. -5. Keep English/Welsh behaviour aligned. -6. Treat save/resume/upload/check/submit/complete as protected journey stages. +1. Preserve live behaviour +2. Prefer extraction over rewrite +3. Work in small, safe slices +4. Keep changes reversible +5. Protect: + - save/resume flows + - upload behaviour + - submission/finalisation +6. Maintain EN/CY parity + +--- ## Target Direction -The long-term direction is: +Move towards: -- shared new appeal workflow engine -- appeal-type definitions/configuration separated from UI rendering -- smaller, clearer components -- isolated validation and payload-shaping logic -- safer addition of future appeal types through definition + bounded type-specific rules +- shared journey/workflow engine +- smaller, composable components +- clear separation of: + - decision logic + - rendering + - integration logic +- ability to support: + - multiple appeal types + - additional portal journeys (like representations) + +--- ## Definition of Success -This branch is succeeding when: +This branch is successful when: -- core S78 journey behaviour remains stable -- regression confidence increases -- high-risk logic moves out of large render-heavy components -- new appeal code becomes easier to understand and test -- future appeal types can be added with less change to core flow code +- behaviour is preserved across all journeys +- complexity is reduced +- code is easier to understand and change +- regression risk is lower +- new journeys/types can be added safely -## Working Branch Model +--- -This refactor stream uses the `refactor` branch as its working base. +## Delivery Model -- BAU continues on `SIPS-Development` -- refactor work is performed from `refactor` -- safe refactor slices may later be merged into `SIPS-Development` +Each refactor stream must: -This branch should not be treated as BAU, and BAU should not be treated as the refactor workspace. +1. follow slice-based approach +2. implement one concern per slice +3. validate behaviour after each slice +4. merge into `refactor` only when safe +5. merge to `SIPS-Development` only when stable + +--- + +## Safety Reminder + +This is a live system. + +If there is any doubt: + +> Preserve behaviour, reduce risk, and keep changes small. diff --git a/context/representations-refactor-current-state.md b/context/representations-refactor-current-state.md new file mode 100644 index 00000000..4ba7907a --- /dev/null +++ b/context/representations-refactor-current-state.md @@ -0,0 +1,300 @@ +# Representations Refactor — Current State of Play + +## Purpose + +This document captures the **pre-refactor state** of the representations flow and defines the starting point for the behaviour-preserving refactor stream. + +It mirrors the approach used for the new appeal refactor and will be updated as slices are completed. + +--- + +## Executive Summary + +The representations flow is: + +- functionally complete and live +- behaviourally stable +- structurally complex and tightly coupled + +The flow currently: + +- spans multiple entry points +- mixes UI, workflow, and data logic +- contains duplicated branching and rendering logic +- relies heavily on shared global state (`currentView`, `searchResultsObj`) + +--- + +## Journey Overview + +The user journey is: + +1. Navigate to case summary page +2. Click **Make representation / consultation** +3. Enter representation flow +4. Select capacity +5. Select representation type +6. Enter content and upload files +7. Review check answers +8. Submit representation +9. View confirmation/completion + +--- + +## Entry Points + +### Primary Entry + +- `CaseSummary` component +- CTA button logic determines: + - whether representation is allowed + - which label to display + - which route to navigate to + +### Route + +- `/myportal/representation?case=` + +--- + +## Dual Mode Behaviour (Critical) + +The flow operates in two modes: + +### 1. New Representation (from search/case) + +- triggered from case summary CTA +- loads case data via search + details APIs +- initializes new representation state + +--- + +### 2. Existing Representation (resume/edit) + +- triggered via query param (`state`) +- loads representation from blob storage +- hydrates existing data and files + +--- + +This dual-mode behaviour is a **major complexity driver**. + +--- + +## Architecture Overview + +### High-Level Structure + +- Page layer (SSR + Redux hydration) +- Case component (core orchestration) +- Representation flow components (capacity/type/content/check) +- Shared helpers (`representationElements`) +- Service layer (case data, blob storage, CRM integration) + +--- + +### Key Components + +- `CaseSummary` → entry + CTA logic +- `Case` → main orchestration component +- Representation flow components: + - capacity selection + - representation type selection + - content entry + - check answers + - completion + +--- + +### State Management + +Primary state dependencies: + +- `currentView` +- `searchResultsObj` +- `myRepresentations` +- `filesForRepresentations` + +Heavy reliance on deeply nested props. + +--- + +## Current Architecture Issues + +### 1. High Coupling + +- UI, workflow logic, and data fetching are tightly mixed +- large components handle multiple responsibilities + +--- + +### 2. Deep Prop Chains + +Examples: + +- `props.currentView.caseReference.*` +- `props.searchResultsObj.*` + +This reduces readability and increases fragility. + +--- + +### 3. Duplicated Logic + +- appeal-type branching repeated across components +- summary rendering duplicated by case type +- representation form structure repeated across capacity types + +--- + +### 4. Dual Entry Complexity + +- separate logic paths for new vs existing representation +- mixed within the same components + +--- + +### 5. Async Data Complexity + +- chained service calls: + - `getCase` + - `getPortalModuleDetails` +- repeated across different contexts +- hard to reason about and test + +--- + +### 6. Inline Business Logic + +- eligibility rules embedded in UI components +- date checks and appeal-type logic duplicated +- LPA-specific behaviour scattered + +--- + +## Risk Areas + +High-risk areas that require extra caution: + +- CaseSummary eligibility logic +- SSR/data-loading logic for representation page +- submission/finalisation flow +- file upload handling +- dual-mode entry (new vs existing) +- Redux hydration and state consistency + +--- + +## Behavioural Constraints (Must Not Change) + +- eligibility rules for making a representation +- journey step order and navigation +- validation rules and messaging +- payload structure sent to backend/CRM +- file upload and metadata behaviour +- submission/finalisation behaviour +- confirmation page behaviour +- route/query parameter structure +- EN/CY parity + +--- + +## Comparison to New Appeal Flow + +### Similarities + +- step-based user journey +- check answers before submission +- file upload and validation steps +- finalisation/confirmation stage + +--- + +### Differences (Important) + +- dual-mode entry (new vs existing) +- more reliance on external data sources +- less structured “engine” (more implicit logic) +- heavier coupling to case summary and search flows + +--- + +## Refactor Readiness + +The flow is suitable for refactor because: + +- behaviour is stable +- clear boundaries can be identified +- repeated patterns exist +- appeal refactor provides a proven model + +--- + +## Refactor Strategy + +The refactor will follow a **slice-based, behaviour-preserving approach**: + +1. Extract entry logic (CaseSummary) +2. Separate SSR/data-loading concerns +3. isolate step resolution logic +4. decompose large components +5. clean up shared helpers +6. stabilize async/service layers +7. isolate submission/finalisation + +--- + +## Initial Slice Focus + +### Slice R1 — Entry Logic Extraction + +Target: + +- representation eligibility logic in `CaseSummary` + +Goal: + +- reduce coupling +- isolate decision logic +- prepare for safe downstream refactor + +--- + +## Validation Position + +At start of refactor: + +- behaviour is assumed correct +- no structural isolation exists +- regression testing is manual + +Each slice must: + +- prove behaviour unchanged +- reduce complexity incrementally + +--- + +## Conclusion + +The representations flow is: + +- behaviourally stable +- structurally complex +- suitable for controlled refactor + +The goal is to: + +- reduce coupling +- improve clarity +- enable safer future changes + +without altering live behaviour. + +--- + +## Next Step + +Begin **Slice R1 — Representation Entry Logic Extraction** + +Following strict guardrails and regression validation. diff --git a/context/representations-refactor-guardrails.md b/context/representations-refactor-guardrails.md new file mode 100644 index 00000000..1d907bdf --- /dev/null +++ b/context/representations-refactor-guardrails.md @@ -0,0 +1,137 @@ +# Representations Refactor Guardrails + +## Purpose + +These guardrails apply to all work on the **representations refactor stream**. + +This stream follows the same discipline as the new appeal refactor: + +> Behaviour-preserving, slice-based refactor of a live journey. + +--- + +## Critical Rule + +Preserve the current live behaviour of the representations journey. + +Do not assume a cleaner implementation allows behaviour changes. + +--- + +## Protected Journey + +The following user journey must not regress: + +1. Enter case summary page +2. Click **Make representation / consultation** +3. Navigate to representation flow +4. Select capacity +5. Select representation type +6. Enter content and upload files +7. View check answers +8. Submit representation +9. View completion/confirmation + +--- + +## Protected Behaviour + +Do not change: + +- representation eligibility logic (dates, appeal type, specialist process) +- CTA visibility and routing from case summary +- capacity selection behaviour +- representation type branching +- validation rules and messaging +- payload shape sent to backend/CRM +- file upload handling and metadata +- submission/finalisation flow +- confirmation behaviour +- navigation order or step progression +- route/query parameters +- EN/CY behaviour + +--- + +## Refactor Approach + +When refactoring: + +1. Understand current behaviour first +2. Identify smallest safe boundary +3. Prefer extraction over rewrite +4. Keep interfaces stable +5. Avoid mixing concerns in one change +6. Keep slices small and reversible + +--- + +## Required Testing Mindset + +Before completing any slice: + +- manually walk the full representation journey +- verify: + - start from case summary CTA + - capacity → type → content → check → submit + - successful completion +- verify EN/CY parity +- verify no navigation or state regression + +If behaviour cannot be confidently verified: +→ do not proceed + +--- + +## Payload / Integration Safety + +Do not change without explicit requirement: + +- CRM payload structure +- field names or mapping +- document/file metadata shape +- blob storage structure +- submission API behaviour + +--- + +## i18n / Accessibility Safety + +For any user-facing change: + +- maintain EN/CY parity +- do not change translation keys unless required +- preserve accessibility semantics and structure +- maintain focus and validation behaviour + +--- + +## What To Avoid + +Do not: + +- rewrite large components in one step +- introduce new business rules +- hardcode dynamic logic +- mix refactor with feature work +- change multiple concerns in one slice + +--- + +## Refactor Success Criteria + +A slice is successful when: + +- behaviour is unchanged +- complexity is reduced +- readability is improved +- regression risk is controlled +- change is small and reviewable + +--- + +## One-Line Rule + +If in doubt: + +> Keep behaviour the same, reduce risk, and make the smallest safe change. diff --git a/context/representations-refactor-tracker.md b/context/representations-refactor-tracker.md new file mode 100644 index 00000000..d2890539 --- /dev/null +++ b/context/representations-refactor-tracker.md @@ -0,0 +1,237 @@ +# Representations Refactor Tracker + +Base branch: `refactor` + +--- + +## Status + +Current slice: Slice R9 — Summary Rollout (Batch 1) +Status: COMPLETE + +--- + +## Slice List + +--- + +### Slice R1 — Representation Entry Logic Extraction + +Status: COMPLETE + +Notes: Completed in prior refactor slice work; no additional changes required in this closeout. + +--- + +### Slice R2 — Representation Page Loader Separation + +Status: COMPLETE + +Notes: Completed in prior refactor slice work; no additional changes required in this closeout. + +--- + +### Slice R3 — Journey Step Resolution Extraction + +Status: COMPLETE + +Notes: Completed in prior refactor slice work; no additional changes required in this closeout. + +--- + +### Slice R4 — Flow Shell Decomposition + +Status: COMPLETE + +Notes: Completed in prior refactor slice work; no additional changes required in this closeout. + +**Completion notes (this slice):** + +- Implemented on feature branch created from `refactor`: `rep-slice-r4-flow-shell`. +- Extracted render-shell structure from `components/case/representation/index.js` into: + - `components/case/representation/shell/RepresentationFlowFormStage.js` + - `components/case/representation/shell/RepresentationTimetablePanel.js` +- Kept `index.js` as orchestration owner (no side-effect migration): + - `onHandleSubmit` unchanged in location/ownership + - `updateRepresentation` unchanged in location/ownership + - upload/PDF/email sequencing unchanged + - stage-resolution/questionnaire decisions remain in `index.js` +- Preserved explicit prop passing; no grouped-prop/view-model abstraction introduced in this slice. +- Validation evidence: + - `npm run lint` completed (warnings only, no new errors). + - `npm run test:reps` completed: **6 passed**. + - Manual APP/IP/Agent/LPA checks: **passed**. + - Manual EN/CY parity checks: **passed**. + +--- + +### Slice R5 — Representation Elements Normalisation + +Status: COMPLETE + +Notes: Completed in prior refactor slice work; no additional changes required in this closeout. + +--- + +### Slice R6 — Async Data / Service Layer Cleanup + +Status: COMPLETE + +Notes: Completed in prior refactor slice work; no additional changes required in this closeout. + +--- + +### Slice R7 — Summary / Case-Type Rendering Simplification (Proof Slice) + +**Completion notes (this slice):** + +- Implemented on feature branch created from `refactor`: `rep-slice-r7-summary-rendering-simplification`. +- Added render-only summary primitives: + - `components/case/summary/components/SummaryCard.js` + - `components/case/summary/components/SummaryRow.js` +- Applied to proof subset: + - `pinswg_planningappeals78id.js` + - `pinswg_planningconditionss73s79id.js` +- Preserved constraints: + - no translation/date/bilingual logic moved + - no linked-cases extraction + - no ordering/visibility changes +- Validation evidence: + - `npm run lint` passed (warnings only) + - `npm run test:reps` passed (**7 passed**) + - manual APP/IP/Agent/LPA + EN/CY checks passed + +--- + +### Slice R8 — Submission / Finalisation Boundary Isolation + +**Completion notes (this slice):** + +- Implemented on feature branch created from `refactor`: `rep-slice-r8-finalisation-boundary`. +- Added helper module: + - `components/case/representation/utils/finalisationBoundary.js` +- Extracted: + - `buildRepresentationUpdateBody(...)` + - `buildSubmitEnrichedValues(...)` + - `runFinalisationSequence(...)` +- Preserved: + - parent-owned branching logic + - completion-side effects in `representationComplete.js` + - exact sequencing of finalisation operations +- Validation evidence: + - `npm run lint` passed (warnings only) + - `npm run test:reps` passed (**7 passed**) + - manual APP/IP/Agent/LPA + EN/CY checks passed + +--- + +### Slice R9 — Summary Rollout (Batch 1) + +**Goal:** +Roll out proven summary rendering primitives across remaining low-risk summary-type files. + +**Completion notes (this slice):** + +- Applied `SummaryCard` and `SummaryRow` primitives to Batch 1 summary-type files. +- Rollout executed incrementally: + - one summary-type file per commit + - consistent mechanical application of proven pattern +- Changes limited strictly to presentational structure: + - replaced card shell markup with `SummaryCard` + - replaced row wrapper markup with `SummaryRow` where safe +- Preserved across all updated files: + - field visibility rules + - row and card ordering + - translation key selection + - EN/CY branching behaviour + - date source selection and formatting + - linked-case logic + - route/query behaviour + - payloads and Redux state +- Parent summary-type files retain all business logic and conditional rendering. +- Shared components confirmed render-only. + +**Validation evidence:** + +- `npm run lint` completed (warnings only, no new errors) +- `npm run test:reps` passed (**7 passed**) +- Structured validation confirmed: + - translation/bilingual logic unchanged + - date/lookup logic unchanged + - conditional rendering preserved +- Targeted manual spot-checks completed: + - `pinswg_sipscase.js` + - `pinswg_dnsid.js` + - `pinswg_electricityactid.js` + - `pinswg_harbourrevisionorderid.js` +- No behavioural regressions identified + +**Outcome:** + +- Summary rendering layer simplified and standardised +- Duplication reduced while preserving all behaviour +- Safer and more maintainable structure + +**Status: COMPLETE** + +--- + +## Rules + +- Only work on ONE slice at a time +- Do not combine slices +- One branch per slice (exception: controlled rollout batches) +- One commit per slice (or per file in rollout batch) +- Update tracker after slice completion +- Do not proceed if regression risk exists + +--- + +## Regression Checklist (Run After Each Slice) + +### Core Journey + +- Navigate from case summary → Make representation +- Select capacity +- Select representation type +- Enter content +- Upload files (if applicable) +- View check answers +- Submit representation +- View confirmation page + +--- + +### Validation + +- EN/CY parity maintained +- No navigation regressions +- No state inconsistencies +- No console errors + +--- + +### Technical + +- `npm run lint` passes +- No new warnings/errors introduced + +--- + +## Notes + +- CaseSummary is a high-risk entry point +- Eligibility logic is complex and must not drift +- Submission flow is highly sensitive +- Dual-mode entry (new vs existing representation) is a key complexity + +--- + +## Definition of Done (Per Slice) + +A slice is complete when: + +- behaviour is preserved +- regression checks pass +- code is cleaner and easier to understand +- change is small and safe to merge diff --git a/lib/representation/pageLoaders.js b/lib/representation/pageLoaders.js new file mode 100644 index 00000000..cab234ef --- /dev/null +++ b/lib/representation/pageLoaders.js @@ -0,0 +1,270 @@ +import { getSession } from "next-auth/react"; +import { + getPersonalAccount, + getPortalLogin +} from "../../actions/services/accountService"; +import { + getCase, + getPortalModuleDetails +} from "../../actions/services/caseService"; +import { getRepsFromBlob } from "../../actions/services/documentService"; +import { getBasicSearch } from "../../actions/services/searchService"; +import { + getFormCollectionByID, + getSearchDetails +} from "../../components/utils"; +import { + setAccountDetails, + setContainerID +} from "../../store/accountDetails/action"; +import { + setCurrentReference, + setCurrentView, + setFilesForRepresentations, + setRepresentationCapacity +} from "../../store/currentView/action"; +import { + setMyRepresentations, + setMyRepresentationsDetails +} from "../../store/myRepresentations/action"; +import { + setSearchDetails, + setSearchResults +} from "../../store/searchOutput/action"; +import { setSearch } from "../../store/search/action"; +import { getRepsFilesBlobs } from "../../actions/azurestorage"; + +const getDetails = (resultsObj, detailsType) => { + let detailsArr = []; + + resultsObj = + detailsType == "mySubmittedReps" ? resultsObj : resultsObj.value; + + if (detailsType == "myRepresentations") { + const repsObj = resultsObj.map((searchDetail, index) => { + detailsArr.push( + getCase(searchDetail["incidentID"]).then((data) => { + let caseID = ""; + + switch (detailsType) { + case "myCases": + caseID = data.pinswg_title; + break; + case "myWatchedCases": + case "mySubmittedReps": + caseID = + data[ + "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" + ]; + break; + case "awaitingSubmission": + case "myRepresentations": + caseID = data.ticketnumber; + break; + default: + caseID = data.pinswg_title; + } + return getPortalModuleDetails( + getFormCollectionByID(data.pinswg_appealcasetype) + .LogicalCollectionName, + caseID + ); + }) + ); + }); + } + + let detArr = Promise.all(detailsArr); + console.log(detArr); + return detArr; +}; + +export const loadRepresentationBootstrap = async ({ ctx }) => { + const { query } = ctx; + console.log("The query", query); + + let thisSession = await getSession(ctx); + let loggedInUser = {}; + + if (!thisSession) { + console.log("not has sesssion......."); + return { + redirect: { + destination: "/auth/signin", + permanent: false + } + }; + } else { + [loggedInUser] = await Promise.all([ + await getPortalLogin(thisSession.user.email) + ]); + + console.log( + "=====//////////=====", + thisSession, + thisSession.user.email, + loggedInUser + ); + loggedInUser = loggedInUser.value[0].contactid; + } + + const [accountDetails, myRepresentations] = await Promise.all([ + await getPersonalAccount(loggedInUser), + await getRepsFromBlob(thisSession.user.id) + ]); + + const myRepresentationsDetails = await getDetails( + myRepresentations, + "myRepresentations" + ); + + console.log(accountDetails); + + const isLPA = + accountDetails[ + "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue" + ] == "LPA" + ? true + : false; + + return { + query, + thisSession, + loggedInUser, + accountDetails, + myRepresentations, + myRepresentationsDetails, + isLPA + }; +}; + +export const loadExistingRepresentation = async ({ store, ctx, bootstrap }) => { + const { query } = ctx; + const { + thisSession, + myRepresentations, + myRepresentationsDetails, + accountDetails, + isLPA + } = bootstrap; + + console.log("is lpa?:", isLPA); + + store.dispatch(setContainerID(thisSession.user.id)); + store.dispatch(setMyRepresentations(myRepresentations)); + store.dispatch(setMyRepresentationsDetails(myRepresentationsDetails)); + + function findObjectByKeyValue(arr, key, value) { + return arr.find((obj) => obj[key] === value); + } + + const result = findObjectByKeyValue( + myRepresentations.value, + "repfile_name", + query.created + ); + + store.dispatch( + setCurrentReference({ + "ticketnumber": + result.ticketnumber || result.caseRef || result.pinswg_name, + "currentReference": result.caseRef, + "currentType": "myRepresentations", + "incidentid": result.incidentID, + "appealType": result.appealType, + "repDetails": result, + "filesList": result.filesList + }) + ); + + store.dispatch(setRepresentationCapacity(result.representationCapacity)); + + const repsFileListObj = await getRepsFilesBlobs( + result.containerID, + result.ticketnumber || result.caseRef, + result.repfile_name + ); + + store.dispatch(setAccountDetails(accountDetails)); + store.dispatch(setFilesForRepresentations(repsFileListObj)); + + return { + props: { + containerID: thisSession.user.id, + docsOffline: process.env.DOCAPI_OFFLINE || false + } + }; +}; + +export const loadNewRepresentation = async ({ store, ctx, bootstrap }) => { + const { query } = ctx; + const { thisSession, accountDetails } = bootstrap; + + const searchResultsObj = await getBasicSearch(query.case); + const searchDetailsObj = await getSearchDetails(searchResultsObj); + + store.dispatch(setContainerID(thisSession.user.id)); + store.dispatch(setSearchResults(searchResultsObj)); + store.dispatch(setSearchDetails(searchDetailsObj)); + store.dispatch(setSearch(query.case)); + store.dispatch( + setCurrentView({ + "viewName": "My Representations", + "viewKey": "myRepresentations" + }) + ); + + console.log( + accountDetails, + "===================== is nrw", + accountDetails.emailaddress1.includes(process.env.NRWDOMAIN), + "===================== " + ); + + store.dispatch( + setCurrentReference({ + "isNRW": + accountDetails.emailaddress1.includes(process.env.NRWDOMAIN) || + false, + "ticketnumber": searchResultsObj.value[0].ticketnumber, + "currentReference": searchResultsObj.value[0].title, + "currentType": "myRepresentations", + "incidentid": searchResultsObj.value[0].incidentid, + "appealType": searchResultsObj.value[0].pinswg_appealcasetype, + "specialistProcess": + searchDetailsObj[0].value[0].pinswg_speacialistcaseprocess != + null || + searchDetailsObj[0].value[0].pinswg_specialistcaseprocess != + null + ? searchDetailsObj[0].value[0] + .pinswg_speacialistcaseprocess || + searchDetailsObj[0].value[0].pinswg_specialistcaseprocess + : "" + }) + ); + + store.dispatch(setAccountDetails(accountDetails)); + + return { + props: { + containerID: thisSession.user.id, + docsOffline: process.env.DOCAPI_OFFLINE || false + } + }; +}; + +export const loadRepresentationPage = async ({ store, ctx }) => { + const bootstrap = await loadRepresentationBootstrap({ ctx }); + + if (bootstrap?.redirect) { + return bootstrap; + } + + const { query } = ctx; + + if (query.hasOwnProperty("state")) { + return loadExistingRepresentation({ store, ctx, bootstrap }); + } + + return loadNewRepresentation({ store, ctx, bootstrap }); +}; diff --git a/pages/myportal/representation.js b/pages/myportal/representation.js index d7a6fabc..2d7b952d 100644 --- a/pages/myportal/representation.js +++ b/pages/myportal/representation.js @@ -1,62 +1,24 @@ import useTranslation from "next-translate/useTranslation"; import Head from "next/head"; -import { useEffect, useState } from "react"; +import { useState } from "react"; -import { getSession, useSession } from "next-auth/react"; +import { useSession } from "next-auth/react"; import { useRouter } from "next/router"; -import { connect, useDispatch } from "react-redux"; -import { - getPersonalAccount, - getPortalLogin, - getPortalLoginProxy -} from "../../actions/services/accountService"; -import { - getCase, - getPortalModuleDetails -} from "../../actions/services/caseService"; -import { - getFilesFromBlob, - getRepsFromBlob -} from "../../actions/services/documentService"; -import { getBasicSearch } from "../../actions/services/searchService"; -import { getFormCollectionByID } from "../../components/utils"; +import { connect } from "react-redux"; import Breadcrumbs from "../../components/breadcrumbs"; import CookieBanner from "../../components/cookieBanner"; import Footer from "../../components/footer"; import Header from "../../components/header"; import Case from "../../components/representation"; -import { - setAccountDetails, - setContainerID, - setLoggedInUserId -} from "../../store/accountDetails/action"; import { wrapper } from "../../store/store"; -import { getSearchDetails } from "../../components/utils"; +import { loadRepresentationPage } from "../../lib/representation/pageLoaders"; -import { - setCurrentReference, - setCurrentView, - setFilesForRepresentations, - setRepresentationCapacity -} from "../../store/currentView/action"; -import { - setSearchDetails, - setSearchResults -} from "../../store/searchOutput/action"; -import { setSearch } from "../../store/search/action"; +import { setCurrentReference } from "../../store/currentView/action"; import NoSessionWarning from "../../components/nosession"; import ServiceBanner from "../../components/myportal/servicebanner"; import TimeOut from "../../components/timeout"; -import { - setMyRepresentations, - setMyRepresentationsDetails, - setMySubmittedReps, - setMySubmittedRepsDetails -} from "../../store/myRepresentations/action"; -import { getRepsFilesBlobs } from "../../actions/azurestorage"; - const RepresentationF = (props) => { const { footerLinks, pages } = props; let { t, lang } = useTranslation(); @@ -65,8 +27,6 @@ const RepresentationF = (props) => { const { locale } = router; const { appealtypes } = router.query; - const dispatch = useDispatch(); - const [showQuestionnaireSection, setShowQuestionnaireSection] = useState(1); // useEffect(() => { @@ -224,264 +184,9 @@ const RepresentationF = (props) => { }; export const getServerSideProps = wrapper.getServerSideProps( - (store) => async (ctx) => { - const { query, req, res } = ctx; - console.log("The query", query); - - const { cookies } = req; - - let loggedInUserCookie = cookies.pinsUser; - - let thisSession = await getSession(ctx); - let loggedInUser = {}; - - if (!thisSession) { - console.log("not has sesssion......."); - return { - redirect: { - destination: "/auth/signin", - permanent: false - } - }; - } else { - [loggedInUser] = await Promise.all([ - await getPortalLogin(thisSession.user.email) - ]); - - console.log( - "=====//////////=====", - thisSession, - thisSession.user.email, - loggedInUser - ); - loggedInUser = loggedInUser.value[0].contactid; - } - - const [accountDetails, myRepresentations] = await Promise.all([ - await getPersonalAccount(loggedInUser), - await getRepsFromBlob(thisSession.user.id) - ]); - - const myRepresentationsDetails = await getDetails( - myRepresentations, - "myRepresentations" - ); - - console.log(accountDetails); - - const isLPA = - accountDetails[ - "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue" - ] == "LPA" - ? true - : false; - - //isLPA && store.dispatch(setRepresentationCapacity("LPA")); - - if (query.hasOwnProperty("state")) { - console.log("is lpa?:", isLPA); - - store.dispatch(setContainerID(thisSession.user.id)); - store.dispatch(setMyRepresentations(myRepresentations)); - store.dispatch( - setMyRepresentationsDetails(myRepresentationsDetails) - ); - - function findObjectByKeyValue(arr, key, value) { - return arr.find((obj) => obj[key] === value); - } - - const result = findObjectByKeyValue( - myRepresentations.value, - "repfile_name", - query.created - ); - - store.dispatch( - setCurrentReference({ - "ticketnumber": - result.ticketnumber || - result.caseRef || - result.pinswg_name, - "currentReference": result.caseRef, - "currentType": "myRepresentations", - "incidentid": result.incidentID, - "appealType": result.appealType, - "repDetails": result, - "filesList": result.filesList - }) - ); - - store.dispatch( - setRepresentationCapacity(result.representationCapacity) - ); - - // console.log( - // "===========================\n getting files", - // result.filesList - // ); - - const repsFileListObj = await getRepsFilesBlobs( - result.containerID, - result.ticketnumber || result.caseRef, - result.repfile_name - ); - - store.dispatch(setAccountDetails(accountDetails)); - store.dispatch(setFilesForRepresentations(repsFileListObj)); - - return { - props: { - containerID: thisSession.user.id, - docsOffline: process.env.DOCAPI_OFFLINE || false - } - }; - } else { - const searchResultsObj = await getBasicSearch(query.case); - const searchDetailsObj = await getSearchDetails(searchResultsObj); - - store.dispatch(setContainerID(thisSession.user.id)); - store.dispatch(setSearchResults(searchResultsObj)); - store.dispatch(setSearchDetails(searchDetailsObj)); - store.dispatch(setSearch(query.case)); - store.dispatch( - setCurrentView({ - "viewName": "My Representations", - "viewKey": "myRepresentations" - }) - ); - - console.log( - accountDetails, - "===================== is nrw", - accountDetails.emailaddress1.includes(process.env.NRWDOMAIN), - "===================== " - ); - - store.dispatch( - setCurrentReference({ - "isNRW": - accountDetails.emailaddress1.includes( - process.env.NRWDOMAIN - ) || false, - "ticketnumber": searchResultsObj.value[0].ticketnumber, - "currentReference": searchResultsObj.value[0].title, - "currentType": "myRepresentations", - "incidentid": searchResultsObj.value[0].incidentid, - "appealType": - searchResultsObj.value[0].pinswg_appealcasetype, - - "specialistProcess": - searchDetailsObj[0].value[0] - .pinswg_speacialistcaseprocess != null || - searchDetailsObj[0].value[0] - .pinswg_specialistcaseprocess != null - ? searchDetailsObj[0].value[0] - .pinswg_speacialistcaseprocess || - searchDetailsObj[0].value[0] - .pinswg_specialistcaseprocess - : "" - }) - ); - - store.dispatch(setAccountDetails(accountDetails)); - - return { - props: { - containerID: thisSession.user.id, - docsOffline: process.env.DOCAPI_OFFLINE || false - } - }; - } - } + (store) => async (ctx) => loadRepresentationPage({ store, ctx }) ); -const getDetails = (resultsObj, detailsType) => { - let detailsArr = []; - - resultsObj = - detailsType == "mySubmittedReps" ? resultsObj : resultsObj.value; - - if (detailsType == "myRepresentations") { - const repsObj = resultsObj.map((searchDetail, index) => { - detailsArr.push( - getCase(searchDetail["incidentID"]).then((data) => { - let caseID = ""; - - switch (detailsType) { - case "myCases": - caseID = data.pinswg_title; - break; - case "myWatchedCases": - case "mySubmittedReps": - caseID = - data[ - "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" - ]; - break; - case "awaitingSubmission": - case "myRepresentations": - caseID = data.ticketnumber; - break; - default: - caseID = data.pinswg_title; - } - return getPortalModuleDetails( - getFormCollectionByID(data.pinswg_appealcasetype) - .LogicalCollectionName, - caseID - ); - }) - ); - }); - } - - // const detailsObj = resultsObj.map(async (searchDetail, index) => { - // let caseID = ""; - - // switch (detailsType) { - // case "myCases": - // caseID = searchDetail.pinswg_title; - // break; - // case "myWatchedCases": - // case "mySubmittedReps": - // caseID = - // searchDetail[ - // "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" - // ]; - // break; - // case "awaitingSubmission": - // caseID = searchDetail.ticketnumber; - // break; - // case "myRepresentations": - // caseID = searchDetail.casereference; - // break; - // default: - // caseID = searchDetail.pinswg_title; - // } - - // console.log(detailsType, " case id : ", caseID); - - // searchDetail.pinswg_appealcasetype != null && - // detailsArr.push( - // getPortalModuleDetails( - // getFormCollectionByID(searchDetail.pinswg_appealcasetype) - // .LogicalCollectionName, - // caseID - // // detailsType != "myWatchedCases" - // // ? searchDetail.ticketnumber - // // : searchDetail[ - // // "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" - // // ] - // ) - // ); - // }); - - let detArr = Promise.all(detailsArr); - console.log(detArr); - return detArr; -}; - // const mapDispatchToProps = (dispatch) => { // return { // setAccountDetails: (loggedInUser) => { diff --git a/tsconfig.json b/tsconfig.json index ed08869a..d55eb308 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,25 +8,17 @@ "allowJs": true, "skipLibCheck": true, "strict": false, - "forceConsistentCasingInFileNames": true, "noEmit": true, "incremental": true, - "esModuleInterop": true, "module": "esnext", + "esModuleInterop": true, "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "jsx": "preserve", - "plugins": [ - { - "name": "next" - } - ], - "strictNullChecks": true + "jsx": "preserve" }, "include": [ "next-env.d.ts", - ".next/types/**/*.ts", "**/*.ts", "**/*.tsx" ],