datastake-daf 0.6.824 → 0.6.826

package/dist/components/index.js

@@ -4827,7 +4827,7 @@ const config$2 = {
   AddDocument: config$3
 };
 
-const _excluded$E = ["width", "height", "size", "name", "fill"];
+const _excluded$D = ["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$E);
+    props = _objectWithoutProperties(_ref, _excluded$D);
   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$D = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$C = ["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$D);
+    rest = _objectWithoutProperties(data, _excluded$C);
   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$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"];
+const _excluded$B = ["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$C);
+    rest = _objectWithoutProperties(_ref, _excluded$B);
   const source = React.useMemo(() => {
     if (data && Array.isArray(data)) {
       return data;
@@ -6889,7 +6889,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$h;
-const _excluded$B = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$A = ["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$B);
+    props = _objectWithoutProperties(_ref, _excluded$A);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7428,7 +7428,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$A = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$z = ["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$A);
+    restProps = _objectWithoutProperties(_ref, _excluded$z);
   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$z = ["children"];
+const _excluded$y = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$z);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   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$y = ["icon"];
+const _excluded$x = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$y);
+    props = _objectWithoutProperties(_ref, _excluded$x);
   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$x = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$w = ["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$x);
+    restProps = _objectWithoutProperties(_ref, _excluded$w);
   const {
     token
   } = useToken$p();
@@ -8854,7 +8854,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$w = ["tabs", "onChange", "value", "className"];
+const _excluded$v = ["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$w);
+    rest = _objectWithoutProperties(_ref, _excluded$v);
   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$v = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$u = ["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$v);
+              restProps = _objectWithoutProperties(button, _excluded$u);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -11875,7 +11875,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$u = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$t = ["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$u);
+    props = _objectWithoutProperties(_ref, _excluded$t);
   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$t = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$s = ["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$t);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -15689,7 +15689,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$s = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$r = ["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$s);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17903,14 +17903,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$r = ["config", "title", "loading"];
+const _excluded$q = ["config", "title", "loading"];
 const Details = _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 card",
     loading: loading,
@@ -17926,14 +17926,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$q = ["config", "title", "loading"];
+const _excluded$p = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   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$p = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$o = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17971,7 +17971,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$p);
+    rest = _objectWithoutProperties(_ref, _excluded$o);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -18147,14 +18147,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$c;
-const _excluded$o = ["title", "activeSdgGoals", "t"];
+const _excluded$n = ["title", "activeSdgGoals", "t"];
 function SDGWidget(_ref) {
   let {
       title = "Sustainable Development Goals",
       activeSdgGoals = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$o);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18452,7 +18452,7 @@ function SdgList({
   });
 }
 
-const _excluded$n = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$m = ["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$n);
+    props = _objectWithoutProperties(_ref, _excluded$m);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18744,13 +18744,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$m = ["title", "children"];
+const _excluded$l = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$m);
+    rest = _objectWithoutProperties(_ref, _excluded$l);
   /**
    * 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$l = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$k = ["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$l);
+    rest = _objectWithoutProperties(_ref, _excluded$k);
   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$k = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
+const _excluded$j = ["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$k);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   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$j = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$i = ["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$j);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   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$i = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$h = ["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$i);
+    props = _objectWithoutProperties(_ref, _excluded$h);
   let invasiveSpeciesConfig = getInvasiveSpeciesConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -24937,7 +24937,7 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$h = ["viewGroup"],
+const _excluded$g = ["viewGroup"],
   _excluded2$1 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
@@ -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$h);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$g);
         items[gKey] = gCfg;
       }
       return items;
@@ -25296,7 +25296,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$g = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$f = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -25312,7 +25312,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$g);
+    props = _objectWithoutProperties(_ref, _excluded$f);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -30804,7 +30804,6 @@ function Repeatable({
   });
 }
 
-/* eslint-disable no-eval */
 const isRiskComment = inputData => {
   if (inputData) {
     if (inputData.name === 'assessment') {
@@ -30817,7 +30816,10 @@ 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, ...args) {
+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];
+  }
   if (options[k].repeatable) {
     return renderRepeatable$1(options, k, ...args);
   } else {
@@ -30845,10 +30847,11 @@ 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, {
-          add,
-          remove
-        }) => {
+        children: (fields, _ref) => {
+          let {
+            add,
+            remove
+          } = _ref;
           const formData = form.repeatable ? values[formId] || [] : values[formId] ? [values[formId]] : [];
           if (fields.length === 0) {
             const formInputs = form.inputs;
@@ -30898,14 +30901,10 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
             const _val = {
               [formId]: formData.map((d, j) => i === j ? val : d)
             };
-            onValuesChange(_val, {
-              ...values,
-              ..._val
-            });
-            setValues({
-              ...values,
+            onValuesChange(_val, _objectSpread2(_objectSpread2({}, values), _val));
+            setValues(_objectSpread2(_objectSpread2({}, values), {}, {
               [formId]: formData.map((d, j) => i === j ? val : d)
-            });
+            }));
           };
           return /*#__PURE__*/jsxRuntime.jsx(Repeatable, {
             form: form,
@@ -30961,154 +30960,156 @@ const getGroupContent = (form, values, i, formId, excludedKeys, getData, setValu
     highlightMandatory
   });
 };
-const GroupContent = ({
-  form,
-  values = {},
-  i,
-  formId,
-  excludedKeys,
-  getData,
-  setValues,
-  MainForm,
-  options,
-  plainForms,
-  setAddress,
-  onValuesChange,
-  allData,
-  changeInputMeta,
-  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 {
     user,
     t
   } = useEditContext();
   const label = getInputLabel$1(form, values);
-  const notPartOfTheForm = form?.type === 'ajaxSubGroup' ? true : !!form?.meta?.isSubGroup;
+  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 hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   const formValues = values[form.dataId];
-  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 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 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 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;
+          inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
           if (Array.isArray(values[formId])) {
             values[formId] = inputValues;
           } else {
             values[formId] = inputValues;
           }
-          setValues({
-            ...values
-          });
-        }
-      };
-      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];
+          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));
           }
-        }
-        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 || ''
+        };
+        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');
         });
-      }
-      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';
+        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)
+        }, "".concat(i).concat(ii)) : null;
+      })]
+    });
+  };
+  const isNa = (formValues === null || formValues === void 0 ? void 0 : formValues.valuation) === 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? options.isRisk && options.dontShowTitle ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "risk-header",
@@ -31116,44 +31117,46 @@ const GroupContent = ({
         children: label
       })
     }) : /*#__PURE__*/jsxRuntime.jsx("h3", {
-      className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} ${i ? 'mt-3 mb-1' : ''}`,
+      className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " ").concat(i ? 'mt-3 mb-1' : ''),
       children: label
     }) : null, /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: `repeatable ${hasLabel ? "mb-4" : ""}`,
+      className: "repeatable ".concat(hasLabel ? "mb-4" : ""),
       children: [form.titleLabel ? /*#__PURE__*/jsxRuntime.jsx("label", {
         children: getInputProp(form.titleLabel, values)
-      }) : null, formValues?.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
+      }) : null, formValues !== null && formValues !== void 0 && formValues.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
         t: t,
         isNa: isNa,
         isSuccess: !isNa
         // TODO: translate
         ,
         config: {
-          title: t(`No ${formValues?.stage || 'planning'} required`)
+          title: t("No ".concat((formValues === null || formValues === void 0 ? void 0 : formValues.stage) || 'planning', " required"))
         },
         children: renderInputs()
       }) : renderInputs()]
     })]
   });
 };
-const GroupContentFormItem = ({
-  values,
-  formId,
-  setValues,
-  MainForm,
-  options,
-  plainForms,
-  setAddress,
-  inputData,
-  inputId,
-  input,
-  rules,
-  inputMeta,
-  changeInputMeta,
-  notPartOfTheForm = true,
-  isAjaxSubGroup,
-  isHighlighted
-}) => {
+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 {
     t,
     user,
@@ -31167,10 +31170,10 @@ const GroupContentFormItem = ({
     staticWidth,
     fullWidth
   } = useEditContext();
-  const [isShown, setIsShown] = React.useState(!!inputMeta?.comment);
-  let maxRule = rules.find(rule => rule.max)?.max;
+  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 requiredRule = rules.find(r => r.required);
-  const lastReview = (inputMeta?.reviews || [])[(inputMeta?.reviews?.length || 0) - 1];
+  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];
   if (!maxRule && input.type === 'textarea') {
     maxRule = MAX_TEXT_AREA_LENGTH;
   }
@@ -31189,38 +31192,35 @@ const GroupContentFormItem = ({
     }
     setIsShown(true);
     if (notPartOfTheForm || isAjaxSubGroup) {
-      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+      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 _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
+        var _defaultData$meta, _defaultData$meta2;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: {
-              ..._defaultData,
+            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
               meta: {
-                inputs: {
-                  ...(_defaultData?.meta?.inputs || {}),
-                  [inputId]: {
-                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                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] || {}), {}, {
                     comment: ''
-                  }
-                }
+                  })
+                })
               }
-            }
+            })
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: {
-            ..._defaultMeta,
-            [inputId]: {
-              ...(_defaultMeta[inputId] || {}),
+          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
               comment: ''
-            }
-          }
+            })
+          })
         });
       }
     } else {
@@ -31237,62 +31237,58 @@ const GroupContentFormItem = ({
     if (!isReview) {
       return;
     }
-    const reviewSuccess = lastReview?.reviewSuccess;
+    const reviewSuccess = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+      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 _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
+        var _defaultData$meta3, _defaultData$meta4, _defaultData$meta5, _defaultData$meta6;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: {
-              ..._defaultData,
+            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
               meta: {
-                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 || []), {
+                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 || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewSuccess: true
                     }]
-                  }
-                }
+                  })
+                })
               }
-            }
+            })
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: {
-            ..._defaultMeta,
-            [inputId]: {
-              ...(_defaultMeta[inputId] || {}),
+          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+            [inputId]: _objectSpread2(_objectSpread2({}, _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: {
-          ...inputMeta,
+        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
           reviews: reviewSuccess ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewSuccess: true
           }]
-        }
+        })
       });
     }
   };
@@ -31300,118 +31296,111 @@ const GroupContentFormItem = ({
     if (!isReview) {
       return;
     }
-    const reviewError = lastReview?.reviewError;
+    const reviewError = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+      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 _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
+        var _defaultData$meta7, _defaultData$meta8, _defaultData$meta9, _defaultData$meta10;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: {
-              ..._defaultData,
+            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
               meta: {
-                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 || []), {
+                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 || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewError: true,
                       comment: ''
                     }]
-                  }
-                }
+                  })
+                })
               }
-            }
+            })
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: {
-            ..._defaultMeta,
-            [inputId]: {
-              ...(_defaultMeta[inputId] || {}),
+          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+            [inputId]: _objectSpread2(_objectSpread2({}, _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: {
-          ...inputMeta,
+        value: _objectSpread2(_objectSpread2({}, 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?.notApplicable && input?.meta?.requiredCommentOnNotApplicable && values?.[formId]?.valuation !== 'na';
+  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';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex input-cont",
-      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 e && e.fileList && e.fileList.map(f => {
-              if (f.response) {
-                return f.response;
-              }
-              return f;
-            });
+      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;
           }
-        } : {}),
-        ...(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: {
-            ...(input.showOnView === false ? {
-              display: 'none'
-            } : {}),
-            flexDirection: 'row',
-            justifyContent: 'space-between'
-          }
-        } : {}),
+        } : {}
+      }, ['switch'].includes(input.type) ? {
+        labelCol: {
+          span: 20
+        },
+        style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
+          display: 'none'
+        } : {}), {}, {
+          flexDirection: 'row',
+          justifyContent: 'space-between'
+        })
+      } : {}), {}, {
         label: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: input?.meta?.code && "mr-10",
+          className: (input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.code) && "mr-10",
           children: getInputLabel$1(input, values)
         }) : null,
         rules: rules,
-        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}`,
+        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),
         extra: /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
           children: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: formatClassname(["ml-4 input-actions"]),
