@bigbinary/neeto-form-frontend 3.12.6 → 3.13.0

package/dist/BuildForm.js

@@ -1,37 +1,36 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { useState, useRef, useEffect, createElement } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
 import classnames from 'classnames';
-import { useFormikContext, useField, Form as Form$3, Formik } from 'formik';
-import { isPresent, truncate, findBy, isNotPresent, slugify, hyphenate, noop, nullSafe, filterBy, removeBy } from '@bigbinary/neeto-cist';
-import { showThumbsUpToastr, withEventTargetValue, hyphenize } from '@bigbinary/neeto-commons-frontend/utils';
+import { isPresent, truncate, findBy, isNotPresent, slugify, existsBy, hyphenate, noop, nullSafe, removeBy } from '@bigbinary/neeto-cist';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
-import { equals, path, curry, assoc, prop, dissoc, when, includes, isEmpty, reject, keys, pick, omit, evolve, map, modify, without, mergeLeft, isNil, pipe, filter, isNotNil, uniq, join, pluck, test, paths, difference, split, last, __, concat, F } from 'ramda';
+import { equals, path, curry, assoc, prop, dissoc, when, includes, isEmpty, reject, keys, pick, omit, evolve, map, mergeLeft, isNil, pipe, filter, isNotNil, uniq, join, pluck, test, paths, difference, split, last, either, T, F } from 'ramda';
 import { j as useDeleteQuestion, Q as QUESTION_TYPES, a as useForm, k as useCreateQuestion, l as useUpdateQuestion, C as CAPTCHA_TYPES, m as useReorderQuestions, i as QUERY_KEYS } from './constants-DBuFEVFA.js';
-import { d as buildDisplayLabel, e as INDEPENDENT_LABELS_MAP, i as isElementOverflowing, D as Drag, f as SELECTABLE_KINDS, h as isAutoGeneratedQuestion, j as isRichTextQuestion, N as NON_BASIC_LATIN_CHARACTERS_REGEX, k as RESERVED_FIELD_CODES, L as LABEL_FIELDS, l as isDefaultLanguage, m as buildDisabledAddButtonTooltipProps, n as buildAddQuestionButtonProps, v as validateEditorContent, F as FIELD_CODES_REJECT_CHARS_REGEX, o as isImmutableField, Q as QUESTIONS_WITHOUT_FIELD_CODE, p as NON_HIDEABLE_FIELDS, q as NON_READ_ONLY_FIELDS, r as RICH_TEXT_QUESTIONS, s as FILE_TYPES_MAP, t as FILE_GROUPS, M as MINIMUM_OPTIONS, u as RATING_OPTIONS, w as STAR_RATING_MIN_VALUE_OPTIONS, x as STAR_RATING_MAX_VALUE_OPTIONS, y as STAR_RATING_ICONS_MAP, z as QUESTION_ACTIONS, A as QUESTION_KINDS, a as QUESTION_KIND, B as getActiveQuestionKindDetails, G as DEFAULT_AVAILABLE_LANGUAGES, H as QUESTIONS_INITIAL_VALUE, J as buildReorderPayload, K as MANDATORY_KINDS } from './constants-DyjXQHMR.js';
+import { d as buildDisplayLabel, e as INDEPENDENT_LABELS_MAP, f as QUESTION_ACTIONS, i as isElementOverflowing, D as Drag, h as SELECTABLE_KINDS, j as isAutoGeneratedQuestion, k as isRichTextQuestion, N as NON_BASIC_LATIN_CHARACTERS_REGEX, l as RESERVED_FIELD_CODES, L as LABEL_FIELDS, m as isDefaultLanguage, n as buildDisabledAddButtonTooltipProps, o as buildAddQuestionButtonProps, v as validateEditorContent, F as FIELD_CODES_REJECT_CHARS_REGEX, p as isImmutableField, Q as QUESTIONS_WITHOUT_FIELD_CODE, q as NON_HIDEABLE_FIELDS, r as NON_READ_ONLY_FIELDS, s as RICH_TEXT_QUESTIONS, t as FILE_TYPES_MAP, u as FILE_GROUPS, M as MINIMUM_OPTIONS, w as RATING_OPTIONS, x as STAR_RATING_MIN_VALUE_OPTIONS, y as STAR_RATING_MAX_VALUE_OPTIONS, z as STAR_RATING_ICONS_MAP, A as buildReorderPayload, B as isMandatoryField, G as QUESTION_KINDS, a as QUESTION_KIND, H as getActiveQuestionKindDetails, J as DEFAULT_AVAILABLE_LANGUAGES, K as DEFAULT_ADVANCED_FEATURES, O as QUESTIONS_INITIAL_VALUE } from './constants-T3w90EO4.js';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import { useState, useRef, useEffect, createElement } from 'react';
 import { Droppable, Draggable, DragDropContext } from '@hello-pangea/dnd';
-import { isMetaKeyPressed, withT, useStateWithDependency, useOnClickOutside } from '@bigbinary/neeto-commons-frontend/react-utils';
-import HelpPopover from '@bigbinary/neeto-molecules/HelpPopover';
-import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
-import { useTranslation, Trans } from 'react-i18next';
-import { a as useBuildFormStore } from './buildForm-nI7TrULn.js';
+import { isMetaKeyPressed, withT, useStateWithDependency, useFuncDebounce, useOnClickOutside } from '@bigbinary/neeto-commons-frontend/react-utils';
+import { showThumbsUpToastr, withEventTargetValue, hyphenize } from '@bigbinary/neeto-commons-frontend/utils';
+import { a as useBuildFormStore } from './buildForm-DQ2wgwuW.js';
 import { shallow } from 'zustand/shallow';
 import Alert from '@bigbinary/neetoui/Alert';
+import { useTranslation, Trans } from 'react-i18next';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import Typography from '@bigbinary/neetoui/Typography';
 import Modal from '@bigbinary/neetoui/Modal';
 import MoreDropdown from '@bigbinary/neeto-molecules/MoreDropdown';
 import Dropdown from '@bigbinary/neetoui/Dropdown';
 import Tooltip from '@bigbinary/neetoui/Tooltip';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { i as isFunction, f as fieldWithFallback, c as isNameQuestion } from './index-BGEdOqsc.js';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { t } from 'i18next';
 import { v4 } from 'uuid';
 import NoData from '@bigbinary/neetoui/NoData';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import Pane from '@bigbinary/neetoui/Pane';
+import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
 import Form$2 from '@bigbinary/neetoui/formik/Form';
+import { useFormikContext, useField } from 'formik';
 import Accordion from '@bigbinary/neetoui/Accordion';
 import Select from '@bigbinary/neetoui/formik/Select';
 import Switch from '@bigbinary/neetoui/formik/Switch';
@@ -43,6 +42,7 @@ import { isEditorEmpty } from '@bigbinary/neeto-editor/utils';
 import * as yup from 'yup';
 import Radio from '@bigbinary/neetoui/formik/Radio';
 import Label from '@bigbinary/neetoui/Label';
+import HelpPopover from '@bigbinary/neeto-molecules/HelpPopover';
 import CreatableSelect from 'react-select/creatable';
 import _toArray from '@babel/runtime/helpers/toArray';
 import Close from '@bigbinary/neeto-icons/Close';
