datastake-daf 0.6.823 → 0.6.824

package/dist/components/index.js

@@ -185,6 +185,16 @@ const findOptions = (value, options) => {
   return value;
 };
 const isEmptyOrSpaces = str => typeof str === 'string' ? str === null || str.match(/^ *$/) !== null : true;
+const safeJsonParse = function (value) {
+  let fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : value;
+  if (typeof value !== 'string') return value;
+  try {
+    return JSON.parse(value);
+  } catch (_unused) {
+    console.warn('Failed to parse JSON:', value);
+    return fallback;
+  }
+};
 const cleanJSON = json => {
   for (let key in json) {
     if (json[key] === undefined) {
@@ -4817,7 +4827,7 @@ const config$2 = {
   AddDocument: config$3
 };
 
-const _excluded$G = ["width", "height", "size", "name", "fill"];
+const _excluded$E = ["width", "height", "size", "name", "fill"];
 const CustomIcon = _ref => {
   let {
       width = 14,
@@ -4826,7 +4836,7 @@ const CustomIcon = _ref => {
       name = "",
       fill = "none"
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$G);
+    props = _objectWithoutProperties(_ref, _excluded$E);
   const conf = config$2[name];
   if (conf) {
     return /*#__PURE__*/jsxRuntime.jsx("svg", _objectSpread2(_objectSpread2({}, props), {}, {
@@ -5115,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$F = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$D = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
 dayjs__default["default"].extend(customParseFormat);
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(utc);
@@ -5491,7 +5501,7 @@ const filterCreateData = data => {
       createdAt,
       updatedAt
     } = data,
-    rest = _objectWithoutProperties(data, _excluded$F);
+    rest = _objectWithoutProperties(data, _excluded$D);
   const _meta = isObjectEmpty(meta) ? undefined : meta;
   return _objectSpread2(_objectSpread2({}, rest), {}, {
     meta: _meta
@@ -6023,7 +6033,7 @@ SelectFilters.propTypes = {
   apiUrl: PropTypes__default["default"].string
 };
 
-const _excluded$E = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
+const _excluded$C = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -6054,7 +6064,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$E);
+    rest = _objectWithoutProperties(_ref, _excluded$C);
   const source = React.useMemo(() => {
     if (data && Array.isArray(data)) {
       return data;
@@ -6113,7 +6123,7 @@ function DAFTable(_ref) {
 
   const paginationPageSize = pagination === null || pagination === void 0 ? void 0 : pagination.pageSize;
   const dataSource = React.useMemo(() => {
-    const pageSize = paginationPageSize ? paginationPageSize : source.length > 10 ? source.length : 10;
+    const pageSize = paginationPageSize ? paginationPageSize : (source === null || source === void 0 ? void 0 : source.length) > 10 ? source === null || source === void 0 ? void 0 : source.length : 10;
     if (doEmptyRows && pageSize) {
       const emptyDataSource = [];
       for (let i = 0; i < pageSize; i++) {
@@ -6879,7 +6889,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$h;
-const _excluded$D = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$B = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
 function StickyTable(_ref) {
   let {
       size = "small",
@@ -6890,7 +6900,7 @@ function StickyTable(_ref) {
       pagination = false,
       doEmptyRows = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$D);
+    props = _objectWithoutProperties(_ref, _excluded$B);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7418,7 +7428,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$C = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$A = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7432,7 +7442,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$C);
+    restProps = _objectWithoutProperties(_ref, _excluded$A);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7551,12 +7561,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$B = ["children"];
+const _excluded$z = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$B);
+    props = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7696,12 +7706,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$A = ["icon"];
+const _excluded$y = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$A);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -8031,7 +8041,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$z = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$x = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$p
 } = antd.theme;
@@ -8124,7 +8134,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$z);
+    restProps = _objectWithoutProperties(_ref, _excluded$x);
   const {
     token
   } = useToken$p();
@@ -8844,7 +8854,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$y = ["tabs", "onChange", "value", "className"];
+const _excluded$w = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8852,7 +8862,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$y);
+    rest = _objectWithoutProperties(_ref, _excluded$w);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8949,7 +8959,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$x = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$v = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8984,7 +8994,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$x);
+              restProps = _objectWithoutProperties(button, _excluded$v);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -11865,7 +11875,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$w = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$u = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11876,7 +11886,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$w);
+    props = _objectWithoutProperties(_ref, _excluded$u);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11936,7 +11946,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$e;
-const _excluded$v = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$t = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11948,7 +11958,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$v);
+    rest = _objectWithoutProperties(_ref, _excluded$t);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -15679,7 +15689,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$u = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$s = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15693,7 +15703,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$u);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17893,14 +17903,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$t = ["config", "title", "loading"];
+const _excluded$r = ["config", "title", "loading"];
 const Details = _ref => {
   let {
       config = [],
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$t);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header card",
     loading: loading,
@@ -17916,14 +17926,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$s = ["config", "title", "loading"];
+const _excluded$q = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$s);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17953,7 +17963,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$r = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$p = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17961,7 +17971,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -18137,14 +18147,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$c;
-const _excluded$q = ["title", "activeSdgGoals", "t"];
+const _excluded$o = ["title", "activeSdgGoals", "t"];
 function SDGWidget(_ref) {
   let {
       title = "Sustainable Development Goals",
       activeSdgGoals = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$q);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18442,7 +18452,7 @@ function SdgList({
   });
 }
 
-const _excluded$p = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$n = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18462,7 +18472,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$p);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18734,13 +18744,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$o = ["title", "children"];
+const _excluded$m = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$o);
+    rest = _objectWithoutProperties(_ref, _excluded$m);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18904,7 +18914,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$n = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$l = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18919,7 +18929,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$n);
+    rest = _objectWithoutProperties(_ref, _excluded$l);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -19288,7 +19298,7 @@ const getVegetationConfig = () => {
 };
 
 var _templateObject$a, _templateObject2$3;
-const _excluded$m = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
+const _excluded$k = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
 function VegetationWidget(_ref) {
   let {
       title = "Vegetation Health",
@@ -19300,7 +19310,7 @@ function VegetationWidget(_ref) {
       growthObservations = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   let vegetationConfig = getVegetationConfig();
   const allVegetationKeys = vegetationConfig.map(item => item.key);
   if (filterKeys && Array.isArray(filterKeys)) {
@@ -19416,7 +19426,7 @@ const getFaunaConfig = () => {
 };
 
 var _templateObject$9, _templateObject2$2;
-const _excluded$l = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$j = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function FaunaWidget(_ref) {
   let {
       title = "Observed Fauna",
@@ -19427,7 +19437,7 @@ function FaunaWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$l);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   let faunaConfig = getFaunaConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -19492,7 +19502,7 @@ const getInvasiveSpeciesConfig = () => {
 };
 
 var _templateObject$8, _templateObject2$1;
-const _excluded$k = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$i = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function InvasiveSpeciesWidget(_ref) {
   let {
       title = "Invasive Species",
@@ -19504,7 +19514,7 @@ function InvasiveSpeciesWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$k);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   let invasiveSpeciesConfig = getInvasiveSpeciesConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -24927,7 +24937,7 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$j = ["viewGroup"],
+const _excluded$h = ["viewGroup"],
   _excluded2$1 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
@@ -24999,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$j);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$h);
         items[gKey] = gCfg;
       }
       return items;
@@ -25286,7 +25296,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$i = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$g = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -25302,7 +25312,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$i);
+    props = _objectWithoutProperties(_ref, _excluded$g);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -30794,6 +30804,7 @@ function Repeatable({
   });
 }
 
+/* eslint-disable no-eval */
 const isRiskComment = inputData => {
   if (inputData) {
     if (inputData.name === 'assessment') {
@@ -30806,10 +30817,7 @@ const isRiskComment = inputData => {
 };
 
 // options, k, setValues, values, excludedKeys, i, formTitles, getData, MainForm, plainForms, setAddress, onValuesChange, data, allData, changeLinking, changeInputMeta, t, highlightMandatory
-function renderNestedInputs$1(options, k) {
-  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-    args[_key - 2] = arguments[_key];
-  }
+function renderNestedInputs$1(options, k, ...args) {
   if (options[k].repeatable) {
     return renderRepeatable$1(options, k, ...args);
   } else {
@@ -30837,11 +30845,10 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
     children: [getFormTitles$1(formTitles, formId, i), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(form.type) ? getInputHeadLines$1(form.type, i, form, values) : /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
       children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: formId,
-        children: (fields, _ref) => {
-          let {
-            add,
-            remove
-          } = _ref;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           const formData = form.repeatable ? values[formId] || [] : values[formId] ? [values[formId]] : [];
           if (fields.length === 0) {
             const formInputs = form.inputs;
@@ -30891,10 +30898,14 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
             const _val = {
               [formId]: formData.map((d, j) => i === j ? val : d)
             };
-            onValuesChange(_val, _objectSpread2(_objectSpread2({}, values), _val));
-            setValues(_objectSpread2(_objectSpread2({}, values), {}, {
+            onValuesChange(_val, {
+              ...values,
+              ..._val
+            });
+            setValues({
+              ...values,
               [formId]: formData.map((d, j) => i === j ? val : d)
-            }));
+            });
           };
           return /*#__PURE__*/jsxRuntime.jsx(Repeatable, {
             form: form,
@@ -30950,156 +30961,154 @@ const getGroupContent = (form, values, i, formId, excludedKeys, getData, setValu
     highlightMandatory
   });
 };
-const GroupContent = _ref2 => {
-  var _form$meta;
-  let {
-    form,
-    values = {},
-    i,
-    formId,
-    excludedKeys,
-    getData,
-    setValues,
-    MainForm,
-    options,
-    plainForms,
-    setAddress,
-    onValuesChange,
-    allData,
-    changeInputMeta,
-    highlightMandatory
-  } = _ref2;
+const GroupContent = ({
+  form,
+  values = {},
+  i,
+  formId,
+  excludedKeys,
+  getData,
+  setValues,
+  MainForm,
+  options,
+  plainForms,
+  setAddress,
+  onValuesChange,
+  allData,
+  changeInputMeta,
+  highlightMandatory
+}) => {
   const {
     user,
     t
   } = useEditContext();
   const label = getInputLabel$1(form, values);
-  const notPartOfTheForm = (form === null || form === void 0 ? void 0 : form.type) === 'ajaxSubGroup' ? true : !!(form !== null && form !== void 0 && (_form$meta = form.meta) !== null && _form$meta !== void 0 && _form$meta.isSubGroup);
+  const notPartOfTheForm = form?.type === 'ajaxSubGroup' ? true : !!form?.meta?.isSubGroup;
   const hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   const formValues = values[form.dataId];
-  const renderInputs = () => {
-    var _form$meta2;
-    return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [form !== null && form !== void 0 && (_form$meta2 = form.meta) !== null && _form$meta2 !== void 0 && _form$meta2.groupInfo ? /*#__PURE__*/jsxRuntime.jsx(GroupInfos, {
-        config: form.meta.groupInfo,
-        user: user,
-        t: t
-      }) : null, Object.keys(form.inputs || {}).filter(i => !excludedKeys.includes(i)).map((inp, ii) => {
-        var _ref3, _values$meta, _values$meta2, _input$meta, _inputData$rules, _input$meta2;
-        const isAjaxSubGroup = (form === null || form === void 0 ? void 0 : form.type) === "ajaxSubGroup";
-        const input = form.inputs[inp];
-        const inputId = input.dataId || inp;
-        const inputValues = notPartOfTheForm ? Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {} : values;
-        const value = inputValues[inputId];
-        const commentValue = inputValues["".concat(inputId, "Comment")];
-        const inputData = getData(formId, input, value, commentValue, "".concat(formId, ".").concat(inputId), "".concat(formId, ".").concat(inputId));
-        const subtitles = form.subtitles || null;
-        const inputMeta = notPartOfTheForm ? isAjaxSubGroup ? ((_ref3 = values[formId] || {}) === null || _ref3 === void 0 || (_ref3 = _ref3.meta) === null || _ref3 === void 0 || (_ref3 = _ref3.inputs) === null || _ref3 === void 0 ? void 0 : _ref3[inputId]) || {} : (((values === null || values === void 0 || (_values$meta = values.meta) === null || _values$meta === void 0 ? void 0 : _values$meta.inputs) || {})[formId] || {})[inputId] || {} : ((values === null || values === void 0 || (_values$meta2 = values.meta) === null || _values$meta2 === void 0 ? void 0 : _values$meta2.inputs) || {})[inputId] || {};
-        inputData.repeatIndex = undefined;
-        inputData.inputName = inputId;
-        inputData.repeatValues = inputValues;
-        if (inputData.groupInputs && Array.isArray(inputData.groupInputs)) {
-          inputData.groupInputs = inputData.groupInputs.map(gpI => {
-            gpI.data.inputName = gpI.data.name;
-            gpI.data.repeatIndex = undefined;
-            gpI.data.name = formId;
-            return gpI;
+  const renderInputs = () => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [form?.meta?.groupInfo ? /*#__PURE__*/jsxRuntime.jsx(GroupInfos, {
+      config: form.meta.groupInfo,
+      user: user,
+      t: t
+    }) : null, Object.keys(form.inputs || {}).filter(i => !excludedKeys.includes(i)).map((inp, ii) => {
+      const isAjaxSubGroup = form?.type === "ajaxSubGroup";
+      const input = form.inputs[inp];
+      const inputId = input.dataId || inp;
+      const inputValues = notPartOfTheForm ? Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {} : values;
+      const value = inputValues[inputId];
+      const commentValue = inputValues[`${inputId}Comment`];
+      const inputData = getData(formId, input, value, commentValue, `${formId}.${inputId}`, `${formId}.${inputId}`);
+      const subtitles = form.subtitles || null;
+      const inputMeta = notPartOfTheForm ? isAjaxSubGroup ? (values[formId] || {})?.meta?.inputs?.[inputId] || {} : ((values?.meta?.inputs || {})[formId] || {})[inputId] || {} : (values?.meta?.inputs || {})[inputId] || {};
+      inputData.repeatIndex = undefined;
+      inputData.inputName = inputId;
+      inputData.repeatValues = inputValues;
+      if (inputData.groupInputs && Array.isArray(inputData.groupInputs)) {
+        inputData.groupInputs = inputData.groupInputs.map(gpI => {
+          gpI.data.inputName = gpI.data.name;
+          gpI.data.repeatIndex = undefined;
+          gpI.data.name = formId;
+          return gpI;
+        });
+      }
+      const isRisk = isRiskComment(inputData);
+      const isHighlighted = highlightMandatory && input?.meta?.mandatory && inputIsEmpty(input, inputValues, inputMeta);
+      const btnOnClick = () => {
+        if (typeof inputData.commentValue === 'string') {
+          onValuesChange({}, {
+            ...values,
+            [`${inputData.inputName}`]: null
           });
         }
-        const isRisk = isRiskComment(inputData);
-        const isHighlighted = highlightMandatory && (input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.mandatory) && inputIsEmpty(input, inputValues, inputMeta);
-        const btnOnClick = () => {
-          if (typeof inputData.commentValue === 'string') {
-            onValuesChange({}, _objectSpread2(_objectSpread2({}, values), {}, {
-              ["".concat(inputData.inputName)]: null
-            }));
-          }
+        const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
+        inputValues[`${inputData.inputName}Comment`] = typeof inputData.commentValue !== 'string' ? '' : null;
+        if (Array.isArray(values[formId])) {
+          values[formId] = inputValues;
+        } else {
+          values[formId] = inputValues;
+        }
+        setValues({
+          ...values
+        });
+      };
+      const btnOnClick2 = () => {
+        if (typeof inputData.commentValue !== 'string') {
           const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-          inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
+          inputValues[`${inputData.inputName}Comment`] = typeof inputData.commentValue !== 'string' ? '' : null;
           if (Array.isArray(values[formId])) {
             values[formId] = inputValues;
           } else {
             values[formId] = inputValues;
           }
-          setValues(_objectSpread2({}, values));
-        };
-        const btnOnClick2 = () => {
-          if (typeof inputData.commentValue !== 'string') {
-            const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-            inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
-            if (Array.isArray(values[formId])) {
-              values[formId] = inputValues;
-            } else {
-              values[formId] = inputValues;
-            }
-            setValues(_objectSpread2({}, values));
-          }
-        };
-        const rules = inputData !== null && inputData !== void 0 && (_inputData$rules = inputData.rules) !== null && _inputData$rules !== void 0 && _inputData$rules.length ? inputData.rules.filter(rule => !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max')) : ((input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.rules) || []).filter(rule => {
-          if (rule.metaIf && typeof rule.metaIf === 'string') {
-            var _values$meta3, _values$meta4;
-            const [name, cond, value] = rule.metaIf.split(' ');
-            const val = name.includes('./') ? values === null || values === void 0 || (_values$meta3 = values.meta) === null || _values$meta3 === void 0 || (_values$meta3 = _values$meta3.inputs) === null || _values$meta3 === void 0 || (_values$meta3 = _values$meta3[formId]) === null || _values$meta3 === void 0 ? void 0 : _values$meta3[name.split('./')[1]] : values === null || values === void 0 || (_values$meta4 = values.meta) === null || _values$meta4 === void 0 || (_values$meta4 = _values$meta4.inputs) === null || _values$meta4 === void 0 ? void 0 : _values$meta4[name.split('./')[1]];
-            if (cond === 'is') {
-              return !!(val !== null && val !== void 0 && val[value]);
-            }
-          }
-          return !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max');
-        });
-        const requiredRule = rules.find(r => r.required);
-        if (requiredRule && input.type === 'text') {
-          rules.push({
-            whitespace: true,
-            message: requiredRule.message || ''
+          setValues({
+            ...values
           });
         }
-        return showHideInput$1(input, values, undefined, inputValues, setValues) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
-          children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-            style: {
-              position: 'relative'
-            },
-            children: [getSubtitles$1(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines$1(input.type, i, input, values) : isRisk ? /*#__PURE__*/jsxRuntime.jsx(RiskGroup, {
-              input: input,
-              inputTypeComponent: inputTypeComponent$1,
-              inputData: inputData,
-              MainForm: MainForm,
-              options: options,
-              setValues: setValues,
-              formId: formId,
-              inputId: inputId,
-              inputOnBlur: inputOnBlur,
-              values: values,
-              getInputLabel: getInputLabel$1,
-              plainForms: plainForms,
-              setAddress: setAddress,
-              btnOnClick: btnOnClick,
-              btnOnClick2: btnOnClick2,
-              locationName: (allData || {}).locationName,
-              subGroupTitle: (allData || {}).subGroupTitle
-            }) : /*#__PURE__*/jsxRuntime.jsx(GroupContentFormItem, {
-              values,
-              formId,
-              setValues,
-              MainForm,
-              options,
-              plainForms,
-              setAddress,
-              inputData,
-              inputId,
-              input,
-              rules,
-              inputMeta,
-              changeInputMeta,
-              notPartOfTheForm,
-              isAjaxSubGroup,
-              isHighlighted
-            })]
-          }, ii)
-        }, "".concat(i).concat(ii)) : null;
-      })]
-    });
-  };
-  const isNa = (formValues === null || formValues === void 0 ? void 0 : formValues.valuation) === 'na';
+      };
+      const rules = inputData?.rules?.length ? inputData.rules.filter(rule => !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max')) : (input?.meta?.rules || []).filter(rule => {
+        if (rule.metaIf && typeof rule.metaIf === 'string') {
+          const [name, cond, value] = rule.metaIf.split(' ');
+          const val = name.includes('./') ? values?.meta?.inputs?.[formId]?.[name.split('./')[1]] : values?.meta?.inputs?.[name.split('./')[1]];
+          if (cond === 'is') {
+            return !!val?.[value];
+          }
+        }
+        return !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max');
+      });
+      const requiredRule = rules.find(r => r.required);
+      if (requiredRule && input.type === 'text') {
+        rules.push({
+          whitespace: true,
+          message: requiredRule.message || ''
+        });
+      }
+      return showHideInput$1(input, values, undefined, inputValues, setValues) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+        children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+          style: {
+            position: 'relative'
+          },
+          children: [getSubtitles$1(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines$1(input.type, i, input, values) : isRisk ? /*#__PURE__*/jsxRuntime.jsx(RiskGroup, {
+            input: input,
+            inputTypeComponent: inputTypeComponent$1,
+            inputData: inputData,
+            MainForm: MainForm,
+            options: options,
+            setValues: setValues,
+            formId: formId,
+            inputId: inputId,
+            inputOnBlur: inputOnBlur,
+            values: values,
+            getInputLabel: getInputLabel$1,
+            plainForms: plainForms,
+            setAddress: setAddress,
+            btnOnClick: btnOnClick,
+            btnOnClick2: btnOnClick2,
+            locationName: (allData || {}).locationName,
+            subGroupTitle: (allData || {}).subGroupTitle
+          }) : /*#__PURE__*/jsxRuntime.jsx(GroupContentFormItem, {
+            values,
+            formId,
+            setValues,
+            MainForm,
+            options,
+            plainForms,
+            setAddress,
+            inputData,
+            inputId,
+            input,
+            rules,
+            inputMeta,
+            changeInputMeta,
+            notPartOfTheForm,
+            isAjaxSubGroup,
+            isHighlighted
+          })]
+        }, ii)
+      }, `${i}${ii}`) : null;
+    })]
+  });
+  const isNa = formValues?.valuation === 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? options.isRisk && options.dontShowTitle ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "risk-header",
@@ -31107,46 +31116,44 @@ const GroupContent = _ref2 => {
         children: label
       })
     }) : /*#__PURE__*/jsxRuntime.jsx("h3", {
-      className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " ").concat(i ? 'mt-3 mb-1' : ''),
+      className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} ${i ? 'mt-3 mb-1' : ''}`,
       children: label
     }) : null, /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "repeatable ".concat(hasLabel ? "mb-4" : ""),
+      className: `repeatable ${hasLabel ? "mb-4" : ""}`,
       children: [form.titleLabel ? /*#__PURE__*/jsxRuntime.jsx("label", {
         children: getInputProp(form.titleLabel, values)
-      }) : null, formValues !== null && formValues !== void 0 && formValues.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
+      }) : null, formValues?.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
         t: t,
         isNa: isNa,
         isSuccess: !isNa
         // TODO: translate
         ,
         config: {
-          title: t("No ".concat((formValues === null || formValues === void 0 ? void 0 : formValues.stage) || 'planning', " required"))
+          title: t(`No ${formValues?.stage || 'planning'} required`)
         },
         children: renderInputs()
       }) : renderInputs()]
     })]
   });
 };
-const GroupContentFormItem = _ref4 => {
-  var _rules$find, _inputMeta$reviews, _input$meta3, _values$formId, _input$meta4, _input$meta7, _input$meta8, _input$meta9, _values$meta10, _values$meta11, _values$parent, _input$meta10, _input$meta11, _inputData$value, _input$meta12, _input$meta13, _inputMeta$comment, _lastReview$comment, _lastReview$reviewer, _lastReview$reviewer2;
-  let {
-    values,
-    formId,
-    setValues,
-    MainForm,
-    options,
-    plainForms,
-    setAddress,
-    inputData,
-    inputId,
-    input,
-    rules,
-    inputMeta,
-    changeInputMeta,
-    notPartOfTheForm = true,
-    isAjaxSubGroup,
-    isHighlighted
-  } = _ref4;
+const GroupContentFormItem = ({
+  values,
+  formId,
+  setValues,
+  MainForm,
+  options,
+  plainForms,
+  setAddress,
+  inputData,
+  inputId,
+  input,
+  rules,
+  inputMeta,
+  changeInputMeta,
+  notPartOfTheForm = true,
+  isAjaxSubGroup,
+  isHighlighted
+}) => {
   const {
     t,
     user,
@@ -31160,10 +31167,10 @@ const GroupContentFormItem = _ref4 => {
     staticWidth,
     fullWidth
   } = useEditContext();
-  const [isShown, setIsShown] = React.useState(!!(inputMeta !== null && inputMeta !== void 0 && inputMeta.comment));
-  let maxRule = (_rules$find = rules.find(rule => rule.max)) === null || _rules$find === void 0 ? void 0 : _rules$find.max;
+  const [isShown, setIsShown] = React.useState(!!inputMeta?.comment);
+  let maxRule = rules.find(rule => rule.max)?.max;
   const requiredRule = rules.find(r => r.required);
-  const lastReview = ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || [])[((inputMeta === null || inputMeta === void 0 || (_inputMeta$reviews = inputMeta.reviews) === null || _inputMeta$reviews === void 0 ? void 0 : _inputMeta$reviews.length) || 0) - 1];
+  const lastReview = (inputMeta?.reviews || [])[(inputMeta?.reviews?.length || 0) - 1];
   if (!maxRule && input.type === 'textarea') {
     maxRule = MAX_TEXT_AREA_LENGTH;
   }
@@ -31182,35 +31189,38 @@ const GroupContentFormItem = _ref4 => {
     }
     setIsShown(true);
     if (notPartOfTheForm || isAjaxSubGroup) {
-      var _values$meta5;
-      const _defaultMeta = ((values === null || values === void 0 || (_values$meta5 = values.meta) === null || _values$meta5 === void 0 ? void 0 : _values$meta5.inputs) || {})[formId] || {};
+      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
-        var _defaultData$meta, _defaultData$meta2;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+            [formId]: {
+              ..._defaultData,
               meta: {
-                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta = _defaultData.meta) === null || _defaultData$meta === void 0 ? void 0 : _defaultData$meta.inputs) || {}), {}, {
-                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta2 = _defaultData.meta) === null || _defaultData$meta2 === void 0 ? void 0 : _defaultData$meta2.inputs) || {})[inputId] || {}), {}, {
+                inputs: {
+                  ...(_defaultData?.meta?.inputs || {}),
+                  [inputId]: {
+                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
                     comment: ''
-                  })
-                })
+                  }
+                }
               }
-            })
+            }
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+          value: {
+            ..._defaultMeta,
+            [inputId]: {
+              ...(_defaultMeta[inputId] || {}),
               comment: ''
-            })
-          })
+            }
+          }
         });
       }
     } else {
@@ -31227,58 +31237,62 @@ const GroupContentFormItem = _ref4 => {
     if (!isReview) {
       return;
     }
-    const reviewSuccess = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess;
+    const reviewSuccess = lastReview?.reviewSuccess;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      var _values$meta6;
-      const _defaultMeta = ((values === null || values === void 0 || (_values$meta6 = values.meta) === null || _values$meta6 === void 0 ? void 0 : _values$meta6.inputs) || {})[formId] || {};
+      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
-        var _defaultData$meta3, _defaultData$meta4, _defaultData$meta5, _defaultData$meta6;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+            [formId]: {
+              ..._defaultData,
               meta: {
-                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta3 = _defaultData.meta) === null || _defaultData$meta3 === void 0 ? void 0 : _defaultData$meta3.inputs) || {}), {}, {
-                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta4 = _defaultData.meta) === null || _defaultData$meta4 === void 0 ? void 0 : _defaultData$meta4.inputs) || {})[inputId] || {}), {}, {
-                    reviews: reviewSuccess ? ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta5 = _defaultData.meta) === null || _defaultData$meta5 === void 0 ? void 0 : _defaultData$meta5.inputs) || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta6 = _defaultData.meta) === null || _defaultData$meta6 === void 0 ? void 0 : _defaultData$meta6.inputs) || {})[inputId] || {}).reviews || []), {
+                inputs: {
+                  ...(_defaultData?.meta?.inputs || {}),
+                  [inputId]: {
+                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                    reviews: reviewSuccess ? (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewSuccess: true
                     }]
-                  })
-                })
+                  }
+                }
               }
-            })
+            }
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+          value: {
+            ..._defaultMeta,
+            [inputId]: {
+              ...(_defaultMeta[inputId] || {}),
               reviews: reviewSuccess ? ((_defaultMeta[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((_defaultMeta[inputId] || {}).reviews || []), {
                 reviewer: user,
                 createdAt: new Date().toISOString(),
                 reviewSuccess: true
               }]
-            })
-          })
+            }
+          }
         });
       }
     } else {
       changeInputMeta({
         key: inputId,
         type: input.type,
-        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+        value: {
+          ...inputMeta,
           reviews: reviewSuccess ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewSuccess: true
           }]
-        })
+        }
       });
     }
   };
@@ -31286,111 +31300,118 @@ const GroupContentFormItem = _ref4 => {
     if (!isReview) {
       return;
     }
-    const reviewError = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError;
+    const reviewError = lastReview?.reviewError;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      var _values$meta7;
-      const _defaultMeta = ((values === null || values === void 0 || (_values$meta7 = values.meta) === null || _values$meta7 === void 0 ? void 0 : _values$meta7.inputs) || {})[formId] || {};
+      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
-        var _defaultData$meta7, _defaultData$meta8, _defaultData$meta9, _defaultData$meta10;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+            [formId]: {
+              ..._defaultData,
               meta: {
-                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta7 = _defaultData.meta) === null || _defaultData$meta7 === void 0 ? void 0 : _defaultData$meta7.inputs) || {}), {}, {
-                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta8 = _defaultData.meta) === null || _defaultData$meta8 === void 0 ? void 0 : _defaultData$meta8.inputs) || {})[inputId] || {}), {}, {
-                    reviews: reviewError ? ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta9 = _defaultData.meta) === null || _defaultData$meta9 === void 0 ? void 0 : _defaultData$meta9.inputs) || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta10 = _defaultData.meta) === null || _defaultData$meta10 === void 0 ? void 0 : _defaultData$meta10.inputs) || {})[inputId] || {}).reviews || []), {
+                inputs: {
+                  ...(_defaultData?.meta?.inputs || {}),
+                  [inputId]: {
+                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                    reviews: reviewError ? (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewError: true,
                       comment: ''
                     }]
-                  })
-                })
+                  }
+                }
               }
-            })
+            }
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+          value: {
+            ..._defaultMeta,
+            [inputId]: {
+              ...(_defaultMeta[inputId] || {}),
               reviews: reviewError ? ((_defaultMeta[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((_defaultMeta[inputId] || {}).reviews || []), {
                 reviewer: user,
                 createdAt: new Date().toISOString(),
                 reviewError: true,
                 comment: ''
               }]
-            })
-          })
+            }
+          }
         });
       }
     } else {
       changeInputMeta({
         key: inputId,
         type: input.type,
-        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+        value: {
+          ...inputMeta,
           reviews: reviewError ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewError: true,
             comment: ''
           }]
-        })
+        }
       });
     }
   };
-  const requiredComment = (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.notApplicable) && (input === null || input === void 0 || (_input$meta3 = input.meta) === null || _input$meta3 === void 0 ? void 0 : _input$meta3.requiredCommentOnNotApplicable) && (values === null || values === void 0 || (_values$formId = values[formId]) === null || _values$formId === void 0 ? void 0 : _values$formId.valuation) !== 'na';
+  const requiredComment = inputMeta?.notApplicable && input?.meta?.requiredCommentOnNotApplicable && values?.[formId]?.valuation !== 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex input-cont",
-      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-        required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-      }, ['total100', 'group'].includes(input.type) ? {} : {
-        name: notPartOfTheForm ? [formId, inputId] : inputId,
-        fieldKey: notPartOfTheForm ? [formId, inputId] : inputId,
-        initialValue: notPartOfTheForm ? (values[formId] || {})[inputId] : values[inputId]
-      }), ['upload', 'imageUpload', 'videoUpload'].includes(input.type) ? {
-        valuePropName: "fileList",
-        getValueFromEvent: e => {
-          if (Array.isArray(e)) {
-            return e;
-          }
-          return e && e.fileList && e.fileList.map(f => {
-            if (f.response) {
-              return f.response;
+      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+        ...(['total100', 'group'].includes(input.type) ? {} : {
+          name: notPartOfTheForm ? [formId, inputId] : inputId,
+          fieldKey: notPartOfTheForm ? [formId, inputId] : inputId,
+          initialValue: notPartOfTheForm ? (values[formId] || {})[inputId] : values[inputId]
+        }),
+        ...(['upload', 'imageUpload', 'videoUpload'].includes(input.type) ? {
+          valuePropName: "fileList",
+          getValueFromEvent: e => {
+            if (Array.isArray(e)) {
+              return e;
             }
-            return f;
-          });
-        }
-      } : {}), inputOnBlur.includes(input.type) ? {
-        trigger: "onBlur"
-      } : {}), {}, {
+            return e && e.fileList && e.fileList.map(f => {
+              if (f.response) {
+                return f.response;
+              }
+              return f;
+            });
+          }
+        } : {}),
+        ...(inputOnBlur.includes(input.type) ? {
+          trigger: "onBlur"
+        } : {}),
         style: input.showOnView === false ? {
           display: 'none'
-        } : {}
-      }, ['switch'].includes(input.type) ? {
-        labelCol: {
-          span: 20
-        },
-        style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-          display: 'none'
-        } : {}), {}, {
-          flexDirection: 'row',
-          justifyContent: 'space-between'
-        })
-      } : {}), {}, {
+        } : {},
+        ...(['switch'].includes(input.type) ? {
+          labelCol: {
+            span: 20
+          },
+          style: {
+            ...(input.showOnView === false ? {
+              display: 'none'
+            } : {}),
+            flexDirection: 'row',
+            justifyContent: 'space-between'
+          }
+        } : {}),
         label: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: (input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.code) && "mr-10",
+          className: input?.meta?.code && "mr-10",
           children: getInputLabel$1(input, values)
         }) : null,
         rules: rules,
-        className: formatClassname([input.comment ? "flex-1 with-comment i-".concat(input.type) : "i-".concat(input.type, " flex-1 "), noActionsInputs.includes(input.type) && 'no-actions-input']),
-        "data-id": "".concat(formId, ".").concat(inputId),
+        className: formatClassname([input.comment ? `flex-1 with-comment i-${input.type}` : `i-${input.type} flex-1 `, noActionsInputs.includes(input.type) && 'no-actions-input']),
+        "data-id": `${formId}.${inputId}`,
         extra: /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
           children: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: formatClassname(["ml-4 input-actions"]),
@@ -31400,7 +31421,7 @@ const GroupContentFormItem = _ref4 => {
                 title: t('Add review note'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                    className: formatClassname(["review-btn review-error-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError) && 'primary']),
+                    className: formatClassname(["review-btn review-error-btn", lastReview?.reviewError && 'primary']),
                     type: "link",
                     onClick: onClickReviewError,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -31416,7 +31437,7 @@ const GroupContentFormItem = _ref4 => {
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
                     type: "link",
                     onClick: onClickReviewSuccess,
-                    className: formatClassname(["review-btn review-success-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess) && 'primary']),
+                    className: formatClassname(["review-btn review-success-btn", lastReview?.reviewSuccess && 'primary']),
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "CheckSquare",
                       width: 16,
@@ -31433,59 +31454,65 @@ const GroupContentFormItem = _ref4 => {
                     className: formatClassname(["default p-0", inputMeta.notApplicable && 'primary']),
                     type: "link",
                     onClick: () => {
-                      var _input$meta5, _input$meta6;
                       const value = getDefaultInputValue(input);
-                      const commentMeta = input !== null && input !== void 0 && (_input$meta5 = input.meta) !== null && _input$meta5 !== void 0 && _input$meta5.requiredCommentOnNotApplicable ? {
+                      const commentMeta = input?.meta?.requiredCommentOnNotApplicable ? {
                         comment: ''
                       } : {};
-                      if (input !== null && input !== void 0 && (_input$meta6 = input.meta) !== null && _input$meta6 !== void 0 && _input$meta6.requiredCommentOnNotApplicable) {
+                      if (input?.meta?.requiredCommentOnNotApplicable) {
                         setIsShown(true);
                       }
                       if (notPartOfTheForm || isAjaxSubGroup) {
-                        var _values$meta8;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta8 = values.meta) === null || _values$meta8 === void 0 ? void 0 : _values$meta8.inputs) || {})[formId] || {};
+                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                         if (isAjaxSubGroup) {
-                          var _defaultData$meta11;
                           changeInputMeta({
                             key: formId,
                             type: input.type,
                             otherValues: {
-                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                              [formId]: {
+                                ..._defaultData,
                                 [inputId]: value,
                                 meta: {
-                                  inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta11 = _defaultData.meta) === null || _defaultData$meta11 === void 0 ? void 0 : _defaultData$meta11.inputs) || {}), {}, {
-                                    [inputId]: inputMeta.notApplicable ? _objectSpread2({
+                                  inputs: {
+                                    ...(_defaultData?.meta?.inputs || {}),
+                                    [inputId]: inputMeta.notApplicable ? {
                                       notApplicable: false,
-                                      notAvailable: false
-                                    }, commentMeta) : _objectSpread2({
+                                      notAvailable: false,
+                                      ...commentMeta
+                                    } : {
                                       notApplicable: true,
-                                      notAvailable: false
-                                    }, commentMeta)
-                                  })
+                                      notAvailable: false,
+                                      ...commentMeta
+                                    }
+                                  }
                                 }
-                              })
+                              }
                             }
                           });
                         } else {
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notApplicable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                              [inputId]: _objectSpread2({
+                            value: inputMeta.notApplicable ? {
+                              ..._defaultMeta,
+                              [inputId]: {
                                 notApplicable: false,
-                                notAvailable: false
-                              }, commentMeta)
-                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                              [inputId]: _objectSpread2({
+                                notAvailable: false,
+                                ...commentMeta
+                              }
+                            } : {
+                              ..._defaultMeta,
+                              [inputId]: {
                                 notApplicable: true,
-                                notAvailable: false
-                              }, commentMeta)
-                            }),
+                                notAvailable: false,
+                                ...commentMeta
+                              }
+                            },
                             otherValues: {
-                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                              [formId]: {
+                                ..._defaultData,
                                 [inputId]: value
-                              })
+                              }
                             }
                           });
                         }
@@ -31506,7 +31533,7 @@ const GroupContentFormItem = _ref4 => {
                         });
                       }
                     },
-                    disabled: !((_input$meta7 = input.meta) !== null && _input$meta7 !== void 0 && _input$meta7.notApplicable),
+                    disabled: !input.meta?.notApplicable,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "NotApplicable",
                       width: 16,
@@ -31520,24 +31547,24 @@ const GroupContentFormItem = _ref4 => {
                   children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     className: formatClassname(["default p-0", inputMeta.notAvailable && 'primary']),
                     type: "link",
-                    disabled: !((_input$meta8 = input.meta) !== null && _input$meta8 !== void 0 && _input$meta8.notAvailable),
+                    disabled: !input.meta?.notAvailable,
                     onClick: () => {
                       const value = getDefaultInputValue(input);
                       if (notPartOfTheForm || isAjaxSubGroup) {
-                        var _values$meta9;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta9 = values.meta) === null || _values$meta9 === void 0 ? void 0 : _values$meta9.inputs) || {})[formId] || {};
+                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                         if (isAjaxSubGroup) {
                           if (isAjaxSubGroup) {
-                            var _defaultData$meta12;
                             changeInputMeta({
                               key: formId,
                               type: input.type,
                               otherValues: {
-                                [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                                [formId]: {
+                                  ..._defaultData,
                                   [inputId]: value,
                                   meta: {
-                                    inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta12 = _defaultData.meta) === null || _defaultData$meta12 === void 0 ? void 0 : _defaultData$meta12.inputs) || {}), {}, {
+                                    inputs: {
+                                      ...(_defaultData?.meta?.inputs || {}),
                                       [inputId]: inputMeta.notAvailable ? {
                                         notApplicable: false,
                                         notAvailable: false
@@ -31545,9 +31572,9 @@ const GroupContentFormItem = _ref4 => {
                                         notApplicable: false,
                                         notAvailable: true
                                       }
-                                    })
+                                    }
                                   }
-                                })
+                                }
                               }
                             });
                           }
@@ -31555,21 +31582,24 @@ const GroupContentFormItem = _ref4 => {
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notAvailable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                            value: inputMeta.notAvailable ? {
+                              ..._defaultMeta,
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: false
                               }
-                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                            } : {
+                              ..._defaultMeta,
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: true
                               }
-                            }),
+                            },
                             otherValues: {
-                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                              [formId]: {
+                                ..._defaultData,
                                 [inputId]: value
-                              })
+                              }
                             }
                           });
                         }
@@ -31600,33 +31630,38 @@ const GroupContentFormItem = _ref4 => {
               }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                 title: t('Add comment'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     type: "link",
-                    disabled: !((_input$meta9 = input.meta) !== null && _input$meta9 !== void 0 && _input$meta9.comment)
-                  }, !isShown ? {
-                    className: 'default p-0'
-                  } : {
-                    className: 'p-0 primary'
-                  }), {}, {
+                    disabled: !input.meta?.comment,
+                    ...(!isShown ? {
+                      className: 'default p-0'
+                    } : {
+                      className: 'p-0 primary'
+                    }),
                     onClick: onClickComment,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "AddComment",
                       width: 16,
                       height: 16
                     })
-                  }))
+                  })
                 })
               })]
             }) : null]
           }) : null
         }),
         children: isReview ? /*#__PURE__*/jsxRuntime.jsx(BasicInput, {
-          data: _objectSpread2(_objectSpread2({}, values[formId] || {}), {}, {
-            meta: _objectSpread2(_objectSpread2({}, (values === null || values === void 0 ? void 0 : values.meta) || {}), {}, {
-              inputs: _objectSpread2(_objectSpread2({}, (values === null || values === void 0 || (_values$meta10 = values.meta) === null || _values$meta10 === void 0 ? void 0 : _values$meta10.inputs) || {}), ((values === null || values === void 0 || (_values$meta11 = values.meta) === null || _values$meta11 === void 0 ? void 0 : _values$meta11.inputs) || {})[formId] || {})
-            })
-          }),
-          linkingData: (values === null || values === void 0 ? void 0 : values.linking) || (values === null || values === void 0 || (_values$parent = values.parent) === null || _values$parent === void 0 ? void 0 : _values$parent.linking),
+          data: {
+            ...(values[formId] || {}),
+            meta: {
+              ...(values?.meta || {}),
+              inputs: {
+                ...(values?.meta?.inputs || {}),
+                ...((values?.meta?.inputs || {})[formId] || {})
+              }
+            }
+          },
+          linkingData: values?.linking || values?.parent?.linking,
           name: input.dataId,
           config: input,
           t: t,
@@ -31638,12 +31673,13 @@ const GroupContentFormItem = _ref4 => {
           getToken: getToken,
           app: app,
           valueOnlyString: true
-        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type](_objectSpread2(_objectSpread2({}, inputData), {}, {
+        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type]({
+          ...inputData,
           name: inputId,
           maxWidth,
           staticWidth,
           fullWidth
-        }), {
+        }, {
           form: MainForm,
           forms: options,
           allForms: plainForms,
@@ -31661,10 +31697,10 @@ const GroupContentFormItem = _ref4 => {
           staticWidth,
           fullWidth
         }) : console.log(input)
-      })), (_input$meta10 = input.meta) !== null && _input$meta10 !== void 0 && _input$meta10.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+      }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "code",
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
-          children: (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.code
+          children: input.meta?.code
         })
       }) : null]
     }), maxRule ? ['imageUpload', 'videoUpload', 'upload'].includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31684,16 +31720,16 @@ const GroupContentFormItem = _ref4 => {
         className: "max-char-span",
         children: t('max-char', {
           chars: maxRule,
-          filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
+          filled: inputData?.value?.length || 0
         })
       })
-    }) : null, (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+    }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "input-content",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         className: "comment-textarea",
-        initialValue: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
+        initialValue: inputMeta?.comment || '',
         hidden: !isShown,
-        name: "".concat(formId, "-").concat(inputId, "-comment"),
+        name: `${formId}-${inputId}-comment`,
         required: requiredComment,
         rules: requiredComment ? [{
           required: true,
@@ -31710,35 +31746,38 @@ const GroupContentFormItem = _ref4 => {
             onConfirm: () => {
               setIsShown(false);
               if (notPartOfTheForm) {
-                var _values$meta12;
-                const _defaultMeta = ((values === null || values === void 0 || (_values$meta12 = values.meta) === null || _values$meta12 === void 0 ? void 0 : _values$meta12.inputs) || {})[formId] || {};
+                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                 const _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
-                  var _defaultData$meta13, _defaultData$meta14;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                      [formId]: {
+                        ..._defaultData,
                         meta: {
-                          inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta13 = _defaultData.meta) === null || _defaultData$meta13 === void 0 ? void 0 : _defaultData$meta13.inputs) || {}), {}, {
-                            [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta14 = _defaultData.meta) === null || _defaultData$meta14 === void 0 ? void 0 : _defaultData$meta14.inputs) || {})[inputId] || {}), {}, {
+                          inputs: {
+                            ...(_defaultData?.meta?.inputs || {}),
+                            [inputId]: {
+                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
                               comment: null
-                            })
-                          })
+                            }
+                          }
                         }
-                      })
+                      }
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+                    value: {
+                      ..._defaultMeta,
+                      [inputId]: {
+                        ...(_defaultMeta[inputId] || {}),
                         comment: null
-                      })
-                    })
+                      }
+                    }
                   });
                 }
               } else {
@@ -31753,7 +31792,7 @@ const GroupContentFormItem = _ref4 => {
             },
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
               type: "link",
-              disabled: !((_input$meta13 = input.meta) !== null && _input$meta13 !== void 0 && _input$meta13.comment),
+              disabled: !input.meta?.comment,
               className: "p-0",
               children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                 width: 16,
@@ -31765,41 +31804,44 @@ const GroupContentFormItem = _ref4 => {
         children: inputTypeComponent$1.comment(inputData, {
           form: MainForm,
           forms: options,
-          value: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
+          value: inputMeta?.comment || '',
           maxWidth,
           staticWidth,
           fullWidth,
           onChange: val => {
             if (notPartOfTheForm) {
-              var _values$meta13;
-              const _defaultMeta = ((values === null || values === void 0 || (_values$meta13 = values.meta) === null || _values$meta13 === void 0 ? void 0 : _values$meta13.inputs) || {})[formId] || {};
+              const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
               const _defaultData = MainForm.getFieldValue(formId);
               if (isAjaxSubGroup) {
-                var _defaultData$meta15, _defaultData$meta16;
                 changeInputMeta({
                   key: formId,
                   type: input.type,
                   otherValues: {
-                    [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                    [formId]: {
+                      ..._defaultData,
                       meta: {
-                        inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta15 = _defaultData.meta) === null || _defaultData$meta15 === void 0 ? void 0 : _defaultData$meta15.inputs) || {}), {}, {
-                          [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta16 = _defaultData.meta) === null || _defaultData$meta16 === void 0 ? void 0 : _defaultData$meta16.inputs) || {})[inputId] || {}), {}, {
+                        inputs: {
+                          ...(_defaultData?.meta?.inputs || {}),
+                          [inputId]: {
+                            ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
                             comment: val
-                          })
-                        })
+                          }
+                        }
                       }
-                    })
+                    }
                   }
                 });
               } else {
                 changeInputMeta({
                   key: formId,
                   type: input.type,
-                  value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                    [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+                  value: {
+                    ..._defaultMeta,
+                    [inputId]: {
+                      ...(_defaultMeta[inputId] || {}),
                       comment: val
-                    })
-                  })
+                    }
+                  }
                 });
               }
             } else {
@@ -31820,16 +31862,16 @@ const GroupContentFormItem = _ref4 => {
         className: "max-char-span",
         children: t('max-char', {
           chars: MAX_COMMENTS_LENGTH,
-          filled: (inputMeta === null || inputMeta === void 0 || (_inputMeta$comment = inputMeta.comment) === null || _inputMeta$comment === void 0 ? void 0 : _inputMeta$comment.length) || 0
+          filled: inputMeta?.comment?.length || 0
         })
       })]
-    }) : null, lastReview !== null && lastReview !== void 0 && lastReview.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
+    }) : null, lastReview?.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "input-content",
       children: isReview ? /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "comment-textarea",
-          initialValue: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
-          name: "".concat(formId, "-").concat(inputId, "-reviewErrorComment"),
+          initialValue: lastReview?.comment || '',
+          name: `${formId}-${inputId}-reviewErrorComment`,
           label: /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex w-100",
             children: /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31840,71 +31882,78 @@ const GroupContentFormItem = _ref4 => {
           children: inputTypeComponent$1.comment(inputData, {
             form: MainForm,
             forms: options,
-            value: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
+            value: lastReview?.comment || '',
             maxWidth,
             staticWidth,
             fullWidth,
             onChange: val => {
               if (notPartOfTheForm) {
-                var _values$meta14;
-                const _defaultMeta = ((values === null || values === void 0 || (_values$meta14 = values.meta) === null || _values$meta14 === void 0 ? void 0 : _values$meta14.inputs) || {})[formId] || {};
+                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
                 const _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
-                  var _defaultData$meta17, _defaultData$meta18, _defaultData$meta19;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
+                      [formId]: {
+                        ..._defaultData,
                         meta: {
-                          inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta17 = _defaultData.meta) === null || _defaultData$meta17 === void 0 ? void 0 : _defaultData$meta17.inputs) || {}), {}, {
-                            [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta18 = _defaultData.meta) === null || _defaultData$meta18 === void 0 ? void 0 : _defaultData$meta18.inputs) || {})[inputId] || {}), {}, {
-                              reviews: ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta19 = _defaultData.meta) === null || _defaultData$meta19 === void 0 ? void 0 : _defaultData$meta19.inputs) || {})[inputId] || {}).reviews || []).map(v => {
+                          inputs: {
+                            ...(_defaultData?.meta?.inputs || {}),
+                            [inputId]: {
+                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                              reviews: (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).map(v => {
                                 if (v.createdAt === lastReview.createdAt) {
-                                  return _objectSpread2(_objectSpread2({}, v), {}, {
+                                  return {
+                                    ...v,
                                     comment: val
-                                  });
+                                  };
                                 }
                                 return v;
                               })
-                            })
-                          })
+                            }
+                          }
                         }
-                      })
+                      }
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
-                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
+                    value: {
+                      ..._defaultMeta,
+                      [inputId]: {
+                        ...(_defaultMeta[inputId] || {}),
                         reviews: ((_defaultMeta[inputId] || {}).reviews || []).map(v => {
                           if (v.createdAt === lastReview.createdAt) {
-                            return _objectSpread2(_objectSpread2({}, v), {}, {
+                            return {
+                              ...v,
                               comment: val
-                            });
+                            };
                           }
                           return v;
                         })
-                      })
-                    })
+                      }
+                    }
                   });
                 }
               } else {
                 changeInputMeta({
                   key: inputId,
                   type: input.type,
-                  value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
-                    reviews: ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || []).map(v => {
+                  value: {
+                    ...inputMeta,
+                    reviews: (inputMeta?.reviews || []).map(v => {
                       if (v.createdAt === lastReview.createdAt) {
-                        return _objectSpread2(_objectSpread2({}, v), {}, {
+                        return {
+                          ...v,
                           comment: val
-                        });
+                        };
                       }
                       return v;
                     })
-                  })
+                  }
                 });
               }
             },
@@ -31916,7 +31965,7 @@ const GroupContentFormItem = _ref4 => {
           className: "max-char-span",
           children: t('max-char', {
             chars: MAX_COMMENTS_LENGTH,
-            filled: ((_lastReview$comment = lastReview.comment) === null || _lastReview$comment === void 0 ? void 0 : _lastReview$comment.length) || 0
+            filled: lastReview.comment?.length || 0
           })
         })]
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -31937,7 +31986,7 @@ const GroupContentFormItem = _ref4 => {
           }), /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex flex-column justify-center mr-1",
             children: /*#__PURE__*/jsxRuntime.jsx("span", {
-              children: (lastReview === null || lastReview === void 0 || (_lastReview$reviewer = lastReview.reviewer) === null || _lastReview$reviewer === void 0 ? void 0 : _lastReview$reviewer.firstName) + ' ' + (lastReview === null || lastReview === void 0 || (_lastReview$reviewer2 = lastReview.reviewer) === null || _lastReview$reviewer2 === void 0 ? void 0 : _lastReview$reviewer2.lastName) + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
+              children: lastReview?.reviewer?.firstName + ' ' + lastReview?.reviewer?.lastName + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
             })
           })]
         })]
@@ -39681,7 +39730,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-const _excluded$h = ["placeholder"];
+const _excluded$f = ["placeholder"];
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -40436,7 +40485,7 @@ const inputTypeComponent = {
         },
         commentHint
       } = _ref15,
-      props = _objectWithoutProperties(_ref15.props, _excluded$h);
+      props = _objectWithoutProperties(_ref15.props, _excluded$f);
     let {
       onChange,
       value
@@ -42113,7 +42162,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);
 };
 
-const _excluded$g = ["icon"];
+const _excluded$e = ["icon"];
 function DynamicForm(_ref) {
   var _data$meta;
   let {
@@ -42733,7 +42782,7 @@ function DynamicForm(_ref) {
           let {
               icon: Icon
             } = _ref3,
-            form = _objectWithoutProperties(_ref3, _excluded$g);
+            form = _objectWithoutProperties(_ref3, _excluded$e);
           return /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
             type: "link",
             size: "large",
@@ -42956,7 +43005,7 @@ const StyledSelect = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$f = ["onChange", "value"];
+const _excluded$d = ["onChange", "value"];
 function AuthForm(_ref) {
   var _steps$currentStep;
   let {
@@ -43094,7 +43143,7 @@ function AuthForm(_ref) {
         {
           var _field$options;
           const _ref3 = field.props || {},
-            restSelectProps = _objectWithoutProperties(_ref3, _excluded$f);
+            restSelectProps = _objectWithoutProperties(_ref3, _excluded$d);
           inputNode = /*#__PURE__*/jsxRuntime.jsx(StyledSelect, _objectSpread2(_objectSpread2({
             placeholder: field.placeholder,
             disabled: field.disabled
@@ -43264,7 +43313,7 @@ function MultiBarProgress(_ref) {
 }
 const Style$x = styled__default["default"].div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteral(["\n\theight: 6px;\n\twidth: 100%;\n\tbackground: var(--base-gray-40);\n\tborder-radius: 8px;\n\tdisplay: flex;\n\toverflow: hidden;\n\tdiv {\n\t\theight: 100%;\n\t}\n"])));
 
-const _excluded$e = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
+const _excluded$c = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
 function MultiColorProgressBar(_ref) {
   let {
       tooltipTitle,
@@ -43276,7 +43325,7 @@ function MultiColorProgressBar(_ref) {
       },
       showInfo = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$e);
+    rest = _objectWithoutProperties(_ref, _excluded$c);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
     title: tooltipTitle,
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Progress, _objectSpread2({
@@ -43351,7 +43400,7 @@ function ProgressBarWithIcon(_ref) {
   });
 }
 
-const _excluded$d = ["value", "options", "onChange", "className", "width"];
+const _excluded$b = ["value", "options", "onChange", "className", "width"];
 const ProgressTabs = _ref => {
   let {
       value = 'setup',
@@ -43372,7 +43421,7 @@ const ProgressTabs = _ref => {
       className = '',
       width = '100%'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$d);
+    rest = _objectWithoutProperties(_ref, _excluded$b);
   // Transform options to include icons and handle disabled state
   const transformedOptions = options.map(option => _objectSpread2(_objectSpread2({}, option), {}, {
     label: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -45924,7 +45973,7 @@ const renderRows = ({
   });
 };
 
-const _excluded$c = ["page", "pageSize"];
+const _excluded$a = ["page", "pageSize"];
 function DataStoreTable$1(_ref) {
   let {
     mod,
@@ -46022,7 +46071,7 @@ function DataStoreTable$1(_ref) {
           page,
           pageSize
         } = activeFilters,
-        rest = _objectWithoutProperties(activeFilters, _excluded$c);
+        rest = _objectWithoutProperties(activeFilters, _excluded$a);
       const params = _objectSpread2({
         pagination: {
           page,
@@ -46342,7 +46391,7 @@ const getLinkedColumns = ({
   ellipsis: true
 }];
 
-const _excluded$b = ["administrativeLevel1", "administrativeLevel2"];
+const _excluded$9 = ["administrativeLevel1", "administrativeLevel2"];
 function DataStoreView(_ref) {
   let {
     mod,
@@ -46405,7 +46454,7 @@ function DataStoreView(_ref) {
           administrativeLevel1,
           administrativeLevel2
         } = _ref2,
-        rest = _objectWithoutProperties(_ref2, _excluded$b);
+        rest = _objectWithoutProperties(_ref2, _excluded$9);
       const levels = [administrativeLevel1, administrativeLevel2].filter(p => !!p);
       let levelsRes = {
         data: []
@@ -47903,14 +47952,14 @@ const TabsStyled = styled__default["default"](antd.Tabs)`
 
 `;
 
-const _excluded$a = ["defaultActiveKey", "items", "onChange"];
+const _excluded$8 = ["defaultActiveKey", "items", "onChange"];
 const StyledTabs = _ref => {
   let {
       defaultActiveKey,
       items,
       onChange
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$a);
+    rest = _objectWithoutProperties(_ref, _excluded$8);
   return /*#__PURE__*/jsxRuntime.jsx(TabsStyled, _objectSpread2({
     defaultActiveKey: defaultActiveKey,
     items: items,
@@ -47981,7 +48030,7 @@ const Container$1 = styled__default["default"].div`
 	width: ${props => props.isPdf ? props.width ? props.width : '1000px' : 'calc(100% - 48px)'};
 `;
 
-const _excluded$9 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
+const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
 const {
   useToken: useToken$i
 } = antd.theme;
@@ -48071,7 +48120,7 @@ function BarChart(_ref) {
       width,
       xAxisConfig = {}
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$9);
+    _objectWithoutProperties(_ref, _excluded$7);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -48155,7 +48204,7 @@ function BarChart(_ref) {
   });
 }
 
-const _excluded$8 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
+const _excluded$6 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
 const {
   useToken: useToken$h
 } = antd.theme;
@@ -48244,7 +48293,7 @@ function LineChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$8);
+    _objectWithoutProperties(_ref, _excluded$6);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -48346,7 +48395,7 @@ function LineChart(_ref) {
   });
 }
 
-const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
+const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
 const {
   useToken: useToken$g
 } = antd.theme;
@@ -48451,7 +48500,7 @@ function ColumnChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$7);
+    _objectWithoutProperties(_ref, _excluded$5);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -48719,7 +48768,7 @@ function RadialBarChart(_ref) {
   });
 }
 
-const _excluded$6 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
+const _excluded$4 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
 const {
   useToken: useToken$e
 } = antd.theme;
@@ -48794,7 +48843,7 @@ function DonutPie(_ref) {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$6);
+    rest = _objectWithoutProperties(_ref, _excluded$4);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -49314,7 +49363,7 @@ function StackChart(_ref) {
   });
 }
 
-const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
+const _excluded$3 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
 const {
   useToken: useToken$c
 } = antd.theme;
@@ -49391,7 +49440,7 @@ const AreaChart = _ref => {
       legendConfig = {},
       width
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$5);
+    rest = _objectWithoutProperties(_ref, _excluded$3);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -49479,7 +49528,7 @@ const AreaChart = _ref => {
   });
 };
 
-const _excluded$4 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
+const _excluded$2 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
 const {
   useToken: useToken$b
 } = antd.theme;
@@ -49504,7 +49553,7 @@ const RadarChart = _ref => {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$4);
+    rest = _objectWithoutProperties(_ref, _excluded$2);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -51887,7 +51936,7 @@ function StakeholderMappings(_ref3) {
 }
 var index = withProvider(StakeholderMappings);
 
-const _excluded$3 = ["t", "checkboxConfig", "defaultTableFilters", "columns", "children", "data", "loading", "APP", "getApiBaseUrl", "selectOptions", "selectFilters", "showCreate", "location", "goTo", "getRedirectLink", "defaultUrlParams", "view", "module", "filtersConfig", "isMobile"];
+const _excluded$1 = ["t", "checkboxConfig", "defaultTableFilters", "columns", "children", "data", "loading", "APP", "getApiBaseUrl", "selectOptions", "selectFilters", "showCreate", "location", "goTo", "getRedirectLink", "defaultUrlParams", "view", "module", "filtersConfig", "isMobile"];
 const BaseScreen = _ref => {
   var _data$data;
   let {
@@ -51925,7 +51974,7 @@ const BaseScreen = _ref => {
       filtersConfig,
       isMobile
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$3);
+    rest = _objectWithoutProperties(_ref, _excluded$1);
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
   const {
@@ -52913,10 +52962,12 @@ class AdminService extends BaseService {
     });
   }
   getItems({
-    item
+    item,
+    params
   }) {
     return this.apiGet({
-      url: `/management/items/${item}`
+      url: `/management/items/${item}`,
+      params
     });
   }
   getItemForm({
@@ -53595,6 +53646,17 @@ const renderTypeTag = ({
     children: label
   });
 };
+const getTabs$2 = ({
+  t
+}) => {
+  return [{
+    key: "active",
+    label: t("Active")
+  }, {
+    key: "deleted",
+    label: t("admin::deleted")
+  }];
+};
 
 const getColumns$9 = ({
   t,
@@ -53920,11 +53982,11 @@ const filtersConfig$d = {
   datastakeId: ""
 };
 const view$2 = "admin-users";
-const defaultUrlParams$5 = {
+const defaultUrlParams$6 = {
   activeTab: "active"
 };
 const defaultTableFilters$2 = {};
-const getTabs$3 = ({
+const getTabs$1 = ({
   totalPending = 0,
   t
 }) => [{
@@ -53939,6 +54001,50 @@ const getTabs$3 = ({
   label: t("Suspended")
 }];
 
+const useGetQueryParams = ({
+  location
+}) => {
+  const queryParams = React.useMemo(() => {
+    const params = new URLSearchParams(location?.search);
+    return Object.fromEntries(params.entries());
+  }, [location.search]);
+  const params = React.useMemo(() => {
+    const {
+      page,
+      pageSize,
+      search,
+      searchParams: rawSearchParams,
+      sortBy,
+      sortDir,
+      status,
+      product,
+      ...rest
+    } = queryParams;
+    return {
+      paginationQuery: {
+        skip: page,
+        take: pageSize
+      },
+      searchParams: {
+        qs: search,
+        fields: safeJsonParse(rawSearchParams)
+      },
+      otherParams: {
+        ...rest,
+        ...(product && {
+          "products.typeOfProduct": product
+        }),
+        ...(status && {
+          published: status === "submitted" ? true : false
+        })
+      },
+      sortBy,
+      sortDir
+    };
+  }, [queryParams]);
+  return params;
+};
+
 function useAdminTable({
   goTo,
   location,
@@ -54033,6 +54139,103 @@ function useAdminTable({
     setLoading
   };
 }
+const useGetParams = ({
+  location
+}) => {
+  const {
+    paginationQuery,
+    searchParams,
+    otherParams,
+    sortBy,
+    sortDir
+  } = useGetQueryParams({
+    location
+  });
+  const cleanSearchParams = Object.fromEntries(Object.entries(searchParams).filter(([_, value]) => value != null && value !== ''));
+  const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+  const {
+    activeTab,
+    ...rest
+  } = otherParams;
+  const params = React.useMemo(() => {
+    if (!hasPagination) {
+      return undefined;
+    }
+    return {
+      pagination: paginationQuery,
+      ...(Object.keys(rest)?.length > 0 && rest),
+      ...(Object.keys(cleanSearchParams)?.length > 0 && {
+        search: cleanSearchParams
+      }),
+      tab: activeTab
+    };
+  }, [location.search, hasPagination, paginationQuery, rest, cleanSearchParams, activeTab]);
+  return params;
+};
+function useSubjectsAdminTable({
+  goTo,
+  location,
+  selectFiltersConfig,
+  view,
+  defaultUrlParams,
+  module,
+  filtersConfig,
+  getRedirectLink,
+  getData,
+  defaultPageSize,
+  refetchTrigger
+}) {
+  const [initFetchDone, setInitFetchDone] = React.useState(false);
+  const [loading, setLoading] = React.useState(false);
+  const [data, setData] = React.useState([]);
+  const filter = useFilters({
+    goTo,
+    location,
+    selectFiltersConfig,
+    view,
+    defaultUrlParams,
+    module,
+    filtersConfig,
+    defaultPageSize: defaultPageSize || 20,
+    getRedirectLink
+  });
+  const activeTab = React.useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
+  const canClearSearch = React.useMemo(() => {
+    return !!filter.activeFilters.search;
+  }, [filter.activeFilters]);
+  const fetchData = React.useCallback(async () => {
+    try {
+      setLoading(true);
+      const {
+        data
+      } = await getData();
+      setData(data.data || data || []);
+      filter.setPagination(prev => ({
+        ...prev,
+        total: data?.meta?.total || data?.length || 0
+      }));
+      if (!initFetchDone) {
+        setInitFetchDone(true);
+      }
+      setLoading(false);
+    } catch (err) {
+      console.log(err);
+    }
+  }, [filter.activeFilters, refetchTrigger, location.search]);
+  React.useEffect(() => {
+    fetchData();
+  }, [fetchData, refetchTrigger]);
+  return {
+    filter,
+    activeTab,
+    canClearSearch,
+    data,
+    loading,
+    initFetchDone,
+    fetchData,
+    setLoading
+  };
+}
 
 function UserTable(_ref) {
   let {
@@ -54067,7 +54270,7 @@ function UserTable(_ref) {
     location,
     selectFiltersConfig: selectFiltersConfig$d,
     view: view$2,
-    defaultUrlParams: defaultUrlParams$5,
+    defaultUrlParams: defaultUrlParams$6,
     module,
     filtersConfig: filtersConfig$d,
     getRedirectLink,
@@ -54127,7 +54330,7 @@ function UserTable(_ref) {
       t: t,
       headerTitle: headerTitle,
       actionButton: actionButton,
-      tabs: getTabs$3({
+      tabs: getTabs$1({
         totalPending: totalPending,
         t
       }),
@@ -54508,11 +54711,11 @@ const filtersConfig$c = {
   datastakeId: ""
 };
 const view$1 = "accounts";
-const defaultUrlParams$4 = {
+const defaultUrlParams$5 = {
   activeTab: "active"
 };
 const defaultTableFilters$1 = {};
-const getTabs$2 = ({
+const getTabs = ({
   totalPending = 0,
   t
 }) => [{
@@ -54816,7 +55019,7 @@ function AccountTable(_ref) {
     location,
     selectFiltersConfig: selectFiltersConfig$c,
     view: view$1,
-    defaultUrlParams: defaultUrlParams$4,
+    defaultUrlParams: defaultUrlParams$5,
     module,
     defaultPageSize,
     filtersConfig: filtersConfig$c,
@@ -54899,7 +55102,7 @@ function AccountTable(_ref) {
       // 	disabled: selectedAccounts.length < 2,
       // },
       ],
-      tabs: getTabs$2({
+      tabs: getTabs({
         totalPending: totalPending,
         t
       }),
@@ -54978,17 +55181,6 @@ function AccountTable(_ref) {
   });
 }
 
-const getTabs$1 = ({
-  t
-}) => {
-  return [{
-    key: "active",
-    label: t("Active")
-  }, {
-    key: "deleted",
-    label: t("admin::deleted")
-  }];
-};
 const selectFiltersConfig$b = {
   category: {
     type: "select",
@@ -55034,7 +55226,7 @@ const filtersConfig$b = {
   name: "",
   datastakeId: ""
 };
-const defaultUrlParams$3 = {
+const defaultUrlParams$4 = {
   activeTab: "active"
 };
 const checkboxConfig$b = {
@@ -55612,7 +55804,6 @@ function CombineLocationModal({
   });
 }
 
-const _excluded$2 = ["pagination", "tab", "filters", "search", "sort"];
 const {
   useToken: useToken$4
 } = antd.theme;
@@ -55642,53 +55833,10 @@ function LocationTable(_ref) {
     token
   } = useToken$4();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
-  const getDataWithStringPagination = async _ref2 => {
-    let {
-      params
-    } = _ref2;
-    const {
-        pagination,
-        tab,
-        filters,
-        search,
-        sort
-      } = params;
-      _objectWithoutProperties(params, _excluded$2);
-    let paginationObj = {
-      page: 1,
-      pageSize: 20
-    };
-    if (pagination) {
-      try {
-        paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
-      } catch (e) {
-        console.error('Failed to parse pagination', e);
-      }
-    }
-    const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
-    let pageNumber = 1;
-    if (paginationObj.page || paginationObj.current) {
-      pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
-    } else if (typeof paginationObj.skip === 'number') {
-      pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
-    }
-    pageNumber = pageNumber || 1;
-    let activeTab = tab || "active";
-    if (!tab && filters) {
-      try {
-        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
-        activeTab = parsedFilters.activeTab || "active";
-      } catch (e) {
-        activeTab = "active";
-      }
-    }
-    const transformedParams = {
-      pagination: {
-        skip: pageNumber,
-        take: pageSize
-      },
-      tab: activeTab
-    };
+  const transformedParams = useGetParams({
+    location
+  });
+  const getDataWithStringPagination = async () => {
     return getData({
       params: transformedParams
     });
@@ -55697,19 +55845,17 @@ function LocationTable(_ref) {
     filter,
     activeTab,
     canClearSearch,
-    totalPending,
     data,
     loading,
     initFetchDone,
     fetchData,
-    fetchPendingAccounts,
     setLoading
-  } = useAdminTable({
+  } = useSubjectsAdminTable({
     goTo,
     location,
     selectFiltersConfig: selectFiltersConfig$b,
     view,
-    defaultUrlParams: defaultUrlParams$3,
+    defaultUrlParams: defaultUrlParams$4,
     module,
     defaultPageSize,
     filtersConfig: filtersConfig$b,
@@ -55746,7 +55892,7 @@ function LocationTable(_ref) {
         tooltip: t("admin::merge-locations"),
         disabled: selectedLocations.length < 2
       }],
-      tabs: getTabs$1({
+      tabs: getTabs$2({
         t
       }),
       isMobile: isMobile,
@@ -55819,17 +55965,6 @@ function LocationTable(_ref) {
   });
 }
 
-const getTabs = ({
-  t
-}) => {
-  return [{
-    key: "active",
-    label: t("Active")
-  }, {
-    key: "deleted",
-    label: t("admin::deleted")
-  }];
-};
 const selectFiltersConfig$a = {
   category: {
     type: "select",
@@ -55875,7 +56010,7 @@ const filtersConfig$a = {
   name: "",
   datastakeId: ""
 };
-const defaultUrlParams$2 = {
+const defaultUrlParams$3 = {
   activeTab: "active"
 };
 const checkboxConfig$a = {
@@ -56354,7 +56489,6 @@ function CombineSubjectsModal({
   });
 }
 
-const _excluded$1 = ["pagination", "tab", "filters", "search", "sort"];
 const {
   useToken: useToken$2
 } = antd.theme;
@@ -56384,53 +56518,10 @@ function SubjectsTable(_ref) {
     token
   } = useToken$2();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
-  const getDataWithStringPagination = async _ref2 => {
-    let {
-      params
-    } = _ref2;
-    const {
-        pagination,
-        tab,
-        filters,
-        search,
-        sort
-      } = params;
-      _objectWithoutProperties(params, _excluded$1);
-    let paginationObj = {
-      page: 1,
-      pageSize: 20
-    };
-    if (pagination) {
-      try {
-        paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
-      } catch (e) {
-        console.error('Failed to parse pagination', e);
-      }
-    }
-    const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
-    let pageNumber = 1;
-    if (paginationObj.page || paginationObj.current) {
-      pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
-    } else if (typeof paginationObj.skip === 'number') {
-      pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
-    }
-    pageNumber = pageNumber || 1;
-    let activeTab = tab || "active";
-    if (!tab && filters) {
-      try {
-        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
-        activeTab = parsedFilters.activeTab || "active";
-      } catch (e) {
-        activeTab = "active";
-      }
-    }
-    const transformedParams = {
-      pagination: {
-        skip: pageNumber,
-        take: pageSize
-      },
-      tab: activeTab
-    };
+  const transformedParams = useGetParams({
+    location
+  });
+  const getDataWithStringPagination = async () => {
     return getData({
       params: transformedParams
     });
@@ -56439,19 +56530,17 @@ function SubjectsTable(_ref) {
     filter,
     activeTab,
     canClearSearch,
-    totalPending,
     data,
     loading,
     initFetchDone,
     fetchData,
-    fetchPendingAccounts,
     setLoading
-  } = useAdminTable({
+  } = useSubjectsAdminTable({
     goTo,
     location,
     selectFiltersConfig: selectFiltersConfig$a,
     view,
-    defaultUrlParams: defaultUrlParams$2,
+    defaultUrlParams: defaultUrlParams$3,
     module,
     defaultPageSize,
     filtersConfig: filtersConfig$a,
@@ -56485,9 +56574,9 @@ function SubjectsTable(_ref) {
         icon: "Merge",
         onClick: () => setIsModalOpen(true),
         tooltip: t("merge-subjects"),
-        disabled: selectedSubjects.length < 2
+        disabled: (selectedSubjects === null || selectedSubjects === void 0 ? void 0 : selectedSubjects.length) < 2
       }],
-      tabs: getTabs({
+      tabs: getTabs$2({
         t
       }),
       isMobile: isMobile,
@@ -56501,13 +56590,13 @@ function SubjectsTable(_ref) {
       checkboxConfig: checkboxConfig$a,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
-      children: [selectedSubjects.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
+      children: [(selectedSubjects === null || selectedSubjects === void 0 ? void 0 : selectedSubjects.length) > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-row  ml-6 mt-5",
         style: {
           flexWrap: "wrap",
           gap: "8px"
         },
-        children: selectedSubjects.map(account => /*#__PURE__*/jsxRuntime.jsxs(antd.Tag, {
+        children: selectedSubjects === null || selectedSubjects === void 0 ? void 0 : selectedSubjects.map(account => /*#__PURE__*/jsxRuntime.jsxs(antd.Tag, {
           className: "flex flex-row gap-2 items-center",
           onClick: () => setSelectedSubjects(prev => prev.filter(a => a.datastakeId !== account.datastakeId)),
           style: {
@@ -57088,7 +57177,7 @@ const selectFiltersConfig$9 = {
 const filtersConfig$9 = {
   search: ""
 };
-const defaultUrlParams$1 = {
+const defaultUrlParams$2 = {
   search: "",
   userRole: null,
   status: null
@@ -57134,7 +57223,7 @@ function Users({
     goTo,
     location,
     selectFiltersConfig: selectFiltersConfig$9,
-    defaultUrlParams: defaultUrlParams$1,
+    defaultUrlParams: defaultUrlParams$2,
     module,
     filtersConfig: filtersConfig$9,
     getRedirectLink
@@ -58586,6 +58675,9 @@ const filtersConfig$8 = {
   name: "",
   datastakeId: ""
 };
+const defaultUrlParams$1 = {
+  activeTab: "active"
+};
 const checkboxConfig$8 = {
   name: "Name",
   datastakeId: "ID"
@@ -58717,52 +58809,10 @@ function DocumentsTable({
   const {
     token
   } = useToken$1();
-  const getDataWithStringPagination = async ({
-    params
-  }) => {
-    const {
-      pagination,
-      tab,
-      filters,
-      search,
-      sort,
-      ...otherParams
-    } = params;
-    let paginationObj = {
-      page: 1,
-      pageSize: 20
-    };
-    if (pagination) {
-      try {
-        paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
-      } catch (e) {
-        console.error('Failed to parse pagination', e);
-      }
-    }
-    const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
-    let pageNumber = 1;
-    if (paginationObj.page || paginationObj.current) {
-      pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
-    } else if (typeof paginationObj.skip === 'number') {
-      pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
-    }
-    pageNumber = pageNumber || 1;
-    let activeTab = tab || "active";
-    if (!tab && filters) {
-      try {
-        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
-        activeTab = parsedFilters.activeTab || "active";
-      } catch (e) {
-        activeTab = "active";
-      }
-    }
-    const transformedParams = {
-      pagination: {
-        skip: pageNumber,
-        take: pageSize
-      },
-      tab: activeTab
-    };
+  const transformedParams = useGetParams({
+    location
+  });
+  const getDataWithStringPagination = async () => {
     return getData({
       params: transformedParams
     });
@@ -58771,19 +58821,17 @@ function DocumentsTable({
     filter,
     activeTab,
     canClearSearch,
-    totalPending,
     data,
     loading,
     initFetchDone,
     fetchData,
-    fetchPendingAccounts,
     setLoading
-  } = useAdminTable({
+  } = useSubjectsAdminTable({
     goTo,
     location,
     selectFiltersConfig: selectFiltersConfig$8,
     view,
-    // defaultUrlParams,
+    defaultUrlParams: defaultUrlParams$1,
     module,
     defaultPageSize,
     filtersConfig: filtersConfig$8,
@@ -58828,11 +58876,12 @@ function DocumentsTable({
       // 		disabled: selectedDocuments.length < 2,
       // 	},
       // ]}
-      // tabs={getTabs({ t })}
-      ,
-      isMobile: isMobile
-      // activeTab={activeTab}
       ,
+      tabs: getTabs$2({
+        t
+      }),
+      isMobile: isMobile,
+      activeTab: activeTab,
       showFilters: showFilters,
       setShowFilters: setShowFilters,
       hasError: hasError,
@@ -59042,7 +59091,7 @@ const getColumns = ({
           className: "daf-default-cell"
         });
       }
-      (options?.eventCategoryOptions || options?.categoryOptions || [])?.map(item => ({
+      (options?.eventCategoryOptions || options?.eventsType || [])?.map(item => ({
         value: item.value,
         label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
       }));
@@ -59136,50 +59185,24 @@ function EventsTable({
   const {
     token
   } = useToken();
-  const getDataWithStringPagination = async ({
-    params
-  }) => {
-    const {
-      pagination,
-      tab,
-      filters,
-      search,
-      sort,
-      ...otherParams
-    } = params;
-
-    // Don't send pagination to API - we'll fetch all data and slice on frontend
-    let activeTab = tab || "active";
-    if (!tab && filters) {
-      try {
-        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
-        activeTab = parsedFilters.activeTab || "active";
-      } catch (e) {
-        activeTab = "active";
-      }
-    }
-
-    // Fetch all data without pagination - we'll slice on frontend based on URL params
-    const transformedParams = {
-      tab: activeTab,
-      ...otherParams
-    };
+  const transformedParams = useGetParams({
+    location
+  });
+  const getDataWithStringPagination = async () => {
     return getData({
       params: transformedParams
     });
   };
   const {
     filter,
-    // activeTab,
+    activeTab,
     canClearSearch,
-    totalPending,
     data,
     loading,
     initFetchDone,
     fetchData,
-    fetchPendingAccounts,
     setLoading
-  } = useAdminTable({
+  } = useSubjectsAdminTable({
     goTo,
     location,
     selectFiltersConfig: selectFiltersConfig$7,
@@ -59193,12 +59216,8 @@ function EventsTable({
     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({
       t,
@@ -59226,11 +59245,12 @@ function EventsTable({
       // 		disabled: selectedEvents.length < 2,
       // 	},
       // ]}
-      // tabs={getTabs({ t })}
-      ,
-      isMobile: isMobile
-      // activeTab={activeTab}
       ,
+      tabs: getTabs$2({
+        t
+      }),
+      isMobile: isMobile,
+      activeTab: activeTab,
       showFilters: showFilters,
       setShowFilters: setShowFilters,
       hasError: hasError,