@@ -31421,7 +31410,7 @@ const GroupContentFormItem = ({
                 title: t('Add review note'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                    className: formatClassname(["review-btn review-error-btn", lastReview?.reviewError && 'primary']),
+                    className: formatClassname(["review-btn review-error-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError) && 'primary']),
                     type: "link",
                     onClick: onClickReviewError,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -31437,7 +31426,7 @@ const GroupContentFormItem = ({
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
                     type: "link",
                     onClick: onClickReviewSuccess,
-                    className: formatClassname(["review-btn review-success-btn", lastReview?.reviewSuccess && 'primary']),
+                    className: formatClassname(["review-btn review-success-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess) && 'primary']),
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "CheckSquare",
                       width: 16,
@@ -31454,65 +31443,59 @@ const GroupContentFormItem = ({
                     className: formatClassname(["default p-0", inputMeta.notApplicable && 'primary']),
                     type: "link",
                     onClick: () => {
+                      var _input$meta5, _input$meta6;
                       const value = getDefaultInputValue(input);
-                      const commentMeta = input?.meta?.requiredCommentOnNotApplicable ? {
+                      const commentMeta = input !== null && input !== void 0 && (_input$meta5 = input.meta) !== null && _input$meta5 !== void 0 && _input$meta5.requiredCommentOnNotApplicable ? {
                         comment: ''
                       } : {};
-                      if (input?.meta?.requiredCommentOnNotApplicable) {
+                      if (input !== null && input !== void 0 && (_input$meta6 = input.meta) !== null && _input$meta6 !== void 0 && _input$meta6.requiredCommentOnNotApplicable) {
                         setIsShown(true);
                       }
                       if (notPartOfTheForm || isAjaxSubGroup) {
+                        var _values$meta8;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta8 = values.meta) === null || _values$meta8 === void 0 ? void 0 : _values$meta8.inputs) || {})[formId] || {};
                         if (isAjaxSubGroup) {
+                          var _defaultData$meta11;
                           changeInputMeta({
                             key: formId,
                             type: input.type,
                             otherValues: {
-                              [formId]: {
-                                ..._defaultData,
+                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                 [inputId]: value,
                                 meta: {
-                                  inputs: {
-                                    ...(_defaultData?.meta?.inputs || {}),
-                                    [inputId]: inputMeta.notApplicable ? {
+                                  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({
                                       notApplicable: false,
-                                      notAvailable: false,
-                                      ...commentMeta
-                                    } : {
+                                      notAvailable: false
+                                    }, commentMeta) : _objectSpread2({
                                       notApplicable: true,
-                                      notAvailable: false,
-                                      ...commentMeta
-                                    }
-                                  }
+                                      notAvailable: false
+                                    }, commentMeta)
+                                  })
                                 }
-                              }
+                              })
                             }
                           });
                         } else {
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notApplicable ? {
-                              ..._defaultMeta,
-                              [inputId]: {
+                            value: inputMeta.notApplicable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                              [inputId]: _objectSpread2({
                                 notApplicable: false,
-                                notAvailable: false,
-                                ...commentMeta
-                              }
-                            } : {
-                              ..._defaultMeta,
-                              [inputId]: {
+                                notAvailable: false
+                              }, commentMeta)
+                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                              [inputId]: _objectSpread2({
                                 notApplicable: true,
-                                notAvailable: false,
-                                ...commentMeta
-                              }
-                            },
+                                notAvailable: false
+                              }, commentMeta)
+                            }),
                             otherValues: {
-                              [formId]: {
-                                ..._defaultData,
+                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                 [inputId]: value
-                              }
+                              })
                             }
                           });
                         }
@@ -31533,7 +31516,7 @@ const GroupContentFormItem = ({
                         });
                       }
                     },
-                    disabled: !input.meta?.notApplicable,
+                    disabled: !((_input$meta7 = input.meta) !== null && _input$meta7 !== void 0 && _input$meta7.notApplicable),
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "NotApplicable",
                       width: 16,
@@ -31547,24 +31530,24 @@ const GroupContentFormItem = ({
                   children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     className: formatClassname(["default p-0", inputMeta.notAvailable && 'primary']),
                     type: "link",
-                    disabled: !input.meta?.notAvailable,
+                    disabled: !((_input$meta8 = input.meta) !== null && _input$meta8 !== void 0 && _input$meta8.notAvailable),
                     onClick: () => {
                       const value = getDefaultInputValue(input);
                       if (notPartOfTheForm || isAjaxSubGroup) {
+                        var _values$meta9;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta9 = values.meta) === null || _values$meta9 === void 0 ? void 0 : _values$meta9.inputs) || {})[formId] || {};
                         if (isAjaxSubGroup) {
                           if (isAjaxSubGroup) {
+                            var _defaultData$meta12;
                             changeInputMeta({
                               key: formId,
                               type: input.type,
                               otherValues: {
-                                [formId]: {
-                                  ..._defaultData,
+                                [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                   [inputId]: value,
                                   meta: {
-                                    inputs: {
-                                      ...(_defaultData?.meta?.inputs || {}),
+                                    inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta12 = _defaultData.meta) === null || _defaultData$meta12 === void 0 ? void 0 : _defaultData$meta12.inputs) || {}), {}, {
                                       [inputId]: inputMeta.notAvailable ? {
                                         notApplicable: false,
                                         notAvailable: false
@@ -31572,9 +31555,9 @@ const GroupContentFormItem = ({
                                         notApplicable: false,
                                         notAvailable: true
                                       }
-                                    }
+                                    })
                                   }
-                                }
+                                })
                               }
                             });
                           }
@@ -31582,24 +31565,21 @@ const GroupContentFormItem = ({
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notAvailable ? {
-                              ..._defaultMeta,
+                            value: inputMeta.notAvailable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: false
                               }
-                            } : {
-                              ..._defaultMeta,
+                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: true
                               }
-                            },
+                            }),
                             otherValues: {
-                              [formId]: {
-                                ..._defaultData,
+                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                 [inputId]: value
-                              }
+                              })
                             }
                           });
                         }
@@ -31630,38 +31610,33 @@ const GroupContentFormItem = ({
               }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                 title: t('Add comment'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
                     type: "link",
-                    disabled: !input.meta?.comment,
-                    ...(!isShown ? {
-                      className: 'default p-0'
-                    } : {
-                      className: 'p-0 primary'
-                    }),
+                    disabled: !((_input$meta9 = input.meta) !== null && _input$meta9 !== void 0 && _input$meta9.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: {
-            ...(values[formId] || {}),
-            meta: {
-              ...(values?.meta || {}),
-              inputs: {
-                ...(values?.meta?.inputs || {}),
-                ...((values?.meta?.inputs || {})[formId] || {})
-              }
-            }
-          },
-          linkingData: values?.linking || values?.parent?.linking,
+          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),
           name: input.dataId,
           config: input,
           t: t,
@@ -31673,13 +31648,12 @@ const GroupContentFormItem = ({
           getToken: getToken,
           app: app,
           valueOnlyString: true
-        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type]({
-          ...inputData,
+        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type](_objectSpread2(_objectSpread2({}, inputData), {}, {
           name: inputId,
           maxWidth,
           staticWidth,
           fullWidth
-        }, {
+        }), {
           form: MainForm,
           forms: options,
           allForms: plainForms,
@@ -31697,10 +31671,10 @@ const GroupContentFormItem = ({
           staticWidth,
           fullWidth
         }) : console.log(input)
-      }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+      })), (_input$meta10 = input.meta) !== null && _input$meta10 !== void 0 && _input$meta10.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "code",
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
-          children: input.meta?.code
+          children: (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.code
         })
       }) : null]
     }), maxRule ? ['imageUpload', 'videoUpload', 'upload'].includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31720,16 +31694,16 @@ const GroupContentFormItem = ({
         className: "max-char-span",
         children: t('max-char', {
           chars: maxRule,
-          filled: inputData?.value?.length || 0
+          filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
         })
       })
