@bigbinary/neeto-form-frontend 1.0.29 → 1.0.31

package/dist/index.js

@@ -24101,7 +24101,7 @@ var STAR_RATING_ICONS_MAP = (cov_5u7jgeqcn().s[5]++, {
 
 function cov_2dmleb6ptc() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/Questions/Fields/Dropdown.jsx";
-  var hash = "3b4fafeb624738114200ce00b52b1f84c919c005";
+  var hash = "9926432972dd870e218f292a5e8cf35d8de9ef94";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -24113,118 +24113,118 @@ function cov_2dmleb6ptc() {
           column: 17
         },
         end: {
-          line: 102,
+          line: 111,
           column: 1
         }
       },
       "1": {
         start: {
-          line: 17,
-          column: 32
+          line: 21,
+          column: 6
         },
         end: {
-          line: 17,
-          column: 36
+          line: 21,
+          column: 10
         }
       },
       "2": {
         start: {
-          line: 18,
+          line: 22,
           column: 16
         },
         end: {
-          line: 18,
+          line: 22,
           column: 32
         }
       },
       "3": {
         start: {
-          line: 19,
+          line: 23,
           column: 28
         },
         end: {
-          line: 19,
+          line: 23,
           column: 46
         }
       },
       "4": {
         start: {
-          line: 21,
+          line: 25,
           column: 29
         },
         end: {
-          line: 24,
+          line: 28,
           column: 3
         }
       },
       "5": {
         start: {
-          line: 22,
+          line: 26,
           column: 24
         },
         end: {
-          line: 22,
+          line: 26,
           column: 77
         }
       },
       "6": {
         start: {
-          line: 23,
+          line: 27,
           column: 4
         },
         end: {
-          line: 23,
+          line: 27,
           column: 60
         }
       },
       "7": {
         start: {
-          line: 26,
+          line: 30,
           column: 2
         },
         end: {
-          line: 101,
+          line: 110,
           column: 4
         }
       },
       "8": {
         start: {
-          line: 45,
+          line: 49,
           column: 12
         },
         end: {
-          line: 87,
+          line: 96,
           column: 15
         }
       },
       "9": {
         start: {
-          line: 49,
+          line: 53,
           column: 20
         },
         end: {
-          line: 74,
+          line: 81,
           column: 21
         }
       },
       "10": {
         start: {
-          line: 66,
-          column: 28
+          line: 72,
+          column: 30
         },
         end: {
-          line: 69,
-          column: 30
+          line: 75,
+          column: 32
         }
       },
       "11": {
         start: {
-          line: 71,
-          column: 41
+          line: 77,
+          column: 43
         },
         end: {
-          line: 71,
-          column: 66
+          line: 77,
+          column: 68
         }
       }
     },
@@ -24247,7 +24247,7 @@ function cov_2dmleb6ptc() {
             column: 49
           },
           end: {
-            line: 102,
+            line: 111,
             column: 1
           }
         },
@@ -24257,222 +24257,336 @@ function cov_2dmleb6ptc() {
         name: "(anonymous_1)",
         decl: {
           start: {
-            line: 21,
+            line: 25,
             column: 29
           },
           end: {
-            line: 21,
+            line: 25,
             column: 30
           }
         },
         loc: {
           start: {
-            line: 21,
+            line: 25,
             column: 38
           },
           end: {
-            line: 24,
+            line: 28,
             column: 3
           }
         },
-        line: 21
+        line: 25
       },
       "2": {
         name: "(anonymous_2)",
         decl: {
           start: {
-            line: 44,
+            line: 48,
             column: 11
           },
           end: {
-            line: 44,
+            line: 48,
             column: 12
           }
         },
         loc: {
           start: {
-            line: 45,
+            line: 49,
             column: 12
           },
           end: {
-            line: 87,
+            line: 96,
             column: 15
           }
         },
-        line: 45
+        line: 49
       },
       "3": {
         name: "(anonymous_3)",
         decl: {
           start: {
-            line: 48,
+            line: 52,
             column: 18
           },
           end: {
-            line: 48,
+            line: 52,
             column: 19
           }
         },
         loc: {
           start: {
-            line: 49,
+            line: 53,
             column: 20
           },
           end: {
-            line: 74,
+            line: 81,
             column: 21
           }
         },
-        line: 49
+        line: 53
       },
       "4": {
         name: "(anonymous_4)",
         decl: {
           start: {
-            line: 65,
-            column: 32
+            line: 71,
+            column: 34
           },
           end: {
-            line: 65,
-            column: 33
+            line: 71,
+            column: 35
           }
         },
         loc: {
           start: {
-            line: 66,
-            column: 28
+            line: 72,
+            column: 30
           },
           end: {
-            line: 69,
-            column: 30
+            line: 75,
+            column: 32
           }
         },
-        line: 66
+        line: 72
       },
       "5": {
         name: "(anonymous_5)",
         decl: {
           start: {
-            line: 71,
-            column: 35
+            line: 77,
+            column: 37
           },
           end: {
-            line: 71,
-            column: 36
+            line: 77,
+            column: 38
           }
         },
         loc: {
           start: {
-            line: 71,
-            column: 41
+            line: 77,
+            column: 43
           },
           end: {
-            line: 71,
-            column: 66
+            line: 77,
+            column: 68
           }
         },
-        line: 71
+        line: 77
       }
     },
     branchMap: {
       "0": {
         loc: {
           start: {
-            line: 49,
+            line: 19,
+            column: 4
+          },
+          end: {
+            line: 19,
+            column: 25
+          }
+        },
+        type: "default-arg",
+        locations: [{
+          start: {
+            line: 19,
+            column: 23
+          },
+          end: {
+            line: 19,
+            column: 25
+          }
+        }],
+        line: 19
+      },
+      "1": {
+        loc: {
+          start: {
+            line: 20,
+            column: 4
+          },
+          end: {
+            line: 20,
+            column: 25
+          }
+        },
+        type: "default-arg",
+        locations: [{
+          start: {
+            line: 20,
             column: 20
           },
           end: {
-            line: 74,
+            line: 20,
+            column: 25
+          }
+        }],
+        line: 20
+      },
+      "2": {
+        loc: {
+          start: {
+            line: 53,
+            column: 20
+          },
+          end: {
+            line: 81,
             column: 21
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 49,
+            line: 53,
             column: 20
           },
           end: {
-            line: 49,
+            line: 53,
             column: 36
           }
         }, {
           start: {
-            line: 50,
+            line: 54,
             column: 22
           },
           end: {
-            line: 73,
+            line: 80,
             column: 28
           }
         }],
-        line: 49
+        line: 53
       },
-      "1": {
+      "3": {
         loc: {
           start: {
-            line: 52,
+            line: 56,
             column: 48
           },
           end: {
-            line: 52,
+            line: 56,
             column: 66
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 52,
+            line: 56,
             column: 48
           },
           end: {
-            line: 52,
+            line: 56,
             column: 57
           }
         }, {
           start: {
-            line: 52,
+            line: 56,
             column: 61
           },
           end: {
-            line: 52,
+            line: 56,
             column: 66
           }
         }],
-        line: 52
+        line: 56
       },
-      "2": {
+      "4": {
         loc: {
           start: {
-            line: 91,
+            line: 65,
+            column: 25
+          },
+          end: {
+            line: 79,
+            column: 25
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 65,
+            column: 25
+          },
+          end: {
+            line: 65,
+            column: 39
+          }
+        }, {
+          start: {
+            line: 66,
+            column: 26
+          },
+          end: {
+            line: 78,
+            column: 28
+          }
+        }],
+        line: 65
+      },
+      "5": {
+        loc: {
+          start: {
+            line: 84,
+            column: 15
+          },
+          end: {
+            line: 95,
+            column: 15
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 84,
+            column: 15
+          },
+          end: {
+            line: 84,
+            column: 29
+          }
+        }, {
+          start: {
+            line: 85,
+            column: 16
+          },
+          end: {
+            line: 94,
+            column: 22
+          }
+        }],
+        line: 84
+      },
+      "6": {
+        loc: {
+          start: {
+            line: 100,
             column: 7
           },
           end: {
-            line: 99,
+            line: 108,
             column: 7
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 91,
+            line: 100,
             column: 7
           },
           end: {
-            line: 91,
+            line: 100,
             column: 18
           }
         }, {
           start: {
-            line: 92,
+            line: 101,
             column: 8
           },
           end: {
-            line: 98,
+            line: 107,
             column: 14
           }
         }],
