diff --git a/components/case/summary.js b/components/case/summary.js index 17f4e73c..b6578ca3 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -582,6 +582,9 @@ const CaseSummary = (props) => {
{_.has(detailsObj, "pinswg_startdate") && + (detailsObj.pinswg_startdate != null || + detailsObj.pinswg_finalcommentsduedate != + null) && showRepsEnded( detailsObj.pinswg_startdate, detailsObj.pinswg_finalcommentsduedate diff --git a/components/case/summaryTypes/pinswg_advertsid.js b/components/case/summaryTypes/pinswg_advertsid.js index 9d5603e3..98a91a9d 100644 --- a/components/case/summaryTypes/pinswg_advertsid.js +++ b/components/case/summaryTypes/pinswg_advertsid.js @@ -137,6 +137,7 @@ const Pinswg_advertsid = (props) => { )}
+
{t("case:summary-decision-label")} @@ -155,7 +156,7 @@ const Pinswg_advertsid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js index 88543edc..0b7fa92d 100644 --- a/components/case/summaryTypes/pinswg_callinss77id.js +++ b/components/case/summaryTypes/pinswg_callinss77id.js @@ -155,7 +155,7 @@ const Pinswg_callinss77id = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js index 6980a5dd..34c7e8e9 100644 --- a/components/case/summaryTypes/pinswg_commonlandid.js +++ b/components/case/summaryTypes/pinswg_commonlandid.js @@ -155,7 +155,7 @@ const Pinswg_commonlandid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js index 415c63bf..73d9bdc6 100644 --- a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js +++ b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js @@ -155,7 +155,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js index 5592c56e..8b41f618 100644 --- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js +++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js @@ -137,7 +137,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js index cbd8bc83..0d2e58d8 100644 --- a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js +++ b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js @@ -155,7 +155,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js index f2d8d6f6..ede678e0 100644 --- a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js +++ b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js @@ -155,7 +155,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js index 35feb755..6de84bd2 100644 --- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js +++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js @@ -155,7 +155,7 @@ const Pinswg_environmentalpermittingid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js index 8f7555e3..a28793e4 100644 --- a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js +++ b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js @@ -176,7 +176,7 @@ const Pinswg_harbourrevisionorderid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js index 4299b060..c67d0f94 100644 --- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js +++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js @@ -155,7 +155,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_householderappealhasid.js b/components/case/summaryTypes/pinswg_householderappealhasid.js index 866271ae..5b33787d 100644 --- a/components/case/summaryTypes/pinswg_householderappealhasid.js +++ b/components/case/summaryTypes/pinswg_householderappealhasid.js @@ -136,7 +136,7 @@ const Pinswg_householderappealhasid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js index d3973880..2efdc90f 100644 --- a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js +++ b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js @@ -155,7 +155,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_ldpid.js b/components/case/summaryTypes/pinswg_ldpid.js index d22b9f3f..f50c8b89 100644 --- a/components/case/summaryTypes/pinswg_ldpid.js +++ b/components/case/summaryTypes/pinswg_ldpid.js @@ -155,7 +155,7 @@ const Pinswg_ldpid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js index 734f4496..f1a571c8 100644 --- a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js +++ b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js @@ -155,7 +155,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js index 164cf5c1..6ebe3660 100644 --- a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js +++ b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js @@ -155,7 +155,7 @@ const Pinswg_maintenanceoflands217id = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js index 867c79d2..120fc90b 100644 --- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js +++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js @@ -155,7 +155,7 @@ const Pinswg_miscellaneouscasewordid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_nonvalidationid.js b/components/case/summaryTypes/pinswg_nonvalidationid.js index af35b0d8..ab2c982e 100644 --- a/components/case/summaryTypes/pinswg_nonvalidationid.js +++ b/components/case/summaryTypes/pinswg_nonvalidationid.js @@ -136,7 +136,7 @@ const Pinswg_nonvalidationid = (props) => { "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_planningappeals78id.js b/components/case/summaryTypes/pinswg_planningappeals78id.js index b8424ddc..8c647911 100644 --- a/components/case/summaryTypes/pinswg_planningappeals78id.js +++ b/components/case/summaryTypes/pinswg_planningappeals78id.js @@ -112,7 +112,10 @@ const Pinswg_planningappeals78id = (props) => { ) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" - ] || ""} + ] || + t( + "case:summary-no-information-to-date-label" + )}
@@ -155,7 +158,7 @@ const Pinswg_planningappeals78id = (props) => { "pinswg_dicision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js index 5565a83a..b4aa8c9b 100644 --- a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js +++ b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js @@ -155,7 +155,7 @@ const Pinswg_planningconditionss73s79id = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js index 917ddddc..6d25f787 100644 --- a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js +++ b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js @@ -155,7 +155,7 @@ const Pinswg_planningobligationappeals106id = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js index f020aa91..b47b4360 100644 --- a/components/case/summaryTypes/pinswg_rowid.js +++ b/components/case/summaryTypes/pinswg_rowid.js @@ -155,7 +155,7 @@ const Pinswg_rowid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js index 42af1e80..6303fdc9 100644 --- a/components/case/summaryTypes/pinswg_wayleaveid.js +++ b/components/case/summaryTypes/pinswg_wayleaveid.js @@ -155,7 +155,7 @@ const Pinswg_wayleaveid = (props) => { "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] || t( - "case:summary-no-date-entered-label" + "case:summary-no-information-to-date-label" )}
diff --git a/components/homepage/login.js b/components/homepage/login.js index c791c2b6..08f1d405 100644 --- a/components/homepage/login.js +++ b/components/homepage/login.js @@ -5,7 +5,6 @@ import useTranslation from "next-translate/useTranslation"; import { connect } from "react-redux"; import { Field, reduxForm } from "redux-form"; -import { getLogin } from "../../actions"; import { setLoggedInUserId } from "../../store/accountDetails/action"; import { parseCookies, setCookie, destroyCookie } from "nookies"; @@ -19,102 +18,6 @@ export const minLength = (errorMsg) => (value) => ? errorMsg //`Must be ${min} characters or more` : undefined; -const RenderTextfield = ({ - id, - className, - rows, - datafieldname, - name, - label, - input, - hint1, - hint2, - meta: { touched, error }, - ...custom -}) => { - return ( - <> -
-
- {hint1} - -
- {hint2} -
- - {touched && error && ( - - Error:{" "} - {error} - - )} - -
- - ); -}; -const RenderPasswordfield = ({ - id, - className, - rows, - datafieldname, - name, - label, - input, - hint1, - hint2, - meta: { touched, error }, - ...custom -}) => { - return ( - <> -
- -
- {hint1} -
- - {touched && error && ( - - Error:{" "} - {error} - - )} - -
- - ); -}; - let Login = (props) => { let { t } = useTranslation(); const { handleSubmit, pristine, reset, submitting, setLoggedInUserId } = @@ -134,32 +37,6 @@ let Login = (props) => { // : setShowSpinnerState(true); // }; - const onHandleSubmit = (values) => { - //spinnerState(); - - let now = new Date(); - let expDate = new Date(now); - - expDate.setDate(now.getDate() + 1); - - getLogin(values.loginUserID, values.loginUserPassword).then((data) => { - data.value.length != 0 - ? (setValidLoginID(true), - setLoggedInUserId(data.value[0].contactid), - setCookie(null, "pinsUser", data.value[0].contactid, { - path: "/", - expires: expDate, - }), - // spinnerState(), - router.replace({ - pathname: - router.locale == "cy" ? "/fymhorth" : "/myportal", - })) - : //setShowSpinnerState(false), - setValidLoginID(false); - }); - }; - const cookies = parseCookies(); useEffect(() => { @@ -241,81 +118,7 @@ let Login = (props) => {

{t("home:login-comingsoon-temp-1a")}{" "}

- {/*
- {validLoginID == false && ( -
- Incorrect username or password -
- )} - - - - -
- -
- */}
- {/*

- { - govGatwayLoginRedirect(); - }} - className="govuk-button withChevron govuk-button-cta" - > - {t("home:login-via-gov-gateway-label")} - -

-

- {t("home:login-card-register-label")}{" "} - - {t("home:login-card-register-link")} - -

- */} - {/*

- { - govGatwayForgottenLink(); - }} - className="govuk-link--no-underline" - > - {t("home:login-card-forgotten-label")}{" "} - -

*/}

{t("home:login-comingsoon-temp-2")} @@ -414,12 +217,4 @@ const mapDispatchToProps = (dispatch) => { }; }; -export default connect( - mapStateToProps, - mapDispatchToProps -)( - reduxForm({ - form: "loginForm", - destroyOnUnmount: false, - })(Login) -); +export default connect(mapStateToProps, mapDispatchToProps)(Login); diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js index fed7f759..6dbf2fe6 100644 --- a/components/pdftemplates/appealRow_pdf.js +++ b/components/pdftemplates/appealRow_pdf.js @@ -348,12 +348,9 @@ export const AppealRow_pdf = (props) => { } > - { - props.props[ - datafieldname[0] - .value - ] - }{" "} + {props.props[ + datafieldname[0].value + ] || ""}{" "} diff --git a/components/pdftemplates/enforcement_pdf.js b/components/pdftemplates/enforcement_pdf.js index 6d0271e3..db895556 100644 --- a/components/pdftemplates/enforcement_pdf.js +++ b/components/pdftemplates/enforcement_pdf.js @@ -247,7 +247,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { "Written representations" && ( - {values.procedureTypeEvidence} + {values.procedureTypeEvidence || ""} )} @@ -298,9 +298,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { "Yes" && ( - { - values.enterNeighbouringLandToViewSiteEvidence - } + {values.enterNeighbouringLandToViewSiteEvidence || + ""} )} @@ -338,9 +337,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { "Yes" && ( - { - values.enterNeighbouringLandAccessRequiredEvidence - } + {values.enterNeighbouringLandAccessRequiredEvidence || + ""} )} @@ -372,9 +370,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.healthAndSafetyIssues == "Yes" && ( - { - values.healthAndSafetyIssuesEvidence - } + {values.healthAndSafetyIssuesEvidence || + ""} )} @@ -402,7 +399,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - {values.LPAcontactDetails} + {values.LPAcontactDetails || ""} @@ -475,7 +472,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.feeExempt == "Yes" && ( - {values.feeExemptEvidence} + {values.feeExemptEvidence || ""} )} @@ -516,7 +513,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.previousGrantedCerts == "Yes" && ( - {values.previousGrantedCertsEvidence} + {values.previousGrantedCertsEvidence || + ""} )} @@ -539,7 +537,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.stopNoticeServed == "Yes" && ( - {values.stopNoticeServedEvidence} + {values.stopNoticeServedEvidence || ""} )} @@ -564,7 +562,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.relatedCases == "Yes" && ( - {values.relatedCasesEvidence} + {values.relatedCasesEvidence || ""} )} @@ -587,7 +585,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.previousEnforcement == "Yes" && ( - {values.previousEnforcementEvidence} + {values.previousEnforcementEvidence || + ""} )} @@ -610,7 +609,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.subjectArticle4 == "Yes" && ( - {values.subjectArticle4Evidence} + {values.subjectArticle4Evidence || ""} )} @@ -634,7 +633,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.previousPDRRestriction == "Yes" && ( - {values.previousPDRRestrictionEvidence} + {values.previousPDRRestrictionEvidence || + ""} )} @@ -667,7 +667,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - {values.LPAldpAndMap} + {values.LPAldpAndMap || ""} @@ -685,7 +685,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - {values.LPAlocalGuidance} + {values.LPAlocalGuidance || ""} @@ -761,7 +761,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.ROW == "Yes" && ( - {values.ROWEvidence} + {values.ROWEvidence || ""} )} @@ -792,7 +792,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.conservationArea == "Yes" && ( - {values.conservationAreaEvidence} + {values.conservationAreaEvidence || + ""} )} @@ -825,9 +826,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.affectListedBuilding == "Yes" && ( - { - values.affectListedBuildingEvidence - } + {values.affectListedBuildingEvidence || + ""} )} @@ -858,7 +858,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.TPO == "Yes" && ( - {values.TPOEvidence} + {values.TPOEvidence || ""} )} @@ -891,9 +891,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.natureConservationSite == "Yes" && ( - { - values.natureConservationSiteEvidence - } + {values.natureConservationSiteEvidence || + ""} )} @@ -924,7 +923,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.protectedSpecies == "Yes" && ( - {values.protectedSpeciesEvidence} + {values.protectedSpeciesEvidence || + ""} )} @@ -971,7 +971,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.floodingIssue == "Yes" && ( - {values.floodingIssueEvidence} + {values.floodingIssueEvidence || ""} )} @@ -1006,9 +1006,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { "Yes" && ( - { - values.governmentDepartmentCommentsEvidence - } + {values.governmentDepartmentCommentsEvidence || + ""} )} @@ -1078,9 +1077,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { "Yes" && ( - { - values.developmentCarriedOutInAccordanceEvidence - } + {values.developmentCarriedOutInAccordanceEvidence || + ""} )} @@ -1161,9 +1159,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { "Yes" && ( - { - values.developmentAnyOtherConditionsEvidence - } + {values.developmentAnyOtherConditionsEvidence || + ""} )} @@ -1207,7 +1204,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - {values.copyOfEnforcementNoticeEvidence} + {values.copyOfEnforcementNoticeEvidence || + ""} @@ -1237,7 +1235,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - {values.enforcementNoticePlan} + {values.enforcementNoticePlan || ""} @@ -1267,9 +1265,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - { - values.listOfNotifiedOfEnforcementEvidence - } + {values.listOfNotifiedOfEnforcementEvidence || + ""} @@ -1301,9 +1298,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { - { - values.copyOfLetterOfAppealNotificationEvidence - } + {values.copyOfLetterOfAppealNotificationEvidence || + ""} @@ -1335,7 +1331,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.lpaEIAOS == "Yes" && ( - {values.lpaEIAOSEvidence} + {values.lpaEIAOSEvidence || ""} )} @@ -1368,9 +1364,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.detailsOfOtherAppeals == "Yes" && ( - { - values.detailsOfOtherAppealsEvidence - } + {values.detailsOfOtherAppealsEvidence || + ""} )} @@ -1403,9 +1398,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.detailsOfPreviousAppeals == "Yes" && ( - { - values.detailsOfPreviousAppealsEvidence - } + {values.detailsOfPreviousAppealsEvidence || + ""} )} @@ -1437,9 +1431,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.otherRelevantInformation == "Yes" && ( - { - values.otherRelevantInformationEvidence - } + {values.otherRelevantInformationEvidence || + ""} )} diff --git a/components/pdftemplates/finalComments_pdf.js b/components/pdftemplates/finalComments_pdf.js index 8498b4d4..ce8c1a0b 100644 --- a/components/pdftemplates/finalComments_pdf.js +++ b/components/pdftemplates/finalComments_pdf.js @@ -226,9 +226,8 @@ export const finalComments_pdf = ({ docProps }) => { - { - values.conditional_representationCapacity_Comments - } + {values.conditional_representationCapacity_Comments || + ""} @@ -319,7 +318,7 @@ export const finalComments_pdf = ({ docProps }) => { - {values.representationComments} + {values.representationComments || ""} diff --git a/components/pdftemplates/other_pdf.js b/components/pdftemplates/other_pdf.js index 1005e614..8d52499d 100644 --- a/components/pdftemplates/other_pdf.js +++ b/components/pdftemplates/other_pdf.js @@ -245,7 +245,7 @@ export const other_pdf = ({ docProps }) => { - {values.representationComments} + {values.representationComments || ""} diff --git a/components/pdftemplates/statement_pdf.js b/components/pdftemplates/statement_pdf.js index d55ac076..1413a689 100644 --- a/components/pdftemplates/statement_pdf.js +++ b/components/pdftemplates/statement_pdf.js @@ -224,9 +224,8 @@ export const statement_pdf = ({ docProps }) => { - { - values.conditional_representationCapacity_Comments - } + {values.conditional_representationCapacity_Comments || + ""} diff --git a/components/pdftemplates/writtenStatement_pdf.js b/components/pdftemplates/writtenStatement_pdf.js index 0a94c6ca..3f38b76c 100644 --- a/components/pdftemplates/writtenStatement_pdf.js +++ b/components/pdftemplates/writtenStatement_pdf.js @@ -238,7 +238,7 @@ export const writtenStatement_pdf = ({ docProps }) => { - {values.representationComments} + {values.representationComments || ""} diff --git a/pages/api/endpoint/getawaitingsubmission_api.js b/pages/api/endpoint/getawaitingsubmission_api.js index 2b6691ad..e20fd15b 100644 --- a/pages/api/endpoint/getawaitingsubmission_api.js +++ b/pages/api/endpoint/getawaitingsubmission_api.js @@ -5,6 +5,13 @@ * tags: [Case] * summary: Phase 2 * description: get awaiting case submission + * parameters: + * - name: loggedInUserId + * in: query + * required: true + * example: 9c563a87-4158-ec11-a9c6-002248008e24 + * schema: + * type: string * responses: * 200: * description: Success diff --git a/pages/api/endpoint/getemailaccountcheck_api.js b/pages/api/endpoint/getemailaccountcheck_api.js index 4d6ee9e0..7792f247 100644 --- a/pages/api/endpoint/getemailaccountcheck_api.js +++ b/pages/api/endpoint/getemailaccountcheck_api.js @@ -1,3 +1,20 @@ +/** + * @swagger + * /api/endpoint/getemailaccountcheck_api: + * get: + * tags: [Login] + * description: Returns portal login + * summary: Phase 2 + * parameters: + * - name: emailAddress + * in: query + * required: true + * schema: + * type: string + * responses: + * 200: + * description: hello world + */ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; diff --git a/pages/api/endpoint/getpicklists_api.js b/pages/api/endpoint/getpicklists_api.js index 592e5612..005dbb2f 100644 --- a/pages/api/endpoint/getpicklists_api.js +++ b/pages/api/endpoint/getpicklists_api.js @@ -1,3 +1,22 @@ +/** + * @swagger + * /api/endpoint/getpicklists_api: + * get: + * tags: [Case] + * description: Returns picklists for appeal tpyes + * summary: Phase 2 + * parameters: + * - name: whichForm + * in: query + * required: true + * example: planningappeals78 + * schema: + * type: string + * responses: + * 200: + * description: hello world + */ + import axios from "axios"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders, consoleLogger } from "../../../actions";