datastake-daf 0.6.838 → 0.6.840

package/dist/components/index.js

@@ -4827,7 +4827,7 @@ const config$2 = {
   AddDocument: config$3
 };
 
-const _excluded$F = ["width", "height", "size", "name", "fill"];
+const _excluded$E = ["width", "height", "size", "name", "fill"];
 const CustomIcon = _ref => {
   let {
       width = 14,
@@ -4836,7 +4836,7 @@ const CustomIcon = _ref => {
       name = "",
       fill = "none"
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$F);
+    props = _objectWithoutProperties(_ref, _excluded$E);
   const conf = config$2[name];
   if (conf) {
     return /*#__PURE__*/jsxRuntime.jsx("svg", _objectSpread2(_objectSpread2({}, props), {}, {
@@ -5125,7 +5125,7 @@ createCommonjsModule(function (module, exports) {
 !function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}}));
 });
 
-const _excluded$E = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$D = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
 dayjs__default["default"].extend(customParseFormat);
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(utc);
@@ -5501,7 +5501,7 @@ const filterCreateData = data => {
       createdAt,
       updatedAt
     } = data,
-    rest = _objectWithoutProperties(data, _excluded$E);
+    rest = _objectWithoutProperties(data, _excluded$D);
   const _meta = isObjectEmpty(meta) ? undefined : meta;
   return _objectSpread2(_objectSpread2({}, rest), {}, {
     meta: _meta
@@ -6033,7 +6033,7 @@ SelectFilters.propTypes = {
   apiUrl: PropTypes__default["default"].string
 };
 
-const _excluded$D = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
+const _excluded$C = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -6064,7 +6064,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$D);
+    rest = _objectWithoutProperties(_ref, _excluded$C);
   const source = React.useMemo(() => {
     if (data && Array.isArray(data)) {
       return data;
@@ -6889,7 +6889,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$h;
-const _excluded$C = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$B = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
 function StickyTable(_ref) {
   let {
       size = "small",
@@ -6900,7 +6900,7 @@ function StickyTable(_ref) {
       pagination = false,
       doEmptyRows = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$C);
+    props = _objectWithoutProperties(_ref, _excluded$B);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7428,7 +7428,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$B = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$A = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7442,7 +7442,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$B);
+    restProps = _objectWithoutProperties(_ref, _excluded$A);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7561,12 +7561,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$A = ["children"];
+const _excluded$z = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$A);
+    props = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7706,12 +7706,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$z = ["icon"];
+const _excluded$y = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$z);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -8041,7 +8041,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$y = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$x = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$p
 } = antd.theme;
@@ -8134,7 +8134,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$y);
+    restProps = _objectWithoutProperties(_ref, _excluded$x);
   const {
     token
   } = useToken$p();
@@ -8854,7 +8854,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$x = ["tabs", "onChange", "value", "className"];
+const _excluded$w = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8862,7 +8862,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$x);
+    rest = _objectWithoutProperties(_ref, _excluded$w);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8959,7 +8959,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$w = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$v = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8994,7 +8994,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$w);
+              restProps = _objectWithoutProperties(button, _excluded$v);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -11875,7 +11875,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$v = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$u = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11886,7 +11886,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$v);
+    props = _objectWithoutProperties(_ref, _excluded$u);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11946,7 +11946,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$e;
-const _excluded$u = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$t = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11958,7 +11958,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$u);
+    rest = _objectWithoutProperties(_ref, _excluded$t);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -15689,7 +15689,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$t = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$s = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15703,7 +15703,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$t);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17903,14 +17903,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$s = ["config", "title", "loading"];
+const _excluded$r = ["config", "title", "loading"];
 const Details = _ref => {
   let {
       config = [],
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$s);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header card",
     loading: loading,
@@ -17926,14 +17926,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$r = ["config", "title", "loading"];
+const _excluded$q = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17963,7 +17963,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$q = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$p = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17971,7 +17971,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -18147,14 +18147,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$c;
-const _excluded$p = ["title", "activeSdgGoals", "t"];
+const _excluded$o = ["title", "activeSdgGoals", "t"];
 function SDGWidget(_ref) {
   let {
       title = "Sustainable Development Goals",
       activeSdgGoals = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$p);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18452,7 +18452,7 @@ function SdgList({
   });
 }
 
-const _excluded$o = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$n = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18472,7 +18472,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$o);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18744,13 +18744,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$n = ["title", "children"];
+const _excluded$m = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$n);
+    rest = _objectWithoutProperties(_ref, _excluded$m);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18914,7 +18914,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$m = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$l = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18929,7 +18929,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$m);
+    rest = _objectWithoutProperties(_ref, _excluded$l);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -19298,7 +19298,7 @@ const getVegetationConfig = () => {
 };
 
 var _templateObject$a, _templateObject2$3;