-        line: 91
+        line: 100
       }
     },
     s: {
@@ -24498,12 +24612,16 @@ function cov_2dmleb6ptc() {
       "5": 0
     },
     b: {
-      "0": [0, 0],
-      "1": [0, 0],
-      "2": [0, 0]
+      "0": [0],
+      "1": [0],
+      "2": [0, 0],
+      "3": [0, 0],
+      "4": [0, 0],
+      "5": [0, 0],
+      "6": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "3b4fafeb624738114200ce00b52b1f84c919c005"
+    hash: "9926432972dd870e218f292a5e8cf35d8de9ef94"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -24526,7 +24644,11 @@ var Dropdown$1 = function Dropdown(_ref) {
     isRequired = _ref.isRequired;
   cov_2dmleb6ptc().f[0]++;
   var _ref2 = (cov_2dmleb6ptc().s[1]++, item),
-    optionsAttributes = _ref2.optionsAttributes;
+    optionsAttributes = _ref2.optionsAttributes,
+    _ref2$optionLabelProp = _ref2.optionLabelProps,
+    optionLabelProps = _ref2$optionLabelProp === void 0 ? (cov_2dmleb6ptc().b[0][0]++, {}) : _ref2$optionLabelProp,
+    _ref2$freezeOptions = _ref2.freezeOptions,
+    freezeOptions = _ref2$freezeOptions === void 0 ? (cov_2dmleb6ptc().b[1][0]++, false) : _ref2$freezeOptions;
   var _ref3 = (cov_2dmleb6ptc().s[2]++, useTranslation()),
     t = _ref3.t;
   var _ref4 = (cov_2dmleb6ptc().s[3]++, useFormikContext()),
@@ -24553,9 +24675,9 @@ var Dropdown$1 = function Dropdown(_ref) {
     })
   })), /*#__PURE__*/React__default.createElement("div", {
     className: "w-full"
-  }, /*#__PURE__*/React__default.createElement(Label, {
+  }, /*#__PURE__*/React__default.createElement(Label, _extends$9({
     className: "mb-1 block"
-  }, t("questions.common.questionFields.field.options")), /*#__PURE__*/React__default.createElement(FieldArray, {
+  }, optionLabelProps), t("questions.common.questionFields.field.options")), /*#__PURE__*/React__default.createElement(FieldArray, {
     name: "".concat(name, ".optionsAttributes")
   }, function (_ref5) {
     var handlePush = _ref5.handlePush;
@@ -24567,13 +24689,14 @@ var Dropdown$1 = function Dropdown(_ref) {
       var _ref6;
       cov_2dmleb6ptc().f[3]++;
       cov_2dmleb6ptc().s[9]++;
-      return (cov_2dmleb6ptc().b[0][0]++, !option._destroy) && (cov_2dmleb6ptc().b[0][1]++, /*#__PURE__*/React__default.createElement("div", {
+      return (cov_2dmleb6ptc().b[2][0]++, !option._destroy) && (cov_2dmleb6ptc().b[2][1]++, /*#__PURE__*/React__default.createElement("div", {
         className: "flex items-start gap-1",
-        key: "question-option-".concat((_ref6 = (cov_2dmleb6ptc().b[1][0]++, option.id)) !== null && _ref6 !== void 0 ? _ref6 : (cov_2dmleb6ptc().b[1][1]++, index))
+        key: "question-option-".concat((_ref6 = (cov_2dmleb6ptc().b[3][0]++, option.id)) !== null && _ref6 !== void 0 ? _ref6 : (cov_2dmleb6ptc().b[3][1]++, index))
       }, /*#__PURE__*/React__default.createElement(InputWithMaxLength, {
+        disabled: freezeOptions,
         name: "".concat(name, ".optionsAttributes.").concat(index, ".label"),
         placeholder: "".concat(t("questions.common.questionFields.field.option"), " ").concat(index + 1)
-      }), /*#__PURE__*/React__default.createElement(Button$1, {
+      }), (cov_2dmleb6ptc().b[4][0]++, !freezeOptions) && (cov_2dmleb6ptc().b[4][1]++, /*#__PURE__*/React__default.createElement(Button$1, {
         style: "text",
         className: classnames({
           invisible: index < DROPDOWN_FIELD_MIN_OPTIONS$1
@@ -24591,8 +24714,8 @@ var Dropdown$1 = function Dropdown(_ref) {
           cov_2dmleb6ptc().s[11]++;
           return handleRemoveOption(index);
         }
-      })));
-    })), /*#__PURE__*/React__default.createElement("div", {
+      }))));
+    })), (cov_2dmleb6ptc().b[5][0]++, !freezeOptions) && (cov_2dmleb6ptc().b[5][1]++, /*#__PURE__*/React__default.createElement("div", {
       className: "mt-3 w-full"
     }, /*#__PURE__*/React__default.createElement(Button$1, {
       icon: Plus,
@@ -24603,8 +24726,8 @@ var Dropdown$1 = function Dropdown(_ref) {
       onClick: handlePush({
         label: ""
       })
-    })));
-  })), (cov_2dmleb6ptc().b[2][0]++, !isRequired) && (cov_2dmleb6ptc().b[2][1]++, /*#__PURE__*/React__default.createElement("div", {
+    }))));
+  })), (cov_2dmleb6ptc().b[6][0]++, !isRequired) && (cov_2dmleb6ptc().b[6][1]++, /*#__PURE__*/React__default.createElement("div", {
     className: "w-full"
   }, /*#__PURE__*/React__default.createElement(Checkbox, {
     id: "".concat(name, ".isRequired"),
@@ -24938,7 +25061,7 @@ var LongText$1 = function LongText(_ref) {
 
 function cov_ezislrxf8() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/Questions/Fields/MultipleChoice.jsx";
-  var hash = "300d57d30f9824378975d70f6442fded08432f5e";
+  var hash = "f398b7e5e94047f87461a57e2caf604e32e36a9d";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -24950,108 +25073,108 @@ function cov_ezislrxf8() {
           column: 23
         },
         end: {
-          line: 89,
+          line: 98,
           column: 1
         }
       },
       "1": {
         start: {
-          line: 15,
-          column: 32
+          line: 19,
+          column: 6
         },
         end: {
-          line: 15,
-          column: 36
+          line: 19,
+          column: 10
         }
       },
       "2": {
         start: {
-          line: 16,
+          line: 20,
           column: 16
         },
         end: {
-          line: 16,
+          line: 20,
           column: 32
         }
       },
       "3": {
         start: {
-          line: 17,
+          line: 21,
           column: 28
         },
         end: {
-          line: 17,
+          line: 21,
           column: 46
         }
       },
       "4": {
         start: {
-          line: 19,
+          line: 23,
           column: 29
         },
         end: {
-          line: 22,
+          line: 26,
           column: 3
         }
       },
       "5": {
         start: {
-          line: 20,
+          line: 24,
           column: 24
         },
         end: {
-          line: 20,
+          line: 24,
           column: 77
         }
       },
       "6": {
         start: {
-          line: 21,
+          line: 25,
           column: 4
         },
         end: {
-          line: 21,
+          line: 25,
           column: 60
         }
       },
       "7": {
         start: {
-          line: 24,
+          line: 28,
           column: 2
         },
         end: {
-          line: 88,
+          line: 97,
           column: 4
         }
       },
       "8": {
         start: {
-          line: 37,
+          line: 41,
           column: 12
         },
         end: {
-          line: 74,
+          line: 83,
           column: 15
         }
       },
       "9": {
         start: {
-          line: 44,
+          line: 48,
           column: 20
         },
         end: {
-          line: 61,
+          line: 68,
           column: 21
         }
       },
       "10": {
         start: {
-          line: 58,
-          column: 41
+          line: 64,
+          column: 43
         },
         end: {
-          line: 58,
-          column: 66
+          line: 64,
+          column: 68
         }
       }
     },
@@ -25074,7 +25197,7 @@ function cov_ezislrxf8() {
             column: 55
           },
           end: {
-            line: 89,
+            line: 98,
             column: 1
           }
         },
@@ -25084,198 +25207,312 @@ function cov_ezislrxf8() {
         name: "(anonymous_1)",
         decl: {
           start: {
-            line: 19,
+            line: 23,
             column: 29
           },
           end: {
-            line: 19,
+            line: 23,
             column: 30
           }
         },
         loc: {
           start: {
-            line: 19,
+            line: 23,
             column: 38
           },
           end: {
-            line: 22,
+            line: 26,
             column: 3
           }
         },
-        line: 19
+        line: 23
       },
       "2": {
         name: "(anonymous_2)",
         decl: {
           start: {
-            line: 36,
+            line: 40,
             column: 11
           },
           end: {
-            line: 36,
+            line: 40,
             column: 12
           }
         },
         loc: {
           start: {
-            line: 37,
+            line: 41,
             column: 12
           },
           end: {
-            line: 74,
+            line: 83,
             column: 15
           }
         },
-        line: 37
+        line: 41
       },
       "3": {
         name: "(anonymous_3)",
         decl: {
           start: {
-            line: 43,
+            line: 47,
             column: 18
           },
           end: {
-            line: 43,
+            line: 47,
             column: 19
           }
         },
         loc: {
           start: {
-            line: 44,
+            line: 48,
             column: 20
           },
           end: {
-            line: 61,
+            line: 68,
             column: 21
           }
         },
-        line: 44
+        line: 48
       },
       "4": {
         name: "(anonymous_4)",
         decl: {
           start: {
-            line: 58,
-            column: 35
+            line: 64,
+            column: 37
           },
           end: {
-            line: 58,
-            column: 36
+            line: 64,
+            column: 38
           }
         },
         loc: {
           start: {
-            line: 58,
-            column: 41
+            line: 64,
+            column: 43
           },
           end: {
-            line: 58,
-            column: 66
+            line: 64,
+            column: 68
           }
         },
-        line: 58
+        line: 64
       }
     },
     branchMap: {
       "0": {
         loc: {
           start: {
-            line: 44,
+            line: 17,
+            column: 4
+          },
+          end: {
+            line: 17,
+            column: 25
+          }
+        },
+        type: "default-arg",
+        locations: [{
+          start: {
+            line: 17,
+            column: 23
+          },
+          end: {
+            line: 17,
+            column: 25
+          }
+        }],
+        line: 17
+      },
+      "1": {
+        loc: {
+          start: {
+            line: 18,
+            column: 4
+          },
+          end: {
+            line: 18,
+            column: 25
+          }
+        },
+        type: "default-arg",
+        locations: [{
+          start: {
+            line: 18,
             column: 20
           },
           end: {
-            line: 61,
+            line: 18,
+            column: 25
+          }
+        }],
+        line: 18
+      },
+      "2": {
+        loc: {
+          start: {
+            line: 48,
+            column: 20
+          },
+          end: {
+            line: 68,
             column: 21
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 44,
+            line: 48,
             column: 20
           },
           end: {
-            line: 44,
+            line: 48,
             column: 36
           }
         }, {
           start: {
-            line: 45,
+            line: 49,
             column: 22
           },
           end: {
-            line: 60,
+            line: 67,
             column: 28
           }
         }],
-        line: 44
+        line: 48
       },
-      "1": {
+      "3": {
         loc: {
           start: {
-            line: 47,
+            line: 51,
             column: 48
           },
           end: {
-            line: 47,
+            line: 51,
             column: 66
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 47,
+            line: 51,
             column: 48
           },
           end: {
-            line: 47,
+            line: 51,
             column: 57
           }
         }, {
           start: {
-            line: 47,
+            line: 51,
             column: 61
           },
           end: {
-            line: 47,
+            line: 51,
             column: 66
           }
         }],
-        line: 47
+        line: 51
       },
-      "2": {
+      "4": {
         loc: {
           start: {
-            line: 78,
+            line: 58,
+            column: 25
+          },
+          end: {
+            line: 66,
+            column: 25
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 58,
+            column: 25
+          },
+          end: {
+            line: 58,
+            column: 39
+          }
+        }, {
+          start: {
+            line: 59,
+            column: 26
+          },
+          end: {
+            line: 65,
+            column: 28
+          }
+        }],
+        line: 58
+      },
+      "5": {
+        loc: {
+          start: {
+            line: 71,
+            column: 15
+          },
+          end: {
+            line: 82,
+            column: 15
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 71,
+            column: 15
+          },
+          end: {
+            line: 71,
+            column: 29
+          }
+        }, {
+          start: {
+            line: 72,
+            column: 16
+          },
+          end: {
+            line: 81,
+            column: 22
+          }
+        }],
+        line: 71
+      },
+      "6": {
+        loc: {
+          start: {
+            line: 87,
             column: 7
           },
           end: {
-            line: 86,
+            line: 95,
             column: 7
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 78,
+            line: 87,
             column: 7
           },
           end: {
-            line: 78,
+            line: 87,
             column: 18
           }
         }, {
           start: {
-            line: 79,
+            line: 88,
             column: 8
           },
           end: {
-            line: 85,
+            line: 94,
             column: 14
           }
         }],