-    }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+    }) : null, (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "input-content",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         className: "comment-textarea",
-        initialValue: inputMeta?.comment || '',
+        initialValue: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
         hidden: !isShown,
-        name: `${formId}-${inputId}-comment`,
+        name: "".concat(formId, "-").concat(inputId, "-comment"),
         required: requiredComment,
         rules: requiredComment ? [{
           required: true,
@@ -31746,38 +31720,35 @@ const GroupContentFormItem = ({
             onConfirm: () => {
               setIsShown(false);
               if (notPartOfTheForm) {
-                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                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 _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
+                  var _defaultData$meta13, _defaultData$meta14;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: {
-                        ..._defaultData,
+                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                         meta: {
-                          inputs: {
-                            ...(_defaultData?.meta?.inputs || {}),
-                            [inputId]: {
-                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                          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] || {}), {}, {
                               comment: null
-                            }
-                          }
+                            })
+                          })
                         }
-                      }
+                      })
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: {
-                      ..._defaultMeta,
-                      [inputId]: {
-                        ...(_defaultMeta[inputId] || {}),
+                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
                         comment: null
-                      }
-                    }
+                      })
+                    })
                   });
                 }
               } else {
@@ -31792,7 +31763,7 @@ const GroupContentFormItem = ({
             },
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
               type: "link",
-              disabled: !input.meta?.comment,
+              disabled: !((_input$meta13 = input.meta) !== null && _input$meta13 !== void 0 && _input$meta13.comment),
               className: "p-0",
               children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                 width: 16,
@@ -31804,44 +31775,41 @@ const GroupContentFormItem = ({
         children: inputTypeComponent$1.comment(inputData, {
           form: MainForm,
           forms: options,
-          value: inputMeta?.comment || '',
+          value: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
           maxWidth,
           staticWidth,
           fullWidth,
           onChange: val => {
             if (notPartOfTheForm) {
-              const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+              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 _defaultData = MainForm.getFieldValue(formId);
               if (isAjaxSubGroup) {
+                var _defaultData$meta15, _defaultData$meta16;
                 changeInputMeta({
                   key: formId,
                   type: input.type,
                   otherValues: {
-                    [formId]: {
-                      ..._defaultData,
+                    [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                       meta: {
-                        inputs: {
-                          ...(_defaultData?.meta?.inputs || {}),
-                          [inputId]: {
-                            ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                        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] || {}), {}, {
                             comment: val
-                          }
-                        }
+                          })
+                        })
                       }
-                    }
+                    })
                   }
                 });
               } else {
                 changeInputMeta({
                   key: formId,
                   type: input.type,
-                  value: {
-                    ..._defaultMeta,
-                    [inputId]: {
-                      ...(_defaultMeta[inputId] || {}),
+                  value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                    [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
                       comment: val
-                    }
-                  }
+                    })
+                  })
                 });
               }
             } else {
@@ -31862,16 +31830,16 @@ const GroupContentFormItem = ({
         className: "max-char-span",
         children: t('max-char', {
           chars: MAX_COMMENTS_LENGTH,
-          filled: inputMeta?.comment?.length || 0
+          filled: (inputMeta === null || inputMeta === void 0 || (_inputMeta$comment = inputMeta.comment) === null || _inputMeta$comment === void 0 ? void 0 : _inputMeta$comment.length) || 0
         })
       })]
-    }) : null, lastReview?.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
+    }) : null, lastReview !== null && lastReview !== void 0 && 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?.comment || '',
-          name: `${formId}-${inputId}-reviewErrorComment`,
+          initialValue: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
+          name: "".concat(formId, "-").concat(inputId, "-reviewErrorComment"),
           label: /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex w-100",
             children: /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31882,78 +31850,71 @@ const GroupContentFormItem = ({
           children: inputTypeComponent$1.comment(inputData, {
             form: MainForm,
             forms: options,
-            value: lastReview?.comment || '',
+            value: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
             maxWidth,
             staticWidth,
             fullWidth,
             onChange: val => {
               if (notPartOfTheForm) {
-                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                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 _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
+                  var _defaultData$meta17, _defaultData$meta18, _defaultData$meta19;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: {
-                        ..._defaultData,
+                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                         meta: {
-                          inputs: {
-                            ...(_defaultData?.meta?.inputs || {}),
-                            [inputId]: {
-                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
-                              reviews: (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).map(v => {
+                          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 => {
                                 if (v.createdAt === lastReview.createdAt) {
-                                  return {
-                                    ...v,
+                                  return _objectSpread2(_objectSpread2({}, v), {}, {
                                     comment: val
-                                  };
+                                  });
                                 }
                                 return v;
                               })
-                            }
-                          }
+                            })
+                          })
                         }
-                      }
+                      })
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: {
-                      ..._defaultMeta,
-                      [inputId]: {
-                        ...(_defaultMeta[inputId] || {}),
+                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
                         reviews: ((_defaultMeta[inputId] || {}).reviews || []).map(v => {
                           if (v.createdAt === lastReview.createdAt) {
-                            return {
-                              ...v,
+                            return _objectSpread2(_objectSpread2({}, v), {}, {
                               comment: val
-                            };
+                            });
                           }
                           return v;
                         })
-                      }
-                    }
+                      })
+                    })
                   });
                 }
               } else {
                 changeInputMeta({
                   key: inputId,
                   type: input.type,
-                  value: {
-                    ...inputMeta,
-                    reviews: (inputMeta?.reviews || []).map(v => {
+                  value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+                    reviews: ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || []).map(v => {
                       if (v.createdAt === lastReview.createdAt) {
-                        return {
-                          ...v,
+                        return _objectSpread2(_objectSpread2({}, v), {}, {
                           comment: val
-                        };
+                        });
                       }
                       return v;
                     })
-                  }
+                  })
                 });
               }
             },
@@ -31965,7 +31926,7 @@ const GroupContentFormItem = ({
           className: "max-char-span",
           children: t('max-char', {
             chars: MAX_COMMENTS_LENGTH,
-            filled: lastReview.comment?.length || 0
+            filled: ((_lastReview$comment = lastReview.comment) === null || _lastReview$comment === void 0 ? void 0 : _lastReview$comment.length) || 0
           })
         })]
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -31986,7 +31947,7 @@ const GroupContentFormItem = ({
           }), /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex flex-column justify-center mr-1",
             children: /*#__PURE__*/jsxRuntime.jsx("span", {
-              children: lastReview?.reviewer?.firstName + ' ' + lastReview?.reviewer?.lastName + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
+              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')
             })
           })]
         })]
@@ -39730,7 +39691,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-const _excluded$f = ["placeholder"];
+/* eslint-disable no-case-declarations */
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -39748,14 +39709,14 @@ const checkCondition = (condition, repeatValues, formsValue) => {
   return isShown;
 };
 function showHideInput(input, formsValue, repeatIndex, repeatValues, setValues, ref) {
-  var _input$meta;
-  if ((input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.hidden) === true) {
-    var _input$meta2;
+  if (input?.meta?.hidden === true) {
     // Set default value for hidden fields
-    if ((input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.defaultValue) !== undefined && !propHasValue(formsValue[ref])) {
+    if (input?.meta?.defaultValue !== undefined && !propHasValue(formsValue[ref])) {
       formsValue[ref] = input.meta.defaultValue;
       if (setValues && typeof setValues === 'function') {
-        setValues(_objectSpread2({}, formsValue));
+        setValues({
+          ...formsValue
+        });
       }
     }
     return false;
@@ -39814,35 +39775,35 @@ function getInputHeadLines(type, i, input, values) {
   switch (type) {
     case "h2":
       return /*#__PURE__*/jsxRuntime.jsx("h2", {
-        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(input, values)
         })
       });
     case "h3":
       return /*#__PURE__*/jsxRuntime.jsx("h3", {
-        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(input, values)
         })
       });
     case "h4":
       return /*#__PURE__*/jsxRuntime.jsx("h4", {
-        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(input, values)
         })
       });
     case "h5":
       return /*#__PURE__*/jsxRuntime.jsx("h5", {
-        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(input, values)
         })
       });
     case "h6":
       return /*#__PURE__*/jsxRuntime.jsx("h6", {
-        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(input, values)
         })
@@ -39851,9 +39812,7 @@ function getInputHeadLines(type, i, input, values) {
       return null;
   }
 }
