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

Merge branch 'Development' into 6607-add-representations-to-a-case-logged-in

Browse Source
This commit is contained in:
robbond
2021-11-09 17:11:02 +00:00
parent 5fef09f76a ded253fd48
commit d357ffe0a1
12 changed files with 110 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/breadcrumbs.js
+9 -9
View File
@@ -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 (
<>
<nav
@@ -313,7 +313,7 @@ const Breadcrumbs = (props) => {
>
<a
onClick={() => {
spinnerState();
// spinnerState();
router.back();
}}
className="govuk-breadcrumbs__link"
@@ -582,11 +582,11 @@ const Breadcrumbs = (props) => {
</ol>
</div>
</nav>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/case/documents.js
+9 -9
View File
@@ -184,7 +184,7 @@ const DocumentDetails = (props) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={documentDetailsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getDocumentResults={getDocumentResults}
/>
</>
@@ -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) => {
</div>
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/case/pagination.js
+5 -5
View File
@@ -81,8 +81,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
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) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage + 1);
// spinnerState(),
getDocumentResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
components/case/summary.js
+9 -9
View File
@@ -257,7 +257,7 @@ const CaseSummary = (props) => {
<a
onClick={() => {
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}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>{" "}
/> */}
</>
);
};
components/homepage/casesearch.js
+9 -9
View File
@@ -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) => {
</Link>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</div>
</>
);
components/homepage/dns.js
+11 -11
View File
@@ -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 (
<div className="card" id="casesearch-card">
<div className="card-body">
@@ -37,20 +37,20 @@ export default function Dns() {
>
<a
className="govuk-button withChevron govuk-button-cta"
onClick={() => {
spinnerState();
}}
// onClick={() => {
// spinnerState();
// }}
>
{t("home:dns-card-button")}
</a>
</Link>
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-loading")}
/>
/> */}
</div>
);
}
components/homepage/login.js
+14 -13
View File
@@ -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) => {
</div>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text="Logging in"
/>
/> */}
</div>
);
};
components/myportal/searchcases.js
+9 -9
View File
@@ -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) => {
</Link>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</div>
</>
);
components/search/advancedsearch.js
+9 -12
View File
@@ -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) => {
</div>
</form>
</div>
{/* <div id="" className="spinnermodal">
</div> */}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/search/dnssearchresults.js
+9 -9
View File
@@ -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) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={searchResultsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getSearchPageResults={getSearchPageResults}
/>
</div>
@@ -301,11 +301,11 @@ const DNSSearchResults = (props) => {
</div>
</div>
)}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/search/pagination.js
+6 -6
View File
@@ -7,7 +7,7 @@ const PaginationControl = (props) => {
searchString,
searchResultsObj,
currentPage,
spinnerState,
// spinnerState,
getSearchPageResults,
} = props;
let { t } = useTranslation();
@@ -81,8 +81,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
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) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getSearchPageResults(currentPage + 1);
// spinnerState(),
getSearchPageResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
components/search/searchresults.js
+11 -11
View File
@@ -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) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={searchResultsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getSearchPageResults={getSearchPageResults}
/>
</>
@@ -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) => {
)}
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};