-        line: 78
+        line: 87
       }
     },
     s: {
@@ -25299,12 +25536,16 @@ function cov_ezislrxf8() {
       "4": 0
     },
     b: {
-      "0": [0, 0],
-      "1": [0, 0],
-      "2": [0, 0]
+      "0": [0],
+      "1": [0],
+      "2": [0, 0],
+      "3": [0, 0],
+      "4": [0, 0],
+      "5": [0, 0],
+      "6": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "300d57d30f9824378975d70f6442fded08432f5e"
+    hash: "f398b7e5e94047f87461a57e2caf604e32e36a9d"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -25327,7 +25568,11 @@ var MultipleChoice$1 = function MultipleChoice(_ref) {
     isRequired = _ref.isRequired;
   cov_ezislrxf8().f[0]++;
   var _ref2 = (cov_ezislrxf8().s[1]++, item),
-    optionsAttributes = _ref2.optionsAttributes;
+    optionsAttributes = _ref2.optionsAttributes,
+    _ref2$optionLabelProp = _ref2.optionLabelProps,
+    optionLabelProps = _ref2$optionLabelProp === void 0 ? (cov_ezislrxf8().b[0][0]++, {}) : _ref2$optionLabelProp,
+    _ref2$freezeOptions = _ref2.freezeOptions,
+    freezeOptions = _ref2$freezeOptions === void 0 ? (cov_ezislrxf8().b[1][0]++, false) : _ref2$freezeOptions;
   var _ref3 = (cov_ezislrxf8().s[2]++, useTranslation()),
     t = _ref3.t;
   var _ref4 = (cov_ezislrxf8().s[3]++, useFormikContext()),
@@ -25357,21 +25602,22 @@ var MultipleChoice$1 = function MultipleChoice(_ref) {
     var handlePush = _ref5.handlePush;
     cov_ezislrxf8().f[2]++;
     cov_ezislrxf8().s[8]++;
-    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Label, {
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Label, _extends$9({
       className: "mb-1 block"
-    }, t("questions.common.questionFields.field.options")), /*#__PURE__*/React__default.createElement("div", {
+    }, optionLabelProps), t("questions.common.questionFields.field.options")), /*#__PURE__*/React__default.createElement("div", {
       className: "flex w-2/3 flex-col space-y-2"
     }, optionsAttributes.map(function (option, index) {
       var _ref6;
       cov_ezislrxf8().f[3]++;
       cov_ezislrxf8().s[9]++;
-      return (cov_ezislrxf8().b[0][0]++, !option._destroy) && (cov_ezislrxf8().b[0][1]++, /*#__PURE__*/React__default.createElement("div", {
+      return (cov_ezislrxf8().b[2][0]++, !option._destroy) && (cov_ezislrxf8().b[2][1]++, /*#__PURE__*/React__default.createElement("div", {
         className: "flex items-start gap-1",
-        key: "question-option-".concat((_ref6 = (cov_ezislrxf8().b[1][0]++, option.id)) !== null && _ref6 !== void 0 ? _ref6 : (cov_ezislrxf8().b[1][1]++, index))
+        key: "question-option-".concat((_ref6 = (cov_ezislrxf8().b[3][0]++, option.id)) !== null && _ref6 !== void 0 ? _ref6 : (cov_ezislrxf8().b[3][1]++, index))
       }, /*#__PURE__*/React__default.createElement(InputWithMaxLength, {
         required: true,
+        disabled: freezeOptions,
         name: "".concat(name, ".optionsAttributes.").concat(index, ".label")
-      }), /*#__PURE__*/React__default.createElement(Button$1, {
+      }), (cov_ezislrxf8().b[4][0]++, !freezeOptions) && (cov_ezislrxf8().b[4][1]++, /*#__PURE__*/React__default.createElement(Button$1, {
         className: classnames({
           invisible: index === 0
         }),
@@ -25383,8 +25629,8 @@ var MultipleChoice$1 = function MultipleChoice(_ref) {
           cov_ezislrxf8().s[10]++;
           return handleRemoveOption(index);
         }
-      })));
-    })), /*#__PURE__*/React__default.createElement("div", {
+      }))));
+    })), (cov_ezislrxf8().b[5][0]++, !freezeOptions) && (cov_ezislrxf8().b[5][1]++, /*#__PURE__*/React__default.createElement("div", {
       className: "mt-3 w-full"
     }, /*#__PURE__*/React__default.createElement(Button$1, {
       icon: Plus,
@@ -25395,8 +25641,8 @@ var MultipleChoice$1 = function MultipleChoice(_ref) {
       onClick: handlePush({
         label: ""
       })
-    })));
-  })), (cov_ezislrxf8().b[2][0]++, !isRequired) && (cov_ezislrxf8().b[2][1]++, /*#__PURE__*/React__default.createElement("div", {
+    }))));
+  })), (cov_ezislrxf8().b[6][0]++, !isRequired) && (cov_ezislrxf8().b[6][1]++, /*#__PURE__*/React__default.createElement("div", {
     className: "w-full"
   }, /*#__PURE__*/React__default.createElement(Checkbox, {
     id: "".concat(name, ".isRequired"),
@@ -25960,7 +26206,7 @@ var ShortText$1 = function ShortText(_ref) {
 
 function cov_1p625a7ih4() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/Questions/Fields/SingleChoice.jsx";
-  var hash = "99213ff7d9beb4d434106a0d7d544e0e50ca3b81";
+  var hash = "1011b25909b9c73b64080f90fa78d81fed144c14";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -25972,108 +26218,108 @@ function cov_1p625a7ih4() {
           column: 21
         },
         end: {
-          line: 96,
+          line: 106,
           column: 1
         }
       },
       "1": {
         start: {
-          line: 17,
-          column: 32
+          line: 21,
+          column: 6
         },
         end: {
-          line: 17,
-          column: 36
+          line: 21,
+          column: 10
         }
       },
       "2": {
         start: {
-          line: 18,
+          line: 22,
           column: 16
         },
         end: {
-          line: 18,
+          line: 22,
           column: 32
         }
       },
       "3": {
         start: {
-          line: 20,
+          line: 24,
           column: 28
         },
         end: {
-          line: 20,
+          line: 24,
           column: 46
         }
       },
       "4": {
         start: {
-          line: 22,
+          line: 26,
           column: 29
         },
         end: {
-          line: 25,
+          line: 29,
           column: 3
         }
       },
       "5": {
         start: {
-          line: 23,
+          line: 27,
           column: 24
         },
         end: {
-          line: 23,
+          line: 27,
           column: 77
         }
       },
       "6": {
         start: {
-          line: 24,
+          line: 28,
           column: 4
         },
         end: {
-          line: 24,
+          line: 28,
           column: 50
         }
       },
       "7": {
         start: {
-          line: 27,
+          line: 31,
           column: 2
         },
         end: {
-          line: 95,
+          line: 105,
           column: 4
         }
       },
       "8": {
         start: {
-          line: 40,
+          line: 44,
           column: 12
         },
         end: {
-          line: 81,
+          line: 91,
           column: 15
         }
       },
       "9": {
         start: {
-          line: 47,
+          line: 51,
           column: 20
         },
         end: {
-          line: 68,
+          line: 76,
           column: 21
         }
       },
       "10": {
         start: {
-          line: 65,
-          column: 41
+          line: 72,
+          column: 43
         },
         end: {
-          line: 65,
-          column: 66
+          line: 72,
+          column: 68
         }
       }
     },
@@ -26096,7 +26342,7 @@ function cov_1p625a7ih4() {
             column: 53
           },
           end: {
-            line: 96,
+            line: 106,
             column: 1
           }
         },
@@ -26106,198 +26352,312 @@ function cov_1p625a7ih4() {
         name: "(anonymous_1)",
         decl: {
           start: {
-            line: 22,
+            line: 26,
             column: 29
           },
           end: {
-            line: 22,
+            line: 26,
             column: 30
           }
         },
         loc: {
           start: {
-            line: 22,
+            line: 26,
             column: 38
           },
           end: {
-            line: 25,
+            line: 29,
             column: 3
           }
         },
-        line: 22
+        line: 26
       },
       "2": {
         name: "(anonymous_2)",
         decl: {
           start: {
-            line: 39,
+            line: 43,
             column: 11
           },
           end: {
-            line: 39,
+            line: 43,
             column: 12
           }
         },
         loc: {
           start: {
-            line: 40,
+            line: 44,
             column: 12
           },
           end: {
-            line: 81,
+            line: 91,
             column: 15
           }
         },
-        line: 40
+        line: 44
       },
       "3": {
         name: "(anonymous_3)",
         decl: {
           start: {
-            line: 46,
+            line: 50,
             column: 18
           },
           end: {
-            line: 46,
+            line: 50,
             column: 19
           }
         },
         loc: {
           start: {
-            line: 47,
+            line: 51,
             column: 20
           },
           end: {
-            line: 68,
+            line: 76,
             column: 21
           }
         },
-        line: 47
+        line: 51
       },
       "4": {
         name: "(anonymous_4)",
         decl: {
           start: {
-            line: 65,
-            column: 35
+            line: 72,
+            column: 37
           },
           end: {
-            line: 65,
-            column: 36
+            line: 72,
+            column: 38
           }
         },
         loc: {
           start: {
-            line: 65,
-            column: 41
+            line: 72,
+            column: 43
           },
           end: {
-            line: 65,
-            column: 66
+            line: 72,
+            column: 68
           }
         },
-        line: 65
+        line: 72
       }
     },
     branchMap: {
       "0": {
         loc: {
           start: {
-            line: 47,
+            line: 19,
+            column: 4
+          },
+          end: {
+            line: 19,
+            column: 25
+          }
+        },
+        type: "default-arg",
+        locations: [{
+          start: {
+            line: 19,
+            column: 23
+          },
+          end: {
+            line: 19,
+            column: 25
+          }
+        }],
+        line: 19
+      },
+      "1": {
+        loc: {
+          start: {
+            line: 20,
+            column: 4
+          },
+          end: {
+            line: 20,
+            column: 25
+          }
+        },
+        type: "default-arg",
+        locations: [{
+          start: {
+            line: 20,
             column: 20
           },
           end: {
-            line: 68,
+            line: 20,
+            column: 25
+          }
+        }],
+        line: 20
+      },
+      "2": {
+        loc: {
+          start: {
+            line: 51,
+            column: 20
+          },
+          end: {
+            line: 76,
             column: 21
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 47,
+            line: 51,
             column: 20
           },
           end: {
-            line: 47,
+            line: 51,
             column: 36
           }
         }, {
           start: {
-            line: 48,
+            line: 52,
             column: 22
           },
           end: {
-            line: 67,
+            line: 75,
             column: 28
           }
         }],
-        line: 47
+        line: 51
       },
-      "1": {
+      "3": {
         loc: {
           start: {
-            line: 50,
+            line: 54,
             column: 48
           },
           end: {
-            line: 50,
+            line: 54,
             column: 66
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 50,
+            line: 54,
             column: 48
           },
           end: {
-            line: 50,
+            line: 54,
             column: 57
           }
         }, {
           start: {
-            line: 50,
+            line: 54,
             column: 61
           },
           end: {
-            line: 50,
+            line: 54,
             column: 66
           }
         }],
-        line: 50
+        line: 54
       },
-      "2": {
+      "4": {
         loc: {
           start: {
-            line: 85,
+            line: 63,
+            column: 25
+          },
+          end: {
+            line: 74,
+            column: 25
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 63,
+            column: 25
+          },
+          end: {
+            line: 63,
+            column: 39
+          }
+        }, {
+          start: {
+            line: 64,
+            column: 26
+          },
+          end: {
+            line: 73,
+            column: 28
+          }
+        }],
+        line: 63
+      },
+      "5": {
+        loc: {
+          start: {
+            line: 79,
+            column: 15
+          },
+          end: {
+            line: 90,
+            column: 15
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 79,
+            column: 15
+          },
+          end: {
+            line: 79,
+            column: 29
+          }
+        }, {
+          start: {
+            line: 80,
+            column: 16
+          },
+          end: {
+            line: 89,
+            column: 22
+          }
+        }],
+        line: 79
+      },
+      "6": {
+        loc: {
+          start: {
+            line: 95,
             column: 7
           },
           end: {
-            line: 93,
+            line: 103,
             column: 7
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 85,
+            line: 95,
             column: 7
           },
           end: {
-            line: 85,
+            line: 95,
             column: 18
           }
         }, {
           start: {
-            line: 86,
+            line: 96,
             column: 8
           },
           end: {
-            line: 92,
+            line: 102,
             column: 14
           }
         }],
-        line: 85
+        line: 95
       }
     },
     s: {
@@ -26321,12 +26681,16 @@ function cov_1p625a7ih4() {
       "4": 0
     },
     b: {
-      "0": [0, 0],
-      "1": [0, 0],
-      "2": [0, 0]
+      "0": [0],
+      "1": [0],
+      "2": [0, 0],
+      "3": [0, 0],
+      "4": [0, 0],
+      "5": [0, 0],
+      "6": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "99213ff7d9beb4d434106a0d7d544e0e50ca3b81"
+    hash: "1011b25909b9c73b64080f90fa78d81fed144c14"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -26349,7 +26713,11 @@ var SingleChoice$1 = function SingleChoice(_ref) {
     isRequired = _ref.isRequired;
   cov_1p625a7ih4().f[0]++;
   var _ref2 = (cov_1p625a7ih4().s[1]++, item),
-    optionsAttributes = _ref2.optionsAttributes;
+    optionsAttributes = _ref2.optionsAttributes,
+    _ref2$optionLabelProp = _ref2.optionLabelProps,
+    optionLabelProps = _ref2$optionLabelProp === void 0 ? (cov_1p625a7ih4().b[0][0]++, {}) : _ref2$optionLabelProp,
+    _ref2$freezeOptions = _ref2.freezeOptions,
+    freezeOptions = _ref2$freezeOptions === void 0 ? (cov_1p625a7ih4().b[1][0]++, false) : _ref2$freezeOptions;
   var _ref3 = (cov_1p625a7ih4().s[2]++, useTranslation()),
     t = _ref3.t;
   var _ref4 = (cov_1p625a7ih4().s[3]++, useFormikContext()),
@@ -26379,21 +26747,22 @@ var SingleChoice$1 = function SingleChoice(_ref) {
     var handlePush = _ref5.handlePush;
     cov_1p625a7ih4().f[2]++;
     cov_1p625a7ih4().s[8]++;
-    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Label, {
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Label, _extends$9({
       className: "mb-1 block"
-    }, t("questions.common.questionFields.field.options")), /*#__PURE__*/React__default.createElement("div", {
+    }, optionLabelProps), t("questions.common.questionFields.field.options")), /*#__PURE__*/React__default.createElement("div", {
       className: "flex w-2/3 flex-col space-y-2"
     }, optionsAttributes.map(function (option, index) {
       var _ref6;
       cov_1p625a7ih4().f[3]++;
       cov_1p625a7ih4().s[9]++;
-      return (cov_1p625a7ih4().b[0][0]++, !option._destroy) && (cov_1p625a7ih4().b[0][1]++, /*#__PURE__*/React__default.createElement("div", {
+      return (cov_1p625a7ih4().b[2][0]++, !option._destroy) && (cov_1p625a7ih4().b[2][1]++, /*#__PURE__*/React__default.createElement("div", {
         className: "flex items-start gap-1",
-        key: "question-option-".concat((_ref6 = (cov_1p625a7ih4().b[1][0]++, option.id)) !== null && _ref6 !== void 0 ? _ref6 : (cov_1p625a7ih4().b[1][1]++, index))
+        key: "question-option-".concat((_ref6 = (cov_1p625a7ih4().b[3][0]++, option.id)) !== null && _ref6 !== void 0 ? _ref6 : (cov_1p625a7ih4().b[3][1]++, index))
       }, /*#__PURE__*/React__default.createElement(InputWithMaxLength, {
+        disabled: freezeOptions,
         name: "".concat(name, ".optionsAttributes.").concat(index, ".label"),
         placeholder: "".concat(t("questions.common.questionFields.field.option"), " ").concat(index + 1)
-      }), /*#__PURE__*/React__default.createElement(Button$1, {
+      }), (cov_1p625a7ih4().b[4][0]++, !freezeOptions) && (cov_1p625a7ih4().b[4][1]++, /*#__PURE__*/React__default.createElement(Button$1, {
         icon: Delete,
         size: "small",
         style: "text",
@@ -26405,8 +26774,8 @@ var SingleChoice$1 = function SingleChoice(_ref) {
           cov_1p625a7ih4().s[10]++;
           return handleRemoveOption(index);
         }
-      })));
-    })), /*#__PURE__*/React__default.createElement("div", {
+      }))));
+    })), (cov_1p625a7ih4().b[5][0]++, !freezeOptions) && (cov_1p625a7ih4().b[5][1]++, /*#__PURE__*/React__default.createElement("div", {
       className: "mt-3 w-full"
     }, /*#__PURE__*/React__default.createElement(Button$1, {
       icon: Plus,
@@ -26417,8 +26786,8 @@ var SingleChoice$1 = function SingleChoice(_ref) {
       onClick: handlePush({
         label: ""
       })
-    })));
-  })), (cov_1p625a7ih4().b[2][0]++, !isRequired) && (cov_1p625a7ih4().b[2][1]++, /*#__PURE__*/React__default.createElement("div", {
+    }))));
+  })), (cov_1p625a7ih4().b[6][0]++, !isRequired) && (cov_1p625a7ih4().b[6][1]++, /*#__PURE__*/React__default.createElement("div", {
     className: "w-full"
   }, /*#__PURE__*/React__default.createElement(Checkbox, {
     id: "".concat(name, ".isRequired"),
@@ -27383,7 +27752,7 @@ var Editor = function Editor(_ref) {
 
 function cov_2j8tlu2ul5() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/Questions/constants.js";
-  var hash = "66ba5b083c318d90b5ba09aa05088ee51337bf74";
+  var hash = "cf06aa225404e0ebe444d6f1219d393c9ffc9417";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -27425,27 +27794,27 @@ function cov_2j8tlu2ul5() {
           column: 30
         },
         end: {
-          line: 190,
+          line: 177,
           column: 1
         }
       },
       "4": {
         start: {
-          line: 193,
+          line: 180,
           column: 38
         },
         end: {
-          line: 196,
+          line: 183,
           column: 1
         }
       },
       "5": {
         start: {
-          line: 198,
+          line: 185,
           column: 29
         },
         end: {
-          line: 198,
+          line: 185,
           column: 62
         }
       }
@@ -27463,7 +27832,7 @@ function cov_2j8tlu2ul5() {
     f: {},
     b: {},
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "66ba5b083c318d90b5ba09aa05088ee51337bf74"
+    hash: "cf06aa225404e0ebe444d6f1219d393c9ffc9417"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -27501,8 +27870,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   component: Email,
   defaults: {
     label: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "phone",
   label: instance.t("fields.pif"),
@@ -27512,8 +27880,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   component: Phone,
   defaults: {
     label: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "name",
   label: instance.t("fields.nif"),
@@ -27523,8 +27890,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   component: ShortText,
   defaults: {
     label: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "text",
   label: instance.t("fields.tif"),
@@ -27534,8 +27900,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   component: ShortText,
   defaults: {
     label: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "question",
   label: instance.t("fields.qif"),
@@ -27544,8 +27909,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   component: LongText,
   defaults: {
     label: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "textarea",
   label: instance.t("fields.def"),
@@ -27554,8 +27918,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   component: Editor,
   defaults: {
     label: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "checkbox",
   label: instance.t("fields.mcf"),
@@ -27568,8 +27931,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
     optionsAttributes: [{
       label: ""
     }]
-  },
-  metadata: {}
+  }
 }, {
   type: "radio",
   label: instance.t("fields.scf"),
@@ -27582,8 +27944,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
     optionsAttributes: new Array(SINGLE_CHOICE_FIELD_MIN_OPTIONS).fill({
       label: ""
     })
-  },
-  metadata: {}
+  }
 }, {
   type: "dropdown",
   label: instance.t("fields.drf"),
@@ -27596,8 +27957,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
     optionsAttributes: new Array(DROPDOWN_FIELD_MIN_OPTIONS).fill({
       label: ""
     })
-  },
-  metadata: {}
+  }
 }, {
   type: "star_rating",
   label: instance.t("fields.rif"),
@@ -27609,8 +27969,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
     isRequired: true,
     count: 5,
     shape: "star"
-  },
-  metadata: {}
+  }
 }, {
   type: "rating",
   label: instance.t("fields.fbf"),
@@ -27623,8 +27982,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
     highestRatingLabel: "",
     averageRatingLabel: "",
     lowestRatingLabel: ""
-  },
-  metadata: {}
+  }
 }, {
   type: "termsandcondition",
   label: instance.t("fields.tcf"),
@@ -27636,8 +27994,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
     privacyPolicyLink: "",
     isRequired: true,
     label: instance.t("common.agreeTermsAndConditions")
-  },
-  metadata: {}
+  }
 }, {
   type: "date",
   label: instance.t("fields.date"),
@@ -27647,8 +28004,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   defaults: {
     label: "",
     isRequired: true
-  },
-  metadata: {}
+  }
 }]);
 
 // To show the question type as label in accordion
