- {props.currentView.caseReference.repDetails.filesList.map(
- (blob, i) => (
-
) : (
""
@@ -252,8 +257,8 @@ const RepAgent = (props) => {
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
- props.props.form[props.form].values ||
- {};
+ props.props.props.form[props.form]
+ .values || {};
console.log("valuesobj:", valuesObj);
diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js
index 21d0033a..01655754 100644
--- a/components/case/representation/representationAppellant.js
+++ b/components/case/representation/representationAppellant.js
@@ -30,12 +30,20 @@ const RepAppellant = (props) => {
setRepresentationSubmit,
currentView,
setRepFileName,
+ updateRepresentation,
} = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values);
+ let filterFilesList =
+ props.currentView.caseReference.repDetails.filesList.filter(function (
+ el
+ ) {
+ return el != null;
+ });
+
return (
<>
- 
+ {filterFilesList.map((blob, i) => (
+
+ ))}
+
-
- {blob.name} (
- {bytesToSize(blob.size)}
- )
-
-
- )
- )}
+
+ {blob.name} (
+ {bytesToSize(blob.size)})
+
+
@@ -154,27 +162,25 @@ const RepAppellant = (props) => {
props.currentView.caseReference.repDetails.filesList
.length > 0 ? (
{formObj.representationForm.values
.filesList.length > 0
- ? formObj.representationForm.values.filesList.map(
- (blob, i) => (
-
diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js
index 373282a1..9bdb8383 100644
--- a/components/case/representation/representationInterestedPartyPerson.js
+++ b/components/case/representation/representationInterestedPartyPerson.js
@@ -23,6 +23,7 @@ const RepInterestedPartyPerson = (props) => {
setRepresentationCapacity,
setRepresentationSubmit,
setRepFileName,
+ updateRepresentation,
} = props;
const required = (value) => (value ? undefined : "Required");
@@ -31,6 +32,13 @@ const RepInterestedPartyPerson = (props) => {
setRepFileName(formObj.representationForm.values);
+ let filterFilesList =
+ props.currentView.caseReference.repDetails.filesList.filter(function (
+ el
+ ) {
+ return el != null;
+ });
+
const files = acceptedFiles.map((file) => (
{file.path} - {file.size} bytes
@@ -218,8 +226,8 @@ const RepInterestedPartyPerson = (props) => {
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
- props.props.form[props.form].values ||
- {};
+ props.props.props.form[props.form]
+ .values || {};
console.log("valuesobj:", valuesObj);
diff --git a/components/pdftemplates/statement_pdf.js b/components/pdftemplates/statement_pdf.js
index 15f1d30a..6fcef2f8 100644
--- a/components/pdftemplates/statement_pdf.js
+++ b/components/pdftemplates/statement_pdf.js
@@ -4,7 +4,7 @@ import {
Page,
StyleSheet,
Text,
- View
+ View,
} from "@react-pdf/renderer";
import Html from "react-pdf-html";
import { getFormCollectionByID } from "../../components/utils";
@@ -111,6 +111,9 @@ export const statement_pdf = ({ docProps }) => {
let datestr = values.pinswg_name.split("-");
let signedDate = datestr[2] + "/" + datestr[1] + "/" + datestr[0];
let appealTypeValue = getFormCollectionByID(values.appealType);
+ let filterFilesList = values.filesList.filter(function (el) {
+ return el != null;
+ });
return (
@@ -353,7 +356,7 @@ export const statement_pdf = ({ docProps }) => {
]}
>
{values.hasOwnProperty("filesList") &&
- values.filesList.map(function (p) {
+ filterFilesList.map(function (p) {
return (
{
+ var hashlink = CryptoJS.HmacSHA256(
+ queryPath,
+ CryptoJS.enc.Hex.parse(WORDKEY)
+ );
+ hashlink = hashlink.toString(CryptoJS.enc.Hex);
+
+ //return "&hash=" + hashlink;
+
+ return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+};
+
+export default async function ApiProxy(req, res) {
+ var token = await getToken();
+ var contactid = req.body.contactid;
+ var queryUrl =
+ "incidents(" +
+ req.body.incidentid +
+ ")/pinswg_incident_contact_case_involvement/$ref";
+
+ console.log(req.body, queryUrl);
+
+ var crmUrl = "https://" + process.env.CRMURL;
+
+ var data = {
+ "@odata.id": crmUrl + "/api/data/v8.2/contacts(" + contactid + ")",
+ };
+
+ var config = {
+ method: "post",
+ url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+ headers: {
+ "OData-MaxVersion": "4.0",
+ "OData-Version": "4.0",
+ "Accept": "application/json",
+ "If-None-Match": "null",
+ "Prefer": 'odata.include-annotations="*",return=representation',
+ "Authorization": "Bearer " + token.access_token,
+ "Content-Type": "application/json",
+ },
+ data: data,
+ };
+
+ return axios(config)
+ .then(({ data }) => {
+ res.status(200).json(data);
+ })
+ .catch((error) => {
+ return error.status == 412
+ ? res.status(200).json({ "record": "exists" })
+ : (consoleLogger(Object.assign(error, data)),
+ res.status(400).json(error));
+ });
+}
diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js
index 70503474..432849b8 100644
--- a/pages/myportal/[appealtypes].js
+++ b/pages/myportal/[appealtypes].js
@@ -324,14 +324,13 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setLoggedInUserId(loggedInUser));
store.dispatch(setLoggedInUserEmail(loggedInUserEmail));
-
- store.dispatch(setAccountDetails(accountDetails));
store.dispatch(setAppealLPA(query.lpa));
store.dispatch(setAppealTypeID(query.apt));
store.dispatch(setCaseReference(caseReference));
store.dispatch(setForm(xmlStr, mandatoryFieldsData, pickListData));
store.dispatch(setAppealType(appealTypeData));
store.dispatch(setContainerID(thisSession.user.id));
+ store.dispatch(setAccountDetails(accountDetails));
store.dispatch(setFilesForAppeal(blobList));
@@ -351,6 +350,7 @@ const mapStateToProps = (state) => {
accountDetails: state.accountDetails,
awaitingSubmission: state.awaitingSubmission,
currentView: state.currentView,
+ initialValues: state.appealType.caseReference.caseDetails,
};
};
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index 27720a81..4c5945b0 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -202,7 +202,6 @@ let Home = (props) => {
)}
-
- {props.currentView.caseReference.repDetails.filesList.map(
- (blob, i) => (
-
) : (
""
@@ -230,8 +236,8 @@ const RepAppellant = (props) => {
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
- props.props.form[props.form].values ||
- {};
+ props.props.props.form[props.form]
+ .values || {};
console.log("valuesobj:", valuesObj);
diff --git a/components/case/representation/representationComplete.js b/components/case/representation/representationComplete.js
index 3b5ebef5..0fc273a7 100644
--- a/components/case/representation/representationComplete.js
+++ b/components/case/representation/representationComplete.js
@@ -9,6 +9,7 @@ import {
createWatchedCases,
sendEmail,
sendRepCompleteMessage,
+ setRepInvolvment,
} from "../../../actions";
import { setRepresentationReset } from "../../../store/currentView/action";
@@ -50,7 +51,11 @@ const RepComplete = (props) => {
};
props.props.currentView.representationMessageSent != true &&
- (sendRepCompleteMessage(
+ (setRepInvolvment(
+ props.props.currentView.caseReference.incidentid,
+ props.props.props.props.accountDetails.loggedinUserId
+ ),
+ sendRepCompleteMessage(
props.props.props.props.accountDetails.containerID,
props.props.currentView.caseReference.currentReference,
props.repFormData.repfile_name
diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js
index 07c0b3d4..91c35ffb 100644
--- a/components/case/representation/representationCompleteSubmit.js
+++ b/components/case/representation/representationCompleteSubmit.js
@@ -163,6 +163,10 @@ const RepCompleteSubmit = (props) => {
// ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
// ];
+ buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
+ return el != null;
+ });
+
const arrUniq = buildAppealFilesArray.filter(
(obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
);
@@ -173,6 +177,7 @@ const RepCompleteSubmit = (props) => {
"filesList": arrUniq,
});
+ let filterFiles = [];
return (
<>
{currentView.representationSubmitConfirmation == true ? (
@@ -354,34 +359,34 @@ const RepCompleteSubmit = (props) => {
-
+ {filterFilesList.map((blob, i) => (
+
+ ))}
+
-
- {blob.name} (
- {bytesToSize(blob.size)})
-
-
- )
- )}
+
+ {blob.name} (
+ {bytesToSize(blob.size)})
+
+
-
+ ? ((filterFiles =
+ formObj.representationForm.values.filesList.filter(
+ function (el) {
+ return el != null;
+ }
+ )),
+ filterFiles.map((blob, i) => (
+
+ )))
: ""}{" "}
+
-
- {blob.name} (
- {bytesToSize(
- blob.size
- )}
- )
-
-
- )
- )
+
+ {blob.name} (
+ {bytesToSize(
+ blob.size
+ )}
+ )
+
+