Merge from git

components/newappeal/buildrow.js

@@ -1,8 +1,10 @@
 import Link from "next/link";
+import _ from "lodash";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
 import xpath from "xpath";
 import BuildField from "./buildfield";
+import jsonpath from "jsonpath";
 
 export default function BuildRow(props) {
     let { t } = useTranslation();
@@ -10,7 +12,13 @@ export default function BuildRow(props) {
     const router = useRouter();
     const { locale } = router;
 
-    const { rowXML, whichSection, sectionCount, onSubmit } = props;
+    const {
+        rowXML,
+        whichSection,
+        sectionCount,
+        onSubmit,
+        mandatoryFieldsData,
+    } = props;
 
     const parser = new DOMParser();
 
@@ -21,18 +29,38 @@ export default function BuildRow(props) {
                     rowXML[key].outerHTML,
                     "text/xml"
                 );
-                var rows = xpath.select("//label/@description", doc);
-                var fieldtype = xpath.select("//@classid", doc);
-                var datafieldname = xpath.select("//@datafieldname", doc);
-                return (
-                    <BuildField
-                        fieldType={fieldtype[0].value}
-                        label={rows[0].value}
-                        datafieldname={datafieldname[0].value}
-                        key={key}
-                        props={props}
-                    />
-                );
+                if (_.isEmpty(rowXML[key].innerHTML)) {
+                    ("");
+                } else {
+                    var rows = xpath.select("//label/@description", doc);
+                    var fieldtype = xpath.select("//@classid", doc);
+                    var datafieldname = xpath.select("//@datafieldname", doc);
+
+                    const isRequiredField = jsonpath.query(
+                        mandatoryFieldsData,
+                        "$..value[?(@.LogicalName=='" +
+                            datafieldname[0].value +
+                            "')]"
+                    );
+
+                    if (isRequiredField[0].RequiredLevel.Value != "None") {
+                        return (
+                            <BuildField
+                                fieldType={fieldtype[0].value}
+                                label={rows[0].value}
+                                datafieldname={datafieldname[0].value}
+                                key={key}
+                                props={props}
+                                picklistData={
+                                    props.props.props.formData.pickListData
+                                }
+                                mandatoryFieldsData={mandatoryFieldsData}
+                            />
+                        );
+                    } else {
+                        return null;
+                    }
+                }
             })}
         </div>
     );