@@ -69,12 +69,14 @@ var DeleteAlert = function DeleteAlert(_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useBuildFormStore = useBuildFormStore(function (store) {
-      var _store$formState;
+      var _store$formState, _store$formState2;
       return {
-        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"]
+        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"],
+        onMutateSuccess: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["onMutateSuccess"]
       };
     }, shallow),
-    selectedLanguage = _useBuildFormStore.selectedLanguage;
+    selectedLanguage = _useBuildFormStore.selectedLanguage,
+    onMutateSuccess = _useBuildFormStore.onMutateSuccess;
   var renderQuestionLabel = function renderQuestionLabel() {
     var questionKind = selectedQuestion.kind;
     var independentLabel = INDEPENDENT_LABELS_MAP[questionKind];
@@ -85,6 +87,10 @@ var DeleteAlert = function DeleteAlert(_ref) {
   var _useDeleteQuestion = useDeleteQuestion(selectedQuestion === null || selectedQuestion === void 0 ? void 0 : selectedQuestion.formId, selectedLanguage, {
       onSuccess: function onSuccess() {
         showThumbsUpToastr();
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [QUESTION_ACTIONS.DELETE].concat(args));
         onClose();
       }
     }),
@@ -151,67 +157,45 @@ var DeleteSmsReminderModal = function DeleteSmsReminderModal(_ref) {
 
 var ChangeLanguageDropdown = function ChangeLanguageDropdown(_ref) {
   var _findBy;
-  var currentLanguage = _ref.currentLanguage,
-    languages = _ref.languages,
-    onChange = _ref.onChange;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isUnsavedChangesAlertOpen = _useState2[0],
-    setIsUnsavedChangesAlertOpen = _useState2[1];
-  var _useState3 = useState(currentLanguage),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectedLanguage = _useState4[0],
-    setSelectedLanguage = _useState4[1];
+  var availableLanguages = _ref.availableLanguages;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useFormikContext = useFormikContext(),
-    dirty = _useFormikContext.dirty;
-  var languageChangeHandler = function languageChangeHandler(code) {
-    if (!dirty) {
-      onChange(code);
-      return;
-    }
-    setSelectedLanguage(code);
-    setIsUnsavedChangesAlertOpen(true);
-  };
+  var _useBuildFormStore = useBuildFormStore(function (store) {
+      var _store$formState, _store$formState2, _store$formState3;
+      return {
+        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"],
+        onLanguageChange: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["onLanguageChange"],
+        isReorderingQuestions: (_store$formState3 = store["formState"]) === null || _store$formState3 === void 0 ? void 0 : _store$formState3["isReorderingQuestions"]
+      };
+    }, shallow),
+    selectedLanguage = _useBuildFormStore.selectedLanguage,
+    onLanguageChange = _useBuildFormStore.onLanguageChange,
+    isReorderingQuestions = _useBuildFormStore.isReorderingQuestions;
   var selectedLanguageName = (_findBy = findBy({
-    code: currentLanguage
-  }, languages)) === null || _findBy === void 0 ? void 0 : _findBy.name;
-  return /*#__PURE__*/jsxs(Fragment, {
-    children: [/*#__PURE__*/jsx(Tooltip, {
-      content: t("neetoForm.questions.changeLanguage"),
-      children: /*#__PURE__*/jsx("div", {
-        children: /*#__PURE__*/jsx(Dropdown, {
-          buttonStyle: "secondary",
-          label: selectedLanguageName,
-          children: /*#__PURE__*/jsx(Dropdown.Menu, {
-            children: languages.map(function (_ref2) {
-              var code = _ref2.code,
-                name = _ref2.name;
-              return /*#__PURE__*/jsx(Dropdown.MenuItem.Button, {
-                isActive: currentLanguage === code,
-                onClick: function onClick() {
-                  return languageChangeHandler(code);
-                },
-                children: name
-              }, code);
-            })
+    code: selectedLanguage
+  }, availableLanguages)) === null || _findBy === void 0 ? void 0 : _findBy.name;
+  return /*#__PURE__*/jsx(Tooltip, {
+    content: t("neetoForm.questions.changeLanguage"),
+    children: /*#__PURE__*/jsx("div", {
+      children: /*#__PURE__*/jsx(Dropdown, {
+        buttonStyle: "secondary",
+        disabled: isReorderingQuestions,
+        label: selectedLanguageName,
+        children: /*#__PURE__*/jsx(Dropdown.Menu, {
+          children: availableLanguages.map(function (_ref2) {
+            var code = _ref2.code,
+              name = _ref2.name;
+            return /*#__PURE__*/jsx(Dropdown.MenuItem.Button, {
+              isActive: selectedLanguage === code,
+              onClick: function onClick() {
+                return onLanguageChange(code);
+              },
+              children: name
+            }, code);
           })
         })
       })
-    }), /*#__PURE__*/jsx(Alert, {
-      isOpen: isUnsavedChangesAlertOpen,
-      message: t("neetoForm.questions.unsavedChangesAlert.message"),
-      submitButtonLabel: t("neetoForm.questions.unsavedChangesAlert.discard"),
-      title: t("neetoForm.questions.unsavedChangesAlert.title"),
-      onClose: function onClose() {
-        return setIsUnsavedChangesAlertOpen(false);
-      },
-      onSubmit: function onSubmit() {
-        onChange(selectedLanguage);
-        setIsUnsavedChangesAlertOpen(false);
-      }
-    })]
+    })
   });
 };
 
@@ -219,8 +203,6 @@ var Overview = function Overview(_ref) {
   var title = _ref.title,
     description = _ref.description,
     availableLanguages = _ref.availableLanguages,
-    selectedLanguage = _ref.selectedLanguage,
-    onLanguageChange = _ref.onLanguageChange,
     additionalActionOptions = _ref.additionalActionOptions;
   return /*#__PURE__*/jsxs("div", {
     className: "neeto-form-nano-form-wrapper__overview mb-4 w-full flex-shrink-0 space-y-4 pt-6",
@@ -235,9 +217,7 @@ var Overview = function Overview(_ref) {
       }), /*#__PURE__*/jsxs("div", {
         className: "flex flex-shrink-0 items-center justify-between space-x-1",
         children: [availableLanguages.length > 1 && /*#__PURE__*/jsx(ChangeLanguageDropdown, {
-          currentLanguage: selectedLanguage,
-          languages: availableLanguages,
-          onChange: onLanguageChange
+          availableLanguages: availableLanguages
         }), isPresent(additionalActionOptions) && /*#__PURE__*/jsx(MoreDropdown, {
           dropdownButtonProps: {
             isRounded: true,
@@ -343,8 +323,8 @@ var Card = function Card(_ref) {
   });
 };
 
-function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Questions = function Questions(_ref) {
   var questions = _ref.questions,
     isDeletable = _ref.isDeletable,
@@ -361,7 +341,7 @@ var Questions = function Questions(_ref) {
       var droppableProps = _ref2.droppableProps,
         placeholder = _ref2.placeholder,
         innerRef = _ref2.innerRef;
-      return /*#__PURE__*/jsxs("div", _objectSpread$g(_objectSpread$g({}, droppableProps), {}, {
+      return /*#__PURE__*/jsxs("div", _objectSpread$e(_objectSpread$e({}, droppableProps), {}, {
         className: "space-y-2",
         ref: innerRef,
         children: [questions.map(function (question, index) {
@@ -374,7 +354,7 @@ var Questions = function Questions(_ref) {
             var draggableProps = _ref3.draggableProps,
               dragHandleProps = _ref3.dragHandleProps,
               innerRef = _ref3.innerRef;
-            return /*#__PURE__*/jsx("div", _objectSpread$g(_objectSpread$g(_objectSpread$g({}, draggableProps), dragHandleProps), {}, {
+            return /*#__PURE__*/jsx("div", _objectSpread$e(_objectSpread$e(_objectSpread$e({}, draggableProps), dragHandleProps), {}, {
               ref: innerRef,
               children: /*#__PURE__*/jsx(Card, {
                 allQuestionKinds: allQuestionKinds,
@@ -406,8 +386,8 @@ var arrayHelpers = {
   moveItem: moveItem
 };
 
-function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var isChoiceQuestion = function isChoiceQuestion(question) {
   return includes(question === null || question === void 0 ? void 0 : question.kind, SELECTABLE_KINDS);
 };
@@ -463,7 +443,7 @@ var generateUniqueFieldCode = function generateUniqueFieldCode(_ref2) {
   var candidateFieldCode = "";
 
   //We need to continue this while loop until we can generate a unique fieldCode
-  // eslint-disable-next-line no-constant-condition
+
   while (true) {
     candidateFieldCode = "".concat(prefix).concat(uniqueNumber === 0 ? "" : uniqueNumber);
     if (!findBy({
@@ -476,9 +456,9 @@ var generateUniqueFieldCode = function generateUniqueFieldCode(_ref2) {
 var isQuestionKindAlreadyActive = function isQuestionKindAlreadyActive(_ref3) {
   var activeQuestions = _ref3.activeQuestions,
     kind = _ref3.kind;
-  return activeQuestions.some(function (activeQuestion) {
-    return activeQuestion.kind === kind.type && activeQuestion._destroy !== true;
-  });
+  return existsBy({
+    kind: kind.type
+  }, activeQuestions);
 };
 var handleFieldDragEnd = function handleFieldDragEnd(_ref4) {
   var items = _ref4.items,
@@ -489,11 +469,11 @@ var handleFieldDragEnd = function handleFieldDragEnd(_ref4) {
   var nextItems = _toConsumableArray(items);
   arrayHelpers.moveItem(nextItems, source.index, destination.index);
   var orderedItems = nextItems.map(function (item, index) {
-    return _objectSpread$f(_objectSpread$f({}, item), {}, {
+    return _objectSpread$d(_objectSpread$d({}, item), {}, {
       displayOrder: index
     });
   });
-  setValue("questions", orderedItems);
+  setValue(orderedItems);
 };
 var createFieldData = function createFieldData(_ref5) {
   var _ref5$kind = _ref5.kind,
@@ -511,7 +491,7 @@ var createFieldData = function createFieldData(_ref5) {
     selectedLanguage: selectedLanguage,
     isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds
   });
-  return _objectSpread$f(_objectSpread$f({}, modifiedDefaultValues), {}, {
+  return _objectSpread$d(_objectSpread$d({}, modifiedDefaultValues), {}, {
     metadata: metadata,
     isRequired: isRequired,
     kind: type,
@@ -539,7 +519,7 @@ var duplicateFieldData = function duplicateFieldData(_ref6) {
   var newQuestionLabel = isRichTextQuestion(kind) ? label : t("neetoForm.common.clonedElementLabel", {
     label: label
   });
-  return _objectSpread$f(_objectSpread$f({}, defaultAttributes), {}, {
+  return _objectSpread$d(_objectSpread$d({}, defaultAttributes), {}, {
     isRequired: isRequired,
     kind: kind,
     label: newQuestionLabel,
@@ -623,13 +603,17 @@ var INITIAL_VALUES = {
 };
 var VALID_FIELD_CODE_REGEX = /^[a-z0-9]+(_[a-z0-9]+)*$/;
 
-var _excluded$8 = ["label", "name"];
-function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var useHelpDoc = function useHelpDoc(key) {
+  return useBuildFormStore(path(["formState", "helpDocUrls", key]));
+};
+
+var _excluded$7 = ["label", "name"];
+function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
   var label = _ref.label,
     name = _ref.name,
-    otherProps = _objectWithoutProperties(_ref, _excluded$8);
+    otherProps = _objectWithoutProperties(_ref, _excluded$7);
   var _useFormikContext = useFormikContext(),
     dirty = _useFormikContext.dirty,
     isValid = _useFormikContext.isValid,
@@ -644,7 +628,7 @@ var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
     var end = element.value.length;
     element.setSelectionRange(end, end);
   };
-  return /*#__PURE__*/jsx(Textarea, _objectSpread$e({
+  return /*#__PURE__*/jsx(Textarea, _objectSpread$c({
     label: label,
     name: name,
     className: "neeto-form-nano-adaptive-input",
@@ -658,8 +642,8 @@ var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
   }, otherProps));
 };
 
-function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   var kind = _ref.kind,
     isLabelDisabled = _ref.isLabelDisabled,
@@ -673,14 +657,14 @@ var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   var shouldShowPlaceholder = includes(kind, QUESTIONS_WITH_PLACEHOLDERS);
   return /*#__PURE__*/jsxs("div", {
     className: "space-y-4",
-    children: [/*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$d({
+    children: [/*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$b({
       required: true,
       disabled: isLabelDisabled,
       label: t("neetoForm.questions.common.questionFields.field.question"),
       name: "label",
       placeholder: DEFAULT_PLACEHOLDERS[kind],
       onChange: withEventTargetValue(handleLabelChange)
-    }, labelProps)), shouldShowPlaceholder && /*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$d({
+    }, labelProps)), shouldShowPlaceholder && /*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$b({
       className: "neeto-form-nano-placeholder-input neeto-form-nano-placeholder-input-".concat(kind),
       name: "placeholder",
       label: t("neetoForm.questions.common.questionFields.field.placeholder")
@@ -688,8 +672,8 @@ var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   });
 };
 
-function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Name = function Name(_ref) {
   var isLabelDisabled = _ref.isLabelDisabled,
     _handleLabelChange = _ref.handleLabelChange;
@@ -709,7 +693,7 @@ var Name = function Name(_ref) {
       label: t("neetoForm.common.splitAsFirstAndLastNames"),
       name: "isSplitMode"
     }), isSplitMode && !usesCustomSubmissionComponent ? /*#__PURE__*/jsxs(Fragment, {
-      children: [/*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$c(_objectSpread$c({}, commonProps), {}, {
+      children: [/*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
         handleLabelChange: function handleLabelChange(value) {
           return _handleLabelChange(value, LABEL_FIELDS.FIRST_NAME);
         },
@@ -721,7 +705,7 @@ var Name = function Name(_ref) {
           label: t("neetoForm.questions.common.questionFields.field.firstNamePlaceholder"),
           name: "firstNamePlaceholder"
         }
-      })), /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$c(_objectSpread$c({}, commonProps), {}, {
+      })), /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
         handleLabelChange: function handleLabelChange(value) {
           return _handleLabelChange(value, LABEL_FIELDS.LAST_NAME);
         },
@@ -734,7 +718,7 @@ var Name = function Name(_ref) {
           name: "lastNamePlaceholder"
         }
       }))]
-    }) : /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$c(_objectSpread$c({}, commonProps), {}, {
+    }) : /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
       labelProps: {
         name: LABEL_FIELDS.FULL_NAME
       },
@@ -754,14 +738,12 @@ var Properties = function Properties(_ref) {
     handleLabelChange = _ref.handleLabelChange,
     questionProps = _ref.questionProps;
   var _useBuildFormStore = useBuildFormStore(function (store) {
-      var _store$formState, _store$formState2;
+      var _store$formState;
       return {
-        enableDomainWhitelisting: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["enableDomainWhitelisting"],
-        enableDomainBlacklisting: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["enableDomainBlacklisting"]
+        usesCustomSubmissionComponent: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["usesCustomSubmissionComponent"]
       };
     }, shallow),
-    enableDomainWhitelisting = _useBuildFormStore.enableDomainWhitelisting,
-    enableDomainBlacklisting = _useBuildFormStore.enableDomainBlacklisting;
+    usesCustomSubmissionComponent = _useBuildFormStore.usesCustomSubmissionComponent;
   var hasAdditionalData = includes(kind, QUESTIONS_WITH_ADDITIONAL_DATA);
   if (isNameQuestion(kind)) {
     return /*#__PURE__*/jsx(Name, {
@@ -778,8 +760,7 @@ var Properties = function Properties(_ref) {
     }), hasAdditionalData && renderAdditionalData({
       kind: kind,
       questionProps: questionProps,
-      enableDomainWhitelisting: enableDomainWhitelisting,
-      enableDomainBlacklisting: enableDomainBlacklisting
+      usesCustomSubmissionComponent: usesCustomSubmissionComponent
     })]
   });
 };
@@ -810,39 +791,24 @@ var Block = function Block(_ref) {
 var useUpdateEditorContent = function useUpdateEditorContent(_ref) {
   var editorRef = _ref.editorRef,
     fieldName = _ref.fieldName,
-    value = _ref.value,
-    initialValue = _ref.initialValue,
-    fieldCode = _ref.fieldCode;
+    value = _ref.value;
   var initialStateRef = useRef({
     language: "",
     value: null
   });
   var _useBuildFormStore = useBuildFormStore(function (store) {
-      return {
-        setFormData: store["setFormData"]
-      };
-    }, shallow),
-    setFormData = _useBuildFormStore.setFormData;
-  var _useBuildFormStore2 = useBuildFormStore(function (store) {
       var _store$formState, _store$formState2;
       return {
         formId: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["formId"],
         selectedLanguage: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["selectedLanguage"]
       };
     }, shallow),
-    formId = _useBuildFormStore2.formId,
-    language = _useBuildFormStore2.selectedLanguage;
-  var shouldReset = useBuildFormStore(function (store) {
-    return store.formState.richTextFieldsToReset.includes(fieldCode);
-  });
+    formId = _useBuildFormStore.formId,
+    language = _useBuildFormStore.selectedLanguage;
   var setEditorContent = function setEditorContent(content) {
     var _editorRef$current$ed;
     return (_editorRef$current$ed = editorRef.current.editor) === null || _editorRef$current$ed === void 0 || (_editorRef$current$ed = _editorRef$current$ed.commands) === null || _editorRef$current$ed === void 0 ? void 0 : _editorRef$current$ed.setContent(content);
   };
-  if (shouldReset) {
-    setEditorContent(initialValue);
-    setFormData(modify("richTextFieldsToReset", without([fieldCode])));
-  }
   var _useForm = useForm({
       formId: formId,
       language: language
@@ -873,8 +839,6 @@ var Editor = function Editor() {
   var editorRef = useRef({
     editor: {}
   });
-  var _useFormikContext = useFormikContext(),
-    fieldCode = _useFormikContext.values.fieldCode;
   var fieldName = "label";
   var _useField = useField({
       name: fieldName,
@@ -885,16 +849,13 @@ var Editor = function Editor() {
     _useField2$ = _useField2[1],
     touched = _useField2$.touched,
     error = _useField2$.error,
-    initialValue = _useField2$.initialValue,
     _useField2$2 = _useField2[2],
     setTouched = _useField2$2.setTouched,
     setValue = _useField2$2.setValue;
   useUpdateEditorContent({
     editorRef: editorRef,
     fieldName: fieldName,
-    value: value,
-    initialValue: initialValue,
-    fieldCode: fieldCode
+    value: value
   });
   return /*#__PURE__*/jsx("div", {
     className: "w-full cursor-auto",
@@ -924,12 +885,12 @@ var RequiredSwitch = withT(function (_ref) {
   });
 });
 
-var _excluded$7 = ["maxLength"];
-function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$6 = ["maxLength"];
+function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var InputWithMaxLength = function InputWithMaxLength(_ref) {
   var maxLength = _ref.maxLength,
-    props = _objectWithoutProperties(_ref, _excluded$7);
+    props = _objectWithoutProperties(_ref, _excluded$6);
   var _useField = useField(props),
     _useField2 = _slicedToArray(_useField, 3),
     value = _useField2[0].value,
@@ -940,13 +901,13 @@ var InputWithMaxLength = function InputWithMaxLength(_ref) {
     }
   }, [value, maxLength, setValue]);
   var shouldShowMaxLength = value && value.length > maxLength - 10;
-  return /*#__PURE__*/jsx(Input, _objectSpread$b(_objectSpread$b({}, props), shouldShowMaxLength && {
+  return /*#__PURE__*/jsx(Input, _objectSpread$9(_objectSpread$9({}, props), shouldShowMaxLength && {
     maxLength: maxLength
   }));
 };
 
 var FieldCode = function FieldCode() {
-  var helpDocUrl = useBuildFormStore(path(["formState", "helpDocUrls", "fieldCode"]));
+  var helpDocUrl = useHelpDoc("fieldCode");
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return /*#__PURE__*/jsx(InputWithMaxLength, {
@@ -973,11 +934,10 @@ var Form$1 = function Form(_ref) {
     initialFocusRef = _ref.initialFocusRef,
     isRequiredField = _ref.isRequiredField,
     isDisabledFieldLabel = _ref.isDisabledFieldLabel,
-    enableFieldCode = _ref.enableFieldCode,
     allQuestionKinds = _ref.allQuestionKinds,
     availableQuestionKinds = _ref.availableQuestionKinds,
     getActiveKindDetails = _ref.getActiveKindDetails,
-    additionalQuestionKindPattern = _ref.additionalQuestionKindPattern,
+    kindUniqueOn = _ref.kindUniqueOn,
     _ref$isEdit = _ref.isEdit,
     isEdit = _ref$isEdit === void 0 ? false : _ref$isEdit;
   var _useState = useState(false),
@@ -994,25 +954,28 @@ var Form$1 = function Form(_ref) {
     setFieldValue = _useFormikContext.setFieldValue,
     errors = _useFormikContext.errors,
     submitCount = _useFormikContext.submitCount;
-  var hideQuestionHelpDoc = useBuildFormStore(path(["formState", "helpDocUrls", "hideQuestion"]));
-  var readOnlyHelpDoc = useBuildFormStore(path(["formState", "helpDocUrls", "readOnly"]));
-  var responseVisibleOnlyToHostHelpDoc = useBuildFormStore(path(["formState", "helpDocUrls", "responseVisibleOnlyToHost"]));
+  var hideQuestionHelpDocUrl = useHelpDoc("hideQuestion");
+  var readOnlyHelpDocUrl = useHelpDoc("readOnly");
+  var responseVisibleOnlyToHostHelpDocUrl = useHelpDoc("responseVisibleOnlyToHost");
   var _useBuildFormStore = useBuildFormStore(function (store) {
       var _store$formState, _store$formState2, _store$formState3, _store$formState4;
       return {
-        showReadOnlySwitch: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["showReadOnlySwitch"],
-        showResponseVisibleOnlyToHostSwitch: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["showResponseVisibleOnlyToHostSwitch"],
-        selectedLanguage: (_store$formState3 = store["formState"]) === null || _store$formState3 === void 0 ? void 0 : _store$formState3["selectedLanguage"],
-        isUsingDefaultQuestionKinds: (_store$formState4 = store["formState"]) === null || _store$formState4 === void 0 ? void 0 : _store$formState4["isUsingDefaultQuestionKinds"]
+        advancedFeatures: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["advancedFeatures"],
+        selectedLanguage: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["selectedLanguage"],
+        isUsingDefaultQuestionKinds: (_store$formState3 = store["formState"]) === null || _store$formState3 === void 0 ? void 0 : _store$formState3["isUsingDefaultQuestionKinds"],
+        usesCustomSubmissionComponent: (_store$formState4 = store["formState"]) === null || _store$formState4 === void 0 ? void 0 : _store$formState4["usesCustomSubmissionComponent"]
       };
     }, shallow),
-    showReadOnlySwitch = _useBuildFormStore.showReadOnlySwitch,
-    showResponseVisibleOnlyToHostSwitch = _useBuildFormStore.showResponseVisibleOnlyToHostSwitch,
+    advancedFeatures = _useBuildFormStore.advancedFeatures,
     selectedLanguage = _useBuildFormStore.selectedLanguage,
-    isUsingDefaultQuestionKinds = _useBuildFormStore.isUsingDefaultQuestionKinds;
+    isUsingDefaultQuestionKinds = _useBuildFormStore.isUsingDefaultQuestionKinds,
+    usesCustomSubmissionComponent = _useBuildFormStore.usesCustomSubmissionComponent;
+  var isFieldCodeEnabled = advancedFeatures.fieldCode,
+    markResponsesAsReadOnly = advancedFeatures.markResponsesAsReadOnly,
+    restrictResponseVisibilityToHost = advancedFeatures.restrictResponseVisibilityToHost;
   var kind = values.kind;
   var questionKinds = isEdit ? allQuestionKinds : availableQuestionKinds;
-  var questionKindUniquenessPattern = mergeLeft(isEdit && additionalQuestionKindPattern ? additionalQuestionKindPattern(values) : {}, {
+  var questionKindUniquenessPattern = mergeLeft(isEdit && kindUniqueOn ? kindUniqueOn(values) : {}, {
     type: kind
   });
   var _useStateWithDependen = useStateWithDependency(getQuestionKind(questionKinds, questionKindUniquenessPattern), [kind]),
@@ -1032,10 +995,10 @@ var Form$1 = function Form(_ref) {
   var isRequired = questionKind && isRequiredField(questionKind);
   var isLabelDisabled = questionKind && isDisabledFieldLabel(questionKind);
   var isImmutable = questionKind && isImmutableField(questionKind);
-  var shouldShowFieldCode = enableFieldCode && !includes(kind, QUESTIONS_WITHOUT_FIELD_CODE);
-  var shouldShowHideSwitch = !includes(kind, NON_HIDEABLE_FIELDS);
-  var shouldShowResponseVisibleOnlyToHostSwitch = showResponseVisibleOnlyToHostSwitch && !includes(kind, NON_HIDEABLE_FIELDS);
-  var shouldShowReadOnlySwitch = showReadOnlySwitch && !includes(kind, NON_READ_ONLY_FIELDS);
+  var shouldShowFieldCode = isFieldCodeEnabled && !includes(kind, QUESTIONS_WITHOUT_FIELD_CODE);
+  var shouldShowHideSwitch = isFieldCodeEnabled && !usesCustomSubmissionComponent && !includes(kind, NON_HIDEABLE_FIELDS);
+  var canRestrictResponseVisibilityToHost = restrictResponseVisibilityToHost && !includes(kind, NON_HIDEABLE_FIELDS);
+  var canMarkResponsesAsReadOnly = markResponsesAsReadOnly && !includes(kind, NON_READ_ONLY_FIELDS);
   var isSettingsBlockVisible = !isRequired && (!isImmutable || shouldShowHideSwitch);
   var handleKindChange = function handleKindChange(option) {
     var data = buildQuestionData(option);
@@ -1103,26 +1066,26 @@ var Form$1 = function Form(_ref) {
           title: t("neetoForm.common.settings"),
           children: [!isImmutable && /*#__PURE__*/jsx(RequiredSwitch, {}), shouldShowHideSwitch && /*#__PURE__*/jsx(Switch, {
             label: t("neetoForm.common.hideQuestion"),
-            labelProps: hideSwitchLabelProps(hideQuestionHelpDoc),
+            labelProps: hideSwitchLabelProps(hideQuestionHelpDocUrl),
             name: "isHidden"
-          }), shouldShowResponseVisibleOnlyToHostSwitch && /*#__PURE__*/jsx(Switch, {
+          }), canRestrictResponseVisibilityToHost && /*#__PURE__*/jsx(Switch, {
             label: t("neetoForm.common.responseVisibleOnlyToHost"),
             name: "isResponseVisibleOnlyToHost",
-            labelProps: responseVisibleOnlyToHostSwitchLabelProps(responseVisibleOnlyToHostHelpDoc)
+            labelProps: responseVisibleOnlyToHostSwitchLabelProps(responseVisibleOnlyToHostHelpDocUrl)
           })]
-        }), (shouldShowFieldCode || shouldShowReadOnlySwitch) && /*#__PURE__*/jsx(Accordion, {
-          defaultActiveKey: isFieldCodeInvalid ? 0 : null // This is to open the accordion when field code is invalid
-          ,
+        }), (shouldShowFieldCode || canMarkResponsesAsReadOnly) && /*#__PURE__*/jsx(Accordion, {
           className: "neeto-form-nano-advanced-properties-accordion",
           "data-cy": "advanced-properties-card",
+          defaultActiveKey: isFieldCodeInvalid ? 0 : null // This is to open the accordion when field code is invalid
+          ,
           children: /*#__PURE__*/jsx(Accordion.Item, {
             title: t("neetoForm.common.advancedProperties"),
             children: /*#__PURE__*/jsxs("div", {
               className: "flex flex-col space-y-4",
-              children: [shouldShowFieldCode && /*#__PURE__*/jsx(FieldCode, {}), shouldShowReadOnlySwitch && /*#__PURE__*/jsx(Switch, {
+              children: [shouldShowFieldCode && /*#__PURE__*/jsx(FieldCode, {}), canMarkResponsesAsReadOnly && /*#__PURE__*/jsx(Switch, {
                 label: t("neetoForm.common.readOnly"),
-                labelProps: readOnlySwitchLabelProps(readOnlyHelpDoc),
-                name: "isReadOnly"
+                name: "isReadOnly",
+                labelProps: readOnlySwitchLabelProps(readOnlyHelpDocUrl)
               })]
             })
           })
@@ -1166,7 +1129,7 @@ var buildNameLabelValidationSchema = function buildNameLabelValidationSchema(que
 };
 var stringSchema = yup.string();
 var formValidationSchema = function formValidationSchema(question) {
-  var enableFieldCode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var isFieldCodeEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return yup.object().shape({
     kind: yup.string().trim().required(t("neetoForm.common.fieldReq", {
       field: t("neetoForm.questions.common.questionFields.field.questionType")
@@ -1176,7 +1139,7 @@ var formValidationSchema = function formValidationSchema(question) {
     firstNameLabel: buildNameLabelValidationSchema(question, stringSchema),
     lastNameLabel: buildNameLabelValidationSchema(question, stringSchema),
     fieldCode: yup.string().trim().notOneOf(RESERVED_FIELD_CODES, t("neetoForm.error.invalidFieldCode")).when("kind", function (kind, schema) {
-      return enableFieldCode && !includes(kind, QUESTIONS_WITHOUT_FIELD_CODE) ? fieldCodeValidation(schema, t("neetoForm.questions.common.questionFields.field.fieldCode")) : schema.notRequired();
+      return isFieldCodeEnabled && !includes(kind, QUESTIONS_WITHOUT_FIELD_CODE) ? fieldCodeValidation(schema, t("neetoForm.questions.common.questionFields.field.fieldCode")) : schema.notRequired();
     }),
     optionsAttributes: yup.array().when("kind", function (kind, schema) {
       return includes(kind, SELECTABLE_KINDS) ? schema.of(yup.object().shape({
@@ -1192,30 +1155,36 @@ var formValidationSchema = function formValidationSchema(question) {
   });
 };
 
-var _excluded$6 = ["question", "onClose", "questions", "handleSelect", "buildRequestArgs", "isOpen"];
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$5 = ["question", "onClose", "questions", "handleSelect", "isOpen"];
+function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Add = function Add(_ref) {
   var question = _ref.question,
     onClose = _ref.onClose,
     questions = _ref.questions,
     handleSelect = _ref.handleSelect,
-    buildRequestArgs = _ref.buildRequestArgs,
     isOpen = _ref.isOpen,
-    props = _objectWithoutProperties(_ref, _excluded$6);
+    props = _objectWithoutProperties(_ref, _excluded$5);
   var _useBuildFormStore = useBuildFormStore(function (store) {
-      var _store$formState, _store$formState2;
+      var _store$formState, _store$formState2, _store$formState3;
       return {
         formId: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["formId"],
-        selectedLanguage: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["selectedLanguage"]
+        selectedLanguage: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["selectedLanguage"],
+        onMutateSuccess: (_store$formState3 = store["formState"]) === null || _store$formState3 === void 0 ? void 0 : _store$formState3["onMutateSuccess"]
       };
     }, shallow),
     formId = _useBuildFormStore.formId,
-    language = _useBuildFormStore.selectedLanguage;
+    language = _useBuildFormStore.selectedLanguage,
+    onMutateSuccess = _useBuildFormStore.onMutateSuccess;
+  var isFieldCodeEnabled = useBuildFormStore(path(["advancedFeatures", "fieldCode"]));
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useCreateQuestion = useCreateQuestion(formId, language, {
       onSuccess: function onSuccess() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [QUESTION_ACTIONS.ADD].concat(args));
         showThumbsUpToastr();
         onClose();
       }
@@ -1225,12 +1194,12 @@ var Add = function Add(_ref) {
   var handleSubmit = function handleSubmit(values) {
     if (isCreating || !isOpen) return;
     var displayOrder = question ? question.displayOrder + 1 : questions.length;
-    createQuestion(_objectSpread$a({
+    createQuestion({
       language: language,
       neetoFormQuestion: mergeLeft({
         displayOrder: displayOrder
       }, values)
-    }, buildRequestArgs), {
+    }, {
       onSuccess: function onSuccess(_ref2) {
         var questions = _ref2.questions;
         var newQuestion = findBy({
@@ -1250,11 +1219,11 @@ var Add = function Add(_ref) {
     }), /*#__PURE__*/jsx(Form$2, {
       formikProps: {
         initialValues: INITIAL_VALUES,
-        validationSchema: formValidationSchema(INITIAL_VALUES, props["enableFieldCode"]),
+        validationSchema: formValidationSchema(INITIAL_VALUES, isFieldCodeEnabled),
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$a({}, _objectSpread$a(_objectSpread$a({}, props), {}, {
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$8({}, _objectSpread$8(_objectSpread$8({}, props), {}, {
           question: question,
           questions: questions
         }))), /*#__PURE__*/jsx(Pane.Footer, {
@@ -1270,23 +1239,26 @@ var Add = function Add(_ref) {
   });
 };
 
-var _excluded$5 = ["question", "isOpen", "onClose"];
-function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$4 = ["question", "isOpen", "onClose"];
+function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Edit = function Edit(_ref) {
   var question = _ref.question,
     isOpen = _ref.isOpen,
     onClose = _ref.onClose,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    props = _objectWithoutProperties(_ref, _excluded$4);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useBuildFormStore = useBuildFormStore(function (store) {
-      var _store$formState;
+      var _store$formState, _store$formState2;
       return {
-        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"]
+        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"],
+        onMutateSuccess: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["onMutateSuccess"]
       };
     }, shallow),
-    language = _useBuildFormStore.selectedLanguage;
+    language = _useBuildFormStore.selectedLanguage,
+    onMutateSuccess = _useBuildFormStore.onMutateSuccess;
+  var isFieldCodeEnabled = useBuildFormStore(path(["advancedFeatures", "fieldCode"]));
   var _useUpdateQuestion = useUpdateQuestion(question === null || question === void 0 ? void 0 : question.formId, language),
     updateQuestion = _useUpdateQuestion.mutate,
     isUpdating = _useUpdateQuestion.isPending;
@@ -1302,6 +1274,10 @@ var Edit = function Edit(_ref) {
       payload: payload
     }, {
       onSuccess: function onSuccess() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [QUESTION_ACTIONS.EDIT].concat(args));
         showThumbsUpToastr();
         onClose();
       },
@@ -1320,11 +1296,11 @@ var Edit = function Edit(_ref) {
     }), /*#__PURE__*/jsx(Form$2, {
       formikProps: {
         initialValues: question,
-        validationSchema: formValidationSchema(question, props["enableFieldCode"]),
+        validationSchema: formValidationSchema(question, isFieldCodeEnabled),
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$9(_objectSpread$9({}, _objectSpread$9({
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$7(_objectSpread$7({}, _objectSpread$7({
           question: question
         }, props)), {}, {
           isEdit: true
@@ -1359,19 +1335,19 @@ var Captcha = withT(function (_ref) {
   });
 });
 
-var _excluded$4 = ["name", "title", "className"];
-function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$3 = ["name", "title", "className"];
+function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SwitchBlock = function SwitchBlock(_ref) {
   var name = _ref.name,
     title = _ref.title,
     _ref$className = _ref.className,
     className = _ref$className === void 0 ? "" : _ref$className,
-    otherProps = _objectWithoutProperties(_ref, _excluded$4);
+    otherProps = _objectWithoutProperties(_ref, _excluded$3);
   return /*#__PURE__*/jsxs(Label, {
     className: classnames("flex items-center justify-start gap-2 ", className),
     "data-cy": "neeto-form-engine-".concat(hyphenate(title && name), "-toggle-label"),
-    children: [/*#__PURE__*/jsx(Switch, _objectSpread$8(_objectSpread$8({}, _objectSpread$8(_objectSpread$8({}, otherProps), {}, {
+    children: [/*#__PURE__*/jsx(Switch, _objectSpread$6(_objectSpread$6({}, _objectSpread$6(_objectSpread$6({}, otherProps), {}, {
       name: name
     })), {}, {
       "data-cy": "neeto-form-engine-".concat(hyphenate(title && name), "-switch")
@@ -1383,15 +1359,15 @@ var SwitchBlock = function SwitchBlock(_ref) {
   });
 };
 
-function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TitleWithHelpPopover = function TitleWithHelpPopover(_ref) {
   var title = _ref.title,
     description = _ref.description,
     helpLink = _ref.helpLink;
   return /*#__PURE__*/jsxs("div", {
     className: "flex gap-2",
-    children: [title, /*#__PURE__*/jsx(HelpPopover, _objectSpread$7({
+    children: [title, /*#__PURE__*/jsx(HelpPopover, _objectSpread$5({
       description: description,
       popoverProps: {
         position: "top"
@@ -1417,9 +1393,9 @@ var DOMAIN_RESTRICTION_TRANSLATIONS = {
   }
 };
 
-var _excluded$3 = ["children"];
-function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$2 = ["children"];
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var STYLES = {
   border: {
     "default": "1px solid rgb(var(--neeto-ui-gray-400))",
@@ -1431,8 +1407,8 @@ var STYLES = {
   }
 };
 var MultiValueRemove = function MultiValueRemove(props) {
-  return /*#__PURE__*/jsx(components.MultiValueRemove, _objectSpread$6(_objectSpread$6({}, props), {}, {
-    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-cy", "".concat(hyphenize(props.data.label), "-remove-icon"))),
+  return /*#__PURE__*/jsx(components.MultiValueRemove, _objectSpread$4(_objectSpread$4({}, props), {}, {
+    innerProps: _objectSpread$4(_objectSpread$4({}, props.innerProps), {}, _defineProperty({}, "data-cy", "".concat(hyphenize(props.data.label), "-remove-icon"))),
     children: /*#__PURE__*/jsx(Close, {
       size: 16
     })
@@ -1440,7 +1416,7 @@ var MultiValueRemove = function MultiValueRemove(props) {
 };
 var ValueContainer = function ValueContainer(_ref) {
   var children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$3);
+    props = _objectWithoutProperties(_ref, _excluded$2);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var getValue = props.getValue,
@@ -1452,8 +1428,8 @@ var ValueContainer = function ValueContainer(_ref) {
     firstChild = _children[0],
     rest = _children.slice(1);
   var shouldCollapse = !isFocused && value.length > visibleDomainsCount;
-  return /*#__PURE__*/jsxs(components.ValueContainer, _objectSpread$6(_objectSpread$6({}, props), {}, {
-    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-cy", "multi-domain-input-container")),
+  return /*#__PURE__*/jsxs(components.ValueContainer, _objectSpread$4(_objectSpread$4({}, props), {}, {
+    innerProps: _objectSpread$4(_objectSpread$4({}, props.innerProps), {}, _defineProperty({}, "data-cy", "multi-domain-input-container")),
     children: [shouldCollapse ? firstChild.slice(0, visibleDomainsCount) : firstChild, shouldCollapse && /*#__PURE__*/jsx(Tag, {
       style: "secondary",
       label: t("neetoForm.common.remainingItemsCount", {
@@ -1463,8 +1439,8 @@ var ValueContainer = function ValueContainer(_ref) {
   }));
 };
 var ClearIndicator = function ClearIndicator(props) {
-  return /*#__PURE__*/jsx(components.ClearIndicator, _objectSpread$6(_objectSpread$6({}, props), {}, {
-    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-cy", "clear-all-button")),
+  return /*#__PURE__*/jsx(components.ClearIndicator, _objectSpread$4(_objectSpread$4({}, props), {}, {
+    innerProps: _objectSpread$4(_objectSpread$4({}, props.innerProps), {}, _defineProperty({}, "data-cy", "clear-all-button")),
     children: /*#__PURE__*/jsx(Close, {
       className: "cursor-pointer",
       size: 16
@@ -1485,7 +1461,7 @@ var CUSTOM_STYLES = {
   input: assoc("overflow", "hidden"),
   multiValue: function multiValue(styles, _ref2) {
     var valid = _ref2.data.valid;
-    return _objectSpread$6(_objectSpread$6({}, styles), {}, {
+    return _objectSpread$4(_objectSpread$4({}, styles), {}, {
       border: valid ? STYLES.border["default"] : STYLES.border.error,
       color: valid ? STYLES.color["default"] : STYLES.color.error
     });
@@ -1527,9 +1503,9 @@ var formatErrorMessage = function formatErrorMessage(error) {
   return removeDuplicateErrorMessages(error);
 };
 
-var _excluded$2 = ["label", "value", "onChange", "error", "onBlur"];
-function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$1 = ["label", "value", "onChange", "error", "onBlur"];
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MultiDomainInput = function MultiDomainInput(_ref) {
   var _ref$label = _ref.label,
     label = _ref$label === void 0 ? "" : _ref$label,
@@ -1541,7 +1517,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
     error = _ref$error === void 0 ? "" : _ref$error,
     _ref$onBlur = _ref.onBlur,
     onBlur = _ref$onBlur === void 0 ? noop : _ref$onBlur,
-    otherProps = _objectWithoutProperties(_ref, _excluded$2);
+    otherProps = _objectWithoutProperties(_ref, _excluded$1);
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     inputValue = _useState2[0],
@@ -1588,7 +1564,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
         "data-cy": "".concat(hyphenize(label), "-input-label"),
         children: label
       })
-    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$5({
+    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$3({
       isMulti: true,
       required: true,
       classNamePrefix: "neeto-ui-react-select",
@@ -1598,7 +1574,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       className: classnames("neeto-ui-react-select__container neeto-ui-react-select__container--medium neeto-ui-email-input__select", {
         "neeto-ui-react-select__container--error": !!error
       }),
-      styles: _objectSpread$5(_objectSpread$5({}, CUSTOM_STYLES), {}, {
+      styles: _objectSpread$3(_objectSpread$3({}, CUSTOM_STYLES), {}, {
         control: mergeLeft({
           maxHeight: "200px",
           overflowY: "auto"
@@ -1610,7 +1586,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       },
       onInputChange: setInputValue,
       onKeyDown: handleKeyDown
-    }, _objectSpread$5({
+    }, _objectSpread$3({
       inputValue: inputValue,
       isFocused: isFocused,
       onChange: onChange,
@@ -1734,25 +1710,26 @@ var RestrictDomainsBlock = function RestrictDomainsBlock(_ref) {
 };
 
 var Email = function Email(_ref) {
-  var enableDomainWhitelisting = _ref.enableDomainWhitelisting,
-    enableDomainBlacklisting = _ref.enableDomainBlacklisting;
+  var usesCustomSubmissionComponent = _ref.usesCustomSubmissionComponent;
   var _useFormikContext = useFormikContext(),
     _useFormikContext$val = _useFormikContext.values,
     _useFormikContext$val2 = _useFormikContext$val.isDomainWhitelistingEnabled,
     isDomainWhitelistingEnabled = _useFormikContext$val2 === void 0 ? false : _useFormikContext$val2,
     _useFormikContext$val3 = _useFormikContext$val.isDomainBlacklistingEnabled,
     isDomainBlacklistingEnabled = _useFormikContext$val3 === void 0 ? false : _useFormikContext$val3;
-  return /*#__PURE__*/jsxs("div", {
-    className: "flex flex-col space-y-4",
-    children: [enableDomainWhitelisting && /*#__PURE__*/jsx(RestrictDomainsBlock, {
-      domainName: "whitelistedDomains",
-      isDomainRestrictionEnabled: isDomainWhitelistingEnabled,
-      switchName: "isDomainWhitelistingEnabled"
-    }), enableDomainBlacklisting && /*#__PURE__*/jsx(RestrictDomainsBlock, {
-      domainName: "blacklistedDomains",
-      isDomainRestrictionEnabled: isDomainBlacklistingEnabled,
-      switchName: "isDomainBlacklistingEnabled"
-    })]
+  return /*#__PURE__*/jsx("div", {
+    className: "flex flex-col",
+    children: !usesCustomSubmissionComponent && /*#__PURE__*/jsxs(Fragment, {
+      children: [/*#__PURE__*/jsx(RestrictDomainsBlock, {
+        domainName: "whitelistedDomains",
+        isDomainRestrictionEnabled: isDomainWhitelistingEnabled,
+        switchName: "isDomainWhitelistingEnabled"
+      }), /*#__PURE__*/jsx(RestrictDomainsBlock, {
+        domainName: "blacklistedDomains",
+        isDomainRestrictionEnabled: isDomainBlacklistingEnabled,
+        switchName: "isDomainBlacklistingEnabled"
+      })]
+    })
   });
 };
 
@@ -1840,8 +1817,8 @@ var FileUpload = function FileUpload() {
   });
 };
 
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Options = function Options(_ref) {
   var questionProps = _ref.questionProps;
   var _useTranslation = useTranslation(),
@@ -1873,7 +1850,7 @@ var Options = function Options(_ref) {
   var isRemoveOptionDisabled = disableRemoveOption || isManageOptionDisabled;
   return /*#__PURE__*/jsxs("div", {
     className: "w-full",
-    children: [/*#__PURE__*/jsx(Label, _objectSpread$4(_objectSpread$4({
+    children: [/*#__PURE__*/jsx(Label, _objectSpread$2(_objectSpread$2({
       className: "mb-2 block"
     }, optionLabelProps), {}, {
       children: t("neetoForm.questions.common.questionFields.field.options")
@@ -1999,8 +1976,7 @@ var transformValueForOption = function transformValueForOption(_ref) {
 var renderAdditionalData = function renderAdditionalData(_ref2) {
   var kind = _ref2.kind,
     questionProps = _ref2.questionProps,
-    enableDomainWhitelisting = _ref2.enableDomainWhitelisting,
-    enableDomainBlacklisting = _ref2.enableDomainBlacklisting;
+    usesCustomSubmissionComponent = _ref2.usesCustomSubmissionComponent;
   switch (kind) {
     case CHECKBOX:
     case RADIO:
@@ -2017,10 +1993,9 @@ var renderAdditionalData = function renderAdditionalData(_ref2) {
     case CAPTCHA:
       return /*#__PURE__*/jsx(Captcha, {});
     case EMAIL:
-      return enableDomainWhitelisting || enableDomainBlacklisting ? /*#__PURE__*/jsx(Email, {
-        enableDomainBlacklisting: enableDomainBlacklisting,
-        enableDomainWhitelisting: enableDomainWhitelisting
-      }) : null;
+      return !usesCustomSubmissionComponent && /*#__PURE__*/jsx(Email, {
+        usesCustomSubmissionComponent: usesCustomSubmissionComponent
+      });
     default:
       return null;
   }
@@ -2091,23 +2066,23 @@ var readOnlySwitchLabelProps = function readOnlySwitchLabelProps(helpUrl) {
   };
 };
 
-var _excluded$1 = ["isOpen", "onClose", "action", "question", "availableQuestionKinds"];
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded = ["isOpen", "onClose", "action", "question", "availableQuestionKinds"];
+function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ManageQuestionPane = function ManageQuestionPane(_ref) {
   var isOpen = _ref.isOpen,
     onClose = _ref.onClose,
     action = _ref.action,
     question = _ref.question,
     availableQuestionKinds = _ref.availableQuestionKinds,
-    props = _objectWithoutProperties(_ref, _excluded$1);
+    props = _objectWithoutProperties(_ref, _excluded);
   var initialFocusRef = useRef(null);
   var Component = resolveActionComponent(action);
   return /*#__PURE__*/jsx(Pane, {
     initialFocusRef: initialFocusRef,
     isOpen: isOpen,
     onClose: onClose,
-    children: /*#__PURE__*/jsx(Component, _objectSpread$3({}, _objectSpread$3({
+    children: /*#__PURE__*/jsx(Component, _objectSpread$1({}, _objectSpread$1({
       availableQuestionKinds: availableQuestionKinds,
       initialFocusRef: initialFocusRef,
       isOpen: isOpen,
@@ -2117,36 +2092,36 @@ var ManageQuestionPane = function ManageQuestionPane(_ref) {
   });
 };
 
-function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var AddQuestion = function AddQuestion(_ref) {
   var onAdd = _ref.onAdd,
     disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
-    isDisabled = _ref.isDisabled;
+    isDisabled = _ref.isDisabled,
+    addQuestionHelpProps = _ref.addQuestionHelpProps;
   var tooltipProps = buildDisabledAddButtonTooltipProps(isDisabled, disabledAddButtonTooltipProps);
-  return /*#__PURE__*/jsx(Tooltip, _objectSpread$2(_objectSpread$2({}, tooltipProps), {}, {
-    children: /*#__PURE__*/jsx("span", {
-      children: /*#__PURE__*/jsx(Button, _objectSpread$2({}, buildAddQuestionButtonProps(onAdd, isDisabled)))
-    })
-  }));
+  return /*#__PURE__*/jsxs("div", {
+    className: "mb-8 flex w-full items-center gap-x-1",
+    children: [/*#__PURE__*/jsx(Tooltip, _objectSpread(_objectSpread({}, tooltipProps), {}, {
+      children: /*#__PURE__*/jsx("span", {
+        children: /*#__PURE__*/jsx(Button, _objectSpread({}, buildAddQuestionButtonProps(onAdd, isDisabled)))
+      })
+    })), isPresent(addQuestionHelpProps) && /*#__PURE__*/jsx("span", {
+      children: /*#__PURE__*/jsx(HelpPopover, _objectSpread({}, addQuestionHelpProps))
+    })]
+  });
 };
 
-var _excluded = ["questionKinds", "onValueChange", "formId", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "isDisabledFieldLabel", "disabledAddButtonTooltipProps", "enableFieldCode", "isFormEnabled", "savedTitle", "formTitle", "formDescription", "selectedLanguage", "availableLanguages", "onLanguageChange", "additionalActionOptions", "isReordering", "additionalQuestionKindPattern", "showActionBlock", "showReadOnlySwitch", "showResponseVisibleOnlyToHostSwitch", "buildRequestArgs", "enableDomainBlacklisting", "enableDomainWhitelisting", "helpDocUrls", "hostSpecificData", "questionsHelpProps", "isUsingDefaultQuestionKinds", "usesCustomSubmissionComponent"];
-function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Form = function Form(_ref) {
   var questionKinds = _ref.questionKinds,
     onValueChange = _ref.onValueChange,
     formId = _ref.formId,
     isDeletable = _ref.isDeletable,
     isRequiredField = _ref.isRequiredField,
-    submitButtonProps = _ref.submitButtonProps,
-    cancelButtonProps = _ref.cancelButtonProps,
     isKindAlreadyActive = _ref.isKindAlreadyActive,
     getActiveKindDetails = _ref.getActiveKindDetails,
     isDisabledFieldLabel = _ref.isDisabledFieldLabel,
     disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
-    enableFieldCode = _ref.enableFieldCode,
     isFormEnabled = _ref.isFormEnabled,
     savedTitle = _ref.savedTitle,
     formTitle = _ref.formTitle,
@@ -2155,25 +2130,21 @@ var Form = function Form(_ref) {
     availableLanguages = _ref.availableLanguages,
     onLanguageChange = _ref.onLanguageChange,
     additionalActionOptions = _ref.additionalActionOptions,
-    isReordering = _ref.isReordering,
-    additionalQuestionKindPattern = _ref.additionalQuestionKindPattern,
-    showActionBlock = _ref.showActionBlock,
-    showReadOnlySwitch = _ref.showReadOnlySwitch,
-    showResponseVisibleOnlyToHostSwitch = _ref.showResponseVisibleOnlyToHostSwitch,
-    buildRequestArgs = _ref.buildRequestArgs,
-    enableDomainBlacklisting = _ref.enableDomainBlacklisting,
-    enableDomainWhitelisting = _ref.enableDomainWhitelisting,
+    kindUniqueOn = _ref.kindUniqueOn,
     helpDocUrls = _ref.helpDocUrls,
     hostSpecificData = _ref.hostSpecificData,
-    questionsHelpProps = _ref.questionsHelpProps,
+    addQuestionHelpProps = _ref.addQuestionHelpProps,
     isUsingDefaultQuestionKinds = _ref.isUsingDefaultQuestionKinds,
     usesCustomSubmissionComponent = _ref.usesCustomSubmissionComponent,
-    formDomProps = _objectWithoutProperties(_ref, _excluded);
+    questionsFromCache = _ref.questionsFromCache,
+    onMutateSuccess = _ref.onMutateSuccess,
+    advancedFeatures = _ref.advancedFeatures;
   var containerRef = useRef();
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var formikContext = useFormikContext();
-  var _useState = useState(null),
+  var _useStateWithDependen = useStateWithDependency(questionsFromCache),
+    _useStateWithDependen2 = _slicedToArray(_useStateWithDependen, 2),
+    questions = _useStateWithDependen2[0],
+    setQuestions = _useStateWithDependen2[1];
+  var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     selectedQuestion = _useState2[0],
     setSelectedQuestion = _useState2[1];
@@ -2193,43 +2164,57 @@ var Form = function Form(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     isManageQuestionPaneOpen = _useState10[0],
     setIsManageQuestionPaneOpen = _useState10[1];
-  var values = formikContext.values,
-    setFieldValue = formikContext.setFieldValue,
-    dirty = formikContext.dirty,
-    isSubmitting = formikContext.isSubmitting,
-    isValid = formikContext.isValid,
-    errors = formikContext.errors,
-    submitForm = formikContext.submitForm,
-    resetForm = formikContext.resetForm;
   var setFormData = useBuildFormStore(prop("setFormData"));
   var _useCreateQuestion = useCreateQuestion(formId, selectedLanguage, {
-      onSuccess: showThumbsUpToastr
+      onSuccess: function onSuccess() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [QUESTION_ACTIONS.CLONE].concat(args));
+        showThumbsUpToastr();
+      }
     }),
     createQuestion = _useCreateQuestion.mutate;
+  var _useReorderQuestions = useReorderQuestions(formId, selectedLanguage, {
+      onSuccess: function onSuccess() {
+        for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+          args[_key2] = arguments[_key2];
+        }
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [QUESTION_ACTIONS.REORDER].concat(args));
+        setFormData({
+          isReorderingQuestions: false
+        });
+      }
+    }),
+    reorderQuestions = _useReorderQuestions.mutate;
+  var debouncedReorderQuestions = useFuncDebounce(reorderQuestions, 1000);
+  var handleReorder = function handleReorder(questions) {
+    var payload = {
+      neetoFormQuestions: {
+        questions: buildReorderPayload(questions)
+      },
+      language: selectedLanguage
+    };
+    setFormData({
+      isReorderingQuestions: true
+    });
+    debouncedReorderQuestions(payload);
+  };
   useEffect(function () {
     setFormData({
       formId: formId,
       enabled: isFormEnabled,
       title: savedTitle,
-      values: values,
-      dirty: dirty,
-      isSubmitting: isSubmitting,
-      isValid: isValid,
-      errors: errors,
-      submitForm: submitForm,
-      resetForm: resetForm,
       selectedLanguage: selectedLanguage,
       helpDocUrls: helpDocUrls,
-      enableDomainBlacklisting: enableDomainBlacklisting,
-      enableDomainWhitelisting: enableDomainWhitelisting,
       isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds,
-      showReadOnlySwitch: showReadOnlySwitch,
-      showResponseVisibleOnlyToHostSwitch: showResponseVisibleOnlyToHostSwitch,
       usesCustomSubmissionComponent: usesCustomSubmissionComponent,
-      hostSpecificData: hostSpecificData
+      hostSpecificData: hostSpecificData,
+      onMutateSuccess: onMutateSuccess,
+      advancedFeatures: advancedFeatures,
+      onLanguageChange: onLanguageChange
     });
-  }, [formId, isFormEnabled, savedTitle, setFormData, values, dirty, isSubmitting, isValid, errors, submitForm, resetForm, selectedLanguage, helpDocUrls, enableDomainBlacklisting, enableDomainWhitelisting, isUsingDefaultQuestionKinds, showReadOnlySwitch, showResponseVisibleOnlyToHostSwitch, usesCustomSubmissionComponent, hostSpecificData]);
-  var questions = values.questions;
+  }, [formId, isFormEnabled, savedTitle, setFormData, selectedLanguage, helpDocUrls, isUsingDefaultQuestionKinds, usesCustomSubmissionComponent, hostSpecificData, onMutateSuccess, advancedFeatures, onLanguageChange]);
   var handleSelect = function handleSelect(question) {
     setSelectedQuestion(question);
   };
@@ -2251,10 +2236,10 @@ var Form = function Form(_ref) {
     var attributes = mergeLeft({
       displayOrder: displayOrder
     }, values);
-    var payload = _objectSpread$1({
+    var payload = {
       language: selectedLanguage,
       neetoFormQuestion: formatQuestionAttributesForClone(attributes)
-    }, buildRequestArgs);
+    };
     createQuestion(payload, {
       onSuccess: function onSuccess(_ref2) {
         var questions = _ref2.questions;
@@ -2273,7 +2258,7 @@ var Form = function Form(_ref) {
     }
   };
   useOnClickOutside(containerRef, function () {
-    return handleSelect(null);
+    return handleSelect({});
   }, {
     enabled: !(isDeleteAlertOpen || isManageQuestionPaneOpen)
   });
@@ -2285,22 +2270,6 @@ var Form = function Form(_ref) {
     activeQuestions: questions,
     isKindAlreadyActive: isKindAlreadyActive
   });
-  var hasActiveQuestions = questions && questions.length && questions.some(function (question) {
-    return question._destroy !== true;
-  });
-  var handleLanguageChange = function handleLanguageChange(code) {
-    resetForm();
-    onLanguageChange(code);
-  };
-  var richTextQuestions = filterBy({
-    kind: includes(__, RICH_TEXT_QUESTIONS)
-  }, questions);
-  var resetFormData = function resetFormData() {
-    resetForm();
-    setFormData({
-      richTextFieldsToReset: pluck("fieldCode", richTextQuestions)
-    });
-  };
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(DeleteAlert, {
       handleSelect: handleSelect,
@@ -2316,20 +2285,16 @@ var Form = function Form(_ref) {
       onClose: function onClose() {
         return setIsDeleteSmsReminderModalOpen(false);
       }
-    }), /*#__PURE__*/jsxs(Form$3, _objectSpread$1(_objectSpread$1({
-      className: "neeto-form-nano-form-wrapper flex h-full flex-col"
-    }, formDomProps), {}, {
-      noValidate: true,
+    }), /*#__PURE__*/jsxs("div", {
+      className: "neeto-form-nano-form-wrapper flex h-full flex-col",
       children: [formTitle && /*#__PURE__*/jsx(Overview, {
         additionalActionOptions: additionalActionOptions,
         availableLanguages: availableLanguages,
-        selectedLanguage: selectedLanguage,
         description: formDescription,
-        title: formTitle,
-        onLanguageChange: handleLanguageChange
+        title: formTitle
       }), /*#__PURE__*/jsx("div", {
         className: "neeto-form-nano-form-wrapper__body min-h-0 w-full flex-grow space-y-6 overflow-y-auto pb-6",
-        children: hasActiveQuestions ? /*#__PURE__*/jsxs("div", {
+        children: isPresent(questions) ? /*#__PURE__*/jsxs("div", {
           className: "space-y-6",
           ref: containerRef,
           children: [/*#__PURE__*/jsx(DragDropContext, {
@@ -2340,7 +2305,10 @@ var Form = function Form(_ref) {
                 source: source,
                 destination: destination,
                 items: questions,
-                setValue: setFieldValue
+                setValue: function setValue(orderedQuestions) {
+                  setQuestions(orderedQuestions);
+                  handleReorder(orderedQuestions);
+                }
               });
             },
             children: /*#__PURE__*/jsx(Questions, {
@@ -2354,40 +2322,27 @@ var Form = function Form(_ref) {
               onEdit: handleEdit,
               onSelect: handleSelect
             })
-          }), /*#__PURE__*/jsxs("div", {
+          }), /*#__PURE__*/jsx("div", {
             className: "mb-8 flex w-full items-center gap-x-1",
-            children: [/*#__PURE__*/jsx(AddQuestion, {
+            children: /*#__PURE__*/jsx(AddQuestion, {
+              addQuestionHelpProps: addQuestionHelpProps,
               disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
               isDisabled: isEmpty(availableQuestionKinds),
               onAdd: handleAdd
-            }), isPresent(questionsHelpProps) && /*#__PURE__*/jsx("span", {
-              children: /*#__PURE__*/jsx(HelpPopover, _objectSpread$1({}, questionsHelpProps))
-            })]
+            })
           })]
         }) : /*#__PURE__*/jsx(AddFirstQuestion, {
           disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
           isDisabled: isEmpty(availableQuestionKinds),
           onAdd: handleAdd
         })
-      }), (showActionBlock || dirty) && /*#__PURE__*/jsx("div", {
-        className: "neeto-ui-border-gray-300 neeto-form-nano-form-wrapper__footer neeto-ui-bg-white sticky bottom-0 flex flex-shrink-0 justify-end border-t px-6 py-4",
-        children: /*#__PURE__*/jsx(ActionBlock, {
-          submitButtonProps: submitButtonProps,
-          isSubmitting: isReordering,
-          cancelButtonProps: _objectSpread$1({
-            label: t("neetoForm.common.reset"),
-            onClick: resetFormData
-          }, cancelButtonProps)
-        })
       }), /*#__PURE__*/jsx(ManageQuestionPane, {
-        additionalQuestionKindPattern: additionalQuestionKindPattern,
         availableQuestionKinds: availableQuestionKinds,
-        buildRequestArgs: buildRequestArgs,
-        enableFieldCode: enableFieldCode,
         getActiveKindDetails: getActiveKindDetails,
         handleSelect: handleSelect,
         isDisabledFieldLabel: isDisabledFieldLabel,
         isRequiredField: isRequiredField,
+        kindUniqueOn: kindUniqueOn,
         questions: questions,
         action: selectedAction,
         allQuestionKinds: questionKinds,
@@ -2397,75 +2352,49 @@ var Form = function Form(_ref) {
           return setIsManageQuestionPaneOpen(false);
         }
       })]
-    }))]
+    })]
   });
 };
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var BuildForm = function BuildForm(_ref) {
   var id = _ref.id,
-    onUpdate = _ref.onUpdate,
-    buildRequestArgs = _ref.buildRequestArgs,
-    _ref$nonRemovableFiel = _ref.nonRemovableFields,
-    nonRemovableFields = _ref$nonRemovableFiel === void 0 ? [] : _ref$nonRemovableFiel,
-    _ref$requiredFields = _ref.requiredFields,
-    requiredFields = _ref$requiredFields === void 0 ? [] : _ref$requiredFields,
-    formDomProps = _ref.formDomProps,
-    _ref$showActionBlock = _ref.showActionBlock,
-    showActionBlock = _ref$showActionBlock === void 0 ? false : _ref$showActionBlock,
-    submitButtonProps = _ref.submitButtonProps,
-    cancelButtonProps = _ref.cancelButtonProps,
     questionKinds = _ref.questionKinds,
     _ref$isKindAlreadyAct = _ref.isKindAlreadyActive,
     isKindAlreadyActive = _ref$isKindAlreadyAct === void 0 ? isQuestionKindAlreadyActive : _ref$isKindAlreadyAct,
     _ref$getActiveKindDet = _ref.getActiveKindDetails,
     getActiveKindDetails = _ref$getActiveKindDet === void 0 ? getActiveQuestionKindDetails : _ref$getActiveKindDet,
-    isQuestionDeletable = _ref.isQuestionDeletable,
-    isFieldRequired = _ref.isFieldRequired,
+    kindUniqueOn = _ref.kindUniqueOn,
+    _ref$isQuestionDeleta = _ref.isQuestionDeletable,
+    isQuestionDeletable = _ref$isQuestionDeleta === void 0 ? T : _ref$isQuestionDeleta,
+    _ref$isFieldRequired = _ref.isFieldRequired,
+    isFieldRequired = _ref$isFieldRequired === void 0 ? F : _ref$isFieldRequired,
     isFieldLabelDisabled = _ref.isFieldLabelDisabled,
-    _ref$showLoader = _ref.showLoader,
-    showLoader = _ref$showLoader === void 0 ? false : _ref$showLoader,
-    _ref$kindUniqueOn = _ref.kindUniqueOn,
-    kindUniqueOn = _ref$kindUniqueOn === void 0 ? ["type"] : _ref$kindUniqueOn,
-    _ref$allowAdditionalG = _ref.allowAdditionalGuests,
-    allowAdditionalGuests = _ref$allowAdditionalG === void 0 ? false : _ref$allowAdditionalG,
-    disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
-    _ref$enableFieldCode = _ref.enableFieldCode,
-    enableFieldCode = _ref$enableFieldCode === void 0 ? false : _ref$enableFieldCode,
-    _ref$availableLanguag = _ref.availableLanguages,
-    availableLanguages = _ref$availableLanguag === void 0 ? DEFAULT_AVAILABLE_LANGUAGES : _ref$availableLanguag,
-    formDescription = _ref.formDescription,
     _ref$formTitle = _ref.formTitle,
     formTitle = _ref$formTitle === void 0 ? "" : _ref$formTitle,
+    formDescription = _ref.formDescription,
+    _ref$availableLanguag = _ref.availableLanguages,
+    availableLanguages = _ref$availableLanguag === void 0 ? DEFAULT_AVAILABLE_LANGUAGES : _ref$availableLanguag,
     _ref$selectedLanguage = _ref.selectedLanguage,
     selectedLanguage = _ref$selectedLanguage === void 0 ? "en" : _ref$selectedLanguage,
     _ref$onLanguageChange = _ref.onLanguageChange,
     onLanguageChange = _ref$onLanguageChange === void 0 ? noop : _ref$onLanguageChange,
+    _ref$addQuestionHelpP = _ref.addQuestionHelpProps,
+    addQuestionHelpProps = _ref$addQuestionHelpP === void 0 ? {} : _ref$addQuestionHelpP,
+    disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
     _ref$additionalAction = _ref.additionalActionOptions,
     additionalActionOptions = _ref$additionalAction === void 0 ? [] : _ref$additionalAction,
-    additionalQuestionKindPattern = _ref.additionalQuestionKindPattern,
-    _ref$enableDomainBlac = _ref.enableDomainBlacklisting,
-    enableDomainBlacklisting = _ref$enableDomainBlac === void 0 ? true : _ref$enableDomainBlac,
-    _ref$enableDomainWhit = _ref.enableDomainWhitelisting,
-    enableDomainWhitelisting = _ref$enableDomainWhit === void 0 ? true : _ref$enableDomainWhit,
+    _ref$allowAdditionalG = _ref.allowAdditionalGuests,
+    allowAdditionalGuests = _ref$allowAdditionalG === void 0 ? false : _ref$allowAdditionalG,
+    _ref$advancedFeatures = _ref.advancedFeatures,
+    advancedFeatures = _ref$advancedFeatures === void 0 ? DEFAULT_ADVANCED_FEATURES : _ref$advancedFeatures,
     helpDocUrls = _ref.helpDocUrls,
     className = _ref.className,
-    _ref$questionsHelpPro = _ref.questionsHelpProps,
-    questionsHelpProps = _ref$questionsHelpPro === void 0 ? {} : _ref$questionsHelpPro,
-    hostSpecificData = _ref.hostSpecificData,
-    _ref$showReadOnlySwit = _ref.showReadOnlySwitch,
-    showReadOnlySwitch = _ref$showReadOnlySwit === void 0 ? false : _ref$showReadOnlySwit,
-    _ref$showResponseVisi = _ref.showResponseVisibleOnlyToHostSwitch,
-    showResponseVisibleOnlyToHostSwitch = _ref$showResponseVisi === void 0 ? false : _ref$showResponseVisi,
     _ref$usesCustomSubmis = _ref.usesCustomSubmissionComponent,
-    usesCustomSubmissionComponent = _ref$usesCustomSubmis === void 0 ? false : _ref$usesCustomSubmis;
+    usesCustomSubmissionComponent = _ref$usesCustomSubmis === void 0 ? false : _ref$usesCustomSubmis,
+    _ref$onMutateSuccess = _ref.onMutateSuccess,
+    onMutateSuccess = _ref$onMutateSuccess === void 0 ? noop : _ref$onMutateSuccess,
+    hostSpecificData = _ref.hostSpecificData;
   var queryClient = useQueryClient();
-  var _useReorderQuestions = useReorderQuestions(id, {
-      onSuccess: showThumbsUpToastr
-    }),
-    reorderQuestions = _useReorderQuestions.mutate,
-    isReordering = _useReorderQuestions.isPending;
   var _useForm = useForm({
       formId: id,
       language: selectedLanguage
@@ -2476,33 +2405,14 @@ var BuildForm = function BuildForm(_ref) {
   var _ref2 = data || QUESTIONS_INITIAL_VALUE,
     isFormEnabled = _ref2.enabled,
     savedTitle = _ref2.title,
-    questions = _ref2.questions,
+    questionsFromCache = _ref2.questions,
     isQuestionsLoading = _ref2.isQuestionsLoading;
-  useEffect(function () {
-    if (data) {
-      onUpdate === null || onUpdate === void 0 || onUpdate(data);
-    }
-  }, [data]);
-  if (isLoading || showLoader && isQuestionsLoading && !isQuestionsPending) {
+  if (isLoading || isQuestionsLoading && !isQuestionsPending) {
     return /*#__PURE__*/jsx("div", {
       className: "flex h-full w-full items-center justify-center py-6",
       children: /*#__PURE__*/jsx(PageLoader, {})
     });
   }
-  var handleSubmit = function handleSubmit(_ref3, _ref4) {
-    var questions = _ref3.questions;
-    var setSubmitting = _ref4.setSubmitting;
-    var payload = {
-      neetoFormQuestions: {
-        questions: buildReorderPayload(questions)
-      }
-    };
-    reorderQuestions(payload, {
-      onSettled: function onSettled() {
-        return setSubmitting(false);
-      }
-    });
-  };
   var onValueChange = function onValueChange(questions) {
     var _queryClient$getQuery = queryClient.getQueryState([QUERY_KEYS.QUESTIONS, id, selectedLanguage]),
       dataUpdateCount = _queryClient$getQuery.dataUpdateCount;
@@ -2510,13 +2420,7 @@ var BuildForm = function BuildForm(_ref) {
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, "preview/".concat(id), selectedLanguage], assoc("questions", questions));
     }
   };
-  var isDeletable = isQuestionDeletable !== null && isQuestionDeletable !== void 0 ? isQuestionDeletable : function (question) {
-    return !nonRemovableFields.includes(question.kind);
-  };
-  var isRequiredField = isFieldRequired !== null && isFieldRequired !== void 0 ? isFieldRequired : function (_ref5) {
-    var kind = _ref5.kind;
-    return concat(MANDATORY_KINDS, requiredFields).includes(kind);
-  };
+  var isRequiredField = either(isMandatoryField, isFieldRequired);
   var isDisabledFieldLabel = function isDisabledFieldLabel(field) {
     return isImmutableField(field) || (isFieldLabelDisabled !== null && isFieldLabelDisabled !== void 0 ? isFieldLabelDisabled : F)(field);
   };
@@ -2524,63 +2428,36 @@ var BuildForm = function BuildForm(_ref) {
     type: QUESTION_KIND.ADDITIONAL_GUESTS.value
   }, QUESTION_KINDS);
   var isUsingDefaultQuestionKinds = isNil(questionKinds);
-  return /*#__PURE__*/jsxs("div", {
+  return /*#__PURE__*/jsx("div", {
     className: classnames("neeto-form-nano-form-outer-wrapper relative", className),
-    children: [/*#__PURE__*/jsx(Formik, {
-      enableReinitialize: true,
-      initialValues: {
-        questions: questions
-      },
-      onSubmit: handleSubmit,
-      children: function children(_ref6) {
-        var errors = _ref6.errors,
-          setFieldError = _ref6.setFieldError;
-        return /*#__PURE__*/jsx(Form, _objectSpread(_objectSpread({}, _objectSpread(_objectSpread({}, formDomProps), {}, {
-          additionalActionOptions: additionalActionOptions,
-          additionalQuestionKindPattern: additionalQuestionKindPattern,
-          availableLanguages: availableLanguages,
-          buildRequestArgs: buildRequestArgs,
-          cancelButtonProps: cancelButtonProps,
-          disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
-          enableDomainBlacklisting: enableDomainBlacklisting,
-          enableDomainWhitelisting: enableDomainWhitelisting,
-          enableFieldCode: enableFieldCode,
-          formDescription: formDescription,
-          formTitle: formTitle,
-          getActiveKindDetails: getActiveKindDetails,
-          helpDocUrls: helpDocUrls,
-          hostSpecificData: hostSpecificData,
-          isDeletable: isDeletable,
-          isDisabledFieldLabel: isDisabledFieldLabel,
-          isFormEnabled: isFormEnabled,
-          isKindAlreadyActive: isKindAlreadyActive,
-          isReordering: isReordering,
-          isRequiredField: isRequiredField,
-          isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds,
-          kindUniqueOn: kindUniqueOn,
-          onLanguageChange: onLanguageChange,
-          onValueChange: onValueChange,
-          questionsHelpProps: questionsHelpProps,
-          savedTitle: savedTitle,
-          selectedLanguage: selectedLanguage,
-          showActionBlock: showActionBlock,
-          showReadOnlySwitch: showReadOnlySwitch,
-          showResponseVisibleOnlyToHostSwitch: showResponseVisibleOnlyToHostSwitch,
-          submitButtonProps: submitButtonProps,
-          usesCustomSubmissionComponent: usesCustomSubmissionComponent
-        })), {}, {
-          formId: id,
-          questionKinds: isUsingDefaultQuestionKinds ? defaultQuestionKinds : questionKinds,
-          onChange: function onChange(event) {
-            if (isEmpty(errors)) return;
-            setFieldError(event.target.name);
-          }
-        }));
-      }
-    }), isQuestionsLoading && !isQuestionsPending && /*#__PURE__*/jsx("div", {
-      className: "neeto-ui-bg-white absolute inset-0 flex items-center justify-center",
-      children: /*#__PURE__*/jsx(PageLoader, {})
-    })]
+    children: /*#__PURE__*/jsx(Form, {
+      addQuestionHelpProps: addQuestionHelpProps,
+      additionalActionOptions: additionalActionOptions,
+      advancedFeatures: advancedFeatures,
+      availableLanguages: availableLanguages,
+      disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
+      formDescription: formDescription,
+      formTitle: formTitle,
+      getActiveKindDetails: getActiveKindDetails,
+      helpDocUrls: helpDocUrls,
+      hostSpecificData: hostSpecificData,
+      isDisabledFieldLabel: isDisabledFieldLabel,
+      isFormEnabled: isFormEnabled,
+      isKindAlreadyActive: isKindAlreadyActive,
+      isRequiredField: isRequiredField,
+      isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds,
+      kindUniqueOn: kindUniqueOn,
+      onLanguageChange: onLanguageChange,
+      onMutateSuccess: onMutateSuccess,
+      onValueChange: onValueChange,
+      questionsFromCache: questionsFromCache,
+      savedTitle: savedTitle,
+      selectedLanguage: selectedLanguage,
+      usesCustomSubmissionComponent: usesCustomSubmissionComponent,
+      formId: id,
+      isDeletable: isQuestionDeletable,
+      questionKinds: isUsingDefaultQuestionKinds ? defaultQuestionKinds : questionKinds
+    })
   });
 };