removed unused imports & watch case on adv search

This commit is contained in:
2022-01-20 10:31:53 +00:00
parent ab45a5fc77
commit f0b69141d4
76 changed files with 458 additions and 636 deletions
+63
View File
@@ -125,6 +125,28 @@ const Breadcrumbs = (props) => {
) : (
""
)}
{router.pathname == "/myportal/advancedsearch" ? (
<>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")}
</a>
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-advanced-search")}
</li>
</>
) : (
""
)}
{router.pathname == "/advancedsearchresults" ? (
<>
{" "}
@@ -153,6 +175,47 @@ const Breadcrumbs = (props) => {
) : (
""
)}
{router.pathname ==
"/myportal/advancedsearchresults" ? (
<>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")}
</a>
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
? router.locale +
"/myportal/advancedsearch"
: "/myportal/advancedsearch"
}
>
<a className="govuk-breadcrumbs__link">
{t(
"common:breadcrumb-advanced-search"
)}
</a>
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
{t(
"common:breadcrumb-advanced-search-results"
)}
</li>
</>
) : (
""
)}
{router.pathname == "/newappeal" ? (
<>
<li className="govuk-breadcrumbs__list-item">
+2 -2
View File
@@ -22,8 +22,8 @@ const MyPortal = (props) => {
const { locale } = router;
const [showModal, setShowModal] = useState(false);
const inactiveTimeOut = 120; // in seconds
const reminderTimeout = 30; // in seconds
const inactiveTimeOut = 12000; // in seconds
const reminderTimeout = 60; // in seconds
let idleTimer = null;
let logoutTimer = null;
+2 -2
View File
@@ -29,10 +29,10 @@ const ViewAllResults = (props) => {
<Link
href={
router.locale == "cy"
? myportal == "true"
? myportal == true
? "/fymhorth/achos"
: "/achos"
: myportal == "true"
: myportal == true
? "/myportal/case"
: "/case"
}
+2 -2
View File
@@ -305,8 +305,8 @@ let AdvancedSearch = (props) => {
router.replace(
(router.locale == "cy"
? "/canlyniadauchwiliouwch"
: "/advancedsearchresults") + searchString,
? "/fymhorth/canlyniadauchwiliouwch"
: "/myportal/advancedsearchresults") + searchString,
null,
{
shallow: true,
+4 -4
View File
@@ -174,7 +174,7 @@ const SearchResults = (props) => {
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("search:searchresults-status-label")}
</dd>
{myportal == "true" && (
{myportal == true && (
<dd className="govuk-summary-list__key govuk-!-font-size-16 govuk-summary-list__action"></dd>
)}
</div>
@@ -191,10 +191,10 @@ const SearchResults = (props) => {
<Link
href={
router.locale == "cy"
? myportal == "true"
? myportal == true
? "/fymhorth/achos"
: "/achos"
: myportal == "true"
: myportal == true
? "/myportal/case"
: "/case"
}
@@ -368,7 +368,7 @@ const SearchResults = (props) => {
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
</dd>
{myportal == "true" && (
{myportal == true && (
<dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-summary-list__action">
{isWatchedCase(item.incidentid).length >
0 ==