@@ -28241,7 +28597,7 @@ var Question = function Question(_ref) {
   var questions = _ref.questions,
     insert = _ref.insert,
     formProps = _ref.formProps,
-    nonRemovableFields = _ref.nonRemovableFields,
+    isDeletable = _ref.isDeletable,
     isRequiredField = _ref.isRequiredField,
     allQuestionKinds = _ref.allQuestionKinds,
     getActiveKindDetails = _ref.getActiveKindDetails,
@@ -28277,8 +28633,8 @@ var Question = function Question(_ref) {
         }), /*#__PURE__*/React__default.createElement(FormField, _extends$9({
           allQuestionKinds: allQuestionKinds,
           getActiveKindDetails: getActiveKindDetails,
-          isDeletable: !nonRemovableFields.includes(item.kind),
-          isRequired: isRequiredField(item.kind),
+          isDeletable: isDeletable(item),
+          isRequired: isRequiredField(item),
           kindUniqueOn: kindUniqueOn
         }, formProps(item, index, insert))));
       }));
@@ -30341,10 +30697,10 @@ var List = function List(_ref) {
   })));
 };
 
-var _excluded$b = ["questionKinds", "showAddQuestionDivider", "onValueChange", "showActionBlock", "formId", "setShouldValidate", "nonRemovableFields", "requiredFields", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "kindUniqueOn"];
+var _excluded$b = ["questionKinds", "showAddQuestionDivider", "onValueChange", "showActionBlock", "formId", "setShouldValidate", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "kindUniqueOn"];
 function cov_2e8k7gwd81() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/Form/index.jsx";
-  var hash = "d4de1ee8731b034d1b63d5d5a31a2eeef7a285ee";
+  var hash = "7c11acd7f0e5fde99d6d92b950980d529a13322c";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -30356,7 +30712,7 @@ function cov_2e8k7gwd81() {
           column: 13
         },
         end: {
-          line: 224,
+          line: 222,
           column: 1
         }
       },
