10489 submission fix
This commit is contained in:
+9
-9
@@ -13,11 +13,11 @@ RELAYPATH = "dev-pedw-hc"
|
||||
|
||||
|
||||
//Test Oauth ESNR
|
||||
//CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
|
||||
//CLIENT_SECRET = IXI8Q~D5oqsC-nrtayHHc~tUAfjQFzNiKVQ~fc2S
|
||||
//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
|
||||
//RELAYURI = "test-pedw-ns.servicebus.windows.net"
|
||||
//RELAYPATH = "test-pedw-hc"
|
||||
CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
|
||||
CLIENT_SECRET = IXI8Q~D5oqsC-nrtayHHc~tUAfjQFzNiKVQ~fc2S
|
||||
RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
|
||||
RELAYURI = "test-pedw-ns.servicebus.windows.net"
|
||||
RELAYPATH = "test-pedw-hc"
|
||||
|
||||
|
||||
//Preprod Oauth WGO
|
||||
@@ -63,12 +63,12 @@ SECRET = SuperSecret
|
||||
AZURE_CLIENT_ID = $CLIENT_ID
|
||||
AZURE_TENANT_ID = $TENANT
|
||||
AZURE_CLIENT_SECRET = $CLIENT_SECRET
|
||||
AZURE_STORAGE_ACCOUNT_NAME= "pedwdev"
|
||||
//AZURE_STORAGE_ACCOUNT_NAME= "pedwtest"
|
||||
//AZURE_STORAGE_ACCOUNT_NAME= "pedwdev"
|
||||
AZURE_STORAGE_ACCOUNT_NAME= "pedwtest"
|
||||
AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg==
|
||||
|
||||
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
|
||||
//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
|
||||
//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
|
||||
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
|
||||
AZURE_PEDW_CONTAINER = "pedwapplications"
|
||||
AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net
|
||||
|
||||
|
||||
+1
-1
@@ -1399,7 +1399,7 @@ export const generateAppealPDF = async (
|
||||
//formValues.append("filesList", fileList);
|
||||
|
||||
Object.assign(formValues, {
|
||||
"filesList": fileList.hasOwnProperty("value") ? fileList.value : [],
|
||||
"filesList": fileList,
|
||||
});
|
||||
|
||||
var queryUrl = "/api/file/generateappealpdf?appealType=" + appealType;
|
||||
|
||||
@@ -49,11 +49,6 @@ const RenderTextfield = ({
|
||||
id={id}
|
||||
type={type}
|
||||
disabled={disabled ? true : false}
|
||||
maxLength={
|
||||
custom.hasOwnProperty("maxFieldLength")
|
||||
? custom.maxFieldLength
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
|
||||
@@ -63,7 +63,7 @@ let BuildCheckRow = (props) => {
|
||||
const { locale } = router;
|
||||
const { appealtypes } = router.query;
|
||||
|
||||
let formObj = jsonpath(fieldLookup, "$['" + appealtypes + "']");
|
||||
let formObj = jsonpath("$['" + appealtypes + "']", fieldLookup);
|
||||
|
||||
let labelTrans =
|
||||
router.locale == "cy"
|
||||
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
getThumbnailIconByExtension,
|
||||
bytesToSize,
|
||||
} from "../utils";
|
||||
import { generateAppealPDF } from "../../actions";
|
||||
|
||||
let BuildCheckSection = (props) => {
|
||||
useEffect(() => {
|
||||
@@ -70,6 +71,38 @@ let BuildCheckSection = (props) => {
|
||||
alert(1);
|
||||
};
|
||||
|
||||
let buildAppealFilesArray = [];
|
||||
console.log("attached docs: - ", buildAppealFilesArray);
|
||||
|
||||
let filesUplaodObj = Object.keys(props.props.form.appealForm.values)
|
||||
.filter(function (k) {
|
||||
return k.indexOf("pinswg_fileUpload") == 0;
|
||||
})
|
||||
.reduce(function (newData, k) {
|
||||
newData[k] = props.props.form.appealForm.values[k];
|
||||
return newData;
|
||||
}, {});
|
||||
|
||||
console.log(filesUplaodObj);
|
||||
|
||||
for (let key in filesUplaodObj) {
|
||||
for (let j in filesUplaodObj[key]) {
|
||||
buildAppealFilesArray.push({
|
||||
"name": filesUplaodObj[key][j].name,
|
||||
"size": filesUplaodObj[key][j].size,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.log(buildAppealFilesArray);
|
||||
|
||||
let pdfObj = props.props.form.appealForm.values;
|
||||
|
||||
Object.assign(pdfObj, {
|
||||
"containerID": props.props.accountDetails.containerID,
|
||||
"casefolderID": props.appealType.caseReference.ticketnumber,
|
||||
});
|
||||
|
||||
return (
|
||||
<div className="govuk-grid-row" key={1222}>
|
||||
<div className="govuk-grid-column-full">
|
||||
@@ -98,41 +131,30 @@ let BuildCheckSection = (props) => {
|
||||
<dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list">
|
||||
<div className="govuk-summary-list__row" key={"9999"}>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{props.props.appealType.fileList.value.length >
|
||||
0
|
||||
? props.props.appealType.fileList.value.map(
|
||||
(blob, i) => (
|
||||
<div
|
||||
key={blob.name + "_" + i}
|
||||
className="govuk-!-margin-bottom-5 fileThumb "
|
||||
>
|
||||
<img
|
||||
src={getThumbnailIconByExtension(
|
||||
blob[i].name
|
||||
)}
|
||||
alt={blob[i].name.slice(
|
||||
blob[i].name.indexOf(
|
||||
"_"
|
||||
) + 1
|
||||
)}
|
||||
width="50"
|
||||
/>
|
||||
{buildAppealFilesArray.length > 0
|
||||
? buildAppealFilesArray.map((blob, i) => (
|
||||
<div
|
||||
key={blob.name + "_" + i}
|
||||
className="govuk-!-margin-bottom-5 fileThumb "
|
||||
>
|
||||
<img
|
||||
src={getThumbnailIconByExtension(
|
||||
blob.name
|
||||
)}
|
||||
alt={blob.name.slice(
|
||||
blob.name.indexOf("_") + 1
|
||||
)}
|
||||
width="50"
|
||||
/>
|
||||
|
||||
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
|
||||
{blob[i].name.slice(
|
||||
blob[i].name.indexOf(
|
||||
"_"
|
||||
) + 1
|
||||
)}
|
||||
(
|
||||
{bytesToSize(
|
||||
blob[i].contentLength
|
||||
)}
|
||||
)
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
)
|
||||
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
|
||||
{blob.name.slice(
|
||||
blob.name.indexOf("_") + 1
|
||||
)}
|
||||
({bytesToSize(blob?.size)})
|
||||
</span>
|
||||
</div>
|
||||
))
|
||||
: ""}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -153,7 +175,16 @@ let BuildCheckSection = (props) => {
|
||||
<a
|
||||
className="govuk-button"
|
||||
data-module="govuk-button"
|
||||
onClick={() => setCurrentSection(9999)}
|
||||
onClick={() => {
|
||||
setCurrentSection(9999),
|
||||
generateAppealPDF(
|
||||
pdfObj,
|
||||
props.props.accountDetails.containerID,
|
||||
props.appealType.caseReference.ticketnumber,
|
||||
router.query.appealtypes,
|
||||
props.appealType.fileList
|
||||
);
|
||||
}}
|
||||
>
|
||||
{t("newappeal:submit-appeal-button")}
|
||||
</a>
|
||||
|
||||
@@ -115,9 +115,9 @@ let BuildSection = (props) => {
|
||||
|
||||
var dataObj = values;
|
||||
|
||||
for (let key in dataObj) {
|
||||
_.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
|
||||
}
|
||||
// for (let key in dataObj) {
|
||||
// _.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
|
||||
// }
|
||||
|
||||
uploadFiles(
|
||||
dataObj,
|
||||
@@ -177,23 +177,9 @@ let BuildSection = (props) => {
|
||||
"\n////////////////////////\n"
|
||||
);
|
||||
|
||||
let pdfObj = values;
|
||||
|
||||
Object.assign(pdfObj, {
|
||||
"containerID": props.props.accountDetails.containerID,
|
||||
"casefolderID": props.appealType.caseReference.ticketnumber,
|
||||
});
|
||||
|
||||
generateAppealPDF(
|
||||
pdfObj,
|
||||
props.props.accountDetails.containerID,
|
||||
props.appealType.caseReference.ticketnumber,
|
||||
router.query.appealtypes,
|
||||
props.appealType.fileList
|
||||
),
|
||||
props.setNewAppealProgress(
|
||||
getProgressObj(formXML, titleList, mandatoryFieldsData, props)
|
||||
);
|
||||
props.setNewAppealProgress(
|
||||
getProgressObj(formXML, titleList, mandatoryFieldsData, props)
|
||||
);
|
||||
|
||||
let appTypeCollection = getFormCollectionByID(
|
||||
props.appealType.appealTypeID
|
||||
@@ -270,6 +256,31 @@ let BuildSection = (props) => {
|
||||
const onHandleSubmit = (values) => {
|
||||
//if (currentSection == sectionCount) {
|
||||
let valuesObj = values || {};
|
||||
let buildAppealFilesArray = [];
|
||||
let filesUplaodObj = Object.keys(values)
|
||||
.filter(function (k) {
|
||||
return k.indexOf("pinswg_fileUpload") == 0;
|
||||
})
|
||||
.reduce(function (newData, k) {
|
||||
newData[k] = values[k];
|
||||
return newData;
|
||||
}, {});
|
||||
|
||||
console.log(filesUplaodObj);
|
||||
|
||||
for (let key in filesUplaodObj) {
|
||||
for (let j in filesUplaodObj[key]) {
|
||||
buildAppealFilesArray.push({
|
||||
"name": filesUplaodObj[key][j].name,
|
||||
"size": filesUplaodObj[key][j].size,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.log(buildAppealFilesArray);
|
||||
setFilesForAppeal(buildAppealFilesArray);
|
||||
|
||||
// Object.assign(values, { "filesList": buildAppealFilesArray });
|
||||
|
||||
delete valuesObj["_pinswg_appellant_value"];
|
||||
console.log("has errors:", props.invalid);
|
||||
|
||||
+2
-2
@@ -71,7 +71,7 @@
|
||||
"react-quill": "^2.0.0",
|
||||
"react-redux": "^7.2.6",
|
||||
"redux": "^4.2.1",
|
||||
"redux-form": "^8.3.9",
|
||||
"redux-form": "^8.3.10",
|
||||
"redux-persist": "^6.0.0",
|
||||
"redux-thunk": "^2.4.2",
|
||||
"sass": "1.69",
|
||||
@@ -90,4 +90,4 @@
|
||||
"next-translate-plugin": "^2.6.2",
|
||||
"prisma": "^5.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ const appealTypeDataInitialState = {
|
||||
caseReference: {},
|
||||
formComplete: "false",
|
||||
documentList: {},
|
||||
fileList: {},
|
||||
fileList: [],
|
||||
progress: [],
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user