diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 3a9d7148..ae801038 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -475,6 +475,9 @@ const Breadcrumbs = (props) => { t( "myportal:myrepresentations-card-title" )} + {currentView.currentView.viewKey == + "mySubmittedReps" && + "Submitted representations"} )} diff --git a/components/myportal.js b/components/myportal.js index 60693d03..d9a0e183 100644 --- a/components/myportal.js +++ b/components/myportal.js @@ -13,6 +13,7 @@ import MyCases from "./myportal/mycases"; import MyRepresentations from "./myportal/myrepresentations"; import SearchCases from "./myportal/searchcases"; import WatchedCases from "./myportal/watchedcases"; +import MySubmittedReps from "./myportal/mysubmittedrepresentations"; import ServiceBanner from "./myportal/servicebanner"; import { JSONPath as jsonpath } from "jsonpath-plus"; import transLookup from "../data/lookuptranslations.json"; @@ -183,9 +184,9 @@ const MyPortal = (props) => { {props.myRepresentations.mySubmittedReps .mySubmittedReps.length > 0 && ( - { + let { t } = useTranslation(); + + const router = useRouter(); + const { locale } = router; + const { setCurrentView } = props; + + let recordCountVar = props.mySubmittedReps.mySubmittedReps; + + return ( +
+
+

+ {t("myportal:submitted-reps-card-title")} +

+
+ +
+ + {(props.myReps + ? recordCountVar.length > 3 + : recordCountVar["@odata.count"] > 3) && ( +
+ { + setCurrentView({ + "viewName": "Submitted Representations", + "viewKey": "mySubmittedReps", + }); + }} + > + {t("myportal:viewall-link-count", { + count: props.mySubmittedReps.mySubmittedReps + .length, + })} + +
+ )} +
+
+ ); +}; + +const mapDispatchToProps = (dispatch) => { + return { + setCurrentView: (currentView) => { + dispatch(setCurrentView(currentView)); + }, + }; +}; + +export default connect(null, mapDispatchToProps)(MySubmittedReps); diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index 37fdcbc9..2e4ecfda 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -84,6 +84,8 @@ const ViewAllResults = (props) => { var resultsArr = currentView.viewKey == "awaitingSubmissionDetails" ? props["awaitingSubmission"].awaitingSubmissionDetails.case + : currentView.viewKey == "mySubmittedReps" + ? props[currentView.viewKey][currentView.viewKey] : props[currentView.viewKey][currentView.viewKey].value || []; const [orderByState, setOrderbyState] = useState("createdon"); @@ -829,6 +831,8 @@ const ViewAllResults = (props) => { t("myportal:mycases-card-title")} {currentView.viewKey == "myRepresentations" && t("myportal:myrepresentations-card-title")} + {currentView.viewKey == "mySubmittedReps" && + "Submitted representations"} {resultsRowArr.length == 0 ? ( diff --git a/components/myportal/watchedcases.js b/components/myportal/watchedcases.js index ee278ece..c48a14f4 100644 --- a/components/myportal/watchedcases.js +++ b/components/myportal/watchedcases.js @@ -12,9 +12,7 @@ const WatchedCases = (props) => { const { locale } = router; const { setCurrentView } = props; - let recordCountVar = props.myReps - ? props.watchedCases.mySubmittedReps - : props.watchedCases.watchedCases; + let recordCountVar = props.watchedCases.watchedCases; return (
@@ -26,11 +24,7 @@ const WatchedCases = (props) => {
{ {props.watchedCases.watchedCases["@odata.count"] + " cases"} */} {t("myportal:viewall-link-count", { - count: props.myReps - ? props.watchedCases.mySubmittedReps.length - : props.watchedCases.watchedCases[ - "@odata.count" - ], + count: props.watchedCases.watchedCases[ + "@odata.count" + ], })}
diff --git a/pages/myportal/index.js b/pages/myportal/index.js index 454d428f..09b7f232 100644 --- a/pages/myportal/index.js +++ b/pages/myportal/index.js @@ -54,16 +54,18 @@ const Home = (props) => { pages, myCases, myRepresentations, - mySubmittedReps, watchedCases, awaitingSubmission, accountDetails, showFileUpload, showLoginCheck, currentView, + mySubmittedReps, } = props; let { t, lang } = useTranslation(); + // const mySubmittedReps = myRepresentations.mySubmittedReps; + const router = useRouter(); const { locale } = router; const { appealtypes } = router.query; @@ -459,7 +461,7 @@ const mapStateToProps = (state) => { myCases: state.myCases, watchedCases: state.watchedCases, myRepresentations: state.myRepresentations, - mySubmittedReps: state.mySubmittedReps, + mySubmittedReps: state.myRepresentations.mySubmittedReps, awaitingSubmission: state.awaitingSubmission, }; }; diff --git a/pages/myportal/viewall.js b/pages/myportal/viewall.js index f7003ecf..8b71211a 100644 --- a/pages/myportal/viewall.js +++ b/pages/myportal/viewall.js @@ -57,6 +57,7 @@ const Home = (props) => { awaitingSubmission={props.awaitingSubmission} accountDetails={props.accountDetails} myportal={true} + mySubmittedReps={props.mySubmittedReps} />