Merged PR 2209: sprint 16 bug fixes

Related work items: #22079, #22151, #22304

actions/azurestorage.js

@@ -1298,7 +1298,7 @@ export const getProgressBlobs = async (containerName, caseReference) => {
         const appealBlobName = blobPathParts[1];
         const contentLength = blob.properties.contentLength;
 
-        consoleLogger("getProgressBlobs in here", blobPathParts);
+        //consoleLogger("getProgressBlobs in here", blobPathParts);
         blobObj.push({
             "name": appealBlobName,
             "path": blob.name,
@@ -1480,7 +1480,7 @@ export const getRepsFilesBlobs = async (
         const repFileName = blobPathParts[3];
         const contentLength = blob.properties.contentLength;
 
-        consoleLogger(blob.name);
+        //consoleLogger(blob.name);
 
         blobObj.push({
             "name": repFileName,
@@ -1509,7 +1509,7 @@ export const getRepsFilesBlobs = async (
             })
         });
     }
-    consoleLogger("blobObj:", blobObj);
+    //consoleLogger("blobObj:", blobObj);
 
     return blobObj;
 };

actions/services/documentDirectService.js

@@ -124,9 +124,7 @@ export const uploadFiles = async (
     var queryUrl = "/api/file/upload";
 
     try {
-        return await postSignedFileJson(queryUrl, formData, {
-            headers: { "content-type": "multipart/form-data" }
-        });
+        return await postSignedFileJson(queryUrl, formData);
     } catch (error) {
         consoleLogger(error);
     }
@@ -146,9 +144,7 @@ export const uploadSingleFile = async (filesObj, containerID, casefolderID) => {
     var queryUrl = "/api/file/uploadsinglefile";
 
     try {
-        return await postSignedFileJson(queryUrl, formData, {
-            headers: { "content-type": "multipart/form-data" }
-        });
+        return await postSignedFileJson(queryUrl, formData);
     } catch (error) {
         consoleLogger(error);
     }
@@ -169,9 +165,7 @@ export const uploadRepFiles = async (
     var queryUrl = "/api/file/upload";
 
     try {
-        return await postSignedFileJson(queryUrl, formData, {
-            headers: { "content-type": "multipart/form-data" }
-        });
+        return await postSignedFileJson(queryUrl, formData);
     } catch (error) {
         consoleLogger(error);
     }

components/case/representation/representationInterestedPartyPerson.js

@@ -10,14 +10,14 @@ import {
     RenderCondtionalRadioList,
     RenderPickList,
     RenderRichMultiline,
-    shouldDisableButton,
+    shouldDisableButton
 } from "./representationElements";
 
 import { useDropzone } from "react-dropzone";
 import {
     setRepresentationCapacity,
     setRepresentationSubmit,
-    setFilesForRepresentations,
+    setFilesForRepresentations
 } from "../../../store/currentView/action";
 
 const RepInterestedPartyPerson = (props) => {
@@ -34,7 +34,7 @@ const RepInterestedPartyPerson = (props) => {
         updateRepresentation,
         setSavingStatus,
         savingStatus,
-        setFilesForRepresentations,
+        setFilesForRepresentations
     } = props;
     const required = (value) => (value ? undefined : "Required");
 
@@ -104,14 +104,15 @@ const RepInterestedPartyPerson = (props) => {
                                           .representationType == "Questionnaire"
                                         ? "Holiadur"
                                         : formObj.representationForm.values
-                                              .representationType == "Statement"
-                                        ? "Datganiad"
-                                        : formObj.representationForm.values
-                                              .representationType ==
-                                          "Final comments"
-                                        ? "Sylwadau terfynol"
-                                        : formObj.representationForm.values
-                                              .representationType
+                                                .representationType ==
+                                            "Statement"
+                                          ? "Datganiad"
+                                          : formObj.representationForm.values
+                                                  .representationType ==
+                                              "Final comments"
+                                            ? "Sylwadau terfynol"
+                                            : formObj.representationForm.values
+                                                  .representationType
                                     : formObj.representationForm.values
                                           .representationType}
                             </label>
@@ -132,7 +133,7 @@ const RepInterestedPartyPerson = (props) => {
                                         t(
                                             "myrepresentations:questionnaire-yes"
                                         ),
-                                        t("myrepresentations:questionnaire-no"),
+                                        t("myrepresentations:questionnaire-no")
                                     ]}
                                     id="representationOnBehalfOf"
                                     className="govuk-radios__input"
@@ -242,7 +243,7 @@ const RepInterestedPartyPerson = (props) => {
                                 data-module="govuk-button"
                                 disabled={shouldDisableButton({
                                     props,
-                                    formObj,
+                                    formObj
                                 })}
                             >
                                 {t("common:continue-button")}
@@ -303,7 +304,7 @@ const RepInterestedPartyPerson = (props) => {
                                         );
                                     }}
                                 >
-                                    {t("common:save-exit-button")}
+                                    {t("common:save-exit-button")}sssss
                                 </button>
                             )}
                         </div>
@@ -321,7 +322,7 @@ const mapDispatchToProps = (dispatch) => ({
         dispatch(change(form, field, newValue)),
     setFilesForRepresentations: (fileList) => {
         dispatch(setFilesForRepresentations(fileList));
-    },
+    }
 });
 
 export default connect(
@@ -331,6 +332,6 @@ export default connect(
     reduxForm({
         form: "representationForm",
         enableReinitialize: true,
-        destroyOnUnmount: false,
+        destroyOnUnmount: false
     })(RepInterestedPartyPerson)
 );

components/newappeal/buildfield.js

@@ -13,7 +13,7 @@ import {
     ReadOnlyfield,
     RichMultiLinefield,
     Textfield,
-    YesNofield,
+    YesNofield
 } from "../elements";
 
 export default function BuildField(props) {
@@ -42,19 +42,24 @@ export default function BuildField(props) {
         setDocumentsList,
         documentList,
         maxSubField,
-        datafieldcontent,
+        datafieldcontent
     } = props;
 
     // Extract deeply nested props for convenience (avoid props.props.props all over)
     // Defensive checks in case nested props don't exist
-    const appealType = props?.props?.props?.appealType || {};
-    const form = props?.props?.props?.form || {};
-    const formProps = props?.props?.props?.props?.form || {};
-    const setFilesForAppeal = props?.props?.props?.setFilesForAppeal;
-    const accountDetails = props?.props?.props?.props?.accountDetails || {};
+    const sectionProps = props?.props?.props || {};
+    const pageProps = sectionProps?.props || {};
+
+    const appealType = sectionProps.appealType || {};
+    const form = sectionProps.form || {};
+    const formProps = pageProps.form || sectionProps.form || {};
+    const setFilesForAppeal = sectionProps.setFilesForAppeal;
+    const accountDetails =
+        sectionProps.accountDetails || pageProps.accountDetails || {};
     const ticketnumber = appealType.caseReference?.ticketnumber || "";
     const fileList = appealType.fileList || {};
-    const containerID = accountDetails.containerID || "";
+    const containerID =
+        accountDetails.containerID || sectionProps.containerID || "";
 
     // Mapping fieldType to components
     const fieldTypeMap = {
@@ -230,7 +235,7 @@ export default function BuildField(props) {
                 parentFieldShowOnValue={parentFieldShowOnValue}
                 validation={validation}
             />
-        ),
+        )
     };
 
     return (

components/search/dnssearchresults.js

@@ -886,6 +886,7 @@ const DNSSearchResults = (props) => {
             setSearchLoaded(true);
         }
     }, [
+        locale,
         selectedOption,
         fieldSortState,
         orderByState,

locales/cy/myportal.json

@@ -3,8 +3,8 @@
     "viewall-link-count": "Gweld pob un o'r {{count}} o achosion",
     "page-title": "Fy Mhorth",
     "lpa-portal-heading": "Porth LPA",
-    "makenewappeal-card-title": "A gafodd cais cynllunio ei wrthod?",
-    "makenewappeal-card-paragraph-zero": "Os yw eich cais cynllunio wedi cael ei wrthod gan eich Awdurdod Cynllunio Lleol, gallwch gyflwyno apêl yn erbyn eu penderfyniad.",
+    "makenewappeal-card-title": "A gafodd cais cynllunio ei wrthod neu heb ei benderfynu?",
+    "makenewappeal-card-paragraph-zero": "Os yw eich cais cynllunio wedi cael ei wrthod neu heb ei benderfynu gan eich Awdurdod Cynllunio Lleol, gallwch gyflwyno apêl yn erbyn eu penderfyniad.",
     "makenewappeal-card-paragraph-one": "Cyn cyflwyno apêl newydd, gwnewch yn siŵr eich bod wedi darllen yr holl",
     "makenewappeal-card-link": "sy'n berthnasol i'r math o apêl sydd gennych.",
     "makenewappeal-card-paragraph-two": "Unwaith y byddwch wedi dewis y botwm 'Gwneud apêl newydd', cewch eich arwain trwy broses i'ch helpu i ddewis yr apêl gywir.",

locales/en/myportal.json

@@ -3,8 +3,8 @@
     "viewall-link-count": "View all {{count}} cases",
     "page-title": "My Portal",
     "lpa-portal-heading": "LPA Portal",
-    "makenewappeal-card-title": "Had a planning application refused?",
-    "makenewappeal-card-paragraph-zero": "If you have had a planning application turned down by your Local Planning Authority, you can submit an appeal against their decision.",
+    "makenewappeal-card-title": "Had a planning application refused or not determined?",
+    "makenewappeal-card-paragraph-zero": "If you have had a planning application turned down or not determined by your Local Planning Authority, you can submit an appeal against their decision.",
     "makenewappeal-card-paragraph-one": "Before submitting a new appeal, please ensure you have read all of the",
     "makenewappeal-card-link": "relevant to your appeal type.",
     "makenewappeal-card-paragraph-two": "Once you have selected the 'Make a new appeal' button, you will be guided through a process to help you choose the right type of appeal.",