diff --git a/.env.local b/.env.local
index e193c22d..8b1a773e 100644
--- a/.env.local
+++ b/.env.local
@@ -1,15 +1,17 @@
ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
-TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
-//TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
+//ESNR Tenant
+//TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
+//WGO Tenant
+TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
GRANT_TYPE = "client_credentials"
HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
-//Dev oauth
+//Dev oauth ESNR
//CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
//CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
@@ -17,7 +19,7 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459
//RELAYPATH = "dev-pedw-hc"
-//Test Oauth
+//Test Oauth ESNR
CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa
CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj-
RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
@@ -25,21 +27,21 @@ RELAYURI = "test-pedw-ns.servicebus.windows.net"
RELAYPATH = "test-pedw-hc"
-//Preprod Oauth
-//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
-//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
-//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
-//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "pp-pedw-hc"
+//Preprod Oauth WGO
+CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
+CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
+RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
+RELAYURI = "pp-pedw-ns.servicebus.windows.net"
+RELAYPATH = "pp-pedw-hc"
-//Prod Oauth
-//CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2
-//CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk
-//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
-//RELAYURI = "prod-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "prod-pedw-hc"
+//Prod Oauth WGO
+CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
+CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~
+RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
+RELAYURI = "prod-pedw-ns.servicebus.windows.net"
+RELAYPATH = "prod-pedw-hc"
GOOGLE_TAG_MANAGER = GTM-T78CBC3
diff --git a/components/case/summary.js b/components/case/summary.js
index 0ba86772..2722ef2f 100644
--- a/components/case/summary.js
+++ b/components/case/summary.js
@@ -211,6 +211,22 @@ const CaseSummary = (props) => {
: ""}
+ {casesObj.description != null && (
+
+
+ {t("case:summary-description-label")}
+
+
+ {casesObj.description.indexOf(";") < 0
+ ? casesObj.description
+ : router.locale == "cy"
+ ? casesObj.description.split(";")[1]
+ : casesObj.description.split(
+ ";"
+ )[0]}
+
+
+ )}
diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js
index b27dc1be..7c47f853 100644
--- a/components/case/summaryTypes/pinswg_dnsid.js
+++ b/components/case/summaryTypes/pinswg_dnsid.js
@@ -22,7 +22,11 @@ const Pinswg_dnsid = (props) => {
{detailsObj.pinswg_projectdescription != null
- ? router.locale == "cy"
+ ? detailsObj.pinswg_projectdescription.indexOf(
+ ";"
+ ) < 0
+ ? detailsObj.pinswg_projectdescription
+ : router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
@@ -34,7 +38,11 @@ const Pinswg_dnsid = (props) => {
{detailsObj.pinswg_projectlocation != null
- ? router.locale == "cy"
+ ? detailsObj.pinswg_projectlocation.indexOf(
+ ";"
+ ) < 0
+ ? detailsObj.pinswg_projectlocation
+ : router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
diff --git a/components/myportal/advancedsearch.js b/components/myportal/advancedsearch.js
new file mode 100644
index 00000000..efa1c89e
--- /dev/null
+++ b/components/myportal/advancedsearch.js
@@ -0,0 +1,513 @@
+import Link from "next/link";
+import { useState } from "react";
+import { useRouter } from "next/router";
+import useTranslation from "next-translate/useTranslation";
+import { reduxForm, formValueSelector, Field } from "redux-form";
+import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import jsonpath from "jsonpath";
+import data from "../../data/collections.json";
+import LoadingOverlay from "react-loading-overlay";
+import transLookup from "../../data/lookuptranslations.json";
+
+const required = (errorMsg) => (value) =>
+ value || typeof value === "number" ? undefined : errorMsg;
+
+export const minLength = (errorMsg) => (value) =>
+ value && value.length < 4
+ ? errorMsg //`Must be ${min} characters or more`
+ : undefined;
+
+let AdvancedSearch = (props) => {
+ let { t } = useTranslation();
+
+ const router = useRouter();
+ const { locale } = router;
+
+ const { LPAData, onSubmit, handleSubmit } = props;
+
+ console.log("props here:", props.props);
+
+ const appealOptionsObj = _.isEmpty(props)
+ ? [{}]
+ : _.isEmpty(props.appealType)
+ ? [{}]
+ : _.isEmpty(props.appealType.appealTypeOptions)
+ ? [{}]
+ : _.isEmpty(props.appealType.appealTypeOptions.value)
+ ? [{}]
+ : props.appealType.appealTypeOptions.value;
+
+ let lpaOptionsObj = _.isEmpty(props)
+ ? [{}]
+ : _.isEmpty(props.LPAData)
+ ? [{}]
+ : _.isEmpty(props.LPAData.LPAData)
+ ? [{}]
+ : _.isEmpty(props.LPAData.LPAData)
+ ? [{}]
+ : props.LPAData.LPAData.value;
+
+ const RenderTextfield = ({
+ id,
+ className,
+ rows,
+ datafieldname,
+ name,
+ label,
+ input,
+ hint1,
+ hint2,
+ hint3,
+ meta: { touched, error },
+ ...custom
+ }) => {
+ return (
+ <>
+
+
+
+
+
+
+
+ {touched && error && (
+
+
+ Error:
+ {" "}
+ {error}
+
+ )}
+
+
+ >
+ );
+ };
+
+ const RenderLPAList = ({
+ name,
+ id,
+ input,
+ optionsObj,
+ meta: { touched, error },
+ label,
+ errormsg,
+ }) => {
+ return (
+ <>
+
+ {" "}
+
+ {touched && error && (
+
+
+ Error:
+ {" "}
+ {errormsg}
+
+ )}
+
+
+
+
+ >
+ );
+ };
+
+ const RenderAppealTypeList = ({
+ name,
+ id,
+ input,
+ optionsObj,
+ meta: { touched, error },
+ label,
+ errormsg,
+ }) => {
+ return (
+ <>
+
+
+ {touched && error && (
+
+
+ Error:
+ {" "}
+ {errormsg}
+
+ )}
+
+
+
+
+ >
+ );
+ };
+
+ // const [showSpinnerState, setShowSpinnerState] = useState(false);
+
+ // let spinnerState = () => {
+ // showSpinnerState == true
+ // ? setShowSpinnerState(false)
+ // : setShowSpinnerState(true);
+ // };
+
+ const onHandleSubmit = (values) => {
+ event.preventDefault();
+ //spinnerState();
+
+ var searchString = "";
+
+ searchString +=
+ values.caseRef != null ? "?q=" + values.caseRef.trim() : "";
+ searchString +=
+ values.lpaTypes != null
+ ? (typeof values.caseRef == "undefined" ? "?" : "&") +
+ "lpa=" +
+ values.lpaTypes
+ : "";
+
+ searchString +=
+ values.appealTypes != null
+ ? (typeof values.caseRef == "undefined" &&
+ typeof values.lpaTypes == "undefined"
+ ? "?"
+ : "&") +
+ ("apt=" + values.appealTypes.split(",")[0])
+ : "";
+
+ router.replace(
+ (router.locale == "cy"
+ ? "/fymhorth/canlyniadauchwiliouwch"
+ : "/myportal/advancedsearchresults") + searchString,
+ null,
+ {
+ shallow: true,
+ }
+ );
+ };
+
+ return (
+ <>
+
+ {/* */}
+ >
+ );
+};
+
+const mapStateToProps = (state) => {
+ return {
+ currentView: state.currentView,
+ search: state.search,
+ searchResultsObj: state.searchResultsObj,
+ formData: state.formData,
+ appealType: state.appealType,
+ LPAData: state.LPAData,
+ //form: state.form,
+ myCases: state.myCases,
+ watchedCases: state.watchedCases,
+ myRepresentations: state.myRepresentations,
+ awaitingSubmission: state.awaitingSubmission,
+ };
+};
+
+const mapDispatchToProps = (dispatch) => {
+ return {};
+};
+
+const selector = formValueSelector("advancedSearchForm"); // <-- same as form name
+
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(
+ reduxForm({
+ form: "advancedSearchForm",
+ destroyOnUnmount: false,
+ })(AdvancedSearch)
+);
diff --git a/components/newappeal.js b/components/newappeal.js
deleted file mode 100644
index 48befd90..00000000
--- a/components/newappeal.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
-import useTranslation from "next-translate/useTranslation";
-import PlanningAppeal from "./newappeal/planningappeal";
-import EnforcementNotice from "./newappeal/enforcementnotice";
-import LDC from "./newappeal/ldc";
-import AdvertApplication from "./newappeal/advertapplication";
-
-export default function NewAppeal({ children, pages }) {
- let { t } = useTranslation();
-
- const router = useRouter();
- const { locale } = router;
-
- return (
-
-
-
- );
-}
diff --git a/components/search.js b/components/search.js
index fcebb057..78ac4dfa 100644
--- a/components/search.js
+++ b/components/search.js
@@ -5,11 +5,12 @@ import useTranslation from "next-translate/useTranslation";
import SearchForCase from "./search/searchforcase";
import AdvancedSearch from "./search/advancedsearch";
-export default function Search({ children, pages }) {
+export default function Search(props) {
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
+ console.log("props here:", props.myportal || false);
return (
-
+
);
}
diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js
index ba33dd41..849a5c36 100644
--- a/components/search/advancedsearch.js
+++ b/components/search/advancedsearch.js
@@ -23,7 +23,7 @@ let AdvancedSearch = (props) => {
const router = useRouter();
const { locale } = router;
- const { LPAData, onSubmit, handleSubmit } = props;
+ const { LPAData, onSubmit, handleSubmit, myportal } = props;
const appealOptionsObj = _.isEmpty(props)
? [{}]
@@ -304,13 +304,13 @@ let AdvancedSearch = (props) => {
: "";
router.replace(
- (router.locale == "cy"
- ? "/fymhorth/canlyniadauchwiliouwch"
- : "/myportal/advancedsearchresults") + searchString,
- null,
- {
- shallow: true,
- }
+ router.locale == "cy"
+ ? (myportal == true ? "/fymhorth" : "") +
+ "/canlyniadauchwiliouwch" +
+ searchString
+ : (myportal == true ? "/myportal" : "") +
+ "/advancedsearchresults" +
+ searchString
);
};
diff --git a/data/formsxml/adverts.xml b/data/formsxml/adverts.xml
new file mode 100644
index 00000000..f931e528
--- /dev/null
+++ b/data/formsxml/adverts.xml
@@ -0,0 +1,1046 @@
+
diff --git a/data/formsxml/callinss77.xml b/data/formsxml/callinss77.xml
new file mode 100644
index 00000000..21b4bf3c
--- /dev/null
+++ b/data/formsxml/callinss77.xml
@@ -0,0 +1,1149 @@
+
diff --git a/data/formsxml/commonland.xml b/data/formsxml/commonland.xml
new file mode 100644
index 00000000..82fbdeed
--- /dev/null
+++ b/data/formsxml/commonland.xml
@@ -0,0 +1,1015 @@
+
diff --git a/data/formsxml/communityinfrastructurelevys117118119.xml b/data/formsxml/communityinfrastructurelevys117118119.xml
new file mode 100644
index 00000000..4a21f29f
--- /dev/null
+++ b/data/formsxml/communityinfrastructurelevys117118119.xml
@@ -0,0 +1,1046 @@
+
diff --git a/data/formsxml/compulsorypurchaseorders.xml b/data/formsxml/compulsorypurchaseorders.xml
new file mode 100644
index 00000000..798a7e3e
--- /dev/null
+++ b/data/formsxml/compulsorypurchaseorders.xml
@@ -0,0 +1,1015 @@
+
diff --git a/data/formsxml/dns.xml b/data/formsxml/dns.xml
new file mode 100644
index 00000000..db58d211
--- /dev/null
+++ b/data/formsxml/dns.xml
@@ -0,0 +1,1179 @@
+
diff --git a/data/formsxml/electricityact.xml b/data/formsxml/electricityact.xml
new file mode 100644
index 00000000..68038bf8
--- /dev/null
+++ b/data/formsxml/electricityact.xml
@@ -0,0 +1,1094 @@
+
diff --git a/data/formsxml/enforcementlistedbuildingconservationap.xml b/data/formsxml/enforcementlistedbuildingconservationap.xml
new file mode 100644
index 00000000..06bb1a91
--- /dev/null
+++ b/data/formsxml/enforcementlistedbuildingconservationap.xml
@@ -0,0 +1,1106 @@
+
diff --git a/data/formsxml/enforcementnoticeappeals174.xml b/data/formsxml/enforcementnoticeappeals174.xml
new file mode 100644
index 00000000..a5e4c604
--- /dev/null
+++ b/data/formsxml/enforcementnoticeappeals174.xml
@@ -0,0 +1,1217 @@
+
diff --git a/data/formsxml/environmentalpermitting.xml b/data/formsxml/environmentalpermitting.xml
new file mode 100644
index 00000000..cbe892c0
--- /dev/null
+++ b/data/formsxml/environmentalpermitting.xml
@@ -0,0 +1,1018 @@
+
diff --git a/data/formsxml/harbourrevisionorder.xml b/data/formsxml/harbourrevisionorder.xml
new file mode 100644
index 00000000..9243d346
--- /dev/null
+++ b/data/formsxml/harbourrevisionorder.xml
@@ -0,0 +1,1033 @@
+
diff --git a/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml b/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml
new file mode 100644
index 00000000..a7bfd8ab
--- /dev/null
+++ b/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml
@@ -0,0 +1,1015 @@
+
diff --git a/data/formsxml/householderappealhas.xml b/data/formsxml/householderappealhas.xml
new file mode 100644
index 00000000..47aba019
--- /dev/null
+++ b/data/formsxml/householderappealhas.xml
@@ -0,0 +1,1141 @@
+
diff --git a/data/formsxml/lawfuldevelopmentcertificate.xml b/data/formsxml/lawfuldevelopmentcertificate.xml
new file mode 100644
index 00000000..2741bfb5
--- /dev/null
+++ b/data/formsxml/lawfuldevelopmentcertificate.xml
@@ -0,0 +1,1049 @@
+
diff --git a/data/formsxml/ldp.xml b/data/formsxml/ldp.xml
new file mode 100644
index 00000000..bb22dbf8
--- /dev/null
+++ b/data/formsxml/ldp.xml
@@ -0,0 +1,463 @@
+
diff --git a/data/formsxml/listedbuildingandconservationareaconsen.xml b/data/formsxml/listedbuildingandconservationareaconsen.xml
new file mode 100644
index 00000000..e5f79e68
--- /dev/null
+++ b/data/formsxml/listedbuildingandconservationareaconsen.xml
@@ -0,0 +1,1038 @@
+
diff --git a/data/formsxml/maintenanceoflands217.xml b/data/formsxml/maintenanceoflands217.xml
new file mode 100644
index 00000000..06e4e784
--- /dev/null
+++ b/data/formsxml/maintenanceoflands217.xml
@@ -0,0 +1,1099 @@
+
diff --git a/data/formsxml/miscellaneouscasework.xml b/data/formsxml/miscellaneouscasework.xml
new file mode 100644
index 00000000..abf93588
--- /dev/null
+++ b/data/formsxml/miscellaneouscasework.xml
@@ -0,0 +1,1209 @@
+
diff --git a/data/formsxml/nonvalidation.xml b/data/formsxml/nonvalidation.xml
new file mode 100644
index 00000000..e9562495
--- /dev/null
+++ b/data/formsxml/nonvalidation.xml
@@ -0,0 +1,537 @@
+
diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml
new file mode 100644
index 00000000..01e82816
--- /dev/null
+++ b/data/formsxml/planningappeals78.xml
@@ -0,0 +1,1144 @@
+
diff --git a/data/formsxml/planningconditionss73s79.xml b/data/formsxml/planningconditionss73s79.xml
new file mode 100644
index 00000000..9a133dec
--- /dev/null
+++ b/data/formsxml/planningconditionss73s79.xml
@@ -0,0 +1,1146 @@
+
diff --git a/data/formsxml/planningobligationappeals106.xml b/data/formsxml/planningobligationappeals106.xml
new file mode 100644
index 00000000..5fa4fbda
--- /dev/null
+++ b/data/formsxml/planningobligationappeals106.xml
@@ -0,0 +1,1038 @@
+
diff --git a/data/formsxml/row.xml b/data/formsxml/row.xml
new file mode 100644
index 00000000..ac293cb3
--- /dev/null
+++ b/data/formsxml/row.xml
@@ -0,0 +1,1015 @@
+
diff --git a/data/formsxml/transportandworkact.xml b/data/formsxml/transportandworkact.xml
new file mode 100644
index 00000000..76bf9923
--- /dev/null
+++ b/data/formsxml/transportandworkact.xml
@@ -0,0 +1,1033 @@
+
diff --git a/data/formsxml/wayleave.xml b/data/formsxml/wayleave.xml
new file mode 100644
index 00000000..c17a5141
--- /dev/null
+++ b/data/formsxml/wayleave.xml
@@ -0,0 +1,1023 @@
+
diff --git a/i18n.js b/i18n.js
index b80b503c..22905cb0 100644
--- a/i18n.js
+++ b/i18n.js
@@ -13,8 +13,9 @@ module.exports = {
"/": ["common", "home"],
"/myportal": ["myportal"],
"/myportal/viewall": ["search"],
- "/myportal/advancedsearch": ["search"],
- "/myportal/searchresults": ["search"],
+ "/myportal/advancedsearch": ["search", "myportal"],
+ "/myportal/advancedsearchresults": ["search", "myportal"],
+ "/myportal/searchresults": ["search", "myportal"],
"/myportal/case": ["case"],
"/advancedsearch": ["search", "myportal"],
"/advancedsearchresults": ["search"],
diff --git a/locales/cy/case.json b/locales/cy/case.json
index 0c27af6d..176e4a5b 100644
--- a/locales/cy/case.json
+++ b/locales/cy/case.json
@@ -5,6 +5,7 @@
"summary-applicant-label": "Apelydd/Ymgeisydd",
"summary-agent-label": "Asiant",
"summary-site-address-label": "Cyfeiriad y Safle",
+ "summary-description-label": "Disgrifiad",
"summary-make-representation-label": "Cyflwyno cynrychiolaeth",
"summary-back-button-label": "Ewch yn ôl",
"summary-case-details-label": "Manylion yr Achos",
diff --git a/locales/en/case.json b/locales/en/case.json
index 10bb81b8..8c6b5591 100644
--- a/locales/en/case.json
+++ b/locales/en/case.json
@@ -5,6 +5,7 @@
"summary-applicant-label": "Appellant/Applicant",
"summary-agent-label": "Agent",
"summary-site-address-label": "Site Address",
+ "summary-description-label": "Description",
"summary-make-representation-label": "Make representation",
"summary-back-button-label": "Go back",
"summary-case-details-label": "Case Details",
diff --git a/package.json b/package.json
index 48b0ac21..24bb32e9 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"dom": "^0.0.3",
"dynamics-web-api": "^1.7.4",
"express": "^4.17.2",
+ "fs": "^0.0.1-security",
"govuk-frontend": "3.13.0",
"https": "^1.0.0",
"hyco-https": "^1.4.5",
diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js
index 59b35ddd..b9492a3d 100644
--- a/pages/api/endpoint/getadvancedsearch_api.js
+++ b/pages/api/endpoint/getadvancedsearch_api.js
@@ -57,7 +57,7 @@ export default async function ApiProxy(req, res) {
: "";
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=" +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=" +
queryString +
" and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js
index 8e979332..9f3bb570 100644
--- a/pages/api/endpoint/getadvancedsearchpaged_api.js
+++ b/pages/api/endpoint/getadvancedsearchpaged_api.js
@@ -58,7 +58,7 @@ export default async function ApiProxy(req, res) {
: "";
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=" +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=" +
queryString +
" and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true" +
(typeof pageNumber != "undefined"
diff --git a/pages/api/endpoint/getawaitingsubmission_api.js b/pages/api/endpoint/getawaitingsubmission_api.js
index a02d336f..23a14d80 100644
--- a/pages/api/endpoint/getawaitingsubmission_api.js
+++ b/pages/api/endpoint/getawaitingsubmission_api.js
@@ -22,7 +22,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
loggedInUserId +
" and servicestage eq 1 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
diff --git a/pages/api/endpoint/getawaitingsubmissionproxy_api.js b/pages/api/endpoint/getawaitingsubmissionproxy_api.js
index 3fbdf43b..a3dc33a2 100644
--- a/pages/api/endpoint/getawaitingsubmissionproxy_api.js
+++ b/pages/api/endpoint/getawaitingsubmissionproxy_api.js
@@ -22,7 +22,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
loggedInUserId +
" and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js
index 564e8609..26ce65ad 100644
--- a/pages/api/endpoint/getbasicdnssearch_api.js
+++ b/pages/api/endpoint/getbasicdnssearch_api.js
@@ -25,7 +25,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
return axios
.get(
diff --git a/pages/api/endpoint/getbasicdnssearchpaged_api.js b/pages/api/endpoint/getbasicdnssearchpaged_api.js
index da246154..c90c9c35 100644
--- a/pages/api/endpoint/getbasicdnssearchpaged_api.js
+++ b/pages/api/endpoint/getbasicdnssearchpaged_api.js
@@ -26,7 +26,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true" +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true" +
(typeof pageNumber != "undefined"
? "&$skiptoken=" + ''
: "");
diff --git a/pages/api/endpoint/getbasicsearch_api.js b/pages/api/endpoint/getbasicsearch_api.js
index 7f0df321..d2bcff53 100644
--- a/pages/api/endpoint/getbasicsearch_api.js
+++ b/pages/api/endpoint/getbasicsearch_api.js
@@ -26,7 +26,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
searchString +
"') or contains(ticketnumber, '" +
searchString +
diff --git a/pages/api/endpoint/getbasicsearchpaged_api.js b/pages/api/endpoint/getbasicsearchpaged_api.js
index 5b43a393..c2be2114 100644
--- a/pages/api/endpoint/getbasicsearchpaged_api.js
+++ b/pages/api/endpoint/getbasicsearchpaged_api.js
@@ -25,7 +25,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
searchString +
"') or contains(ticketnumber, '" +
searchString +
diff --git a/pages/api/endpoint/getmycases_api.js b/pages/api/endpoint/getmycases_api.js
index 344e0dfe..abab2143 100644
--- a/pages/api/endpoint/getmycases_api.js
+++ b/pages/api/endpoint/getmycases_api.js
@@ -22,7 +22,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
+ "incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
loggedInUserId +
" and servicestage eq 0 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true&$top=3";
diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js
index 782880c5..3ea52570 100644
--- a/pages/myportal/[appealtypes].js
+++ b/pages/myportal/[appealtypes].js
@@ -1,3 +1,4 @@
+import fs from "fs";
import jsonpath from "jsonpath";
import useTranslation from "next-translate/useTranslation";
import Head from "next/head";
@@ -6,12 +7,11 @@ import { useEffect } from "react";
import { connect } from "react-redux";
import xpath from "xpath";
import {
- createCase,
getAppealsTypes,
- getFormData,
getMandatoryFields,
getPickLists,
} from "../../actions";
+import { getProviderConfig } from "../../actions/govgateway";
import Breadcrumbs from "../../components/breadcrumbs";
import CookieBanner from "../../components/cookieBanner";
import Footer from "../../components/footer";
@@ -19,31 +19,8 @@ import Header from "../../components/header";
import BuildCheckSection from "../../components/newappeal/buildchecksection";
import BuildSection from "../../components/newappeal/buildsection";
import CompleteAppeal from "../../components/newappeal/complete";
-import AdvertsForm from "../../data/forms/adverts";
-import Callinss77Form from "../../data/forms/callinss77";
-import CommonLandForm from "../../data/forms/commonland";
-import CommunityInfrastructureLevys117118119Form from "../../data/forms/communityinfrastructurelevys117118119";
-import CompulsoryPurchaseOrdersForm from "../../data/forms/compulsorypurchaseorders";
-import DNSForm from "../../data/forms/dns";
-import ElectricityActForm from "../../data/forms/electricityact";
-import EnforcementListedBuildingConservationapForm from "../../data/forms/enforcementlistedbuildingconservationap";
-import EnforcementNoticeAppeals174Form from "../../data/forms/enforcementnoticeappeals174";
-import EnvironmentalPermittingForm from "../../data/forms/environmentalpermitting";
-import HarbourRevisionOrderForm from "../../data/forms/harbourrevisionorder";
-import HedgesHedgerowsTreePreservationReplacemForm from "../../data/forms/hedgeshedgerowstreepreservationreplacem";
-import HouseholderAppealHasForm from "../../data/forms/householderappealhas";
-import LawfulDevelopmentCertificateForm from "../../data/forms/lawfuldevelopmentcertificate";
-import LdpForm from "../../data/forms/ldp";
-import ListedBuildingAndConservationAreaConsenForm from "../../data/forms/listedbuildingandconservationareaconsen";
-import MaintenanceOfLands217Form from "../../data/forms/maintenanceoflands217";
-import MiscellaneousCaseworkForm from "../../data/forms/miscellaneouscasework";
-import NonValidationForm from "../../data/forms/nonvalidation";
-import PlanningAppeals78Form from "../../data/forms/planningappeals78";
-import PlanningConditionss73s79Form from "../../data/forms/planningconditionss73s79";
-import PlanningObligationAppeals106Form from "../../data/forms/planningobligationappeals106";
-import RowForm from "../../data/forms/row";
-import TransportAndWorkActForm from "../../data/forms/transportandworkact";
-import WayleaveForm from "../../data/forms/wayleave";
+import TimeOut from "../../components/timeout";
+
import { setLoggedInUserId } from "../../store/accountDetails/action";
import {
setAppealLPA,
@@ -53,6 +30,7 @@ import {
setCaseReference,
} from "../../store/appealType/action";
import { setForm } from "../../store/formData/action";
+import { getGovGatewayConfig } from "../../store/govgateway/action";
import { wrapper } from "../../store/store";
let Home = (props) => {
@@ -65,7 +43,6 @@ let Home = (props) => {
useEffect(() => {
//setFormTitle(formTitle);
- console.log(router.query);
setCaseReference(router.query.casereference);
}, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -105,88 +82,6 @@ let Home = (props) => {
const formTitle = selectedObj[0].value;
- const getFormType = (appealType) => {
- switch (appealType) {
- case "adverts":
- return ;
- case "callinss77":
- return ;
- case "commonland":
- return ;
- case "communityinfrastructurelevys117118119":
- return (
-
- );
- case "compulsorypurchaseorders":
- return ;
- case "dns":
- return ;
- case "electricityact":
- return ;
- case "enforcementlistedbuildingconservationap":
- return (
-
- );
- case "enforcementnoticeappeals174":
- return ;
- case "environmentalpermitting":
- return ;
- case "harbourrevisionorder":
- return ;
- case "harbourrhedgeshedgerowstreepreservationreplacemevisionorder":
- return (
-
- );
- case "householderappealhas":
- return ;
- case "lawfuldevelopmentcertificate":
- return ;
-
- case "ldp":
- return ;
-
- case "listedbuildingandconservationareaconsen":
- return (
-
- );
- case "maintenanceoflands217":
- return ;
-
- case "miscellaneouscasework":
- return ;
-
- case "nonvalidation":
- return ;
-
- case "planningappeals78":
- return ;
-
- case "planningconditionss73s79":
- return ;
-
- case "planningobligationappeals106":
- return ;
-
- case "row":
- return ;
-
- case "transportandworkact":
- return ;
- case "wayleave":
- return ;
-
- default:
- return ;
- }
- re;
- };
-
const { onSubmit } = props;
return (
@@ -296,14 +191,13 @@ let Home = (props) => {
}
props={props}
/>
- {/* {getFormType(appealtypes)} */}
>
)}
-
+
);
};
@@ -314,15 +208,14 @@ export const getServerSideProps = wrapper.getServerSideProps(
const { cookies } = req;
console.log(cookies);
- console.log("the query", query);
+ console.log("the query", query.appealtypes);
let loggedInUser = cookies.pinsUser;
- const [appealTypeData, mandatoryFieldsData, pickListData, formdata] =
+ const [appealTypeData, mandatoryFieldsData, pickListData] =
await Promise.all([
await getAppealsTypes(),
await getMandatoryFields(query.appealtypes),
await getPickLists(query.appealtypes),
- await getFormData(query.appealtypes),
]);
let caseReference = {};
@@ -330,12 +223,20 @@ export const getServerSideProps = wrapper.getServerSideProps(
caseReference.ticketnumber = query.casereference;
caseReference.incidentid = query.inid;
- console.log(caseReference);
- let xmlStr = formdata;
- xmlStr = formdata.value[0].formxml;
- xmlStr = xmlStr.replace(/\\"/g, "");
+ var path = require("path");
+ const configDirectory = path.resolve(process.cwd(), "data/formsxml");
+ var xmlStr = fs.readFileSync(
+ path.join(configDirectory, query.appealtypes + ".xml"),
+ "utf8"
+ );
- //console.log(caseReference, query.appealtypes, formdata);
+ xmlStr = xmlStr.replace(/\t/g, "");
+ xmlStr = xmlStr.replace(/\n/g, "");
+ xmlStr = xmlStr.replace(/> <"/g, "><");
+ xmlStr = xmlStr.toString();
+
+ const providerConfig = await getProviderConfig();
+ store.dispatch(getGovGatewayConfig(providerConfig));
store.dispatch(setLoggedInUserId(loggedInUser));
store.dispatch(setAppealLPA(query.lpa));
store.dispatch(setAppealTypeID(query.apt));
@@ -353,6 +254,7 @@ const mapStateToProps = (state) => {
appealType: state.appealType,
form: state.form,
accountDetails: state.accountDetails,
+ govGateway: state.govGateway,
};
};
diff --git a/pages/myportal/advancedsearch.js b/pages/myportal/advancedsearch.js
index 1439729d..fe720725 100644
--- a/pages/myportal/advancedsearch.js
+++ b/pages/myportal/advancedsearch.js
@@ -49,6 +49,7 @@ const Home = (props) => {
)}
diff --git a/pages/myportal/index.js b/pages/myportal/index.js
index dbf7b7ff..28c7207a 100644
--- a/pages/myportal/index.js
+++ b/pages/myportal/index.js
@@ -154,14 +154,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
let providerConfig = await getProviderConfig();
- // console.log(
- // "logout endpoint: ",
- // providerConfig.end_session_endpoint,
- // "\n",
- // "redirect:",
- // process.env.GG_REDIRECT_URI
- //);
-
store.dispatch(getGovGatewayConfig(providerConfig));
const [
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index 8a43cf36..5c1c5918 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -1,3 +1,4 @@
+import fs from "fs";
import jsonpath from "jsonpath";
import useTranslation from "next-translate/useTranslation";
import Head from "next/head";
@@ -8,10 +9,10 @@ import xpath from "xpath";
import {
createCase,
getAppealsTypes,
- getFormData,
getMandatoryFields,
getPickLists,
} from "../../actions";
+import { getProviderConfig } from "../../actions/govgateway";
import Breadcrumbs from "../../components/breadcrumbs";
import CookieBanner from "../../components/cookieBanner";
import Footer from "../../components/footer";
@@ -19,31 +20,8 @@ import Header from "../../components/header";
import BuildCheckSection from "../../components/newappeal/buildchecksection";
import BuildSection from "../../components/newappeal/buildsection";
import CompleteAppeal from "../../components/newappeal/complete";
-import AdvertsForm from "../../data/forms/adverts";
-import Callinss77Form from "../../data/forms/callinss77";
-import CommonLandForm from "../../data/forms/commonland";
-import CommunityInfrastructureLevys117118119Form from "../../data/forms/communityinfrastructurelevys117118119";
-import CompulsoryPurchaseOrdersForm from "../../data/forms/compulsorypurchaseorders";
-import DNSForm from "../../data/forms/dns";
-import ElectricityActForm from "../../data/forms/electricityact";
-import EnforcementListedBuildingConservationapForm from "../../data/forms/enforcementlistedbuildingconservationap";
-import EnforcementNoticeAppeals174Form from "../../data/forms/enforcementnoticeappeals174";
-import EnvironmentalPermittingForm from "../../data/forms/environmentalpermitting";
-import HarbourRevisionOrderForm from "../../data/forms/harbourrevisionorder";
-import HedgesHedgerowsTreePreservationReplacemForm from "../../data/forms/hedgeshedgerowstreepreservationreplacem";
-import HouseholderAppealHasForm from "../../data/forms/householderappealhas";
-import LawfulDevelopmentCertificateForm from "../../data/forms/lawfuldevelopmentcertificate";
-import LdpForm from "../../data/forms/ldp";
-import ListedBuildingAndConservationAreaConsenForm from "../../data/forms/listedbuildingandconservationareaconsen";
-import MaintenanceOfLands217Form from "../../data/forms/maintenanceoflands217";
-import MiscellaneousCaseworkForm from "../../data/forms/miscellaneouscasework";
-import NonValidationForm from "../../data/forms/nonvalidation";
-import PlanningAppeals78Form from "../../data/forms/planningappeals78";
-import PlanningConditionss73s79Form from "../../data/forms/planningconditionss73s79";
-import PlanningObligationAppeals106Form from "../../data/forms/planningobligationappeals106";
-import RowForm from "../../data/forms/row";
-import TransportAndWorkActForm from "../../data/forms/transportandworkact";
-import WayleaveForm from "../../data/forms/wayleave";
+import TimeOut from "../../components/timeout";
+
import { setLoggedInUserId } from "../../store/accountDetails/action";
import {
setAppealLPA,
@@ -53,6 +31,7 @@ import {
setCaseReference,
} from "../../store/appealType/action";
import { setForm } from "../../store/formData/action";
+import { getGovGatewayConfig } from "../../store/govgateway/action";
import { wrapper } from "../../store/store";
let Home = (props) => {
@@ -104,88 +83,6 @@ let Home = (props) => {
const formTitle = selectedObj[0].value;
- const getFormType = (appealType) => {
- switch (appealType) {
- case "adverts":
- return ;
- case "callinss77":
- return ;
- case "commonland":
- return ;
- case "communityinfrastructurelevys117118119":
- return (
-
- );
- case "compulsorypurchaseorders":
- return ;
- case "dns":
- return ;
- case "electricityact":
- return ;
- case "enforcementlistedbuildingconservationap":
- return (
-
- );
- case "enforcementnoticeappeals174":
- return ;
- case "environmentalpermitting":
- return ;
- case "harbourrevisionorder":
- return ;
- case "harbourrhedgeshedgerowstreepreservationreplacemevisionorder":
- return (
-
- );
- case "householderappealhas":
- return ;
- case "lawfuldevelopmentcertificate":
- return ;
-
- case "ldp":
- return ;
-
- case "listedbuildingandconservationareaconsen":
- return (
-
- );
- case "maintenanceoflands217":
- return ;
-
- case "miscellaneouscasework":
- return ;
-
- case "nonvalidation":
- return ;
-
- case "planningappeals78":
- return ;
-
- case "planningconditionss73s79":
- return ;
-
- case "planningobligationappeals106":
- return ;
-
- case "row":
- return ;
-
- case "transportandworkact":
- return ;
- case "wayleave":
- return ;
-
- default:
- return ;
- }
- re;
- };
-
const { onSubmit } = props;
return (
@@ -295,7 +192,6 @@ let Home = (props) => {
}
props={props}
/>
- {/* {getFormType(appealtypes)} */}
>
)}
@@ -303,6 +199,7 @@ let Home = (props) => {
+
);
};
@@ -321,21 +218,29 @@ export const getServerSideProps = wrapper.getServerSideProps(
appealTypeData,
mandatoryFieldsData,
pickListData,
- formdata,
] = await Promise.all([
await createCase(query.apt, query.lpa, loggedInUser),
await getAppealsTypes(),
await getMandatoryFields(query.appealtypes),
await getPickLists(query.appealtypes),
- await getFormData(query.appealtypes),
]);
let caseReference = caseReferenceData;
- let xmlStr = formdata;
- xmlStr = formdata.value[0].formxml;
- xmlStr = xmlStr.replace(/\\"/g, "");
- //console.log(caseReference, query.appealtypes, formdata);
+ var path = require("path");
+ const configDirectory = path.resolve(process.cwd(), "data/formsxml");
+ var xmlStr = fs.readFileSync(
+ path.join(configDirectory, query.appealtypes + ".xml"),
+ "utf8"
+ );
+ // xmlStr = formdata.value[0].formxml;
+ xmlStr = xmlStr.replace(/\t/g, "");
+ xmlStr = xmlStr.replace(/\n/g, "");
+ xmlStr = xmlStr.replace(/> <"/g, "><");
+ xmlStr = xmlStr.toString();
+
+ const providerConfig = await getProviderConfig();
+ store.dispatch(getGovGatewayConfig(providerConfig));
store.dispatch(setLoggedInUserId(loggedInUser));
store.dispatch(setAppealLPA(query.lpa));
store.dispatch(setAppealTypeID(query.apt));
@@ -353,6 +258,7 @@ const mapStateToProps = (state) => {
appealType: state.appealType,
form: state.form,
accountDetails: state.accountDetails,
+ govGateway: state.govGateway,
};
};
diff --git a/pages/newappeal/index.js b/pages/newappeal/index.js
index 69fe4481..329d8d9c 100644
--- a/pages/newappeal/index.js
+++ b/pages/newappeal/index.js
@@ -12,6 +12,9 @@ import { setLoggedInUserId } from "../../store/accountDetails/action";
import { setAppealType } from "../../store/appealType/action";
import { setLPA } from "../../store/lpa/action";
import { wrapper } from "../../store/store";
+import TimeOut from "../../components/timeout";
+import { getGovGatewayConfig } from "../../store/govgateway/action";
+import { getProviderConfig } from "../../actions/govgateway";
const Home = (props) => {
const { footerLinks, pages, formData } = props;
@@ -112,6 +115,7 @@ const Home = (props) => {
+
);
};
@@ -130,6 +134,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
await getLPA(),
]);
+ const providerConfig = await getProviderConfig();
+ store.dispatch(getGovGatewayConfig(providerConfig));
store.dispatch(setAppealType(appealTypeData));
store.dispatch(setLPA(lpaData));
store.dispatch(setLoggedInUserId(loggedInUser));
@@ -145,6 +151,7 @@ const mapStateToProps = (state) => {
LPAData: state.LPAData,
form: state.form,
accountDetails: state.accountDetails,
+ govGateway: state.govGateway,
};
};
diff --git a/pages/newappeal/planningappeal.js b/pages/newappeal/planningappeal.js
deleted file mode 100644
index 773cd811..00000000
--- a/pages/newappeal/planningappeal.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import useTranslation from "next-translate/useTranslation";
-import Head from "next/head";
-import { useRouter } from "next/router";
-import CookieBanner from "../../components/cookieBanner";
-import Footer from "../../components/footer";
-import Header from "../../components/header";
-import NewAppeal from "../../components/newappeal";
-
-const Home = (props) => {
- const { footerLinks, pages } = props;
- let { t, lang } = useTranslation();
-
- const router = useRouter();
- const { locale } = router;
-
- return (
-
-
-
- {t("myportal:page-title")} - {t("common:service-name")}
-
-
-
-
- );
-};
-
-export default Home; //connect(mapStateToProps)(Home);
diff --git a/pages/newappeal/selectappeal.js b/pages/newappeal/selectappeal.js
deleted file mode 100644
index 37754f47..00000000
--- a/pages/newappeal/selectappeal.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import useTranslation from "next-translate/useTranslation";
-import Head from "next/head";
-import { useRouter } from "next/router";
-import { useState } from "react";
-import { connect } from "react-redux";
-import { getAppealsTypes } from "../../actions";
-import Breadcrumbs from "../../components/breadcrumbs";
-import CookieBanner from "../../components/cookieBanner";
-import Footer from "../../components/footer";
-import Header from "../../components/header";
-import {
- setAppealType,
- setAppealTypeID,
- setAppealTypeTitle,
-} from "../../store/appealType/action";
-import { wrapper } from "../../store/store";
-
-const Home = (props) => {
- const { footerLinks, pages, formData } = props;
- let { t, lang } = useTranslation();
-
- const router = useRouter();
- const { locale } = router;
- const { appealtypes } = router.query;
-
- const { appealType } = props;
-
- const optionsObj = props.appealType.appealTypeOptions.GlobalOptionSet
- .Options || [{}];
-
- const appealOptions = Object.keys(optionsObj).map((key, index) => (
-
- ));
-
- const [appealTypeSelect, setAppealTypeSelect] = useState("");
- const handleParam = (setValue) => (e) => setValue(e.target.value);
-
- const selectAppealType = (event) => {
- event.preventDefault();
- router.replace("/newappeal/" + props.appealType.appealTypeID, null, {
- shallow: true,
- });
- };
-
- return (
-
-
-
- {t("search:page-title")} - {t("common:service-name")}
-
-
-
-
- );
-};
-
-export const getServerSideProps = wrapper.getServerSideProps(
- (store) =>
- async ({ query, req, res }) => {
- const appealTypeData = await getAppealsTypes();
- console.log("appeal types", appealTypeData);
- store.dispatch(setAppealType(appealTypeData));
- }
-);
-
-const mapStateToProps = (state) => {
- return {
- search: state.search,
- searchResultsObj: state.searchResultsObj,
- formData: state.formData,
- appealType: state.appealType,
- };
-};
-
-const mapDispatchToProps = (dispatch) => {
- return {
- onChangeSelect: (event) => {
- dispatch(
- setAppealTypeTitle(
- event.target.options[event.target.selectedIndex].text
- )
- );
- dispatch(setAppealTypeID(event.target.value));
- },
- };
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Home);