@@ -30543,200 +30899,180 @@ function cov_2e8k7gwd81() {
       "19": {
         start: {
           line: 106,
-          column: 26
-        },
-        end: {
-          line: 106,
-          column: 63
-        }
-      },
-      "20": {
-        start: {
-          line: 106,
-          column: 34
-        },
-        end: {
-          line: 106,
-          column: 63
-        }
-      },
-      "21": {
-        start: {
-          line: 108,
           column: 20
         },
         end: {
-          line: 138,
+          line: 136,
           column: 4
         }
       },
-      "22": {
+      "20": {
         start: {
-          line: 108,
+          line: 106,
           column: 46
         },
         end: {
-          line: 138,
+          line: 136,
           column: 3
         }
       },
-      "23": {
+      "21": {
         start: {
-          line: 117,
+          line: 115,
           column: 6
         },
         end: {
-          line: 117,
+          line: 115,
           column: 62
         }
       },
-      "24": {
+      "22": {
         start: {
-          line: 119,
+          line: 117,
           column: 27
         },
         end: {
-          line: 123,
+          line: 121,
           column: 7
         }
       },
-      "25": {
+      "23": {
         start: {
-          line: 125,
+          line: 123,
           column: 6
         },
         end: {
-          line: 131,
+          line: 129,
           column: 8
         }
       },
-      "26": {
+      "24": {
         start: {
-          line: 127,
+          line: 125,
           column: 47
         },
         end: {
-          line: 130,
+          line: 128,
           column: 9
         }
       },
-      "27": {
+      "25": {
         start: {
-          line: 134,
+          line: 132,
           column: 6
         },
         end: {
-          line: 134,
+          line: 132,
           column: 69
         }
       },
-      "28": {
+      "26": {
         start: {
-          line: 136,
+          line: 134,
           column: 6
         },
         end: {
-          line: 136,
+          line: 134,
           column: 36
         }
       },
-      "29": {
+      "27": {
         start: {
-          line: 140,
+          line: 138,
           column: 2
         },
         end: {
-          line: 223,
+          line: 221,
           column: 4
         }
       },
-      "30": {
+      "28": {
         start: {
-          line: 151,
+          line: 149,
           column: 23
         },
         end: {
-          line: 151,
+          line: 149,
           column: 51
         }
       },
-      "31": {
+      "29": {
         start: {
-          line: 153,
+          line: 151,
           column: 32
         },
         end: {
-          line: 156,
+          line: 154,
           column: 11
         }
       },
-      "32": {
+      "30": {
         start: {
-          line: 157,
+          line: 155,
           column: 10
         },
         end: {
-          line: 157,
+          line: 155,
           column: 59
         }
       },
-      "33": {
+      "31": {
         start: {
-          line: 158,
+          line: 156,
           column: 10
         },
         end: {
-          line: 158,
+          line: 156,
           column: 39
         }
       },
-      "34": {
+      "32": {
         start: {
-          line: 165,
+          line: 163,
           column: 14
         },
         end: {
-          line: 194,
+          line: 192,
           column: 17
         }
       },
-      "35": {
+      "33": {
         start: {
-          line: 168,
+          line: 166,
           column: 20
         },
         end: {
-          line: 173,
+          line: 171,
           column: 22
         }
       },
-      "36": {
+      "34": {
         start: {
-          line: 191,
+          line: 189,
           column: 38
         },
         end: {
-          line: 191,
+          line: 189,
           column: 65
         }
       },
-      "37": {
+      "35": {
         start: {
-          line: 203,
+          line: 201,
           column: 38
         },
         end: {
-          line: 206,
+          line: 204,
           column: 17
         }
       },
-      "38": {
+      "36": {
         start: {
-          line: 207,
+          line: 205,
           column: 16
         },
         end: {
-          line: 207,
+          line: 205,
           column: 65
         }
       }
@@ -30760,7 +31096,7 @@ function cov_2e8k7gwd81() {
             column: 6
           },
           end: {
-            line: 224,
+            line: 222,
             column: 1
           }
         },
@@ -30867,21 +31203,21 @@ function cov_2e8k7gwd81() {
         decl: {
           start: {
             line: 106,
-            column: 26
+            column: 20
           },
           end: {
             line: 106,
-            column: 27
+            column: 21
           }
         },
         loc: {
           start: {
             line: 106,
-            column: 34
+            column: 46
           },
           end: {
-            line: 106,
-            column: 63
+            line: 136,
+            column: 3
           }
         },
         line: 106
@@ -30890,289 +31226,265 @@ function cov_2e8k7gwd81() {
         name: "(anonymous_6)",
         decl: {
           start: {
-            line: 108,
-            column: 20
-          },
-          end: {
-            line: 108,
-            column: 21
-          }
-        },
-        loc: {
-          start: {
-            line: 108,
-            column: 46
-          },
-          end: {
-            line: 138,
-            column: 3
-          }
-        },
-        line: 108
-      },
-      "7": {
-        name: "(anonymous_7)",
-        decl: {
-          start: {
-            line: 116,
+            line: 114,
             column: 22
           },
           end: {
-            line: 116,
+            line: 114,
             column: 23
           }
         },
         loc: {
           start: {
-            line: 117,
+            line: 115,
             column: 6
           },
           end: {
-            line: 117,
+            line: 115,
             column: 62
           }
         },
-        line: 117
+        line: 115
       },
-      "8": {
-        name: "(anonymous_8)",
+      "7": {
+        name: "(anonymous_7)",
         decl: {
           start: {
-            line: 118,
+            line: 116,
             column: 17
           },
           end: {
-            line: 118,
+            line: 116,
             column: 18
           }
         },
         loc: {
           start: {
-            line: 118,
+            line: 116,
             column: 23
           },
           end: {
-            line: 132,
+            line: 130,
             column: 5
           }
         },
-        line: 118
+        line: 116
       },
-      "9": {
-        name: "(anonymous_9)",
+      "8": {
+        name: "(anonymous_8)",
         decl: {
           start: {
-            line: 127,
+            line: 125,
             column: 25
           },
           end: {
-            line: 127,
+            line: 125,
             column: 26
           }
         },
         loc: {
           start: {
-            line: 127,
+            line: 125,
             column: 47
           },
           end: {
-            line: 130,
+            line: 128,
             column: 9
           }
         },
-        line: 127
+        line: 125
       },
-      "10": {
-        name: "(anonymous_10)",
+      "9": {
+        name: "(anonymous_9)",
         decl: {
           start: {
-            line: 133,
+            line: 131,
             column: 14
           },
           end: {
-            line: 133,
+            line: 131,
             column: 15
           }
         },
         loc: {
           start: {
-            line: 134,
+            line: 132,
             column: 6
           },
           end: {
-            line: 134,
+            line: 132,
             column: 69
           }
         },
-        line: 134
+        line: 132
       },
-      "11": {
-        name: "(anonymous_11)",
+      "10": {
+        name: "(anonymous_10)",
         decl: {
           start: {
-            line: 135,
+            line: 133,
             column: 14
           },
           end: {
-            line: 135,
+            line: 133,
             column: 15
           }
         },
         loc: {
           start: {
-            line: 135,
+            line: 133,
             column: 20
           },
           end: {
-            line: 137,
+            line: 135,
             column: 5
           }
         },
-        line: 135
+        line: 133
       },
-      "12": {
-        name: "(anonymous_12)",
+      "11": {
+        name: "(anonymous_11)",
         decl: {
           start: {
-            line: 151,
+            line: 149,
             column: 17
           },
           end: {
-            line: 151,
+            line: 149,
             column: 18
           }
         },
         loc: {
           start: {
-            line: 151,
+            line: 149,
             column: 23
           },
           end: {
-            line: 151,
+            line: 149,
             column: 51
           }
         },
-        line: 151
+        line: 149
       },
-      "13": {
-        name: "(anonymous_13)",
+      "12": {
+        name: "(anonymous_12)",
         decl: {
           start: {
-            line: 152,
+            line: 150,
             column: 18
           },
           end: {
-            line: 152,
+            line: 150,
             column: 19
           }
         },
         loc: {
           start: {
-            line: 152,
+            line: 150,
             column: 24
           },
           end: {
-            line: 159,
+            line: 157,
             column: 9
           }
         },
-        line: 152
+        line: 150
       },
-      "14": {
-        name: "(anonymous_14)",
+      "13": {
+        name: "(anonymous_13)",
         decl: {
           start: {
-            line: 164,
+            line: 162,
             column: 13
           },
           end: {
-            line: 164,
+            line: 162,
             column: 14
           }
         },
         loc: {
           start: {
-            line: 165,
+            line: 163,
             column: 14
           },
           end: {
-            line: 194,
+            line: 192,
             column: 17
           }
         },
-        line: 165
+        line: 163
       },
-      "15": {
-        name: "(anonymous_15)",
+      "14": {
+        name: "(anonymous_14)",
         decl: {
           start: {
-            line: 167,
+            line: 165,
             column: 29
           },
           end: {
-            line: 167,
+            line: 165,
             column: 30
           }
         },
         loc: {
           start: {
-            line: 168,
+            line: 166,
             column: 20
           },
           end: {
-            line: 173,
+            line: 171,
             column: 22
           }
         },
-        line: 168
+        line: 166
       },
-      "16": {
-        name: "(anonymous_16)",
+      "15": {
+        name: "(anonymous_15)",
         decl: {
           start: {
-            line: 191,
+            line: 189,
             column: 30
           },
           end: {
-            line: 191,
+            line: 189,
             column: 31
           }
         },
         loc: {
           start: {
-            line: 191,
+            line: 189,
             column: 38
           },
           end: {
-            line: 191,
+            line: 189,
             column: 65
           }
         },
-        line: 191
+        line: 189
       },
-      "17": {
-        name: "(anonymous_17)",
+      "16": {
+        name: "(anonymous_16)",
         decl: {
           start: {
-            line: 202,
+            line: 200,
             column: 24
           },
           end: {
-            line: 202,
+            line: 200,
             column: 25
           }
         },
         loc: {
           start: {
-            line: 202,
+            line: 200,
             column: 32
           },
           end: {
-            line: 208,
+            line: 206,
             column: 15
           }
         },
-        line: 202
+        line: 200
       }
     },
     branchMap: {
@@ -31254,266 +31566,266 @@ function cov_2e8k7gwd81() {
       "2": {
         loc: {
           start: {
-            line: 114,
+            line: 112,
             column: 6
           },
           end: {
-            line: 115,
+            line: 113,
             column: 55
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 114,
+            line: 112,
             column: 6
           },
           end: {
-            line: 114,
+            line: 112,
             column: 44
           }
         }, {
           start: {
-            line: 115,
+            line: 113,
             column: 6
           },
           end: {
-            line: 115,
+            line: 113,
             column: 55
           }
         }],
-        line: 114
+        line: 112
       },
       "3": {
         loc: {
           start: {
-            line: 114,
+            line: 112,
             column: 21
           },
           end: {
-            line: 114,
+            line: 112,
             column: 43
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 114,
+            line: 112,
             column: 21
           },
           end: {
-            line: 114,
+            line: 112,
             column: 32
           }
         }, {
           start: {
-            line: 114,
+            line: 112,
             column: 36
           },
           end: {
-            line: 114,
+            line: 112,
             column: 43
           }
         }],
-        line: 114
+        line: 112
       },
       "4": {
         loc: {
           start: {
-            line: 115,
+            line: 113,
             column: 21
           },
           end: {
-            line: 115,
+            line: 113,
             column: 43
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 115,
+            line: 113,
             column: 21
           },
           end: {
-            line: 115,
+            line: 113,
             column: 32
           }
         }, {
           start: {
-            line: 115,
+            line: 113,
             column: 36
           },
           end: {
-            line: 115,
+            line: 113,
             column: 43
           }
         }],
-        line: 115
+        line: 113
       },
       "5": {
         loc: {
           start: {
-            line: 117,
+            line: 115,
             column: 27
           },
           end: {
-            line: 117,
+            line: 115,
             column: 49
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 117,
+            line: 115,
             column: 27
           },
           end: {
-            line: 117,
+            line: 115,
             column: 38
           }
         }, {
           start: {
-            line: 117,
+            line: 115,
             column: 42
           },
           end: {
-            line: 117,
+            line: 115,
             column: 49
           }
         }],
-        line: 117
+        line: 115
       },
       "6": {
         loc: {
           start: {
-            line: 148,
+            line: 146,
             column: 12
           },
           end: {
-            line: 149,
+            line: 147,
             column: 61
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 148,
+            line: 146,
             column: 12
           },
           end: {
-            line: 148,
+            line: 146,
             column: 72
           }
         }, {
           start: {
-            line: 149,
+            line: 147,
             column: 12
           },
           end: {
-            line: 149,
+            line: 147,
             column: 61
           }
         }],
-        line: 148
+        line: 146
       },
       "7": {
         loc: {
           start: {
-            line: 162,
+            line: 160,
             column: 9
           },
           end: {
-            line: 211,
+            line: 209,
             column: 9
           }
         },
         type: "cond-expr",
         locations: [{
           start: {
-            line: 163,
+            line: 161,
             column: 10
           },
           end: {
-            line: 196,
+            line: 194,
             column: 23
           }
         }, {
           start: {
-            line: 198,
+            line: 196,
             column: 10
           },
           end: {
-            line: 210,
+            line: 208,
             column: 29
           }
         }],
-        line: 162
+        line: 160
       },
       "8": {
         loc: {
           start: {
-            line: 212,
+            line: 210,
             column: 9
           },
           end: {
-            line: 220,
+            line: 218,
             column: 9
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 212,
+            line: 210,
             column: 9
           },
           end: {
-            line: 212,
+            line: 210,
             column: 24
           }
         }, {
           start: {
-            line: 213,
+            line: 211,
             column: 10
           },
           end: {
-            line: 219,
+            line: 217,
             column: 12
           }
         }],
-        line: 212
+        line: 210
       },
       "9": {
         loc: {
           start: {
-            line: 216,
+            line: 214,
             column: 24
           },
           end: {
-            line: 216,
+            line: 214,
             column: 46
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 216,
+            line: 214,
             column: 24
           },
           end: {
-            line: 216,
+            line: 214,
             column: 36
           }
         }, {
           start: {
-            line: 216,
+            line: 214,
             column: 40
           },
           end: {
-            line: 216,
+            line: 214,
             column: 46
           }
         }],
-        line: 216
+        line: 214
       }
     },
     s: {
@@ -31553,9 +31865,7 @@ function cov_2e8k7gwd81() {
       "33": 0,
       "34": 0,
       "35": 0,
-      "36": 0,
-      "37": 0,
-      "38": 0
+      "36": 0
     },
     f: {
       "0": 0,
@@ -31574,8 +31884,7 @@ function cov_2e8k7gwd81() {
       "13": 0,
       "14": 0,
       "15": 0,
-      "16": 0,
-      "17": 0
+      "16": 0
     },
     b: {
       "0": [0, 0, 0],
@@ -31590,7 +31899,7 @@ function cov_2e8k7gwd81() {
       "9": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "d4de1ee8731b034d1b63d5d5a31a2eeef7a285ee"
+    hash: "7c11acd7f0e5fde99d6d92b950980d529a13322c"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -31617,8 +31926,8 @@ var Form = function Form(_ref) {
     showActionBlock = _ref.showActionBlock,
     formId = _ref.formId,
     setShouldValidate = _ref.setShouldValidate,
-    nonRemovableFields = _ref.nonRemovableFields,
-    requiredFields = _ref.requiredFields,
+    isDeletable = _ref.isDeletable,
+    isRequiredField = _ref.isRequiredField,
     submitButtonProps = _ref.submitButtonProps,
     cancelButtonProps = _ref.cancelButtonProps,
     isKindAlreadyActive = _ref.isKindAlreadyActive,
@@ -31691,16 +32000,10 @@ var Form = function Form(_ref) {
     setFormFieldState(assoc(id, nextFieldState));
   };
   cov_2e8k7gwd81().s[19]++;
-  var isRequiredField = function isRequiredField(kind) {
-    cov_2e8k7gwd81().f[5]++;
-    cov_2e8k7gwd81().s[20]++;
-    return requiredFields.includes(kind);
-  };
-  cov_2e8k7gwd81().s[21]++;
   var formProps = function formProps(item, index, insert$1) {
     var _ref10, _ref11;
-    cov_2e8k7gwd81().f[6]++;
-    cov_2e8k7gwd81().s[22]++;
+    cov_2e8k7gwd81().f[5]++;
+    cov_2e8k7gwd81().s[20]++;
     return {
       name: "questions.".concat(index),
       questionKinds: availableQuestionKinds,
@@ -31709,35 +32012,35 @@ var Form = function Form(_ref) {
       isExpanded: (cov_2e8k7gwd81().b[2][0]++, formFieldState[(_ref10 = (cov_2e8k7gwd81().b[3][0]++, item.nodeId)) !== null && _ref10 !== void 0 ? _ref10 : (cov_2e8k7gwd81().b[3][1]++, item.id)]) && (cov_2e8k7gwd81().b[2][1]++, formFieldState[(_ref11 = (cov_2e8k7gwd81().b[4][0]++, item.nodeId)) !== null && _ref11 !== void 0 ? _ref11 : (cov_2e8k7gwd81().b[4][1]++, item.id)].isExpanded),
       onChangeExpanded: function onChangeExpanded(isExpanded) {
         var _ref12;
-        cov_2e8k7gwd81().f[7]++;
-        cov_2e8k7gwd81().s[23]++;
+        cov_2e8k7gwd81().f[6]++;
+        cov_2e8k7gwd81().s[21]++;
         return handleChangeExpanded((_ref12 = (cov_2e8k7gwd81().b[5][0]++, item.nodeId)) !== null && _ref12 !== void 0 ? _ref12 : (cov_2e8k7gwd81().b[5][1]++, item.id), isExpanded);
       },
       onDuplicate: function onDuplicate() {
-        cov_2e8k7gwd81().f[8]++;
-        var newQuestions = (cov_2e8k7gwd81().s[24]++, insert(item.displayOrder, duplicateFieldData(item), values.questions));
-        cov_2e8k7gwd81().s[25]++;
+        cov_2e8k7gwd81().f[7]++;
+        var newQuestions = (cov_2e8k7gwd81().s[22]++, insert(item.displayOrder, duplicateFieldData(item), values.questions));
+        cov_2e8k7gwd81().s[23]++;
         setFieldValue("questions", newQuestions.map(function (question, index) {
-          cov_2e8k7gwd81().f[9]++;
-          cov_2e8k7gwd81().s[26]++;
+          cov_2e8k7gwd81().f[8]++;
+          cov_2e8k7gwd81().s[24]++;
           return _objectSpread$9(_objectSpread$9({}, question), {}, {
             displayOrder: index + 1
           });
         }));
       },
       onAddNew: function onAddNew(kind) {
-        cov_2e8k7gwd81().f[10]++;
-        cov_2e8k7gwd81().s[27]++;
-        return insert$1(index + 1, createFieldData(kind, isRequiredField(kind)));
+        cov_2e8k7gwd81().f[9]++;
+        cov_2e8k7gwd81().s[25]++;
+        return insert$1(index + 1, createFieldData(kind, isRequiredField(item)));
       },
       onRemove: function onRemove() {
-        cov_2e8k7gwd81().f[11]++;
-        cov_2e8k7gwd81().s[28]++;
+        cov_2e8k7gwd81().f[10]++;
+        cov_2e8k7gwd81().s[26]++;
         setDeleteQuestionIndex(index);
       }
     };
   };
-  cov_2e8k7gwd81().s[29]++;
+  cov_2e8k7gwd81().s[27]++;
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Alert, {
     isOpen: deleteQuestionIndex !== null,
     message: t("questions.deleteAlert.message"),
@@ -31746,16 +32049,16 @@ var Form = function Form(_ref) {
       label: (_ref13 = (cov_2e8k7gwd81().b[6][0]++, INDEPENDENT_LABELS_MAP[(_questions$deleteQues = questions[deleteQuestionIndex]) === null || _questions$deleteQues === void 0 ? void 0 : _questions$deleteQues.kind])) !== null && _ref13 !== void 0 ? _ref13 : (cov_2e8k7gwd81().b[6][1]++, sliceLabel((_questions$deleteQues2 = questions[deleteQuestionIndex]) === null || _questions$deleteQues2 === void 0 ? void 0 : _questions$deleteQues2.label))
     }),
     onClose: function onClose() {
-      cov_2e8k7gwd81().f[12]++;
-      cov_2e8k7gwd81().s[30]++;
+      cov_2e8k7gwd81().f[11]++;
+      cov_2e8k7gwd81().s[28]++;
       return setDeleteQuestionIndex(null);
     },
     onSubmit: function onSubmit() {
-      cov_2e8k7gwd81().f[13]++;
-      var nextQuestions = (cov_2e8k7gwd81().s[31]++, formHelpers.destroyFromList(questions, deleteQuestionIndex));
-      cov_2e8k7gwd81().s[32]++;
+      cov_2e8k7gwd81().f[12]++;
+      var nextQuestions = (cov_2e8k7gwd81().s[29]++, formHelpers.destroyFromList(questions, deleteQuestionIndex));
+      cov_2e8k7gwd81().s[30]++;
       setFieldValue("questions", nextQuestions, false);
-      cov_2e8k7gwd81().s[33]++;
+      cov_2e8k7gwd81().s[31]++;
       setDeleteQuestionIndex(null);
     }
   }), /*#__PURE__*/React__default.createElement(Form$1, _extends$9({}, formDomProps, {
@@ -31765,14 +32068,14 @@ var Form = function Form(_ref) {
   }, function (_ref14) {
     var insert = _ref14.insert,
       push = _ref14.push;
-    cov_2e8k7gwd81().f[14]++;
-    cov_2e8k7gwd81().s[34]++;
+    cov_2e8k7gwd81().f[13]++;
+    cov_2e8k7gwd81().s[32]++;
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(DragDropContext, {
       onDragEnd: function onDragEnd(_ref15) {
         var source = _ref15.source,
           destination = _ref15.destination;
-        cov_2e8k7gwd81().f[15]++;
-        cov_2e8k7gwd81().s[35]++;
+        cov_2e8k7gwd81().f[14]++;
+        cov_2e8k7gwd81().s[33]++;
         return handleFieldDragEnd({
           source: source,
           destination: destination,
@@ -31785,9 +32088,9 @@ var Form = function Form(_ref) {
       formProps: formProps,
       getActiveKindDetails: getActiveKindDetails,
       insert: insert,
+      isDeletable: isDeletable,
       isRequiredField: isRequiredField,
       kindUniqueOn: kindUniqueOn,
-      nonRemovableFields: nonRemovableFields,
       questions: questions
     })), /*#__PURE__*/React__default.createElement("div", {
       className: "mb-8 w-full"
@@ -31795,8 +32098,8 @@ var Form = function Form(_ref) {
       kindUniqueOn: kindUniqueOn,
       questionKinds: availableQuestionKinds,
       onSelect: function onSelect(kind) {
-        cov_2e8k7gwd81().f[16]++;
-        cov_2e8k7gwd81().s[36]++;
+        cov_2e8k7gwd81().f[15]++;
+        cov_2e8k7gwd81().s[34]++;
         return push(createFieldData(kind));
       }
     })));
@@ -31804,9 +32107,9 @@ var Form = function Form(_ref) {
     kindUniqueOn: kindUniqueOn,
     questionKinds: availableQuestionKinds,
     onSelect: function onSelect(kind) {
-      cov_2e8k7gwd81().f[17]++;
-      var nextQuestions = (cov_2e8k7gwd81().s[37]++, formHelpers.pushToList(questions, createFieldData(kind)));
-      cov_2e8k7gwd81().s[38]++;
+      cov_2e8k7gwd81().f[16]++;
+      var nextQuestions = (cov_2e8k7gwd81().s[35]++, formHelpers.pushToList(questions, createFieldData(kind)));
+      cov_2e8k7gwd81().s[36]++;
       setFieldValue("questions", nextQuestions, false);
     }
   }))), (cov_2e8k7gwd81().b[8][0]++, showActionBlock) && (cov_2e8k7gwd81().b[8][1]++, /*#__PURE__*/React__default.createElement(ActionBlock, {
@@ -32168,7 +32471,7 @@ var formValidationSchema = (cov_13igvew484().s[2]++, object().shape({
 
 function cov_2nbnnlcv5p() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/index.jsx";
-  var hash = "9bf2679d6e35d9ba293532d06fb53c83addc07f7";
+  var hash = "3f91bb4f96e8987cc816d9501ef4ff5ac168630d";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -32180,93 +32483,93 @@ function cov_2nbnnlcv5p() {
           column: 18
         },
         end: {
-          line: 149,
+          line: 158,
           column: 1
         }
       },
       "1": {
         start: {
-          line: 36,
+          line: 38,
           column: 54
         },
         end: {
-          line: 36,
+          line: 38,
           column: 69
         }
       },
       "2": {
         start: {
-          line: 38,
+          line: 40,
           column: 22
         },
         end: {
-          line: 38,
+          line: 40,
           column: 38
         }
       },
       "3": {
         start: {
-          line: 40,
+          line: 42,
           column: 43
         },
         end: {
-          line: 45,
+          line: 47,
           column: 4
         }
       },
       "4": {
         start: {
-          line: 42,
+          line: 44,
           column: 22
         },
         end: {
-          line: 42,
+          line: 44,
           column: 41
         }
       },
       "5": {
         start: {
-          line: 44,
+          line: 46,
           column: 6
         },
         end: {
-          line: 44,
+          line: 46,
           column: 28
         }
       },
       "6": {
         start: {
-          line: 53,
+          line: 55,
           column: 6
         },
         end: {
-          line: 71,
+          line: 73,
           column: 4
         }
       },
       "7": {
         start: {
-          line: 55,
+          line: 57,
           column: 23
         },
         end: {
-          line: 55,
+          line: 57,
           column: 39
         }
       },
       "8": {
         start: {
-          line: 73,
-          column: 23
+          line: 75,
+          column: 2
         },
         end: {
-          line: 80,
-          column: 6
+          line: 81,
+          column: 3
         }
       },
       "9": {
         start: {
-          line: 74,
+          line: 76,
           column: 4
         },
         end: {
@@ -32276,101 +32579,141 @@ function cov_2nbnnlcv5p() {
       },
       "10": {
         start: {
-          line: 82,
+          line: 83,
+          column: 23
+        },
+        end: {
+          line: 90,
+          column: 6
+        }
+      },
+      "11": {
+        start: {
+          line: 84,
+          column: 4
+        },
+        end: {
+          line: 90,
+          column: 6
+        }
+      },
+      "12": {
+        start: {
+          line: 92,
           column: 24
         },
         end: {
-          line: 94,
+          line: 104,
           column: 3
         }
       },
-      "11": {
+      "13": {
         start: {
-          line: 83,
+          line: 93,
           column: 32
         },
         end: {
-          line: 86,
+          line: 96,
           column: 6
         }
       },
-      "12": {
+      "14": {
         start: {
-          line: 88,
+          line: 98,
           column: 4
         },
         end: {
-          line: 93,
+          line: 103,
           column: 5
         }
       },
-      "13": {
+      "15": {
         start: {
-          line: 89,
+          line: 99,
           column: 6
         },
         end: {
-          line: 92,
+          line: 102,
           column: 8
         }
       },
-      "14": {
+      "16": {
         start: {
-          line: 96,
-          column: 2
+          line: 107,
+          column: 4
         },
         end: {
-          line: 102,
-          column: 3
+          line: 108,
+          column: 61
         }
       },
-      "15": {
+      "17": {
         start: {
-          line: 97,
+          line: 108,
+          column: 17
+        },
+        end: {
+          line: 108,
+          column: 60
+        }
+      },
+      "18": {
+        start: {
+          line: 111,
           column: 4
         },
         end: {
-          line: 101,
-          column: 6
+          line: 111,
+          column: 68
         }
       },
-      "16": {
+      "19": {
         start: {
-          line: 104,
+          line: 111,
+          column: 38
+        },
+        end: {
+          line: 111,
+          column: 67
+        }
+      },
+      "20": {
+        start: {
+          line: 113,
           column: 2
         },
         end: {
-          line: 148,
+          line: 157,
           column: 4
         }
       },
-      "17": {
+      "21": {
         start: {
-          line: 117,
+          line: 126,
           column: 10
         },
         end: {
-          line: 139,
+          line: 148,
           column: 12
         }
       },
-      "18": {
+      "22": {
         start: {
-          line: 135,
+          line: 144,
           column: 14
         },
         end: {
-          line: 137,
+          line: 146,
           column: 15
         }
       },
-      "19": {
+      "23": {
         start: {
-          line: 136,
+          line: 145,
           column: 16
         },
         end: {
-          line: 136,
+          line: 145,
           column: 49
         }
       }
@@ -32390,183 +32733,231 @@ function cov_2nbnnlcv5p() {
         },
         loc: {
           start: {
-            line: 35,
+            line: 37,
             column: 6
           },
           end: {
-            line: 149,
+            line: 158,
             column: 1
           }
         },
-        line: 35
+        line: 37
       },
       "1": {
         name: "(anonymous_1)",
         decl: {
           start: {
-            line: 42,
+            line: 44,
             column: 13
           },
           end: {
-            line: 42,
+            line: 44,
             column: 14
           }
         },
         loc: {
           start: {
-            line: 42,
+            line: 44,
             column: 22
           },
           end: {
-            line: 42,
+            line: 44,
             column: 41
           }
         },
-        line: 42
+        line: 44
       },
       "2": {
         name: "(anonymous_2)",
         decl: {
           start: {
-            line: 43,
+            line: 45,
             column: 15
           },
           end: {
-            line: 43,
+            line: 45,
             column: 16
           }
         },
         loc: {
           start: {
-            line: 44,
+            line: 46,
             column: 6
           },
           end: {
-            line: 44,
+            line: 46,
             column: 28
           }
         },
-        line: 44
+        line: 46
       },
       "3": {
         name: "(anonymous_3)",
         decl: {
           start: {
-            line: 55,
+            line: 57,
             column: 15
           },
           end: {
-            line: 55,
+            line: 57,
             column: 16
           }
         },
         loc: {
           start: {
-            line: 55,
+            line: 57,
             column: 23
           },
           end: {
-            line: 55,
+            line: 57,
             column: 39
           }
         },
-        line: 55
+        line: 57
       },
       "4": {
         name: "(anonymous_4)",
         decl: {
           start: {
-            line: 73,
+            line: 83,
             column: 23
           },
           end: {
-            line: 73,
+            line: 83,
             column: 24
           }
         },
         loc: {
           start: {
-            line: 74,
+            line: 84,
             column: 4
           },
           end: {
-            line: 80,
+            line: 90,
             column: 6
           }
         },
-        line: 74
+        line: 84
       },
       "5": {
         name: "(anonymous_5)",
         decl: {
           start: {
-            line: 82,
+            line: 92,
             column: 24
           },
           end: {
-            line: 82,
+            line: 92,
             column: 25
           }
         },
         loc: {
           start: {
-            line: 82,
+            line: 92,
             column: 37
           },
           end: {
-            line: 94,
+            line: 104,
             column: 3
           }
         },
-        line: 82
+        line: 92
       },
       "6": {
         name: "(anonymous_6)",
         decl: {
           start: {
-            line: 116,
+            line: 108,
+            column: 5
+          },
+          end: {
+            line: 108,
+            column: 6
+          }
+        },
+        loc: {
+          start: {
+            line: 108,
+            column: 17
+          },
+          end: {
+            line: 108,
+            column: 60
+          }
+        },
+        line: 108
+      },
+      "7": {
+        name: "(anonymous_7)",
+        decl: {
+          start: {
+            line: 111,
+            column: 24
+          },
+          end: {
+            line: 111,
+            column: 25
+          }
+        },
+        loc: {
+          start: {
+            line: 111,
+            column: 38
+          },
+          end: {
+            line: 111,
+            column: 67
+          }
+        },
+        line: 111
+      },
+      "8": {
+        name: "(anonymous_8)",
+        decl: {
+          start: {
+            line: 125,
             column: 9
           },
           end: {
-            line: 116,
+            line: 125,
             column: 10
           }
         },
         loc: {
           start: {
-            line: 117,
+            line: 126,
             column: 10
           },
           end: {
-            line: 139,
+            line: 148,
             column: 12
           }
         },
-        line: 117
+        line: 126
       },
-      "7": {
-        name: "(anonymous_7)",
+      "9": {
+        name: "(anonymous_9)",
         decl: {
           start: {
-            line: 134,
+            line: 143,
             column: 22
           },
           end: {
-            line: 134,
+            line: 143,
             column: 23
           }
         },
         loc: {
           start: {
-            line: 134,
+            line: 143,
             column: 31
           },
           end: {
-            line: 138,
+            line: 147,
             column: 13
           }
         },
-        line: 134
+        line: 143
       }
     },
     branchMap: {
@@ -32741,119 +33132,119 @@ function cov_2nbnnlcv5p() {
       "7": {
         loc: {
           start: {
-            line: 33,
+            line: 35,
             column: 2
           },
           end: {
-            line: 33,
+            line: 35,
             column: 20
           }
         },
         type: "default-arg",
         locations: [{
           start: {
-            line: 33,
+            line: 35,
             column: 15
           },
           end: {
-            line: 33,
+            line: 35,
             column: 20
           }
         }],
-        line: 33
+        line: 35
       },
       "8": {
         loc: {
           start: {
-            line: 34,
+            line: 36,
             column: 2
           },
           end: {
-            line: 34,
+            line: 36,
             column: 25
           }
         },
         type: "default-arg",
         locations: [{
           start: {
-            line: 34,
+            line: 36,
             column: 17
           },
           end: {
-            line: 34,
+            line: 36,
             column: 25
           }
         }],
-        line: 34
+        line: 36
       },
       "9": {
         loc: {
           start: {
-            line: 43,
+            line: 45,
             column: 18
           },
           end: {
-            line: 43,
+            line: 45,
             column: 70
           }
         },
         type: "default-arg",
         locations: [{
           start: {
-            line: 43,
+            line: 45,
             column: 27
           },
           end: {
-            line: 43,
+            line: 45,
             column: 70
           }
         }],
-        line: 43
+        line: 45
       },
       "10": {
         loc: {
           start: {
-            line: 48,
+            line: 50,
             column: 10
           },
           end: {
-            line: 51,
+            line: 53,
             column: 5
           }
         },
         type: "default-arg",
         locations: [{
           start: {
-            line: 48,
+            line: 50,
             column: 46
           },
           end: {
-            line: 51,
+            line: 53,
             column: 5
           }
         }],
-        line: 48
+        line: 50
       },
       "11": {
         loc: {
           start: {
-            line: 88,
-            column: 4
+            line: 75,
+            column: 2
           },
           end: {
-            line: 93,
-            column: 5
+            line: 81,
+            column: 3
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 88,
-            column: 4
+            line: 75,
+            column: 2
           },
           end: {
-            line: 93,
-            column: 5
+            line: 81,
+            column: 3
           }
         }, {
           start: {
@@ -32865,28 +33256,70 @@ function cov_2nbnnlcv5p() {
             column: undefined
           }
         }],
-        line: 88
+        line: 75
       },
       "12": {
         loc: {
           start: {
-            line: 96,
-            column: 2
+            line: 75,
+            column: 6
           },
           end: {
-            line: 102,
-            column: 3
+            line: 75,
+            column: 53
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 75,
+            column: 6
+          },
+          end: {
+            line: 75,
+            column: 15
+          }
+        }, {
+          start: {
+            line: 75,
+            column: 20
+          },
+          end: {
+            line: 75,
+            column: 30
+          }
+        }, {
+          start: {
+            line: 75,
+            column: 34
+          },
+          end: {
+            line: 75,
+            column: 52
+          }
+        }],
+        line: 75
+      },
+      "13": {
+        loc: {
+          start: {
+            line: 98,
+            column: 4
+          },
+          end: {
+            line: 103,
+            column: 5
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 96,
-            column: 2
+            line: 98,
+            column: 4
           },
           end: {
-            line: 102,
-            column: 3
+            line: 103,
+            column: 5
           }
         }, {
           start: {
@@ -32898,102 +33331,126 @@ function cov_2nbnnlcv5p() {
             column: undefined
           }
         }],
-        line: 96
+        line: 98
       },
-      "13": {
+      "14": {
         loc: {
           start: {
-            line: 96,
-            column: 6
+            line: 107,
+            column: 4
           },
           end: {
-            line: 96,
-            column: 53
+            line: 108,
+            column: 61
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 96,
-            column: 6
+            line: 107,
+            column: 4
           },
           end: {
-            line: 96,
-            column: 15
+            line: 107,
+            column: 23
           }
         }, {
           start: {
-            line: 96,
-            column: 20
+            line: 108,
+            column: 5
           },
           end: {
-            line: 96,
-            column: 30
+            line: 108,
+            column: 60
+          }
+        }],
+        line: 107
+      },
+      "15": {
+        loc: {
+          start: {
+            line: 111,
+            column: 4
+          },
+          end: {
+            line: 111,
+            column: 68
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 111,
+            column: 4
+          },
+          end: {
+            line: 111,
+            column: 19
           }
         }, {
           start: {
-            line: 96,
-            column: 34
+            line: 111,
+            column: 24
           },
           end: {
-            line: 96,
-            column: 52
+            line: 111,
+            column: 67
           }
         }],
-        line: 96
+        line: 111
       },
-      "14": {
+      "16": {
         loc: {
           start: {
-            line: 131,
+            line: 140,
             column: 14
           },
           end: {
-            line: 131,
+            line: 140,
             column: 71
           }
         },
         type: "cond-expr",
         locations: [{
           start: {
-            line: 131,
+            line: 140,
             column: 41
           },
           end: {
-            line: 131,
+            line: 140,
             column: 54
           }
         }, {
           start: {
-            line: 131,
+            line: 140,
             column: 57
           },
           end: {
-            line: 131,
+            line: 140,
             column: 71
           }
         }],
-        line: 131
+        line: 140
       },
-      "15": {
+      "17": {
         loc: {
           start: {
-            line: 135,
+            line: 144,
             column: 14
           },
           end: {
-            line: 137,
+            line: 146,
             column: 15
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 135,
+            line: 144,
             column: 14
           },
           end: {
-            line: 137,
+            line: 146,
             column: 15
           }
         }, {
@@ -33006,40 +33463,40 @@ function cov_2nbnnlcv5p() {
             column: undefined
           }
         }],
-        line: 135
+        line: 144
       },
-      "16": {
+      "18": {
         loc: {
           start: {
-            line: 142,
+            line: 151,
             column: 7
           },
           end: {
-            line: 146,
+            line: 155,
             column: 7
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 142,
+            line: 151,
             column: 7
           },
           end: {
-            line: 142,
+            line: 151,
             column: 25
           }
         }, {
           start: {
-            line: 143,
+            line: 152,
             column: 8
           },
           end: {
-            line: 145,
+            line: 154,
             column: 14
           }
         }],
-        line: 142
+        line: 151
       }
     },
     s: {
@@ -33062,7 +33519,11 @@ function cov_2nbnnlcv5p() {
       "16": 0,
       "17": 0,
       "18": 0,
-      "19": 0
+      "19": 0,
+      "20": 0,
+      "21": 0,
+      "22": 0,
+      "23": 0
     },
     f: {
       "0": 0,
@@ -33072,7 +33533,9 @@ function cov_2nbnnlcv5p() {
       "4": 0,
       "5": 0,
       "6": 0,
-      "7": 0
+      "7": 0,
+      "8": 0,
+      "9": 0
     },
     b: {
       "0": [0],
@@ -33087,14 +33550,16 @@ function cov_2nbnnlcv5p() {
       "9": [0],
       "10": [0],
       "11": [0, 0],
-      "12": [0, 0],
-      "13": [0, 0, 0],
+      "12": [0, 0, 0],
+      "13": [0, 0],
       "14": [0, 0],
       "15": [0, 0],
-      "16": [0, 0]
+      "16": [0, 0],
+      "17": [0, 0],
+      "18": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "9bf2679d6e35d9ba293532d06fb53c83addc07f7"
+    hash: "3f91bb4f96e8987cc816d9501ef4ff5ac168630d"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -33114,6 +33579,7 @@ function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$9(Object(source), !0).forEach(function (key) { _defineProperty$a(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 cov_2nbnnlcv5p().s[0]++;
 var BuildForm = function BuildForm(_ref) {
+  var _ref8, _ref9;
   var id = _ref.id,
     onUpdate = _ref.onUpdate,
     buildRequestArgs = _ref.buildRequestArgs,
@@ -33134,6 +33600,8 @@ var BuildForm = function BuildForm(_ref) {
     isKindAlreadyActive = _ref$isKindAlreadyAct === void 0 ? (cov_2nbnnlcv5p().b[5][0]++, isQuestionKindAlreadyActive) : _ref$isKindAlreadyAct,
     _ref$getActiveKindDet = _ref.getActiveKindDetails,
     getActiveKindDetails = _ref$getActiveKindDet === void 0 ? (cov_2nbnnlcv5p().b[6][0]++, getActiveQuestionKindDetails) : _ref$getActiveKindDet,
+    isQuestionDeletable = _ref.isQuestionDeletable,
+    isFieldRequired = _ref.isFieldRequired,
     _ref$showLoader = _ref.showLoader,
     showLoader = _ref$showLoader === void 0 ? (cov_2nbnnlcv5p().b[7][0]++, false) : _ref$showLoader,
     _ref$kindUniqueOn = _ref.kindUniqueOn,
@@ -33189,9 +33657,19 @@ var BuildForm = function BuildForm(_ref) {
     isQuestionsLoading = _ref6$data2.isQuestionsLoading,
     isLoading = _ref6.isLoading;
   cov_2nbnnlcv5p().s[8]++;
+  if ((cov_2nbnnlcv5p().b[12][0]++, isLoading) || (cov_2nbnnlcv5p().b[12][1]++, showLoader) && (cov_2nbnnlcv5p().b[12][2]++, isQuestionsLoading)) {
+    cov_2nbnnlcv5p().b[11][0]++;
+    cov_2nbnnlcv5p().s[9]++;
+    return /*#__PURE__*/React__default.createElement("div", {
+      className: "flex h-full w-full items-center justify-center py-6"
+    }, /*#__PURE__*/React__default.createElement(PageLoader, null));
+  } else {
+    cov_2nbnnlcv5p().b[11][1]++;
+  }
+  cov_2nbnnlcv5p().s[10]++;
   var handleSubmit = function handleSubmit(payload) {
     cov_2nbnnlcv5p().f[4]++;
-    cov_2nbnnlcv5p().s[9]++;
+    cov_2nbnnlcv5p().s[11]++;
     return updateQuestions({
       id: id,
       values: _objectSpread$8({
@@ -33199,31 +33677,32 @@ var BuildForm = function BuildForm(_ref) {
       }, buildRequestArgs)
     });
   };
-  cov_2nbnnlcv5p().s[10]++;
+  cov_2nbnnlcv5p().s[12]++;
   var onValueChange = function onValueChange(questions) {
     cov_2nbnnlcv5p().f[5]++;
-    var _ref7 = (cov_2nbnnlcv5p().s[11]++, queryClient.getQueryState([QUERY_KEYS.QUESTIONS, id])),
+    var _ref7 = (cov_2nbnnlcv5p().s[13]++, queryClient.getQueryState([QUERY_KEYS.QUESTIONS, id])),
       dataUpdateCount = _ref7.dataUpdateCount;
-    cov_2nbnnlcv5p().s[12]++;
+    cov_2nbnnlcv5p().s[14]++;
     if (dataUpdateCount > 0) {
-      cov_2nbnnlcv5p().b[11][0]++;
-      cov_2nbnnlcv5p().s[13]++;
+      cov_2nbnnlcv5p().b[13][0]++;
+      cov_2nbnnlcv5p().s[15]++;
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, "preview/".concat(id)], assoc("questions", questions));
     } else {
-      cov_2nbnnlcv5p().b[11][1]++;
+      cov_2nbnnlcv5p().b[13][1]++;
     }
   };
-  cov_2nbnnlcv5p().s[14]++;
-  if ((cov_2nbnnlcv5p().b[13][0]++, isLoading) || (cov_2nbnnlcv5p().b[13][1]++, showLoader) && (cov_2nbnnlcv5p().b[13][2]++, isQuestionsLoading)) {
-    cov_2nbnnlcv5p().b[12][0]++;
-    cov_2nbnnlcv5p().s[15]++;
-    return /*#__PURE__*/React__default.createElement("div", {
-      className: "flex h-full w-full items-center justify-center py-6"
-    }, /*#__PURE__*/React__default.createElement(PageLoader, null));
-  } else {
-    cov_2nbnnlcv5p().b[12][1]++;
-  }
-  cov_2nbnnlcv5p().s[16]++;
+  var isDeletable = (cov_2nbnnlcv5p().s[16]++, (_ref8 = (cov_2nbnnlcv5p().b[14][0]++, isQuestionDeletable)) !== null && _ref8 !== void 0 ? _ref8 : (cov_2nbnnlcv5p().b[14][1]++, function (question) {
+    cov_2nbnnlcv5p().f[6]++;
+    cov_2nbnnlcv5p().s[17]++;
+    return !nonRemovableFields.includes(question.kind);
+  }));
+  var isRequiredField = (cov_2nbnnlcv5p().s[18]++, (_ref9 = (cov_2nbnnlcv5p().b[15][0]++, isFieldRequired)) !== null && _ref9 !== void 0 ? _ref9 : (cov_2nbnnlcv5p().b[15][1]++, function (_ref10) {
+    var kind = _ref10.kind;
+    cov_2nbnnlcv5p().f[7]++;
+    cov_2nbnnlcv5p().s[19]++;
+    return requiredFields.includes(kind);
+  }));
+  cov_2nbnnlcv5p().s[20]++;
   return /*#__PURE__*/React__default.createElement("div", {
     className: "relative"
   }, /*#__PURE__*/React__default.createElement(Formik, {
@@ -33235,38 +33714,38 @@ var BuildForm = function BuildForm(_ref) {
       questions: questions
     },
     onSubmit: handleSubmit
-  }, function (_ref8) {
-    var errors = _ref8.errors,
-      setFieldError = _ref8.setFieldError;
-    cov_2nbnnlcv5p().f[6]++;
-    cov_2nbnnlcv5p().s[17]++;
+  }, function (_ref11) {
+    var errors = _ref11.errors,
+      setFieldError = _ref11.setFieldError;
+    cov_2nbnnlcv5p().f[8]++;
+    cov_2nbnnlcv5p().s[21]++;
     return /*#__PURE__*/React__default.createElement(Form, _extends$9({}, formDomProps, {
       cancelButtonProps: cancelButtonProps,
       formId: id,
       getActiveKindDetails: getActiveKindDetails,
+      isDeletable: isDeletable,
       isKindAlreadyActive: isKindAlreadyActive,
+      isRequiredField: isRequiredField,
       kindUniqueOn: kindUniqueOn,
-      nonRemovableFields: nonRemovableFields,
-      requiredFields: requiredFields,
       setShouldValidate: setShouldValidateForm,
       showActionBlock: showActionBlock,
       showAddQuestionDivider: showAddQuestionDivider,
       submitButtonProps: submitButtonProps,
-      questionKinds: isPresent(questionKinds) ? (cov_2nbnnlcv5p().b[14][0]++, questionKinds) : (cov_2nbnnlcv5p().b[14][1]++, QUESTION_KINDS),
+      questionKinds: isPresent(questionKinds) ? (cov_2nbnnlcv5p().b[16][0]++, questionKinds) : (cov_2nbnnlcv5p().b[16][1]++, QUESTION_KINDS),
       onValueChange: onValueChange,
       onChange: function onChange(event) {
-        cov_2nbnnlcv5p().f[7]++;
-        cov_2nbnnlcv5p().s[18]++;
+        cov_2nbnnlcv5p().f[9]++;
+        cov_2nbnnlcv5p().s[22]++;
         if (!isEmpty(errors)) {
-          cov_2nbnnlcv5p().b[15][0]++;
-          cov_2nbnnlcv5p().s[19]++;
+          cov_2nbnnlcv5p().b[17][0]++;
+          cov_2nbnnlcv5p().s[23]++;
           setFieldError(event.target.name);
         } else {
-          cov_2nbnnlcv5p().b[15][1]++;
+          cov_2nbnnlcv5p().b[17][1]++;
         }
       }
     }));
-  }), (cov_2nbnnlcv5p().b[16][0]++, isQuestionsLoading) && (cov_2nbnnlcv5p().b[16][1]++, /*#__PURE__*/React__default.createElement("div", {
+  }), (cov_2nbnnlcv5p().b[18][0]++, isQuestionsLoading) && (cov_2nbnnlcv5p().b[18][1]++, /*#__PURE__*/React__default.createElement("div", {
     className: "neeto-ui-bg-gray-100 absolute top-0 left-0 right-0 bottom-0 flex items-center justify-center opacity-75"
   }, /*#__PURE__*/React__default.createElement(PageLoader, null))));
 };
@@ -46022,7 +46501,7 @@ cov_1zuybttr1q().s[8]++;
 var _ref7;
 function cov_1y9t6ere98() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/validations.js";
-  var hash = "d1ecc3936dc48fb7362ad34ab9e6e02e86c5ff20";
+  var hash = "caddab36f5d99d8486ee83ca1f16c9afcc3b5825";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -46374,7 +46853,7 @@ function cov_1y9t6ere98() {
           column: 26
         },
         end: {
-          line: 77,
+          line: 82,
           column: 1
         }
       },
@@ -46385,7 +46864,7 @@ function cov_1y9t6ere98() {
         },
         end: {
           line: 73,
-          column: 71
+          column: 50
         }
       },
       "36": {
@@ -46394,137 +46873,137 @@ function cov_1y9t6ere98() {
           column: 2
         },
         end: {
-          line: 74,
-          column: 73
+          line: 79,
+          column: 3
         }
       },
       "37": {
         start: {
-          line: 74,
-          column: 18
+          line: 75,
+          column: 4
         },
         end: {
-          line: 74,
-          column: 73
+          line: 78,
+          column: 46
         }
       },
       "38": {
         start: {
-          line: 76,
+          line: 81,
           column: 2
         },
         end: {
-          line: 76,
+          line: 81,
           column: 16
         }
       },
       "39": {
         start: {
-          line: 79,
+          line: 84,
           column: 30
         },
         end: {
-          line: 92,
+          line: 97,
           column: 1
         }
       },
       "40": {
         start: {
-          line: 95,
+          line: 100,
           column: 2
         },
         end: {
-          line: 112,
+          line: 117,
           column: 3
         }
       },
       "41": {
         start: {
-          line: 97,
+          line: 102,
           column: 2
         },
         end: {
-          line: 112,
+          line: 117,
           column: 3
         }
       },
       "42": {
         start: {
-          line: 98,
+          line: 103,
           column: 4
         },
         end: {
-          line: 111,
+          line: 116,
           column: 5
         }
       },
       "43": {
         start: {
-          line: 99,
+          line: 104,
           column: 24
         },
         end: {
-          line: 99,
+          line: 104,
           column: 51
         }
       },
       "44": {
         start: {
-          line: 100,
+          line: 105,
           column: 21
         },
         end: {
-          line: 100,
+          line: 105,
           column: 59
         }
       },
       "45": {
         start: {
-          line: 103,
+          line: 108,
           column: 6
         },
         end: {
-          line: 110,
+          line: 115,
           column: 9
         }
       },
       "46": {
         start: {
-          line: 104,
+          line: 109,
           column: 8
         },
         end: {
-          line: 109,
+          line: 114,
           column: 9
         }
       },
       "47": {
         start: {
-          line: 105,
+          line: 110,
           column: 10
         },
         end: {
-          line: 105,
+          line: 110,
           column: 39
         }
       },
       "48": {
         start: {
-          line: 106,
+          line: 111,
           column: 10
         },
         end: {
-          line: 106,
+          line: 111,
           column: 29
         }
       },
       "49": {
         start: {
-          line: 108,
+          line: 113,
           column: 10
         },
         end: {
-          line: 108,
+          line: 113,
           column: 31
         }
       }
@@ -46716,7 +47195,7 @@ function cov_1y9t6ere98() {
             column: 53
           },
           end: {
-            line: 77,
+            line: 82,
             column: 1
           }
         },
@@ -46726,73 +47205,73 @@ function cov_1y9t6ere98() {
         name: "(anonymous_8)",
         decl: {
           start: {
-            line: 95,
+            line: 100,
             column: 2
           },
           end: {
-            line: 95,
+            line: 100,
             column: 3
           }
         },
         loc: {
           start: {
-            line: 97,
+            line: 102,
             column: 2
           },
           end: {
-            line: 112,
+            line: 117,
             column: 3
           }
         },
-        line: 97
+        line: 102
       },
       "9": {
         name: "(anonymous_9)",
         decl: {
           start: {
-            line: 97,
+            line: 102,
             column: 2
           },
           end: {
-            line: 97,
+            line: 102,
             column: 3
           }
         },
         loc: {
           start: {
-            line: 97,
+            line: 102,
             column: 11
           },
           end: {
-            line: 112,
+            line: 117,
             column: 3
           }
         },
-        line: 97
+        line: 102
       },
       "10": {
         name: "(anonymous_10)",
         decl: {
           start: {
-            line: 103,
+            line: 108,
             column: 25
           },
           end: {
-            line: 103,
+            line: 108,
             column: 26
           }
         },
         loc: {
           start: {
-            line: 103,
+            line: 108,
             column: 42
           },
           end: {
-            line: 110,
+            line: 115,
             column: 7
           }
         },
-        line: 103
+        line: 108
       }
     },
     branchMap: {
@@ -47067,8 +47546,8 @@ function cov_1y9t6ere98() {
             column: 2
           },
           end: {
-            line: 74,
-            column: 73
+            line: 79,
+            column: 3
           }
         },
         type: "if",
@@ -47078,8 +47557,8 @@ function cov_1y9t6ere98() {
             column: 2
           },
           end: {
-            line: 74,
-            column: 73
+            line: 79,
+            column: 3
           }
         }, {
           start: {
@@ -47096,22 +47575,22 @@ function cov_1y9t6ere98() {
       "9": {
         loc: {
           start: {
-            line: 98,
+            line: 103,
             column: 4
           },
           end: {
-            line: 111,
+            line: 116,
             column: 5
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 98,
+            line: 103,
             column: 4
           },
           end: {
-            line: 111,
+            line: 116,
             column: 5
           }
         }, {
@@ -47124,7 +47603,7 @@ function cov_1y9t6ere98() {
             column: undefined
           }
         }],
-        line: 98
+        line: 103
       }
     },
     s: {
@@ -47205,7 +47684,7 @@ function cov_1y9t6ere98() {
       "9": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "d1ecc3936dc48fb7362ad34ab9e6e02e86c5ff20"
+    hash: "caddab36f5d99d8486ee83ca1f16c9afcc3b5825"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -47341,12 +47820,12 @@ var validateDateField = function validateDateField(_ref6) {
   var label = _ref6.label,
     isRequired = _ref6.isRequired;
   cov_1y9t6ere98().f[7]++;
-  var schema = (cov_1y9t6ere98().s[35]++, yup.date().typeError(getInvalidTypeError(label, "date")));
+  var schema = (cov_1y9t6ere98().s[35]++, yup.date().typeError("").nullable());
   cov_1y9t6ere98().s[36]++;
   if (isRequired) {
     cov_1y9t6ere98().b[8][0]++;
     cov_1y9t6ere98().s[37]++;
-    schema = schema.required(getRequiredFieldError(label));
+    schema = yup.date().typeError(getInvalidTypeError(label, "date")).required(getRequiredFieldError(label));
   } else {
     cov_1y9t6ere98().b[8][1]++;
   }
@@ -65251,7 +65730,7 @@ var linkifyDecorator = function linkifyDecorator(decoratedHref, decoratedText, k
 
 function cov_29xlle89ll() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/Submissions/Submission.jsx";
-  var hash = "f309c9df1c79dbf4de7b84c18c2f39eed53b297f";
+  var hash = "4cf87e1b1fcaee8e7e2e1f269b349130d14d288a";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -65597,7 +66076,7 @@ function cov_29xlle89ll() {
           },
           end: {
             line: 49,
-            column: 63
+            column: 72
           }
         },
         type: "cond-expr",
@@ -65608,16 +66087,49 @@ function cov_29xlle89ll() {
           },
           end: {
             line: 49,
-            column: 55
+            column: 64
           }
         }, {
           start: {
             line: 49,
-            column: 58
+            column: 67
           },
           end: {
             line: 49,
-            column: 63
+            column: 72
+          }
+        }],
+        line: 49
+      },
+      "9": {
+        loc: {
+          start: {
+            line: 49,
+            column: 33
+          },
+          end: {
+            line: 49,
+            column: 64
+          }
+        },
+        type: "binary-expr",
+        locations: [{
+          start: {
+            line: 49,
+            column: 33
+          },
+          end: {
+            line: 49,
+            column: 38
+          }
+        }, {
+          start: {
+            line: 49,
+            column: 42
+          },
+          end: {
+            line: 49,
+            column: 64
           }
         }],
         line: 49
@@ -65645,10 +66157,11 @@ function cov_29xlle89ll() {
       "5": [0],
       "6": [0, 0],
       "7": [0, 0],
-      "8": [0, 0]
+      "8": [0, 0],
+      "9": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "f309c9df1c79dbf4de7b84c18c2f39eed53b297f"
+    hash: "4cf87e1b1fcaee8e7e2e1f269b349130d14d288a"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -65718,7 +66231,7 @@ var Submission = function Submission(_ref) {
       weight: "semibold"
     }, answerProps), /*#__PURE__*/React__default.createElement(_default, {
       componentDecorator: linkifyDecorator
-    }, kind === "date" ? (cov_29xlle89ll().b[8][0]++, dateFormat.date(value)) : (cov_29xlle89ll().b[8][1]++, value))));
+    }, kind === "date" ? (cov_29xlle89ll().b[8][0]++, (cov_29xlle89ll().b[9][0]++, value) && (cov_29xlle89ll().b[9][1]++, dateFormat.date(value))) : (cov_29xlle89ll().b[8][1]++, value))));
   }));
 };