diff --git a/actions/azurestorage.js b/actions/azurestorage.js
index 420a683c..b405ae99 100644
--- a/actions/azurestorage.js
+++ b/actions/azurestorage.js
@@ -361,7 +361,7 @@ export const createRepPDFBlob = async (
const content = formContent;
//console.log(content);
- const blobName = caseID + "/files/" + repName + ".pdf";
+ const blobName = caseID + "/" + repName + "/files/" + repName + ".pdf";
console.log("blobName:", blobName);
const blockBlobClient = containerClient.getBlockBlobClient(blobName);
@@ -378,7 +378,7 @@ export const createRepPDFBlob = async (
const withTags = await blockBlobClient.setTags(tags);
const withMeta = await blockBlobClient.setMetadata(tags);
- return formContent.pinswg_name;
+ return uploadBlobResponse;
};
export const deleteBlob = async (containerName, blobName) => {
diff --git a/components/case/representation/representationComplete.js b/components/case/representation/representationComplete.js
index d2265706..d1dc6abb 100644
--- a/components/case/representation/representationComplete.js
+++ b/components/case/representation/representationComplete.js
@@ -69,10 +69,9 @@ const RepComplete = (props) => {
setRepresentationReset()}
- className="govuk-button">
-
+ className="govuk-button"
+ >
{t("common:continue-button")}
-
diff --git a/pages/api/file/generateappealpdf.js b/pages/api/file/generateappealpdf.js
index 3318019e..47abd0c5 100644
--- a/pages/api/file/generateappealpdf.js
+++ b/pages/api/file/generateappealpdf.js
@@ -196,12 +196,4 @@ export default async function handler(req, res) {
path: `/files/${blobProgress.pinswg_name}.pdf`,
});
});
-
- // return res.status(200).json({
- // data: "success",
- // path: process.cwd() + `/tmp/${blobProgress.pinswg_name}.pdf`,
- // });
- // } else {
- // return res.status(400).json();
- // }
}
diff --git a/pages/api/file/generatepdf.js b/pages/api/file/generatepdf.js
index fa447fa6..b021c8bf 100644
--- a/pages/api/file/generatepdf.js
+++ b/pages/api/file/generatepdf.js
@@ -79,6 +79,7 @@ import {
createRepBlob,
uploadFile,
uploadPDFRepFiles,
+ createRepPDFBlob,
} from "../../../actions/azurestorage";
import { hashAPIPath } from "../../../actions";
@@ -208,16 +209,16 @@ export default async function handler(req, res) {
// code block
}
- console.log(
- "///////////////////////////////////\n file created: \n" +
- process.cwd() +
- `tmp/${reqBodyobj.repfile_name}.pdf` +
- "\n folder:" +
- process.cwd() +
- "\n/////////////////////////"
- );
+ // console.log(
+ // "///////////////////////////////////\n file created: \n" +
+ // process.cwd() +
+ // `tmp/${reqBodyobj.repfile_name}.pdf` +
+ // "\n folder:" +
+ // process.cwd() +
+ // "\n/////////////////////////"
+ // );
- const renderedPDF = await ReactPDF.renderStream(
+ const renderedPDF = await ReactPDF.renderToStream(
);
@@ -226,30 +227,16 @@ export default async function handler(req, res) {
containerID,
caseRef,
reqBodyobj.repfile_name
- );
-
- console.log(
- "///////////////////////////////////\nrep pdf file created: " +
- `/files/${reqBodyobj.repfile_name}.pdf`,
- "\n/////////////////////////"
- );
-
- // upload file to storage account
- // uploadPDFRepFiles(
- // process.cwd() + `/tmp/${reqBodyobj.repfile_name}.pdf`,
- // containerID,
- // caseRef + "/" + reqBodyobj.repfile_name,
- // repType
- // );
-
- // remove from local folder
- //fs.unlinkSync(process.cwd() + `/tmp/${reqBodyobj.repfile_name}.pdf`);
-
- return res.status(200).json({
- data: "success",
- path: `${reqBodyobj.repfile_name}.pdf`,
+ ).then((data) => {
+ console.log(
+ "///////////////////////////////////\nrep pdf file created: " +
+ `${caseRef}/files/${reqBodyobj.repfile_name}.pdf`,
+ "\n/////////////////////////"
+ );
+ return res.status(200).json({
+ status: "success",
+ data: data,
+ path: `${caseRef}/${reqBodyobj.repfile_name}/files/${reqBodyobj.repfile_name}.pdf`,
+ });
});
- // } else {
- // return res.status(400).json();
- // }
}