robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused imports

Browse Source
This commit is contained in:
robbond
2024-06-19 06:32:38 +01:00
parent e4a1903b48
commit b0e2bb6e14
263 changed files with 1458 additions and 2693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+2 -1
View File
@@ -70,7 +70,8 @@ AZURE_CLIENT_SECRET = $CLIENT_SECRET
// test key // test key
AZURE_STORAGE_ACCOUNT_NAME = "pedwtest" 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 AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
actions/azurestorage.js
+11 -2
View File
@@ -1,6 +1,7 @@
import { DefaultAzureCredential } from "@azure/identity"; import { DefaultAzureCredential } from "@azure/identity";
import _ from "lodash"; import _ from "lodash";
import { hashAPIPath } from "."; import { hashAPIPath } from ".";
import { da } from "date-fns/locale";
const { const {
ContainerClient, ContainerClient,
BlockBlobClient, BlockBlobClient,
@@ -143,7 +144,14 @@ export const createContainer = async (containerName) => {
const blobServiceClient = new BlobServiceClient(`${STORAGE_PATH}`, creds); 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( //console.log(
// "\n//////////////////\n container name :", // "\n//////////////////\n container name :",
@@ -151,7 +159,8 @@ export const createContainer = async (containerName) => {
// "\n//////////////////\n" // "\n//////////////////\n"
// ); // );
return containerName; console.log(createContainerResponse);
return createContainerResponse;
}; };
export const getContainers = async () => { export const getContainers = async () => {
actions/index.js
+6 -10
View File
@@ -42,9 +42,13 @@ export const consoleLogger = (err) => {
var errStr = var errStr =
"\n\n/////////////////////////////////////////////////\nServer Error " + "\n\n/////////////////////////////////////////////////\nServer Error " +
"\n" + "\n" +
(_.has(err, "response.status") (_.has(err, "name") ? "Name: " + err.name + "\n" : "") +
? "Status: " + err.response.status + "\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") (_.has(err, "response.statusText")
? "\nStatusText: " + err.response.status + "\n" ? "\nStatusText: " + err.response.status + "\n"
: "") + : "") +
@@ -96,7 +100,6 @@ export const getToken = () => {
return data; return data;
}) })
.catch((error) => { .catch((error) => {
//console.log("error :", error.response);
consoleLogger(error); consoleLogger(error);
return error; return error;
}); });
@@ -283,7 +286,6 @@ export const getAddressSearchPaged = (
fieldSort, fieldSort,
showNumberOfRecords showNumberOfRecords
) => { ) => {
//console.log(queryUrl);
return axios return axios
.get( .get(
"/api/endpoint/getbasicsearch_by_address_paged_api?searchString=" + "/api/endpoint/getbasicsearch_by_address_paged_api?searchString=" +
@@ -312,7 +314,6 @@ export const getBasicSearchPaged = (
fieldSort, fieldSort,
showNumberOfRecords showNumberOfRecords
) => { ) => {
//console.log(queryUrl);
return axios return axios
.get( .get(
"/api/endpoint/getbasicsearchpaged_api?searchString=" + "/api/endpoint/getbasicsearchpaged_api?searchString=" +
@@ -338,7 +339,6 @@ export const getDNSCoords = () => {
return axios return axios
.get(BASE_URL + "/api/endpoint/getdnscoords_api") .get(BASE_URL + "/api/endpoint/getdnscoords_api")
.then((res) => { .then((res) => {
//console.log(res.data);
return res.data; return res.data;
}) })
.catch((error) => { .catch((error) => {
@@ -581,7 +581,6 @@ export const getLinkedCases = (parentIncidentid) => {
parentIncidentid parentIncidentid
) )
.then((res) => { .then((res) => {
//console.log(" linked date", res.data);
return res.data; return res.data;
}) })
.catch((error) => { .catch((error) => {
@@ -626,7 +625,6 @@ export const getLPA = () => {
return axios return axios
.get(BASE_URL + "/api/endpoint/getlpa_api") .get(BASE_URL + "/api/endpoint/getlpa_api")
.then((res) => { .then((res) => {
//console.log(res.data);
return res.data; return res.data;
}) })
.catch((error) => { .catch((error) => {
@@ -681,7 +679,6 @@ export const getPersonalAccount = (contactid) => {
contactid contactid
) )
.then((res) => { .then((res) => {
//console.log(res.data);
return res.data; return res.data;
}) })
.catch((error) => { .catch((error) => {
@@ -1284,7 +1281,6 @@ export const getCase = (incidentID) => {
return axios return axios
.get(BASE_URL + "/api/endpoint/getcase_api?incidentID=" + incidentID) .get(BASE_URL + "/api/endpoint/getcase_api?incidentID=" + incidentID)
.then((res) => { .then((res) => {
//console.log("//////////----", res.data);
return res.data; return res.data;
}) })
.catch((error) => { .catch((error) => {
actions/selectQueryTypes.js
-4
View File
@@ -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"; 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; break;
case "pinswg_planningappeals78s": case "pinswg_planningappeals78s":
//console.log(
// "///////////////\n path:",
// process.env.RELAYPATH == "test-pedw-hc"
// );
return process.env.RELAYPATH == "dev-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_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"; : "&$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";
components/accessibility.js
+2 -3
View File
@@ -1,8 +1,7 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import AccessibilityEN from "./footerDocs/accessibility_en"; import { useRouter } from "next/router";
import AccessibilityCY from "./footerDocs/accessibility_cy"; import AccessibilityCY from "./footerDocs/accessibility_cy";
import AccessibilityEN from "./footerDocs/accessibility_en";
const AccessibilityStatement = (props) => { const AccessibilityStatement = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/account/changepassword.js
+65 -67
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { import Link from "next/link";
Field, import { useRouter } from "next/router";
reduxForm, import React, { useState } from "react";
formValueSelector, import { connect } from "react-redux";
getFormSubmitErrors, import { Field, formValueSelector, reduxForm } from "redux-form";
} from "redux-form";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import { updatePassword } from "../../actions"; import { updatePassword } from "../../actions";
const RenderTextfield = ({ const RenderTextfield = ({
@@ -95,63 +89,67 @@ const ChangePassword = (props) => {
const [hasErrors, setHasErrors] = useState(""); const [hasErrors, setHasErrors] = useState("");
return <> return (
{passwordUpdated != true ? ( <>
<form onSubmit={handleSubmit(onHandleSubmit)}> {passwordUpdated != true ? (
<fieldset className="govuk-fieldset"> <form onSubmit={handleSubmit(onHandleSubmit)}>
<Field <fieldset className="govuk-fieldset">
name="newpassword" <Field
id="newpassword" name="newpassword"
component={RenderTextfield} id="newpassword"
type="password" component={RenderTextfield}
className="govuk-input govuk-input--width-20" type="password"
validate={[required, minLength(6)]} className="govuk-input govuk-input--width-20"
label="New password" validate={[required, minLength(6)]}
/> label="New password"
<Field />
name="confirmpassword" <Field
id="confirmpassword" name="confirmpassword"
component={RenderTextfield} id="confirmpassword"
type="password" component={RenderTextfield}
className="govuk-input govuk-input--width-20" type="password"
validate={[required, passwordsMustMatch]} className="govuk-input govuk-input--width-20"
label="Confirm new password" validate={[required, passwordsMustMatch]}
/> label="Confirm new password"
</fieldset> />
</fieldset>
<div className="govuk-button-group"> <div className="govuk-button-group">
<button <button
type="submit" type="submit"
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
> >
Continue Continue
</button> </button>
<Link <Link
href={ href={
"/myportal?q=" + "/myportal?q=" +
props.accountDetails.loggedinUserId props.accountDetails.loggedinUserId
} }
className="govuk-link"> className="govuk-link"
Cancel >
</Link> Cancel
</div> </Link>
</form> </div>
) : ( </form>
<> ) : (
<p className="govuk-body"> <>
<Link <p className="govuk-body">
href={ <Link
"/myportal?q=" + href={
props.accountDetails.loggedinUserId "/myportal?q=" +
} props.accountDetails.loggedinUserId
className="govuk-link"> }
Go to My Portal className="govuk-link"
</Link> >
</p> Go to My Portal
</> </Link>
)} </p>
</>; </>
)}
</>
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetails.js
+5 -11
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { import Link from "next/link";
Field, import { useRouter } from "next/router";
reduxForm, import React, { useState } from "react";
formValueSelector, import { connect } from "react-redux";
getFormSubmitErrors, import { Field, formValueSelector, reduxForm } from "redux-form";
} from "redux-form";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import BuildCheckPersonalDetails from "./personaldetailsCheck"; import BuildCheckPersonalDetails from "./personaldetailsCheck";
import PersonalDetailsComplete from "./personaldetailsComplete"; import PersonalDetailsComplete from "./personaldetailsComplete";
components/account/personaldetailsCheck.js
+325 -329
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { import Link from "next/link";
Field, import { useRouter } from "next/router";
reduxForm, import React from "react";
formValueSelector, import { connect } from "react-redux";
getFormSubmitErrors,
} from "redux-form";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
const BuildCheckPersonalDetails = (props) => { const BuildCheckPersonalDetails = (props) => {
const { const {
@@ -31,325 +24,328 @@ const BuildCheckPersonalDetails = (props) => {
: t("account:account-preferred-language-welsh"); : t("account:account-preferred-language-welsh");
}; };
return <> return (
<h2 className="govuk-heading-m"> <>
{t("account:account-about-you-label")} <h2 className="govuk-heading-m">
</h2> {t("account:account-about-you-label")}
<dl className="govuk-summary-list govuk-!-margin-bottom-9"> </h2>
<div className="govuk-summary-list__row"> <dl className="govuk-summary-list govuk-!-margin-bottom-9">
<dt className="govuk-summary-list__key"> <div className="govuk-summary-list__row">
{t("account:account-first-name-label")} <dt className="govuk-summary-list__key">
</dt> {t("account:account-first-name-label")}
<dd className="govuk-summary-list__value"> </dt>
{ <dd className="govuk-summary-list__value">
props.props.props.form.personalDetailsForm.values {
.firstname props.props.props.form.personalDetailsForm.values
} .firstname
</dd> }
<dd className="govuk-summary-list__actions"> </dd>
<a <dd className="govuk-summary-list__actions">
className="govuk-link" <a
href="#firstname" className="govuk-link"
onClick={() => { href="#firstname"
setPersonalDetailsComplete(false); onClick={() => {
}} setPersonalDetailsComplete(false);
> }}
{t("common:change-link-label")} >
<span className="govuk-visually-hidden"> {t("common:change-link-label")}
{t("account:account-first-name-label")}{" "} <span className="govuk-visually-hidden">
</span> {t("account:account-first-name-label")}{" "}
</a> </span>
</dd> </a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-last-name-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.lastname
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#lastname"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-last-name-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-email-address-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.emailaddress1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#emailaddress1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-email-address-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-telephone-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.telephone1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#telephone1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{t("account:account-telephone-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-company-group-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.company
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-company-group-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-preferred-language-label")}
</dt>
<dd className="govuk-summary-list__value">
{getPreferredLanguageLabel(
props.props.props.form.personalDetailsForm.values
.pinswg_preferredlanguage
)}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-preferred-language-label")}
</span>
</a>
</dd>
</div>
</dl>
<h2 className="govuk-heading-m">
{" "}
{t("account:account-your-address-label")}
</h2>
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-1-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-1-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-2-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line2
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line2"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-2-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-town-city-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_city
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_city"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-town-city-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-county-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_county
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_county"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-county-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-postcode-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_postalcode
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_postalcode"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-postcode-label")}
</span>
</a>
</dd>
</div>
</dl>
<div className="govuk-button-group">
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
onClick={() => {
setAccountUpdatedComplete(true);
}}
>
{t("common:continue-button")}
</button>
<Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId}
className="govuk-link"
>
{t("common:back-link")}
</Link>
</div> </div>
<div className="govuk-summary-list__row"> </>
<dt className="govuk-summary-list__key"> );
{" "}
{t("account:account-last-name-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.lastname
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#lastname"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-last-name-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-email-address-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.emailaddress1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#emailaddress1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-email-address-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-telephone-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.telephone1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#telephone1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{t("account:account-telephone-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-company-group-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.company
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-company-group-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-preferred-language-label")}
</dt>
<dd className="govuk-summary-list__value">
{getPreferredLanguageLabel(
props.props.props.form.personalDetailsForm.values
.pinswg_preferredlanguage
)}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-preferred-language-label")}
</span>
</a>
</dd>
</div>
</dl>
<h2 className="govuk-heading-m">
{" "}
{t("account:account-your-address-label")}
</h2>
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-1-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-1-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-2-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line2
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line2"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-2-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-town-city-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_city
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_city"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-town-city-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-county-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_county
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_county"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-county-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-postcode-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_postalcode
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_postalcode"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-postcode-label")}
</span>
</a>
</dd>
</div>
</dl>
<div className="govuk-button-group">
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
onClick={() => {
setAccountUpdatedComplete(true);
}}
>
{t("common:continue-button")}
</button>
<Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId}
className="govuk-link">
{t("common:back-link")}
</Link>
</div>
</>;
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetailsComplete.js
+19 -32
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { import Link from "next/link";
Field, import { useRouter } from "next/router";
reduxForm, import React, { useEffect } from "react";
formValueSelector, import { connect } from "react-redux";
getFormSubmitErrors,
} from "redux-form";
import {
useDispatch,
useSelector,
shallowEqual,
connect,
setRegisterFormComplete,
setAccountCreatedComplete,
} from "react-redux";
import { updateAccount } from "../../actions"; import { updateAccount } from "../../actions";
const PersonalDetailsComplete = (props) => { const PersonalDetailsComplete = (props) => {
@@ -40,22 +26,23 @@ const PersonalDetailsComplete = (props) => {
props.props.props.form.personalDetailsForm.values, props.props.props.form.personalDetailsForm.values,
]); ]);
return <> return (
<p className="govuk-body">{t("account:account-complete-para-1")}</p> <>
<p className="govuk-body">{t("account:account-complete-para-1")}</p>
<p className="govuk-body">{t("account:account-complete-para-2")}</p> <p className="govuk-body">{t("account:account-complete-para-2")}</p>
<p className="govuk-body"> <p className="govuk-body">
<Link <Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId} href={"/myportal?q=" + props.accountDetails.loggedinUserId}
className="govuk-link"> className="govuk-link"
>
{" "} {" "}
{t("account:account-complete-return-to-portal-link")} {t("account:account-complete-return-to-portal-link")}
</Link>
</Link> </p>
</p> </>
</>; );
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/registerCheck.js
+3 -34
View File
@@ -1,14 +1,7 @@
import _ from "lodash";
import React, { useState } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { import { useRouter } from "next/router";
Field, import React from "react";
reduxForm, import { connect } from "react-redux";
formValueSelector,
getFormSubmitErrors,
} from "redux-form";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import { setAccCr } from "../../store/accountDetails/action"; import { setAccCr } from "../../store/accountDetails/action";
const RegisterFormCheck = (props) => { const RegisterFormCheck = (props) => {
@@ -144,30 +137,6 @@ const RegisterFormCheck = (props) => {
</a> </a>
</dd> </dd>
</div> </div>
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">Company/Group</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.accountRegisterForm.values
.companygroup
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
onClick={() => {
setRegisterFormComplete(false);
}}
>
Change
<span className="govuk-visually-hidden">
{" "}
company/group
</span>
</a>
</dd>
</div> */}
</dl> </dl>
<dl className="govuk-summary-list govuk-!-margin-bottom-9"> <dl className="govuk-summary-list govuk-!-margin-bottom-9">
<h2 className="govuk-heading-m"> <h2 className="govuk-heading-m">
components/account/registerComplete.js
+5 -22
View File
@@ -1,30 +1,14 @@
import _ from "lodash"; 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 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 { connect } from "react-redux";
import {
Field,
reduxForm,
formValueSelector,
getFormSubmitErrors,
} from "redux-form";
import {
useDispatch,
useSelector,
shallowEqual,
connect,
setRegisterFormComplete,
setAccountCreatedComplete,
} from "react-redux";
import { setAccCr, setLogout } from "../../store/accountDetails/action"; 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 RegisterComplete = (props) => {
const { const {
@@ -69,7 +53,6 @@ const RegisterComplete = (props) => {
? setAccCr("exists") ? setAccCr("exists")
: (checkEmailObj = createAccount(accountBody).then( : (checkEmailObj = createAccount(accountBody).then(
(data) => { (data) => {
//console.log(data);
setAccCr("created"); setAccCr("created");
} }
)); ));
components/account/registerform.js
+4 -45
View File
@@ -1,14 +1,8 @@
import _ from "lodash";
import React, { useState } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { import { useRouter } from "next/router";
Field, import React, { useState } from "react";
reduxForm, import { connect } from "react-redux";
formValueSelector, import { Field, formValueSelector, reduxForm } from "redux-form";
getFormSubmitErrors,
} from "redux-form";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import RegisterFormCheck from "./registerCheck"; import RegisterFormCheck from "./registerCheck";
import RegisterComplete from "./registerComplete"; import RegisterComplete from "./registerComplete";
@@ -120,11 +114,9 @@ const RegisterForm = (props) => {
const [hasErrors, setHasErrors] = useState(""); const [hasErrors, setHasErrors] = useState("");
const onHandleSubmit = (values) => { const onHandleSubmit = (values) => {
//console.log(values);
setRegisterFormComplete(true); setRegisterFormComplete(true);
}; };
//console.log(pristine);
return ( return (
<> <>
{!pristine && !valid && ( {!pristine && !valid && (
@@ -205,39 +197,6 @@ const RegisterForm = (props) => {
"account:register-new-account-phone-label" "account:register-new-account-phone-label"
)} )}
/> />
{/* <Field
name="pinswg_custom_password"
id="pinswg_custom_password"
component={RenderTextfield}
type="password"
className="govuk-input govuk-input--width-20"
label={t(
"account:register-new-account-password-label"
)}
validate={[required, minLength5]}
errorMsg={t(
"account:register-new-account-password-label-errormsg"
)}
/>
<Field
name="custom_password_check"
id="custom_password_check"
component={RenderTextfield}
type="password"
className="govuk-input govuk-input--width-20"
label={t(
"account:register-new-account-confirm-password-label"
)}
validate={[
required,
passwordsMatch,
minLength5,
]}
errorMsg={t(
"account:register-new-account-confirm-password-label-errormsg"
)}
/> */}
</fieldset> </fieldset>
<fieldset className="govuk-fieldset"> <fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m"> <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
components/addresssearch.js
+1 -4
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import SearchForCase from "./search/searchforcase"; import { useRouter } from "next/router";
import AddressSearch from "./search/addresssearch"; import AddressSearch from "./search/addresssearch";
export default function Search(props) { export default function Search(props) {
components/addresssearchresults.js
+2 -4
View File
@@ -1,10 +1,8 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; 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 CRMError from "./crmError";
import SearchResults from "./search/addresssearchresults";
export default function Search(props) { export default function Search(props) {
const { const {
components/banner.js
-1
View File
@@ -1,4 +1,3 @@
import Link from "next/link";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
export default function Banner() { export default function Banner() {
components/breadcrumbs.js
+53 -255
View File
@@ -1,78 +1,29 @@
import Link from "next/link";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import { useState } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; 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 { useSession } from "next-auth/react";
import { import { setCurrentView } from "../store/currentView/action";
setCurrentLinkedCases,
setCurrentReference,
setCurrentView,
} from "../store/currentView/action";
const Breadcrumbs = (props) => { const Breadcrumbs = (props) => {
const { courseContent, slug, currentView, setCurrentView } = props; const { currentView, setCurrentView } = props;
const router = useRouter(); const router = useRouter();
const { appealType, section } = router.query;
let { t } = useTranslation(); 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 (
<li
className="govuk-breadcrumbs__list-item"
aria-current="page"
>
{breadcrumb}
</li>
);
}
} else {
return null;
}
}
//const [showSpinnerState, setShowSpinnerState] = useState(false);
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const { data: session, status } = useSession(); const { data: session, status } = useSession();
return ( return (
<> <>
<nav <nav
aria-label={ aria-label={"Breadcrumb for PEDW"}
"Breadcrumb for " + _.startCase(_.toLower(appealType))
}
role="navigation" role="navigation"
data-module="track-click" data-module="track-click"
> >
<div className="govuk-breadcrumbs "> <div className="govuk-breadcrumbs ">
<ol className="govuk-breadcrumbs__list"> <ol className="govuk-breadcrumbs__list">
{/* <li className="govuk-breadcrumbs__list-item">
<Link href={t("common:gov-wales-link")}>
<a className="govuk-breadcrumbs__link">
{t("common:gov-wales-label")}
</a>
</Link>
</li> */}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
href={"/"} href={"/"}
@@ -81,14 +32,12 @@ const Breadcrumbs = (props) => {
{t("common:service-name-breadcrumb")} {t("common:service-name-breadcrumb")}
</Link> </Link>
</li> </li>
{router.pathname == "/myportal" ? ( {router.pathname == "/myportal" && (
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("myportal:page-title")} {t("myportal:page-title")}
</li> </li>
) : (
""
)} )}
{router.pathname == "/myportal/searchresults" ? ( {router.pathname == "/myportal/searchresults" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<a <a
@@ -108,38 +57,29 @@ const Breadcrumbs = (props) => {
{t("common:breadcrumb-search-results")} {t("common:breadcrumb-search-results")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/searchresults" ? ( {router.pathname == "/searchresults" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-search-results")} {t("common:breadcrumb-search-results")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/advancedsearch" ? ( {router.pathname == "/advancedsearch" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-advanced-search")} {t("common:breadcrumb-advanced-search")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/addresssearch" ? ( {router.pathname == "/addresssearch" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-address-search")} {t("common:breadcrumb-address-search")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/addresssearch" && (
{router.pathname == "/myportal/addresssearch" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -159,10 +99,8 @@ const Breadcrumbs = (props) => {
{t("common:breadcrumb-address-search")} {t("common:breadcrumb-address-search")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/advancedsearch" ? ( {router.pathname == "/myportal/advancedsearch" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -182,10 +120,8 @@ const Breadcrumbs = (props) => {
{t("common:breadcrumb-advanced-search")} {t("common:breadcrumb-advanced-search")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/addresssearchresults" ? ( {router.pathname == "/addresssearchresults" && (
<> <>
{" "} {" "}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -207,10 +143,8 @@ const Breadcrumbs = (props) => {
)} )}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/advancedsearchresults" ? ( {router.pathname == "/advancedsearchresults" && (
<> <>
{" "} {" "}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -232,11 +166,9 @@ const Breadcrumbs = (props) => {
)} )}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == {router.pathname ==
"/myportal/advancedsearchresults" ? ( "/myportal/advancedsearchresults" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -271,10 +203,9 @@ const Breadcrumbs = (props) => {
)} )}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/addresssearchresults" ? ( {router.pathname ==
"/myportal/addresssearchresults" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -310,10 +241,8 @@ const Breadcrumbs = (props) => {
)} )}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/newappeal" ? ( {router.pathname == "/newappeal" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -333,10 +262,8 @@ const Breadcrumbs = (props) => {
{t("newappeal:page-title")} {t("newappeal:page-title")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/newappeal/[appealtypes]" ? ( {router.pathname == "/newappeal/[appealtypes]" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -356,10 +283,8 @@ const Breadcrumbs = (props) => {
{t("newappeal:page-title")} {t("newappeal:page-title")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/[appealtypes]" ? ( {router.pathname == "/myportal/[appealtypes]" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -382,10 +307,8 @@ const Breadcrumbs = (props) => {
{props.formTitle} {props.formTitle}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/newappeal/selectappeal" ? ( {router.pathname == "/newappeal/selectappeal" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -419,10 +342,8 @@ const Breadcrumbs = (props) => {
Select Appeal Select Appeal
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/viewall" ? ( {router.pathname == "/viewall" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -442,10 +363,8 @@ const Breadcrumbs = (props) => {
{t("common:breadcrumb-your-cases")} {t("common:breadcrumb-your-cases")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/viewall" ? ( {router.pathname == "/myportal/viewall" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -480,10 +399,8 @@ const Breadcrumbs = (props) => {
)} )}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/case" ? ( {router.pathname == "/myportal/case" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -499,28 +416,6 @@ const Breadcrumbs = (props) => {
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
{/* <li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
? "/" +
router.locale +
"/fymhorth/gweldpopeth"
: "/myportal/viewall"
}
className="govuk-breadcrumbs__link"
onClick={() => {
setCurrentView({
"viewName":
"Awaiting Submission",
"viewKey":
"awaitingSubmissionDetails",
});
}}
>
{t("common:breadcrumb-your-cases")}
</Link>
</li> */}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-case-reference")}:{" "} {t("common:breadcrumb-case-reference")}:{" "}
{ {
@@ -529,11 +424,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/case/[ticketnumber]" && (
{router.pathname == "/case/[ticketnumber]" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-case-reference")}:{" "} {t("common:breadcrumb-case-reference")}:{" "}
@@ -543,11 +435,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/case/id/[incident]" && (
{router.pathname == "/case/id/[incident]" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -595,10 +484,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/case/id/[incident]" ? ( {router.pathname == "/myportal/case/id/[incident]" && (
<> <>
{" "} {" "}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -661,11 +548,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/case/[ticketnumber]" && (
{router.pathname == "/myportal/case/[ticketnumber]" ? (
<> <>
{" "} {" "}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -690,10 +574,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/dnsapplications" ? ( {router.pathname == "/myportal/dnsapplications" && (
<> <>
{" "} {" "}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -714,10 +596,8 @@ const Breadcrumbs = (props) => {
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/dnsdetails" ? ( {router.pathname == "/myportal/dnsdetails" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -749,11 +629,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/case" && (
{router.pathname == "/case" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -784,10 +661,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/myportal/representation" ? ( {router.pathname == "/myportal/representation" && (
<> <>
{session != null && ( {session != null && (
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -837,10 +712,8 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/account/personaldetails" ? ( {router.pathname == "/account/personaldetails" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -860,19 +733,15 @@ const Breadcrumbs = (props) => {
{t("account:account-title")} {t("account:account-title")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/account/register" ? ( {router.pathname == "/account/register" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("account:register-new-account-heading")} {t("account:register-new-account-heading")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/account/changepassword" ? ( {router.pathname == "/account/changepassword" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -892,19 +761,15 @@ const Breadcrumbs = (props) => {
Update your password Update your password
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns" ? ( {router.pathname == "/dns" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns/[developmentName]" ? ( {router.pathname == "/dns/[developmentName]" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -926,19 +791,15 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dnsapplications" ? ( {router.pathname == "/dnsapplications" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dnsdetails" ? ( {router.pathname == "/dnsdetails" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -961,46 +822,36 @@ const Breadcrumbs = (props) => {
} }
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns/application-process" ? ( {router.pathname == "/dns/application-process" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
Guidance Guidance
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns/help" ? ( {router.pathname == "/dns/help" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
Help Help
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns/contact-us" ? ( {router.pathname == "/dns/contact-us" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
Contact us Contact us
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns/applications" ? ( {router.pathname == "/dns/applications" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("dnsApplications:page-title")} {t("dnsApplications:page-title")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/dns/application-view" ? ( {router.pathname == "/dns/application-view" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
@@ -1021,28 +872,22 @@ const Breadcrumbs = (props) => {
TWA - Morlais Demonstration Zone TWA - Morlais Demonstration Zone
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/help/cookies" ? ( {router.pathname == "/help/cookies" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("cookies:cookie-breadcrumb")} {t("cookies:cookie-breadcrumb")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/privacy" ? ( {router.pathname == "/privacy" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("common:footer-privacy-link-label")} {t("common:footer-privacy-link-label")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/accessibility" ? ( {router.pathname == "/accessibility" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t( {t(
@@ -1050,82 +895,35 @@ const Breadcrumbs = (props) => {
)} )}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/details-about-cookies" ? ( {router.pathname == "/details-about-cookies" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("cookies:cookie-policy-title-heading")} {t("cookies:cookie-policy-title-heading")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/auth/signin" ? ( {router.pathname == "/auth/signin" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("auth:auth-page-title")} {t("auth:auth-page-title")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/auth/verify-request" ? ( {router.pathname == "/auth/verify-request" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("auth:auth-check-email-page-title")} {t("auth:auth-check-email-page-title")}
</li> </li>
</> </>
) : (
""
)} )}
{router.pathname == "/auth/error" ? ( {router.pathname == "/auth/error" && (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
{t("auth:auth-error-signin-error-title")} {t("auth:auth-error-signin-error-title")}
</li> </li>
</> </>
) : (
""
)} )}
{/* {!_.isEmpty(slug) ? (
<>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
? "/" + router.locale +"/fymhorth"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")}
</a>
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale == "cy"
? router.locale + "/apêlnewydd"
: "/newappeal"
}
>
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-new-appeal")}
</a>
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
{props.formTitle}
</li>
</>
) : (
""
)} */}
<Breadcrumb />
</ol> </ol>
</div> </div>
</nav> </nav>
components/case.js
+2 -4
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import Summary from "./case/summary"; import { useRouter } from "next/router";
import Documents from "./case/documents"; import Documents from "./case/documents";
import RepresentationList from "./case/representationList"; import RepresentationList from "./case/representationList";
import Summary from "./case/summary";
const Case = (props) => { const Case = (props) => {
const { showRepresentations } = props; const { showRepresentations } = props;
components/case/documents.js
-3
View File
@@ -345,7 +345,6 @@ const DocumentDetails = (props) => {
) )
.then((data) => data) .then((data) => data)
.then((data) => { .then((data) => {
//console.log("getting details", data);
setDocumentDetails(data); setDocumentDetails(data);
setShowSpinnerState(false); setShowSpinnerState(false);
}); });
@@ -365,7 +364,6 @@ const DocumentDetails = (props) => {
orderBy, orderBy,
fieldSort fieldSort
).then((data) => { ).then((data) => {
//console.log(data);
setDocumentDetails(data); setDocumentDetails(data);
return data; return data;
}); });
@@ -459,7 +457,6 @@ const DocumentDetails = (props) => {
const docDetailsObj = async () => { const docDetailsObj = async () => {
let docObj = await getSearchDocumentDetails(incidentid).then( let docObj = await getSearchDocumentDetails(incidentid).then(
(data) => { (data) => {
//console.log(data);
setDocumentDetails(data); setDocumentDetails(data);
setDocumentSearchState(true); setDocumentSearchState(true);
components/case/pagination.js
+1 -6
View File
@@ -1,7 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useState } from "react"; import { useRouter } from "next/router";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { setCurrentPage } from "../../store/currentView/action"; import { setCurrentPage } from "../../store/currentView/action";
@@ -27,14 +25,12 @@ const PaginationControl = (props) => {
); );
const getRange = (start, end) => { const getRange = (start, end) => {
//console.log(start, end);
return Array(end - start + 1) return Array(end - start + 1)
.fill() .fill()
.map((v, i) => i + start); .map((v, i) => i + start);
}; };
const paginationNumbers = (currentPage, pageCount) => { const paginationNumbers = (currentPage, pageCount) => {
//console.log(currentPage);
let delta; let delta;
if (pageCount <= 7) { if (pageCount <= 7) {
@@ -76,7 +72,6 @@ const PaginationControl = (props) => {
pages = pages.concat(withDots(pageCount, ["...", pageCount])); pages = pages.concat(withDots(pageCount, ["...", pageCount]));
} }
//console.log(pages);
return pages; return pages;
}; };
components/case/representation/index.js
+18 -34
View File
@@ -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 { JSONPath as jsonpath } from "jsonpath-plus";
import _, { property } from "lodash"; import _ from "lodash";
import { import useTranslation from "next-translate/useTranslation";
Field, import { useRouter } from "next/router";
FieldArray, import { useState } from "react";
reduxForm,
formValueSelector,
reset,
} from "redux-form";
import { connect } from "react-redux";
import { useDropzone } from "react-dropzone"; 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 { import {
setRepresentationCapacity, setRepresentationCapacity,
setRepresentationSubmit,
setSubmitBack,
setRepresentationSubmitConfirmation,
setRepresentationMessageSent, setRepresentationMessageSent,
setRepresentationReset, setRepresentationReset,
setRepresentationSubmit,
setRepresentationSubmitConfirmation,
} from "../../../store/currentView/action"; } 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 RepAgent from "./representationAgent";
import RepInterestedPartyPerson from "./representationInterestedPartyPerson"; import RepAppellant from "./representationAppellant";
import RepLandOwner from "./representationLandowner"; import RepCapacitySelection from "./representationCapacitySelection";
import RepLPA from "./representationLPA";
import RepCompleteSubmit from "./representationCompleteSubmit"; import RepCompleteSubmit from "./representationCompleteSubmit";
import { useSession, signIn, signOut } from "next-auth/react"; import RepInterestedPartyPerson from "./representationInterestedPartyPerson";
import { import RepLPA from "./representationLPA";
updateCase, import RepLPACapacitySelection from "./representationLPACapacitySelection";
patchCase, import RepLandOwner from "./representationLandowner";
uploadRepFiles,
sendEmail,
generateRepPDF,
createWatchedCases,
} from "../../../actions";
import { formatDates } from "../../../components/utils";
import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78";
import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement"; import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement";
import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78";
let MakeRepresentation = (props) => { let MakeRepresentation = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationAgent.js
+7 -15
View File
@@ -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 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 { import {
RenderPickList,
RenderTextfield,
RenderRadioList,
RenderMultiline,
RenderRichMultiline,
RenderCondtionalRadioList,
FileUploadField, FileUploadField,
RenderCondtionalRadioList,
RenderPickList,
RenderRichMultiline,
} from "./representationElements"; } from "./representationElements";
import {
getFormCollectionByID,
getThumbnailIconByExtension,
bytesToSize,
} from "../../utils";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
components/case/representation/representationAppellant.js
+7 -17
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { Field, reduxForm, reset, change } from "redux-form"; import { useRouter } from "next/router";
import React, { useCallback, useEffect, useMemo, useState } from "react"; import React from "react";
import { connect } from "react-redux";
import { Field, change, reduxForm } from "redux-form";
import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
import { import {
RenderPickList,
RenderTextfield,
RenderRadioList,
RenderMultiline,
RenderRichMultiline,
RenderFileUpload,
FileUploadField, FileUploadField,
RepresentationGuidanceText, RenderPickList,
RenderRichMultiline,
} from "./representationElements"; } from "./representationElements";
import {
getFormCollectionByID,
getThumbnailIconByExtension,
bytesToSize,
} from "../../utils";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
// import { // import {
components/case/representation/representationCapacitySelection.js
+3 -18
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { import { useRouter } from "next/router";
Field,
reduxForm,
formValueSelector,
handleSubmit,
reset,
} from "redux-form";
import {
RenderPickList,
RenderTextfield,
RenderRadioList,
RenderRadioListWithText,
RenderMultiline,
} from "./representationElements";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
import { Field } from "redux-form";
import RepDetails from "./representationDetails"; import RepDetails from "./representationDetails";
import { setRepresentationCapacity } from "../../../store/currentView/action"; import { RenderRadioListWithText } from "./representationElements";
let RepCapacitySelection = (props) => { let RepCapacitySelection = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationComplete.js
+1 -1
View File
@@ -6,9 +6,9 @@ import { connect } from "react-redux";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
import { import {
createWatchedCases,
sendEmail, sendEmail,
sendRepCompleteMessage, sendRepCompleteMessage,
createWatchedCases,
} from "../../../actions"; } from "../../../actions";
import { setRepresentationReset } from "../../../store/currentView/action"; import { setRepresentationReset } from "../../../store/currentView/action";
components/case/representation/representationCompleteSubmit.js
+5 -9
View File
@@ -1,18 +1,14 @@
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useState } from "react";
import { useDropzone } from "react-dropzone"; 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 { connect } from "react-redux";
import RepComplete from "./representationComplete";
import RepLPAQuestionnaireCheck_enforcement from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement";
import RepLPAQuestionnaireCheck_s78 from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78";
import { import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
getFormCollectionByID,
getThumbnailIconByExtension,
bytesToSize,
} from "../../utils";
const RepCompleteSubmit = (props) => { const RepCompleteSubmit = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationDetails.js
+2 -5
View File
@@ -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 { JSONPath as jsonpath } from "jsonpath-plus";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const RepDetails = (props) => { const RepDetails = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationElements.js
+14 -19
View File
@@ -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 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"; import dynamic from "next/dynamic";
const ReactQuill = dynamic(() => import("react-quill"), { ssr: false }); import Link from "next/link";
import "react-quill/dist/quill.snow.css"; import router from "next/router";
import DatePicker, { registerLocale, setDefaultLocale } from "react-datepicker"; import React, { useMemo, useState } from "react";
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css"; 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 { import {
addYears,
addMonths,
addDays, addDays,
subYears, addMonths,
subMonths, addYears,
subDays,
parseISO, parseISO,
subDays,
subMonths,
subYears,
} from "date-fns"; } from "date-fns";
import { import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
getFormCollectionByID,
getThumbnailIconByExtension,
bytesToSize,
} from "../../utils";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
components/case/representation/representationInterestedPartyPerson.js
+9 -17
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { Field, reduxForm, change } from "redux-form"; import { useRouter } from "next/router";
import {
RenderPickList,
RenderTextfield,
RenderCondtionalRadioList,
RenderMultiline,
RenderRichMultiline,
FileUploadField,
} from "./representationElements";
import {
getFormCollectionByID,
getThumbnailIconByExtension,
bytesToSize,
} from "../../utils";
import { useDropzone } from "react-dropzone"; 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) => { const RepInterestedPartyPerson = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationLPA.js
+13 -28
View File
@@ -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 { 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 Enforcement_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_enforcement";
import S78_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_s78"; 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 RepLPA = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationLPACapacitySelection.js
+1 -18
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { import { useRouter } from "next/router";
Field,
reduxForm,
formValueSelector,
handleSubmit,
reset,
} from "redux-form";
import {
RenderPickList,
RenderTextfield,
RenderRadioList,
RenderMultiline,
} from "./representationElements";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
import RepDetails from "./representationDetails";
import RepLPADetails from "./representationLPADetails"; import RepLPADetails from "./representationLPADetails";
import { setRepresentationCapacity } from "../../../store/currentView/action";
let RepLPACapacitySelection = (props) => { let RepLPACapacitySelection = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationLPAComments.js
+2 -15
View File
@@ -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 { connect } from "react-redux";
import { Field, reduxForm, formValueSelector } from "redux-form"; import { Field, formValueSelector, reduxForm } from "redux-form";
import { import { RenderMultiline } from "./representationElements";
RenderPickList,
RenderTextfield,
RenderRadioList,
RenderMultiline,
RenderCondtionalRadioList,
RenderLPACondtionalRadioList,
FileUploadField,
RenderRichMultiline,
RenderDatePicker,
} from "./representationElements";
let RepLPAQuestionnaire = (props) => { let RepLPAQuestionnaire = (props) => {
return ( return (
components/case/representation/representationLPADetails.js
+2 -5
View File
@@ -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 { JSONPath as jsonpath } from "jsonpath-plus";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const RepLPADetails = (props) => { const RepLPADetails = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationLandowner.js
+6 -14
View File
@@ -1,20 +1,12 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { Field, reduxForm } from "redux-form"; import { useRouter } from "next/router";
import {
RenderPickList,
RenderTextfield,
RenderRadioList,
RenderMultiline,
RenderRichMultiline,
FileUploadField,
} from "./representationElements";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
import { Field } from "redux-form";
import { import {
setRepresentationCapacity, FileUploadField,
setRepresentationSubmit, RenderPickList,
} from "../../../store/currentView/action"; RenderRichMultiline,
} from "./representationElements";
const RepLandOwner = (props) => { const RepLandOwner = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationProgress/representationProgress_enforcement.js
+1 -22
View File
@@ -1,26 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { connect } from "react-redux"; import { useRouter } from "next/router";
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";
const RepresentationProgress_enforcement = (props) => { const RepresentationProgress_enforcement = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationProgress/representationProgress_s78.js
+1 -22
View File
@@ -1,26 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { connect } from "react-redux"; import { useRouter } from "next/router";
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";
const RepresentationProgress_s78 = (props) => { const RepresentationProgress_s78 = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+15 -22
View File
@@ -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 { 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 Enforcement_Questionnaire = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+14 -22
View File
@@ -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 { 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 { getFormCollectionByID } from "../../../../components/utils";
import {
FileUploadField,
RenderDatePicker,
RenderLPACondtionalRadioList,
RenderMultiline,
RenderPickList,
RenderRadioList,
RenderRichMultiline,
RenderTextfield,
} from "../representationElements";
let S78_Questionnaire = (props) => { let S78_Questionnaire = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js
-2
View File
@@ -1,6 +1,4 @@
import _ from "lodash"; import _ from "lodash";
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { formatDates } from "../../../utils"; import { formatDates } from "../../../utils";
components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js
-2
View File
@@ -1,6 +1,4 @@
import _ from "lodash"; import _ from "lodash";
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { formatDates } from "../../../utils"; import { formatDates } from "../../../utils";
components/case/representationList.js
+4 -14
View File
@@ -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 { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; 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 transLookup from "../../data/lookuptranslations.json";
import { getRepresentations } from "../../actions"; import { getRepresentations } from "../../actions";
import { setRepresentations } from "../../store/searchOutput/action"; import { setRepresentations } from "../../store/searchOutput/action";
import PaginationControl from "./pagination";
import { formatDates } from "../utils"; import { formatDates } from "../utils";
const RepresentationList = (props) => { const RepresentationList = (props) => {
@@ -29,8 +27,6 @@ const RepresentationList = (props) => {
var representationsArr = representationsObj || []; var representationsArr = representationsObj || [];
const RepresentationsView = (representationsArr) => { const RepresentationsView = (representationsArr) => {
//console.log(documentDetailsArr);
representationsArr = representationsArr.value; representationsArr = representationsArr.value;
return ( return (
<> <>
@@ -130,12 +126,6 @@ const RepresentationList = (props) => {
); );
})} })}
</dl> </dl>
{/* <PaginationControl
currentPage={currentPage}
searchResultsObj={documentDetailsObj}
// spinnerState={spinnerState}
getDocumentResults={getDocumentResults}
/> */}
</> </>
); );
}; };
components/case/summary.js
+17 -67
View File
@@ -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 { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; 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 transLookup from "../../data/lookuptranslations.json";
import { import {
getLinkedCases,
createWatchedCases, createWatchedCases,
getWatchedCasesProxy,
getPortalModuleDetailsProxy,
deleteWatchedCases, deleteWatchedCases,
getLinkedCases,
getPortalModuleDetailsProxy,
getWatchedCasesProxy,
} from "../../actions"; } from "../../actions";
import { import {
setCurrentLinkedCases, setCurrentLinkedCases,
@@ -25,9 +25,9 @@ import {
setWatchedCasesDetails, setWatchedCasesDetails,
} from "../../store/watchedCases/action"; } from "../../store/watchedCases/action";
import { getFormCollectionByID } from "../utils"; import { signIn, useSession } from "next-auth/react";
import { getSession, useSession, signIn } from "next-auth/react"; import { destroyCookie, parseCookies, setCookie } from "nookies";
import { parseCookies, setCookie, destroyCookie } from "nookies"; import { getFormCollectionByID, getDetailsProxy } from "../utils";
import Pinswg_advertsid from "./summaryTypes/pinswg_advertsid"; import Pinswg_advertsid from "./summaryTypes/pinswg_advertsid";
import Pinswg_callinss77id from "./summaryTypes/pinswg_callinss77id"; import Pinswg_callinss77id from "./summaryTypes/pinswg_callinss77id";
@@ -106,45 +106,13 @@ const CaseSummary = (props) => {
.then(() => { .then(() => {
getWatchedCasesProxy(loggedInUser).then((data) => { getWatchedCasesProxy(loggedInUser).then((data) => {
setWatchedCases(data), setWatchedCases(data),
getDetails(data, "myWatchedCases").then((data) => { getDetailsProxy(data, "myWatchedCases").then((data) => {
setWatchedCasesDetails(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) => { const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath( let isWatched = jsonpath(
"$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]", "$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
@@ -162,9 +130,11 @@ const CaseSummary = (props) => {
.then(() => { .then(() => {
getWatchedCasesProxy(cookies.pinsUser).then((data) => { getWatchedCasesProxy(cookies.pinsUser).then((data) => {
setWatchedCases(data), setWatchedCases(data),
getDetails(data, "myWatchedCases").then((data) => { getDetailsProxy(data, "myWatchedCases").then(
setWatchedCasesDetails(data); (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
)} */}
<br />{" "} <br />{" "}
{t( {t(
"case:representation-date-passed-additional-label" "case:representation-date-passed-additional-label"
components/case/summaryTypes/pinswg_advertsid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_advertsid = (props) => { const Pinswg_advertsid = (props) => {
components/case/summaryTypes/pinswg_callinss77id.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_callinss77id = (props) => { const Pinswg_callinss77id = (props) => {
components/case/summaryTypes/pinswg_commonlandid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_commonlandid = (props) => { const Pinswg_commonlandid = (props) => {
components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_communityinfrastructurelevyid = (props) => { const Pinswg_communityinfrastructurelevyid = (props) => {
components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_compulsorypurchaseordersid = (props) => { const Pinswg_compulsorypurchaseordersid = (props) => {
components/case/summaryTypes/pinswg_dnsid.js
+2 -5
View File
@@ -1,10 +1,7 @@
import { useRouter } from "next/router"; 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 { 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 transLookup from "../../../data/lookuptranslations.json";
import GoogleMapComponent from "../../mapping/"; import GoogleMapComponent from "../../mapping/";
components/case/summaryTypes/pinswg_electricityactid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_electricityactid = (props) => { const Pinswg_electricityactid = (props) => {
components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_enforcementlistedbuildingconseid = (props) => { const Pinswg_enforcementlistedbuildingconseid = (props) => {
components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_enforcementnoticeappeals174id = (props) => { const Pinswg_enforcementnoticeappeals174id = (props) => {
components/case/summaryTypes/pinswg_environmentalpermittingid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_environmentalpermittingid = (props) => { const Pinswg_environmentalpermittingid = (props) => {
components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_harbourrevisionorderid = (props) => { const Pinswg_harbourrevisionorderid = (props) => {
components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
components/case/summaryTypes/pinswg_householderappealhasid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_householderappealhasid = (props) => { const Pinswg_householderappealhasid = (props) => {
components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_lawfuldevelopmentcertificatappid = (props) => { const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
components/case/summaryTypes/pinswg_ldpid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_ldpid = (props) => { const Pinswg_ldpid = (props) => {
components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_listedbuildingandconservationrid = (props) => { const Pinswg_listedbuildingandconservationrid = (props) => {
components/case/summaryTypes/pinswg_maintenanceoflands217id.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_maintenanceoflands217id = (props) => { const Pinswg_maintenanceoflands217id = (props) => {
components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_miscellaneouscasewordid = (props) => { const Pinswg_miscellaneouscasewordid = (props) => {
components/case/summaryTypes/pinswg_nonvalidationid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_nonvalidationid = (props) => { const Pinswg_nonvalidationid = (props) => {
components/case/summaryTypes/pinswg_planningappeals78id.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_planningappeals78id = (props) => { const Pinswg_planningappeals78id = (props) => {
components/case/summaryTypes/pinswg_planningconditionss73s79id.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_planningconditionss73s79id = (props) => { const Pinswg_planningconditionss73s79id = (props) => {
components/case/summaryTypes/pinswg_planningobligationappeals106id.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_planningobligationappeals106id = (props) => { const Pinswg_planningobligationappeals106id = (props) => {
components/case/summaryTypes/pinswg_rowid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_rowid = (props) => { const Pinswg_rowid = (props) => {
components/case/summaryTypes/pinswg_transportandworkactid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_transportandworkactid = (props) => { const Pinswg_transportandworkactid = (props) => {
components/case/summaryTypes/pinswg_wayleaveid.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { JSONPath as jsonpath } from "jsonpath-plus"; import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash"; import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
const Pinswg_wayleaveid = (props) => { const Pinswg_wayleaveid = (props) => {
components/caseresults.js
+6 -11
View File
@@ -1,8 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; 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"; import SearchResults from "./search/searchresults";
export default function Search({ children, pages }) { export default function Search({ children, pages }) {
@@ -26,16 +24,13 @@ export default function Search({ children, pages }) {
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/advancedsearch" className="govuk-button"> <Link href="/advancedsearch" className="govuk-button">
{t("search:searchresults-search-button-label")} {t("search:searchresults-search-button-label")}
</Link> </Link>
<Link href="/advancedsearch" className="govuk-button govuk-button--secondary"> <Link
href="/advancedsearch"
{t( className="govuk-button govuk-button--secondary"
"search:searchresults-new-search-button-label" >
)} {t("search:searchresults-new-search-button-label")}
</Link> </Link>
</div> </div>
</div> </div>
components/checkanswers.js
+1 -3
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import BuildCheckSection from "./newappeal/buildchecksection"; import BuildCheckSection from "./newappeal/buildchecksection";
const CheckAnswers = (props) => { const CheckAnswers = (props) => {
components/cookieBanner.js
+4 -4
View File
@@ -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 Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import { useState } from "react";
import cookie from "cookie-cutter"; import { CookieConsent } from "react-cookie-consent";
import { useState, useEffect } from "react";
const CookieBanner = () => { const CookieBanner = () => {
let { t, lang } = useTranslation(); let { t, lang } = useTranslation();
components/cookiePolicy.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const CookiePolicy = (props) => { const CookiePolicy = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/cookiemanager/index.js
+4 -4
View File
@@ -1,10 +1,10 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useContext, useEffect, useState } from "react"; import { parseCookies } from "nookies";
import useTranslation from "next-translate/useTranslation"; import { useState } from "react";
import { Field, reduxForm } from "redux-form";
import { parseCookies, setCookie, destroyCookie } from "nookies";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { reduxForm } from "redux-form";
import cookie from "cookie-cutter"; import cookie from "cookie-cutter";
components/crmError.js
+1 -3
View File
@@ -1,7 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { DiagConsoleLogger } from "@opentelemetry/api"; import { useRouter } from "next/router";
const CRMError = (props) => { const CRMError = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationSideBar.js
+1 -3
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const ApplicationSideBar = (props) => { const ApplicationSideBar = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationSummary.js
+1 -3
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const ApplicationSummary = (props) => { const ApplicationSummary = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationTabs.js
+4 -6
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import ApplicationTabsTimeLine from "./applicationTabsTimeline"; import { useRouter } from "next/router";
import { useState } from "react";
import ApplicationSideBar from "./applicationSideBar"; import ApplicationSideBar from "./applicationSideBar";
import ApplicationTabsDocuments from "./applicationTabsDocuments";
import ApplicationTabsComments from "./applicationTabsComments"; import ApplicationTabsComments from "./applicationTabsComments";
import ApplicationTabsDocuments from "./applicationTabsDocuments";
import ApplicationTabsRegistrationForm from "./applicationTabsRegistrationForm"; import ApplicationTabsRegistrationForm from "./applicationTabsRegistrationForm";
import ApplicationTabsTimeLine from "./applicationTabsTimeline";
const ApplicationTabs = (props) => { const ApplicationTabs = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationTabsComments.js
+1 -3
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const ApplicationTabsComments = (props) => { const ApplicationTabsComments = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationTabsDocuments.js
+2 -3
View File
@@ -1,12 +1,11 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useContext } from "react";
import useTranslation from "next-translate/useTranslation";
import { import {
Accordion, Accordion,
AccordionItem, AccordionItem,
AccordionItemHeading,
AccordionItemButton, AccordionItemButton,
AccordionItemHeading,
AccordionItemPanel, AccordionItemPanel,
} from "react-accessible-accordion"; } from "react-accessible-accordion";
// import "react-accessible-accordion/dist/fancy-example.css"; // import "react-accessible-accordion/dist/fancy-example.css";
components/dns/applications/applicationTabsRegistrationForm.js
+1 -3
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const ApplicationTabsRegistrationForm = (props) => { const ApplicationTabsRegistrationForm = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationTabsTimeline.js
+1 -3
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
const ApplicationTabsTimeLine = (props) => { const ApplicationTabsTimeLine = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/applications/applicationsIntro.js
+1 -4
View File
@@ -1,7 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useContext } from "react";
import useTranslation from "next-translate/useTranslation";
const ApplicationIntro = (props) => { const ApplicationIntro = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
@@ -28,9 +27,7 @@ const ApplicationIntro = (props) => {
<p className="govuk-body"> <p className="govuk-body">
{t("dnsApplications:page-intro-paragraph-2")}{" "} {t("dnsApplications:page-intro-paragraph-2")}{" "}
<Link href="/dns/calendar" className="govuk-link"> <Link href="/dns/calendar" className="govuk-link">
{t("dnsApplications:page-intro-paragraph-2-link")} {t("dnsApplications:page-intro-paragraph-2-link")}
</Link> </Link>
. .
</p> </p>
components/dns/applications/applicationsList.js
+1 -2
View File
@@ -1,7 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useContext } from "react";
import useTranslation from "next-translate/useTranslation";
const ApplicationList = (props) => { const ApplicationList = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/homepage/applicationsForComment.js
+6 -5
View File
@@ -1,6 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const ApplicationsForComment = (props) => { const ApplicationsForComment = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
@@ -15,10 +15,11 @@ const ApplicationsForComment = (props) => {
<div className="govuk-panel__body"> <div className="govuk-panel__body">
<ul className="govuk-list"> <ul className="govuk-list">
<li> <li>
<Link href="/dns/application-view" className="govuk-body-s "> <Link
href="/dns/application-view"
Holyhead Harbour Revision Order className="govuk-body-s "
>
Holyhead Harbour Revision Order
</Link> </Link>
</li> </li>
</ul> </ul>
components/dns/homepage/dnsLinks.js
+7 -7
View File
@@ -1,6 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const DNSLinks = (props) => { const DNSLinks = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
@@ -13,10 +13,11 @@ const DNSLinks = (props) => {
<ul className="govuk-list"> <ul className="govuk-list">
<li> <li>
<h3 className="govuk-heading-l govuk-!-font-size-27"> <h3 className="govuk-heading-l govuk-!-font-size-27">
<Link href="/dnsapplications" className="govuk-link govuk-link--no-underline"> <Link
href="/dnsapplications"
className="govuk-link govuk-link--no-underline"
>
{t("dnsHome:links-applications-title")} {t("dnsHome:links-applications-title")}
</Link> </Link>
<p className="govuk-body-s govuk-!-padding-top-2"> <p className="govuk-body-s govuk-!-padding-top-2">
{t( {t(
@@ -45,10 +46,9 @@ const DNSLinks = (props) => {
<h3 className="govuk-heading-l govuk-!-font-size-27"> <h3 className="govuk-heading-l govuk-!-font-size-27">
<Link <Link
href="https://gov.wales/developments-national-significance-dns-guidance" href="https://gov.wales/developments-national-significance-dns-guidance"
className="govuk-link govuk-link--no-underline "> className="govuk-link govuk-link--no-underline "
>
{t("dnsHome:links-help-title")} {t("dnsHome:links-help-title")}
</Link> </Link>
<p className="govuk-body-s govuk-!-padding-top-2"> <p className="govuk-body-s govuk-!-padding-top-2">
{t("dnsHome:links-guidance-intro-paragraph")} {t("dnsHome:links-guidance-intro-paragraph")}
components/dns/homepage/latestApplications.js
+1 -1
View File
@@ -1,6 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const LatestApplications = (props) => { const LatestApplications = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
components/dns/homepage/titleContent.js
+2 -3
View File
@@ -72,10 +72,9 @@ const TitleContent = (props) => {
? value.split(" - ")[1].split(" ").join("-") ? value.split(" - ")[1].split(" ").join("-")
: value) : value)
} }
className="govuk-button govuk-!-margin-bottom-0 "> className="govuk-button govuk-!-margin-bottom-0 "
>
{t("dnsHome:title-application-search-button")} {t("dnsHome:title-application-search-button")}
</Link> </Link>
</div> </div>
</div> </div>
components/dns/main.js
+3 -6
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import TitleContent from "./homepage/titleContent"; import { useRouter } from "next/router";
import LatestApplications from "./homepage/latestApplications";
import DNSLinks from "./homepage/dnsLinks"; 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 }) { export default function Main({ children, pages, props }) {
let { t } = useTranslation(); let { t } = useTranslation();
components/dnssearchresults.js
+2 -5
View File
@@ -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 useTranslation from "next-translate/useTranslation";
import SearchForCase from "./search/searchforcase"; import { useRouter } from "next/router";
import DNSSearchResults from "./search/dnssearchresults";
import CRMError from "./crmError"; import CRMError from "./crmError";
import DNSSearchResults from "./search/dnssearchresults";
export default function Search(props) { export default function Search(props) {
const { searchString, searchResultsObj, myportal, watchedCases, showMap } = const { searchString, searchResultsObj, myportal, watchedCases, showMap } =
components/elements/index.js
+17 -29
View File
@@ -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 { 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 fieldLookup from "../../data/crmfieldlookuptranslations.json";
import pickListLookup from "../../data/picklistLookups.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 dynamic from "next/dynamic";
import { bytesToSize, getThumbnailIconByExtension } from "../utils";
import { import {
addYears,
addMonths,
addDays, addDays,
subYears, addMonths,
subMonths, addYears,
subDays,
parseISO, parseISO,
subDays,
subMonths,
subYears,
} from "date-fns"; } from "date-fns";
const ReactQuill = dynamic(() => import("react-quill"), { ssr: false });
import "react-quill/dist/quill.snow.css"; import "react-quill/dist/quill.snow.css";
const ReactQuill = dynamic(() => import("react-quill"), { ssr: false });
const RenderTextfield = ({ const RenderTextfield = ({
id, id,
components/errorpage.js
+50 -49
View File
@@ -1,58 +1,59 @@
import Link from "next/link"; import Link from "next/link";
import Header from "./header";
import Banner from "./breadcrumbs";
import Breadcrumbs from "./banner";
import Footer from "./footer"; import Footer from "./footer";
import Header from "./header";
const Errorpage = () => { const Errorpage = () => {
var m = new Date(); var m = new Date();
var dateString = var dateString =
m.getUTCDate() + m.getUTCDate() +
"/" + "/" +
(m.getUTCMonth() + 1) + (m.getUTCMonth() + 1) +
"/" + "/" +
m.getUTCFullYear() + m.getUTCFullYear() +
" " + " " +
m.getUTCHours() + m.getUTCHours() +
":" + ":" +
m.getUTCMinutes() + m.getUTCMinutes() +
":" + ":" +
m.getUTCSeconds(); m.getUTCSeconds();
return ( return (
<div className=""> <div className="">
<Header courseName="An error has occured" /> <Header courseName="An error has occured" />
<div className="govuk-width-container"> <div className="govuk-width-container">
<main <main
className="govuk-main-wrapper govuk-main-wrapper--auto-spacing" className="govuk-main-wrapper govuk-main-wrapper--auto-spacing"
id="main-content" id="main-content"
role="main" role="main"
> >
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds"> <div className="govuk-grid-column-two-thirds">
<h1 className="govuk-heading-xl">There has been a problem</h1> <h1 className="govuk-heading-xl">
<p className="govuk-body"> There has been a problem
Unfortunately something has gone wrong! </h1>
</p> <p className="govuk-body">
<p className="govuk-body govuk-!-margin-top-9">{dateString}</p> Unfortunately something has gone wrong!
<Link </p>
href="/" <p className="govuk-body govuk-!-margin-top-9">
role="button" {dateString}
draggable="false" </p>
className="govuk-button govuk-button--start govuk-!-margin-top-2 govuk-!-margin-bottom-8" <Link
data-module="govuk-button"> href="/"
role="button"
Try again draggable="false"
className="govuk-button govuk-button--start govuk-!-margin-top-2 govuk-!-margin-bottom-8"
</Link> data-module="govuk-button"
<br /> >
Try again
</Link>
<br />
</div>
</div>
</main>
</div> </div>
</div> <Footer footerLinks="" />
</main> </div>
</div> );
<Footer footerLinks="" />
</div>
);
}; };
export default Errorpage; export default Errorpage;
components/footer.js
+1 -1
View File
@@ -1,6 +1,6 @@
import useTranslation from "next-translate/useTranslation";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { useState } from "react"; import { useState } from "react";
export default function Footer(props) { export default function Footer(props) {
components/footerDocs/accessibility_cy.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function AccessibilityCY() { export default function AccessibilityCY() {
let { t } = useTranslation(); let { t } = useTranslation();
components/footerDocs/accessibility_en.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function AccessibilityEN() { export default function AccessibilityEN() {
let { t } = useTranslation(); let { t } = useTranslation();
components/footerDocs/privacy_cy.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function PrivacyCY() { export default function PrivacyCY() {
let { t } = useTranslation(); let { t } = useTranslation();
components/footerDocs/privacy_en.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function PrivacyEN() { export default function PrivacyEN() {
let { t } = useTranslation(); let { t } = useTranslation();
components/footerDocs/tandc_cy.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function TandCCY() { export default function TandCCY() {
let { t } = useTranslation(); let { t } = useTranslation();
components/footerDocs/tandc_en.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function TandCEN() { export default function TandCEN() {
let { t } = useTranslation(); let { t } = useTranslation();
components/header.js
+28 -49
View File
@@ -1,14 +1,13 @@
import Link from "next/link";
import Image from "next/image";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import Banner from "../components/banner";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import { setLogout } from "../store/accountDetails/action";
import _ from "lodash"; import _ from "lodash";
import { parseCookies, setCookie, destroyCookie } from "nookies"; import useTranslation from "next-translate/useTranslation";
import Link from "next/link";
import { useRouter } from "next/router";
import { destroyCookie, setCookie } from "nookies";
import { connect } from "react-redux";
import Banner from "../components/banner";
import { setLogout } from "../store/accountDetails/action";
import { useSession, signIn, signOut } from "next-auth/react"; import { signOut } from "next-auth/react";
const Header = (props) => { const Header = (props) => {
let { t, lang } = useTranslation(); let { t, lang } = useTranslation();
@@ -91,23 +90,8 @@ const Header = (props) => {
</Link> </Link>
</div> </div>
{/* <div className="govuk-header__content govuk-!-width-one-half govuk-!-margin-top-3">
<Link
href={router.locale == "cy" ? "/allgofnodi" : "/logout"}
>
<a
onClick={() => {
window.localStorage.clear();
}}
className="govuk-header__link
govuk-header__link--service-name"
>
{serviceName || t("common:service-name")}
</a>
</Link>
</div> */}
<div className="languageSwitch"> <div className="languageSwitch">
{/* <div className="mobileNav"> <div className="mobileNav">
<div className="mobileMenu"> <div className="mobileMenu">
<input <input
type="radio" type="radio"
@@ -183,36 +167,31 @@ const Header = (props) => {
locale={ locale={
locale == "en" ? "cy" : "en" locale == "en" ? "cy" : "en"
} }
className="govuk-header__link "
lang={locale == "en" ? "cy" : "en"}
hrefLang={
locale == "en" ? "cy" : "en"
}
data-journey-click={
locale == "en"
? "link - click:lang-select:Cymraeg"
: "link - click:lang-select:English"
}
aria-label={
locale == "en"
? "Dewiswch Cymraeg"
: "Select English"
}
> >
<a {" "}
className="govuk-header__link " {t("common:available-in")}
lang={
locale == "en" ? "cy" : "en"
}
hrefLang={
locale == "en" ? "cy" : "en"
}
data-journey-click={
locale == "en"
? "link - click:lang-select:Cymraeg"
: "link - click:lang-select:English"
}
aria-label={
locale == "en"
? "Dewiswch Cymraeg"
: "Select English"
}
>
{" "}
{t("common:available-in")}
</a>
</Link> </Link>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> */} </div>
<div className="fullNavs"> <div className="fullNav">
{hasContactLink.includes(router.pathname) == true ? ( {hasContactLink.includes(router.pathname) == true ? (
<Link <Link
href="/dns/contact-us" href="/dns/contact-us"
components/homepage/casecomment.js
+1 -2
View File
@@ -1,6 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
export default function CaseComment() { export default function CaseComment() {
let { t } = useTranslation(); let { t } = useTranslation();
components/homepage/casesearch.js
+2 -3
View File
@@ -1,7 +1,6 @@
import Link from "next/link";
import { useState } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import Link from "next/link";
import { useRouter } from "next/router";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Field, reduxForm } from "redux-form"; import { Field, reduxForm } from "redux-form";
components/homepage/dns.js
+2 -3
View File
@@ -1,7 +1,6 @@
import Link from "next/link";
import { useState } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import Link from "next/link";
import { useRouter } from "next/router";
export default function Dns() { export default function Dns() {
let { t } = useTranslation(); let { t } = useTranslation();

Some files were not shown because too many files have changed in this diff Show More