Merge from git

components/newappeal/buildsection.js

@@ -32,19 +32,21 @@ let BuildSection = (props) => {
         setCurrentSection,
         refno,
         gotoSection,
+        mandatoryFieldsData,
     } = props;
 
     const currentSection = props.appealType.currentSection;
     const parser = new DOMParser();
     var doc = parser.parseFromString(props.formXML, "text/xml");
-    var titles = xpath.select(
-        "//form/tabs/tab[" + currentSection + " ]/labels/label/@description",
-        doc
-    );
+    // var titles = xpath.select(
+    //     "//form/tabs/tab[" + currentSection + " ]/labels/label/@description",
+    //     doc
+    // );
     var rowXML = xpath.select(
-        "/form/tabs/tab[" +
-            currentSection +
-            "]/columns//sections/section/rows/row",
+        // "/form/tabs/tab[" +
+        //     currentSection +
+        //     "]/columns//sections/section/rows/row",
+        "/form/tabs/tab/columns//sections/section/rows/row",
         doc
     );
 
@@ -129,7 +131,8 @@ let BuildSection = (props) => {
         <div className="govuk-grid-row">
             <div className="govuk-grid-column-two-thirds">
                 <h1 className="govuk-heading-m  govuk-!-margin-top-5">
-                    {titles[0].value}{" "}
+                    {/* {titles[0].value}{" "} */}
+                    Enter your appeal information
                 </h1>
                 <form onSubmit={handleSubmit(onHandleSubmit)}>
                     {hasErrors == true ? (
@@ -141,17 +144,17 @@ let BuildSection = (props) => {
                     ) : (
                         ""
                     )}
-
                     <BuildRow
                         rowXML={rowXML}
                         whichSection={props.whichSection}
                         sectionCount={props.sectionCount}
                         onSubmit={onSubmit}
+                        mandatoryFieldsData={mandatoryFieldsData}
                         props={props}
                     />
                     {}
                     <div className="govuk-button-group">
-                        {props.sectionCount != currentSection ? (
+                        {/* {props.sectionCount != currentSection ? (
                             <button
                                 type="submit"
                                 className="govuk-button"
@@ -163,15 +166,15 @@ let BuildSection = (props) => {
                         ) : (
                             ""
                         )}
-                        {props.sectionCount == currentSection ? (
-                            <button
-                                type="submit"
-                                className="govuk-button"
-                                data-module="govuk-button"
-                            >
-                                Submit
-                            </button>
-                        ) : (
+                        {props.sectionCount == currentSection ? ( */}
+                        <button
+                            type="submit"
+                            className="govuk-button"
+                            data-module="govuk-button"
+                        >
+                            Submit
+                        </button>
+                        {/* ) : (
                             ""
                         )}
                         {currentSection > 1 ? (
@@ -186,11 +189,11 @@ let BuildSection = (props) => {
                             </a>
                         ) : (
                             ""
-                        )}
+                        )} */}
                     </div>
                 </form>
             </div>
-            <div className="govuk-grid-column-one-third">
+            {/* <div className="govuk-grid-column-one-third">
                 <nav
                     role="navigation"
                     aria-labelledby="progress-list"
@@ -239,7 +242,7 @@ let BuildSection = (props) => {
                         </ul>
                     </ol>
                 </nav>
-            </div>
+            </div> */}
         </div>
     );
 };