-function getInputLabel(input) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  let asText = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+function getInputLabel(input, formsValue = {}, asText = false) {
   if (typeof input.label === "object") {
     const validations = Object.keys(input.label);
     const key = validations.find(v => {
@@ -39911,8 +39870,7 @@ function getInputLabel(input) {
     }) : ReactHtmlParser__default["default"](input.label);
   }
 }
-function getSelectOptions$1(option) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+function getSelectOptions$1(option, formsValue = {}) {
   if (typeof option.label === "object") {
     const validations = Object.keys(option.label);
     const key = validations.find(v => {
@@ -39936,9 +39894,7 @@ function getSectionLabel(labels, values) {
   }
   return labels;
 }
-function getSubtitles(subtitles, position) {
-  let formsValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  let repeatValues = arguments.length > 4 ? arguments[4] : undefined;
+function getSubtitles(subtitles, position, formsValue = {}, repeatIndex, repeatValues) {
   let subtitle = subtitles && subtitles[position];
   if (subtitle && typeof subtitle === "object") {
     let newSubtitle = subtitle.default || "";
@@ -39982,12 +39938,14 @@ function getSubtitles(subtitles, position) {
 function getFormTitles(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 = (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;
@@ -40021,52 +39979,48 @@ const updateFormValues = (repeatIndex, repeatValues, inputName, value, formsValu
   }
 };
 const inputTypeComponent = {
-  text: (_ref, _ref2) => {
-    let {
-      props,
-      rules
-    } = _ref;
-    let {
-      inputMeta = {},
-      t
-    } = _ref2;
+  text: ({
+    props,
+    rules
+  }, {
+    inputMeta = {},
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
     const maxProps = {};
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
-      size: "medium"
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+      size: "medium",
+      ...maxProps,
       allowClear: true,
       autoComplete: "new-password",
-      type: "text"
-    }, props), {}, {
+      type: "text",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  drawTerritory: (_ref3, _ref4) => {
-    let {
-      formsValue,
-      name,
-      addressData,
-      onValuesChange
-    } = _ref3;
-    let {
-      setFormValues,
-      form
-    } = _ref4;
+  drawTerritory: ({
+    formsValue,
+    name,
+    addressData,
+    onValuesChange
+  }, {
+    setFormValues,
+    form
+  }) => {
     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] || {};
@@ -40074,10 +40028,10 @@ const inputTypeComponent = {
         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}`;
       }
     }
     console.log("search", {
@@ -40097,9 +40051,10 @@ const inputTypeComponent = {
         const allFormValues = form && typeof form.getFieldsValue === 'function' ? form.getFieldsValue(true) : formsValue;
 
         // Create the updated values
-        const updatedValues = _objectSpread2(_objectSpread2({}, allFormValues), {}, {
+        const updatedValues = {
+          ...allFormValues,
           [name]: val
-        });
+        };
 
         // Call onValuesChange with the change and all values
         if (typeof onValuesChange === 'function') {
@@ -40114,44 +40069,39 @@ const inputTypeComponent = {
       searchValue: search
     });
   },
-  link: (_ref5, _ref6) => {
-    let {
-      props,
-      rules
-    } = _ref5;
-    let {
-      inputMeta = {},
-      t
-    } = _ref6;
+  link: ({
+    props,
+    rules
+  }, {
+    inputMeta = {},
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
     const maxProps = {};
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
-      size: "medium"
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+      size: "medium",
+      ...maxProps,
       allowClear: true,
       autoComplete: "new-password",
-      type: "text"
-    }, props), {}, {
+      type: "text",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  number: (_ref7, _ref8) => {
-    var _input$meta3;
-    let {
-      props,
-      rules,
-      input
-    } = _ref7;
-    let {
-      inputMeta = {},
-      t
-    } = _ref8;
+  number: ({
+    props,
+    rules,
+    input
+  }, {
+    inputMeta = {},
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
-    const integerRule = !(input !== null && input !== void 0 && (_input$meta3 = input.meta) !== null && _input$meta3 !== void 0 && _input$meta3.isDecimal);
+    const integerRule = !input?.meta?.isDecimal;
     const parser = value => {
       if (!value) {
         return "";
@@ -40162,53 +40112,50 @@ const inputTypeComponent = {
       return value.replace(/\$\s?|(,*)/g, "");
     };
     if (maxRule) {
-      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
         allowClear: true,
-        autoComplete: "new-password"
-      }, props), {}, {
+        autoComplete: "new-password",
+        ...props,
         type: "number",
         min: 0,
         max: maxRule.max,
         parser: parser
-      }));
+      });
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
       allowClear: true,
-      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
-    }));
+    });
   },
-  select: (_ref9, _ref10) => {
-    var _input$meta4;
-    let {
-      value,
-      options,
-      optionGroup,
-      props,
-      formsValue,
-      optionsFilter,
-      filterCond,
-      repeatValues,
-      repeatIndex,
-      name,
-      inputName,
-      address,
-      addressData,
-      input
-    } = _ref9;
-    let {
-      forms,
-      form,
-      setAddress,
-      inputMeta = {},
-      t,
-      changeInputMeta
-    } = _ref10;
+  select: ({
+    value,
+    options,
+    optionGroup,
+    props,
+    formsValue,
+    optionsFilter,
+    filterCond,
+    repeatValues,
+    repeatIndex,
+    name,
+    inputName,
+    address,
+    addressData,
+    input
+  }, {
+    forms,
+    form,
+    setAddress,
+    inputMeta = {},
+    t,
+    changeInputMeta
+  }) => {
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -40264,19 +40211,18 @@ const inputTypeComponent = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       autoComplete: "new-password",
       allowClear: true,
       showSearch: true,
-      defaultValue: input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.defaultValue,
+      defaultValue: input?.meta?.defaultValue,
       filterOption: filterSelectOptions,
-      optionFilterProp: "children"
-    }, props), {}, {
+      optionFilterProp: "children",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp$1(props.placeholder, formsValue) || t("Select one option"),
       onChange: (val, selectedValue) => {
-        var _input$meta5;
-        if (typeof (input === null || input === void 0 || (_input$meta5 = input.meta) === null || _input$meta5 === void 0 ? void 0 : _input$meta5.onChange) === "string") {
+        if (typeof input?.meta?.onChange === "string") {
           const [value, otherKey, otherVal] = input.meta.onChange.split(".");
           if (val === value) {
             changeInputMeta({
@@ -40290,7 +40236,9 @@ const inputTypeComponent = {
         }
         if (address && selectedValue) {
           dot__default["default"].str(address, selectedValue.children, addressData);
-          setAddress(_objectSpread2({}, addressData));
+          setAddress({
+            ...addressData
+          });
         }
         if (props.onChange) {
           props.onChange(val);
@@ -40302,35 +40250,33 @@ const inputTypeComponent = {
           value: og.value,
           disabled: og.disabled,
           children: og.label
-        }, "".concat(i).concat(j)))
+        }, `${i}${j}`))
       }, i) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
         value: option.value,
         disabled: option.disabled,
         children: option.label
       }, i))
-    }));
+    });
   },
-  multiselect: (_ref11, _ref12) => {
-    let {
-      value,
-      options,
-      optionGroup,
-      optionsFilter,
-      filterCond,
-      props,
-      formsValue,
-      repeatValues,
-      repeatIndex,
-      inputName,
-      name,
-      tags
-    } = _ref11;
-    let {
-      forms,
-      form,
-      inputMeta = {},
-      t
-    } = _ref12;
+  multiselect: ({
+    value,
+    options,
+    optionGroup,
+    optionsFilter,
+    filterCond,
+    props,
+    formsValue,
+    repeatValues,
+    repeatIndex,
+    inputName,
+    name,
+    tags
+  }, {
+    forms,
+    form,
+    inputMeta = {},
+    t
+  }) => {
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -40387,16 +40333,16 @@ const inputTypeComponent = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       allowClear: true,
       autoComplete: "new-password",
       mode: tags ? "tags" : "multiple",
-      optionFilterProp: "children"
-    }, tags ? {
-      tokenSeparators: [",", "\n", "\t"]
-    } : {}), {}, {
-      filterOption: filterSelectOptions
-    }, props), {}, {
+      optionFilterProp: "children",
+      ...(tags ? {
+        tokenSeparators: [",", "\n", "\t"]
+      } : {}),
+      filterOption: filterSelectOptions,
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp$1(props.placeholder, formsValue) || t("Select all relevant options"),
       children: (opts || []).map((option, i) => option.items ? /*#__PURE__*/jsxRuntime.jsx(antd.Select.OptGroup, {
@@ -40405,42 +40351,42 @@ const inputTypeComponent = {
           value: og.value,
           disabled: og.disabled,
           children: og.label
-        }, "".concat(i).concat(j)))
+        }, `${i}${j}`))
       }, i) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
         value: option.value,
         disabled: option.disabled,
         children: option.label
       }, i))
-    }));
+    });
   },
-  date: (_ref13, _ref14) => {
-    let {
-      props,
-      rules,
-      repeatValues,
-      formsValue,
-      name
-    } = _ref13;
-    let {
-      inputMeta,
-      t,
-      groupFormId,
-      form,
-      setFormValues
-    } = _ref14;
+  date: ({
+    props,
+    rules,
+    repeatValues,
+    formsValue,
+    name
+  }, {
+    inputMeta,
+    t,
+    groupFormId,
+    form,
+    setFormValues
+  }) => {
     const lng = localStorage.getItem("datastakeLng") || "en";
     const maxRule = rules.find(r => r.max);
     const handleDateChange = date => {
       if (date) {
         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);
         }
@@ -40452,10 +40398,10 @@ const inputTypeComponent = {
         checkForMax = checkCondition(maxRule.condition, repeatValues, formsValue);
       }
       if (checkForMax) {
-        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
           allowClear: true,
-          autoComplete: "new-password"
-        }, props), {}, {
+          autoComplete: "new-password",
+          ...props,
           onChange: handleDateChange,
           format: DATE_FORMATS,
           locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
@@ -40464,33 +40410,31 @@ const inputTypeComponent = {
           disabledDate: current => {
             return current && current >= dayjs__default["default"]().endOf("day");
           }
-        }));
+        });
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
       allowClear: true,
-      autoComplete: "new-password"
-    }, props), {}, {
+      autoComplete: "new-password",
+      ...props,
       onChange: handleDateChange,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Select date"),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       format: DATE_FORMATS,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"]
-    }));
+    });
   },
-  comment: (_ref15, _ref16) => {
-    let {
-        props: {
-          placeholder
-        },
-        commentHint
-      } = _ref15,
-      props = _objectWithoutProperties(_ref15.props, _excluded$f);
-    let {
-      onChange,
-      value
-    } = _ref16;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
+  comment: ({
+    props: {
+      placeholder,
+      ...props
+    },
+    commentHint
+  }, {
+    onChange,
+    value
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
       allowClear: true,
       value: value,
       onChange: e => onChange(e.target.value),
@@ -40500,60 +40444,56 @@ const inputTypeComponent = {
       autoSize: {
         minRows: 5,
         maxRows: 5
-      }
-    }, props), {}, {
+      },
+      ...props,
       disabled: false
-    }));
+    });
   },
-  textarea: (_ref17, _ref18) => {
-    let {
-      props,
-      rules
-    } = _ref17;
-    let {
-      inputMeta,
-      t
-    } = _ref18;
+  textarea: ({
+    props,
+    rules
+  }, {
+    inputMeta,
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
     let maxLength = MAX_TEXT_AREA_LENGTH;
     if (maxRule) {
       maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
       allowClear: true,
       autoComplete: "new-password",
       maxLength: maxLength,
       autoSize: {
         minRows: 5,
         maxRows: 5
-      }
-    }, props), {}, {
+      },
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  phoneNumber: (_ref19, _ref20) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref19;
-    let {
-      setFormValues,
-      t
-    } = _ref20;
-    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, _objectSpread2(_objectSpread2({
+  phoneNumber: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    setFormValues,
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, {
       t: t,
       doChangeErrors: false,
       allowClear: true,
-      country: formsValue === null || formsValue === void 0 ? void 0 : formsValue.country,
+      country: formsValue?.country,
       formsValue: formsValue,
-      initialValue: value
-    }, props), {}, {
+      initialValue: value,
+      ...props,
       onChange: val => {
         if (repeatValues) {
           const inputValues = Array.isArray(formsValue[name]) ? formsValue[name] || [] : [];
@@ -40569,25 +40509,24 @@ const inputTypeComponent = {
           setFormValues(formsValue);
         }
       }
-    }));
+    });
   },
-  switch: (_ref21, _ref22) => {
-    let {
-      props,
-      value,
-      restricted,
-      autocomplete,
-      formsValue,
-      repeatIndex,
-      name,
-      inputName,
-      replace
-    } = _ref21;
-    let {
-      form,
-      setFormValues
-    } = _ref22;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, _objectSpread2(_objectSpread2({}, props), {}, {
+  switch: ({
+    props,
+    value,
+    restricted,
+    autocomplete,
+    formsValue,
+    repeatIndex,
+    name,
+    inputName,
+    replace
+  }, {
+    form,
+    setFormValues
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, {
+      ...props,
       defaultChecked: value || false,
       checked: value || false,
       onChange: isChecked => {
@@ -40629,15 +40568,14 @@ const inputTypeComponent = {
           setFormValues(formsValue);
         }
       }
-    }));
+    });
   },
-  total100: _ref23 => {
-    let {
-      props,
-      name,
-      options,
-      value
-    } = _ref23;
+  total100: ({
+    props,
+    name,
+    options,
+    value
+  }) => {
     value = value ? Array.isArray(value) ? value : [value] : [];
     function totalValue() {
       let total = 0;
@@ -40661,11 +40599,10 @@ const inputTypeComponent = {
       className: "total100",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: name,
-        children: (fields, _ref24) => {
-          let {
-            add,
-            remove
-          } = _ref24;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           if (fields.length === 0) {
             const formData = value || [];
             if (formData.length) {
@@ -40684,26 +40621,26 @@ const inputTypeComponent = {
               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,
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
                     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,
@@ -40711,14 +40648,14 @@ const inputTypeComponent = {
                     allowClear: true,
                     name: "value",
                     formatter: value => {
-                      return value ? "".concat(value, "%") : "";
+                      return value ? `${value}%` : "";
                     },
                     disabled: !v.type,
                     placeholder: props.valueplaceholder ? props.valueplaceholder : "Value",
                     min: 1,
                     max: 100 - siblingTotal(v.type)
                   })
-                })), 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, {}),
@@ -40750,21 +40687,18 @@ const inputTypeComponent = {
       }) : null]
     });
   },
-  percentage: (_ref25, _ref26) => {
-    var _input$meta6;
-    let {
-      name,
-      inputName,
-      totalMax,
-      repeatIndex,
-      props,
-      formsValue,
-      input
-    } = _ref25;
-    let {
-      inputMeta,
-      t
-    } = _ref26;
+  percentage: ({
+    name,
+    inputName,
+    totalMax,
+    repeatIndex,
+    props,
+    formsValue,
+    input
+  }, {
+    inputMeta,
+    t
+  }) => {
     const isRepeatable = Array.isArray(formsValue[name]);
     let totalSiblings = 0;
     if (isRepeatable && totalMax) {
@@ -40772,15 +40706,15 @@ const inputTypeComponent = {
         totl = totl + (grp[inputName] || 0);
         return totl;
       }, 0);
-    } else if (Array.isArray(input === null || input === void 0 || (_input$meta6 = input.meta) === null || _input$meta6 === void 0 ? void 0 : _input$meta6.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({
-      allowClear: true
-    }, props), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
+      allowClear: true,
+      ...props,
       style: {
         width: "100%"
       },
@@ -40789,36 +40723,33 @@ const inputTypeComponent = {
       min: 0,
       max: 100 - totalSiblings,
       formatter: value => {
-        return value ? "".concat(value) : "";
+        return value ? `${value}` : "";
       },
       parser: value => value.replace("%", ""),
       addonAfter: "%"
-    }));
+    });
   },
-  year: _ref27 => {
-    let {
-      props
-    } = _ref27;
+  year: ({
+    props
+  }) => {
     const lng = localStorage.getItem("datastakeLng") || "en";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
       allowClear: true,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
-      picker: "year"
-    }, props), {}, {
+      picker: "year",
+      ...props,
       format: "YYYY"
-    }));
+    });
   },
-  upload: (_ref28, _ref29) => {
-    let {
-      rules,
-      value
-    } = _ref28;
-    let {
-      setLoading,
-      t,
-      getApiBaseUrl,
-      getAppHeader
-    } = _ref29;
+  upload: ({
+    rules,
+    value
+  }, {
+    setLoading,
+    t,
+    getApiBaseUrl,
+    getAppHeader
+  }) => {
     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) : []) || [];
@@ -40831,12 +40762,13 @@ const inputTypeComponent = {
       }
     }
     const allowedExtensions = accept && accept !== "*" ? accept.split(",").map(ext => ext.trim().toLowerCase()) : [];
-    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 {
@@ -40844,9 +40776,10 @@ const inputTypeComponent = {
           }
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40856,19 +40789,17 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  imageUpload: (_ref30, _ref31) => {
-    let {
-      rules,
-      value
-    } = _ref30;
-    let {
-      setLoading,
-      getApiBaseUrl,
-      getAppHeader,
-      t
-    } = _ref31;
+  imageUpload: ({
+    rules,
+    value
+  }, {
+    setLoading,
+    getApiBaseUrl,
+    getAppHeader,
+    t
+  }) => {
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -40879,17 +40810,17 @@ const inputTypeComponent = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({}, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      ...maxProps,
       beforeUpload: beforeUpload(allowedImageExtensions),
       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;
             }
@@ -40901,9 +40832,10 @@ const inputTypeComponent = {
           setLoading(false);
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40913,19 +40845,17 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  videoUpload: (_ref32, _ref33) => {
-    let {
-      rules,
-      value
-    } = _ref32;
-    let {
-      setLoading = () => {},
-      getApiBaseUrl,
-      getAppHeader,
-      t
-    } = _ref33;
+  videoUpload: ({
+    rules,
+    value
+  }, {
+    setLoading = () => {},
+    getApiBaseUrl,
+    getAppHeader,
+    t
+  }) => {
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -40936,25 +40866,21 @@ const inputTypeComponent = {
         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;
             }
@@ -40966,9 +40892,10 @@ const inputTypeComponent = {
           setLoading(false);
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40978,19 +40905,17 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  geolocation: (_ref34, _ref35) => {
-    let {
-      value,
-      name,
-      formsValue,
-      addressData,
-      props
-    } = _ref34;
-    let {
-      inputMeta
-    } = _ref35;
+  geolocation: ({
+    value,
+    name,
+    formsValue,
+    addressData,
+    props
+  }, {
+    inputMeta
+  }) => {
     let search = formsValue.country;
     if (addressData && Object.keys(addressData).length > 0) {
       const country = countriesList.countries[formsValue.country] || {};
@@ -40998,10 +40923,10 @@ const inputTypeComponent = {
         search = addressData.country;
       }
       if (addressData.level1) {
-        search = "".concat(addressData.level1, ", ").concat(addressData.country || country.name);
+        search = `${addressData.level1}, ${addressData.country || country.name}`;
       }
       if (addressData.level2) {
-        search = "".concat(addressData.level2, ", ").concat(addressData.level1, ", ").concat(addressData.country || country.name);
+        search = `${addressData.level2}, ${addressData.level1}, ${addressData.country || country.name}`;
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -41009,10 +40934,10 @@ const inputTypeComponent = {
         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, {
@@ -41025,35 +40950,33 @@ const inputTypeComponent = {
       searchValue: search
     });
   },
-  ajaxSelect: (_ref36, _ref37) => {
-    let {
-      call,
-      automaticallyLink,
-      name,
-      preSelected,
-      inputName,
-      props,
-      formsValue,
-      onNewSetValue,
-      multiple,
-      updateOptions,
-      repeatValues,
-      repeatIndex,
-      value,
-      unique,
-      address,
-      addressData = {},
-      input
-    } = _ref36;
-    let {
-      form,
-      forms,
-      setAddress,
-      changeInputMeta,
-      inputMeta = {},
-      meta,
-      setFormValues
-    } = _ref37;
+  ajaxSelect: ({
+    call,
+    automaticallyLink,
+    name,
+    preSelected,
+    inputName,
+    props,
+    formsValue,
+    onNewSetValue,
+    multiple,
+    updateOptions,
+    repeatValues,
+    repeatIndex,
+    value,
+    unique,
+    address,
+    addressData = {},
+    input
+  }, {
+    form,
+    forms,
+    setAddress,
+    changeInputMeta,
+    inputMeta = {},
+    meta,
+    setFormValues
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect, {
       preSelected: preSelected,
       input: input,
@@ -41089,41 +41012,40 @@ const inputTypeComponent = {
           const selectedValue = data.find(v => v.value === ev);
           if (address && selectedValue) {
             dot__default["default"].str(address, selectedValue.label, addressData);
-            setAddress(_objectSpread2({}, addressData));
+            setAddress({
+              ...addressData
+            });
           }
         }
       },
       setAddress: setAddress
     });
   },
-  tag: _ref38 => {
-    let {
-      value,
-      repeatLabel
-    } = _ref38;
+  tag: ({
+    value,
+    repeatLabel
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(TagInput$1, {
       allowClear: true,
       value: value || [],
       newPlaceholder: repeatLabel
     });
   },
-  modal: (_ref39, _ref40) => {
-    let {
-      call,
-      automaticallyLink,
-      name,
-      inputName,
-      props,
-      formsValue,
-      onNewSetValue,
-      repeatValues,
-      repeatIndex,
-      value,
-      modalTitle
-    } = _ref39;
-    let {
-      form
-    } = _ref40;
+  modal: ({
+    call,
+    automaticallyLink,
+    name,
+    inputName,
+    props,
+    formsValue,
+    onNewSetValue,
+    repeatValues,
+    repeatIndex,
+    value,
+    modalTitle
+  }, {
+    form
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(AjaxModal$2, {
       allowClear: true,
       call: call,
@@ -41141,69 +41063,63 @@ const inputTypeComponent = {
       buttonText: modalTitle
     });
   },
-  website: (_ref41, _ref42) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref41;
-    let {
-      form,
-      inputMeta = {},
-      t
-    } = _ref42;
-    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
+  website: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    form,
+    inputMeta = {},
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(Website, {
       allowClear: true,
       initialValue: value,
-      t: t
-    }, props), {}, {
+      t: t,
+      ...props,
       onChange: val => updateFormValues(repeatIndex, repeatValues, inputName, val, formsValue, name, form),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com"
-    }));
+    });
   },
-  dataLink: (_ref43, _ref44) => {
-    var _input$meta7, _input$meta10, _formsValue$meta, _input$meta11;
-    let {
-      setValues,
-      name,
-      onValuesChange,
-      formsValue,
-      input,
-      changeLinking,
-      call,
-      automaticallyLink,
-      inputName,
-      props,
-      onNewSetValue,
-      multiple,
-      updateOptions,
-      repeatValues,
-      repeatIndex,
-      value,
-      unique,
-      address,
-      addressData = {},
-      getFromLinking
-    } = _ref43;
-    let {
-      form,
-      groupFormId,
-      setAddress,
-      isHighlighted,
-      changeInputMeta,
-      meta,
-      inputMeta,
-      forms
-    } = _ref44;
-    if ((input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 || (_input$meta7 = _input$meta7.optionsView) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.editInputType) === "ajaxSelect") {
-      var _formsValue$groupForm, _input$meta8, _input$meta9;
-      const currentValue = groupFormId ? (_formsValue$groupForm = formsValue[groupFormId]) === null || _formsValue$groupForm === void 0 ? void 0 : _formsValue$groupForm[name] : formsValue[name];
-      (input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 || (_input$meta8 = _input$meta8.optionsView) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.call) || (input === null || input === void 0 || (_input$meta9 = input.meta) === null || _input$meta9 === void 0 ? void 0 : _input$meta9.call) || "default::list()::::";
+  dataLink: ({
+    setValues,
+    name,
+    onValuesChange,
+    formsValue,
+    input,
+    changeLinking,
+    call,
+    automaticallyLink,
+    inputName,
+    props,
+    onNewSetValue,
+    multiple,
+    updateOptions,
+    repeatValues,
+    repeatIndex,
+    value,
+    unique,
+    address,
+    addressData = {},
+    getFromLinking
+  }, {
+    form,
+    groupFormId,
+    setAddress,
+    isHighlighted,
+    changeInputMeta,
+    meta,
+    inputMeta,
+    forms
+  }) => {
+    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,
@@ -41240,7 +41156,9 @@ const inputTypeComponent = {
             const selectedValue = data.find(v => v.value === ev);
             if (address && selectedValue) {
               dot__default["default"].str(address, selectedValue.label, addressData);
-              setAddress(_objectSpread2({}, addressData));
+              setAddress({
+                ...addressData
+              });
             }
           }
         },
@@ -41250,149 +41168,188 @@ const inputTypeComponent = {
         isDataLink: true
       });
     }
-    const isSingle = (input === null || input === void 0 || (_input$meta10 = input.meta) === null || _input$meta10 === void 0 ? void 0 : _input$meta10.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 = (val, i) => {
       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
+      });
     };
     return /*#__PURE__*/jsxRuntime.jsx(DataLink, {
       form: input,
       formsValue: formsValue,
       onUpdate: onUpdate,
       isHighlighted: isHighlighted,
-      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$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.maxRepeat,
-      remove: _ref45 => {
-        let {
-          key
-        } = _ref45;
+      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
     });
   },
-  internallink: (_ref46, _ref47) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref46;
-    let {
-      form,
-      inputMeta = {},
-      t
-    } = _ref47;
-    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
+  internallink: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    form,
+    inputMeta = {},
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(Website, {
       allowClear: true,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com",
-      initialValue: value
-    }, props), {}, {
+      initialValue: value,
+      ...props,
       onChange: val => updateFormValues(repeatIndex, repeatValues, inputName, val, formsValue, name, form)
-    }));
+    });
   },
-  group: _ref48 => {
-    let {
-      props,
-      groupInputs
-    } = _ref48;
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, _objectSpread2({
-      groupInputs: groupInputs
-    }, props));
+  group: ({
+    props,
+    groupInputs
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, {
+      groupInputs: groupInputs,
+      ...props
+    });
   },
-  groupInputs: (_ref49, _ref50) => {
-    let {
-      props,
-      groupInputs
-    } = _ref49;
-    let {
-      inputMeta
-    } = _ref50;
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, _objectSpread2({
+  groupInputs: ({
+    props,
+    groupInputs
+  }, {
+    inputMeta
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, {
       groupInputs: groupInputs,
-      inputMeta: inputMeta
-    }, props));
+      inputMeta: inputMeta,
+      ...props
+    });
   },
-  radioGroup: _ref51 => {
-    let {
-      props,
-      value,
-      options
-    } = _ref51;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, _objectSpread2(_objectSpread2({
-      value: value
-    }, props), {}, {
+  radioGroup: ({
+    props,
+    value,
+    options
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, {
+      value: value,
+      ...props,
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Radio, {
           value: o.value,
@@ -41405,17 +41362,16 @@ const inputTypeComponent = {
           }) : null]
         }, o.value);
       })
-    }));
+    });
   },
-  checkboxGroup: _ref52 => {
-    let {
-      props,
-      value,
-      options
-    } = _ref52;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, _objectSpread2(_objectSpread2({
-      value: value
-    }, props), {}, {
+  checkboxGroup: ({
+    props,
+    value,
+    options
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, {
+      value: value,
+      ...props,
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Checkbox, {
           value: o.value,
@@ -41428,30 +41384,28 @@ const inputTypeComponent = {
           }) : null]
         }, o.value);
       })
-    }));
+    });
   }
 };
-const GetFormItem = _ref53 => {
-  var _find, _input$meta12, _input$meta13, _input$meta14, _input$meta15, _input$meta16, _input$meta17, _input$meta18, _inputData$value, _input$meta19, _input$meta20, _inputData$commentVal;
-  let {
-    code,
-    inputData,
-    inputId,
-    input,
-    setLoading,
-    values,
-    MainForm,
-    options,
-    plainForms,
-    setValues,
-    alertError,
-    setAddress,
-    inputMeta = {},
-    inputKey,
-    changeInputMeta = () => {},
-    i,
-    isCreate = false
-  } = _ref53;
+const GetFormItem = ({
+  code,
+  inputData,
+  inputId,
+  input,
+  setLoading,
+  values,
+  MainForm,
+  options,
+  plainForms,
+  setValues,
+  alertError,
+  setAddress,
+  inputMeta = {},
+  inputKey,
+  changeInputMeta = () => {},
+  i,
+  isCreate = false
+}) => {
   const {
     t,
     getAppHeader,
@@ -41467,7 +41421,7 @@ const GetFormItem = _ref53 => {
     case "h6":
       return getInputHeadLines(input.type, i, input, values);
     default:
-      const rules = inputMeta !== null && inputMeta !== void 0 && inputMeta.notApplicable || inputMeta !== null && inputMeta !== void 0 && inputMeta.notAvailable ? [] : inputData.rules ? inputData.rules.filter(rule => !Object.keys(rule).includes("accept") && !Object.keys(rule).includes("max")) : [];
+      const rules = inputMeta?.notApplicable || inputMeta?.notAvailable ? [] : inputData.rules ? inputData.rules.filter(rule => !Object.keys(rule).includes("accept") && !Object.keys(rule).includes("max")) : [];
       const requiredRule = rules.find(r => r.required);
       if (requiredRule && input.type === "text") {
         rules.push({
@@ -41476,45 +41430,47 @@ const GetFormItem = _ref53 => {
         });
       }
       const noLabel = ["message"].includes(input.type);
-      let maxRule = (_find = ((inputData === null || inputData === void 0 ? void 0 : inputData.rules) || []).find(rule => rule.max)) === null || _find === void 0 ? void 0 : _find.max;
+      let maxRule = (inputData?.rules || []).find(rule => rule.max)?.max;
       return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex input-cont",
-          children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-            initialValue: inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.defaultValue
-          }, ["total100", "group"].includes(input.type) ? {} : {
-            name: inputId,
-            fieldKey: inputId,
-            initialValue: inputData.value
-          }), ["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, {
+            initialValue: inputMeta?.defaultValue,
+            ...(["total100", "group"].includes(input.type) ? {} : {
+              name: inputId,
+              fieldKey: inputId,
+              initialValue: inputData.value
+            }),
+            ...(["upload", "imageUpload", "videoUpload"].includes(input.type) ? {
+              valuePropName: "fileList",
+              getValueFromEvent: e => {
+                if (Array.isArray(e)) {
+                  return e;
                 }
-                return f;
-              });
-            }
-          } : {}), {}, {
+                return e && e.fileList && e.fileList.map(f => {
+                  if (f.response) {
+                    return f.response;
+                  }
+                  return f;
+                });
+              }
+            } : {}),
             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"
-            })
-          } : {}), {}, {
-            className: input.comment ? "flex-1 with-comment i-".concat(input.type) : "i-".concat(input.type, " flex-1"),
+            } : {},
+            ...(["switch"].includes(input.type) ? {
+              labelCol: {
+                span: 20
+              },
+              style: {
+                ...(input.showOnView === false ? {
+                  display: "none"
+                } : {}),
+                flexDirection: "row",
+                justifyContent: "space-between"
+              }
+            } : {}),
+            className: input.comment ? `flex-1 with-comment i-${input.type}` : `i-${input.type} flex-1`,
             "data-id": inputData.name,
             rules: rules,
             required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
@@ -41525,8 +41481,8 @@ const GetFormItem = _ref53 => {
               children: [/*#__PURE__*/jsxRuntime.jsx("div", {
                 className: "mr-1",
                 children: getInputLabel(input, values)
-              }), !!(input !== null && input !== void 0 && (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.tooltip) && /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-                title: input === null || input === void 0 || (_input$meta13 = input.meta) === null || _input$meta13 === void 0 ? void 0 : _input$meta13.tooltip,
+              }), !!input?.meta?.tooltip && /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+                title: input?.meta?.tooltip,
                 trigger: "hover",
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "flex flex-column justify-content-center",
@@ -41544,7 +41500,7 @@ const GetFormItem = _ref53 => {
                     title: t("Not applicable"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
                       children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-                        disabled: !(input !== null && input !== void 0 && (_input$meta14 = input.meta) !== null && _input$meta14 !== void 0 && _input$meta14.notApplicable),
+                        disabled: !input?.meta?.notApplicable,
                         className: formatClassname(["default p-0", inputMeta.notApplicable && "primary"]),
                         type: "link",
                         onClick: () => {
@@ -41579,7 +41535,7 @@ const GetFormItem = _ref53 => {
                     title: t("No available information"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
                       children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-                        disabled: !(input !== null && input !== void 0 && (_input$meta15 = input.meta) !== null && _input$meta15 !== void 0 && _input$meta15.notAvailable),
+                        disabled: !input?.meta?.notAvailable,
                         className: formatClassname(["default p-0", inputMeta.notAvailable && "primary"]),
                         type: "link",
                         onClick: () => {
@@ -41613,14 +41569,14 @@ const GetFormItem = _ref53 => {
                   }), /*#__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 !== null && input !== void 0 && (_input$meta16 = input.meta) !== null && _input$meta16 !== void 0 && _input$meta16.comment)
-                      }, !isShown ? {
-                        className: "default p-0"
-                      } : {
-                        className: "p-0 primary"
-                      }), {}, {
+                        disabled: !input?.meta?.comment,
+                        ...(!isShown ? {
+                          className: "default p-0"
+                        } : {
+                          className: "p-0 primary"
+                        }),
                         onClick: () => {
                           setIsShown(true);
                           changeInputMeta({
@@ -41636,18 +41592,18 @@ const GetFormItem = _ref53 => {
                           width: 16,
                           height: 16
                         })
-                      }))
+                      })
                     })
                   })]
-                }), (_input$meta17 = input.meta) !== null && _input$meta17 !== void 0 && _input$meta17.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+                }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "code",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: (_input$meta18 = input.meta) === null || _input$meta18 === void 0 ? void 0 : _input$meta18.code
+                    children: input.meta?.code
                   })
                 }) : code ? /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "code",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: "".concat(code, ".").concat(i + 1)
+                    children: `${code}.${i + 1}`
                   })
                 }) : null]
               })
@@ -41667,7 +41623,7 @@ const GetFormItem = _ref53 => {
               getAppHeader,
               getApiBaseUrl
             }) : console.log(input)
-          }))
+          })
         }), alertError ? /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
           message: alertError.message,
           type: "error",
@@ -41696,10 +41652,10 @@ const GetFormItem = _ref53 => {
             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$meta19 = input.meta) !== null && _input$meta19 !== void 0 && _input$meta19.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+        }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "input-content dynamic-form-comment",
           children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "comment-textarea",
@@ -41725,7 +41681,7 @@ const GetFormItem = _ref53 => {
                 },
                 children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   type: "link",
-                  disabled: !((_input$meta20 = input.meta) !== null && _input$meta20 !== void 0 && _input$meta20.comment),
+                  disabled: !input.meta?.comment,
                   className: "p-0",
                   children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                     width: 16,
@@ -41756,7 +41712,7 @@ const GetFormItem = _ref53 => {
             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]
@@ -41776,23 +41732,22 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
   const formId = form.dataId || k;
   const allInputs = Object.keys(form.inputs).filter(i => {
     const input = form.inputs[i];
-    return !excludedKeys.includes(i) && !input.excludeFromEdit && showHideInput(input, values, undefined, undefined, setValues, "".concat(formId, ".").concat(i));
+    return !excludedKeys.includes(i) && !input.excludeFromEdit && showHideInput(input, values, undefined, undefined, setValues, `${formId}.${i}`);
   });
   return allInputs.length ? /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
     children: [getFormTitles(formTitles, formId, i), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(form.type) ? getInputHeadLines(form.type, i, form, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [!form.repeatable ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " mb0 ").concat(i ? 'mt-3' : ''),
+        className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} mb0 ${i ? 'mt-3' : ''}`,
         children: getInputLabel(form, values)
       }) : !form.hideSectionLabel ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " mb0 ").concat(i ? 'mt-3' : ''),
+        className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} mb0 ${i ? 'mt-3' : ''}`,
         children: form.sectionLabel ? getSectionLabel(form.sectionLabel, values) : form.label ? getInputLabel(form, values) : camelCaseToTitle(k)
       }) : null, /*#__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;
@@ -41843,7 +41798,7 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                     padding: '0px 5px',
                     color: '#2E90FA'
                   },
-                  children: "#".concat(field.name + 1)
+                  children: `#${field.name + 1}`
                 }), /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "remove-button-for-repeatable",
                   children: (formData.filter(k => Object.keys(k).length > 0).length >= 1 || fields.length > 1) && (typeof form.canDelete !== 'function' || form.canDelete(Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {})) ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
@@ -41865,8 +41820,8 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                   const inputId = input.dataId || inp;
                   const inputValues = Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {};
                   const value = inputValues[inputId];
-                  const commentValue = inputValues["".concat(inputId, "Comment")];
-                  const inputData = getData(formId, input, value, commentValue, "".concat(formId, "[").concat(field.name, "].").concat(inputId), "".concat(formId, ".").concat(inputId));
+                  const commentValue = inputValues[`${inputId}Comment`];
+                  const inputData = getData(formId, input, value, commentValue, `${formId}[${field.name}].${inputId}`, `${formId}.${inputId}`);
                   const subtitles = form.subtitles || null;
                   inputData.repeatIndex = field.name;
                   inputData.inputName = inputId;
@@ -41887,59 +41842,64 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                       message: requiredRule.message || ''
                     });
                   }
-                  return showHideInput(input, values, field.name, inputValues, setValues, "".concat(formId, "[").concat(field.name, "].").concat(inputId)) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+                  return showHideInput(input, values, field.name, inputValues, setValues, `${formId}[${field.name}].${inputId}`) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
                     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-                      className: form.repeatable ? "inputs" : "",
+                      className: form.repeatable ? `inputs` : "",
                       children: [getSubtitles(subtitles, input.position, values, field.name, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines(input.type, i, input, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-                        children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, field), {}, {
-                          required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-                        }, ['total100', 'group'].includes(input.type) ? {} : {
-                          name: [field.name, inputId],
-                          fieldKey: [field.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;
+                        children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                          ...field,
+                          required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+                          ...(['total100', 'group'].includes(input.type) ? {} : {
+                            name: [field.name, inputId],
+                            fieldKey: [field.fieldKey, inputId],
+                            initialValue: inputData.value
+                          }),
+                          ...(['upload'].includes(input.type) ? {
+                            valuePropName: "fileList",
+                            getValueFromEvent: e => {
+                              if (Array.isArray(e)) {
+                                return e;
                               }
-                              return f;
-                            });
-                          }
-                        } : {}), {}, {
+                              return e && e.fileList && e.fileList.map(f => {
+                                if (f.response) {
+                                  return f.response;
+                                }
+                                return f;
+                              });
+                            }
+                          } : {}),
                           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: getInputLabel(input, values),
                           rules: rules,
-                          className: input.comment ? "with-comment i-".concat(input.type) : "i-".concat(input.type),
+                          className: input.comment ? `with-comment i-${input.type}` : `i-${input.type}`,
                           extra: input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                             disabled: inputData.props.disabled,
                             type: "link",
                             onClick: () => {
                               const inputValues = Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {};
-                              inputValues["".concat(inputData.inputName, "Comment")] = !inputData.commentValue ? '' : undefined;
+                              inputValues[`${inputData.inputName}Comment`] = !inputData.commentValue ? '' : undefined;
                               if (Array.isArray(values[formId])) {
                                 values[formId][field.name] = inputValues;
                               } else {
                                 values[formId] = inputValues;
                               }
-                              setValues(_objectSpread2({}, values));
+                              setValues({
+                                ...values
+                              });
                             },
                             children: t(!inputData.commentValue ? 'Add Comment' : 'Remove Comment')
                           }) : null,
@@ -41956,9 +41916,9 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                             getAppHeader,
                             getApiBaseUrl
                           }) : console.log(input)
