lpa dashboard tweaks

components/myportal.js

@@ -104,7 +104,7 @@ const MyPortal = (props) => {
                         </div>
                     </div>
                 </div>
-                {isLPA == true ? (
+                {isLPA && (
                     <div>
                         <h2 className="heading-small card-heading">
                             {
@@ -115,13 +115,11 @@ const MyPortal = (props) => {
                             LPA Portal
                         </h2>
                     </div>
-                ) : (
-                    ""
                 )}
                 <div className="govuk-grid-row">
                     <div className="govuk-grid-column-full">
                         <div className="flex-container grid-row govuk-body ">
-                            {isLPA ? "" : <MakeNewAppeal />}
+                            {!isLPA && <MakeNewAppeal />}
                             <SearchCases />
                             {/* {props.awaitingSubmission.awaitingSubmission[
                                 "@odata.count"
@@ -147,12 +145,16 @@ const MyPortal = (props) => {
                                       />
                                   )}
                             {props.myCases.myCases["@odata.count"] > 0 && (
-                                <MyCases myCases={props.myCases} />
+                                <MyCases
+                                    myCases={props.myCases}
+                                    isLPA={isLPA}
+                                />
                             )}
                             {props.watchedCases.watchedCases["@odata.count"] >
                                 0 && (
                                 <WatchedCases
                                     watchedCases={props.watchedCases}
+                                    isLPA={isLPA}
                                 />
                             )}
                             {props.myRepresentations.myRepresentations[
@@ -160,12 +162,12 @@ const MyPortal = (props) => {
                             ] > 0 && (
                                 <MyRepresentations
                                     myRepresentations={props.myRepresentations}
+                                    isLPA={isLPA}
                                 />
                             )}
-                            {isLPA ? "" : <Dns />}
+                            {!isLPA && <Dns />}
 
                             {/* <YourAccount /> */}
-                            {showFileUpload == "true" && <UploadFile />}
                         </div>
                     </div>
                 </div>

components/myportal/mycases.js

@@ -44,7 +44,10 @@ const MyCases = (props) => {
                                     });
                                 }}
                             >
-                                {t("myportal:viewall-link")}
+                                {t("myportal:viewall-link")}{" "}
+                                {props.isLPA &&
+                                    props.myCases.myCases["@odata.count"] +
+                                        " appeals"}
                             </a>
                         </Link>
                     </div>

pages/api/endpoint/getmylpacases_api.js

@@ -19,7 +19,12 @@
 
 import axios from "axios";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeaders, consoleLogger } from "../../../actions";
+import {
+    getToken,
+    azureHeaders,
+    consoleLogger,
+    getLPA,
+} from "../../../actions";
 import jsonpath from "jsonpath";
 
 const WORDKEY = process.env.HASHKEY;
@@ -43,7 +48,7 @@ export default async function ApiProxy(req, res) {
 
     const lpaList = await getLPA();
 
-    const lpaGUID = jsonpath.query(lpaList, '$..[?(@.name="' + lpaid + '")]');
+    const lpaGUID = jsonpath.query(lpaList, '$..[?(@.name=="' + lpaid + '")]');
 
     console.log(
         '$..[?(@.name="' + lpaid + '")]',

pages/myportal/index.js

@@ -192,7 +192,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         const lpaid =
             accountDetails[
-                "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
+                "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
             ];
 
         const [
@@ -202,7 +202,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
             awaitingSubmission,
             awaitingSubmissionFromBlob,
         ] = await Promise.all([
-            accountDetails.pinswg_typeofinvolvment == 846040012
+            accountDetails.pinswg_typeofinvolvement == 846040012
                 ? await getMyLPACases(lpaid)
                 : await getMyCases(loggedInUser),