diff --git a/actions/azurestorage.js b/actions/azurestorage.js
index b9280e4d..cbd8f4eb 100644
--- a/actions/azurestorage.js
+++ b/actions/azurestorage.js
@@ -309,7 +309,7 @@ export const createRepBlob = async (formContent, containerName, caseref) => {
const tags = {
containerid: containerName,
- caseID: formContent.ticketnumber,
+ caseID: formContent.ticketnumber || formContent.caseRef,
blobType: "Representation",
};
diff --git a/components/case/representation/representationCapacitySelection.js b/components/case/representation/representationCapacitySelection.js
index a349bdd0..94da3aa0 100644
--- a/components/case/representation/representationCapacitySelection.js
+++ b/components/case/representation/representationCapacitySelection.js
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { useDropzone } from "react-dropzone";
import { Field } from "redux-form";
import RepDetails from "./representationDetails";
-import { RenderRadioListWithText } from "./representationElements";
+import { RenderRadioList } from "./representationElements";
let RepCapacitySelection = (props) => {
let { t } = useTranslation();
@@ -72,7 +72,7 @@ let RepCapacitySelection = (props) => {
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
- component={RenderRadioListWithText}
+ component={RenderRadioList}
validate={[required]}
/>
diff --git a/components/pdftemplates/finalComments_pdf.js b/components/pdftemplates/finalComments_pdf.js
index 92578cc3..6bd138f5 100644
--- a/components/pdftemplates/finalComments_pdf.js
+++ b/components/pdftemplates/finalComments_pdf.js
@@ -242,29 +242,6 @@ export const finalComments_pdf = ({ docProps }) => {
{values.representationCapacity}
-
- 3.
-
- {getTrans(
- docProps.locale,
- "statement-representation-capacity-details-label"
- )}
- :
-
-
-
- {CleanHTML(
- values.conditional_representationCapacity_Comments
- ) || "N/A"}
-
-
-
{
marginBottom: 10,
}}
>
- 4.
+ 3.
{getTrans(
docProps.locale,
@@ -297,7 +274,7 @@ export const finalComments_pdf = ({ docProps }) => {
marginBottom: 10,
}}
>
- 5.
+ 4.
{getTrans(
docProps.locale,
diff --git a/components/pdftemplates/statement_pdf.js b/components/pdftemplates/statement_pdf.js
index 75b21724..221c0a21 100644
--- a/components/pdftemplates/statement_pdf.js
+++ b/components/pdftemplates/statement_pdf.js
@@ -242,29 +242,6 @@ export const statement_pdf = ({ docProps }) => {
{values.representationCapacity}
-
- 3.
-
- {getTrans(
- docProps.locale,
- "statement-representation-capacity-details-label"
- )}
- :
-
-
-
- {CleanHTML(
- values.conditional_representationCapacity_Comments
- ) || "N/A"}
-
-
-
{
marginBottom: 10,
}}
>
- 4.
+ 3.
{getTrans(
docProps.locale,
@@ -297,7 +274,7 @@ export const statement_pdf = ({ docProps }) => {
marginBottom: 10,
}}
>
- 5.
+ 4.
{getTrans(
docProps.locale,
diff --git a/pages/api/file/downloadblob.js b/pages/api/file/downloadblob.js
index 9e43fdb7..4b8d6cb0 100644
--- a/pages/api/file/downloadblob.js
+++ b/pages/api/file/downloadblob.js
@@ -20,9 +20,9 @@ ApiProxy.get(async (req, res) => {
"/api/file/downloadblob?container=" +
containerName +
"&casefolderID=" +
- encodeURIComponent(casefolderID) +
+ casefolderID +
"&blobname=" +
- encodeURIComponent(blobName.trim());
+ blobName.trim();
if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) {
const bloblocation =
diff --git a/pages/myportal/representation.js b/pages/myportal/representation.js
index f8b3a726..f48fbcea 100644
--- a/pages/myportal/representation.js
+++ b/pages/myportal/representation.js
@@ -381,15 +381,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setAccountDetails(accountDetails));
- // return {
- // props: {
- // searchResultsObj: {
- // searchResultsObj: searchResultsObj,
- // searchDetailsObj: searchDetailsObj,
- // },
- // containerID: thisSession.user.id,
- // },
- // };
+ return {
+ props: {
+ containerID: thisSession.user.id,
+ docsOffline: process.env.DOCAPI_OFFLINE || false,
+ },
+ };
}
}
);