datastake-daf 0.6.842 → 0.6.844

package/dist/components/index.js

@@ -4827,7 +4827,7 @@ const config$2 = {
   AddDocument: config$3
 };
 
-const _excluded$D = ["width", "height", "size", "name", "fill"];
+const _excluded$E = ["width", "height", "size", "name", "fill"];
 const CustomIcon = _ref => {
   let {
       width = 14,
@@ -4836,7 +4836,7 @@ const CustomIcon = _ref => {
       name = "",
       fill = "none"
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$D);
+    props = _objectWithoutProperties(_ref, _excluded$E);
   const conf = config$2[name];
   if (conf) {
     return /*#__PURE__*/jsxRuntime.jsx("svg", _objectSpread2(_objectSpread2({}, props), {}, {
@@ -5125,7 +5125,7 @@ createCommonjsModule(function (module, exports) {
 !function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}}));
 });
 
-const _excluded$C = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$D = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
 dayjs__default["default"].extend(customParseFormat);
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(utc);
@@ -5501,7 +5501,7 @@ const filterCreateData = data => {
       createdAt,
       updatedAt
     } = data,
-    rest = _objectWithoutProperties(data, _excluded$C);
+    rest = _objectWithoutProperties(data, _excluded$D);
   const _meta = isObjectEmpty(meta) ? undefined : meta;
   return _objectSpread2(_objectSpread2({}, rest), {}, {
     meta: _meta
@@ -5593,7 +5593,8 @@ const getValueOnSelectFromDefaultKeys = (val, options, uniqueDefaultKeys) => {
  * @param {object} obj - Object to traverse
  * @returns {any} - Resolved value or undefined
  */
-const resolveValuePath = (path, obj) => {
+const resolveValuePath = (path, obj, form) => {
+  var _Object$keys;
   if (!path || !obj) return undefined;
 
   // Split by / and traverse the object
@@ -5612,7 +5613,8 @@ const resolveValuePath = (path, obj) => {
       current = current[part];
     }
   }
-  return current;
+  const value = ((_Object$keys = Object.keys(form || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0 ? findOptions(current, (form === null || form === void 0 ? void 0 : form.options) || []) : current;
+  return value;
 };
 
 /**
@@ -5684,6 +5686,7 @@ const getCombinedPrefilledValues = form => {
 const resolveCombinedPrefilledValue = function (template) {
   let values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   let parentValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  let form = arguments.length > 3 ? arguments[3] : undefined;
   if (!template || typeof template !== 'string') return '';
 
   // Regular expression to match placeholders like {path} or {path^subpath}
@@ -5696,7 +5699,8 @@ const resolveCombinedPrefilledValue = function (template) {
   if (nonParentPaths.length > 0) {
     // Check if at least one non-parent value has actual data
     hasNonParentValue = nonParentPaths.some(path => {
-      const value = resolveValuePath(path, values);
+      var _form$inputs;
+      const value = resolveValuePath(path, values, form === null || form === void 0 || (_form$inputs = form.inputs) === null || _form$inputs === void 0 ? void 0 : _form$inputs[path]);
       return value !== undefined && value !== null && value !== '';
     });
 
@@ -5715,8 +5719,9 @@ const resolveCombinedPrefilledValue = function (template) {
       const resolved = resolveValuePath(actualPath, parentValues);
       return formatValue(resolved);
     } else {
+      var _form$inputs2;
       // Regular path in current values
-      const resolved = resolveValuePath(path, values);
+      const resolved = resolveValuePath(path, values, form === null || form === void 0 || (_form$inputs2 = form.inputs) === null || _form$inputs2 === void 0 ? void 0 : _form$inputs2[path]);
       return formatValue(resolved);
     }
   });
@@ -5868,6 +5873,12 @@ const SelectFilters = _ref => {
   } = _ref;
   const [filters, setFilters] = React.useState(selectedFilters || {});
   const [initFilters, setInitFilters] = React.useState(selectedFilters || {});
+
+  // Sync internal state with selectedFilters prop when it changes
+  React.useEffect(() => {
+    setFilters(selectedFilters || {});
+    setInitFilters(selectedFilters || {});
+  }, [selectedFilters]);
   const getClearLabel = () => {
     switch (type) {
       case 'small':
@@ -6033,7 +6044,7 @@ SelectFilters.propTypes = {
   apiUrl: PropTypes__default["default"].string
 };
 
-const _excluded$B = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
+const _excluded$C = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -6064,7 +6075,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$B);
+    rest = _objectWithoutProperties(_ref, _excluded$C);
   const source = React.useMemo(() => {
     if (data && Array.isArray(data)) {
       return data;
@@ -6889,7 +6900,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$h;
-const _excluded$A = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$B = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
 function StickyTable(_ref) {
   let {
       size = "small",
@@ -6900,7 +6911,7 @@ function StickyTable(_ref) {
       pagination = false,
       doEmptyRows = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$A);
+    props = _objectWithoutProperties(_ref, _excluded$B);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7428,7 +7439,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$z = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$A = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7442,7 +7453,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$z);
+    restProps = _objectWithoutProperties(_ref, _excluded$A);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7561,12 +7572,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$y = ["children"];
+const _excluded$z = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$y);
+    props = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7706,12 +7717,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$x = ["icon"];
+const _excluded$y = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$x);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -8034,14 +8045,14 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   &.ant-select-single {
     .ant-select-selector {
         padding-inline-end: 24px !important;
-        padding: 0 !important;
+        padding: 3px !important;
         max-width: 56px !important;
         width: 56px !important;
     }
   }
 `;
 
-const _excluded$w = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$x = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$p
 } = antd.theme;
@@ -8134,7 +8145,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$w);
+    restProps = _objectWithoutProperties(_ref, _excluded$x);
   const {
     token
   } = useToken$p();
@@ -8854,7 +8865,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$v = ["tabs", "onChange", "value", "className"];
+const _excluded$w = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8862,7 +8873,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$v);
+    rest = _objectWithoutProperties(_ref, _excluded$w);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8959,7 +8970,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$u = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$v = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8994,7 +9005,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$u);
+              restProps = _objectWithoutProperties(button, _excluded$v);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -11875,7 +11886,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$t = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$u = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11886,7 +11897,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$t);
+    props = _objectWithoutProperties(_ref, _excluded$u);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11946,7 +11957,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$e;
-const _excluded$s = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$t = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11958,7 +11969,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$s);
+    rest = _objectWithoutProperties(_ref, _excluded$t);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -15689,7 +15700,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$r = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$s = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15703,7 +15714,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17903,14 +17914,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$q = ["config", "title", "loading"];
+const _excluded$r = ["config", "title", "loading"];
 const Details = _ref => {
   let {
       config = [],
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header card",
     loading: loading,
@@ -17926,14 +17937,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$p = ["config", "title", "loading"];
+const _excluded$q = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$p);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17963,7 +17974,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$o = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$p = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17971,7 +17982,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$o);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -18147,14 +18158,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$c;
-const _excluded$n = ["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$n);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18452,7 +18463,7 @@ function SdgList({
   });
 }
 
-const _excluded$m = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$n = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18472,7 +18483,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18744,13 +18755,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$l = ["title", "children"];
+const _excluded$m = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$l);
+    rest = _objectWithoutProperties(_ref, _excluded$m);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18914,7 +18925,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$k = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$l = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18929,7 +18940,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$k);
+    rest = _objectWithoutProperties(_ref, _excluded$l);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -19298,7 +19309,7 @@ const getVegetationConfig = () => {
 };
 
 var _templateObject$a, _templateObject2$3;
-const _excluded$j = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
+const _excluded$k = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
 function VegetationWidget(_ref) {
   let {
       title = "Vegetation Health",
@@ -19310,7 +19321,7 @@ function VegetationWidget(_ref) {
       growthObservations = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$j);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   let vegetationConfig = getVegetationConfig();
   const allVegetationKeys = vegetationConfig.map(item => item.key);
   if (filterKeys && Array.isArray(filterKeys)) {
@@ -19426,7 +19437,7 @@ const getFaunaConfig = () => {
 };
 
 var _templateObject$9, _templateObject2$2;
-const _excluded$i = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$j = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function FaunaWidget(_ref) {
   let {
       title = "Observed Fauna",
@@ -19437,7 +19448,7 @@ function FaunaWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$i);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   let faunaConfig = getFaunaConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -19502,7 +19513,7 @@ const getInvasiveSpeciesConfig = () => {
 };
 
 var _templateObject$8, _templateObject2$1;
-const _excluded$h = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$i = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function InvasiveSpeciesWidget(_ref) {
   let {
       title = "Invasive Species",
@@ -19514,7 +19525,7 @@ function InvasiveSpeciesWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   let invasiveSpeciesConfig = getInvasiveSpeciesConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -20697,11 +20708,15 @@ function DataLink$1({
     getToken
   });
   const data = React.useMemo(() => {
+    const filteredPrefilledValues = Object.entries(form?.meta?.prefilledValues || {}).filter(([_, value]) => !(value && typeof value === 'object' && 'combine' in value)).reduce((acc, [key, value]) => ({
+      ...acc,
+      [key]: value
+    }), {});
     const _formData = isSingle ? formData && !Array.isArray(formData) ? [{
-      ...form?.meta?.prefilledValues,
+      ...filteredPrefilledValues,
       ...formData
     }] : [] : (Array.isArray(formData) ? formData : []).map(f => ({
-      ...form?.meta?.prefilledValues,
+      ...filteredPrefilledValues,
       ...f
     }));
     return (_formData || []).map((f, i) => {
@@ -22440,11 +22455,15 @@ function DataLinkFlat$1({
     }
   }, [entity, values.linking]);
   const dataLinkFormData = React.useMemo(() => {
+    const filteredPrefilledValues = Object.entries(form?.meta?.prefilledValues || {}).filter(([_, value]) => !(value && typeof value === 'object' && 'combine' in value)).reduce((acc, [key, value]) => ({
+      ...acc,
+      [key]: value
+    }), {});
     const _formData = isSingle ? formData && !Array.isArray(formData) ? [{
-      ...form?.meta?.prefilledValues,
+      ...filteredPrefilledValues,
       ...formData
     }] : [] : (Array.isArray(formData) ? formData : []).map(f => ({
-      ...form?.meta?.prefilledValues,
+      ...filteredPrefilledValues,
       ...f
     }));
     return (_formData || []).map((f, i) => {
@@ -23449,10 +23468,10 @@ const BasicInput = _ref => {
       case 'text':
       case 'phoneNumber':
       case 'textarea':
-        return item ? propHasValue$1(item[inputName]) ? item[inputName] : placeholder(item, inputName, withPlaceholder) : propHasValue$1(data[inputName]) ? data[inputName] : placeholder(data, inputName, withPlaceholder);
+        return item ? propHasValue$1(item[inputName]) && item[inputName] !== '' ? item[inputName] : placeholder(item, inputName, withPlaceholder) : propHasValue$1(data[inputName]) && data[inputName] !== '' ? data[inputName] : placeholder(data, inputName, withPlaceholder);
       case 'website':
       case 'link':
-        const v = item ? propHasValue$1(item[inputName]) ? item[inputName] : placeholder(item, inputName, withPlaceholder) : propHasValue$1(data[inputName]) ? data[inputName] : placeholder(data, inputName, withPlaceholder);
+        const v = item ? propHasValue$1(item[inputName]) && item[inputName] !== '' ? item[inputName] : placeholder(item, inputName, withPlaceholder) : propHasValue$1(data[inputName]) && data[inputName] !== '' ? data[inputName] : placeholder(data, inputName, withPlaceholder);
         if (isModal) {
           return /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex flex-column ant-upload-list",
@@ -24081,7 +24100,7 @@ const Input = _ref2 => {
           ajaxOptions: ajaxOptions,
           evaluationConfig: evaluationConfig
         }, key);
-      }), isRepeatable && Array.isArray(modalData) && !modalData.length ? /*#__PURE__*/jsxRuntime.jsx("span", {
+      }), isRepeatable && Array.isArray(modalData) && !modalData.length || modalData === "" ? /*#__PURE__*/jsxRuntime.jsx("span", {
         className: "text-muted",
         children: t('Not answered')
       }) : null]
@@ -24116,7 +24135,7 @@ const Input = _ref2 => {
           linkingData: linkingData,
           evaluationConfig: evaluationConfig
         }, key);
-      }), !modalData || Array.isArray(modalData) && !modalData.length ? /*#__PURE__*/jsxRuntime.jsx("span", {
+      }), !modalData || Array.isArray(modalData) && !modalData.length || modalData === "" ? /*#__PURE__*/jsxRuntime.jsx("span", {
         className: "text-muted",
         children: t('Not answered')
       }) : (Array.isArray(modalData) ? modalData : [modalData]).map((item, itemId) => /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -24203,7 +24222,7 @@ const Input = _ref2 => {
           linkingData: linkingData,
           evaluationConfig: evaluationConfig
         }, key);
-      }), !formData || Array.isArray(formData) && !formData.length ? /*#__PURE__*/jsxRuntime.jsx("span", {
+      }), !formData || Array.isArray(formData) && !formData.length || formData === "" ? /*#__PURE__*/jsxRuntime.jsx("span", {
         className: "text-muted",
         children: t('Not answered')
       }) : (_ref3 = Array.isArray(formData) ? formData : [formData]) === null || _ref3 === void 0 ? void 0 : _ref3.map((item, itemId) => /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
@@ -24937,7 +24956,7 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$g = ["viewGroup"],
+const _excluded$h = ["viewGroup"],
   _excluded2$1 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
@@ -25009,7 +25028,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$g);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$h);
         items[gKey] = gCfg;
       }
       return items;
