diff --git a/.env.local b/.env.local index 26da4dca..7c8b5580 100644 --- a/.env.local +++ b/.env.local @@ -70,7 +70,8 @@ AZURE_CLIENT_SECRET = $CLIENT_SECRET // test key AZURE_STORAGE_ACCOUNT_NAME = "pedwtest" -AZURE_STORAGE_ACCOUNT_KEY = Dl8qUVEnR2mglklQorttMurmjUpe2lI3oMWl9V245U6BOLutXDwmpU36afeTrGLK+zfzNVLErsWM+AStiYsimw== +//AZURE_STORAGE_ACCOUNT_KEY = Dl8qUVEnR2mglklQorttMurmjUpe2lI3oMWl9V245U6BOLutXDwmpU36afeTrGLK+zfzNVLErsWM+AStiYsimw== +AZURE_STORAGE_ACCOUNT_KEY = iEQKwh4TB9BT63pU5a6+ivn6ItiDkuIkYCrUwjm9STJTdMBOKWUT06EEcP8pcy/qeQ89ogK75mFQ+AStT53G/g== AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net diff --git a/actions/azurestorage.js b/actions/azurestorage.js index ea65db7b..87d5d1ed 100644 --- a/actions/azurestorage.js +++ b/actions/azurestorage.js @@ -1,6 +1,7 @@ import { DefaultAzureCredential } from "@azure/identity"; import _ from "lodash"; import { hashAPIPath } from "."; +import { da } from "date-fns/locale"; const { ContainerClient, BlockBlobClient, @@ -143,7 +144,14 @@ export const createContainer = async (containerName) => { const blobServiceClient = new BlobServiceClient(`${STORAGE_PATH}`, creds); - const createContainerResponse = await containerClient.createIfNotExists(); + const createContainerResponse = await containerClient + .createIfNotExists() + .then((data) => { + return data; + }) + .catch((err) => { + console.log("has error", err); + }); //console.log( // "\n//////////////////\n container name :", @@ -151,7 +159,8 @@ export const createContainer = async (containerName) => { // "\n//////////////////\n" // ); - return containerName; + console.log(createContainerResponse); + return createContainerResponse; }; export const getContainers = async () => { diff --git a/actions/index.js b/actions/index.js index 1f6e5566..cbf27611 100644 --- a/actions/index.js +++ b/actions/index.js @@ -42,9 +42,13 @@ export const consoleLogger = (err) => { var errStr = "\n\n/////////////////////////////////////////////////\nServer Error " + "\n" + - (_.has(err, "response.status") - ? "Status: " + err.response.status + "\n" + (_.has(err, "name") ? "Name: " + err.name + "\n" : "") + + (_.has(err, "code") ? "Code: " + err.code + "\n" : "") + + (_.has(err, "message") ? "Message: " + err.message + "\n" : "") + + (_.has(err, "request.url") + ? "request.url: " + err.request.url + "\n" : "") + + (_.has(err, "response.status") ? "Status: " + err.code + "\n" : "") + (_.has(err, "response.statusText") ? "\nStatusText: " + err.response.status + "\n" : "") + @@ -96,7 +100,6 @@ export const getToken = () => { return data; }) .catch((error) => { - //console.log("error :", error.response); consoleLogger(error); return error; }); @@ -283,7 +286,6 @@ export const getAddressSearchPaged = ( fieldSort, showNumberOfRecords ) => { - //console.log(queryUrl); return axios .get( "/api/endpoint/getbasicsearch_by_address_paged_api?searchString=" + @@ -312,7 +314,6 @@ export const getBasicSearchPaged = ( fieldSort, showNumberOfRecords ) => { - //console.log(queryUrl); return axios .get( "/api/endpoint/getbasicsearchpaged_api?searchString=" + @@ -338,7 +339,6 @@ export const getDNSCoords = () => { return axios .get(BASE_URL + "/api/endpoint/getdnscoords_api") .then((res) => { - //console.log(res.data); return res.data; }) .catch((error) => { @@ -581,7 +581,6 @@ export const getLinkedCases = (parentIncidentid) => { parentIncidentid ) .then((res) => { - //console.log(" linked date", res.data); return res.data; }) .catch((error) => { @@ -626,7 +625,6 @@ export const getLPA = () => { return axios .get(BASE_URL + "/api/endpoint/getlpa_api") .then((res) => { - //console.log(res.data); return res.data; }) .catch((error) => { @@ -681,7 +679,6 @@ export const getPersonalAccount = (contactid) => { contactid ) .then((res) => { - //console.log(res.data); return res.data; }) .catch((error) => { @@ -1284,7 +1281,6 @@ export const getCase = (incidentID) => { return axios .get(BASE_URL + "/api/endpoint/getcase_api?incidentID=" + incidentID) .then((res) => { - //console.log("//////////----", res.data); return res.data; }) .catch((error) => { diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js index 39a7ef3f..249cf816 100644 --- a/actions/selectQueryTypes.js +++ b/actions/selectQueryTypes.js @@ -50,10 +50,6 @@ export const getSelectQuery = (appealTypeName) => { return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_sitepostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_starttimeofevent,pinswg_typeofevent"; break; case "pinswg_planningappeals78s": - //console.log( - // "///////////////\n path:", - // process.env.RELAYPATH == "test-pedw-hc" - // ); return process.env.RELAYPATH == "dev-pedw-hc" ? "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_localplanningauthority_value,pinswg_casedecisiondate,pinswg_dicision,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_representation_period_end_date,pinswg_extend_representation_date,pinswg_typeofevent" : "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_localplanningauthority_value,pinswg_casedecisiondate,pinswg_dicision,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_typeofevent"; diff --git a/components/accessibility.js b/components/accessibility.js index e2dbf543..d07d12ca 100644 --- a/components/accessibility.js +++ b/components/accessibility.js @@ -1,8 +1,7 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import AccessibilityEN from "./footerDocs/accessibility_en"; +import { useRouter } from "next/router"; import AccessibilityCY from "./footerDocs/accessibility_cy"; +import AccessibilityEN from "./footerDocs/accessibility_en"; const AccessibilityStatement = (props) => { let { t } = useTranslation(); diff --git a/components/account/changepassword.js b/components/account/changepassword.js index 638c1836..8b53860e 100644 --- a/components/account/changepassword.js +++ b/components/account/changepassword.js @@ -1,15 +1,9 @@ -import Link from "next/link"; -import _ from "lodash"; -import React, { useState, useEffect } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import React, { useState } from "react"; +import { connect } from "react-redux"; +import { Field, formValueSelector, reduxForm } from "redux-form"; import { updatePassword } from "../../actions"; const RenderTextfield = ({ @@ -95,63 +89,67 @@ const ChangePassword = (props) => { const [hasErrors, setHasErrors] = useState(""); - return <> - {passwordUpdated != true ? ( -
-
- - -
+ return ( + <> + {passwordUpdated != true ? ( + +
+ + +
-
- - - Cancel - -
-
- ) : ( - <> -

- - Go to My Portal - -

- - )} - ; +
+ + + Cancel + +
+ + ) : ( + <> +

+ + Go to My Portal + +

+ + )} + + ); }; const mapStateToProps = (state) => { diff --git a/components/account/personaldetails.js b/components/account/personaldetails.js index fa775187..cae2e87c 100644 --- a/components/account/personaldetails.js +++ b/components/account/personaldetails.js @@ -1,15 +1,9 @@ -import _ from "lodash"; -import Link from "next/link"; -import React, { useState } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import React, { useState } from "react"; +import { connect } from "react-redux"; +import { Field, formValueSelector, reduxForm } from "redux-form"; import BuildCheckPersonalDetails from "./personaldetailsCheck"; import PersonalDetailsComplete from "./personaldetailsComplete"; diff --git a/components/account/personaldetailsCheck.js b/components/account/personaldetailsCheck.js index aad11ee0..efa40415 100644 --- a/components/account/personaldetailsCheck.js +++ b/components/account/personaldetailsCheck.js @@ -1,15 +1,8 @@ -import _ from "lodash"; -import Link from "next/link"; -import React, { useState } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import React from "react"; +import { connect } from "react-redux"; const BuildCheckPersonalDetails = (props) => { const { @@ -31,325 +24,328 @@ const BuildCheckPersonalDetails = (props) => { : t("account:account-preferred-language-welsh"); }; - return <> -

- {t("account:account-about-you-label")} -

-
-
-
- {t("account:account-first-name-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .firstname - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {t("account:account-first-name-label")}{" "} - - -
+ return ( + <> +

+ {t("account:account-about-you-label")} +

+
+
+
+ {t("account:account-first-name-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .firstname + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {t("account:account-first-name-label")}{" "} + + +
+
+
+
+ {" "} + {t("account:account-last-name-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .lastname + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-last-name-label")} + + +
+
+
+
+ {" "} + {t("account:account-email-address-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .emailaddress1 + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-email-address-label")} + + +
+
+
+
+ {t("account:account-telephone-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .telephone1 + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {t("account:account-telephone-label")} + + +
+
+
+
+ {" "} + {t("account:account-company-group-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .company + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-company-group-label")} + + +
+
+
+
+ {t("account:account-preferred-language-label")} +
+
+ {getPreferredLanguageLabel( + props.props.props.form.personalDetailsForm.values + .pinswg_preferredlanguage + )} +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-preferred-language-label")} + + +
+
+
+

+ {" "} + {t("account:account-your-address-label")} +

+
+
+
+ {t("account:account-address-line-1-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .address1_line1 + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-address-line-1-label")} + + +
+
+
+
+ {t("account:account-address-line-2-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .address1_line2 + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-address-line-2-label")} + + +
+
+
+
+ {t("account:account-town-city-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .address1_city + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-town-city-label")} + + +
+
+
+
+ {" "} + {t("account:account-county-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .address1_county + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-county-label")} + + +
+
+
+
+ {" "} + {t("account:account-postcode-label")} +
+
+ { + props.props.props.form.personalDetailsForm.values + .address1_postalcode + } +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-postcode-label")} + + +
+
+
+
+ + + {t("common:back-link")} +
-
-
- {" "} - {t("account:account-last-name-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .lastname - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-last-name-label")} - - -
-
-
-
- {" "} - {t("account:account-email-address-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .emailaddress1 - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-email-address-label")} - - -
-
-
-
- {t("account:account-telephone-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .telephone1 - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {t("account:account-telephone-label")} - - -
-
-
-
- {" "} - {t("account:account-company-group-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .company - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-company-group-label")} - - -
-
-
-
- {t("account:account-preferred-language-label")} -
-
- {getPreferredLanguageLabel( - props.props.props.form.personalDetailsForm.values - .pinswg_preferredlanguage - )} -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-preferred-language-label")} - - -
-
-
-

- {" "} - {t("account:account-your-address-label")} -

-
-
-
- {t("account:account-address-line-1-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .address1_line1 - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-address-line-1-label")} - - -
-
-
-
- {t("account:account-address-line-2-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .address1_line2 - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-address-line-2-label")} - - -
-
-
-
- {t("account:account-town-city-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .address1_city - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-town-city-label")} - - -
-
-
-
- {" "} - {t("account:account-county-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .address1_county - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-county-label")} - - -
-
-
-
- {" "} - {t("account:account-postcode-label")} -
-
- { - props.props.props.form.personalDetailsForm.values - .address1_postalcode - } -
-
- { - setPersonalDetailsComplete(false); - }} - > - {t("common:change-link-label")} - - {" "} - {t("account:account-postcode-label")} - - -
-
-
-
- - - {t("common:back-link")} - -
- ; + + ); }; const mapStateToProps = (state) => { diff --git a/components/account/personaldetailsComplete.js b/components/account/personaldetailsComplete.js index 1e202af3..53222775 100644 --- a/components/account/personaldetailsComplete.js +++ b/components/account/personaldetailsComplete.js @@ -1,22 +1,8 @@ -import _ from "lodash"; -import Link from "next/link"; -import React, { useState, useEffect } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { - useDispatch, - useSelector, - shallowEqual, - connect, - setRegisterFormComplete, - setAccountCreatedComplete, -} from "react-redux"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import React, { useEffect } from "react"; +import { connect } from "react-redux"; import { updateAccount } from "../../actions"; const PersonalDetailsComplete = (props) => { @@ -40,22 +26,23 @@ const PersonalDetailsComplete = (props) => { props.props.props.form.personalDetailsForm.values, ]); - return <> -

{t("account:account-complete-para-1")}

+ return ( + <> +

{t("account:account-complete-para-1")}

-

{t("account:account-complete-para-2")}

+

{t("account:account-complete-para-2")}

-

- - - {" "} - {t("account:account-complete-return-to-portal-link")} - - -

- ; +

+ + {" "} + {t("account:account-complete-return-to-portal-link")} + +

+ + ); }; const mapStateToProps = (state) => { diff --git a/components/account/registerCheck.js b/components/account/registerCheck.js index b2b11046..b4e9356e 100644 --- a/components/account/registerCheck.js +++ b/components/account/registerCheck.js @@ -1,14 +1,7 @@ -import _ from "lodash"; -import React, { useState } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import { useRouter } from "next/router"; +import React from "react"; +import { connect } from "react-redux"; import { setAccCr } from "../../store/accountDetails/action"; const RegisterFormCheck = (props) => { @@ -144,30 +137,6 @@ const RegisterFormCheck = (props) => { - {/*
-
Company/Group
-
- { - props.props.props.form.accountRegisterForm.values - .companygroup - } -
-
- { - setRegisterFormComplete(false); - }} - > - Change - - {" "} - company/group - - -
-
*/}

diff --git a/components/account/registerComplete.js b/components/account/registerComplete.js index 508d64f2..b028daaf 100644 --- a/components/account/registerComplete.js +++ b/components/account/registerComplete.js @@ -1,30 +1,14 @@ import _ from "lodash"; -import Link from "next/link"; -import React, { useEffect, useState } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import React, { useEffect, useState } from "react"; -import { JSONPath as jsonpath } from "jsonpath-plus"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { - useDispatch, - useSelector, - shallowEqual, - connect, - setRegisterFormComplete, - setAccountCreatedComplete, -} from "react-redux"; +import { connect } from "react-redux"; import { setAccCr, setLogout } from "../../store/accountDetails/action"; -import { useSession, signIn, signOut } from "next-auth/react"; -import { parseCookies, setCookie, destroyCookie } from "nookies"; -import { getEmailAccountCheck, createAccount } from "../../actions"; +import { createAccount, getEmailAccountCheck } from "../../actions"; const RegisterComplete = (props) => { const { @@ -69,7 +53,6 @@ const RegisterComplete = (props) => { ? setAccCr("exists") : (checkEmailObj = createAccount(accountBody).then( (data) => { - //console.log(data); setAccCr("created"); } )); diff --git a/components/account/registerform.js b/components/account/registerform.js index 8da9cc32..c7f5698b 100644 --- a/components/account/registerform.js +++ b/components/account/registerform.js @@ -1,14 +1,8 @@ -import _ from "lodash"; -import React, { useState } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - getFormSubmitErrors, -} from "redux-form"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import { useRouter } from "next/router"; +import React, { useState } from "react"; +import { connect } from "react-redux"; +import { Field, formValueSelector, reduxForm } from "redux-form"; import RegisterFormCheck from "./registerCheck"; import RegisterComplete from "./registerComplete"; @@ -120,11 +114,9 @@ const RegisterForm = (props) => { const [hasErrors, setHasErrors] = useState(""); const onHandleSubmit = (values) => { - //console.log(values); setRegisterFormComplete(true); }; - //console.log(pristine); return ( <> {!pristine && !valid && ( @@ -205,39 +197,6 @@ const RegisterForm = (props) => { "account:register-new-account-phone-label" )} /> - - {/* - */}
diff --git a/components/addresssearch.js b/components/addresssearch.js index d855738f..f9ea22d6 100644 --- a/components/addresssearch.js +++ b/components/addresssearch.js @@ -1,8 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; -import SearchForCase from "./search/searchforcase"; +import { useRouter } from "next/router"; import AddressSearch from "./search/addresssearch"; export default function Search(props) { diff --git a/components/addresssearchresults.js b/components/addresssearchresults.js index 94c15a07..c4f4a8b2 100644 --- a/components/addresssearchresults.js +++ b/components/addresssearchresults.js @@ -1,10 +1,8 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useContext } from "react"; -import useTranslation from "next-translate/useTranslation"; -import SearchForCase from "./search/searchforcase"; -import SearchResults from "./search/addresssearchresults"; import CRMError from "./crmError"; +import SearchResults from "./search/addresssearchresults"; export default function Search(props) { const { diff --git a/components/banner.js b/components/banner.js index 1e4c0c20..de6bb0c0 100644 --- a/components/banner.js +++ b/components/banner.js @@ -1,4 +1,3 @@ -import Link from "next/link"; import useTranslation from "next-translate/useTranslation"; export default function Banner() { diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index eccd45da..62faa8e4 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -1,78 +1,29 @@ -import Link from "next/link"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; -import { useState } from "react"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; -import { getSession, useSession } from "next-auth/react"; -import { - setCurrentLinkedCases, - setCurrentReference, - setCurrentView, -} from "../store/currentView/action"; +import { useSession } from "next-auth/react"; +import { setCurrentView } from "../store/currentView/action"; const Breadcrumbs = (props) => { - const { courseContent, slug, currentView, setCurrentView } = props; + const { currentView, setCurrentView } = props; const router = useRouter(); - const { appealType, section } = router.query; - let { t } = useTranslation(); - function Breadcrumb() { - if (slug) { - var coursePageURL = appealType + "/" + slug; - if (_.isEmpty(courseContent)) { - return null; - } else { - var sectionObj = jsonpath( - '$..sections[?(@.path=="/' + coursePageURL + '")]', - courseContent - ); - var breadcrumb = sectionObj[0].chapter.title; //sectionObj[0].chapter - return ( -
  • - {breadcrumb} -
    • - ); - } - } else { - return null; - } - } - - //const [showSpinnerState, setShowSpinnerState] = useState(false); - - // let spinnerState = () => { - // showSpinnerState == true - // ? setShowSpinnerState(false) - // : setShowSpinnerState(true); - // }; - const { data: session, status } = useSession(); return ( <> diff --git a/components/case.js b/components/case.js index 8bfd8f04..1aa1b15a 100644 --- a/components/case.js +++ b/components/case.js @@ -1,10 +1,8 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; -import Summary from "./case/summary"; +import { useRouter } from "next/router"; import Documents from "./case/documents"; import RepresentationList from "./case/representationList"; +import Summary from "./case/summary"; const Case = (props) => { const { showRepresentations } = props; diff --git a/components/case/documents.js b/components/case/documents.js index 8b41d60b..2254f62f 100644 --- a/components/case/documents.js +++ b/components/case/documents.js @@ -345,7 +345,6 @@ const DocumentDetails = (props) => { ) .then((data) => data) .then((data) => { - //console.log("getting details", data); setDocumentDetails(data); setShowSpinnerState(false); }); @@ -365,7 +364,6 @@ const DocumentDetails = (props) => { orderBy, fieldSort ).then((data) => { - //console.log(data); setDocumentDetails(data); return data; }); @@ -459,7 +457,6 @@ const DocumentDetails = (props) => { const docDetailsObj = async () => { let docObj = await getSearchDocumentDetails(incidentid).then( (data) => { - //console.log(data); setDocumentDetails(data); setDocumentSearchState(true); diff --git a/components/case/pagination.js b/components/case/pagination.js index 20966176..fa6e187d 100644 --- a/components/case/pagination.js +++ b/components/case/pagination.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { useState } from "react"; +import { useRouter } from "next/router"; import { connect } from "react-redux"; import { setCurrentPage } from "../../store/currentView/action"; @@ -27,14 +25,12 @@ const PaginationControl = (props) => { ); const getRange = (start, end) => { - //console.log(start, end); return Array(end - start + 1) .fill() .map((v, i) => i + start); }; const paginationNumbers = (currentPage, pageCount) => { - //console.log(currentPage); let delta; if (pageCount <= 7) { @@ -76,7 +72,6 @@ const PaginationControl = (props) => { pages = pages.concat(withDots(pageCount, ["...", pageCount])); } - //console.log(pages); return pages; }; diff --git a/components/case/representation/index.js b/components/case/representation/index.js index bf9e8d11..7bf869e7 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -1,48 +1,32 @@ -import Link from "next/link"; -import { useState, useEffect } from "react"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; -import _, { property } from "lodash"; -import { - Field, - FieldArray, - reduxForm, - formValueSelector, - reset, -} from "redux-form"; -import { connect } from "react-redux"; +import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; +import { useState } from "react"; import { useDropzone } from "react-dropzone"; +import { connect } from "react-redux"; +import { formValueSelector, reduxForm } from "redux-form"; +import { signIn, useSession } from "next-auth/react"; +import { generateRepPDF, sendEmail, uploadRepFiles } from "../../../actions"; +import { formatDates } from "../../../components/utils"; import { setRepresentationCapacity, - setRepresentationSubmit, - setSubmitBack, - setRepresentationSubmitConfirmation, setRepresentationMessageSent, setRepresentationReset, + setRepresentationSubmit, + setRepresentationSubmitConfirmation, } from "../../../store/currentView/action"; -import RepCapacitySelection from "./representationCapacitySelection"; -import RepLPACapacitySelection from "./representationLPACapacitySelection"; -import RepDetails from "./representationDetails"; -import RepAppellant from "./representationAppellant"; import RepAgent from "./representationAgent"; -import RepInterestedPartyPerson from "./representationInterestedPartyPerson"; -import RepLandOwner from "./representationLandowner"; -import RepLPA from "./representationLPA"; +import RepAppellant from "./representationAppellant"; +import RepCapacitySelection from "./representationCapacitySelection"; import RepCompleteSubmit from "./representationCompleteSubmit"; -import { useSession, signIn, signOut } from "next-auth/react"; -import { - updateCase, - patchCase, - uploadRepFiles, - sendEmail, - generateRepPDF, - createWatchedCases, -} from "../../../actions"; -import { formatDates } from "../../../components/utils"; -import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78"; +import RepInterestedPartyPerson from "./representationInterestedPartyPerson"; +import RepLPA from "./representationLPA"; +import RepLPACapacitySelection from "./representationLPACapacitySelection"; +import RepLandOwner from "./representationLandowner"; import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement"; +import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78"; let MakeRepresentation = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js index 93e66406..a84f756b 100644 --- a/components/case/representation/representationAgent.js +++ b/components/case/representation/representationAgent.js @@ -1,22 +1,14 @@ -import Link from "next/link"; -import { connect } from "react-redux"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm, change } from "redux-form"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import { Field, change, reduxForm } from "redux-form"; +import { bytesToSize, getThumbnailIconByExtension } from "../../utils"; import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderRichMultiline, - RenderCondtionalRadioList, FileUploadField, + RenderCondtionalRadioList, + RenderPickList, + RenderRichMultiline, } from "./representationElements"; -import { - getFormCollectionByID, - getThumbnailIconByExtension, - bytesToSize, -} from "../../utils"; import { useDropzone } from "react-dropzone"; diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js index f52b385c..7f93a23e 100644 --- a/components/case/representation/representationAppellant.js +++ b/components/case/representation/representationAppellant.js @@ -1,25 +1,15 @@ -import Link from "next/link"; -import { connect } from "react-redux"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm, reset, change } from "redux-form"; -import React, { useCallback, useEffect, useMemo, useState } from "react"; +import { useRouter } from "next/router"; +import React from "react"; +import { connect } from "react-redux"; +import { Field, change, reduxForm } from "redux-form"; +import { bytesToSize, getThumbnailIconByExtension } from "../../utils"; import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderRichMultiline, - RenderFileUpload, FileUploadField, - RepresentationGuidanceText, + RenderPickList, + RenderRichMultiline, } from "./representationElements"; -import { - getFormCollectionByID, - getThumbnailIconByExtension, - bytesToSize, -} from "../../utils"; import { useDropzone } from "react-dropzone"; // import { diff --git a/components/case/representation/representationCapacitySelection.js b/components/case/representation/representationCapacitySelection.js index 64a57017..aa843568 100644 --- a/components/case/representation/representationCapacitySelection.js +++ b/components/case/representation/representationCapacitySelection.js @@ -1,24 +1,9 @@ -import Link from "next/link"; -import { connect } from "react-redux"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - handleSubmit, - reset, -} from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderRadioListWithText, - RenderMultiline, -} from "./representationElements"; +import { useRouter } from "next/router"; import { useDropzone } from "react-dropzone"; +import { Field } from "redux-form"; import RepDetails from "./representationDetails"; -import { setRepresentationCapacity } from "../../../store/currentView/action"; +import { RenderRadioListWithText } from "./representationElements"; let RepCapacitySelection = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationComplete.js b/components/case/representation/representationComplete.js index 69d793c5..3b5ebef5 100644 --- a/components/case/representation/representationComplete.js +++ b/components/case/representation/representationComplete.js @@ -6,9 +6,9 @@ import { connect } from "react-redux"; import { useDropzone } from "react-dropzone"; import { + createWatchedCases, sendEmail, sendRepCompleteMessage, - createWatchedCases, } from "../../../actions"; import { setRepresentationReset } from "../../../store/currentView/action"; diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js index 1c67af78..73f4b69c 100644 --- a/components/case/representation/representationCompleteSubmit.js +++ b/components/case/representation/representationCompleteSubmit.js @@ -1,18 +1,14 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; +import { useState } from "react"; import { useDropzone } from "react-dropzone"; -import RepComplete from "./representationComplete"; -import RepLPAQuestionnaireCheck_s78 from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78"; -import RepLPAQuestionnaireCheck_enforcement from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement"; -import { useState, useEffect } from "react"; import { connect } from "react-redux"; +import RepComplete from "./representationComplete"; +import RepLPAQuestionnaireCheck_enforcement from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement"; +import RepLPAQuestionnaireCheck_s78 from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78"; -import { - getFormCollectionByID, - getThumbnailIconByExtension, - bytesToSize, -} from "../../utils"; +import { bytesToSize, getThumbnailIconByExtension } from "../../utils"; const RepCompleteSubmit = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationDetails.js b/components/case/representation/representationDetails.js index 51912d4d..efe5380c 100644 --- a/components/case/representation/representationDetails.js +++ b/components/case/representation/representationDetails.js @@ -1,9 +1,6 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm } from "redux-form"; -import { RenderPickList, RenderTextfield } from "./representationElements"; import { JSONPath as jsonpath } from "jsonpath-plus"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const RepDetails = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js index 6841f7d5..a415f182 100644 --- a/components/case/representation/representationElements.js +++ b/components/case/representation/representationElements.js @@ -1,31 +1,26 @@ -import { Field, Fields, reduxForm } from "redux-form"; -import router from "next/router"; -import React, { useState, useMemo } from "react"; import useTranslation from "next-translate/useTranslation"; -import { JSONPath as jsonpath } from "jsonpath-plus"; -import Dropzone, { useDropzone } from "react-dropzone"; -import Link from "next/link"; import dynamic from "next/dynamic"; -const ReactQuill = dynamic(() => import("react-quill"), { ssr: false }); -import "react-quill/dist/quill.snow.css"; -import DatePicker, { registerLocale, setDefaultLocale } from "react-datepicker"; +import Link from "next/link"; +import router from "next/router"; +import React, { useMemo, useState } from "react"; +import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; +import Dropzone from "react-dropzone"; +import "react-quill/dist/quill.snow.css"; +import { Field } from "redux-form"; +const ReactQuill = dynamic(() => import("react-quill"), { ssr: false }); import { - addYears, - addMonths, addDays, - subYears, - subMonths, - subDays, + addMonths, + addYears, parseISO, + subDays, + subMonths, + subYears, } from "date-fns"; -import { - getFormCollectionByID, - getThumbnailIconByExtension, - bytesToSize, -} from "../../utils"; +import { bytesToSize, getThumbnailIconByExtension } from "../../utils"; import { useRouter } from "next/router"; diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js index 067d6e3e..0d556c9f 100644 --- a/components/case/representation/representationInterestedPartyPerson.js +++ b/components/case/representation/representationInterestedPartyPerson.js @@ -1,22 +1,14 @@ -import Link from "next/link"; -import { connect } from "react-redux"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm, change } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderCondtionalRadioList, - RenderMultiline, - RenderRichMultiline, - FileUploadField, -} from "./representationElements"; -import { - getFormCollectionByID, - getThumbnailIconByExtension, - bytesToSize, -} from "../../utils"; +import { useRouter } from "next/router"; import { useDropzone } from "react-dropzone"; +import { connect } from "react-redux"; +import { Field, change, reduxForm } from "redux-form"; +import { + FileUploadField, + RenderCondtionalRadioList, + RenderPickList, + RenderRichMultiline, +} from "./representationElements"; const RepInterestedPartyPerson = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js index 225583eb..cd015ea1 100644 --- a/components/case/representation/representationLPA.js +++ b/components/case/representation/representationLPA.js @@ -1,34 +1,19 @@ -import Link from "next/link"; -import _ from "lodash"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { connect } from "react-redux"; -import { Field, reduxForm, formValueSelector, change } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderCondtionalRadioList, - RenderLPACondtionalRadioList, - FileUploadField, - RenderRichMultiline, - RenderDatePicker, -} from "./representationElements"; -import { getFormCollectionByID, formatDates } from "../../utils"; -import { - setRepresentationCapacity, - setRepresentationSubmit, -} from "../../../store/currentView/action"; -import { useDropzone } from "react-dropzone"; -import { select } from "xpath"; import { JSONPath as jsonpath } from "jsonpath-plus"; -import { useState } from "react"; +import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; +import { useDropzone } from "react-dropzone"; +import { connect } from "react-redux"; +import { Field, change, formValueSelector, reduxForm } from "redux-form"; +import { + FileUploadField, + RenderMultiline, + RenderPickList, +} from "./representationElements"; +import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement"; +import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78"; import Enforcement_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_enforcement"; import S78_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_s78"; -import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78"; -import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement"; -import transLookup from "../../../data/lookuptranslations.json"; let RepLPA = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationLPACapacitySelection.js b/components/case/representation/representationLPACapacitySelection.js index 03ff11e4..d5bd531a 100644 --- a/components/case/representation/representationLPACapacitySelection.js +++ b/components/case/representation/representationLPACapacitySelection.js @@ -1,24 +1,7 @@ -import Link from "next/link"; -import { connect } from "react-redux"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { - Field, - reduxForm, - formValueSelector, - handleSubmit, - reset, -} from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, -} from "./representationElements"; +import { useRouter } from "next/router"; import { useDropzone } from "react-dropzone"; -import RepDetails from "./representationDetails"; import RepLPADetails from "./representationLPADetails"; -import { setRepresentationCapacity } from "../../../store/currentView/action"; let RepLPACapacitySelection = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationLPAComments.js b/components/case/representation/representationLPAComments.js index 54d7a609..9607192e 100644 --- a/components/case/representation/representationLPAComments.js +++ b/components/case/representation/representationLPAComments.js @@ -1,19 +1,6 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { connect } from "react-redux"; -import { Field, reduxForm, formValueSelector } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderCondtionalRadioList, - RenderLPACondtionalRadioList, - FileUploadField, - RenderRichMultiline, - RenderDatePicker, -} from "./representationElements"; +import { Field, formValueSelector, reduxForm } from "redux-form"; +import { RenderMultiline } from "./representationElements"; let RepLPAQuestionnaire = (props) => { return ( diff --git a/components/case/representation/representationLPADetails.js b/components/case/representation/representationLPADetails.js index 0deb0581..f38e40f2 100644 --- a/components/case/representation/representationLPADetails.js +++ b/components/case/representation/representationLPADetails.js @@ -1,9 +1,6 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm } from "redux-form"; -import { RenderPickList, RenderTextfield } from "./representationElements"; import { JSONPath as jsonpath } from "jsonpath-plus"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const RepLPADetails = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationLandowner.js b/components/case/representation/representationLandowner.js index a643666a..a886507b 100644 --- a/components/case/representation/representationLandowner.js +++ b/components/case/representation/representationLandowner.js @@ -1,20 +1,12 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderRichMultiline, - FileUploadField, -} from "./representationElements"; +import { useRouter } from "next/router"; import { useDropzone } from "react-dropzone"; +import { Field } from "redux-form"; import { - setRepresentationCapacity, - setRepresentationSubmit, -} from "../../../store/currentView/action"; + FileUploadField, + RenderPickList, + RenderRichMultiline, +} from "./representationElements"; const RepLandOwner = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationProgress/representationProgress_enforcement.js b/components/case/representation/representationProgress/representationProgress_enforcement.js index ff72b307..6d5c7dd1 100644 --- a/components/case/representation/representationProgress/representationProgress_enforcement.js +++ b/components/case/representation/representationProgress/representationProgress_enforcement.js @@ -1,26 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { connect } from "react-redux"; -import { Field, reduxForm, formValueSelector } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderCondtionalRadioList, - RenderLPACondtionalRadioList, - FileUploadField, - RenderRichMultiline, - RenderDatePicker, -} from "../representationElements"; -import { - setRepresentationCapacity, - setRepresentationSubmit, -} from "../../../../store/currentView/action"; -import { useDropzone } from "react-dropzone"; -import { select } from "xpath"; -import { JSONPath as jsonpath } from "jsonpath-plus"; +import { useRouter } from "next/router"; const RepresentationProgress_enforcement = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationProgress/representationProgress_s78.js b/components/case/representation/representationProgress/representationProgress_s78.js index 7e3a460e..0257887c 100644 --- a/components/case/representation/representationProgress/representationProgress_s78.js +++ b/components/case/representation/representationProgress/representationProgress_s78.js @@ -1,26 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { connect } from "react-redux"; -import { Field, reduxForm, formValueSelector } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderCondtionalRadioList, - RenderLPACondtionalRadioList, - FileUploadField, - RenderRichMultiline, - RenderDatePicker, -} from "../representationElements"; -import { - setRepresentationCapacity, - setRepresentationSubmit, -} from "../../../../store/currentView/action"; -import { useDropzone } from "react-dropzone"; -import { select } from "xpath"; -import { JSONPath as jsonpath } from "jsonpath-plus"; +import { useRouter } from "next/router"; const RepresentationProgress_s78 = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js index 0ad44685..c26214b3 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js @@ -1,26 +1,19 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { connect } from "react-redux"; -import { Field, reduxForm, formValueSelector } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderCondtionalRadioList, - RenderLPACondtionalRadioList, - FileUploadField, - RenderRichMultiline, - RenderDatePicker, -} from "../representationElements"; -import { - setRepresentationCapacity, - setRepresentationSubmit, -} from "../../../../store/currentView/action"; -import { useDropzone } from "react-dropzone"; -import { select } from "xpath"; import { JSONPath as jsonpath } from "jsonpath-plus"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; +import { useDropzone } from "react-dropzone"; +import { connect } from "react-redux"; +import { Field, formValueSelector, reduxForm } from "redux-form"; +import { + FileUploadField, + RenderDatePicker, + RenderLPACondtionalRadioList, + RenderMultiline, + RenderPickList, + RenderRadioList, + RenderRichMultiline, + RenderTextfield, +} from "../representationElements"; let Enforcement_Questionnaire = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index 1155e0ae..fe2af58d 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -1,27 +1,19 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { connect } from "react-redux"; -import { Field, reduxForm, formValueSelector } from "redux-form"; -import { - RenderPickList, - RenderTextfield, - RenderRadioList, - RenderMultiline, - RenderCondtionalRadioList, - RenderLPACondtionalRadioList, - FileUploadField, - RenderRichMultiline, - RenderDatePicker, -} from "../representationElements"; -import { - setRepresentationCapacity, - setRepresentationSubmit, -} from "../../../../store/currentView/action"; -import { useDropzone } from "react-dropzone"; -import { select } from "xpath"; import { JSONPath as jsonpath } from "jsonpath-plus"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; +import { useDropzone } from "react-dropzone"; +import { Field } from "redux-form"; import { getFormCollectionByID } from "../../../../components/utils"; +import { + FileUploadField, + RenderDatePicker, + RenderLPACondtionalRadioList, + RenderMultiline, + RenderPickList, + RenderRadioList, + RenderRichMultiline, + RenderTextfield, +} from "../representationElements"; let S78_Questionnaire = (props) => { let { t } = useTranslation(); diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js index 44ce4199..91b1ec3f 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js @@ -1,6 +1,4 @@ import _ from "lodash"; -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; import { formatDates } from "../../../utils"; diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js index 375c8e2a..57d6f841 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js @@ -1,6 +1,4 @@ import _ from "lodash"; -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; import { formatDates } from "../../../utils"; diff --git a/components/case/representationList.js b/components/case/representationList.js index e566687f..0a5db79f 100644 --- a/components/case/representationList.js +++ b/components/case/representationList.js @@ -1,15 +1,13 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useState, useEffect, useRef } from "react"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; +import { useEffect, useState } from "react"; +import { connect } from "react-redux"; import transLookup from "../../data/lookuptranslations.json"; import { getRepresentations } from "../../actions"; import { setRepresentations } from "../../store/searchOutput/action"; -import PaginationControl from "./pagination"; import { formatDates } from "../utils"; const RepresentationList = (props) => { @@ -29,8 +27,6 @@ const RepresentationList = (props) => { var representationsArr = representationsObj || []; const RepresentationsView = (representationsArr) => { - //console.log(documentDetailsArr); - representationsArr = representationsArr.value; return ( <> @@ -130,12 +126,6 @@ const RepresentationList = (props) => { ); })}

    - {/* */} ); }; diff --git a/components/case/summary.js b/components/case/summary.js index a4d2ea43..e335b85e 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -1,18 +1,18 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useState, useEffect, useRef } from "react"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import { useEffect } from "react"; +import { connect } from "react-redux"; import transLookup from "../../data/lookuptranslations.json"; import { - getLinkedCases, createWatchedCases, - getWatchedCasesProxy, - getPortalModuleDetailsProxy, deleteWatchedCases, + getLinkedCases, + getPortalModuleDetailsProxy, + getWatchedCasesProxy, } from "../../actions"; import { setCurrentLinkedCases, @@ -25,9 +25,9 @@ import { setWatchedCasesDetails, } from "../../store/watchedCases/action"; -import { getFormCollectionByID } from "../utils"; -import { getSession, useSession, signIn } from "next-auth/react"; -import { parseCookies, setCookie, destroyCookie } from "nookies"; +import { signIn, useSession } from "next-auth/react"; +import { destroyCookie, parseCookies, setCookie } from "nookies"; +import { getFormCollectionByID, getDetailsProxy } from "../utils"; import Pinswg_advertsid from "./summaryTypes/pinswg_advertsid"; import Pinswg_callinss77id from "./summaryTypes/pinswg_callinss77id"; @@ -106,45 +106,13 @@ const CaseSummary = (props) => { .then(() => { getWatchedCasesProxy(loggedInUser).then((data) => { setWatchedCases(data), - getDetails(data, "myWatchedCases").then((data) => { + getDetailsProxy(data, "myWatchedCases").then((data) => { setWatchedCasesDetails(data); }); }); }); }; - const getDetails = (resultsObj, detailsType) => { - //console.log(resultsObj); - let detailsArr = []; - resultsObj = resultsObj.value; - const detailsObj = resultsObj.map((searchDetail, index) => { - if (searchDetail.pinswg_appealcasetype == null) { - console.log( - detailsType != "myWatchedCases" - ? searchDetail.ticketnumber - : searchDetail[ - "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" - ] - ); - } else { - detailsArr.push( - getPortalModuleDetailsProxy( - getFormCollectionByID( - searchDetail.pinswg_appealcasetype - ).LogicalCollectionName, - detailsType != "myWatchedCases" - ? searchDetail.ticketnumber - : searchDetail[ - "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" - ] - ) - ); - } - }); - //console.log(detailsArr); - return Promise.all(detailsArr); - }; - const isWatchedCase = (whichIncident) => { let isWatched = jsonpath( "$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]", @@ -162,9 +130,11 @@ const CaseSummary = (props) => { .then(() => { getWatchedCasesProxy(cookies.pinsUser).then((data) => { setWatchedCases(data), - getDetails(data, "myWatchedCases").then((data) => { - setWatchedCasesDetails(data); - }); + getDetailsProxy(data, "myWatchedCases").then( + (data) => { + setWatchedCasesDetails(data); + } + ); }); }); }; @@ -513,26 +483,6 @@ const CaseSummary = (props) => { ), } )} - {/* The - representation - period for - this appeal - is between{" "} - {formatDates( - detailsObj.pinswg_startdate - )}{" "} - and{" "} - {props - .currentView - .caseReference - .appealType == - 846040019 - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : formatDates( - detailsObj.pinswg_finalcommentsduedate - )} */}
    {" "} {t( "case:representation-date-passed-additional-label" diff --git a/components/case/summaryTypes/pinswg_advertsid.js b/components/case/summaryTypes/pinswg_advertsid.js index 792ef8d9..27c483ad 100644 --- a/components/case/summaryTypes/pinswg_advertsid.js +++ b/components/case/summaryTypes/pinswg_advertsid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_advertsid = (props) => { diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js index 0b7fa92d..fe03ca96 100644 --- a/components/case/summaryTypes/pinswg_callinss77id.js +++ b/components/case/summaryTypes/pinswg_callinss77id.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_callinss77id = (props) => { diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js index 60b016d7..8f428ce4 100644 --- a/components/case/summaryTypes/pinswg_commonlandid.js +++ b/components/case/summaryTypes/pinswg_commonlandid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_commonlandid = (props) => { diff --git a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js index 73d9bdc6..338926ad 100644 --- a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js +++ b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_communityinfrastructurelevyid = (props) => { diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js index 8b41f618..4d7fa147 100644 --- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js +++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_compulsorypurchaseordersid = (props) => { diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js index 4bda337b..efcd32de 100644 --- a/components/case/summaryTypes/pinswg_dnsid.js +++ b/components/case/summaryTypes/pinswg_dnsid.js @@ -1,10 +1,7 @@ import { useRouter } from "next/router"; -import Head from "next/head"; -import { useEffect, useRef, ReactElement } from "react"; - -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; -import _, { round } from "lodash"; +import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; import transLookup from "../../../data/lookuptranslations.json"; import GoogleMapComponent from "../../mapping/"; diff --git a/components/case/summaryTypes/pinswg_electricityactid.js b/components/case/summaryTypes/pinswg_electricityactid.js index b81b3cc2..1c62f3ed 100644 --- a/components/case/summaryTypes/pinswg_electricityactid.js +++ b/components/case/summaryTypes/pinswg_electricityactid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_electricityactid = (props) => { diff --git a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js index 0d2e58d8..952dd551 100644 --- a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js +++ b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_enforcementlistedbuildingconseid = (props) => { diff --git a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js index ede678e0..6ef58db0 100644 --- a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js +++ b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_enforcementnoticeappeals174id = (props) => { diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js index 6de84bd2..6be71cd9 100644 --- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js +++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_environmentalpermittingid = (props) => { diff --git a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js index a28793e4..283443c5 100644 --- a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js +++ b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_harbourrevisionorderid = (props) => { diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js index a600a6a7..1fbe7ef8 100644 --- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js +++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { diff --git a/components/case/summaryTypes/pinswg_householderappealhasid.js b/components/case/summaryTypes/pinswg_householderappealhasid.js index 822dcb7c..49ad4fcd 100644 --- a/components/case/summaryTypes/pinswg_householderappealhasid.js +++ b/components/case/summaryTypes/pinswg_householderappealhasid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_householderappealhasid = (props) => { diff --git a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js index 2efdc90f..dc72a42f 100644 --- a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js +++ b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_lawfuldevelopmentcertificatappid = (props) => { diff --git a/components/case/summaryTypes/pinswg_ldpid.js b/components/case/summaryTypes/pinswg_ldpid.js index f50c8b89..f5ab5685 100644 --- a/components/case/summaryTypes/pinswg_ldpid.js +++ b/components/case/summaryTypes/pinswg_ldpid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_ldpid = (props) => { diff --git a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js index f1a571c8..ca66c98f 100644 --- a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js +++ b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_listedbuildingandconservationrid = (props) => { diff --git a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js index 6ebe3660..3b6d4d1d 100644 --- a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js +++ b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_maintenanceoflands217id = (props) => { diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js index 120fc90b..7251bd03 100644 --- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js +++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_miscellaneouscasewordid = (props) => { diff --git a/components/case/summaryTypes/pinswg_nonvalidationid.js b/components/case/summaryTypes/pinswg_nonvalidationid.js index ab2c982e..04896099 100644 --- a/components/case/summaryTypes/pinswg_nonvalidationid.js +++ b/components/case/summaryTypes/pinswg_nonvalidationid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_nonvalidationid = (props) => { diff --git a/components/case/summaryTypes/pinswg_planningappeals78id.js b/components/case/summaryTypes/pinswg_planningappeals78id.js index 8c647911..8c58c358 100644 --- a/components/case/summaryTypes/pinswg_planningappeals78id.js +++ b/components/case/summaryTypes/pinswg_planningappeals78id.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_planningappeals78id = (props) => { diff --git a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js index b4aa8c9b..cc9e805b 100644 --- a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js +++ b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_planningconditionss73s79id = (props) => { diff --git a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js index 6d25f787..03da14c6 100644 --- a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js +++ b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_planningobligationappeals106id = (props) => { diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js index dcfc4d49..955372b3 100644 --- a/components/case/summaryTypes/pinswg_rowid.js +++ b/components/case/summaryTypes/pinswg_rowid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_rowid = (props) => { diff --git a/components/case/summaryTypes/pinswg_transportandworkactid.js b/components/case/summaryTypes/pinswg_transportandworkactid.js index 0bdc6817..396fbc5d 100644 --- a/components/case/summaryTypes/pinswg_transportandworkactid.js +++ b/components/case/summaryTypes/pinswg_transportandworkactid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_transportandworkactid = (props) => { diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js index 6303fdc9..d535ebf8 100644 --- a/components/case/summaryTypes/pinswg_wayleaveid.js +++ b/components/case/summaryTypes/pinswg_wayleaveid.js @@ -1,7 +1,7 @@ -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; import { JSONPath as jsonpath } from "jsonpath-plus"; import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import transLookup from "../../../data/lookuptranslations.json"; const Pinswg_wayleaveid = (props) => { diff --git a/components/caseresults.js b/components/caseresults.js index da23c9e1..53de80a2 100644 --- a/components/caseresults.js +++ b/components/caseresults.js @@ -1,8 +1,6 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useContext } from "react"; -import useTranslation from "next-translate/useTranslation"; -import SearchForCase from "./search/searchforcase"; import SearchResults from "./search/searchresults"; export default function Search({ children, pages }) { @@ -26,16 +24,13 @@ export default function Search({ children, pages }) {
    - {t("search:searchresults-search-button-label")} - - - - {t( - "search:searchresults-new-search-button-label" - )} - + + {t("search:searchresults-new-search-button-label")}
    diff --git a/components/checkanswers.js b/components/checkanswers.js index 77ca5ecc..b38c932a 100644 --- a/components/checkanswers.js +++ b/components/checkanswers.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; import BuildCheckSection from "./newappeal/buildchecksection"; const CheckAnswers = (props) => { diff --git a/components/cookieBanner.js b/components/cookieBanner.js index eccb3334..08286ab6 100644 --- a/components/cookieBanner.js +++ b/components/cookieBanner.js @@ -1,9 +1,9 @@ -import { CookieConsent } from "react-cookie-consent"; +import cookie from "cookie-cutter"; +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import cookie from "cookie-cutter"; -import { useState, useEffect } from "react"; +import { useState } from "react"; +import { CookieConsent } from "react-cookie-consent"; const CookieBanner = () => { let { t, lang } = useTranslation(); diff --git a/components/cookiePolicy.js b/components/cookiePolicy.js index 8aaed62e..bd81a2cc 100644 --- a/components/cookiePolicy.js +++ b/components/cookiePolicy.js @@ -1,6 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const CookiePolicy = (props) => { let { t } = useTranslation(); diff --git a/components/cookiemanager/index.js b/components/cookiemanager/index.js index f025351b..10e2a717 100644 --- a/components/cookiemanager/index.js +++ b/components/cookiemanager/index.js @@ -1,10 +1,10 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useContext, useEffect, useState } from "react"; -import useTranslation from "next-translate/useTranslation"; -import { Field, reduxForm } from "redux-form"; -import { parseCookies, setCookie, destroyCookie } from "nookies"; +import { parseCookies } from "nookies"; +import { useState } from "react"; import { connect } from "react-redux"; +import { reduxForm } from "redux-form"; import cookie from "cookie-cutter"; diff --git a/components/crmError.js b/components/crmError.js index 8a9e8d12..a065a447 100644 --- a/components/crmError.js +++ b/components/crmError.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { DiagConsoleLogger } from "@opentelemetry/api"; +import { useRouter } from "next/router"; const CRMError = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationSideBar.js b/components/dns/applications/applicationSideBar.js index 94e1c210..1ee2cb16 100644 --- a/components/dns/applications/applicationSideBar.js +++ b/components/dns/applications/applicationSideBar.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const ApplicationSideBar = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationSummary.js b/components/dns/applications/applicationSummary.js index 45346c29..2785600f 100644 --- a/components/dns/applications/applicationSummary.js +++ b/components/dns/applications/applicationSummary.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const ApplicationSummary = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationTabs.js b/components/dns/applications/applicationTabs.js index 64de5c2c..ef22cdc7 100644 --- a/components/dns/applications/applicationTabs.js +++ b/components/dns/applications/applicationTabs.js @@ -1,13 +1,11 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; -import { useState } from "react"; import useTranslation from "next-translate/useTranslation"; -import ApplicationTabsTimeLine from "./applicationTabsTimeline"; +import { useRouter } from "next/router"; +import { useState } from "react"; import ApplicationSideBar from "./applicationSideBar"; -import ApplicationTabsDocuments from "./applicationTabsDocuments"; import ApplicationTabsComments from "./applicationTabsComments"; +import ApplicationTabsDocuments from "./applicationTabsDocuments"; import ApplicationTabsRegistrationForm from "./applicationTabsRegistrationForm"; +import ApplicationTabsTimeLine from "./applicationTabsTimeline"; const ApplicationTabs = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationTabsComments.js b/components/dns/applications/applicationTabsComments.js index 9f015862..a85ad5a9 100644 --- a/components/dns/applications/applicationTabsComments.js +++ b/components/dns/applications/applicationTabsComments.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const ApplicationTabsComments = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationTabsDocuments.js b/components/dns/applications/applicationTabsDocuments.js index 58031f95..b2e6bf2d 100644 --- a/components/dns/applications/applicationTabsDocuments.js +++ b/components/dns/applications/applicationTabsDocuments.js @@ -1,12 +1,11 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useContext } from "react"; -import useTranslation from "next-translate/useTranslation"; import { Accordion, AccordionItem, - AccordionItemHeading, AccordionItemButton, + AccordionItemHeading, AccordionItemPanel, } from "react-accessible-accordion"; // import "react-accessible-accordion/dist/fancy-example.css"; diff --git a/components/dns/applications/applicationTabsRegistrationForm.js b/components/dns/applications/applicationTabsRegistrationForm.js index ac8fa71f..7e5a3f6f 100644 --- a/components/dns/applications/applicationTabsRegistrationForm.js +++ b/components/dns/applications/applicationTabsRegistrationForm.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const ApplicationTabsRegistrationForm = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationTabsTimeline.js b/components/dns/applications/applicationTabsTimeline.js index 19160f81..cb0fb45b 100644 --- a/components/dns/applications/applicationTabsTimeline.js +++ b/components/dns/applications/applicationTabsTimeline.js @@ -1,7 +1,5 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; const ApplicationTabsTimeLine = (props) => { let { t } = useTranslation(); diff --git a/components/dns/applications/applicationsIntro.js b/components/dns/applications/applicationsIntro.js index 4a0d7a0d..7f45f09f 100644 --- a/components/dns/applications/applicationsIntro.js +++ b/components/dns/applications/applicationsIntro.js @@ -1,7 +1,6 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useContext } from "react"; -import useTranslation from "next-translate/useTranslation"; const ApplicationIntro = (props) => { let { t } = useTranslation(); @@ -28,9 +27,7 @@ const ApplicationIntro = (props) => {

    {t("dnsApplications:page-intro-paragraph-2")}{" "} - {t("dnsApplications:page-intro-paragraph-2-link")} - .

    diff --git a/components/dns/applications/applicationsList.js b/components/dns/applications/applicationsList.js index cd2dede2..93199663 100644 --- a/components/dns/applications/applicationsList.js +++ b/components/dns/applications/applicationsList.js @@ -1,7 +1,6 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useContext } from "react"; -import useTranslation from "next-translate/useTranslation"; const ApplicationList = (props) => { let { t } = useTranslation(); diff --git a/components/dns/homepage/applicationsForComment.js b/components/dns/homepage/applicationsForComment.js index 43477e9f..7957cecd 100644 --- a/components/dns/homepage/applicationsForComment.js +++ b/components/dns/homepage/applicationsForComment.js @@ -1,6 +1,6 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; const ApplicationsForComment = (props) => { let { t } = useTranslation(); @@ -15,10 +15,11 @@ const ApplicationsForComment = (props) => {
    diff --git a/components/dns/homepage/dnsLinks.js b/components/dns/homepage/dnsLinks.js index 0b7b30f3..2efc4d1f 100644 --- a/components/dns/homepage/dnsLinks.js +++ b/components/dns/homepage/dnsLinks.js @@ -1,6 +1,6 @@ +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; const DNSLinks = (props) => { let { t } = useTranslation(); @@ -13,10 +13,11 @@ const DNSLinks = (props) => {
    diff --git a/components/dns/main.js b/components/dns/main.js index 2e905b86..f725a15d 100644 --- a/components/dns/main.js +++ b/components/dns/main.js @@ -1,11 +1,8 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; -import TitleContent from "./homepage/titleContent"; -import LatestApplications from "./homepage/latestApplications"; +import { useRouter } from "next/router"; import DNSLinks from "./homepage/dnsLinks"; -import ApplicationsForComment from "./homepage/applicationsForComment"; +import LatestApplications from "./homepage/latestApplications"; +import TitleContent from "./homepage/titleContent"; export default function Main({ children, pages, props }) { let { t } = useTranslation(); diff --git a/components/dnssearchresults.js b/components/dnssearchresults.js index 8824721f..c70dd317 100644 --- a/components/dnssearchresults.js +++ b/components/dnssearchresults.js @@ -1,10 +1,7 @@ -import Link from "next/link"; -import { useRouter } from "next/router"; -import { useContext } from "react"; import useTranslation from "next-translate/useTranslation"; -import SearchForCase from "./search/searchforcase"; -import DNSSearchResults from "./search/dnssearchresults"; +import { useRouter } from "next/router"; import CRMError from "./crmError"; +import DNSSearchResults from "./search/dnssearchresults"; export default function Search(props) { const { searchString, searchResultsObj, myportal, watchedCases, showMap } = diff --git a/components/elements/index.js b/components/elements/index.js index 1e4139f7..77069f32 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -1,43 +1,31 @@ -import { Field, reduxForm, FieldArray } from "redux-form"; -import { useRouter } from "next/router"; -import DatePicker, { registerLocale, setDefaultLocale } from "react-datepicker"; -import React, { useCallback, useEffect, useMemo, useState } from "react"; -import "react-datepicker/dist/react-datepicker.css"; -import moment from "moment"; import { JSONPath as jsonpath } from "jsonpath-plus"; +import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import React, { useMemo, useState } from "react"; +import DatePicker from "react-datepicker"; +import "react-datepicker/dist/react-datepicker.css"; +import Dropzone from "react-dropzone"; +import { Field, FieldArray } from "redux-form"; +import { deleteBlob, getFilesFromBlobHashed } from "../../actions"; import fieldLookup from "../../data/crmfieldlookuptranslations.json"; import pickListLookup from "../../data/picklistLookups.json"; -import useTranslation from "next-translate/useTranslation"; -import FileUpload from "../newappeal/fileupload"; -import Dropzone, { useDropzone } from "react-dropzone"; -import _ from "lodash"; -import { connect, useDispatch } from "react-redux"; -import { - getFilesFromBlobHashed, - deleteBlob, - downloadBlob, -} from "../../actions"; -import { setFilesForAppeal } from "../../store/appealType/action"; -import Link from "next/link"; -import { - getFormCollectionByID, - getThumbnailIconByExtension, - bytesToSize, -} from "../utils"; import dynamic from "next/dynamic"; +import { bytesToSize, getThumbnailIconByExtension } from "../utils"; import { - addYears, - addMonths, addDays, - subYears, - subMonths, - subDays, + addMonths, + addYears, parseISO, + subDays, + subMonths, + subYears, } from "date-fns"; -const ReactQuill = dynamic(() => import("react-quill"), { ssr: false }); import "react-quill/dist/quill.snow.css"; +const ReactQuill = dynamic(() => import("react-quill"), { ssr: false }); const RenderTextfield = ({ id, diff --git a/components/errorpage.js b/components/errorpage.js index 23326256..0450f41d 100644 --- a/components/errorpage.js +++ b/components/errorpage.js @@ -1,58 +1,59 @@ import Link from "next/link"; -import Header from "./header"; -import Banner from "./breadcrumbs"; -import Breadcrumbs from "./banner"; import Footer from "./footer"; +import Header from "./header"; const Errorpage = () => { - var m = new Date(); - var dateString = - m.getUTCDate() + - "/" + - (m.getUTCMonth() + 1) + - "/" + - m.getUTCFullYear() + - " " + - m.getUTCHours() + - ":" + - m.getUTCMinutes() + - ":" + - m.getUTCSeconds(); + var m = new Date(); + var dateString = + m.getUTCDate() + + "/" + + (m.getUTCMonth() + 1) + + "/" + + m.getUTCFullYear() + + " " + + m.getUTCHours() + + ":" + + m.getUTCMinutes() + + ":" + + m.getUTCSeconds(); - return ( -
    -
    -
    -
    -
    -
    -

    There has been a problem

    -

    - Unfortunately something has gone wrong! -

    -

    {dateString}

    - - - Try again - - -
    + return ( +
    +
    +
    +
    +
    +
    +

    + There has been a problem +

    +

    + Unfortunately something has gone wrong! +

    +

    + {dateString} +

    + + Try again + +
    +
    +
    +
    -
    -
    -
    -
    -
    - ); +