10486 double click on dropdown

components/newappeal/createCase.js

@@ -17,46 +17,17 @@ import Aboutyou from "./aboutyou";
 import { createNewCase, createNewCaseBlob, consoleLogger } from "../../actions";
 import { FieldsTranslations } from "../elements";
 
-let CreateCase = (props) => {
+const RenderLPAList = ({
-    // useEffect(() => {
-    //     window.scrollTo(0, 0);
-    // });
-
-    let { t } = useTranslation();
-
-    const router = useRouter();
-    const { locale } = router;
-
-    const { LPAData, onSubmit, handleSubmit, formData } = props;
-
-    const appealOptionsObj = _.isEmpty(props)
-        ? [{}]
-        : _.isEmpty(props.appealType)
-        ? [{}]
-        : _.isEmpty(props.appealType.appealTypeOptions)
-        ? [{}]
-        : _.isEmpty(props.appealType.appealTypeOptions.value)
-        ? [{}]
-        : props.appealType.appealTypeOptions.value;
-
-    let lpaOptionsObj = _.isEmpty(props)
-        ? [{}]
-        : _.isEmpty(props.LPAData)
-        ? [{}]
-        : _.isEmpty(props.LPAData.LPAData)
-        ? [{}]
-        : _.isEmpty(props.LPAData.LPAData)
-        ? [{}]
-        : props.LPAData.LPAData.value;
-
-    const RenderLPAList = ({
     name,
     input,
     optionsObj,
     meta: { touched, error },
     label,
     errorMsg,
-    }) => {
+}) => {
+    let { t } = useTranslation();
+    const router = useRouter();
+
     return (
         <>
             <div
@@ -71,13 +42,8 @@ let CreateCase = (props) => {
                     {label}
                 </label>
                 {touched && error && (
-                        <span
+                    <span id={name + "-error"} className="govuk-error-message">
-                            id={name + "-error"}
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
-                            className="govuk-error-message"
-                        >
-                            <span className="govuk-visually-hidden">
-                                Error:
-                            </span>{" "}
                         {errorMsg}
                     </span>
                 )}
@@ -103,8 +69,7 @@ let CreateCase = (props) => {
                                           {router.locale == "cy"
                                               ? jsonpath(
                                                     '$..[?(@.value=="' +
-                                                            optionsObj[key]
+                                                        optionsObj[key].name +
-                                                                .name +
                                                         '")].value_cy',
                                                     transLookup
                                                 )
@@ -117,16 +82,18 @@ let CreateCase = (props) => {
             </div>
         </>
     );
-    };
+};
 
-    const RenderAppealTypeList = ({
+const RenderAppealTypeList = ({
     name,
     input,
     optionsObj,
     meta: { touched, error },
     label,
     errorMsg,
-    }) => {
+}) => {
+    let { t } = useTranslation();
+    const router = useRouter();
     return (
         <>
             <div
@@ -140,13 +107,8 @@ let CreateCase = (props) => {
                     {label}
                 </label>
                 {touched && error && (
-                        <span
+                    <span id={name + "-error"} className="govuk-error-message">
-                            id={name + "-error"}
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
-                            className="govuk-error-message"
-                        >
-                            <span className="govuk-visually-hidden">
-                                Error:
-                            </span>{" "}
                         {errorMsg}
                     </span>
                 )}
@@ -170,13 +132,10 @@ let CreateCase = (props) => {
                                           value={
                                               _.isEmpty(optionsObj[key])
                                                   ? ""
-                                                      : _.isEmpty(
+                                                  : _.isEmpty(optionsObj[key])
-                                                            optionsObj[key]
-                                                        )
                                                   ? ""
                                                   : _.isEmpty(
-                                                            optionsObj[key]
+                                                        optionsObj[key].value
-                                                                .value
                                                     )
                                                   ? ""
                                                   : optionsObj[key]
@@ -187,15 +146,12 @@ let CreateCase = (props) => {
                                               ? ""
                                               : _.isEmpty(optionsObj[key])
                                               ? ""
-                                                  : _.isEmpty(
+                                              : _.isEmpty(optionsObj[key].value)
-                                                        optionsObj[key].value
-                                                    )
                                               ? ""
                                               : router.locale == "cy"
                                               ? jsonpath(
                                                     '$..[?(@.value=="' +
-                                                            optionsObj[key]
+                                                        optionsObj[key].value +
-                                                                .value +
                                                         '")].value_cy',
                                                     transLookup
                                                 )
@@ -208,9 +164,9 @@ let CreateCase = (props) => {
             </div>
         </>
     );
-    };
+};
 
-    const RenderRadio = ({
+const RenderRadio = ({
     datafieldname,
     name,
     label,
@@ -220,7 +176,7 @@ let CreateCase = (props) => {
     input: { onChange, value },
     meta: { touched, error },
     ...custom
-    }) => {
+}) => {
     let { t } = useTranslation();
     const required = (value) => (value ? undefined : "Required");
     return (
@@ -286,15 +242,13 @@ let CreateCase = (props) => {
                                     //     parseInt(options[key].split("|")[0])
                                     // }
                                     onChange={(e) => {
-                                            let docListObj =
+                                        let docListObj = custom.documentList;
-                                                custom.documentList;
                                         if (
                                             custom.requiredDocumentValue ==
                                             "Yes"
                                         ) {
                                             e.target.value != "846040000"
-                                                    ? (docListObj =
+                                                ? (docListObj = Object.assign(
-                                                          Object.assign(
                                                       docListObj,
                                                       {
                                                           ["documentCheckList_" +
@@ -303,12 +257,9 @@ let CreateCase = (props) => {
                                                       }
                                                   ))
                                                 : delete docListObj[
-                                                          "documentCheckList_" +
+                                                      "documentCheckList_" + id
-                                                              id
                                                   ];
-                                                custom.setDocumentsList(
+                                            custom.setDocumentsList(docListObj);
-                                                    docListObj
-                                                );
                                         }
                                     }}
                                 />
@@ -325,9 +276,9 @@ let CreateCase = (props) => {
             </div>
         </>
     );
-    };
+};
 
-    function Radiofield(props) {
+function Radiofield(props) {
     const {
         name,
         label,
@@ -409,7 +360,39 @@ let CreateCase = (props) => {
             )}
         </>
     );
-    }
+}
+
+let CreateCase = (props) => {
+    // useEffect(() => {
+    //     window.scrollTo(0, 0);
+    // });
+
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+
+    const { LPAData, onSubmit, handleSubmit, formData } = props;
+
+    const appealOptionsObj = _.isEmpty(props)
+        ? [{}]
+        : _.isEmpty(props.appealType)
+        ? [{}]
+        : _.isEmpty(props.appealType.appealTypeOptions)
+        ? [{}]
+        : _.isEmpty(props.appealType.appealTypeOptions.value)
+        ? [{}]
+        : props.appealType.appealTypeOptions.value;
+
+    let lpaOptionsObj = _.isEmpty(props)
+        ? [{}]
+        : _.isEmpty(props.LPAData)
+        ? [{}]
+        : _.isEmpty(props.LPAData.LPAData)
+        ? [{}]
+        : _.isEmpty(props.LPAData.LPAData)
+        ? [{}]
+        : props.LPAData.LPAData.value;
 
     const required = (value) => (value ? undefined : "Required");