@@ -25289,7 +25308,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$f = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$g = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -25305,7 +25324,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$f);
+    props = _objectWithoutProperties(_ref, _excluded$g);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -39723,7 +39742,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-/* eslint-disable no-case-declarations */
+const _excluded$f = ["placeholder"];
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -39741,14 +39760,14 @@ const checkCondition = (condition, repeatValues, formsValue) => {
   return isShown;
 };
 function showHideInput(input, formsValue, repeatIndex, repeatValues, setValues, ref) {
-  if (input?.meta?.hidden === true) {
+  var _input$meta;
+  if ((input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.hidden) === true) {
+    var _input$meta2;
     // Set default value for hidden fields
-    if (input?.meta?.defaultValue !== undefined && !propHasValue(formsValue[ref])) {
+    if ((input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.defaultValue) !== undefined && !propHasValue(formsValue[ref])) {
       formsValue[ref] = input.meta.defaultValue;
       if (setValues && typeof setValues === 'function') {
-        setValues({
-          ...formsValue
-        });
+        setValues(_objectSpread2({}, formsValue));
       }
     }
     return false;
@@ -39807,35 +39826,35 @@ function getInputHeadLines(type, i, input, values) {
   switch (type) {
     case "h2":
       return /*#__PURE__*/jsxRuntime.jsx("h2", {
-        className: `title-semibold-2 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
+        className: "title-semibold-2 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h3":
       return /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: `title-semibold-3 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
+        className: "title-semibold-3 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h4":
       return /*#__PURE__*/jsxRuntime.jsx("h4", {
-        className: `title-semibold-4 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
+        className: "title-semibold-4 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h5":
       return /*#__PURE__*/jsxRuntime.jsx("h5", {
-        className: `title-semibold-5 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
+        className: "title-semibold-5 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h6":
       return /*#__PURE__*/jsxRuntime.jsx("h6", {
-        className: `title-semibold-6 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
+        className: "title-semibold-6 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
@@ -39844,7 +39863,9 @@ function getInputHeadLines(type, i, input, values) {
       return null;
   }
 }
-function getInputLabel(input, formsValue = {}, asText = false) {
+function getInputLabel(input) {
+  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  let asText = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if (typeof input.label === "object") {
     const validations = Object.keys(input.label);
     const key = validations.find(v => {
@@ -39902,7 +39923,8 @@ function getInputLabel(input, formsValue = {}, asText = false) {
     }) : ReactHtmlParser__default["default"](input.label);
   }
 }
-function getSelectOptions$1(option, formsValue = {}) {
+function getSelectOptions$1(option) {
+  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (typeof option.label === "object") {
     const validations = Object.keys(option.label);
     const key = validations.find(v => {
@@ -39926,7 +39948,9 @@ function getSectionLabel(labels, values) {
   }
   return labels;
 }
-function getSubtitles(subtitles, position, formsValue = {}, repeatIndex, repeatValues) {
+function getSubtitles(subtitles, position) {
+  let formsValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  let repeatValues = arguments.length > 4 ? arguments[4] : undefined;
   let subtitle = subtitles && subtitles[position];
   if (subtitle && typeof subtitle === "object") {
     let newSubtitle = subtitle.default || "";
@@ -39970,14 +39994,12 @@ function getSubtitles(subtitles, position, formsValue = {}, repeatIndex, repeatV
 function getFormTitles(titles, key, position) {
   let tilte = titles && titles[key];
   return tilte ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-    className: `title-semibold-3 mb0 ${position ? "mt-3" : ""}`,
+    className: "title-semibold-3 mb0 ".concat(position ? "mt-3" : ""),
     children: tilte
   }) : null;
 }
 const updateFormValues = (repeatIndex, repeatValues, inputName, value, formsValue, name, mainForm) => {
-  formsValue = Object.assign(formsValue, {
-    ...mainForm.getFieldsValue(true)
-  });
+  formsValue = Object.assign(formsValue, _objectSpread2({}, mainForm.getFieldsValue(true)));
   if (typeof repeatIndex === "number" && repeatValues) {
     if (!repeatValues[inputName] || !___default["default"].isEqual(repeatValues[inputName], value)) {
       repeatValues[inputName] = value;
@@ -40011,48 +40033,52 @@ const updateFormValues = (repeatIndex, repeatValues, inputName, value, formsValu
   }
 };
 const inputTypeComponent = {
-  text: ({
-    props,
-    rules
-  }, {
-    inputMeta = {},
-    t
-  }) => {
+  text: (_ref, _ref2) => {
+    let {
+      props,
+      rules
+    } = _ref;
+    let {
+      inputMeta = {},
+      t
+    } = _ref2;
     const maxRule = rules.find(r => r.max);
     const maxProps = {};
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
-      size: "medium",
-      ...maxProps,
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
+      size: "medium"
+    }, maxProps), {}, {
       allowClear: true,
       autoComplete: "new-password",
-      type: "text",
-      ...props,
+      type: "text"
+    }, props), {}, {
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    });
+    }));
   },
-  drawTerritory: ({
-    formsValue,
-    name,
-    addressData,
-    onValuesChange
-  }, {
-    setFormValues,
-    form
-  }) => {
+  drawTerritory: (_ref3, _ref4) => {
+    let {
+      formsValue,
+      name,
+      addressData,
+      onValuesChange
+    } = _ref3;
+    let {
+      setFormValues,
+      form
+    } = _ref4;
     let search = formsValue.country;
     if (addressData && addressData.address && Object.keys(addressData.address).length > 0) {
       if (addressData.address.country) {
         search = addressData.address.country;
       }
       if (addressData.address.level1) {
-        search = `${addressData.address.level1}, ${addressData.address.country}`;
+        search = "".concat(addressData.address.level1, ", ").concat(addressData.address.country);
       }
       if (addressData.address.level2) {
-        search = `${addressData.address.level2}, ${addressData.address.level1}, ${addressData.address.country}`;
+        search = "".concat(addressData.address.level2, ", ").concat(addressData.address.level1, ", ").concat(addressData.address.country);
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -40060,10 +40086,10 @@ const inputTypeComponent = {
         search = country.name;
       }
       if (formsValue.administrativeLevel1Name) {
-        search = `${search} ${formsValue.administrativeLevel1Name}`;
+        search = "".concat(search, " ").concat(formsValue.administrativeLevel1Name);
       }
       if (formsValue.administrativeLevel2Name) {
-        search = `${search} ${formsValue.administrativeLevel2Name}`;
+        search = "".concat(search, " ").concat(formsValue.administrativeLevel2Name);
       }
     }
     console.log("search", {
@@ -40083,10 +40109,9 @@ const inputTypeComponent = {
         const allFormValues = form && typeof form.getFieldsValue === 'function' ? form.getFieldsValue(true) : formsValue;
 
         // Create the updated values
-        const updatedValues = {
-          ...allFormValues,
+        const updatedValues = _objectSpread2(_objectSpread2({}, allFormValues), {}, {
           [name]: val
-        };
+        });
 
         // Call onValuesChange with the change and all values
         if (typeof onValuesChange === 'function') {
@@ -40101,39 +40126,44 @@ const inputTypeComponent = {
       searchValue: search
     });
   },
-  link: ({
-    props,
-    rules
-  }, {
-    inputMeta = {},
-    t
-  }) => {
+  link: (_ref5, _ref6) => {
+    let {
+      props,
+      rules
+    } = _ref5;
+    let {
+      inputMeta = {},
+      t
+    } = _ref6;
     const maxRule = rules.find(r => r.max);
     const maxProps = {};
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
-      size: "medium",
-      ...maxProps,
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
+      size: "medium"
+    }, maxProps), {}, {
       allowClear: true,
       autoComplete: "new-password",
-      type: "text",
-      ...props,
+      type: "text"
+    }, props), {}, {
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    });
+    }));
   },
-  number: ({
-    props,
-    rules,
-    input
-  }, {
-    inputMeta = {},
-    t
-  }) => {
+  number: (_ref7, _ref8) => {
+    var _input$meta3;
+    let {
+      props,
+      rules,
+      input
+    } = _ref7;
+    let {
+      inputMeta = {},
+      t
+    } = _ref8;
     const maxRule = rules.find(r => r.max);
-    const integerRule = !input?.meta?.isDecimal;
+    const integerRule = !(input !== null && input !== void 0 && (_input$meta3 = input.meta) !== null && _input$meta3 !== void 0 && _input$meta3.isDecimal);
     const parser = value => {
       if (!value) {
         return "";
@@ -40144,50 +40174,53 @@ const inputTypeComponent = {
       return value.replace(/\$\s?|(,*)/g, "");
     };
     if (maxRule) {
-      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
+      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
         allowClear: true,
-        autoComplete: "new-password",
-        ...props,
+        autoComplete: "new-password"
+      }, props), {}, {
         type: "number",
         min: 0,
         max: maxRule.max,
         parser: parser
-      });
+      }));
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
       allowClear: true,
-      autoComplete: "new-password",
-      ...props,
+      autoComplete: "new-password"
+    }, props), {}, {
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type number"),
       min: 0,
       formatter: value => numberWithCommas$1(value),
       parser: parser
-    });
+    }));
   },
-  select: ({
-    value,
-    options,
-    optionGroup,
-    props,
-    formsValue,
-    optionsFilter,
-    filterCond,
-    repeatValues,
-    repeatIndex,
-    name,
-    inputName,
-    address,
-    addressData,
-    input
-  }, {
-    forms,
-    form,
-    setAddress,
-    inputMeta = {},
-    t,
-    changeInputMeta
-  }) => {
+  select: (_ref9, _ref10) => {
+    var _input$meta4;
+    let {
+      value,
+      options,
+      optionGroup,
+      props,
+      formsValue,
+      optionsFilter,
+      filterCond,
+      repeatValues,
+      repeatIndex,
+      name,
+      inputName,
+      address,
+      addressData,
+      input
+    } = _ref9;
+    let {
+      forms,
+      form,
+      setAddress,
+      inputMeta = {},
+      t,
+      changeInputMeta
+    } = _ref10;
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -40243,18 +40276,19 @@ const inputTypeComponent = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
       autoComplete: "new-password",
       allowClear: true,
       showSearch: true,
-      defaultValue: input?.meta?.defaultValue,
+      defaultValue: input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.defaultValue,
       filterOption: filterSelectOptions,
-      optionFilterProp: "children",
-      ...props,
+      optionFilterProp: "children"
+    }, props), {}, {
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp$1(props.placeholder, formsValue) || t("Select one option"),
       onChange: (val, selectedValue) => {
-        if (typeof input?.meta?.onChange === "string") {
+        var _input$meta5;
+        if (typeof (input === null || input === void 0 || (_input$meta5 = input.meta) === null || _input$meta5 === void 0 ? void 0 : _input$meta5.onChange) === "string") {
           const [value, otherKey, otherVal] = input.meta.onChange.split(".");
           if (val === value) {
             changeInputMeta({
@@ -40268,9 +40302,7 @@ const inputTypeComponent = {
         }
         if (address && selectedValue) {
           dot__default["default"].str(address, selectedValue.children, addressData);
-          setAddress({
-            ...addressData
-          });
+          setAddress(_objectSpread2({}, addressData));
         }
         if (props.onChange) {
           props.onChange(val);
@@ -40282,33 +40314,35 @@ const inputTypeComponent = {
           value: og.value,
           disabled: og.disabled,
           children: og.label
-        }, `${i}${j}`))
+        }, "".concat(i).concat(j)))
       }, i) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
         value: option.value,
         disabled: option.disabled,
         children: option.label
       }, i))
-    });
+    }));
   },
-  multiselect: ({
-    value,
-    options,
-    optionGroup,
-    optionsFilter,
-    filterCond,
-    props,
-    formsValue,
-    repeatValues,
-    repeatIndex,
-    inputName,
-    name,
-    tags
-  }, {
-    forms,
-    form,
-    inputMeta = {},
-    t
-  }) => {
+  multiselect: (_ref11, _ref12) => {
+    let {
+      value,
+      options,
+      optionGroup,
+      optionsFilter,
+      filterCond,
+      props,
+      formsValue,
+      repeatValues,
+      repeatIndex,
+      inputName,
+      name,
+      tags
+    } = _ref11;
+    let {
+      forms,
+      form,
+      inputMeta = {},
+      t
+    } = _ref12;
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -40365,16 +40399,16 @@ const inputTypeComponent = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2(_objectSpread2({
       allowClear: true,
       autoComplete: "new-password",
       mode: tags ? "tags" : "multiple",
-      optionFilterProp: "children",
-      ...(tags ? {
-        tokenSeparators: [",", "\n", "\t"]
-      } : {}),
-      filterOption: filterSelectOptions,
-      ...props,
+      optionFilterProp: "children"
+    }, tags ? {
+      tokenSeparators: [",", "\n", "\t"]
+    } : {}), {}, {
+      filterOption: filterSelectOptions
+    }, props), {}, {
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp$1(props.placeholder, formsValue) || t("Select all relevant options"),
       children: (opts || []).map((option, i) => option.items ? /*#__PURE__*/jsxRuntime.jsx(antd.Select.OptGroup, {
@@ -40383,42 +40417,42 @@ const inputTypeComponent = {
           value: og.value,
           disabled: og.disabled,
           children: og.label
-        }, `${i}${j}`))
+        }, "".concat(i).concat(j)))
       }, i) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
         value: option.value,
         disabled: option.disabled,
         children: option.label
       }, i))
-    });
+    }));
   },
-  date: ({
-    props,
-    rules,
-    repeatValues,
-    formsValue,
-    name
-  }, {
-    inputMeta,
-    t,
-    groupFormId,
-    form,
-    setFormValues
-  }) => {
+  date: (_ref13, _ref14) => {
+    let {
+      props,
+      rules,
+      repeatValues,
+      formsValue,
+      name
+    } = _ref13;
+    let {
+      inputMeta,
+      t,
+      groupFormId,
+      form,
+      setFormValues
+    } = _ref14;
     const lng = localStorage.getItem("datastakeLng") || "en";
     const maxRule = rules.find(r => r.max);
     const handleDateChange = date => {
       if (date) {
         const localDate = dayjs__default["default"].utc(date);
         if (groupFormId) {
-          const _new = {
-            ...(formsValue[groupFormId] || {}),
+          const _new = _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
             [name]: localDate
-          };
+          });
           form.setFieldValue(groupFormId, _new);
-          setFormValues({
-            ...formsValue,
+          setFormValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
             [groupFormId]: _new
-          });
+          }));
         } else {
           form.setFieldValue(name, localDate);
         }
@@ -40430,10 +40464,10 @@ const inputTypeComponent = {
         checkForMax = checkCondition(maxRule.condition, repeatValues, formsValue);
       }
       if (checkForMax) {
-        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
+        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
           allowClear: true,
-          autoComplete: "new-password",
-          ...props,
+          autoComplete: "new-password"
+        }, props), {}, {
           onChange: handleDateChange,
           format: DATE_FORMATS,
           locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
@@ -40442,31 +40476,33 @@ const inputTypeComponent = {
           disabledDate: current => {
             return current && current >= dayjs__default["default"]().endOf("day");
           }
-        });
+        }));
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
       allowClear: true,
-      autoComplete: "new-password",
-      ...props,
+      autoComplete: "new-password"
+    }, props), {}, {
       onChange: handleDateChange,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Select date"),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       format: DATE_FORMATS,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"]
-    });
+    }));
   },
-  comment: ({
-    props: {
-      placeholder,
-      ...props
-    },
-    commentHint
-  }, {
-    onChange,
-    value
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
+  comment: (_ref15, _ref16) => {
+    let {
+        props: {
+          placeholder
+        },
+        commentHint
+      } = _ref15,
+      props = _objectWithoutProperties(_ref15.props, _excluded$f);
+    let {
+      onChange,
+      value
+    } = _ref16;
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
       allowClear: true,
       value: value,
       onChange: e => onChange(e.target.value),
@@ -40476,56 +40512,60 @@ const inputTypeComponent = {
       autoSize: {
         minRows: 5,
         maxRows: 5
-      },
-      ...props,
+      }
+    }, props), {}, {
       disabled: false
-    });
+    }));
   },
-  textarea: ({
-    props,
-    rules
-  }, {
-    inputMeta,
-    t
-  }) => {
+  textarea: (_ref17, _ref18) => {
+    let {
+      props,
+      rules
+    } = _ref17;
+    let {
+      inputMeta,
+      t
+    } = _ref18;
     const maxRule = rules.find(r => r.max);
     let maxLength = MAX_TEXT_AREA_LENGTH;
     if (maxRule) {
       maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
       allowClear: true,
       autoComplete: "new-password",
       maxLength: maxLength,
       autoSize: {
         minRows: 5,
         maxRows: 5
-      },
-      ...props,
+      }
+    }, props), {}, {
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    });
+    }));
   },
-  phoneNumber: ({
-    name,
-    inputName,
-    props,
-    value,
-    repeatIndex,
-    repeatValues,
-    formsValue
-  }, {
-    setFormValues,
-    t
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, {
+  phoneNumber: (_ref19, _ref20) => {
+    let {
+      name,
+      inputName,
+      props,
+      value,
+      repeatIndex,
+      repeatValues,
+      formsValue
+    } = _ref19;
+    let {
+      setFormValues,
+      t
+    } = _ref20;
+    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, _objectSpread2(_objectSpread2({
       t: t,
       doChangeErrors: false,
       allowClear: true,
-      country: formsValue?.country,
+      country: formsValue === null || formsValue === void 0 ? void 0 : formsValue.country,
       formsValue: formsValue,
-      initialValue: value,
-      ...props,
+      initialValue: value
+    }, props), {}, {
       onChange: val => {
         if (repeatValues) {
           const inputValues = Array.isArray(formsValue[name]) ? formsValue[name] || [] : [];
@@ -40541,24 +40581,25 @@ const inputTypeComponent = {
           setFormValues(formsValue);
         }
       }
-    });
+    }));
   },
-  switch: ({
-    props,
-    value,
-    restricted,
-    autocomplete,
-    formsValue,
-    repeatIndex,
-    name,
-    inputName,
-    replace
-  }, {
-    form,
-    setFormValues
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, {
-      ...props,
+  switch: (_ref21, _ref22) => {
+    let {
+      props,
+      value,
+      restricted,
+      autocomplete,
+      formsValue,
+      repeatIndex,
+      name,
+      inputName,
+      replace
+    } = _ref21;
+    let {
+      form,
+      setFormValues
+    } = _ref22;
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, _objectSpread2(_objectSpread2({}, props), {}, {
       defaultChecked: value || false,
       checked: value || false,
       onChange: isChecked => {
@@ -40600,14 +40641,15 @@ const inputTypeComponent = {
           setFormValues(formsValue);
         }
       }
-    });
+    }));
   },
-  total100: ({
-    props,
-    name,
-    options,
-    value
-  }) => {
+  total100: _ref23 => {
+    let {
+      props,
+      name,
+      options,
+      value
+    } = _ref23;
     value = value ? Array.isArray(value) ? value : [value] : [];
     function totalValue() {
       let total = 0;
@@ -40631,10 +40673,11 @@ const inputTypeComponent = {
       className: "total100",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: name,
-        children: (fields, {
-          add,
-          remove
-        }) => {
+        children: (fields, _ref24) => {
+          let {
+            add,
+            remove
+          } = _ref24;
           if (fields.length === 0) {
             const formData = value || [];
             if (formData.length) {
@@ -40653,26 +40696,26 @@ const inputTypeComponent = {
               const v = value[field.name];
               return /*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
                 className: "total",
-                children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                  noStyle: true,
-                  ...field,
+                children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
+                  noStyle: true
+                }, field), {}, {
                   name: [field.name, "type"],
                   fieldKey: [field.fieldKey, "type"],
                   initialValue: v.type,
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
                     allowClear: true,
                     showSearch: true,
                     filterOption: filterSelectOptions,
-                    optionFilterProp: "children",
-                    ...props,
+                    optionFilterProp: "children"
+                  }, props), {}, {
                     children: options.map((option, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
                       value: option.value,
                       children: option.label
                     }, i))
-                  })
-                }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                  noStyle: true,
-                  ...field,
+                  }))
+                })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
+                  noStyle: true
+                }, field), {}, {
                   name: [field.name, "value"],
                   fieldKey: [field.fieldKey, "value"],
                   initialValue: v.value,
@@ -40680,14 +40723,14 @@ const inputTypeComponent = {
                     allowClear: true,
                     name: "value",
                     formatter: value => {
-                      return value ? `${value}%` : "";
+                      return value ? "".concat(value, "%") : "";
                     },
                     disabled: !v.type,
                     placeholder: props.valueplaceholder ? props.valueplaceholder : "Value",
                     min: 1,
                     max: 100 - siblingTotal(v.type)
                   })
-                }), fields.length - 1 === i ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+                })), fields.length - 1 === i ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   disabled: !v.value || !v.type || totalValue() >= 100,
                   type: "primary",
                   icon: /*#__PURE__*/jsxRuntime.jsx(Icons.PlusOutlined, {}),
@@ -40719,18 +40762,21 @@ const inputTypeComponent = {
       }) : null]
     });
   },
-  percentage: ({
-    name,
-    inputName,
-    totalMax,
-    repeatIndex,
-    props,
-    formsValue,
-    input
-  }, {
-    inputMeta,
-    t
-  }) => {
+  percentage: (_ref25, _ref26) => {
+    var _input$meta6;
+    let {
+      name,
+      inputName,
+      totalMax,
+      repeatIndex,
+      props,
+      formsValue,
+      input
+    } = _ref25;
+    let {
+      inputMeta,
+      t
+    } = _ref26;
     const isRepeatable = Array.isArray(formsValue[name]);
     let totalSiblings = 0;
     if (isRepeatable && totalMax) {
@@ -40738,15 +40784,15 @@ const inputTypeComponent = {
         totl = totl + (grp[inputName] || 0);
         return totl;
       }, 0);
-    } else if (Array.isArray(input?.meta?.siblings)) {
+    } else if (Array.isArray(input === null || input === void 0 || (_input$meta6 = input.meta) === null || _input$meta6 === void 0 ? void 0 : _input$meta6.siblings)) {
       totalSiblings = input.meta.siblings.reduce((totl, key) => {
         totl = totl + (formsValue[key] || 0);
         return totl;
       }, 0);
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
-      allowClear: true,
-      ...props,
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+      allowClear: true
+    }, props), {}, {
       style: {
         width: "100%"
       },
@@ -40755,33 +40801,36 @@ const inputTypeComponent = {
       min: 0,
       max: 100 - totalSiblings,
       formatter: value => {
-        return value ? `${value}` : "";
+        return value ? "".concat(value) : "";
       },
       parser: value => value.replace("%", ""),
       addonAfter: "%"
-    });
+    }));
   },
-  year: ({
-    props
-  }) => {
+  year: _ref27 => {
+    let {
+      props
+    } = _ref27;
     const lng = localStorage.getItem("datastakeLng") || "en";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
       allowClear: true,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
-      picker: "year",
-      ...props,
+      picker: "year"
+    }, props), {}, {
       format: "YYYY"
-    });
+    }));
   },
-  upload: ({
-    rules,
-    value
-  }, {
-    setLoading,
-    t,
-    getApiBaseUrl,
-    getAppHeader
-  }) => {
+  upload: (_ref28, _ref29) => {
+    let {
+      rules,
+      value
+    } = _ref28;
+    let {
+      setLoading,
+      t,
+      getApiBaseUrl,
+      getAppHeader
+    } = _ref29;
     const apiURL = getApiBaseUrl();
     const accept = rules.length ? rules.find(rule => Object.keys(rule).includes("accept")).accept || "*" : null;
     const values = (Array.isArray(value) ? value : value && typeof value === "object" && value.fileList && Array.isArray(value.fileList) ? value.fileList.map(f => f.response).filter(f => f) : []) || [];
@@ -40794,13 +40843,12 @@ const inputTypeComponent = {
       }
     }
     const allowedExtensions = accept && accept !== "*" ? accept.split(",").map(ext => ext.trim().toLowerCase()) : [];
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
-      ...maxProps,
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({}, maxProps), {}, {
       accept: accept,
-      action: `${apiURL}/upload`,
+      action: "".concat(apiURL, "/upload"),
       beforeUpload: beforeUpload(allowedExtensions),
       onChange: val => {
-        if (val?.file && typeof setLoading === "function") {
+        if (val !== null && val !== void 0 && val.file && typeof setLoading === "function") {
           if (val.file.percent !== 100) {
             setLoading(true);
           } else {
@@ -40808,10 +40856,9 @@ const inputTypeComponent = {
           }
         }
       },
-      headers: {
-        Authorization: `Bearer ${getToken()}`,
-        ...getAppHeader()
-      },
+      headers: _objectSpread2({
+        Authorization: "Bearer ".concat(getToken())
+      }, getAppHeader()),
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40821,17 +40868,19 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    });
+    }));
   },
-  imageUpload: ({
-    rules,
-    value
-  }, {
-    setLoading,
-    getApiBaseUrl,
-    getAppHeader,
-    t
-  }) => {
+  imageUpload: (_ref30, _ref31) => {
+    let {
+      rules,
+      value
+    } = _ref30;
+    let {
+      setLoading,
+      getApiBaseUrl,
+      getAppHeader,
+      t
+    } = _ref31;
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -40842,17 +40891,17 @@ const inputTypeComponent = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
-      ...maxProps,
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({}, maxProps), {}, {
       beforeUpload: beforeUpload(allowedImageExtensions),
       accept: "image/*",
       classList: !values || !values.length ? "empty" : "",
       listType: "picture",
-      action: `${apiURL}/upload`,
+      action: "".concat(apiURL, "/upload"),
       onChange: val => {
         if (typeof setLoading === "function") {
-          if (val?.file) {
-            if (val?.file?.status === "removed") {
+          if (val !== null && val !== void 0 && val.file) {
+            var _val$file;
+            if ((val === null || val === void 0 || (_val$file = val.file) === null || _val$file === void 0 ? void 0 : _val$file.status) === "removed") {
               setLoading(false);
               return;
             }
@@ -40864,10 +40913,9 @@ const inputTypeComponent = {
           setLoading(false);
         }
       },
-      headers: {
-        Authorization: `Bearer ${getToken()}`,
-        ...getAppHeader()
-      },
+      headers: _objectSpread2({
+        Authorization: "Bearer ".concat(getToken())
+      }, getAppHeader()),
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40877,17 +40925,19 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    });
+    }));
   },
-  videoUpload: ({
-    rules,
-    value
-  }, {
-    setLoading = () => {},
-    getApiBaseUrl,
-    getAppHeader,
-    t
-  }) => {
+  videoUpload: (_ref32, _ref33) => {
+    let {
+      rules,
+      value
+    } = _ref32;
+    let {
+      setLoading = () => {},
+      getApiBaseUrl,
+      getAppHeader,
+      t
+    } = _ref33;
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -40898,21 +40948,25 @@ const inputTypeComponent = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
-      itemRender: (item, fileList) => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [/*#__PURE__*/jsxRuntime.jsx(EditVideoPreview, {
-          url: fileList?.response?.url || fileList?.url
-        }), item]
-      }),
-      ...maxProps,
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({
+      itemRender: (item, fileList) => {
+        var _fileList$response;
+        return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+          children: [/*#__PURE__*/jsxRuntime.jsx(EditVideoPreview, {
+            url: (fileList === null || fileList === void 0 || (_fileList$response = fileList.response) === null || _fileList$response === void 0 ? void 0 : _fileList$response.url) || (fileList === null || fileList === void 0 ? void 0 : fileList.url)
+          }), item]
+        });
+      }
+    }, maxProps), {}, {
       accept: "video/*",
       classList: !values || !values.length ? "empty" : "",
       listType: "picture",
-      action: `${apiURL}/upload`,
+      action: "".concat(apiURL, "/upload"),
       onChange: val => {
         if (typeof setLoading === "function") {
-          if (val?.file) {
-            if (val?.file?.status === "removed") {
+          if (val !== null && val !== void 0 && val.file) {
+            var _val$file2;
+            if ((val === null || val === void 0 || (_val$file2 = val.file) === null || _val$file2 === void 0 ? void 0 : _val$file2.status) === "removed") {
               setLoading(false);
               return;
             }
@@ -40924,10 +40978,9 @@ const inputTypeComponent = {
           setLoading(false);
         }
       },
-      headers: {
-        Authorization: `Bearer ${getToken()}`,
-        ...getAppHeader()
-      },
+      headers: _objectSpread2({
+        Authorization: "Bearer ".concat(getToken())
+      }, getAppHeader()),
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40937,17 +40990,19 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    });
+    }));
   },
-  geolocation: ({
-    value,
-    name,
-    formsValue,
-    addressData,
-    props
-  }, {
-    inputMeta
-  }) => {
+  geolocation: (_ref34, _ref35) => {
+    let {
+      value,
+      name,
+      formsValue,
+      addressData,
+      props
+    } = _ref34;
+    let {
+      inputMeta
+    } = _ref35;
     let search = formsValue.country;
     if (addressData && Object.keys(addressData).length > 0) {
       const country = countriesList.countries[formsValue.country] || {};
@@ -40955,10 +41010,10 @@ const inputTypeComponent = {
         search = addressData.country;
       }
       if (addressData.level1) {
-        search = `${addressData.level1}, ${addressData.country || country.name}`;
+        search = "".concat(addressData.level1, ", ").concat(addressData.country || country.name);
       }
       if (addressData.level2) {
-        search = `${addressData.level2}, ${addressData.level1}, ${addressData.country || country.name}`;
+        search = "".concat(addressData.level2, ", ").concat(addressData.level1, ", ").concat(addressData.country || country.name);
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -40966,10 +41021,10 @@ const inputTypeComponent = {
         search = country.name;
       }
       if (formsValue.administrativeLevel1Name) {
-        search = `${search} ${formsValue.administrativeLevel1Name}`;
+        search = "".concat(search, " ").concat(formsValue.administrativeLevel1Name);
       }
       if (formsValue.administrativeLevel2Name) {
-        search = `${search} ${formsValue.administrativeLevel2Name}`;
+        search = "".concat(search, " ").concat(formsValue.administrativeLevel2Name);
       }
     }
     return /*#__PURE__*/jsxRuntime.jsx(Geolocation, {
@@ -40982,33 +41037,35 @@ const inputTypeComponent = {
       searchValue: search
     });
   },
-  ajaxSelect: ({
-    call,
-    automaticallyLink,
-    name,
-    preSelected,
-    inputName,
-    props,
-    formsValue,
-    onNewSetValue,
-    multiple,
-    updateOptions,
-    repeatValues,
-    repeatIndex,
-    value,
-    unique,
-    address,
-    addressData = {},
-    input
-  }, {
-    form,
-    forms,
-    setAddress,
-    changeInputMeta,
-    inputMeta = {},
-    meta,
-    setFormValues
-  }) => {
+  ajaxSelect: (_ref36, _ref37) => {
+    let {
+      call,
+      automaticallyLink,
+      name,
+      preSelected,
+      inputName,
+      props,
+      formsValue,
+      onNewSetValue,
+      multiple,
+      updateOptions,
+      repeatValues,
+      repeatIndex,
+      value,
+      unique,
+      address,
+      addressData = {},
+      input
+    } = _ref36;
+    let {
+      form,
+      forms,
+      setAddress,
+      changeInputMeta,
+      inputMeta = {},
+      meta,
+      setFormValues
+    } = _ref37;
     return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect, {
       preSelected: preSelected,
       input: input,
@@ -41044,40 +41101,41 @@ const inputTypeComponent = {
           const selectedValue = data.find(v => v.value === ev);
           if (address && selectedValue) {
             dot__default["default"].str(address, selectedValue.label, addressData);
-            setAddress({
-              ...addressData
-            });
+            setAddress(_objectSpread2({}, addressData));
           }
         }
       },
       setAddress: setAddress
     });
   },
-  tag: ({
-    value,
-    repeatLabel
-  }) => {
+  tag: _ref38 => {
+    let {
+      value,
+      repeatLabel
+    } = _ref38;
     return /*#__PURE__*/jsxRuntime.jsx(TagInput$1, {
       allowClear: true,
       value: value || [],
       newPlaceholder: repeatLabel
     });
   },
-  modal: ({
-    call,
-    automaticallyLink,
-    name,
-    inputName,
-    props,
-    formsValue,
-    onNewSetValue,
-    repeatValues,
-    repeatIndex,
-    value,
-    modalTitle
-  }, {
-    form
-  }) => {
+  modal: (_ref39, _ref40) => {
+    let {
+      call,
+      automaticallyLink,
+      name,
+      inputName,
+      props,
+      formsValue,
+      onNewSetValue,
+      repeatValues,
+      repeatIndex,
+      value,
+      modalTitle
+    } = _ref39;
+    let {
+      form
+    } = _ref40;
     return /*#__PURE__*/jsxRuntime.jsx(AjaxModal$2, {
       allowClear: true,
       call: call,
@@ -41095,63 +41153,69 @@ const inputTypeComponent = {
       buttonText: modalTitle
     });
   },
-  website: ({
-    name,
-    inputName,
-    props,
-    value,
-    repeatIndex,
-    repeatValues,
-    formsValue
-  }, {
-    form,
-    inputMeta = {},
-    t
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(Website, {
+  website: (_ref41, _ref42) => {
+    let {
+      name,
+      inputName,
+      props,
+      value,
+      repeatIndex,
+      repeatValues,
+      formsValue
+    } = _ref41;
+    let {
+      form,
+      inputMeta = {},
+      t
+    } = _ref42;
+    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
       allowClear: true,
       initialValue: value,
-      t: t,
-      ...props,
+      t: t
+    }, props), {}, {
       onChange: val => updateFormValues(repeatIndex, repeatValues, inputName, val, formsValue, name, form),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com"
-    });
+    }));
   },
-  dataLink: ({
-    setValues,
-    name,
-    onValuesChange,
-    formsValue,
-    input,
-    changeLinking,
-    call,
-    automaticallyLink,
-    inputName,
-    props,
-    onNewSetValue,
-    multiple,
-    updateOptions,
-    repeatValues,
-    repeatIndex,
-    value,
-    unique,
-    address,
-    addressData = {},
-    getFromLinking
-  }, {
-    form,
-    groupFormId,
-    setAddress,
-    isHighlighted,
-    changeInputMeta,
-    meta,
-    inputMeta,
-    forms
-  }) => {
-    if (input?.meta?.optionsView?.editInputType === "ajaxSelect") {
-      const currentValue = groupFormId ? formsValue[groupFormId]?.[name] : formsValue[name];
-      input?.meta?.optionsView?.call || input?.meta?.call || "default::list()::::";
+  dataLink: (_ref43, _ref44) => {
+    var _input$meta7, _input$meta10, _formsValue$meta, _input$meta11;
+    let {
+      setValues,
+      name,
+      onValuesChange,
+      formsValue,
+      input,
+      changeLinking,
+      call,
+      automaticallyLink,
+      inputName,
+      props,
+      onNewSetValue,
+      multiple,
+      updateOptions,
+      repeatValues,
+      repeatIndex,
+      value,
+      unique,
+      address,
+      addressData = {},
+      getFromLinking
+    } = _ref43;
+    let {
+      form,
+      groupFormId,
+      setAddress,
+      isHighlighted,
+      changeInputMeta,
+      meta,
+      inputMeta,
+      forms
+    } = _ref44;
+    if ((input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 || (_input$meta7 = _input$meta7.optionsView) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.editInputType) === "ajaxSelect") {
+      var _formsValue$groupForm, _input$meta8, _input$meta9;
+      const currentValue = groupFormId ? (_formsValue$groupForm = formsValue[groupFormId]) === null || _formsValue$groupForm === void 0 ? void 0 : _formsValue$groupForm[name] : formsValue[name];
+      (input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 || (_input$meta8 = _input$meta8.optionsView) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.call) || (input === null || input === void 0 || (_input$meta9 = input.meta) === null || _input$meta9 === void 0 ? void 0 : _input$meta9.call) || "default::list()::::";
       return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect$1, {
         size: "medium",
         input: input,
@@ -41188,9 +41252,7 @@ const inputTypeComponent = {
             const selectedValue = data.find(v => v.value === ev);
             if (address && selectedValue) {
               dot__default["default"].str(address, selectedValue.label, addressData);
-              setAddress({
-                ...addressData
-              });
+              setAddress(_objectSpread2({}, addressData));
             }
           }
         },
@@ -41200,188 +41262,149 @@ const inputTypeComponent = {
         isDataLink: true
       });
     }
-    const isSingle = input?.meta?.maxRepeat === 1;
-    const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [{
-      ...(formsValue[groupFormId] || {})[name]
-    }] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => ({
-      ...v
-    })) : isSingle ? formsValue[name] ? [{
-      ...formsValue[name]
-    }] : [] : (formsValue[name] || []).map(v => ({
-      ...v
-    }));
+    const isSingle = (input === null || input === void 0 || (_input$meta10 = input.meta) === null || _input$meta10 === void 0 ? void 0 : _input$meta10.maxRepeat) === 1;
+    const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [_objectSpread2({}, (formsValue[groupFormId] || {})[name])] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => _objectSpread2({}, v)) : isSingle ? formsValue[name] ? [_objectSpread2({}, formsValue[name])] : [] : (formsValue[name] || []).map(v => _objectSpread2({}, v));
     const onUpdate = (val, i) => {
       const _val = isSingle ? {
         [name]: val
       } : {
-        [name]: formData?.map((d, j) => i === j ? val : d)
+        [name]: formData === null || formData === void 0 ? void 0 : formData.map((d, j) => i === j ? val : d)
       };
       if (groupFormId) {
-        const _defaultData = form?.getFieldValue(groupFormId) || {};
-        const _newData = {
-          ..._defaultData,
-          ..._val
-        };
-        onValuesChange(_newData, {
-          ...formsValue,
+        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
+        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
+        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
           [groupFormId]: _newData
-        });
-        form?.setFieldValue(groupFormId, _newData);
-        setValues({
-          ...formsValue,
+        }));
+        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
+        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
           [groupFormId]: _newData
-        });
+        }));
         return;
       }
-      onValuesChange(_val, {
-        ...formsValue,
-        ..._val
-      });
-      form?.setFieldValue(name, _val[name]);
-      setValues({
-        ...formsValue,
-        ..._val
-      });
+      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
+      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
+      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
     };
     return /*#__PURE__*/jsxRuntime.jsx(DataLink, {
       form: input,
       formsValue: formsValue,
       onUpdate: onUpdate,
       isHighlighted: isHighlighted,
-      values: groupFormId ? {
-        ...(formsValue[groupFormId] || {}),
+      values: groupFormId ? _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
         meta: {
-          inputs: (formsValue?.meta?.inputs || {})[groupFormId]
+          inputs: ((formsValue === null || formsValue === void 0 || (_formsValue$meta = formsValue.meta) === null || _formsValue$meta === void 0 ? void 0 : _formsValue$meta.inputs) || {})[groupFormId]
         }
-      } : formsValue,
+      }) : formsValue,
       name: name,
       groupFormId: groupFormId,
-      maxRepeat: input?.meta?.maxRepeat,
-      remove: ({
-        key
-      }) => {
+      maxRepeat: input === null || input === void 0 || (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.maxRepeat,
+      remove: _ref45 => {
+        let {
+          key
+        } = _ref45;
         const _val = isSingle ? {
           [name]: null
         } : {
           [name]: formData.filter((v, i) => i !== key)
         };
         if (groupFormId) {
-          const _defaultData = form?.getFieldValue(groupFormId) || {};
-          const _newData = {
-            ..._defaultData,
-            ..._val
-          };
-          onValuesChange(_newData, {
-            ...formsValue,
+          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
+          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
+          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
             [groupFormId]: _newData
-          });
-          form?.setFieldValue(groupFormId, _newData);
-          setValues({
-            ...formsValue,
+          }));
+          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
+          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
             [groupFormId]: _newData
-          });
+          }));
           return;
         }
-        onValuesChange(_val, {
-          ...formsValue,
-          ..._val
-        });
-        form?.setFieldValue(name, _val[name]);
-        setValues({
-          ...formsValue,
-          ..._val
-        });
+        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
+        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
+        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
       },
       add: val => {
         const _val = isSingle ? {
           [name]: val
         } : {
-          [name]: [...formData, {
-            ...val
-          }]
+          [name]: [...formData, _objectSpread2({}, val)]
         };
         if (groupFormId) {
-          const _defaultData = form?.getFieldValue(groupFormId) || {};
-          const _newData = {
-            ..._defaultData,
-            ..._val
-          };
-          form?.setFieldValue(groupFormId, _newData);
-          onValuesChange(_newData, {
-            ...formsValue,
+          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
+          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
+          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
+          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
             [groupFormId]: _newData
-          });
-          setValues({
-            ...formsValue,
+          }));
+          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
             [groupFormId]: _newData
-          });
+          }));
           return;
         }
-        form?.setFieldValue(name, _val[name]);
-        onValuesChange(_val, {
-          ...formsValue,
-          ..._val
-        });
-        setValues({
-          ...formsValue,
-          ..._val
-        });
+        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
+        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
+        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
       },
       k: name,
       formData: formData
     });
   },
-  internallink: ({
-    name,
-    inputName,
-    props,
-    value,
-    repeatIndex,
-    repeatValues,
-    formsValue
-  }, {
-    form,
-    inputMeta = {},
-    t
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(Website, {
+  internallink: (_ref46, _ref47) => {
+    let {
+      name,
+      inputName,
+      props,
+      value,
+      repeatIndex,
+      repeatValues,
+      formsValue
+    } = _ref46;
+    let {
+      form,
+      inputMeta = {},
+      t
+    } = _ref47;
+    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
       allowClear: true,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com",
-      initialValue: value,
-      ...props,
+      initialValue: value
+    }, props), {}, {
       onChange: val => updateFormValues(repeatIndex, repeatValues, inputName, val, formsValue, name, form)
-    });
+    }));
   },
-  group: ({
-    props,
-    groupInputs
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, {
-      groupInputs: groupInputs,
-      ...props
-    });
+  group: _ref48 => {
+    let {
+      props,
+      groupInputs
+    } = _ref48;
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, _objectSpread2({
+      groupInputs: groupInputs
+    }, props));
   },
-  groupInputs: ({
-    props,
-    groupInputs
-  }, {
-    inputMeta
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, {
+  groupInputs: (_ref49, _ref50) => {
+    let {
+      props,
+      groupInputs
+    } = _ref49;
+    let {
+      inputMeta
+    } = _ref50;
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, _objectSpread2({
       groupInputs: groupInputs,
-      inputMeta: inputMeta,
-      ...props
-    });
+      inputMeta: inputMeta
+    }, props));
   },
-  radioGroup: ({
-    props,
-    value,
-    options
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, {
-      value: value,
-      ...props,
+  radioGroup: _ref51 => {
+    let {
+      props,
+      value,
+      options
+    } = _ref51;
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, _objectSpread2(_objectSpread2({
+      value: value
+    }, props), {}, {
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Radio, {
           value: o.value,
@@ -41394,16 +41417,17 @@ const inputTypeComponent = {
           }) : null]
         }, o.value);
       })
-    });
+    }));
   },
-  checkboxGroup: ({
-    props,
-    value,
-    options
-  }) => {
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, {
-      value: value,
-      ...props,
+  checkboxGroup: _ref52 => {
+    let {
+      props,
+      value,
+      options
+    } = _ref52;
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, _objectSpread2(_objectSpread2({
+      value: value
+    }, props), {}, {
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Checkbox, {
           value: o.value,
@@ -41416,28 +41440,30 @@ const inputTypeComponent = {
           }) : null]
         }, o.value);
       })
-    });
+    }));
   }
 };
-const GetFormItem = ({
-  code,
-  inputData,
-  inputId,
-  input,
-  setLoading,
-  values,
-  MainForm,
-  options,
-  plainForms,
-  setValues,
-  alertError,
-  setAddress,
-  inputMeta = {},
-  inputKey,
-  changeInputMeta = () => {},
-  i,
-  isCreate = false
-}) => {
+const GetFormItem = _ref53 => {
+  var _find, _input$meta12, _input$meta13, _input$meta14, _input$meta15, _input$meta16, _input$meta17, _input$meta18, _inputData$value, _input$meta19, _input$meta20, _inputData$commentVal;
+  let {
+    code,
+    inputData,
+    inputId,
+    input,
+    setLoading,
+    values,
+    MainForm,
+    options,
+    plainForms,
+    setValues,
+    alertError,
+    setAddress,
+    inputMeta = {},
+    inputKey,
+    changeInputMeta = () => {},
+    i,
+    isCreate = false
+  } = _ref53;
   const {
     t,
     getAppHeader,
@@ -41453,7 +41479,7 @@ const GetFormItem = ({
     case "h6":
       return getInputHeadLines(input.type, i, input, values);
     default:
-      const rules = inputMeta?.notApplicable || inputMeta?.notAvailable ? [] : inputData.rules ? inputData.rules.filter(rule => !Object.keys(rule).includes("accept") && !Object.keys(rule).includes("max")) : [];
+      const rules = inputMeta !== null && inputMeta !== void 0 && inputMeta.notApplicable || inputMeta !== null && inputMeta !== void 0 && inputMeta.notAvailable ? [] : inputData.rules ? inputData.rules.filter(rule => !Object.keys(rule).includes("accept") && !Object.keys(rule).includes("max")) : [];
       const requiredRule = rules.find(r => r.required);
       if (requiredRule && input.type === "text") {
         rules.push({
@@ -41462,47 +41488,45 @@ const GetFormItem = ({
         });
       }
       const noLabel = ["message"].includes(input.type);
-      let maxRule = (inputData?.rules || []).find(rule => rule.max)?.max;
+      let maxRule = (_find = ((inputData === null || inputData === void 0 ? void 0 : inputData.rules) || []).find(rule => rule.max)) === null || _find === void 0 ? void 0 : _find.max;
       return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex input-cont",
-          children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-            initialValue: inputMeta?.defaultValue,
-            ...(["total100", "group"].includes(input.type) ? {} : {
-              name: inputId,
-              fieldKey: inputId,
-              initialValue: inputData.value
-            }),
-            ...(["upload", "imageUpload", "videoUpload"].includes(input.type) ? {
-              valuePropName: "fileList",
-              getValueFromEvent: e => {
-                if (Array.isArray(e)) {
-                  return e;
-                }
-                return e && e.fileList && e.fileList.map(f => {
-                  if (f.response) {
-                    return f.response;
-                  }
-                  return f;
-                });
+          children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+            initialValue: inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.defaultValue
+          }, ["total100", "group"].includes(input.type) ? {} : {
+            name: inputId,
+            fieldKey: inputId,
+            initialValue: inputData.value
+          }), ["upload", "imageUpload", "videoUpload"].includes(input.type) ? {
+            valuePropName: "fileList",
+            getValueFromEvent: e => {
+              if (Array.isArray(e)) {
+                return e;
               }
-            } : {}),
+              return e && e.fileList && e.fileList.map(f => {
+                if (f.response) {
+                  return f.response;
+                }
+                return f;
+              });
+            }
+          } : {}), {}, {
             style: input.showOnView === false ? {
               display: "none"
-            } : {},
-            ...(["switch"].includes(input.type) ? {
-              labelCol: {
-                span: 20
-              },
-              style: {
-                ...(input.showOnView === false ? {
-                  display: "none"
-                } : {}),
-                flexDirection: "row",
-                justifyContent: "space-between"
-              }
-            } : {}),
-            className: input.comment ? `flex-1 with-comment i-${input.type}` : `i-${input.type} flex-1`,
+            } : {}
+          }, ["switch"].includes(input.type) ? {
+            labelCol: {
+              span: 20
+            },
+            style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
+              display: "none"
+            } : {}), {}, {
+              flexDirection: "row",
+              justifyContent: "space-between"
+            })
+          } : {}), {}, {
+            className: input.comment ? "flex-1 with-comment i-".concat(input.type) : "i-".concat(input.type, " flex-1"),
             "data-id": inputData.name,
             rules: rules,
             required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
@@ -41513,8 +41537,8 @@ const GetFormItem = ({
               children: [/*#__PURE__*/jsxRuntime.jsx("div", {
                 className: "mr-1",
                 children: getInputLabel(input, values)
-              }), !!input?.meta?.tooltip && /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-                title: input?.meta?.tooltip,
+              }), !!(input !== null && input !== void 0 && (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.tooltip) && /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+                title: input === null || input === void 0 || (_input$meta13 = input.meta) === null || _input$meta13 === void 0 ? void 0 : _input$meta13.tooltip,
                 trigger: "hover",
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "flex flex-column justify-content-center",
@@ -41532,7 +41556,7 @@ const GetFormItem = ({
                     title: t("Not applicable"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
                       children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-                        disabled: !input?.meta?.notApplicable,
+                        disabled: !(input !== null && input !== void 0 && (_input$meta14 = input.meta) !== null && _input$meta14 !== void 0 && _input$meta14.notApplicable),
                         className: formatClassname(["default p-0", inputMeta.notApplicable && "primary"]),
                         type: "link",
                         onClick: () => {
@@ -41567,7 +41591,7 @@ const GetFormItem = ({
                     title: t("No available information"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
                       children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-                        disabled: !input?.meta?.notAvailable,
+                        disabled: !(input !== null && input !== void 0 && (_input$meta15 = input.meta) !== null && _input$meta15 !== void 0 && _input$meta15.notAvailable),
                         className: formatClassname(["default p-0", inputMeta.notAvailable && "primary"]),
                         type: "link",
                         onClick: () => {
@@ -41601,14 +41625,14 @@ const GetFormItem = ({
                   }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                     title: t("Add comment"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+                      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
                         type: "link",
-                        disabled: !input?.meta?.comment,
-                        ...(!isShown ? {
-                          className: "default p-0"
-                        } : {
-                          className: "p-0 primary"
-                        }),
+                        disabled: !(input !== null && input !== void 0 && (_input$meta16 = input.meta) !== null && _input$meta16 !== void 0 && _input$meta16.comment)
+                      }, !isShown ? {
+                        className: "default p-0"
+                      } : {
+                        className: "p-0 primary"
+                      }), {}, {
                         onClick: () => {
                           setIsShown(true);
                           changeInputMeta({
@@ -41624,18 +41648,18 @@ const GetFormItem = ({
                           width: 16,
                           height: 16
                         })
-                      })
+                      }))
                     })
                   })]
-                }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+                }), (_input$meta17 = input.meta) !== null && _input$meta17 !== void 0 && _input$meta17.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "code",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: input.meta?.code
+                    children: (_input$meta18 = input.meta) === null || _input$meta18 === void 0 ? void 0 : _input$meta18.code
                   })
                 }) : code ? /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "code",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: `${code}.${i + 1}`
+                    children: "".concat(code, ".").concat(i + 1)
                   })
                 }) : null]
               })
@@ -41655,7 +41679,7 @@ const GetFormItem = ({
               getAppHeader,
               getApiBaseUrl
             }) : console.log(input)
-          })
+          }))
         }), alertError ? /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
           message: alertError.message,
           type: "error",
@@ -41684,10 +41708,10 @@ const GetFormItem = ({
             className: "max-char-span",
             children: t("max-char", {
               chars: maxRule,
-              filled: inputData?.value?.length || 0
+              filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
             })
           })
-        }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+        }) : null, (_input$meta19 = input.meta) !== null && _input$meta19 !== void 0 && _input$meta19.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "input-content dynamic-form-comment",
           children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "comment-textarea",
@@ -41713,7 +41737,7 @@ const GetFormItem = ({
                 },
                 children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   type: "link",
-                  disabled: !input.meta?.comment,
+                  disabled: !((_input$meta20 = input.meta) !== null && _input$meta20 !== void 0 && _input$meta20.comment),
                   className: "p-0",
                   children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                     width: 16,
@@ -41744,7 +41768,7 @@ const GetFormItem = ({
             className: "max-char-span",
             children: t("max-char", {
               chars: MAX_COMMENTS_LENGTH,
-              filled: inputData?.commentValue?.length || 0
+              filled: (inputData === null || inputData === void 0 || (_inputData$commentVal = inputData.commentValue) === null || _inputData$commentVal === void 0 ? void 0 : _inputData$commentVal.length) || 0
             })
           })]
         }) : null]
@@ -42111,7 +42135,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   });
 };
 
-const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValues, setValues, MainForm) => {
+const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValues, setValues, MainForm, form) => {
   const combinedValuesRef = React.useRef({});
   React.useEffect(() => {
     if (!combinedPrefilledValues || Object.keys(combinedPrefilledValues).length === 0) {
@@ -42121,7 +42145,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
     let hasChanges = false;
     Object.keys(combinedPrefilledValues).forEach(fieldKey => {
       const template = combinedPrefilledValues[fieldKey];
-      const resolvedValue = resolveCombinedPrefilledValue(template, values, parentValues);
+      const resolvedValue = resolveCombinedPrefilledValue(template, values, parentValues, form);
       if (resolvedValue === null) {
         return;
       }
@@ -42300,7 +42324,7 @@ function DynamicForm(_ref) {
   }, [data, isCreate]);
 
   // Handle combined prefilled values (auto-fill based on templates)
-  useCombinedPrefilledValues(combinedPrefilledValues, values, parentValues, setValues, MainForm);
+  useCombinedPrefilledValues(combinedPrefilledValues, values, parentValues, setValues, MainForm, form);
 
   // Initialize default values for hidden and disabled fields
   React.useEffect(() => {
@@ -50984,6 +51008,7 @@ const BaseGraph = /*#__PURE__*/React.forwardRef(function BaseGraph({
     getViewport,
     fitView
   } = react.useReactFlow();
+  const hasInitialFitRef = React.useRef(false);
   const nodesToFit = React.useMemo(() => {
     let result;
     if (mandatoryNodesToFit) {
@@ -50994,27 +51019,29 @@ const BaseGraph = /*#__PURE__*/React.forwardRef(function BaseGraph({
     return result;
   }, [nodes.length, mandatoryNodesToFit?.length, mandatoryNodesToFit]);
 
-  // In BaseGraph.jsx, replace the useEffect with:
+  // Only auto-fit on initial render or when node count changes, not on property changes
   React.useEffect(() => {
     if (nodesToFit.length === 0) return;
 
-    // Use setTimeout instead of requestAnimationFrame to ensure nodes are rendered
-    const timer = setTimeout(() => {
-      fitView({
-        padding: 0.4,
-        nodes: [...nodesToFit],
-        // duration: withDuration ? 300 : undefined,
-        maxZoom: 0.9
-      });
-    }, 100); // Small delay to ensure nodes are rendered
-
-    return () => clearTimeout(timer);
-  }, [nodesToFit.length, nodesToFit.map(n => `${n.id}-${n.width}-${n.height}`).join(','), withDuration]);
+    // Only auto-fit on initial render or when node count changes
+    if (!hasInitialFitRef.current) {
+      hasInitialFitRef.current = true;
+      const timer = setTimeout(() => {
+        fitView({
+          padding: 0.4,
+          nodes: [...nodesToFit],
+          maxZoom: 0.9
+        });
+      }, 100);
+      return () => clearTimeout(timer);
+    }
+  }, [nodesToFit.length, withDuration]);
   return /*#__PURE__*/jsxRuntime.jsx(ComponentWithFocus, {
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
       style: {
         height: "100%",
-        width: "100%"
+        width: "100%",
+        position: "relative"
       },
       ref: ref,
       children: [filtersConfig ? /*#__PURE__*/jsxRuntime.jsx(Filters, {
@@ -51243,8 +51270,7 @@ function TradeRelationship(_ref) {
     filtersConfig,
     onFilterChange = () => {},
     renderTooltipItems = () => [],
-    getTotal = () => 0,
-    onRenderComplete = () => {}
+    getTotal = () => 0
   } = _ref;
   const reactFlowWrapper = React.useRef(null);
   const [nodes, setNodes] = react.useNodesState([]);
@@ -51257,27 +51283,6 @@ function TradeRelationship(_ref) {
   const [activeNode, setActiveNode] = React.useState(null);
   // const [initCenter, setInitCenter] = useState(true);
   const [associatedNodes, setAssociatedNodes] = React.useState(null);
-  const isFullyRenderedRef = React.useRef(false);
-  const [isFullyRendered, setIsFullyRendered] = React.useState(false);
-  React.useEffect(() => {
-    isFullyRenderedRef.current = false;
-    setIsFullyRendered(false);
-    setActiveNode(null);
-  }, [data]);
-  React.useEffect(() => {
-    if (nodes.length > 0 && edges.length > 0 && !isFullyRenderedRef.current) {
-      const timeoutId = setTimeout(() => {
-        isFullyRenderedRef.current = true;
-        setIsFullyRendered(true);
-        onRenderComplete(true);
-      }, 200);
-      return () => clearTimeout(timeoutId);
-    }
-    if (nodes.length === 0 || edges.length === 0) {
-      setIsFullyRendered(true);
-      onRenderComplete(true);
-    }
-  }, [nodes.length, edges.length, associatedNodes]);
   React.useEffect(() => {
     setActiveNode(null);
   }, [data]);
@@ -51464,7 +51469,7 @@ function TradeRelationship(_ref) {
 
     // Cleanup to prevent memory leaks if component unmounts quickly
     return () => clearTimeout(timeoutId);
-  }, [data, activeNode]);
+  }, [data]);
   React.useEffect(() => {
     if (activeNode) {
       let _associatedNodesRight = [activeNode];
@@ -55023,7 +55028,8 @@ function AccountTable(_ref) {
     module,
     defaultPageSize = 20,
     actionButton,
-    inviteAccount
+    inviteAccount,
+    refetchTrigger
   } = _ref;
   const accountTypes = config === null || config === void 0 ? void 0 : config.accountTypes;
   const [showFilters, setShowFilters] = React.useState(false);
@@ -55051,7 +55057,8 @@ function AccountTable(_ref) {
     filtersConfig: filtersConfig$c,
     getRedirectLink,
     getData,
-    fetchPendingOnMount: true
+    fetchPendingOnMount: true,
+    refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
     var _config$options;
@@ -58305,23 +58312,27 @@ function NewAccount({
   updateAccount,
   inviteAccount,
   isPending = false,
-  accountToEdit
+  accountToEdit,
+  countries
 }) {
   const [MainForm] = antd.Form.useForm();
   const [loading, setLoading] = React.useState(false);
   const [accountUsed, setAccountUsed] = React.useState(false);
   const isEdit = React.useMemo(() => accountToEdit && typeof accountToEdit === "object", [accountToEdit]);
+  const selectedCountry = React.useMemo(() => findOptions(accountToEdit?.otherData?.country, countries), [accountToEdit?.otherData?.country, countries]);
+  console.log(selectedCountry, "selectedCountry");
   React.useEffect(() => {
     if (accountToEdit && typeof accountToEdit === "object") {
       MainForm.setFieldsValue({
         name: accountToEdit.name,
         email: accountToEdit.email,
-        type: accountToEdit?.otherData?.interface
+        type: accountToEdit?.otherData?.interface,
+        country: selectedCountry
       });
     } else {
       MainForm.resetFields();
     }
-  }, [accountToEdit, MainForm]);
+  }, [accountToEdit, MainForm, selectedCountry]);
   const onSubmit = async () => {
     try {
       const val = await MainForm.validateFields();
@@ -58333,6 +58344,7 @@ function NewAccount({
           data: val,
           isPending: accountToEdit.status === 'pending' || isPending
         });
+        antd.message.success(t("Account successfully updated"));
       } else {
         if (!inviteAccount) {
           throw new Error("inviteAccount function is required for creating new accounts");
@@ -58372,7 +58384,7 @@ function NewAccount({
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: t("Type")
         })
-      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+      }), !isEdit && /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "email",
         label: t("Email"),
         rules: [{
@@ -58382,6 +58394,16 @@ function NewAccount({
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: t("Type")
         })
+      }), isEdit && /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        name: "country",
+        label: t("Country"),
+        rules: [{
+          required: true
+        }],
+        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+          placeholder: t("Select"),
+          options: countries
+        })
       }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "type",
         label: t("Type"),
@@ -58505,6 +58527,7 @@ function AdminAccountsScreen({
   };
   const [addAccountVisible, setAddAccountVisible] = React.useState(!!query.get("create"));
   const [accountToEdit, setAccountToEdit] = React.useState(null);
+  const [refetchTrigger, setRefetchTrigger] = React.useState(0);
   const actionButtons = React.useMemo(() => [{
     type: "primary",
     onClick: () => setAddAccountVisible(true),
@@ -58545,6 +58568,7 @@ function AdminAccountsScreen({
       headerTitle: "accounts",
       actionButton: actionButtons,
       getData: handleGetData,
+      refetchTrigger: refetchTrigger,
       config: {
         accountTypes,
         addAccountVisible,
@@ -58566,8 +58590,10 @@ function AdminAccountsScreen({
         setAccountToEdit(null);
       },
       accountTypes: accountTypes,
-      countriesOptions: options?.countries,
-      fetchData: () => {},
+      countries: options?.countries,
+      fetchData: () => {
+        setRefetchTrigger(prev => prev + 1);
+      },
       inviteAccount: data => AdminService.inviteAccount(data),
       updateAccount: ({
         data,