22079 mockup
This commit is contained in:
@@ -37,7 +37,7 @@ const RenderTextfield = ({
|
||||
htmlFor={id}
|
||||
id={id + "_label"}
|
||||
>
|
||||
<span className="govuk-body-s">{hint1}</span>
|
||||
<p className="govuk-body-s">{hint1}</p>
|
||||
</label>
|
||||
<ul className="govuk-body-s govuk-!-margin-top-3">
|
||||
<li>{hint2} </li>
|
||||
@@ -90,7 +90,7 @@ let CaseSearch = (props) => {
|
||||
|
||||
throw new SubmissionError({
|
||||
basicSearch: t("home:casesearch-search-validation-required"),
|
||||
_error: "required",
|
||||
_error: "required"
|
||||
});
|
||||
} else {
|
||||
router.push({
|
||||
@@ -98,7 +98,7 @@ let CaseSearch = (props) => {
|
||||
router.locale == "cy"
|
||||
? "/canlyniadauchwilio"
|
||||
: "/searchresults",
|
||||
query: { q: values.basicSearch },
|
||||
query: { q: values.basicSearch }
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -111,14 +111,16 @@ let CaseSearch = (props) => {
|
||||
<h2 className="heading-small card-heading">
|
||||
{t("home:casesearch-card-title")}
|
||||
</h2>
|
||||
|
||||
<p className="govuk-body-s">
|
||||
{t("home:casesearch-card-paragraph")}
|
||||
</p>
|
||||
<Field
|
||||
validate={[
|
||||
minLength(
|
||||
t(
|
||||
"home:casesearch-search-validation-minlength"
|
||||
)
|
||||
),
|
||||
)
|
||||
]}
|
||||
className="govuk-input"
|
||||
component={RenderTextfield}
|
||||
@@ -144,7 +146,7 @@ let CaseSearch = (props) => {
|
||||
"event",
|
||||
"SearchButtonClicked",
|
||||
{
|
||||
searchTerm: basicSearch.value,
|
||||
searchTerm: basicSearch.value
|
||||
}
|
||||
);
|
||||
}}
|
||||
@@ -193,7 +195,7 @@ const mapStateToProps = (state) => {
|
||||
myCases: state.myCases,
|
||||
watchedCases: state.watchedCases,
|
||||
myRepresentations: state.myRepresentations,
|
||||
awaitingSubmission: state.awaitingSubmission,
|
||||
awaitingSubmission: state.awaitingSubmission
|
||||
};
|
||||
};
|
||||
|
||||
@@ -207,6 +209,6 @@ export default connect(
|
||||
)(
|
||||
reduxForm({
|
||||
form: "basicSearchForm",
|
||||
destroyOnUnmount: false,
|
||||
destroyOnUnmount: false
|
||||
})(CaseSearch)
|
||||
);
|
||||
|
||||
@@ -27,14 +27,14 @@ const MyPortal = (props) => {
|
||||
|
||||
const handleLogout = () => {
|
||||
console.info("////////////\n" + "logout" + "\n////////////");
|
||||
window.localStorage.clear(),
|
||||
(window.localStorage.clear(),
|
||||
destroyCookie(null, "next-auth.csrf-token", { path: "/" }),
|
||||
destroyCookie(null, "next-auth.callback-url", { path: "/" }),
|
||||
destroyCookie(null, "pedw_locale", { path: "/" }),
|
||||
destroyCookie(null, "pinsUser", { path: "/" }),
|
||||
signOut({
|
||||
callbackUrl: locale == "cy" ? "/cy/allgofnodi" : "/logout",
|
||||
});
|
||||
callbackUrl: locale == "cy" ? "/cy/allgofnodi" : "/logout"
|
||||
}));
|
||||
};
|
||||
|
||||
const isLPA =
|
||||
@@ -114,7 +114,7 @@ const MyPortal = (props) => {
|
||||
] +
|
||||
'")].value_cy',
|
||||
json: transLookup,
|
||||
eval: true,
|
||||
eval: true
|
||||
})
|
||||
: props.accountDetails.accountDetails[
|
||||
"pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
|
||||
@@ -126,10 +126,11 @@ const MyPortal = (props) => {
|
||||
<div className="govuk-grid-row">
|
||||
<div className="govuk-grid-column-full">
|
||||
<div className="flex-container grid-row govuk-body ">
|
||||
<SearchCases />
|
||||
{!isLPA && (
|
||||
<MakeNewAppeal docsOffline={docsOffline} />
|
||||
)}
|
||||
<SearchCases />
|
||||
|
||||
{/* {props.awaitingSubmission.awaitingSubmission[
|
||||
"@odata.count"
|
||||
] > 0 && (
|
||||
@@ -143,7 +144,7 @@ const MyPortal = (props) => {
|
||||
{!isLPA &&
|
||||
_.has(props.awaitingSubmission, [
|
||||
"awaitingSubmissionFromBlob",
|
||||
"@odata.count",
|
||||
"@odata.count"
|
||||
]) &&
|
||||
props.awaitingSubmission
|
||||
.awaitingSubmissionFromBlob[
|
||||
|
||||
@@ -88,7 +88,7 @@ let AdvancedSearch = (props) => {
|
||||
optionsObj,
|
||||
meta: { touched, error },
|
||||
label,
|
||||
errormsg,
|
||||
errormsg
|
||||
}) => {
|
||||
return (
|
||||
<>
|
||||
@@ -143,7 +143,7 @@ let AdvancedSearch = (props) => {
|
||||
.name +
|
||||
'")].value_cy',
|
||||
json: transLookup,
|
||||
eval: true,
|
||||
eval: true
|
||||
})
|
||||
: optionsObj[key].name ||
|
||||
t(
|
||||
@@ -166,7 +166,7 @@ let AdvancedSearch = (props) => {
|
||||
optionsObj,
|
||||
meta: { touched, error },
|
||||
label,
|
||||
errormsg,
|
||||
errormsg
|
||||
}) => {
|
||||
return (
|
||||
<>
|
||||
@@ -213,47 +213,52 @@ let AdvancedSearch = (props) => {
|
||||
_.isEmpty(optionsObj[key])
|
||||
? ""
|
||||
: _.isEmpty(
|
||||
optionsObj[key]
|
||||
)
|
||||
? ""
|
||||
: _.isEmpty(
|
||||
optionsObj[key]
|
||||
.value
|
||||
)
|
||||
? ""
|
||||
: optionsObj[key]
|
||||
.attributevalue +
|
||||
"," +
|
||||
optionsObj[key].value
|
||||
.replace(
|
||||
/(\band|[\s\-\+\(\)\,\&])/g,
|
||||
""
|
||||
optionsObj[key]
|
||||
)
|
||||
? ""
|
||||
: _.isEmpty(
|
||||
optionsObj[key]
|
||||
.value
|
||||
)
|
||||
.toLowerCase()
|
||||
? ""
|
||||
: optionsObj[key]
|
||||
.attributevalue +
|
||||
"," +
|
||||
optionsObj[
|
||||
key
|
||||
].value
|
||||
.replace(
|
||||
/(\band|[\s\-\+\(\)\,\&])/g,
|
||||
""
|
||||
)
|
||||
.toLowerCase()
|
||||
}
|
||||
>
|
||||
{_.isEmpty(optionsObj[key])
|
||||
? ""
|
||||
: _.isEmpty(optionsObj[key])
|
||||
? ""
|
||||
: _.isEmpty(
|
||||
optionsObj[key].value
|
||||
)
|
||||
? ""
|
||||
: router.locale == "cy"
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@ && @.value=="' +
|
||||
? ""
|
||||
: _.isEmpty(
|
||||
optionsObj[key]
|
||||
.value +
|
||||
'")].value_cy',
|
||||
json: transLookup,
|
||||
eval: true,
|
||||
})
|
||||
: optionsObj[key].value ||
|
||||
t(
|
||||
"case:summary-no-date-entered-label"
|
||||
)}
|
||||
.value
|
||||
)
|
||||
? ""
|
||||
: router.locale == "cy"
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@ && @.value=="' +
|
||||
optionsObj[
|
||||
key
|
||||
].value +
|
||||
'")].value_cy',
|
||||
json: transLookup,
|
||||
eval: true
|
||||
})
|
||||
: optionsObj[key]
|
||||
.value ||
|
||||
t(
|
||||
"case:summary-no-date-entered-label"
|
||||
)}
|
||||
</option>
|
||||
);
|
||||
})}
|
||||
@@ -325,7 +330,7 @@ let AdvancedSearch = (props) => {
|
||||
t(
|
||||
"myportal:searchcases-validation-minlength"
|
||||
)
|
||||
),
|
||||
)
|
||||
]}
|
||||
className="govuk-input govuk-!-width-two-thirds"
|
||||
component={RenderTextfield}
|
||||
@@ -475,7 +480,7 @@ const mapStateToProps = (state) => {
|
||||
myCases: state.myCases,
|
||||
watchedCases: state.watchedCases,
|
||||
myRepresentations: state.myRepresentations,
|
||||
awaitingSubmission: state.awaitingSubmission,
|
||||
awaitingSubmission: state.awaitingSubmission
|
||||
};
|
||||
};
|
||||
|
||||
@@ -491,6 +496,6 @@ export default connect(
|
||||
)(
|
||||
reduxForm({
|
||||
form: "advancedSearchForm",
|
||||
destroyOnUnmount: false,
|
||||
destroyOnUnmount: false
|
||||
})(AdvancedSearch)
|
||||
);
|
||||
|
||||
@@ -19,6 +19,9 @@ export default function MakeNewAppeal(props) {
|
||||
<h2 className="govuk-heading-s">
|
||||
{t("myportal:makenewappeal-card-title")}
|
||||
</h2>
|
||||
<p className="govuk-body-s">
|
||||
{t("myportal:makenewappeal-card-paragraph-zero")}
|
||||
</p>
|
||||
<p className="govuk-body-s">
|
||||
{t("myportal:makenewappeal-card-paragraph-one")}{" "}
|
||||
<Link href={t("myportal:makenewappeal-card-guidance-link")}>
|
||||
|
||||
@@ -36,7 +36,7 @@ const RenderTextfield = ({
|
||||
htmlFor={id}
|
||||
id={id + "_label"}
|
||||
>
|
||||
<span className="govuk-body-s">{hint1}</span>
|
||||
<p className="govuk-body-s">{hint1}</p>
|
||||
</label>
|
||||
<ul className="govuk-body-s govuk-!-margin-top-3">
|
||||
<li>{hint2} </li>
|
||||
@@ -89,7 +89,7 @@ let CaseSearch = (props) => {
|
||||
|
||||
throw new SubmissionError({
|
||||
basicSearch: t("myportal:searchcases-validation-required"),
|
||||
_error: "required",
|
||||
_error: "required"
|
||||
});
|
||||
} else {
|
||||
router.push({
|
||||
@@ -97,7 +97,7 @@ let CaseSearch = (props) => {
|
||||
router.locale == "cy"
|
||||
? "/fymhorth/canlyniadauchwilio"
|
||||
: "/myportal/searchresults",
|
||||
query: { q: values.basicSearch },
|
||||
query: { q: values.basicSearch }
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -111,13 +111,17 @@ let CaseSearch = (props) => {
|
||||
{t("myportal:searchcases-card-title")}
|
||||
</h3>
|
||||
|
||||
<p className="govuk-body-s">
|
||||
{t("myportal:searchcases-card-paragraph")}
|
||||
</p>
|
||||
|
||||
<Field
|
||||
validate={[
|
||||
minLength(
|
||||
t(
|
||||
"myportal:searchcases-validation-minlength"
|
||||
)
|
||||
),
|
||||
)
|
||||
]}
|
||||
className="govuk-input"
|
||||
component={RenderTextfield}
|
||||
@@ -143,7 +147,7 @@ let CaseSearch = (props) => {
|
||||
"event",
|
||||
"MyPortalSearchButtonClicked",
|
||||
{
|
||||
searchTerm: basicSearch.value,
|
||||
searchTerm: basicSearch.value
|
||||
}
|
||||
);
|
||||
}}
|
||||
@@ -201,7 +205,7 @@ const mapStateToProps = (state) => {
|
||||
myCases: state.myCases,
|
||||
watchedCases: state.watchedCases,
|
||||
myRepresentations: state.myRepresentations,
|
||||
awaitingSubmission: state.awaitingSubmission,
|
||||
awaitingSubmission: state.awaitingSubmission
|
||||
};
|
||||
};
|
||||
|
||||
@@ -215,6 +219,6 @@ export default connect(
|
||||
)(
|
||||
reduxForm({
|
||||
form: "basicSearchForm",
|
||||
destroyOnUnmount: false,
|
||||
destroyOnUnmount: false
|
||||
})(CaseSearch)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user