-const _excluded$l = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
+const _excluded$k = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
 function VegetationWidget(_ref) {
   let {
       title = "Vegetation Health",
@@ -19310,7 +19310,7 @@ function VegetationWidget(_ref) {
       growthObservations = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$l);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   let vegetationConfig = getVegetationConfig();
   const allVegetationKeys = vegetationConfig.map(item => item.key);
   if (filterKeys && Array.isArray(filterKeys)) {
@@ -19426,7 +19426,7 @@ const getFaunaConfig = () => {
 };
 
 var _templateObject$9, _templateObject2$2;
-const _excluded$k = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$j = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function FaunaWidget(_ref) {
   let {
       title = "Observed Fauna",
@@ -19437,7 +19437,7 @@ function FaunaWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$k);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   let faunaConfig = getFaunaConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -19502,7 +19502,7 @@ const getInvasiveSpeciesConfig = () => {
 };
 
 var _templateObject$8, _templateObject2$1;
-const _excluded$j = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$i = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function InvasiveSpeciesWidget(_ref) {
   let {
       title = "Invasive Species",
@@ -19514,7 +19514,7 @@ function InvasiveSpeciesWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$j);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   let invasiveSpeciesConfig = getInvasiveSpeciesConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -24937,8 +24937,8 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$i = ["viewGroup"],
-  _excluded2$2 = ["label", "icon", "position"];
+const _excluded$h = ["viewGroup"],
+  _excluded2$1 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
     style = {},
@@ -25009,7 +25009,7 @@ const Content$1 = _ref => {
       if (groups[gKey].viewGroup === key) {
         // eslint-disable-next-line no-unused-vars
         const _groups$gKey = groups[gKey],
-          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$i);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$h);
         items[gKey] = gCfg;
       }
       return items;
@@ -25237,7 +25237,7 @@ const Content$1 = _ref => {
           showIcon: true
         });
       }
-      let groups = _objectWithoutProperties(f, _excluded2$2);
+      let groups = _objectWithoutProperties(f, _excluded2$1);
       groups = Object.keys(groups).reduce((items, key) => {
         var _groups$key2;
         if (!((_groups$key2 = groups[key]) !== null && _groups$key2 !== void 0 && (_groups$key2 = _groups$key2.meta) !== null && _groups$key2 !== void 0 && _groups$key2.excludeFromView)) {
@@ -25289,7 +25289,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$h = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$g = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -25305,7 +25305,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$g);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -30797,6 +30797,7 @@ function Repeatable({
   });
 }
 
+/* eslint-disable no-eval */
 const isRiskComment = inputData => {
   if (inputData) {
     if (inputData.name === 'assessment') {
@@ -30809,10 +30810,7 @@ const isRiskComment = inputData => {
 };
 
 // options, k, setValues, values, excludedKeys, i, formTitles, getData, MainForm, plainForms, setAddress, onValuesChange, data, allData, changeLinking, changeInputMeta, t, highlightMandatory
-function renderNestedInputs$1(options, k) {
-  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-    args[_key - 2] = arguments[_key];
-  }
+function renderNestedInputs$1(options, k, ...args) {
   if (options[k].repeatable) {
     return renderRepeatable$1(options, k, ...args);
   } else {
@@ -30840,11 +30838,10 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
     children: [getFormTitles$1(formTitles, formId, i), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(form.type) ? getInputHeadLines$1(form.type, i, form, values) : /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
       children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: formId,
-        children: (fields, _ref) => {
-          let {
-            add,
-            remove
-          } = _ref;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           const formData = form.repeatable ? values[formId] || [] : values[formId] ? [values[formId]] : [];
           if (fields.length === 0) {
             const formInputs = form.inputs;
@@ -30894,10 +30891,14 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
             const _val = {
               [formId]: formData.map((d, j) => i === j ? val : d)
             };
-            onValuesChange(_val, _objectSpread2(_objectSpread2({}, values), _val));
-            setValues(_objectSpread2(_objectSpread2({}, values), {}, {
+            onValuesChange(_val, {
+              ...values,
+              ..._val
+            });
+            setValues({
+              ...values,
               [formId]: formData.map((d, j) => i === j ? val : d)
-            }));
+            });
           };
           return /*#__PURE__*/jsxRuntime.jsx(Repeatable, {
             form: form,
@@ -30953,156 +30954,154 @@ const getGroupContent = (form, values, i, formId, excludedKeys, getData, setValu
     highlightMandatory
   });
 };
-const GroupContent = _ref2 => {
-  var _form$meta;
-  let {
-    form,
-    values = {},
-    i,
-    formId,
-    excludedKeys,
-    getData,
-    setValues,
-    MainForm,
-    options,
-    plainForms,
-    setAddress,
-    onValuesChange,
-    allData,
-    changeInputMeta,
-    highlightMandatory
-  } = _ref2;
+const GroupContent = ({
+  form,
+  values = {},
+  i,
+  formId,
+  excludedKeys,
+  getData,
+  setValues,
+  MainForm,
+  options,
+  plainForms,
+  setAddress,
+  onValuesChange,
+  allData,
+  changeInputMeta,
+  highlightMandatory
+}) => {
   const {
     user,
     t
   } = useEditContext();
   const label = getInputLabel$1(form, values);
-  const notPartOfTheForm = (form === null || form === void 0 ? void 0 : form.type) === 'ajaxSubGroup' ? true : !!(form !== null && form !== void 0 && (_form$meta = form.meta) !== null && _form$meta !== void 0 && _form$meta.isSubGroup);
+  const notPartOfTheForm = form?.type === 'ajaxSubGroup' ? true : !!form?.meta?.isSubGroup;
   const hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   const formValues = values[form.dataId];
-  const renderInputs = () => {
-    var _form$meta2;
-    return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [form !== null && form !== void 0 && (_form$meta2 = form.meta) !== null && _form$meta2 !== void 0 && _form$meta2.groupInfo ? /*#__PURE__*/jsxRuntime.jsx(GroupInfos, {
-        config: form.meta.groupInfo,
-        user: user,
-        t: t
-      }) : null, Object.keys(form.inputs || {}).filter(i => !excludedKeys.includes(i)).map((inp, ii) => {
-        var _ref3, _values$meta, _values$meta2, _input$meta, _inputData$rules, _input$meta2;
-        const isAjaxSubGroup = (form === null || form === void 0 ? void 0 : form.type) === "ajaxSubGroup";
-        const input = form.inputs[inp];
-        const inputId = input.dataId || inp;
-        const inputValues = notPartOfTheForm ? Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {} : values;
-        const value = inputValues[inputId];
-        const commentValue = inputValues["".concat(inputId, "Comment")];
-        const inputData = getData(formId, input, value, commentValue, "".concat(formId, ".").concat(inputId), "".concat(formId, ".").concat(inputId));
-        const subtitles = form.subtitles || null;
-        const inputMeta = notPartOfTheForm ? isAjaxSubGroup ? ((_ref3 = values[formId] || {}) === null || _ref3 === void 0 || (_ref3 = _ref3.meta) === null || _ref3 === void 0 || (_ref3 = _ref3.inputs) === null || _ref3 === void 0 ? void 0 : _ref3[inputId]) || {} : (((values === null || values === void 0 || (_values$meta = values.meta) === null || _values$meta === void 0 ? void 0 : _values$meta.inputs) || {})[formId] || {})[inputId] || {} : ((values === null || values === void 0 || (_values$meta2 = values.meta) === null || _values$meta2 === void 0 ? void 0 : _values$meta2.inputs) || {})[inputId] || {};
-        inputData.repeatIndex = undefined;
-        inputData.inputName = inputId;
-        inputData.repeatValues = inputValues;
-        if (inputData.groupInputs && Array.isArray(inputData.groupInputs)) {
-          inputData.groupInputs = inputData.groupInputs.map(gpI => {
-            gpI.data.inputName = gpI.data.name;
-            gpI.data.repeatIndex = undefined;
-            gpI.data.name = formId;
-            return gpI;
+  const renderInputs = () => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [form?.meta?.groupInfo ? /*#__PURE__*/jsxRuntime.jsx(GroupInfos, {
+      config: form.meta.groupInfo,
+      user: user,
+      t: t
+    }) : null, Object.keys(form.inputs || {}).filter(i => !excludedKeys.includes(i)).map((inp, ii) => {
+      const isAjaxSubGroup = form?.type === "ajaxSubGroup";
+      const input = form.inputs[inp];
+      const inputId = input.dataId || inp;
+      const inputValues = notPartOfTheForm ? Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {} : values;
+      const value = inputValues[inputId];
+      const commentValue = inputValues[`${inputId}Comment`];
+      const inputData = getData(formId, input, value, commentValue, `${formId}.${inputId}`, `${formId}.${inputId}`);
+      const subtitles = form.subtitles || null;
+      const inputMeta = notPartOfTheForm ? isAjaxSubGroup ? (values[formId] || {})?.meta?.inputs?.[inputId] || {} : ((values?.meta?.inputs || {})[formId] || {})[inputId] || {} : (values?.meta?.inputs || {})[inputId] || {};
+      inputData.repeatIndex = undefined;
+      inputData.inputName = inputId;
+      inputData.repeatValues = inputValues;
+      if (inputData.groupInputs && Array.isArray(inputData.groupInputs)) {
+        inputData.groupInputs = inputData.groupInputs.map(gpI => {
+          gpI.data.inputName = gpI.data.name;
+          gpI.data.repeatIndex = undefined;
+          gpI.data.name = formId;
+          return gpI;
+        });
+      }
+      const isRisk = isRiskComment(inputData);
+      const isHighlighted = highlightMandatory && input?.meta?.mandatory && inputIsEmpty(input, inputValues, inputMeta);
+      const btnOnClick = () => {
+        if (typeof inputData.commentValue === 'string') {
+          onValuesChange({}, {
+            ...values,
+            [`${inputData.inputName}`]: null
           });
         }
-        const isRisk = isRiskComment(inputData);
-        const isHighlighted = highlightMandatory && (input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.mandatory) && inputIsEmpty(input, inputValues, inputMeta);
-        const btnOnClick = () => {
-          if (typeof inputData.commentValue === 'string') {
-            onValuesChange({}, _objectSpread2(_objectSpread2({}, values), {}, {
-              ["".concat(inputData.inputName)]: null
-            }));
-          }
+        const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
+        inputValues[`${inputData.inputName}Comment`] = typeof inputData.commentValue !== 'string' ? '' : null;
+        if (Array.isArray(values[formId])) {
+          values[formId] = inputValues;
+        } else {
+          values[formId] = inputValues;
+        }
+        setValues({
+          ...values
+        });
+      };
+      const btnOnClick2 = () => {
+        if (typeof inputData.commentValue !== 'string') {
           const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-          inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
+          inputValues[`${inputData.inputName}Comment`] = typeof inputData.commentValue !== 'string' ? '' : null;
           if (Array.isArray(values[formId])) {
             values[formId] = inputValues;
           } else {
             values[formId] = inputValues;
           }
-          setValues(_objectSpread2({}, values));
-        };
-        const btnOnClick2 = () => {
-          if (typeof inputData.commentValue !== 'string') {
-            const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-            inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
-            if (Array.isArray(values[formId])) {
-              values[formId] = inputValues;
-            } else {
-              values[formId] = inputValues;
-            }
-            setValues(_objectSpread2({}, values));
-          }
-        };
-        const rules = inputData !== null && inputData !== void 0 && (_inputData$rules = inputData.rules) !== null && _inputData$rules !== void 0 && _inputData$rules.length ? inputData.rules.filter(rule => !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max')) : ((input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.rules) || []).filter(rule => {
-          if (rule.metaIf && typeof rule.metaIf === 'string') {
-            var _values$meta3, _values$meta4;
-            const [name, cond, value] = rule.metaIf.split(' ');
-            const val = name.includes('./') ? values === null || values === void 0 || (_values$meta3 = values.meta) === null || _values$meta3 === void 0 || (_values$meta3 = _values$meta3.inputs) === null || _values$meta3 === void 0 || (_values$meta3 = _values$meta3[formId]) === null || _values$meta3 === void 0 ? void 0 : _values$meta3[name.split('./')[1]] : values === null || values === void 0 || (_values$meta4 = values.meta) === null || _values$meta4 === void 0 || (_values$meta4 = _values$meta4.inputs) === null || _values$meta4 === void 0 ? void 0 : _values$meta4[name.split('./')[1]];
-            if (cond === 'is') {
-              return !!(val !== null && val !== void 0 && val[value]);
-            }
-          }
-          return !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max');
-        });
-        const requiredRule = rules.find(r => r.required);
-        if (requiredRule && input.type === 'text') {
-          rules.push({
-            whitespace: true,
-            message: requiredRule.message || ''
+          setValues({
+            ...values
           });
         }
-        return showHideInput$1(input, values, undefined, inputValues, setValues) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
-          children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-            style: {
-              position: 'relative'
-            },
-            children: [getSubtitles$1(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines$1(input.type, i, input, values) : isRisk ? /*#__PURE__*/jsxRuntime.jsx(RiskGroup, {
-              input: input,
-              inputTypeComponent: inputTypeComponent$1,
-              inputData: inputData,
-              MainForm: MainForm,
-              options: options,
-              setValues: setValues,
-              formId: formId,
-              inputId: inputId,
-              inputOnBlur: inputOnBlur,
-              values: values,
-              getInputLabel: getInputLabel$1,
-              plainForms: plainForms,
-              setAddress: setAddress,
-              btnOnClick: btnOnClick,
-              btnOnClick2: btnOnClick2,
-              locationName: (allData || {}).locationName,
-              subGroupTitle: (allData || {}).subGroupTitle
-            }) : /*#__PURE__*/jsxRuntime.jsx(GroupContentFormItem, {
-              values,
-              formId,
-              setValues,
-              MainForm,
-              options,
-              plainForms,
-              setAddress,
-              inputData,
-              inputId,
-              input,
-              rules,
-              inputMeta,
-              changeInputMeta,
-              notPartOfTheForm,
-              isAjaxSubGroup,
-              isHighlighted
-            })]
-          }, ii)
-        }, "".concat(i).concat(ii)) : null;
-      })]
-    });
-  };
-  const isNa = (formValues === null || formValues === void 0 ? void 0 : formValues.valuation) === 'na';
+      };
+      const rules = inputData?.rules?.length ? inputData.rules.filter(rule => !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max')) : (input?.meta?.rules || []).filter(rule => {
+        if (rule.metaIf && typeof rule.metaIf === 'string') {
+          const [name, cond, value] = rule.metaIf.split(' ');
+          const val = name.includes('./') ? values?.meta?.inputs?.[formId]?.[name.split('./')[1]] : values?.meta?.inputs?.[name.split('./')[1]];
+          if (cond === 'is') {
+            return !!val?.[value];
+          }
+        }
+        return !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max');
+      });
+      const requiredRule = rules.find(r => r.required);
+      if (requiredRule && input.type === 'text') {
+        rules.push({
+          whitespace: true,
+          message: requiredRule.message || ''
+        });
+      }
+      return showHideInput$1(input, values, undefined, inputValues, setValues) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+        children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+          style: {
+            position: 'relative'
+          },
+          children: [getSubtitles$1(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines$1(input.type, i, input, values) : isRisk ? /*#__PURE__*/jsxRuntime.jsx(RiskGroup, {
+            input: input,
+            inputTypeComponent: inputTypeComponent$1,
+            inputData: inputData,
+            MainForm: MainForm,
+            options: options,
+            setValues: setValues,
+            formId: formId,
+            inputId: inputId,
+            inputOnBlur: inputOnBlur,
+            values: values,
+            getInputLabel: getInputLabel$1,
+            plainForms: plainForms,
+            setAddress: setAddress,
+            btnOnClick: btnOnClick,
+            btnOnClick2: btnOnClick2,
+            locationName: (allData || {}).locationName,
+            subGroupTitle: (allData || {}).subGroupTitle
+          }) : /*#__PURE__*/jsxRuntime.jsx(GroupContentFormItem, {
+            values,
+            formId,
+            setValues,
+            MainForm,
+            options,
+            plainForms,
+            setAddress,
+            inputData,
+            inputId,
+            input,
+            rules,
+            inputMeta,
+            changeInputMeta,
+            notPartOfTheForm,
+            isAjaxSubGroup,
+            isHighlighted
+          })]
+        }, ii)
+      }, `${i}${ii}`) : null;
+    })]
+  });
+  const isNa = formValues?.valuation === 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? options.isRisk && options.dontShowTitle ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "risk-header",
@@ -31110,46 +31109,44 @@ const GroupContent = _ref2 => {
         children: label
       })
     }) : /*#__PURE__*/jsxRuntime.jsx("h3", {
-      className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " ").concat(i ? 'mt-3 mb-1' : ''),
+      className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} ${i ? 'mt-3 mb-1' : ''}`,
       children: label
     }) : null, /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "repeatable ".concat(hasLabel ? "mb-4" : ""),
+      className: `repeatable ${hasLabel ? "mb-4" : ""}`,
       children: [form.titleLabel ? /*#__PURE__*/jsxRuntime.jsx("label", {
         children: getInputProp(form.titleLabel, values)
-      }) : null, formValues !== null && formValues !== void 0 && formValues.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
+      }) : null, formValues?.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
         t: t,
         isNa: isNa,
         isSuccess: !isNa
         // TODO: translate
         ,
         config: {
-          title: t("No ".concat((formValues === null || formValues === void 0 ? void 0 : formValues.stage) || 'planning', " required"))
+          title: t(`No ${formValues?.stage || 'planning'} required`)
         },
         children: renderInputs()
       }) : renderInputs()]
     })]
   });
 };
-const GroupContentFormItem = _ref4 => {
-  var _rules$find, _inputMeta$reviews, _input$meta3, _values$formId, _input$meta4, _input$meta7, _input$meta8, _input$meta9, _values$meta10, _values$meta11, _values$parent, _input$meta10, _input$meta11, _inputData$value, _input$meta12, _input$meta13, _inputMeta$comment, _lastReview$comment, _lastReview$reviewer, _lastReview$reviewer2;
-  let {
-    values,
-    formId,
-    setValues,
-    MainForm,
-    options,
-    plainForms,
-    setAddress,
-    inputData,
-    inputId,
-    input,
-    rules,
-    inputMeta,
-    changeInputMeta,
-    notPartOfTheForm = true,
-    isAjaxSubGroup,
-    isHighlighted
-  } = _ref4;
+const GroupContentFormItem = ({
+  values,
+  formId,
+  setValues,
+  MainForm,
+  options,
+  plainForms,
+  setAddress,
+  inputData,
+  inputId,
+  input,
+  rules,
+  inputMeta,
+  changeInputMeta,
+  notPartOfTheForm = true,
+  isAjaxSubGroup,
+  isHighlighted
+}) => {
   const {
     t,
     user,
@@ -31163,10 +31160,10 @@ const GroupContentFormItem = _ref4 => {
     staticWidth,
     fullWidth
   } = useEditContext();
-  const [isShown, setIsShown] = React.useState(!!(inputMeta !== null && inputMeta !== void 0 && inputMeta.comment));
-  let maxRule = (_rules$find = rules.find(rule => rule.max)) === null || _rules$find === void 0 ? void 0 : _rules$find.max;
+  const [isShown, setIsShown] = React.useState(!!inputMeta?.comment);
+  let maxRule = rules.find(rule => rule.max)?.max;
   const requiredRule = rules.find(r => r.required);
-  const lastReview = ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || [])[((inputMeta === null || inputMeta === void 0 || (_inputMeta$reviews = inputMeta.reviews) === null || _inputMeta$reviews === void 0 ? void 0 : _inputMeta$reviews.length) || 0) - 1];
+  const lastReview = (inputMeta?.reviews || [])[(inputMeta?.reviews?.length || 0) - 1];
   if (!maxRule && input.type === 'textarea') {
     maxRule = MAX_TEXT_AREA_LENGTH;
   }
@@ -31185,35 +31182,38 @@ const GroupContentFormItem = _ref4 => {
     }
     setIsShown(true);
     if (notPartOfTheForm || isAjaxSubGroup) {
-      var _values$meta5;
-      const _defaultMeta = ((values === null || values === void 0 || (_values$meta5 = values.meta) === null || _values$meta5 === void 0 ? void 0 : _values$meta5.inputs) || {})[formId] || {};
+      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
-        var _defaultData$meta, _defaultData$meta2;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+            [formId]: {
+              ..._defaultData,
               meta: {
-                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta = _defaultData.meta) === null || _defaultData$meta === void 0 ? void 0 : _defaultData$meta.inputs) || {}), {}, {
-                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta2 = _defaultData.meta) === null || _defaultData$meta2 === void 0 ? void 0 : _defaultData$meta2.inputs) || {})[inputId] || {}), {}, {
+                inputs: {
+                  ...(_defaultData?.meta?.inputs || {}),
+                  [inputId]: {
+                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
                     comment: ''
-                  })
-                })
+                  }
+                }
               }
-            })
+            }
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+          value: {
+            ..._defaultMeta,
+            [inputId]: {
+              ...(_defaultMeta[inputId] || {}),
               comment: ''
-            })
-          })
+            }
+          }
         });
       }
     } else {
@@ -31230,58 +31230,62 @@ const GroupContentFormItem = _ref4 => {
     if (!isReview) {
       return;
     }
-    const reviewSuccess = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess;
+    const reviewSuccess = lastReview?.reviewSuccess;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      var _values$meta6;
-      const _defaultMeta = ((values === null || values === void 0 || (_values$meta6 = values.meta) === null || _values$meta6 === void 0 ? void 0 : _values$meta6.inputs) || {})[formId] || {};
+      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
-        var _defaultData$meta3, _defaultData$meta4, _defaultData$meta5, _defaultData$meta6;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+            [formId]: {
+              ..._defaultData,
               meta: {
-                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta3 = _defaultData.meta) === null || _defaultData$meta3 === void 0 ? void 0 : _defaultData$meta3.inputs) || {}), {}, {
-                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta4 = _defaultData.meta) === null || _defaultData$meta4 === void 0 ? void 0 : _defaultData$meta4.inputs) || {})[inputId] || {}), {}, {
-                    reviews: reviewSuccess ? ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta5 = _defaultData.meta) === null || _defaultData$meta5 === void 0 ? void 0 : _defaultData$meta5.inputs) || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta6 = _defaultData.meta) === null || _defaultData$meta6 === void 0 ? void 0 : _defaultData$meta6.inputs) || {})[inputId] || {}).reviews || []), {
+                inputs: {
+                  ...(_defaultData?.meta?.inputs || {}),
+                  [inputId]: {
+                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                    reviews: reviewSuccess ? (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewSuccess: true
                     }]
-                  })
-                })
+                  }
+                }
               }
-            })
+            }
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+          value: {
+            ..._defaultMeta,
+            [inputId]: {
+              ...(_defaultMeta[inputId] || {}),
               reviews: reviewSuccess ? ((_defaultMeta[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((_defaultMeta[inputId] || {}).reviews || []), {
                 reviewer: user,
                 createdAt: new Date().toISOString(),
                 reviewSuccess: true
               }]
-            })
-          })
+            }
+          }
         });
       }
     } else {
       changeInputMeta({
         key: inputId,
         type: input.type,
-        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+        value: {
+          ...inputMeta,
           reviews: reviewSuccess ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewSuccess: true
           }]
-        })
+        }
       });
     }
   };
@@ -31289,111 +31293,118 @@ const GroupContentFormItem = _ref4 => {
     if (!isReview) {
       return;
     }
-    const reviewError = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError;
+    const reviewError = lastReview?.reviewError;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      var _values$meta7;
-      const _defaultMeta = ((values === null || values === void 0 || (_values$meta7 = values.meta) === null || _values$meta7 === void 0 ? void 0 : _values$meta7.inputs) || {})[formId] || {};
+      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
-        var _defaultData$meta7, _defaultData$meta8, _defaultData$meta9, _defaultData$meta10;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+            [formId]: {
+              ..._defaultData,
               meta: {
-                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta7 = _defaultData.meta) === null || _defaultData$meta7 === void 0 ? void 0 : _defaultData$meta7.inputs) || {}), {}, {
-                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta8 = _defaultData.meta) === null || _defaultData$meta8 === void 0 ? void 0 : _defaultData$meta8.inputs) || {})[inputId] || {}), {}, {
-                    reviews: reviewError ? ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta9 = _defaultData.meta) === null || _defaultData$meta9 === void 0 ? void 0 : _defaultData$meta9.inputs) || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta10 = _defaultData.meta) === null || _defaultData$meta10 === void 0 ? void 0 : _defaultData$meta10.inputs) || {})[inputId] || {}).reviews || []), {
+                inputs: {
+                  ...(_defaultData?.meta?.inputs || {}),
+                  [inputId]: {
+                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                    reviews: reviewError ? (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewError: true,
                       comment: ''
                     }]
-                  })
-                })
+                  }
+                }
               }
-            })
+            }
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+          value: {
+            ..._defaultMeta,
+            [inputId]: {
+              ...(_defaultMeta[inputId] || {}),
               reviews: reviewError ? ((_defaultMeta[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((_defaultMeta[inputId] || {}).reviews || []), {
                 reviewer: user,
                 createdAt: new Date().toISOString(),
                 reviewError: true,
                 comment: ''
               }]
-            })
-          })
+            }
+          }
         });
       }
     } else {
       changeInputMeta({
         key: inputId,
         type: input.type,
-        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+        value: {
+          ...inputMeta,
           reviews: reviewError ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewError: true,
             comment: ''
           }]
-        })
+        }
       });
     }
   };
-  const requiredComment = (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.notApplicable) && (input === null || input === void 0 || (_input$meta3 = input.meta) === null || _input$meta3 === void 0 ? void 0 : _input$meta3.requiredCommentOnNotApplicable) && (values === null || values === void 0 || (_values$formId = values[formId]) === null || _values$formId === void 0 ? void 0 : _values$formId.valuation) !== 'na';
+  const requiredComment = inputMeta?.notApplicable && input?.meta?.requiredCommentOnNotApplicable && values?.[formId]?.valuation !== 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex input-cont",
-      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-        required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-      }, ['total100', 'group'].includes(input.type) ? {} : {
-        name: notPartOfTheForm ? [formId, inputId] : inputId,
-        fieldKey: notPartOfTheForm ? [formId, inputId] : inputId,
-        initialValue: notPartOfTheForm ? (values[formId] || {})[inputId] : values[inputId]
-      }), ['upload', 'imageUpload', 'videoUpload'].includes(input.type) ? {
-        valuePropName: "fileList",
-        getValueFromEvent: e => {
-          if (Array.isArray(e)) {
-            return e;
-          }
-          return e && e.fileList && e.fileList.map(f => {
-            if (f.response) {
-              return f.response;
+      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+        ...(['total100', 'group'].includes(input.type) ? {} : {
+          name: notPartOfTheForm ? [formId, inputId] : inputId,
+          fieldKey: notPartOfTheForm ? [formId, inputId] : inputId,
+          initialValue: notPartOfTheForm ? (values[formId] || {})[inputId] : values[inputId]
+        }),
+        ...(['upload', 'imageUpload', 'videoUpload'].includes(input.type) ? {
+          valuePropName: "fileList",
+          getValueFromEvent: e => {
+            if (Array.isArray(e)) {
+              return e;
             }
-            return f;
-          });
-        }
-      } : {}), inputOnBlur.includes(input.type) ? {
-        trigger: "onBlur"
-      } : {}), {}, {
+            return e && e.fileList && e.fileList.map(f => {
+              if (f.response) {
+                return f.response;
+              }
+              return f;
+            });
+          }
+        } : {}),
+        ...(inputOnBlur.includes(input.type) ? {
+          trigger: "onBlur"
+        } : {}),
         style: input.showOnView === false ? {
           display: 'none'
-        } : {}
-      }, ['switch'].includes(input.type) ? {
-        labelCol: {
-          span: 20
-        },
-        style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-          display: 'none'
-        } : {}), {}, {
-          flexDirection: 'row',
-          justifyContent: 'space-between'
-        })
-      } : {}), {}, {
+        } : {},
+        ...(['switch'].includes(input.type) ? {
+          labelCol: {
+            span: 20
+          },
+          style: {
+            ...(input.showOnView === false ? {
+              display: 'none'
+            } : {}),
+            flexDirection: 'row',
+            justifyContent: 'space-between'
+          }
+        } : {}),
         label: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: (input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.code) && "mr-10",
+          className: input?.meta?.code && "mr-10",
           children: getInputLabel$1(input, values)
         }) : null,
         rules: rules,
-        className: formatClassname([input.comment ? "flex-1 with-comment i-".concat(input.type) : "i-".concat(input.type, " flex-1 "), noActionsInputs.includes(input.type) && 'no-actions-input']),
-        "data-id": "".concat(formId, ".").concat(inputId),
+        className: formatClassname([input.comment ? `flex-1 with-comment i-${input.type}` : `i-${input.type} flex-1 `, noActionsInputs.includes(input.type) && 'no-actions-input']),
+        "data-id": `${formId}.${inputId}`,
         extra: /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
           children: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: formatClassname(["ml-4 input-actions"]),
@@ -31403,7 +31414,7 @@ const GroupContentFormItem = _ref4 => {
                 title: t('Add review note'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                    className: formatClassname(["review-btn review-error-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError) && 'primary']),
+                    className: formatClassname(["review-btn review-error-btn", lastReview?.reviewError && 'primary']),
                     type: "link",
                     onClick: onClickReviewError,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -31419,7 +31430,7 @@ const GroupContentFormItem = _ref4 => {
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
                     type: "link",
                     onClick: onClickReviewSuccess,
-                    className: formatClassname(["review-btn review-success-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess) && 'primary']),
+                    className: formatClassname(["review-btn review-success-btn", lastReview?.reviewSuccess && 'primary']),
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "CheckSquare",
                       width: 16,
@@ -31436,59 +31447,65 @@ const GroupContentFormItem = _ref4 => {
                     className: formatClassname(["default p-0", inputMeta.notApplicable && 'primary']),
                     type: "link",
                     onClick: () => {
-                      var _input$meta5, _input$meta6;
                       const value = getDefaultInputValue(input);
-                      const commentMeta = input !== null && input !== void 0 && (_input$meta5 = input.meta) !== null && _input$meta5 !== void 0 && _input$meta5.requiredCommentOnNotApplicable ? {
+                      const commentMeta = input?.meta?.requiredCommentOnNotApplicable ? {
                         comment: ''
                       } : {};
-                      if (input !== null && input !== void 0 && (_input$meta6 = input.meta) !== null && _input$meta6 !== void 0 && _input$meta6.requiredCommentOnNotApplicable) {
+                      if (input?.meta?.requiredCommentOnNotApplicable) {
                         setIsShown(true);
                       }
                       if (notPartOfTheForm || isAjaxSubGroup) {
-                        var _values$meta8;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta8 = values.meta) === null || _values$meta8 === void 0 ? void 0 : _values$meta8.inputs) || {})[formId] || {};
+                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                         if (isAjaxSubGroup) {
-                          var _defaultData$meta11;
                           changeInputMeta({
                             key: formId,
                             type: input.type,
                             otherValues: {
-                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                              [formId]: {
+                                ..._defaultData,
                                 [inputId]: value,
                                 meta: {
-                                  inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta11 = _defaultData.meta) === null || _defaultData$meta11 === void 0 ? void 0 : _defaultData$meta11.inputs) || {}), {}, {
-                                    [inputId]: inputMeta.notApplicable ? _objectSpread2({
+                                  inputs: {
+                                    ...(_defaultData?.meta?.inputs || {}),
+                                    [inputId]: inputMeta.notApplicable ? {
                                       notApplicable: false,
-                                      notAvailable: false
-                                    }, commentMeta) : _objectSpread2({
+                                      notAvailable: false,
+                                      ...commentMeta
+                                    } : {
                                       notApplicable: true,
-                                      notAvailable: false
-                                    }, commentMeta)
-                                  })
+                                      notAvailable: false,
+                                      ...commentMeta
+                                    }
+                                  }
                                 }
-                              })
+                              }
                             }
                           });
                         } else {
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notApplicable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                              [inputId]: _objectSpread2({
+                            value: inputMeta.notApplicable ? {
+                              ..._defaultMeta,
+                              [inputId]: {
                                 notApplicable: false,
-                                notAvailable: false
-                              }, commentMeta)
-                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                              [inputId]: _objectSpread2({
+                                notAvailable: false,
+                                ...commentMeta
+                              }
+                            } : {
+                              ..._defaultMeta,
+                              [inputId]: {
                                 notApplicable: true,
-                                notAvailable: false
-                              }, commentMeta)
-                            }),
+                                notAvailable: false,
+                                ...commentMeta
+                              }
+                            },
                             otherValues: {
-                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                              [formId]: {
+                                ..._defaultData,
                                 [inputId]: value
-                              })
+                              }
                             }
                           });
                         }
@@ -31509,7 +31526,7 @@ const GroupContentFormItem = _ref4 => {
                         });
                       }
                     },
-                    disabled: !((_input$meta7 = input.meta) !== null && _input$meta7 !== void 0 && _input$meta7.notApplicable),
+                    disabled: !input.meta?.notApplicable,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "NotApplicable",
                       width: 16,
@@ -31523,24 +31540,24 @@ const GroupContentFormItem = _ref4 => {
                   children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     className: formatClassname(["default p-0", inputMeta.notAvailable && 'primary']),
                     type: "link",
-                    disabled: !((_input$meta8 = input.meta) !== null && _input$meta8 !== void 0 && _input$meta8.notAvailable),
+                    disabled: !input.meta?.notAvailable,
                     onClick: () => {
                       const value = getDefaultInputValue(input);
                       if (notPartOfTheForm || isAjaxSubGroup) {
-                        var _values$meta9;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta9 = values.meta) === null || _values$meta9 === void 0 ? void 0 : _values$meta9.inputs) || {})[formId] || {};
+                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                         if (isAjaxSubGroup) {
                           if (isAjaxSubGroup) {
-                            var _defaultData$meta12;
                             changeInputMeta({
                               key: formId,
                               type: input.type,
                               otherValues: {
-                                [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                                [formId]: {
+                                  ..._defaultData,
                                   [inputId]: value,
                                   meta: {
-                                    inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta12 = _defaultData.meta) === null || _defaultData$meta12 === void 0 ? void 0 : _defaultData$meta12.inputs) || {}), {}, {
+                                    inputs: {
+                                      ...(_defaultData?.meta?.inputs || {}),
                                       [inputId]: inputMeta.notAvailable ? {
                                         notApplicable: false,
                                         notAvailable: false
@@ -31548,9 +31565,9 @@ const GroupContentFormItem = _ref4 => {
                                         notApplicable: false,
                                         notAvailable: true
                                       }
-                                    })
+                                    }
                                   }
-                                })
+                                }
                               }
                             });
                           }
@@ -31558,21 +31575,24 @@ const GroupContentFormItem = _ref4 => {
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notAvailable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                            value: inputMeta.notAvailable ? {
+                              ..._defaultMeta,
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: false
                               }
-                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                            } : {
+                              ..._defaultMeta,
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: true
                               }
-                            }),
+                            },
                             otherValues: {
-                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                              [formId]: {
+                                ..._defaultData,
                                 [inputId]: value
-                              })
+                              }
                             }
                           });
                         }
@@ -31603,33 +31623,38 @@ const GroupContentFormItem = _ref4 => {
               }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                 title: t('Add comment'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     type: "link",
-                    disabled: !((_input$meta9 = input.meta) !== null && _input$meta9 !== void 0 && _input$meta9.comment)
-                  }, !isShown ? {
-                    className: 'default p-0'
-                  } : {
-                    className: 'p-0 primary'
-                  }), {}, {
+                    disabled: !input.meta?.comment,
+                    ...(!isShown ? {
+                      className: 'default p-0'
+                    } : {
+                      className: 'p-0 primary'
+                    }),
                     onClick: onClickComment,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "AddComment",
                       width: 16,
                       height: 16
                     })
-                  }))
+                  })
                 })
               })]
             }) : null]
           }) : null
         }),
         children: isReview ? /*#__PURE__*/jsxRuntime.jsx(BasicInput, {
-          data: _objectSpread2(_objectSpread2({}, values[formId] || {}), {}, {
-            meta: _objectSpread2(_objectSpread2({}, (values === null || values === void 0 ? void 0 : values.meta) || {}), {}, {
-              inputs: _objectSpread2(_objectSpread2({}, (values === null || values === void 0 || (_values$meta10 = values.meta) === null || _values$meta10 === void 0 ? void 0 : _values$meta10.inputs) || {}), ((values === null || values === void 0 || (_values$meta11 = values.meta) === null || _values$meta11 === void 0 ? void 0 : _values$meta11.inputs) || {})[formId] || {})
-            })
-          }),
-          linkingData: (values === null || values === void 0 ? void 0 : values.linking) || (values === null || values === void 0 || (_values$parent = values.parent) === null || _values$parent === void 0 ? void 0 : _values$parent.linking),
+          data: {
+            ...(values[formId] || {}),
+            meta: {
+              ...(values?.meta || {}),
+              inputs: {
+                ...(values?.meta?.inputs || {}),
+                ...((values?.meta?.inputs || {})[formId] || {})
+              }
+            }
+          },
+          linkingData: values?.linking || values?.parent?.linking,
           name: input.dataId,
           config: input,
           t: t,
@@ -31641,12 +31666,13 @@ const GroupContentFormItem = _ref4 => {
           getToken: getToken,
           app: app,
           valueOnlyString: true
-        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type](_objectSpread2(_objectSpread2({}, inputData), {}, {
+        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type]({
+          ...inputData,
           name: inputId,
           maxWidth,
           staticWidth,
           fullWidth
-        }), {
+        }, {
           form: MainForm,
           forms: options,
           allForms: plainForms,
@@ -31664,10 +31690,10 @@ const GroupContentFormItem = _ref4 => {
           staticWidth,
           fullWidth
         }) : console.log(input)
-      })), (_input$meta10 = input.meta) !== null && _input$meta10 !== void 0 && _input$meta10.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+      }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "code",
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
-          children: (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.code
+          children: input.meta?.code
         })
       }) : null]
     }), maxRule ? ['imageUpload', 'videoUpload', 'upload'].includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31687,16 +31713,16 @@ const GroupContentFormItem = _ref4 => {
         className: "max-char-span",
         children: t('max-char', {
           chars: maxRule,
-          filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
+          filled: inputData?.value?.length || 0
         })
       })
-    }) : null, (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+    }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "input-content",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         className: "comment-textarea",
-        initialValue: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
+        initialValue: inputMeta?.comment || '',
         hidden: !isShown,
-        name: "".concat(formId, "-").concat(inputId, "-comment"),
+        name: `${formId}-${inputId}-comment`,
         required: requiredComment,
         rules: requiredComment ? [{
           required: true,
@@ -31713,35 +31739,38 @@ const GroupContentFormItem = _ref4 => {
             onConfirm: () => {
               setIsShown(false);
               if (notPartOfTheForm) {
-                var _values$meta12;
-                const _defaultMeta = ((values === null || values === void 0 || (_values$meta12 = values.meta) === null || _values$meta12 === void 0 ? void 0 : _values$meta12.inputs) || {})[formId] || {};
+                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                 const _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
-                  var _defaultData$meta13, _defaultData$meta14;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                      [formId]: {
+                        ..._defaultData,
                         meta: {
-                          inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta13 = _defaultData.meta) === null || _defaultData$meta13 === void 0 ? void 0 : _defaultData$meta13.inputs) || {}), {}, {
-                            [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta14 = _defaultData.meta) === null || _defaultData$meta14 === void 0 ? void 0 : _defaultData$meta14.inputs) || {})[inputId] || {}), {}, {
+                          inputs: {
+                            ...(_defaultData?.meta?.inputs || {}),
+                            [inputId]: {
+                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
                               comment: null
-                            })
-                          })
+                            }
+                          }
                         }
-                      })
+                      }
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+                    value: {
+                      ..._defaultMeta,
+                      [inputId]: {
+                        ...(_defaultMeta[inputId] || {}),
                         comment: null
-                      })
-                    })
+                      }
+                    }
                   });
                 }
               } else {
@@ -31756,7 +31785,7 @@ const GroupContentFormItem = _ref4 => {
             },
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
               type: "link",
-              disabled: !((_input$meta13 = input.meta) !== null && _input$meta13 !== void 0 && _input$meta13.comment),
+              disabled: !input.meta?.comment,
               className: "p-0",
               children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                 width: 16,
@@ -31768,41 +31797,44 @@ const GroupContentFormItem = _ref4 => {
         children: inputTypeComponent$1.comment(inputData, {
           form: MainForm,
           forms: options,
-          value: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
+          value: inputMeta?.comment || '',
           maxWidth,
           staticWidth,
           fullWidth,
           onChange: val => {
             if (notPartOfTheForm) {
-              var _values$meta13;
-              const _defaultMeta = ((values === null || values === void 0 || (_values$meta13 = values.meta) === null || _values$meta13 === void 0 ? void 0 : _values$meta13.inputs) || {})[formId] || {};
+              const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
               const _defaultData = MainForm.getFieldValue(formId);
               if (isAjaxSubGroup) {
-                var _defaultData$meta15, _defaultData$meta16;
                 changeInputMeta({
                   key: formId,
                   type: input.type,
                   otherValues: {
-                    [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                    [formId]: {
+                      ..._defaultData,
                       meta: {
-                        inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta15 = _defaultData.meta) === null || _defaultData$meta15 === void 0 ? void 0 : _defaultData$meta15.inputs) || {}), {}, {
-                          [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta16 = _defaultData.meta) === null || _defaultData$meta16 === void 0 ? void 0 : _defaultData$meta16.inputs) || {})[inputId] || {}), {}, {
+                        inputs: {
+                          ...(_defaultData?.meta?.inputs || {}),
+                          [inputId]: {
+                            ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
                             comment: val
-                          })
-                        })
+                          }
+                        }
                       }
-                    })
+                    }
                   }
                 });
               } else {
                 changeInputMeta({
                   key: formId,
                   type: input.type,
-                  value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                    [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+                  value: {
+                    ..._defaultMeta,
+                    [inputId]: {
+                      ...(_defaultMeta[inputId] || {}),
                       comment: val
-                    })
-                  })
+                    }
+                  }
                 });
               }
             } else {
@@ -31823,16 +31855,16 @@ const GroupContentFormItem = _ref4 => {
         className: "max-char-span",
         children: t('max-char', {
           chars: MAX_COMMENTS_LENGTH,
-          filled: (inputMeta === null || inputMeta === void 0 || (_inputMeta$comment = inputMeta.comment) === null || _inputMeta$comment === void 0 ? void 0 : _inputMeta$comment.length) || 0
+          filled: inputMeta?.comment?.length || 0
         })
       })]
-    }) : null, lastReview !== null && lastReview !== void 0 && lastReview.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
+    }) : null, lastReview?.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "input-content",
       children: isReview ? /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "comment-textarea",
-          initialValue: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
-          name: "".concat(formId, "-").concat(inputId, "-reviewErrorComment"),
+          initialValue: lastReview?.comment || '',
+          name: `${formId}-${inputId}-reviewErrorComment`,
           label: /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex w-100",
             children: /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31843,71 +31875,78 @@ const GroupContentFormItem = _ref4 => {
           children: inputTypeComponent$1.comment(inputData, {
             form: MainForm,
             forms: options,
-            value: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
+            value: lastReview?.comment || '',
             maxWidth,
             staticWidth,
             fullWidth,
             onChange: val => {
               if (notPartOfTheForm) {
-                var _values$meta14;
-                const _defaultMeta = ((values === null || values === void 0 || (_values$meta14 = values.meta) === null || _values$meta14 === void 0 ? void 0 : _values$meta14.inputs) || {})[formId] || {};
+                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                 const _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
-                  var _defaultData$meta17, _defaultData$meta18, _defaultData$meta19;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                      [formId]: {
+                        ..._defaultData,
                         meta: {
-                          inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta17 = _defaultData.meta) === null || _defaultData$meta17 === void 0 ? void 0 : _defaultData$meta17.inputs) || {}), {}, {
-                            [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta18 = _defaultData.meta) === null || _defaultData$meta18 === void 0 ? void 0 : _defaultData$meta18.inputs) || {})[inputId] || {}), {}, {
-                              reviews: ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta19 = _defaultData.meta) === null || _defaultData$meta19 === void 0 ? void 0 : _defaultData$meta19.inputs) || {})[inputId] || {}).reviews || []).map(v => {
+                          inputs: {
+                            ...(_defaultData?.meta?.inputs || {}),
+                            [inputId]: {
+                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                              reviews: (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).map(v => {
                                 if (v.createdAt === lastReview.createdAt) {
-                                  return _objectSpread2(_objectSpread2({}, v), {}, {
+                                  return {
+                                    ...v,
                                     comment: val
-                                  });
+                                  };
                                 }
                                 return v;
                               })
-                            })
-                          })
+                            }
+                          }
                         }
-                      })
+                      }
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+                    value: {
+                      ..._defaultMeta,
+                      [inputId]: {
+                        ...(_defaultMeta[inputId] || {}),
                         reviews: ((_defaultMeta[inputId] || {}).reviews || []).map(v => {
                           if (v.createdAt === lastReview.createdAt) {
-                            return _objectSpread2(_objectSpread2({}, v), {}, {
+                            return {
+                              ...v,
                               comment: val
-                            });
+                            };
                           }
                           return v;
                         })
-                      })
-                    })
+                      }
+                    }
                   });
                 }
               } else {
                 changeInputMeta({
                   key: inputId,
                   type: input.type,
-                  value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
-                    reviews: ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || []).map(v => {
+                  value: {
+                    ...inputMeta,
+                    reviews: (inputMeta?.reviews || []).map(v => {
                       if (v.createdAt === lastReview.createdAt) {
-                        return _objectSpread2(_objectSpread2({}, v), {}, {
+                        return {
+                          ...v,
                           comment: val
-                        });
+                        };
                       }
                       return v;
                     })
-                  })
+                  }
                 });
               }
             },
@@ -31919,7 +31958,7 @@ const GroupContentFormItem = _ref4 => {
           className: "max-char-span",
           children: t('max-char', {
             chars: MAX_COMMENTS_LENGTH,
-            filled: ((_lastReview$comment = lastReview.comment) === null || _lastReview$comment === void 0 ? void 0 : _lastReview$comment.length) || 0
+            filled: lastReview.comment?.length || 0
           })
         })]
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -31940,7 +31979,7 @@ const GroupContentFormItem = _ref4 => {
           }), /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex flex-column justify-center mr-1",
             children: /*#__PURE__*/jsxRuntime.jsx("span", {
-              children: (lastReview === null || lastReview === void 0 || (_lastReview$reviewer = lastReview.reviewer) === null || _lastReview$reviewer === void 0 ? void 0 : _lastReview$reviewer.firstName) + ' ' + (lastReview === null || lastReview === void 0 || (_lastReview$reviewer2 = lastReview.reviewer) === null || _lastReview$reviewer2 === void 0 ? void 0 : _lastReview$reviewer2.lastName) + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
+              children: lastReview?.reviewer?.firstName + ' ' + lastReview?.reviewer?.lastName + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
             })
           })]
         })]
@@ -35913,13 +35952,11 @@ const beforeUpload = allowedExtensions => file => {
 };
 const allowedImageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.avif', '.bmp', '.tiff', '.tif', '.heif', '.heic', '.svg', '.ico'];
 
-const _excluded$g = ["placeholder"],
-  _excluded2$1 = ["label", "description", "excludeFromEdit", "showFormIf", "icon", "position", "template", "formClass"];
+/* eslint-disable no-case-declarations */
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(timezone);
 dayjs__default["default"].tz.setDefault("UTC");
-const getDefaultInputValue = function () {
-  let input = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+const getDefaultInputValue = (input = {}) => {
   let value = undefined;
   if (input.type === "multiselect") {
     value = [];
@@ -35937,30 +35974,33 @@ const checkCondition$1 = (condition, repeatValues, formsValue) => {
   const isShown = _checkValue(isNotEmpty ? field : wantedValue, match, isNotEmpty ? formValue : value);
   return isShown;
 };
-const renderDataLinkGroup = _ref2 => {
-  var _input$meta, _formsValue$meta, _input$meta2;
-  let {
-    input,
-    groupFormId,
-    name,
-    formsValue,
-    form,
-    onValuesChange,
-    setValues,
-    changeLinking,
-    isHighlighted
-  } = _ref2;
-  const dataLinkKey = Object.keys((input === null || input === void 0 ? void 0 : input.inputs) || {}).find(k => {
-    var _input$inputs$k;
-    return (input === null || input === void 0 || (_input$inputs$k = input.inputs[k]) === null || _input$inputs$k === void 0 ? void 0 : _input$inputs$k.type) === "dataLink";
-  });
-  const dataLinkInput = ((input === null || input === void 0 ? void 0 : input.inputs) || {})[dataLinkKey];
-  const otherInputs = Object.keys((input === null || input === void 0 ? void 0 : input.inputs) || {}).filter(k => k !== dataLinkKey).reduce((all, key) => {
-    all[key] = input === null || input === void 0 ? void 0 : input.inputs[key];
+const renderDataLinkGroup = ({
+  input,
+  groupFormId,
+  name,
+  formsValue,
+  form,
+  onValuesChange,
+  setValues,
+  changeLinking,
+  isHighlighted
+}) => {
+  const dataLinkKey = Object.keys(input?.inputs || {}).find(k => input?.inputs[k]?.type === "dataLink");
+  const dataLinkInput = (input?.inputs || {})[dataLinkKey];
+  const otherInputs = Object.keys(input?.inputs || {}).filter(k => k !== dataLinkKey).reduce((all, key) => {
+    all[key] = input?.inputs[key];
     return all;
   }, {});
-  const isSingle = (input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.maxRepeat) === 1;
-  const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [_objectSpread2({}, (formsValue[groupFormId] || {})[name])] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => _objectSpread2({}, v)) : isSingle ? formsValue[name] ? [_objectSpread2({}, formsValue[name])] : [] : getArray(formsValue[name] || []).map(v => _objectSpread2({}, v));
+  const isSingle = input?.meta?.maxRepeat === 1;
+  const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [{
+    ...(formsValue[groupFormId] || {})[name]
+  }] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => ({
+    ...v
+  })) : isSingle ? formsValue[name] ? [{
+    ...formsValue[name]
+  }] : [] : getArray(formsValue[name] || []).map(v => ({
+    ...v
+  }));
   const onUpdate = (val, i) => {
     const _val = isSingle ? {
       [name]: val
@@ -35968,20 +36008,31 @@ const renderDataLinkGroup = _ref2 => {
       [name]: formData.map((d, j) => i === j ? val : d)
     };
     if (groupFormId) {
-      const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-      const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-      onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+      const _defaultData = form?.getFieldValue(groupFormId) || {};
+      const _newData = {
+        ..._defaultData,
+        ..._val
+      };
+      onValuesChange(_newData, {
+        ...formsValue,
         [groupFormId]: _newData
-      }));
-      form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+      });
+      form?.setFieldValue(groupFormId, _newData);
+      setValues({
+        ...formsValue,
         [groupFormId]: _newData
-      }));
+      });
       return;
     }
-    onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-    form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-    setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+    onValuesChange(_val, {
+      ...formsValue,
+      ..._val
+    });
+    form?.setFieldValue(name, _val[name]);
+    setValues({
+      ...formsValue,
+      ..._val
+    });
   };
   return /*#__PURE__*/jsxRuntime.jsx(DataLinkGroup, {
     form: input,
@@ -35992,79 +36043,102 @@ const renderDataLinkGroup = _ref2 => {
     isHighlighted: isHighlighted,
     dataLinkInput: dataLinkInput,
     formsValue: formsValue,
-    values: groupFormId ? _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+    values: groupFormId ? {
+      ...(formsValue[groupFormId] || {}),
       meta: {
-        inputs: ((formsValue === null || formsValue === void 0 || (_formsValue$meta = formsValue.meta) === null || _formsValue$meta === void 0 ? void 0 : _formsValue$meta.inputs) || {})[groupFormId]
+        inputs: (formsValue?.meta?.inputs || {})[groupFormId]
       }
-    }) : formsValue,
+    } : formsValue,
     name: name,
     groupFormId: groupFormId,
-    maxRepeat: input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.maxRepeat,
-    remove: _ref3 => {
-      let {
-        key
-      } = _ref3;
+    maxRepeat: input?.meta?.maxRepeat,
+    remove: ({
+      key
+    }) => {
       const _val = isSingle ? {
         [name]: null
       } : {
         [name]: formData.filter((v, j) => j !== key)
       };
       if (groupFormId) {
-        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+        const _defaultData = form?.getFieldValue(groupFormId) || {};
+        const _newData = {
+          ..._defaultData,
+          ..._val
+        };
+        onValuesChange(_newData, {
+          ...formsValue,
           [groupFormId]: _newData
-        }));
-        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        });
+        form?.setFieldValue(groupFormId, _newData);
+        setValues({
+          ...formsValue,
           [groupFormId]: _newData
-        }));
+        });
         return;
       }
-      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+      onValuesChange(_val, {
+        ...formsValue,
+        ..._val
+      });
+      form?.setFieldValue(name, _val[name]);
+      setValues({
+        ...formsValue,
+        ..._val
+      });
     },
     add: val => {
       const _val = isSingle ? {
         [name]: val
       } : {
-        [name]: [...formData, _objectSpread2({}, val)]
+        [name]: [...formData, {
+          ...val
+        }]
       };
       if (groupFormId) {
-        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+        const _defaultData = form?.getFieldValue(groupFormId) || {};
+        const _newData = {
+          ..._defaultData,
+          ..._val
+        };
+        form?.setFieldValue(groupFormId, _newData);
+        onValuesChange(_newData, {
+          ...formsValue,
           [groupFormId]: _newData
-        }));
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        });
+        setValues({
+          ...formsValue,
           [groupFormId]: _newData
-        }));
+        });
         return;
       }
-      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+      form?.setFieldValue(name, _val[name]);
+      onValuesChange(_val, {
+        ...formsValue,
+        ..._val
+      });
+      setValues({
+        ...formsValue,
+        ..._val
+      });
     },
     k: name,
     formData: formData
   });
 };
 function showHideInput$1(input, data, repeatIndex, repeatValues, inputMeta) {
-  var _input$meta3, _data$meta;
-  if (inputMeta !== null && inputMeta !== void 0 && inputMeta.notApplicable || inputMeta !== null && inputMeta !== void 0 && inputMeta.notAvailable) {
+  if (inputMeta?.notApplicable || inputMeta?.notAvailable) {
     return false;
   }
-  if (typeof (input === null || input === void 0 || (_input$meta3 = input.meta) === null || _input$meta3 === void 0 ? void 0 : _input$meta3.excludeFromEdit) === "boolean") {
-    var _input$meta4;
-    return !(input !== null && input !== void 0 && (_input$meta4 = input.meta) !== null && _input$meta4 !== void 0 && _input$meta4.excludeFromEdit);
+  if (typeof input?.meta?.excludeFromEdit === "boolean") {
+    return !input?.meta?.excludeFromEdit;
   }
-  const formsValue = _objectSpread2({}, data);
-  Object.keys((data === null || data === void 0 || (_data$meta = data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.inputs) || {}).forEach(key => {
-    var _data$meta2;
-    const input = data === null || data === void 0 || (_data$meta2 = data.meta) === null || _data$meta2 === void 0 ? void 0 : _data$meta2.inputs[key];
-    if (input !== null && input !== void 0 && input.notApplicable || input !== null && input !== void 0 && input.notAvailable) {
+  const formsValue = {
+    ...data
+  };
+  Object.keys(data?.meta?.inputs || {}).forEach(key => {
+    const input = data?.meta?.inputs[key];
+    if (input?.notApplicable || input?.notAvailable) {
       formsValue[key] = undefined;
       delete formsValue[key];
     }
@@ -36123,35 +36197,35 @@ function getInputHeadLines$1(type, i, input, values) {
   switch (type) {
     case "h2":
       return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "title-semibold-2 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-2 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel$1(input, values)
         })
       });
     case "h3":
       return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "title-semibold-3 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-3 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel$1(input, values)
         })
       });
     case "h4":
       return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "title-semibold-4 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-4 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel$1(input, values)
         })
       });
     case "h5":
       return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "title-semibold-5 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-5 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel$1(input, values)
         })
       });
     case "h6":
       return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "title-semibold-6 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-6 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel$1(input, values)
         })
@@ -36160,16 +36234,15 @@ function getInputHeadLines$1(type, i, input, values) {
       return null;
   }
 }
-function getInputProp(prop) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  let scope = arguments.length > 2 ? arguments[2] : undefined;
+function getInputProp(prop, formsValue = {}, scope) {
   if (prop && typeof prop === "object") {
     const validations = Object.keys(prop);
     const key = validations.find(v => {
       let [path, match, wantedValue] = v.split(/( is | includes | not | notEmpty )/gim);
-      const value = dot__default["default"].pick(path, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+      const value = dot__default["default"].pick(path, {
+        ...formsValue,
         scope
-      }));
+      });
       return _checkValue(wantedValue, match, value);
     });
     const label = key ? prop[key] : prop[validations[0]];
@@ -36178,33 +36251,29 @@ function getInputProp(prop) {
     return prop;
   }
 }
-function getInputLabel$1(input) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  let asText = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+function getInputLabel$1(input, formsValue = {}, asText = false) {
   return /*#__PURE__*/jsxRuntime.jsx(InputLabel, {
     input: input,
     formsValue: formsValue,
     asText: asText
   });
 }
-const InputLabel = _ref4 => {
-  var _input$meta5, _input$meta6, _input$meta7;
-  let {
-    input,
-    formsValue,
-    asText
-  } = _ref4;
+const InputLabel = ({
+  input,
+  formsValue,
+  asText
+}) => {
   const {
     t,
     evaluationConfig,
     scope
   } = useEditContext();
   const label = getInputProp(input.label, formsValue, scope);
-  return input !== null && input !== void 0 && (_input$meta5 = input.meta) !== null && _input$meta5 !== void 0 && _input$meta5.isEvaluation || input.description && typeof input.description === "string" && !asText ? /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+  return input?.meta?.isEvaluation || input.description && typeof input.description === "string" && !asText ? /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex",
       children: [ReactHtmlParser__default["default"](label), /*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
-        content: input !== null && input !== void 0 && (_input$meta6 = input.meta) !== null && _input$meta6 !== void 0 && _input$meta6.isEvaluation ? /*#__PURE__*/jsxRuntime.jsx(EvaluationPopover, {
+        content: input?.meta?.isEvaluation ? /*#__PURE__*/jsxRuntime.jsx(EvaluationPopover, {
           t: t,
           evaluationConfig: evaluationConfig
         }) : /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -36212,7 +36281,7 @@ const InputLabel = _ref4 => {
           children: ReactHtmlParser__default["default"](input.description)
         }),
         placement: "top",
-        children: !(input !== null && input !== void 0 && (_input$meta7 = input.meta) !== null && _input$meta7 !== void 0 && _input$meta7.isEvaluation) || evaluationConfig.length > 0 ? /*#__PURE__*/jsxRuntime.jsx("div", {
+        children: !input?.meta?.isEvaluation || evaluationConfig.length > 0 ? /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex flex-column justify-content-center ml-1",
           children: /*#__PURE__*/jsxRuntime.jsx(TooltipIcon, {
             fontSize: 13
@@ -36234,9 +36303,7 @@ function getSectionLabel$1(labels, values) {
   }
   return labels;
 }
-function getSubtitles$1(subtitles, position) {
-  let formsValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  let repeatValues = arguments.length > 4 ? arguments[4] : undefined;
+function getSubtitles$1(subtitles, position, formsValue = {}, repeatIndex, repeatValues) {
   let subtitle = subtitles && subtitles[position];
   if (subtitle && typeof subtitle === "object") {
     let newSubtitle = subtitle.default || "";
@@ -36280,12 +36347,14 @@ function getSubtitles$1(subtitles, position) {
 function getFormTitles$1(titles, key, position) {
   let tilte = titles && titles[key];
   return tilte ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-    className: "title-semibold-3 mb0 ".concat(position ? "mt-3" : ""),
+    className: `title-semibold-3 mb0 ${position ? "mt-3" : ""}`,
     children: tilte
   }) : null;
 }
 const updateFormValues$1 = (repeatIndex, repeatValues, inputName, value, formsValue, name, mainForm) => {
-  formsValue = Object.assign(formsValue, _objectSpread2({}, mainForm.getFieldsValue(true)));
+  formsValue = Object.assign(formsValue, {
+    ...mainForm.getFieldsValue(true)
+  });
   if (typeof repeatIndex === "number" && repeatValues) {
     if (!repeatValues[inputName] || !___default["default"].isEqual(repeatValues[inputName], value)) {
       repeatValues[inputName] = value;
@@ -36320,16 +36389,14 @@ const updateFormValues$1 = (repeatIndex, repeatValues, inputName, value, formsVa
 };
 const inputOnBlur = [];
 const inputTypeComponent$1 = {
-  text: (_ref5, _ref6) => {
-    let {
-      props,
-      rules
-    } = _ref5;
-    let {
-      inputMeta = {},
-      t,
-      isHighlighted
-    } = _ref6;
+  text: ({
+    props,
+    rules
+  }, {
+    inputMeta = {},
+    t,
+    isHighlighted
+  }) => {
     const maxRule = rules.find(r => r.max);
     const maxProps = {
       maxLength: MAX_TEXT_AREA_LENGTH
@@ -36337,28 +36404,26 @@ const inputTypeComponent$1 = {
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
-      size: "large"
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+      size: "large",
+      ...maxProps,
       allowClear: true,
       autoComplete: "new-password",
-      type: "text"
-    }, props), {}, {
+      type: "text",
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  link: (_ref7, _ref8) => {
-    let {
-      props,
-      rules
-    } = _ref7;
-    let {
-      inputMeta = {},
-      t,
-      isHighlighted
-    } = _ref8;
+  link: ({
+    props,
+    rules
+  }, {
+    inputMeta = {},
+    t,
+    isHighlighted
+  }) => {
     const maxRule = rules.find(r => r.max);
     const maxProps = {
       maxLength: MAX_TEXT_AREA_LENGTH
@@ -36366,32 +36431,29 @@ const inputTypeComponent$1 = {
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
-      size: "large"
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+      size: "large",
+      ...maxProps,
       allowClear: true,
       autoComplete: "new-password",
-      type: "text"
-    }, props), {}, {
+      type: "text",
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  number: (_ref9, _ref10) => {
-    var _input$meta8;
-    let {
-      props,
-      rules,
-      input
-    } = _ref9;
-    let {
-      inputMeta = {},
-      t,
-      isHighlighted
-    } = _ref10;
+  number: ({
+    props,
+    rules,
+    input
+  }, {
+    inputMeta = {},
+    t,
+    isHighlighted
+  }) => {
     const maxRule = rules.find(r => r.max);
-    const integerRule = !(input !== null && input !== void 0 && (_input$meta8 = input.meta) !== null && _input$meta8 !== void 0 && _input$meta8.isDecimal);
+    const integerRule = !input?.meta?.isDecimal;
     const parser = value => {
       if (!value) {
         return "";
@@ -36402,63 +36464,60 @@ const inputTypeComponent$1 = {
       return value.replace(/\$\s?|(,*)/g, "");
     };
     if (maxRule) {
-      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
         size: "large",
         allowClear: true,
-        autoComplete: "new-password"
-      }, props), {}, {
+        autoComplete: "new-password",
+        ...props,
         type: "number",
         parser: parser,
         min: 0,
         max: maxRule.max,
         className: formatClassname([isHighlighted && "highlighted-input"])
-      }));
+      });
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
       size: "large",
       allowClear: true,
       className: formatClassname([isHighlighted && "highlighted-input"]),
-      autoComplete: "new-password"
-    }, props), {}, {
+      autoComplete: "new-password",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type number"),
       min: 0,
       formatter: value => numberWithCommas$1(value),
       parser: parser
-    }));
+    });
   },
   // eslint-disable-next-line no-unused-vars
-  select: (_ref11, _ref12) => {
-    var _input$meta9, _input$meta10;
-    let {
-      value,
-      options,
-      optionGroup,
-      props,
-      formsValue,
-      optionsFilter,
-      filterCond,
-      repeatValues,
-      repeatIndex,
-      name,
-      inputName,
-      address,
-      addressData,
-      input,
-      scope
-    } = _ref11;
-    let {
-      forms,
-      form,
-      setAddress,
-      inputMeta = {},
-      t,
-      isHighlighted,
-      changeInputMeta,
-      groupFormId
-    } = _ref12;
+  select: ({
+    value,
+    options,
+    optionGroup,
+    props,
+    formsValue,
+    optionsFilter,
+    filterCond,
+    repeatValues,
+    repeatIndex,
+    name,
+    inputName,
+    address,
+    addressData,
+    input,
+    scope
+  }, {
+    forms,
+    form,
+    setAddress,
+    inputMeta = {},
+    t,
+    isHighlighted,
+    changeInputMeta,
+    groupFormId
+  }) => {
     let opts;
-    const isEvaluation = input === null || input === void 0 || (_input$meta9 = input.meta) === null || _input$meta9 === void 0 ? void 0 : _input$meta9.isEvaluation;
+    const isEvaluation = input?.meta?.isEvaluation;
     let defaultValue = value;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -36483,7 +36542,7 @@ const inputTypeComponent$1 = {
         opts = [];
       }
     } else {
-      opts = options === null || options === void 0 ? void 0 : options.filter(o => !o.onlyView);
+      opts = options?.filter(o => !o.onlyView);
     }
     opts = JSON.parse(JSON.stringify(opts || []));
     opts = opts.map(o => getSelectOptions$2(o, formsValue));
@@ -36493,7 +36552,7 @@ const inputTypeComponent$1 = {
     const uniqueDefaultKeys = getUniqueDefaultKeys(options);
 
     // Handle default value logic
-    if (!propHasValue$1(value) && propHasValue$1(input === null || input === void 0 || (_input$meta10 = input.meta) === null || _input$meta10 === void 0 ? void 0 : _input$meta10.defaultValue)) {
+    if (!propHasValue$1(value) && propHasValue$1(input?.meta?.defaultValue)) {
       // If no current value but there's a default value, use the default
       value = input.meta.defaultValue;
       defaultValue = value;
@@ -36526,7 +36585,7 @@ const inputTypeComponent$1 = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       size: "large",
       autoComplete: "new-password",
       allowClear: true,
@@ -36535,32 +36594,35 @@ const inputTypeComponent$1 = {
       value: value // Use value instead of defaultValue for controlled behavior
       ,
       filterOption: filterSelectOptions,
-      optionFilterProp: "children"
-    }, props), {}, {
+      optionFilterProp: "children",
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-select"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp(props.placeholder, formsValue) || t("Select one option"),
       onChange: (val, selectedValue) => {
         // ONLY FOR SBG EVALUATON !!
         if (isEvaluation && val === "na" && groupFormId) {
-          var _formsValue$meta2;
           changeInputMeta({
             key: groupFormId,
-            value: _objectSpread2(_objectSpread2({}, (formsValue === null || formsValue === void 0 || (_formsValue$meta2 = formsValue.meta) === null || _formsValue$meta2 === void 0 || (_formsValue$meta2 = _formsValue$meta2.inputs) === null || _formsValue$meta2 === void 0 ? void 0 : _formsValue$meta2[groupFormId]) || {}), {}, {
+            value: {
+              ...(formsValue?.meta?.inputs?.[groupFormId] || {}),
               documentation: {
                 notApplicable: true
               }
-            }),
+            },
             otherValues: {
-              [groupFormId]: _objectSpread2(_objectSpread2({}, (formsValue === null || formsValue === void 0 ? void 0 : formsValue[groupFormId]) || {}), {}, {
+              [groupFormId]: {
+                ...(formsValue?.[groupFormId] || {}),
                 [name]: val
-              })
+              }
             }
           });
         }
         if (address && selectedValue) {
           dot__default["default"].str(address, selectedValue.children, addressData);
-          setAddress(_objectSpread2({}, addressData));
+          setAddress({
+            ...addressData
+          });
         }
         if (props.onChange) {
           props.onChange(val);
@@ -36591,15 +36653,15 @@ const inputTypeComponent$1 = {
             if (og.disabled !== undefined) {
               groupOtherProps.disabled = og.disabled;
             }
-            return /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, _objectSpread2(_objectSpread2({
-              value: og.value
-            }, groupOtherProps), {}, {
+            return /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+              value: og.value,
+              ...groupOtherProps,
               children: og.label
-            }), "".concat(i).concat(j));
+            }, `${i}${j}`);
           })
-        }) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, _objectSpread2(_objectSpread2({
-          value: option.value
-        }, otherProps), {}, {
+        }) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+          value: option.value,
+          ...otherProps,
           children: isEvaluation ? /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "flex",
             children: [/*#__PURE__*/jsxRuntime.jsx("div", {
@@ -36607,35 +36669,33 @@ const inputTypeComponent$1 = {
               children: sgbEvaluationIcons[option.value]
             }), option.label]
           }) : option.label
-        }), option.value);
+        }, option.value);
       })
-    }));
+    });
   },
-  multiselect: (_ref13, _ref14) => {
-    let {
-      value,
-      options,
-      optionGroup,
-      optionsFilter,
-      filterCond,
-      props,
-      formsValue,
-      repeatValues,
-      repeatIndex,
-      inputName,
-      name,
-      tags,
-      maxWidth,
-      staticWidth,
-      fullWidth
-    } = _ref13;
-    let {
-      forms,
-      form,
-      inputMeta = {},
-      t,
-      isHighlighted
-    } = _ref14;
+  multiselect: ({
+    value,
+    options,
+    optionGroup,
+    optionsFilter,
+    filterCond,
+    props,
+    formsValue,
+    repeatValues,
+    repeatIndex,
+    inputName,
+    name,
+    tags,
+    maxWidth,
+    staticWidth,
+    fullWidth
+  }, {
+    forms,
+    form,
+    inputMeta = {},
+    t,
+    isHighlighted
+  }) => {
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -36697,17 +36757,17 @@ const inputTypeComponent$1 = {
       staticWidth,
       fullWidth
     });
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       size: "medium",
       allowClear: true,
       autoComplete: "new-password",
       mode: tags ? "tags" : "multiple",
-      optionFilterProp: "children"
-    }, tags ? {
-      tokenSeparators: [","]
-    } : {}), {}, {
-      filterOption: filterSelectOptions
-    }, props), {}, {
+      optionFilterProp: "children",
+      ...(tags ? {
+        tokenSeparators: [","]
+      } : {}),
+      filterOption: filterSelectOptions,
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-select"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp(props.placeholder, formsValue) || t("Select all relevant options"),
@@ -36746,52 +36806,51 @@ const inputTypeComponent$1 = {
             if (og.disabled !== undefined) {
               groupOtherProps.disabled = og.disabled;
             }
-            return /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, _objectSpread2(_objectSpread2({
-              value: og.value
-            }, groupOtherProps), {}, {
+            return /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+              value: og.value,
+              ...groupOtherProps,
               children: og.label
-            }), "".concat(i).concat(j));
+            }, `${i}${j}`);
           })
-        }) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, _objectSpread2(_objectSpread2({
-          value: option.value
-        }, otherProps), {}, {
+        }) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+          value: option.value,
+          ...otherProps,
           children: option.label
-        }), i);
+        }, i);
       })
-    }));
+    });
   },
-  date: (_ref15, _ref16) => {
-    var _formsValue$groupForm, _value2;
-    let {
-      props,
-      rules,
-      repeatValues,
-      formsValue,
-      name
-    } = _ref15;
-    let {
-      setFormValues,
-      inputMeta,
-      form,
-      t,
-      isHighlighted,
-      groupFormId
-    } = _ref16;
+  date: ({
+    props,
+    rules,
+    repeatValues,
+    formsValue,
+    name
+  }, {
+    setFormValues,
+    inputMeta,
+    form,
+    t,
+    isHighlighted,
+    groupFormId
+  }) => {
     const lng = localStorage.getItem("datastakeLng") || "en";
     const maxRule = rules.find(r => r.max);
-    let value = groupFormId ? formsValue === null || formsValue === void 0 || (_formsValue$groupForm = formsValue[groupFormId]) === null || _formsValue$groupForm === void 0 ? void 0 : _formsValue$groupForm[name] : formsValue[name];
+    let value = groupFormId ? formsValue?.[groupFormId]?.[name] : formsValue[name];
     const handleDateChange = date => {
       if (date) {
         // const localDate = dayjs.utc(date).add(dayjs(date).utcOffset(), 'minutes');
         const localDate = dayjs__default["default"].utc(date);
         if (groupFormId) {
-          const _new = _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+          const _new = {
+            ...(formsValue[groupFormId] || {}),
             [name]: localDate
-          });
+          };
           form.setFieldValue(groupFormId, _new);
-          setFormValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          setFormValues({
+            ...formsValue,
             [groupFormId]: _new
-          }));
+          });
         } else {
           form.setFieldValue(name, localDate);
         }
@@ -36800,13 +36859,15 @@ const inputTypeComponent$1 = {
     if (groupFormId) {
       if (typeof value === "string" || typeof value === "undefined") {
         value = typeof value === "string" ? dayjs__default["default"].utc(value) : null;
-        const _new = _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+        const _new = {
+          ...(formsValue[groupFormId] || {}),
           [name]: value
-        });
+        };
         form.setFieldValue(groupFormId, _new);
-        setFormValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        setFormValues({
+          ...formsValue,
           [groupFormId]: _new
-        }));
+        });
       }
     } else {
       if (typeof value === "string") {
@@ -36822,13 +36883,12 @@ const inputTypeComponent$1 = {
         checkForMax = checkCondition$1(maxRule.condition, repeatValues, formsValue);
       }
       if (checkForMax) {
-        var _value;
-        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
           size: "large",
           allowClear: true,
-          autoComplete: "new-password"
-        }, props), {}, {
-          value: value ? dayjs__default["default"]((_value = value) === null || _value === void 0 ? void 0 : _value.format("YYYY-MM-DD"), "YYYY-MM-DD") : undefined,
+          autoComplete: "new-password",
+          ...props,
+          value: value ? dayjs__default["default"](value?.format("YYYY-MM-DD"), "YYYY-MM-DD") : undefined,
           onChange: handleDateChange,
           className: formatClassname([isHighlighted && "highlighted-input"]),
           disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
@@ -36838,54 +36898,49 @@ const inputTypeComponent$1 = {
           disabledDate: current => {
             return current && current >= dayjs__default["default"]().endOf("day");
           }
-        }));
+        });
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
       size: "large",
       allowClear: true,
-      autoComplete: "new-password"
-    }, props), {}, {
-      value: value ? dayjs__default["default"]((_value2 = value) === null || _value2 === void 0 ? void 0 : _value2.format("YYYY-MM-DD"), "YYYY-MM-DD") : undefined,
+      autoComplete: "new-password",
+      ...props,
+      value: value ? dayjs__default["default"](value?.format("YYYY-MM-DD"), "YYYY-MM-DD") : undefined,
       onChange: handleDateChange,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder,
       format: DATE_FORMATS,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"]
-    }));
+    });
   },
-  groupExpandable: (_ref17, _ref18) => {
-    var _formsValue$groupForm2;
-    let {
-      formsValue,
-      name,
-      input
-    } = _ref17;
-    let {
-      groupFormId
-    } = _ref18;
-    const data = groupFormId ? formsValue === null || formsValue === void 0 || (_formsValue$groupForm2 = formsValue[groupFormId]) === null || _formsValue$groupForm2 === void 0 ? void 0 : _formsValue$groupForm2[name] : formsValue === null || formsValue === void 0 ? void 0 : formsValue[name];
+  groupExpandable: ({
+    formsValue,
+    name,
+    input
+  }, {
+    groupFormId
+  }) => {
+    const data = groupFormId ? formsValue?.[groupFormId]?.[name] : formsValue?.[name];
     return /*#__PURE__*/jsxRuntime.jsx(GroupExpandable, {
       input: input,
       formsValue: formsValue,
       data: data
     });
   },
-  comment: (_ref19, _ref20) => {
-    let {
-        props: {
-          placeholder
-        },
-        commentHint
-      } = _ref19,
-      props = _objectWithoutProperties(_ref19.props, _excluded$g);
-    let {
-      onChange,
-      value,
-      isHighlighted
-    } = _ref20;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
+  comment: ({
+    props: {
+      placeholder,
+      ...props
+    },
+    commentHint
+  }, {
+    onChange,
+    value,
+    isHighlighted
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
       allowClear: true,
       value: value,
       onChange: e => onChange(e.target.value),
@@ -36896,27 +36951,26 @@ const inputTypeComponent$1 = {
       autoSize: {
         minRows: 5,
         maxRows: 5
-      }
-    }, props), {}, {
+      },
+      ...props,
       disabled: false
-    }));
+    });
   },
-  tableComment: (_ref21, _ref22) => {
-    var _formsValue$meta3;
-    let {
-      setValues,
-      name,
-      onValuesChange,
-      formsValue
-    } = _ref21;
-    let {
-      form,
-      groupFormId,
-      isHighlighted
-    } = _ref22;
-    const formData = groupFormId ? getArray((formsValue[groupFormId] || {})[name] || []).map((v, i) => _objectSpread2(_objectSpread2({}, v), {}, {
+  tableComment: ({
+    setValues,
+    name,
+    onValuesChange,
+    formsValue
+  }, {
+    form,
+    groupFormId,
+    isHighlighted
+  }) => {
+    const formData = groupFormId ? getArray((formsValue[groupFormId] || {})[name] || []).map((v, i) => ({
+      ...v,
       key: i
-    })) : (formsValue[name] || []).map((v, i) => _objectSpread2(_objectSpread2({}, v), {}, {
+    })) : (formsValue[name] || []).map((v, i) => ({
+      ...v,
       key: i
     }));
     const onUpdate = (val, i) => {
@@ -36924,89 +36978,121 @@ const inputTypeComponent$1 = {
         [name]: formData.map((d, j) => i === j ? val : d)
       };
       if (groupFormId) {
-        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+        const _defaultData = form?.getFieldValue(groupFormId) || {};
+        const _newData = {
+          ..._defaultData,
+          ..._val
+        };
+        onValuesChange(_newData, {
+          ...formsValue,
           [groupFormId]: _newData
-        }));
-        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        });
+        form?.setFieldValue(groupFormId, _newData);
+        setValues({
+          ...formsValue,
           [groupFormId]: _newData
-        }));
+        });
         return;
       }
-      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+      onValuesChange(_val, {
+        ...formsValue,
+        ..._val
+      });
+      form?.setFieldValue(name, _val[name]);
+      setValues({
+        ...formsValue,
+        ..._val
+      });
     };
     return /*#__PURE__*/jsxRuntime.jsx(Comment, {
       onUpdate: onUpdate,
       isHighlighted: isHighlighted,
       form: form,
-      values: groupFormId ? _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+      values: groupFormId ? {
+        ...(formsValue[groupFormId] || {}),
         meta: {
-          inputs: ((formsValue === null || formsValue === void 0 || (_formsValue$meta3 = formsValue.meta) === null || _formsValue$meta3 === void 0 ? void 0 : _formsValue$meta3.inputs) || {})[groupFormId]
+          inputs: (formsValue?.meta?.inputs || {})[groupFormId]
         }
-      }) : formsValue,
+      } : formsValue,
       name: name,
-      remove: _ref23 => {
-        let {
-          key
-        } = _ref23;
+      remove: ({
+        key
+      }) => {
         const _val = {
           [name]: formData.filter(v => v.key !== key)
         };
         if (groupFormId) {
-          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+          const _defaultData = form?.getFieldValue(groupFormId) || {};
+          const _newData = {
+            ..._defaultData,
+            ..._val
+          };
+          onValuesChange(_newData, {
+            ...formsValue,
             [groupFormId]: _newData
-          }));
-          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          });
+          form?.setFieldValue(groupFormId, _newData);
+          setValues({
+            ...formsValue,
             [groupFormId]: _newData
-          }));
+          });
           return;
         }
-        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+        onValuesChange(_val, {
+          ...formsValue,
+          ..._val
+        });
+        form?.setFieldValue(name, _val[name]);
+        setValues({
+          ...formsValue,
+          ..._val
+        });
       },
       add: val => {
         const _val = {
-          [name]: [...formData, _objectSpread2(_objectSpread2({}, val), {}, {
+          [name]: [...formData, {
+            ...val,
             key: formData.length
-          })]
+          }]
         };
         if (groupFormId) {
-          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+          const _defaultData = form?.getFieldValue(groupFormId) || {};
+          const _newData = {
+            ..._defaultData,
+            ..._val
+          };
+          form?.setFieldValue(groupFormId, _newData);
+          onValuesChange(_newData, {
+            ...formsValue,
             [groupFormId]: _newData
-          }));
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          });
+          setValues({
+            ...formsValue,
             [groupFormId]: _newData
-          }));
+          });
           return;
         }
-        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+        form?.setFieldValue(name, _val[name]);
+        onValuesChange(_val, {
+          ...formsValue,
+          ..._val
+        });
+        setValues({
+          ...formsValue,
+          ..._val
+        });
       },
       k: name
     });
   },
-  textarea: (_ref24, _ref25) => {
-    let {
-      props,
-      rules
-    } = _ref24;
-    let {
-      inputMeta,
-      t,
-      isHighlighted
-    } = _ref25;
+  textarea: ({
+    props,
+    rules
+  }, {
+    inputMeta,
+    t,
+    isHighlighted
+  }) => {
     const maxRule = rules.find(r => r.max);
     let maxLength = MAX_TEXT_AREA_LENGTH;
     let rows = 5;
@@ -37033,7 +37119,7 @@ const inputTypeComponent$1 = {
       //     rows = 14;
       //   }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
       allowClear: true,
       autoComplete: "new-password",
       maxLength: maxLength,
@@ -37041,37 +37127,35 @@ const inputTypeComponent$1 = {
       autoSize: {
         minRows: rows,
         maxRows: rows
-      }
-    }, props), {}, {
+      },
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  phoneNumber: (_ref26, _ref27) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref26;
-    let {
-      setFormValues,
-      inputMeta,
-      t,
-      isHighlighted
-    } = _ref27;
-    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, _objectSpread2(_objectSpread2({
+  phoneNumber: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    setFormValues,
+    inputMeta,
+    t,
+    isHighlighted
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, {
       customSelectWidthPercentage: "20%",
       t: t,
       size: "large",
       allowClear: true,
-      country: formsValue === null || formsValue === void 0 ? void 0 : formsValue.country,
+      country: formsValue?.country,
       initialValue: value,
-      name: name
-    }, props), {}, {
+      name: name,
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type Number"),
@@ -37092,27 +37176,26 @@ const inputTypeComponent$1 = {
         }
         return val;
       }
-    }));
+    });
   },
-  switch: (_ref28, _ref29) => {
-    let {
-      props,
-      value,
-      restricted,
-      autocomplete,
-      formsValue,
-      repeatValues,
-      repeatIndex,
-      name,
-      inputName,
-      replace: replaceInput,
-      unique
-    } = _ref28;
-    let {
-      form,
-      isHighlighted
-    } = _ref29;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, _objectSpread2(_objectSpread2({}, props), {}, {
+  switch: ({
+    props,
+    value,
+    restricted,
+    autocomplete,
+    formsValue,
+    repeatValues,
+    repeatIndex,
+    name,
+    inputName,
+    replace: replaceInput,
+    unique
+  }, {
+    form,
+    isHighlighted
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, {
+      ...props,
       size: "default",
       defaultChecked: value || false,
       checked: value || false,
@@ -37140,7 +37223,9 @@ const inputTypeComponent$1 = {
           const [formName, replaceInputName] = replaceTo.split(".");
           const replaceRepeatValues = replaceInputName ? dot__default["default"].pick(formName, formsValue) : undefined;
           updateFormValues$1(undefined, replaceRepeatValues, replaceInputName, isChecked ? newId : undefined, formsValue, formName, form);
-          formsValue = Object.assign(formsValue, _objectSpread2({}, form.getFieldsValue(true)));
+          formsValue = Object.assign(formsValue, {
+            ...form.getFieldsValue(true)
+          });
           if (oldId) {
             const allRepeatValues = dot__default["default"].pick(name, formsValue);
             if (allRepeatValues && Array.isArray(allRepeatValues)) {
@@ -37181,22 +37266,20 @@ const inputTypeComponent$1 = {
           }
         }
       }
-    }));
+    });
   },
-  radioGroup: (_ref30, _ref31) => {
-    let {
-      props,
-      value,
-      options,
-      isRisk
-    } = _ref30;
-    let {
-      isHighlighted
-    } = _ref31;
+  radioGroup: ({
+    props,
+    value,
+    options,
+    isRisk
+  }, {
+    isHighlighted
+  }) => {
     if (isRisk) {
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, _objectSpread2(_objectSpread2({
-        value: value
-      }, props), {}, {
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, {
+        value: value,
+        ...props,
         className: "is-risk-radio",
         children: (options || []).map(o => {
           return /*#__PURE__*/jsxRuntime.jsxs(antd.Radio, {
@@ -37210,11 +37293,11 @@ const inputTypeComponent$1 = {
             }) : null]
           }, o.value);
         })
-      }));
+      });
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, _objectSpread2(_objectSpread2({
-      value: value
-    }, props), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, {
+      value: value,
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Radio, {
@@ -37228,20 +37311,18 @@ const inputTypeComponent$1 = {
           }) : null]
         }, o.value);
       })
-    }));
+    });
   },
-  checkboxGroup: (_ref32, _ref33) => {
-    let {
-      props,
-      value,
-      options
-    } = _ref32;
-    let {
-      isHighlighted
-    } = _ref33;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, _objectSpread2(_objectSpread2({
-      value: value
-    }, props), {}, {
+  checkboxGroup: ({
+    props,
+    value,
+    options
+  }, {
+    isHighlighted
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, {
+      value: value,
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       style: {
         display: "grid",
@@ -37265,18 +37346,16 @@ const inputTypeComponent$1 = {
           }) : null]
         }, o.value);
       })
-    }));
+    });
   },
-  total100: (_ref34, _ref35) => {
-    let {
-      props,
-      name,
-      options,
-      value
-    } = _ref34;
-    let {
-      isHighlighted
-    } = _ref35;
+  total100: ({
+    props,
+    name,
+    options,
+    value
+  }, {
+    isHighlighted
+  }) => {
     value = value ? Array.isArray(value) ? value : [value] : [];
     function totalValue() {
       let total = 0;
@@ -37300,11 +37379,10 @@ const inputTypeComponent$1 = {
       className: formatClassname(["total100", isHighlighted && "highlighted-input"]),
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: name,
-        children: (fields, _ref36) => {
-          let {
-            add,
-            remove
-          } = _ref36;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           if (fields.length === 0) {
             const formData = value || [];
             if (formData.length) {
@@ -37323,27 +37401,27 @@ const inputTypeComponent$1 = {
               const v = value[field.name] || {};
               return /*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
                 className: "total",
-                children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
-                  noStyle: true
-                }, field), {}, {
+                children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                  noStyle: true,
+                  ...field,
                   name: [field.name, "type"],
                   fieldKey: [field.fieldKey, "type"],
                   initialValue: v.type || null,
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
                     size: "large",
                     allowClear: true,
                     showSearch: true,
                     filterOption: filterSelectOptions,
-                    optionFilterProp: "children"
-                  }, props), {}, {
+                    optionFilterProp: "children",
+                    ...props,
                     children: options.map((option, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
                       value: option.value,
                       children: option.label
                     }, i))
-                  }))
-                })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
-                  noStyle: true
-                }, field), {}, {
+                  })
+                }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                  noStyle: true,
+                  ...field,
                   name: [field.name, "value"],
                   fieldKey: [field.fieldKey, "value"],
                   initialValue: v.value,
@@ -37352,14 +37430,14 @@ const inputTypeComponent$1 = {
                     allowClear: true,
                     name: "value",
                     formatter: value => {
-                      return value ? "".concat(value, "%") : "";
+                      return value ? `${value}%` : "";
                     },
                     disabled: !v.type || null,
                     placeholder: props.valueplaceholder ? props.valueplaceholder : "Value",
                     min: 1,
                     max: 100 - siblingTotal(v.type || 0)
                   })
-                })), fields.length - 1 === i ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+                }), fields.length - 1 === i ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   disabled: !v.value || !v.type || totalValue() >= 100,
                   type: "primary",
                   icon: /*#__PURE__*/jsxRuntime.jsx(Icons.PlusOutlined, {}),
@@ -37391,22 +37469,19 @@ const inputTypeComponent$1 = {
       }) : null]
     });
   },
-  percentage: (_ref37, _ref38) => {
-    var _input$meta11;
-    let {
-      name,
-      inputName,
-      totalMax,
-      repeatIndex,
-      props,
-      formsValue,
-      input
-    } = _ref37;
-    let {
-      inputMeta,
-      t,
-      isHighlighted
-    } = _ref38;
+  percentage: ({
+    name,
+    inputName,
+    totalMax,
+    repeatIndex,
+    props,
+    formsValue,
+    input
+  }, {
+    inputMeta,
+    t,
+    isHighlighted
+  }) => {
     const isRepeatable = Array.isArray(formsValue[name]);
     let totalSiblings = 0;
     if (isRepeatable && totalMax) {
@@ -37414,47 +37489,45 @@ const inputTypeComponent$1 = {
         totl = totl + (grp[inputName] || 0);
         return totl;
       }, 0);
-    } else if (Array.isArray(input === null || input === void 0 || (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.siblings)) {
+    } else if (Array.isArray(input?.meta?.siblings)) {
       totalSiblings = input.meta.siblings.reduce((totl, key) => {
         totl = totl + (formsValue[key] || 0);
         return totl;
       }, 0);
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
       size: "large",
-      allowClear: true
-    }, props), {}, {
+      allowClear: true,
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-cont"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type number"),
       min: 0,
       max: 100 - totalSiblings,
       formatter: value => {
-        return value ? "".concat(value) : "";
+        return value ? `${value}` : "";
       },
       parser: value => value.replace("%", ""),
       addonAfter: "%"
-    }));
+    });
   },
-  drawTerritory: (_ref39, _ref40) => {
-    let {
-      formsValue,
-      name,
-      addressData
-    } = _ref39;
-    let {
-      setFormValues
-    } = _ref40;
+  drawTerritory: ({
+    formsValue,
+    name,
+    addressData
+  }, {
+    setFormValues
+  }) => {
     let search = formsValue.country;
     if (addressData && addressData.address && Object.keys(addressData.address).length > 0) {
       if (addressData.address.country) {
         search = addressData.address.country;
       }
       if (addressData.address.level1) {
-        search = "".concat(addressData.address.level1, ", ").concat(addressData.address.country);
+        search = `${addressData.address.level1}, ${addressData.address.country}`;
       }
       if (addressData.address.level2) {
-        search = "".concat(addressData.address.level2, ", ").concat(addressData.address.level1, ", ").concat(addressData.address.country);
+        search = `${addressData.address.level2}, ${addressData.address.level1}, ${addressData.address.country}`;
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -37462,10 +37535,10 @@ const inputTypeComponent$1 = {
         search = country.name;
       }
       if (formsValue.administrativeLevel1Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel1Name);
+        search = `${search} ${formsValue.administrativeLevel1Name}`;
       }
       if (formsValue.administrativeLevel2Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel2Name);
+        search = `${search} ${formsValue.administrativeLevel2Name}`;
       }
     }
     return /*#__PURE__*/jsxRuntime.jsx(PolygonSelector, {
@@ -37477,36 +37550,32 @@ const inputTypeComponent$1 = {
       searchValue: search
     });
   },
-  year: (_ref41, _ref42) => {
-    let {
-      props
-    } = _ref41;
-    let {
-      isHighlighted
-    } = _ref42;
+  year: ({
+    props
+  }, {
+    isHighlighted
+  }) => {
     const lng = localStorage.getItem("datastakeLng") || "en";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
       size: "large",
       allowClear: true,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
-      picker: "year"
-    }, props), {}, {
+      picker: "year",
+      ...props,
       className: formatClassname([isHighlighted && "highlighted-input"]),
       format: "YYYY"
-    }));
+    });
   },
-  upload: (_ref43, _ref44) => {
-    let {
-      rules,
-      value
-    } = _ref43;
-    let {
-      setLoading = () => {},
-      getApiBaseUrl,
-      getAppHeader,
-      t,
-      isHighlighted
-    } = _ref44;
+  upload: ({
+    rules,
+    value
+  }, {
+    setLoading = () => {},
+    getApiBaseUrl,
+    getAppHeader,
+    t,
+    isHighlighted
+  }) => {
     const apiURL = getApiBaseUrl();
     const accept = rules.length ? rules.find(rule => Object.keys(rule).includes("accept")).accept || "*" : null;
     const values = (Array.isArray(value) ? value : value && typeof value === "object" && value.fileList && Array.isArray(value.fileList) ? value.fileList.map(f => f.response).filter(f => f) : []) || [];
@@ -37519,12 +37588,13 @@ const inputTypeComponent$1 = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({}, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      ...maxProps,
       accept: accept,
-      action: "".concat(apiURL, "/upload"),
+      action: `${apiURL}/upload`,
       beforeUpload: beforeUpload(allowedExtensions),
       onChange: val => {
-        if (val !== null && val !== void 0 && val.file && typeof setLoading === "function") {
+        if (val?.file && typeof setLoading === "function") {
           if (val.file.percent !== 100) {
             setLoading(true);
           } else {
@@ -37532,9 +37602,10 @@ const inputTypeComponent$1 = {
           }
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -37545,20 +37616,18 @@ const inputTypeComponent$1 = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  imageUpload: (_ref45, _ref46) => {
-    let {
-      rules,
-      value
-    } = _ref45;
-    let {
-      setLoading = () => {},
-      getApiBaseUrl,
-      getAppHeader,
-      t,
-      isHighlighted
-    } = _ref46;
+  imageUpload: ({
+    rules,
+    value
+  }, {
+    setLoading = () => {},
+    getApiBaseUrl,
+    getAppHeader,
+    t,
+    isHighlighted
+  }) => {
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -37569,18 +37638,17 @@ const inputTypeComponent$1 = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({
-      beforeUpload: beforeUpload(allowedImageExtensions)
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      beforeUpload: beforeUpload(allowedImageExtensions),
+      ...maxProps,
       accept: "image/*",
       classList: !values || !values.length ? "empty" : "",
       listType: "picture",
-      action: "".concat(apiURL, "/upload"),
+      action: `${apiURL}/upload`,
       onChange: val => {
         if (typeof setLoading === "function") {
-          if (val !== null && val !== void 0 && val.file) {
-            var _val$file;
-            if ((val === null || val === void 0 || (_val$file = val.file) === null || _val$file === void 0 ? void 0 : _val$file.status) === "removed") {
+          if (val?.file) {
+            if (val?.file?.status === "removed") {
               setLoading(false);
               return;
             }
@@ -37592,9 +37660,10 @@ const inputTypeComponent$1 = {
           setLoading(false);
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -37605,20 +37674,18 @@ const inputTypeComponent$1 = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  videoUpload: (_ref47, _ref48) => {
-    let {
-      rules,
-      value
-    } = _ref47;
-    let {
-      setLoading = () => {},
-      getApiBaseUrl,
-      getAppHeader,
-      t,
-      isHighlighted
-    } = _ref48;
+  videoUpload: ({
+    rules,
+    value
+  }, {
+    setLoading = () => {},
+    getApiBaseUrl,
+    getAppHeader,
+    t,
+    isHighlighted
+  }) => {
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -37629,25 +37696,21 @@ const inputTypeComponent$1 = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({
-      itemRender: (item, fileList) => {
-        var _fileList$response;
-        return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/jsxRuntime.jsx(EditVideoPreview, {
-            url: (fileList === null || fileList === void 0 || (_fileList$response = fileList.response) === null || _fileList$response === void 0 ? void 0 : _fileList$response.url) || (fileList === null || fileList === void 0 ? void 0 : fileList.url)
-          }), item]
-        });
-      }
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      itemRender: (item, fileList) => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/jsxRuntime.jsx(EditVideoPreview, {
+          url: fileList?.response?.url || fileList?.url
+        }), item]
+      }),
+      ...maxProps,
       accept: "video/*",
       classList: !values || !values.length ? "empty" : "",
       listType: "picture",
-      action: "".concat(apiURL, "/upload"),
+      action: `${apiURL}/upload`,
       onChange: val => {
         if (typeof setLoading === "function") {
-          if (val !== null && val !== void 0 && val.file) {
-            var _val$file2;
-            if ((val === null || val === void 0 || (_val$file2 = val.file) === null || _val$file2 === void 0 ? void 0 : _val$file2.status) === "removed") {
+          if (val?.file) {
+            if (val?.file?.status === "removed") {
               setLoading(false);
               return;
             }
@@ -37659,9 +37722,10 @@ const inputTypeComponent$1 = {
           setLoading(false);
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       fileList: values,
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
@@ -37673,30 +37737,28 @@ const inputTypeComponent$1 = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  geolocation: (_ref49, _ref50) => {
-    let {
-      value,
-      name,
-      props,
-      formsValue,
-      addressData
-    } = _ref49;
-    let {
-      inputMeta,
-      isHighlighted
-    } = _ref50;
+  geolocation: ({
+    value,
+    name,
+    props,
+    formsValue,
+    addressData
+  }, {
+    inputMeta,
+    isHighlighted
+  }) => {
     let search = formsValue.country;
     if (addressData && Object.keys(addressData).length > 0) {
       if (addressData.country) {
         search = addressData.country;
       }
       if (addressData.level1) {
-        search = "".concat(addressData.level1, ", ").concat(addressData.country);
+        search = `${addressData.level1}, ${addressData.country}`;
       }
       if (addressData.level2) {
-        search = "".concat(addressData.level2, ", ").concat(addressData.level1, ", ").concat(addressData.country);
+        search = `${addressData.level2}, ${addressData.level1}, ${addressData.country}`;
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -37704,10 +37766,10 @@ const inputTypeComponent$1 = {
         search = country.name;
       }
       if (formsValue.administrativeLevel1Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel1Name);
+        search = `${search} ${formsValue.administrativeLevel1Name}`;
       }
       if (formsValue.administrativeLevel2Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel2Name);
+        search = `${search} ${formsValue.administrativeLevel2Name}`;
       }
     }
     return /*#__PURE__*/jsxRuntime.jsx(Geolocation, {
@@ -37721,36 +37783,34 @@ const inputTypeComponent$1 = {
       searchValue: search
     });
   },
-  ajaxSelect: (_ref51, _ref52) => {
-    let {
-      call,
-      automaticallyLink,
-      name,
-      inputName,
-      props,
-      formsValue,
-      onNewSetValue,
-      multiple,
-      updateOptions,
-      repeatValues,
-      repeatIndex,
-      value,
-      unique,
-      address,
-      addressData = {},
-      getFromLinking,
-      input
-    } = _ref51;
-    let {
-      form,
-      forms,
-      setAddress,
-      changeInputMeta,
-      inputMeta,
-      meta,
-      isHighlighted,
-      groupFormId
-    } = _ref52;
+  ajaxSelect: ({
+    call,
+    automaticallyLink,
+    name,
+    inputName,
+    props,
+    formsValue,
+    onNewSetValue,
+    multiple,
+    updateOptions,
+    repeatValues,
+    repeatIndex,
+    value,
+    unique,
+    address,
+    addressData = {},
+    getFromLinking,
+    input
+  }, {
+    form,
+    forms,
+    setAddress,
+    changeInputMeta,
+    inputMeta,
+    meta,
+    isHighlighted,
+    groupFormId
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect, {
       size: "medium",
       input: input,
@@ -37787,7 +37847,9 @@ const inputTypeComponent$1 = {
           const selectedValue = data.find(v => v.value === ev);
           if (address && selectedValue) {
             dot__default["default"].str(address, selectedValue.label, addressData);
-            setAddress(_objectSpread2({}, addressData));
+            setAddress({
+              ...addressData
+            });
           }
         }
       },
@@ -37796,11 +37858,10 @@ const inputTypeComponent$1 = {
       address: true
     });
   },
-  tag: _ref53 => {
-    let {
-      value,
-      repeatLabel
-    } = _ref53;
+  tag: ({
+    value,
+    repeatLabel
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(TagInput, {
       size: "large",
       allowClear: true,
@@ -37808,28 +37869,26 @@ const inputTypeComponent$1 = {
       newPlaceholder: repeatLabel
     });
   },
-  modal: (_ref54, _ref55) => {
-    let {
-      call,
-      automaticallyLink,
-      name,
-      inputName,
-      props,
-      formsValue,
-      allFormsValue,
-      onNewSetValue,
-      repeatValues,
-      repeatIndex,
-      value,
-      modalTitle,
-      totalInputs,
-      shownInputs,
-      allowDupplicates
-    } = _ref54;
-    let {
-      form,
-      add
-    } = _ref55;
+  modal: ({
+    call,
+    automaticallyLink,
+    name,
+    inputName,
+    props,
+    formsValue,
+    allFormsValue,
+    onNewSetValue,
+    repeatValues,
+    repeatIndex,
+    value,
+    modalTitle,
+    totalInputs,
+    shownInputs,
+    allowDupplicates
+  }, {
+    form,
+    add
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(AjaxModal, {
       allowClear: true,
       call: call,
@@ -37852,44 +37911,40 @@ const inputTypeComponent$1 = {
       allowDupplicates: allowDupplicates
     });
   },
-  dataLink: (_ref56, _ref57) => {
-    var _input$meta12, _input$meta15, _input$meta16, _formsValue$meta5, _input$meta18;
-    let {
-      setValues,
-      name,
-      onValuesChange,
-      changeLinking,
-      formsValue,
-      input,
-      call,
-      automaticallyLink,
-      inputName,
-      props,
-      onNewSetValue,
-      multiple,
-      updateOptions,
-      repeatValues,
-      repeatIndex,
-      value,
-      unique,
-      address,
-      addressData = {},
-      getFromLinking
-    } = _ref56;
-    let {
-      form,
-      forms,
-      setAddress,
-      changeInputMeta,
-      inputMeta,
-      meta,
-      isHighlighted,
-      groupFormId
-    } = _ref57;
-    if ((input === null || input === void 0 || (_input$meta12 = input.meta) === null || _input$meta12 === void 0 || (_input$meta12 = _input$meta12.optionsView) === null || _input$meta12 === void 0 ? void 0 : _input$meta12.editInputType) === "ajaxSelect") {
-      var _formsValue$groupForm3, _input$meta13, _input$meta14;
-      const currentValue = groupFormId ? (_formsValue$groupForm3 = formsValue[groupFormId]) === null || _formsValue$groupForm3 === void 0 ? void 0 : _formsValue$groupForm3[name] : formsValue[name];
-      (input === null || input === void 0 || (_input$meta13 = input.meta) === null || _input$meta13 === void 0 || (_input$meta13 = _input$meta13.optionsView) === null || _input$meta13 === void 0 ? void 0 : _input$meta13.call) || (input === null || input === void 0 || (_input$meta14 = input.meta) === null || _input$meta14 === void 0 ? void 0 : _input$meta14.call) || "default::list()::::";
+  dataLink: ({
+    setValues,
+    name,
+    onValuesChange,
+    changeLinking,
+    formsValue,
+    input,
+    call,
+    automaticallyLink,
+    inputName,
+    props,
+    onNewSetValue,
+    multiple,
+    updateOptions,
+    repeatValues,
+    repeatIndex,
+    value,
+    unique,
+    address,
+    addressData = {},
+    getFromLinking
+  }, {
+    form,
+    forms,
+    setAddress,
+    changeInputMeta,
+    inputMeta,
+    meta,
+    isHighlighted,
+    groupFormId
+  }) => {
+    if (input?.meta?.optionsView?.editInputType === "ajaxSelect") {
+      const currentValue = groupFormId ? formsValue[groupFormId]?.[name] : formsValue[name];
+      input?.meta?.optionsView?.call || input?.meta?.call || "default::list()::::";
       return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect$1, {
         size: "medium",
         input: input,
@@ -37926,7 +37981,9 @@ const inputTypeComponent$1 = {
             const selectedValue = data.find(v => v.value === ev);
             if (address && selectedValue) {
               dot__default["default"].str(address, selectedValue.label, addressData);
-              setAddress(_objectSpread2({}, addressData));
+              setAddress({
+                ...addressData
+              });
             }
           }
         },
@@ -37936,93 +37993,138 @@ const inputTypeComponent$1 = {
         isDataLink: true
       });
     }
-    const isSingle = (input === null || input === void 0 || (_input$meta15 = input.meta) === null || _input$meta15 === void 0 ? void 0 : _input$meta15.maxRepeat) === 1;
-    const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [_objectSpread2({}, (formsValue[groupFormId] || {})[name])] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => _objectSpread2({}, v)) : isSingle ? formsValue[name] ? [_objectSpread2({}, formsValue[name])] : [] : (formsValue[name] || []).map(v => _objectSpread2({}, v));
+    const isSingle = input?.meta?.maxRepeat === 1;
+    const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [{
+      ...(formsValue[groupFormId] || {})[name]
+    }] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => ({
+      ...v
+    })) : isSingle ? formsValue[name] ? [{
+      ...formsValue[name]
+    }] : [] : (formsValue[name] || []).map(v => ({
+      ...v
+    }));
     const onUpdate = (editData, i) => {
-      const val = _objectSpread2(_objectSpread2({}, formData[i]), editData);
+      const val = {
+        ...formData[i],
+        ...editData
+      };
       const _val = isSingle ? {
         [name]: val
       } : {
-        [name]: formData === null || formData === void 0 ? void 0 : formData.map((d, j) => i === j ? val : d)
+        [name]: formData?.map((d, j) => i === j ? val : d)
       };
       if (groupFormId) {
-        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+        const _defaultData = form?.getFieldValue(groupFormId) || {};
+        const _newData = {
+          ..._defaultData,
+          ..._val
+        };
+        onValuesChange(_newData, {
+          ...formsValue,
           [groupFormId]: _newData
-        }));
-        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        });
+        form?.setFieldValue(groupFormId, _newData);
+        setValues({
+          ...formsValue,
           [groupFormId]: _newData
-        }));
+        });
         return;
       }
-      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+      onValuesChange(_val, {
+        ...formsValue,
+        ..._val
+      });
+      form?.setFieldValue(name, _val[name]);
+      setValues({
+        ...formsValue,
+        ..._val
+      });
     };
-    if (input !== null && input !== void 0 && (_input$meta16 = input.meta) !== null && _input$meta16 !== void 0 && _input$meta16.flat) {
-      var _formsValue$meta4, _input$meta17;
+    if (input?.meta?.flat) {
       return /*#__PURE__*/jsxRuntime.jsx(DataLinkFlat, {
         form: input,
         changeLinking: changeLinking,
         onUpdate: onUpdate,
         isHighlighted: isHighlighted,
         formsValue: formsValue,
-        values: groupFormId ? _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+        values: groupFormId ? {
+          ...(formsValue[groupFormId] || {}),
           meta: {
-            inputs: ((formsValue === null || formsValue === void 0 || (_formsValue$meta4 = formsValue.meta) === null || _formsValue$meta4 === void 0 ? void 0 : _formsValue$meta4.inputs) || {})[groupFormId]
+            inputs: (formsValue?.meta?.inputs || {})[groupFormId]
           }
-        }) : formsValue,
+        } : formsValue,
         name: name,
         groupFormId: groupFormId,
-        maxRepeat: input === null || input === void 0 || (_input$meta17 = input.meta) === null || _input$meta17 === void 0 ? void 0 : _input$meta17.maxRepeat,
-        remove: _ref58 => {
-          let {
-            key
-          } = _ref58;
+        maxRepeat: input?.meta?.maxRepeat,
+        remove: ({
+          key
+        }) => {
           const _val = isSingle ? {
             [name]: null
           } : {
             [name]: formData.filter((v, i) => i !== key)
           };
           if (groupFormId) {
-            const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-            const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-            onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+            const _defaultData = form?.getFieldValue(groupFormId) || {};
+            const _newData = {
+              ..._defaultData,
+              ..._val
+            };
+            onValuesChange(_newData, {
+              ...formsValue,
               [groupFormId]: _newData
-            }));
-            form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-            setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+            });
+            form?.setFieldValue(groupFormId, _newData);
+            setValues({
+              ...formsValue,
               [groupFormId]: _newData
-            }));
+            });
             return;
           }
-          onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-          form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+          onValuesChange(_val, {
+            ...formsValue,
+            ..._val
+          });
+          form?.setFieldValue(name, _val[name]);
+          setValues({
+            ...formsValue,
+            ..._val
+          });
         },
         add: val => {
           const _val = isSingle ? {
             [name]: val
           } : {
-            [name]: [...formData, _objectSpread2({}, val)]
+            [name]: [...formData, {
+              ...val
+            }]
           };
           if (groupFormId) {
-            const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-            const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-            form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-            onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+            const _defaultData = form?.getFieldValue(groupFormId) || {};
+            const _newData = {
+              ..._defaultData,
+              ..._val
+            };
+            form?.setFieldValue(groupFormId, _newData);
+            onValuesChange(_newData, {
+              ...formsValue,
               [groupFormId]: _newData
-            }));
-            setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+            });
+            setValues({
+              ...formsValue,
               [groupFormId]: _newData
-            }));
+            });
             return;
           }
-          form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-          onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+          form?.setFieldValue(name, _val[name]);
+          onValuesChange(_val, {
+            ...formsValue,
+            ..._val
+          });
+          setValues({
+            ...formsValue,
+            ..._val
+          });
         },
         k: name,
         formData: formData
@@ -38034,79 +38136,101 @@ const inputTypeComponent$1 = {
       onUpdate: onUpdate,
       isHighlighted: isHighlighted,
       formsValue: formsValue,
-      values: groupFormId ? _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+      values: groupFormId ? {
+        ...(formsValue[groupFormId] || {}),
         meta: {
-          inputs: ((formsValue === null || formsValue === void 0 || (_formsValue$meta5 = formsValue.meta) === null || _formsValue$meta5 === void 0 ? void 0 : _formsValue$meta5.inputs) || {})[groupFormId]
+          inputs: (formsValue?.meta?.inputs || {})[groupFormId]
         }
-      }) : formsValue,
+      } : formsValue,
       name: name,
       groupFormId: groupFormId,
-      maxRepeat: input === null || input === void 0 || (_input$meta18 = input.meta) === null || _input$meta18 === void 0 ? void 0 : _input$meta18.maxRepeat,
-      remove: _ref59 => {
-        let {
-          key
-        } = _ref59;
+      maxRepeat: input?.meta?.maxRepeat,
+      remove: ({
+        key
+      }) => {
         const _val = isSingle ? {
           [name]: null
         } : {
           [name]: formData.filter((v, i) => i !== key)
         };
         if (groupFormId) {
-          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+          const _defaultData = form?.getFieldValue(groupFormId) || {};
+          const _newData = {
+            ..._defaultData,
+            ..._val
+          };
+          onValuesChange(_newData, {
+            ...formsValue,
             [groupFormId]: _newData
-          }));
-          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          });
+          form?.setFieldValue(groupFormId, _newData);
+          setValues({
+            ...formsValue,
             [groupFormId]: _newData
-          }));
+          });
           return;
         }
-        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+        onValuesChange(_val, {
+          ...formsValue,
+          ..._val
+        });
+        form?.setFieldValue(name, _val[name]);
+        setValues({
+          ...formsValue,
+          ..._val
+        });
       },
       add: val => {
         const _val = isSingle ? {
           [name]: val
         } : {
-          [name]: [...formData, _objectSpread2({}, val)]
+          [name]: [...formData, {
+            ...val
+          }]
         };
         if (groupFormId) {
-          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+          const _defaultData = form?.getFieldValue(groupFormId) || {};
+          const _newData = {
+            ..._defaultData,
+            ..._val
+          };
+          form?.setFieldValue(groupFormId, _newData);
+          onValuesChange(_newData, {
+            ...formsValue,
             [groupFormId]: _newData
-          }));
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          });
+          setValues({
+            ...formsValue,
             [groupFormId]: _newData
-          }));
+          });
           return;
         }
-        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+        form?.setFieldValue(name, _val[name]);
+        onValuesChange(_val, {
+          ...formsValue,
+          ..._val
+        });
+        setValues({
+          ...formsValue,
+          ..._val
+        });
       },
       k: name,
       formData: formData
     });
   },
-  dataLinkGroup: (_ref60, _ref61) => {
-    let {
-      setValues,
-      name,
-      onValuesChange,
-      changeLinking,
-      formsValue,
-      input
-    } = _ref60;
-    let {
-      form,
-      groupFormId,
-      isHighlighted
-    } = _ref61;
+  dataLinkGroup: ({
+    setValues,
+    name,
+    onValuesChange,
+    changeLinking,
+    formsValue,
+    input
+  }, {
+    form,
+    groupFormId,
+    isHighlighted
+  }) => {
     return renderDataLinkGroup({
       input,
       name,
@@ -38119,41 +38243,51 @@ const inputTypeComponent$1 = {
       isHighlighted
     });
   },
-  groupCheckbox: (_ref62, _ref63) => {
-    let {
-      setValues,
-      name,
-      onValuesChange,
-      formsValue,
-      input
-    } = _ref62;
-    let {
-      form,
-      groupFormId,
-      isHighlighted
-    } = _ref63;
+  groupCheckbox: ({
+    setValues,
+    name,
+    onValuesChange,
+    formsValue,
+    input
+  }, {
+    form,
+    groupFormId,
+    isHighlighted
+  }) => {
     const formData = groupFormId ? (formsValue[groupFormId] || {})[name] || [] : formsValue[name] || [];
     const onUpdate = (val, key) => {
       const _val = {
-        [name]: _objectSpread2(_objectSpread2({}, formData), {}, {
+        [name]: {
+          ...formData,
           [key]: val
-        })
+        }
       };
       if (groupFormId) {
-        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+        const _defaultData = form?.getFieldValue(groupFormId) || {};
+        const _newData = {
+          ..._defaultData,
+          ..._val
+        };
+        onValuesChange(_newData, {
+          ...formsValue,
           [groupFormId]: _newData
-        }));
-        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        });
+        form?.setFieldValue(groupFormId, _newData);
+        setValues({
+          ...formsValue,
           [groupFormId]: _newData
-        }));
+        });
         return;
       }
-      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+      onValuesChange(_val, {
+        ...formsValue,
+        ..._val
+      });
+      form?.setFieldValue(name, _val[name]);
+      setValues({
+        ...formsValue,
+        ..._val
+      });
     };
     return /*#__PURE__*/jsxRuntime.jsx(GroupCheckbox, {
       form: input,
@@ -38162,91 +38296,96 @@ const inputTypeComponent$1 = {
       isHighlighted: isHighlighted
     });
   },
-  website: (_ref64, _ref65) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref64;
-    let {
-      form,
-      isHighlighted,
-      inputMeta = {},
-      t
-    } = _ref65;
-    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
+  website: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    form,
+    isHighlighted,
+    inputMeta = {},
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(Website, {
       size: "large",
       allowClear: true,
-      initialValue: value
-    }, props), {}, {
+      initialValue: value,
+      ...props,
       onChange: val => updateFormValues$1(repeatIndex, repeatValues, inputName, val, formsValue, name, form),
       className: formatClassname([isHighlighted && "highlighted-cont"]),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com"
-    }));
+    });
   },
-  group: (_ref66, _ref67) => {
-    let {
-      props,
-      groupInputs,
-      formsValue
-    } = _ref66;
-    let {
-      inputMeta,
-      isHighlighted
-    } = _ref67;
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput, _objectSpread2({
+  group: ({
+    props,
+    groupInputs,
+    formsValue
+  }, {
+    inputMeta,
+    isHighlighted
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput, {
       formsValue: formsValue,
       isHighlighted: isHighlighted,
       groupInputs: groupInputs,
-      inputMeta: inputMeta
-    }, props));
+      inputMeta: inputMeta,
+      ...props
+    });
   },
-  groupInputs: (_ref68, _ref69) => {
-    let {
-      props,
-      groupInputs,
-      formsValue
-    } = _ref68;
-    let {
-      inputMeta,
-      isHighlighted
-    } = _ref69;
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput, _objectSpread2({
+  groupInputs: ({
+    props,
+    groupInputs,
+    formsValue
+  }, {
+    inputMeta,
+    isHighlighted
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput, {
       formsValue: formsValue,
       isHighlighted: isHighlighted,
       groupInputs: groupInputs,
-      inputMeta: inputMeta
-    }, props));
+      inputMeta: inputMeta,
+      ...props
+    });
   },
-  smartHelp: (_ref70, _ref71) => {
+  smartHelp: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    form,
+    isHighlighted,
+    inputMeta = {},
+    t
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(Smart, {});
   }
 };
 const filterForm = (f, d) => {
   return f && (f.showFormIf ? showHideForm(f, d) : true);
 };
-const checkFormHasSubsections = function () {
-  let f = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return Object.keys(f).map(key => propHasValue$1(f[key].subSection)).includes(true);
-};
+const checkFormHasSubsections = (f = {}) => Object.keys(f).map(key => propHasValue$1(f[key].subSection)).includes(true);
 const mapFormGroup = (f, d) => Object.keys(f).map(key => {
-  const _ref72 = f[key] || {},
-    {
-      label,
-      description = "",
-      excludeFromEdit,
-      showFormIf,
-      icon = "",
-      position = 0,
-      template,
-      formClass
-    } = _ref72,
-    fc = _objectWithoutProperties(_ref72, _excluded2$1);
+  const {
+    label,
+    description = "",
+    excludeFromEdit,
+    showFormIf,
+    icon = "",
+    position = 0,
+    template,
+    formClass,
+    ...fc
+  } = f[key] || {};
   const fConf = {
     id: key,
     label,
@@ -38305,14 +38444,11 @@ const groupSubForms = (fConf, d) => {
     return f;
   }, {});
 };
-const inputIsEmpty = function () {
-  let input = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  let values = arguments.length > 1 ? arguments[1] : undefined;
-  let inputMeta = arguments.length > 2 ? arguments[2] : undefined;
-  if (inputMeta !== null && inputMeta !== void 0 && inputMeta.notApplicable || inputMeta !== null && inputMeta !== void 0 && inputMeta.notAvailable) {
+const inputIsEmpty = (input = {}, values, inputMeta) => {
+  if (inputMeta?.notApplicable || inputMeta?.notAvailable) {
     return false;
   }
-  if ((input === null || input === void 0 ? void 0 : input.type) === "groupInputs") {
+  if (input?.type === "groupInputs") {
     return true;
   }
   const value = values[input.dataId];
@@ -38324,28 +38460,26 @@ const inputIsEmpty = function () {
   }
   return !value;
 };
-const GetFormItem$1 = _ref73 => {
-  var _inputMeta$reviews, _input$meta19, _input$meta20, _rules$find, _input$meta21;
-  let {
-    highlightMandatory,
-    inputData,
-    inputId,
-    input,
-    values,
-    MainForm,
-    options,
-    plainForms,
-    setValues,
-    setAddress,
-    i,
-    inputKey,
-    onValuesChange = () => {},
-    setLoading = () => {},
-    inputMeta = {},
-    changeInputMeta = () => {},
-    changeLinking = () => {},
-    namespace
-  } = _ref73;
+const GetFormItem$1 = ({
+  highlightMandatory,
+  inputData,
+  inputId,
+  input,
+  values,
+  MainForm,
+  options,
+  plainForms,
+  setValues,
+  setAddress,
+  i,
+  inputKey,
+  onValuesChange = () => {},
+  setLoading = () => {},
+  inputMeta = {},
+  changeInputMeta = () => {},
+  changeLinking = () => {},
+  namespace
+}) => {
   const {
     t,
     user,
@@ -38360,42 +38494,44 @@ const GetFormItem$1 = _ref73 => {
     staticWidth,
     fullWidth
   } = useEditContext();
-  const lastReview = ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || [])[((inputMeta === null || inputMeta === void 0 || (_inputMeta$reviews = inputMeta.reviews) === null || _inputMeta$reviews === void 0 ? void 0 : _inputMeta$reviews.length) || 0) - 1];
+  const lastReview = (inputMeta?.reviews || [])[(inputMeta?.reviews?.length || 0) - 1];
   const [isShown, setIsShown] = React.useState(!!inputData.commentValue);
   const inputLabel = getInputLabel$1(input, values);
   const onClickReviewSuccess = () => {
     if (!isReview) {
       return;
     }
-    const reviewSuccess = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess;
+    const reviewSuccess = lastReview?.reviewSuccess;
     changeInputMeta({
       key: inputId,
       type: input.type,
-      value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+      value: {
+        ...inputMeta,
         reviews: reviewSuccess ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
           reviewer: user,
           createdAt: new Date().toISOString(),
           reviewSuccess: true
         }]
-      })
+      }
     });
   };
   const onClickReviewError = () => {
     if (!isReview) {
       return;
     }
-    const reviewError = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError;
+    const reviewError = lastReview?.reviewError;
     changeInputMeta({
       key: inputId,
       type: input.type,
-      value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+      value: {
+        ...inputMeta,
         reviews: reviewError ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
           reviewer: user,
           createdAt: new Date().toISOString(),
           reviewError: true,
           comment: ""
         }]
-      })
+      }
     });
   };
   switch (input.type) {
@@ -38409,12 +38545,12 @@ const GetFormItem$1 = _ref73 => {
     case "header":
       return /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "daf-title with-subtitle",
-        style: input === null || input === void 0 || (_input$meta19 = input.meta) === null || _input$meta19 === void 0 ? void 0 : _input$meta19.style,
+        style: input?.meta?.style,
         children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "flex",
           children: [/*#__PURE__*/jsxRuntime.jsx("h1", {
             children: ReactHtmlParser__default["default"](getLabel$1(input.label, values))
-          }), !!input.description || input !== null && input !== void 0 && (_input$meta20 = input.meta) !== null && _input$meta20 !== void 0 && _input$meta20.isEvaluation ? /*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
+          }), !!input.description || input?.meta?.isEvaluation ? /*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
             content: /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "tooltip-popover-cont",
               children: ReactHtmlParser__default["default"](input.description)
@@ -38441,7 +38577,7 @@ const GetFormItem$1 = _ref73 => {
       const specialCharsRule = rules.find(r => r.type === "specialCharacters");
 
       // eslint-disable-next-line no-case-declarations
-      let maxRule = (_rules$find = rules.find(rule => rule.max)) === null || _rules$find === void 0 ? void 0 : _rules$find.max;
+      let maxRule = rules.find(rule => rule.max)?.max;
       if (!maxRule && input.type === "textarea") {
         maxRule = MAX_TEXT_AREA_LENGTH;
       }
@@ -38454,30 +38590,27 @@ const GetFormItem$1 = _ref73 => {
           message: requiredRule.message || ""
         });
       }
-      const isHighlighted = highlightMandatory && (input === null || input === void 0 || (_input$meta21 = input.meta) === null || _input$meta21 === void 0 ? void 0 : _input$meta21.mandatory) && inputIsEmpty(input, values, inputMeta);
+      const isHighlighted = highlightMandatory && input?.meta?.mandatory && inputIsEmpty(input, values, inputMeta);
       if (requiredRule || specialCharsRule) {
         if (input.type === "groupInputs") {
           rules = rules.map(r => {
             if (r.required) {
-              return _ref74 => {
-                let {
-                  getFieldValue
-                } = _ref74;
-                return {
-                  validator() {
-                    if (inputMeta.notAvailable || inputMeta.notApplicable) {
-                      return Promise.resolve();
-                    }
-                    const keys = Object.keys(input.inputs);
-                    for (let i = 0; i < keys.length; i++) {
-                      if (typeof getFieldValue(keys[i]) === "undefined" || getFieldValue(keys[i]) === null) {
-                        return Promise.reject(r.message);
-                      }
-                    }
+              return ({
+                getFieldValue
+              }) => ({
+                validator() {
+                  if (inputMeta.notAvailable || inputMeta.notApplicable) {
                     return Promise.resolve();
                   }
-                };
-              };
+                  const keys = Object.keys(input.inputs);
+                  for (let i = 0; i < keys.length; i++) {
+                    if (typeof getFieldValue(keys[i]) === "undefined" || getFieldValue(keys[i]) === null) {
+                      return Promise.reject(r.message);
+                    }
+                  }
+                  return Promise.resolve();
+                }
+              });
             }
             return r;
           });
@@ -38515,13 +38648,12 @@ const GetFormItem$1 = _ref73 => {
         }
       }
       if (input && typeof input === "object") {
-        var _input$meta22, _input$meta23, _input$meta24, _input$meta25, _values$parent, _input$meta26, _input$meta27, _inputData$value, _input$meta28, _input$meta29, _inputData$commentVal, _lastReview$comment, _lastReview$reviewer, _lastReview$reviewer2;
         // check if input is valid
         const hideComment = namespace === "project-readiness";
         return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "flex-row input-cont",
-            children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+            children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
               extra: /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
                 children: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsxs("div", {
                   className: formatClassname(["ml-4 input-actions"]),
@@ -38531,7 +38663,7 @@ const GetFormItem$1 = _ref73 => {
                       title: t("Add review note"),
                       children: /*#__PURE__*/jsxRuntime.jsx("div", {
                         children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                          className: formatClassname(["review-btn review-error-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError) && "primary"]),
+                          className: formatClassname(["review-btn review-error-btn", lastReview?.reviewError && "primary"]),
                           type: "link",
                           onClick: onClickReviewError,
                           children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -38547,7 +38679,7 @@ const GetFormItem$1 = _ref73 => {
                         children: /*#__PURE__*/jsxRuntime.jsx("div", {
                           type: "link",
                           onClick: onClickReviewSuccess,
-                          className: formatClassname(["review-btn review-success-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess) && "primary"]),
+                          className: formatClassname(["review-btn review-success-btn", lastReview?.reviewSuccess && "primary"]),
                           children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                             name: "CheckSquare",
                             width: 16,
@@ -38584,7 +38716,7 @@ const GetFormItem$1 = _ref73 => {
                               }
                             });
                           },
-                          disabled: !((_input$meta22 = input.meta) !== null && _input$meta22 !== void 0 && _input$meta22.notApplicable),
+                          disabled: !input.meta?.notApplicable,
                           children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                             name: "NotApplicable",
                             width: 16,
@@ -38598,7 +38730,7 @@ const GetFormItem$1 = _ref73 => {
                         children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                           className: formatClassname(["default p-0", inputMeta.notAvailable && "primary"]),
                           type: "link",
-                          disabled: !((_input$meta23 = input.meta) !== null && _input$meta23 !== void 0 && _input$meta23.notAvailable),
+                          disabled: !input.meta?.notAvailable,
                           onClick: () => {
                             const value = getDefaultInputValue(input);
                             MainForm.setFields([{
@@ -38630,14 +38762,14 @@ const GetFormItem$1 = _ref73 => {
                     }), !hideComment ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                       title: t("Add comment"),
                       children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                        children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
+                        children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                           type: "link",
-                          disabled: !((_input$meta24 = input.meta) !== null && _input$meta24 !== void 0 && _input$meta24.comment)
-                        }, !isShown ? {
-                          className: "default p-0"
-                        } : {
-                          className: "p-0 primary"
-                        }), {}, {
+                          disabled: !input.meta?.comment,
+                          ...(!isShown ? {
+                            className: "default p-0"
+                          } : {
+                            className: "p-0 primary"
+                          }),
                           onClick: () => {
                             if (inputMeta.comment !== undefined && inputMeta.comment !== null) {
                               return;
@@ -38656,7 +38788,7 @@ const GetFormItem$1 = _ref73 => {
                             width: 16,
                             height: 16
                           })
-                        }))
+                        })
                       })
                     }) : /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                       title: t("Project Readiness"),
@@ -38675,34 +38807,36 @@ const GetFormItem$1 = _ref73 => {
                   }) : null]
                 }) : null
               }),
-              initialValue: inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.defaultValue
-            }, inputOnBlur.includes(input.type) ? {
-              trigger: "onBlur"
-            } : {}), ["total100", "group"].includes(input.type) ? {} : {
-              name: inputId,
-              fieldKey: inputId,
-              initialValue: inputData.value
-            }), ["upload"].includes(input.type) ? {
-              valuePropName: "fileList",
-              getValueFromEvent: e => {
-                if (Array.isArray(e)) {
-                  return e;
-                }
-                return e && e.fileList && e.fileList.map(f => {
-                  if (f.response) {
-                    return f.response;
+              initialValue: inputMeta?.defaultValue,
+              ...(inputOnBlur.includes(input.type) ? {
+                trigger: "onBlur"
+              } : {}),
+              ...(["total100", "group"].includes(input.type) ? {} : {
+                name: inputId,
+                fieldKey: inputId,
+                initialValue: inputData.value
+              }),
+              ...(["upload"].includes(input.type) ? {
+                valuePropName: "fileList",
+                getValueFromEvent: e => {
+                  if (Array.isArray(e)) {
+                    return e;
                   }
-                  return f;
-                });
-              }
-            } : {}), {}, {
-              className: formatClassname(["i-".concat(input.type, " flex-1"), input.comment && "with-comment", maxRule && "with-max-rule"]),
+                  return e && e.fileList && e.fileList.map(f => {
+                    if (f.response) {
+                      return f.response;
+                    }
+                    return f;
+                  });
+                }
+              } : {}),
+              className: formatClassname([`i-${input.type} flex-1`, input.comment && "with-comment", maxRule && "with-max-rule"]),
               "data-id": inputData.name,
               rules: rules,
               required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
               labelCol: 12,
               label: /*#__PURE__*/jsxRuntime.jsx("div", {
-                className: formatClassname(["flex", (input === null || input === void 0 || (_input$meta25 = input.meta) === null || _input$meta25 === void 0 ? void 0 : _input$meta25.code) && "mr-10"]),
+                className: formatClassname(["flex", input?.meta?.code && "mr-10"]),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "mr-1",
                   children: getInputLabel$1(input, values)
@@ -38715,7 +38849,7 @@ const GetFormItem$1 = _ref73 => {
                 config: input,
                 t: t,
                 ajaxForms: ajaxForms,
-                linkingData: (values === null || values === void 0 ? void 0 : values.linking) || (values === null || values === void 0 || (_values$parent = values.parent) === null || _values$parent === void 0 ? void 0 : _values$parent.linking),
+                linkingData: values?.linking || values?.parent?.linking,
                 changeAjaxForms: changeAjaxForms,
                 getApiBaseUrl: getApiBaseUrl,
                 getAppHeader: getAppHeader,
@@ -38723,11 +38857,12 @@ const GetFormItem$1 = _ref73 => {
                 getToken: getToken,
                 app: app,
                 valueOnlyString: true
-              }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type](_objectSpread2(_objectSpread2({}, inputData), {}, {
+              }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type]({
+                ...inputData,
                 maxWidth,
                 staticWidth,
                 fullWidth
-              }), {
+              }, {
                 form: MainForm,
                 forms: options,
                 allForms: plainForms,
@@ -38748,10 +38883,10 @@ const GetFormItem$1 = _ref73 => {
                 staticWidth,
                 fullWidth
               }) : console.log(input)
-            })), (_input$meta26 = input.meta) !== null && _input$meta26 !== void 0 && _input$meta26.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+            }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "code",
               children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                children: (_input$meta27 = input.meta) === null || _input$meta27 === void 0 ? void 0 : _input$meta27.code
+                children: input.meta?.code
               })
             }) : null]
           }), maxRule ? ["imageUpload", "upload", "videoUpload"].includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -38771,10 +38906,10 @@ const GetFormItem$1 = _ref73 => {
               className: "max-char-span",
               children: t("max-char", {
                 chars: maxRule,
-                filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
+                filled: inputData?.value?.length || 0
               })
             })
-          }) : null, (_input$meta28 = input.meta) !== null && _input$meta28 !== void 0 && _input$meta28.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+          }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "input-content",
             children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
               className: "comment-textarea",
@@ -38800,7 +38935,7 @@ const GetFormItem$1 = _ref73 => {
                   },
                   children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     type: "link",
-                    disabled: !((_input$meta29 = input.meta) !== null && _input$meta29 !== void 0 && _input$meta29.comment),
+                    disabled: !input.meta?.comment,
                     className: "p-0",
                     children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                       width: 16,
@@ -38809,11 +38944,12 @@ const GetFormItem$1 = _ref73 => {
                   })
                 })]
               }),
-              children: inputTypeComponent$1.comment(_objectSpread2(_objectSpread2({}, inputData), {}, {
+              children: inputTypeComponent$1.comment({
+                ...inputData,
                 maxWidth,
                 staticWidth,
                 fullWidth
-              }), {
+              }, {
                 form: MainForm,
                 forms: options,
                 setFormValues: setValues,
@@ -38838,16 +38974,16 @@ const GetFormItem$1 = _ref73 => {
               className: "max-char-span",
               children: t("max-char", {
                 chars: MAX_COMMENTS_LENGTH,
-                filled: (inputData === null || inputData === void 0 || (_inputData$commentVal = inputData.commentValue) === null || _inputData$commentVal === void 0 ? void 0 : _inputData$commentVal.length) || 0
+                filled: inputData?.commentValue?.length || 0
               })
             })]
-          }) : null, lastReview !== null && lastReview !== void 0 && lastReview.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
+          }) : null, lastReview?.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "input-content",
             children: isReview ? /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
               children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
                 className: "comment-textarea",
-                initialValue: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || "",
-                name: "".concat(inputId, "-reviewErrorComment"),
+                initialValue: lastReview?.comment || "",
+                name: `${inputId}-reviewErrorComment`,
                 label: /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "flex w-100",
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -38855,28 +38991,31 @@ const GetFormItem$1 = _ref73 => {
                     children: t("Review note")
                   })
                 }),
-                children: inputTypeComponent$1.comment(_objectSpread2(_objectSpread2({}, inputData), {}, {
+                children: inputTypeComponent$1.comment({
+                  ...inputData,
                   maxWidth,
                   staticWidth,
                   fullWidth
-                }), {
+                }, {
                   form: MainForm,
                   forms: options,
-                  value: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || "",
+                  value: lastReview?.comment || "",
                   onChange: val => {
                     changeInputMeta({
                       key: inputId,
                       type: input.type,
-                      value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
-                        reviews: ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || []).map(v => {
+                      value: {
+                        ...inputMeta,
+                        reviews: (inputMeta?.reviews || []).map(v => {
                           if (v.createdAt === lastReview.createdAt) {
-                            return _objectSpread2(_objectSpread2({}, v), {}, {
+                            return {
+                              ...v,
                               comment: val
-                            });
+                            };
                           }
                           return v;
                         })
-                      })
+                      }
                     });
                   },
                   t,
@@ -38890,7 +39029,7 @@ const GetFormItem$1 = _ref73 => {
                 className: "max-char-span",
                 children: t("max-char", {
                   chars: MAX_COMMENTS_LENGTH,
-                  filled: ((_lastReview$comment = lastReview.comment) === null || _lastReview$comment === void 0 ? void 0 : _lastReview$comment.length) || 0
+                  filled: lastReview.comment?.length || 0
                 })
               })]
             }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -38911,7 +39050,7 @@ const GetFormItem$1 = _ref73 => {
                 }), /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "flex flex-column justify-center mr-1",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: (lastReview === null || lastReview === void 0 || (_lastReview$reviewer = lastReview.reviewer) === null || _lastReview$reviewer === void 0 ? void 0 : _lastReview$reviewer.firstName) + " " + (lastReview === null || lastReview === void 0 || (_lastReview$reviewer2 = lastReview.reviewer) === null || _lastReview$reviewer2 === void 0 ? void 0 : _lastReview$reviewer2.lastName) + " - " + moment__default["default"](lastReview.createdAt).format("DD MMM YYYY")
+                    children: lastReview?.reviewer?.firstName + " " + lastReview?.reviewer?.lastName + " - " + moment__default["default"](lastReview.createdAt).format("DD MMM YYYY")
                   })
                 })]
               })]
@@ -38922,14 +39061,13 @@ const GetFormItem$1 = _ref73 => {
       return null;
   }
 };
-const editErrorHandler = _ref76 => {
-  let {
-    errorFields,
-    t = s => s
-  } = _ref76;
+const editErrorHandler = ({
+  errorFields,
+  t = s => s
+}) => {
   if (Array.isArray(errorFields) && errorFields.length) {
     const name = errorFields[0].name.join(".");
-    const element = document.querySelector("[data-id=\"".concat(name, "\"]"));
+    const element = document.querySelector(`[data-id="${name}"]`);
     if (element) {
       element.scrollIntoView();
       antd.message.error(t("errors::please-correct-invalid-inputs"));
@@ -42019,10 +42157,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => ({
-        ...prevValues,
-        ...resolvedValues
-      }));
+      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);