From ca9b56d21046144bf1c6e0b6e5c043a42cea93ae Mon Sep 17 00:00:00 2001 From: "robert.bond@test.gov.wales" Date: Tue, 9 Nov 2021 16:05:36 +0000 Subject: [PATCH] commented out spinner function --- components/breadcrumbs.js | 18 +++++++++--------- components/case/documents.js | 18 +++++++++--------- components/case/pagination.js | 10 +++++----- components/case/summary.js | 18 +++++++++--------- components/homepage/casesearch.js | 18 +++++++++--------- components/homepage/dns.js | 22 +++++++++++----------- components/homepage/login.js | 27 ++++++++++++++------------- components/myportal/searchcases.js | 18 +++++++++--------- components/search/advancedsearch.js | 21 +++++++++------------ components/search/dnssearchresults.js | 18 +++++++++--------- components/search/pagination.js | 12 ++++++------ components/search/searchresults.js | 22 +++++++++++----------- 12 files changed, 110 insertions(+), 112 deletions(-) diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 0d76a426..33e1f6b2 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -38,13 +38,13 @@ const Breadcrumbs = (props) => { } } - const [showSpinnerState, setShowSpinnerState] = useState(false); + // const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; return ( <> - + /> */} ); }; diff --git a/components/case/documents.js b/components/case/documents.js index bfcc9a59..63e1ac8d 100644 --- a/components/case/documents.js +++ b/components/case/documents.js @@ -184,7 +184,7 @@ const DocumentDetails = (props) => { @@ -330,13 +330,13 @@ const DocumentDetails = (props) => { ) : pagesCount; - const [showSpinnerState, setShowSpinnerState] = useState(false); + //const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const [showDocumentSearchState, setDocumentSearchState] = useState(false); @@ -370,11 +370,11 @@ const DocumentDetails = (props) => { - + /> */} ); }; diff --git a/components/case/pagination.js b/components/case/pagination.js index 50b88581..41768f9b 100644 --- a/components/case/pagination.js +++ b/components/case/pagination.js @@ -81,8 +81,8 @@ const PaginationControl = (props) => { { - spinnerState(), - getDocumentResults(currentPage - 1); + // spinnerState(), + getDocumentResults(currentPage - 1); }} > {t("common:previous-link-button")} @@ -114,7 +114,7 @@ const PaginationControl = (props) => { className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem" key={i} onClick={() => { - spinnerState(); + // spinnerState(); console.log(i + 1); getDocumentResults(i + 1); }} @@ -129,8 +129,8 @@ const PaginationControl = (props) => { { - spinnerState(), - getDocumentResults(currentPage + 1); + // spinnerState(), + getDocumentResults(currentPage + 1); }} > {t("common:next-link-button")} diff --git a/components/case/summary.js b/components/case/summary.js index 78d38710..da9701ce 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -257,7 +257,7 @@ const CaseSummary = (props) => { { - spinnerState(); + // spinnerState(); router.back(); }} className="govuk-button govuk-button--secondary" @@ -570,13 +570,13 @@ const CaseSummary = (props) => { const linkedCases = linkCaseObj(); }, [incidentid, setCurrentLinkedCases]); - const [showSpinnerState, setShowSpinnerState] = useState(false); + // const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; function formatDates(dateObj) { var dateObj = new Date(dateObj); @@ -631,11 +631,11 @@ const CaseSummary = (props) => { return ( <> {showDetailsBlock} - {" "} + /> */} ); }; diff --git a/components/homepage/casesearch.js b/components/homepage/casesearch.js index 738f2722..aeb487cd 100644 --- a/components/homepage/casesearch.js +++ b/components/homepage/casesearch.js @@ -76,16 +76,16 @@ let CaseSearch = (props) => { const router = useRouter(); const { locale } = router; - const [showSpinnerState, setShowSpinnerState] = useState(false); + //const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const onHandleSubmit = (values) => { - spinnerState(); + // spinnerState(); router.replace({ pathname: router.locale == "cy" @@ -151,11 +151,11 @@ let CaseSearch = (props) => { - + /> */} ); diff --git a/components/homepage/dns.js b/components/homepage/dns.js index cd8fd796..8941107a 100644 --- a/components/homepage/dns.js +++ b/components/homepage/dns.js @@ -6,16 +6,16 @@ import LoadingOverlay from "react-loading-overlay"; export default function Dns() { let { t } = useTranslation(); - const [showSpinnerState, setShowSpinnerState] = useState(false); + //const [showSpinnerState, setShowSpinnerState] = useState(false); const router = useRouter(); const { locale } = router; - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; return (
@@ -37,20 +37,20 @@ export default function Dns() { > { - spinnerState(); - }} + // onClick={() => { + // spinnerState(); + // }} > {t("home:dns-card-button")}
- + /> */} ); } diff --git a/components/homepage/login.js b/components/homepage/login.js index 82ae7bdd..7e707b96 100644 --- a/components/homepage/login.js +++ b/components/homepage/login.js @@ -114,17 +114,17 @@ let Login = (props) => { const router = useRouter(); const { locale } = router; - const [showSpinnerState, setShowSpinnerState] = useState(false); + // const [showSpinnerState, setShowSpinnerState] = useState(false); const [validLoginID, setValidLoginID] = useState(null); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const onHandleSubmit = (values) => { - spinnerState(); + //spinnerState(); getLogin(values.loginUserID, values.loginUserPassword).then((data) => { data.value.length != 0 @@ -133,13 +133,14 @@ let Login = (props) => { setCookie(null, "pinsUser", data.value[0].contactid, { path: "/", }), - spinnerState(), + // spinnerState(), router.replace({ pathname: router.locale == "cy" ? "/fymhorth" : "/myportal", shallow: true, })) - : (setShowSpinnerState(false), setValidLoginID(false)); + : //setShowSpinnerState(false), + setValidLoginID(false); }); }; @@ -147,10 +148,10 @@ let Login = (props) => { useEffect(() => { cookies.pinsUser != null || typeof cookies.pinsUser != "undefined" - ? (spinnerState(), + ? // spinnerState(), router.replace("/myportal", null, { shallow: true, - })) + }) : ""; }, []); @@ -243,11 +244,11 @@ let Login = (props) => { - + /> */} ); }; diff --git a/components/myportal/searchcases.js b/components/myportal/searchcases.js index f43e5f3e..0668b7e5 100644 --- a/components/myportal/searchcases.js +++ b/components/myportal/searchcases.js @@ -71,16 +71,16 @@ let CaseSearch = (props) => { const router = useRouter(); const { locale } = router; - const [showSpinnerState, setShowSpinnerState] = useState(false); + //const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const onHandleSubmit = (values) => { - spinnerState(); + //spinnerState(); router.push({ pathname: router.locale == "cy" @@ -143,11 +143,11 @@ let CaseSearch = (props) => { - + /> */} ); diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js index 0721210b..e9ff67df 100644 --- a/components/search/advancedsearch.js +++ b/components/search/advancedsearch.js @@ -218,17 +218,17 @@ let AdvancedSearch = (props) => { const required = (value) => (value ? undefined : "Required"); - const [showSpinnerState, setShowSpinnerState] = useState(false); + // const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const onHandleSubmit = (values) => { event.preventDefault(); - spinnerState(); + //spinnerState(); var searchString = ""; @@ -411,14 +411,11 @@ let AdvancedSearch = (props) => { - {/*
- -
*/} - + /> */} ); }; diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index 7d24d8d6..007c1109 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -38,13 +38,13 @@ const DNSSearchResults = (props) => { var resultsArr = searchResultsObj.value || []; - const [showSpinnerState, setShowSpinnerState] = useState(false); + //const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const ResultsView = (resultsArr) => { return ( @@ -226,7 +226,7 @@ const DNSSearchResults = (props) => { @@ -301,11 +301,11 @@ const DNSSearchResults = (props) => { )} - + /> */} ); }; diff --git a/components/search/pagination.js b/components/search/pagination.js index 2ac43e98..9a29050d 100644 --- a/components/search/pagination.js +++ b/components/search/pagination.js @@ -7,7 +7,7 @@ const PaginationControl = (props) => { searchString, searchResultsObj, currentPage, - spinnerState, + // spinnerState, getSearchPageResults, } = props; let { t } = useTranslation(); @@ -81,8 +81,8 @@ const PaginationControl = (props) => { { - spinnerState(), - getSearchPageResults(currentPage - 1); + // spinnerState(), + getSearchPageResults(currentPage - 1); }} > {t("common:previous-link-button")} @@ -114,7 +114,7 @@ const PaginationControl = (props) => { className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem" key={i} onClick={() => { - spinnerState(); + // spinnerState(); console.log(i + 1); getSearchPageResults(i + 1); }} @@ -129,8 +129,8 @@ const PaginationControl = (props) => { { - spinnerState(), - getSearchPageResults(currentPage + 1); + // spinnerState(), + getSearchPageResults(currentPage + 1); }} > {t("common:next-link-button")} diff --git a/components/search/searchresults.js b/components/search/searchresults.js index bd014c66..66cb4002 100644 --- a/components/search/searchresults.js +++ b/components/search/searchresults.js @@ -66,13 +66,13 @@ const SearchResults = (props) => { var resultsArr = searchResultsObj.value || []; - const [showSpinnerState, setShowSpinnerState] = useState(false); + // const [showSpinnerState, setShowSpinnerState] = useState(false); - let spinnerState = () => { - showSpinnerState == true - ? setShowSpinnerState(false) - : setShowSpinnerState(true); - }; + // let spinnerState = () => { + // showSpinnerState == true + // ? setShowSpinnerState(false) + // : setShowSpinnerState(true); + // }; const cookies = parseCookies(); @@ -430,7 +430,7 @@ const SearchResults = (props) => { @@ -476,7 +476,7 @@ const SearchResults = (props) => { //console.log("getting details", data); return getSearchDetailsPaged(data).then((data) => { setSearchDetails(data); - setShowSpinnerState(false); + //setShowSpinnerState(false); }); }); } else { @@ -490,7 +490,7 @@ const SearchResults = (props) => { //console.log("getting details", data); return getSearchDetailsPaged(data).then((data) => { setSearchDetails(data); - setShowSpinnerState(false); + //setShowSpinnerState(false); }); }); } @@ -535,11 +535,11 @@ const SearchResults = (props) => { )} - + /> */} ); };