-                        })), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                          name: [field.name, "".concat(inputData.inputName, "Comment")],
-                          fieldKey: [field.fieldKey, "".concat(inputData.inputName, "Comment")],
+                        }), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                          name: [field.name, `${inputData.inputName}Comment`],
+                          fieldKey: [field.fieldKey, `${inputData.inputName}Comment`],
                           initialValue: inputData.commentValue,
                           hidden: !inputData.commentValue,
                           children: inputTypeComponent.comment(inputData, {
@@ -41972,10 +41932,10 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                         }) : null]
                       })]
                     }, ii)
-                  }, "".concat(i).concat(ii)) : null;
+                  }, `${i}${ii}`) : null;
                 })
               })]
-            }, "".concat(formId, "-").concat(field.name))), form.repeatable ? /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
+            }, `${formId}-${field.name}`)), form.repeatable ? /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
               type: "dashed",
               style: {
                 margin: '10px 0px 30px',
@@ -42004,7 +41964,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   const hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? /*#__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.jsx("div", {
       className: hasLabel ? "mb-4" : "",
@@ -42013,8 +41973,8 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
         const inputId = input.dataId || inp;
         const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
         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 commentValue = inputValues[`${inputId}Comment`];
+        const inputData = getData(formId, input, value, commentValue, `${formId}.${inputId}`, `${formId}.${inputId}`);
         const subtitles = form.subtitles || null;
         inputData.repeatIndex = undefined;
         inputData.inputName = inputId;
@@ -42035,58 +41995,62 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
             message: requiredRule.message || ''
           });
         }
-        return showHideInput(input, values, undefined, inputValues, setValues, "".concat(formId, ".").concat(inputId)) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+        return showHideInput(input, values, undefined, inputValues, setValues, `${formId}.${inputId}`) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             children: [getSubtitles(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines(input.type, i, input, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _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: [formId, inputId],
-                fieldKey: [formId, 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;
+              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: [formId, inputId],
+                  fieldKey: [formId, inputId],
+                  initialValue: inputData.value
+                }),
+                ...(['upload'].includes(input.type) ? {
+                  valuePropName: "fileList",
+                  getValueFromEvent: e => {
+                    if (Array.isArray(e)) {
+                      return e;
                     }
-                    return f;
-                  });
-                }
-              } : {}), {}, {
+                    return e && e.fileList && e.fileList.map(f => {
+                      if (f.response) {
+                        return f.response;
+                      }
+                      return f;
+                    });
+                  }
+                } : {}),
                 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: getInputLabel(input, values),
                 rules: rules,
-                className: input.comment ? "with-comment i-".concat(input.type) : "i-".concat(input.type),
+                className: input.comment ? `with-comment i-${input.type}` : `i-${input.type}`,
                 extra: input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   disabled: inputData.props.disabled,
                   type: "link",
                   onClick: () => {
                     const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-                    inputValues["".concat(inputData.inputName, "Comment")] = !inputData.commentValue ? '' : undefined;
+                    inputValues[`${inputData.inputName}Comment`] = !inputData.commentValue ? '' : undefined;
                     if (Array.isArray(values[formId])) {
                       values[formId] = inputValues;
                     } else {
                       values[formId] = inputValues;
                     }
-                    setValues(_objectSpread2({}, values));
+                    setValues({
+                      ...values
+                    });
                   },
                   children: t(!inputData.commentValue ? 'Add Comment' : 'Remove Comment')
                 }) : null,
@@ -42101,9 +42065,9 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
                   getAppHeader,
                   getApiBaseUrl
                 }) : console.log(input)
-              })), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                name: [formId, "".concat(inputData.inputName, "Comment")],
-                fieldKey: [formId, "".concat(inputData.inputName, "Comment")],
+              }), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                name: [formId, `${inputData.inputName}Comment`],
+                fieldKey: [formId, `${inputData.inputName}Comment`],
                 initialValue: inputData.commentValue,
                 hidden: !inputData.commentValue,
                 children: inputTypeComponent.comment(inputData, {
@@ -42117,7 +42081,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
               }) : null]
             })]
           }, ii)
-        }, "".concat(i).concat(ii)) : null;
+        }, `${i}${ii}`) : null;
       })
     })]
   });
@@ -42156,7 +42120,10 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
+      setValues(prevValues => ({
+        ...prevValues,
+        ...resolvedValues
+      }));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);
@@ -53044,9 +53011,8 @@ class AdminService extends BaseService {
     subject,
     id
   }) {
-    const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiDelete({
-      url: `/management/subject/${type}/${id}`
+      url: `/management/subject/${subject}/${id}`
     });
   }
   async getUserGrowth(activeFilter) {
@@ -54152,14 +54118,23 @@ const useGetParams = ({
     location
   });
   const cleanSearchParams = Object.fromEntries(Object.entries(searchParams).filter(([_, value]) => value != null && value !== ''));
-  const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+  const hasPagination = paginationQuery?.skip != null || paginationQuery?.take != null;
   const {
     activeTab,
     ...rest
   } = otherParams;
+  console.log({
+    hasPagination
+  });
   const params = React.useMemo(() => {
     if (!hasPagination) {
-      return undefined;
+      return {
+        pagination: {
+          skip: 1,
+          take: 20
+        },
+        tab: 'active'
+      };
     }
     return {
       pagination: paginationQuery,
@@ -54169,7 +54144,7 @@ const useGetParams = ({
       }),
       tab: activeTab
     };
-  }, [location.search, hasPagination, paginationQuery, rest, cleanSearchParams, activeTab]);
+  }, [location.search]);
   return params;
 };
 function useSubjectsAdminTable({
@@ -54188,6 +54163,9 @@ function useSubjectsAdminTable({
   const [initFetchDone, setInitFetchDone] = React.useState(false);
   const [loading, setLoading] = React.useState(false);
   const [data, setData] = React.useState([]);
+  const params = useGetParams({
+    location
+  });
   const filter = useFilters({
     goTo,
     location,
@@ -54208,7 +54186,9 @@ function useSubjectsAdminTable({
       setLoading(true);
       const {
         data
-      } = await getData();
+      } = await getData({
+        params
+      });
       setData(data.data || data || []);
       filter.setPagination(prev => ({
         ...prev,
@@ -54221,10 +54201,10 @@ function useSubjectsAdminTable({
     } catch (err) {
       console.log(err);
     }
-  }, [filter.activeFilters, refetchTrigger, location.search]);
+  }, [params]);
   React.useEffect(() => {
     fetchData();
-  }, [fetchData, refetchTrigger]);
+  }, [params, refetchTrigger]);
   return {
     filter,
     activeTab,
@@ -55833,14 +55813,6 @@ function LocationTable(_ref) {
     token
   } = useToken$4();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
-  const transformedParams = useGetParams({
-    location
-  });
-  const getDataWithStringPagination = async () => {
-    return getData({
-      params: transformedParams
-    });
-  };
   const {
     filter,
     activeTab,
@@ -55860,7 +55832,7 @@ function LocationTable(_ref) {
     defaultPageSize,
     filtersConfig: filtersConfig$b,
     getRedirectLink,
-    getData: getDataWithStringPagination,
+    getData: getData,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
@@ -56518,14 +56490,6 @@ function SubjectsTable(_ref) {
     token
   } = useToken$2();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
-  const transformedParams = useGetParams({
-    location
-  });
-  const getDataWithStringPagination = async () => {
-    return getData({
-      params: transformedParams
-    });
-  };
   const {
     filter,
     activeTab,
@@ -56545,7 +56509,7 @@ function SubjectsTable(_ref) {
     defaultPageSize,
     filtersConfig: filtersConfig$a,
     getRedirectLink,
-    getData: getDataWithStringPagination,
+    getData: getData,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
@@ -58809,14 +58773,6 @@ function DocumentsTable({
   const {
     token
   } = useToken$1();
-  const transformedParams = useGetParams({
-    location
-  });
-  const getDataWithStringPagination = async () => {
-    return getData({
-      params: transformedParams
-    });
-  };
   const {
     filter,
     activeTab,
@@ -58836,16 +58792,12 @@ function DocumentsTable({
     defaultPageSize,
     filtersConfig: filtersConfig$8,
     getRedirectLink,
-    getData: getDataWithStringPagination,
+    getData: getData,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
-    return {
-      category: config.options?.category,
-      country: config.options?.countries,
-      sources: []
-    };
-  }, [config.options]);
+    return options;
+  }, [options]);
   const columns = React.useMemo(() => {
     return getColumns$1({
       t,
@@ -59095,7 +59047,7 @@ const getColumns = ({
         value: item.value,
         label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
       }));
-      const type = findOptions(value, options?.eventsType || []) || "-";
+      const type = (value === 'other' ? t(value) : findOptions(value, options?.eventsType || [])) || "-";
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: type,
         children: type
@@ -59185,14 +59137,6 @@ function EventsTable({
   const {
     token
   } = useToken();
-  const transformedParams = useGetParams({
-    location
-  });
-  const getDataWithStringPagination = async () => {
-    return getData({
-      params: transformedParams
-    });
-  };
   const {
     filter,
     activeTab,
@@ -59212,7 +59156,7 @@ function EventsTable({
     defaultPageSize,
     filtersConfig: filtersConfig$7,
     getRedirectLink,
-    getData: getDataWithStringPagination,
+    getData: getData,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {