datastake-daf 0.6.785 → 0.6.787

package/dist/components/index.js

@@ -4778,7 +4778,7 @@ const config$2 = {
   Down: config$3
 };
 
-const _excluded$C = ["width", "height", "size", "name", "fill"];
+const _excluded$D = ["width", "height", "size", "name", "fill"];
 const CustomIcon = _ref => {
   let {
       width = 14,
@@ -4787,7 +4787,7 @@ const CustomIcon = _ref => {
       name = "",
       fill = "none"
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$C);
+    props = _objectWithoutProperties(_ref, _excluded$D);
   const conf = config$2[name];
   if (conf) {
     return /*#__PURE__*/jsxRuntime.jsx("svg", _objectSpread2(_objectSpread2({}, props), {}, {
@@ -5076,7 +5076,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$B = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$C = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
 dayjs__default["default"].extend(customParseFormat);
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(utc);
@@ -5452,7 +5452,7 @@ const filterCreateData = data => {
       createdAt,
       updatedAt
     } = data,
-    rest = _objectWithoutProperties(data, _excluded$B);
+    rest = _objectWithoutProperties(data, _excluded$C);
   const _meta = isObjectEmpty(meta) ? undefined : meta;
   return _objectSpread2(_objectSpread2({}, rest), {}, {
     meta: _meta
@@ -5848,7 +5848,7 @@ SelectFilters.propTypes = {
   apiUrl: PropTypes__default["default"].string
 };
 
-const _excluded$A = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
+const _excluded$B = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -5879,7 +5879,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$A);
+    rest = _objectWithoutProperties(_ref, _excluded$B);
   const [source, setSource] = React.useState([]);
   const projectData = (projects || []).find(p => p.id === selectedProject);
   const [filtersInit, setFiltersInit] = React.useState(!loading);
@@ -6697,7 +6697,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$f;
-const _excluded$z = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$A = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
 function StickyTable(_ref) {
   let {
       size = "small",
@@ -6708,7 +6708,7 @@ function StickyTable(_ref) {
       pagination = false,
       doEmptyRows = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$z);
+    props = _objectWithoutProperties(_ref, _excluded$A);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7233,7 +7233,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$y = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$z = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7247,7 +7247,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$y);
+    restProps = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7366,12 +7366,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$x = ["children"];
+const _excluded$y = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$x);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7511,12 +7511,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$w = ["icon"];
+const _excluded$x = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$w);
+    props = _objectWithoutProperties(_ref, _excluded$x);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -7846,7 +7846,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$v = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$w = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$n
 } = antd.theme;
@@ -7939,7 +7939,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$v);
+    restProps = _objectWithoutProperties(_ref, _excluded$w);
   const {
     token
   } = useToken$n();
@@ -8661,7 +8661,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$u = ["tabs", "onChange", "value", "className"];
+const _excluded$v = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8669,7 +8669,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$u);
+    rest = _objectWithoutProperties(_ref, _excluded$v);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8766,7 +8766,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$t = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$u = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8801,7 +8801,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$t);
+              restProps = _objectWithoutProperties(button, _excluded$u);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -9558,29 +9558,24 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = function (type, value, user, config) {
-  let getApiBaseUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
-  let getAppHeader = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : () => {};
-  let app = arguments.length > 6 ? arguments[6] : undefined;
-  let allValues = arguments.length > 7 ? arguments[7] : undefined;
-  let formValues = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {};
+const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        const language = user !== null && user !== void 0 && user.language && (user === null || user === void 0 ? void 0 : user.language) === 'sp' ? 'es' : user === null || user === void 0 ? void 0 : user.language;
+        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
+        const options = config?.options || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
+        const options = config?.options || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9595,7 +9590,7 @@ const renderFieldData = function (type, value, user, config) {
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
+      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9609,7 +9604,7 @@ const renderFieldData = function (type, value, user, config) {
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
+        const documentName = allValues?.map(item => item?.name).join(', ');
         return documentName;
       }
     default:
@@ -9617,27 +9612,25 @@ const renderFieldData = function (type, value, user, config) {
   }
 };
 
-const renderValue = _ref => {
-  let {
-    value,
-    hasChildren,
-    config,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    allData = {}
-  } = _ref;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
-    if (!(config !== null && config !== void 0 && config.inputs)) return null;
+const renderValue = ({
+  value,
+  hasChildren,
+  config,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  allData = {}
+}) => {
+  if (config?.type === 'groupInputs') {
+    if (!config?.inputs) return null;
     const inputKeys = Object.keys(config.inputs).sort((a, b) => {
-      var _config$inputs$a, _config$inputs$b;
-      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
-      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
+      const positionA = config.inputs[a]?.position || 0;
+      const positionB = config.inputs[b]?.position || 0;
       return positionA - positionB;
     });
     const values = inputKeys.map(inputKey => {
-      let inputValue = value === null || value === void 0 ? void 0 : value[inputKey];
+      let inputValue = value?.[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
       } else if (typeof inputValue === 'object' && inputValue !== null) {
@@ -9678,8 +9671,8 @@ const renderValue = _ref => {
   } else {
     displayValue = String(value);
   }
-  const fieldType = (config === null || config === void 0 ? void 0 : config.type) || 'text';
-  let cssClass = "tree-value ".concat(fieldType, "-type");
+  const fieldType = config?.type || 'text';
+  let cssClass = `tree-value ${fieldType}-type`;
   if (displayValue === '-') {
     cssClass += ' empty';
   }
@@ -9689,21 +9682,19 @@ const renderValue = _ref => {
     children: displayValue
   });
 };
-const determineHasChildren = _ref2 => {
-  var _config$meta;
-  let {
-    config,
-    level
-  } = _ref2;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
+const determineHasChildren = ({
+  config,
+  level
+}) => {
+  if (config?.type === 'groupInputs') {
     return false;
   }
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'header' && config !== null && config !== void 0 && config.inputs && Object.keys(config.inputs).length > 0) {
+  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
     return true;
   }
-  return (config === null || config === void 0 ? void 0 : config.inputs) || (config === null || config === void 0 ? void 0 : config.type) === 'group' || (config === null || config === void 0 ? void 0 : config.type) === 'dataLinkGroup' || (config === null || config === void 0 ? void 0 : config.type) === 'section' || (config === null || config === void 0 ? void 0 : config.type) === 'ajaxSubGroup' ||
+  return config?.inputs || config?.type === 'group' || config?.type === 'dataLinkGroup' || config?.type === 'section' || config?.type === 'ajaxSubGroup' ||
   // Add this line
-  (config === null || config === void 0 ? void 0 : config.type) === 'dataLink' && (config === null || config === void 0 || (_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.tableKeys) || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
+  config?.type === 'dataLink' && config?.meta?.tableKeys || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
 };
 
 const sortByPosition = (items, getConfig) => {
@@ -11691,7 +11682,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$s = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$t = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11702,7 +11693,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$s);
+    props = _objectWithoutProperties(_ref, _excluded$t);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11762,7 +11753,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$c;
-const _excluded$r = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$s = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11774,7 +11765,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -14735,7 +14726,7 @@ const useMap$1 = ({
   });
   function handleSelectMarker(clickedMarker) {
     setSelectedMarkersId(prev => {
-      if (prev.includes(clickedMarker.datastakeId)) {
+      if (openPopupIdRef.current === clickedMarker.datastakeId) {
         // Deselecting - clear polylines
         openPopupIdRef.current = null;
         setMarkerWithPopup(null);
@@ -15327,7 +15318,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$q = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$r = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15341,7 +15332,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17541,14 +17532,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$p = ["config", "title", "loading"];
+const _excluded$q = ["config", "title", "loading"];
 const Details = _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 card",
     loading: loading,
@@ -17564,14 +17555,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$o = ["config", "title", "loading"];
+const _excluded$p = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$o);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17601,7 +17592,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$n = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$o = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17609,7 +17600,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$n);
+    rest = _objectWithoutProperties(_ref, _excluded$o);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -17785,14 +17776,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$a;
-const _excluded$m = ["title", "activeSdgGoals", "t"];
+const _excluded$n = ["title", "activeSdgGoals", "t"];
 function SDGWidget(_ref) {
   let {
       title = "Sustainable Development Goals",
       activeSdgGoals = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18090,7 +18081,7 @@ function SdgList({
   });
 }
 
-const _excluded$l = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$m = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18110,7 +18101,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$l);
+    props = _objectWithoutProperties(_ref, _excluded$m);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18382,13 +18373,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$k = ["title", "children"];
+const _excluded$l = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$k);
+    rest = _objectWithoutProperties(_ref, _excluded$l);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18552,7 +18543,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$j = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$k = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18567,7 +18558,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$j);
+    rest = _objectWithoutProperties(_ref, _excluded$k);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -24123,7 +24114,7 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$i = ["viewGroup"],
+const _excluded$j = ["viewGroup"],
   _excluded2$1 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
@@ -24192,7 +24183,7 @@ const Content$1 = _ref => {
       if (groups[gKey].viewGroup === key) {
         // eslint-disable-next-line no-unused-vars
         const _groups$gKey = groups[gKey],
-          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$i);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$j);
         items[gKey] = gCfg;
       }
       return items;
@@ -24450,7 +24441,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$h = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$i = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -24466,7 +24457,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -35002,7 +34993,7 @@ const beforeUpload = allowedExtensions => file => {
 };
 const allowedImageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.avif', '.bmp', '.tiff', '.tif', '.heif', '.heic', '.svg', '.ico'];
 
-const _excluded$g = ["placeholder"],
+const _excluded$h = ["placeholder"],
   _excluded2 = ["label", "description", "excludeFromEdit", "showFormIf", "icon", "position", "template", "formClass"];
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(timezone);
@@ -35951,7 +35942,7 @@ const inputTypeComponent$1 = {
         },
         commentHint
       } = _ref19,
-      props = _objectWithoutProperties(_ref19.props, _excluded$g);
+      props = _objectWithoutProperties(_ref19.props, _excluded$h);
     let {
       onChange,
       value,
@@ -38633,7 +38624,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-const _excluded$f = ["placeholder"];
+const _excluded$g = ["placeholder"];
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -39388,7 +39379,7 @@ const inputTypeComponent = {
         },
         commentHint
       } = _ref15,
-      props = _objectWithoutProperties(_ref15.props, _excluded$f);
+      props = _objectWithoutProperties(_ref15.props, _excluded$g);
     let {
       onChange,
       value
@@ -41026,7 +41017,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   });
 };
 
-const _excluded$e = ["icon"];
+const _excluded$f = ["icon"];
 function DynamicForm(_ref) {
   var _data$meta;
   let {
@@ -41641,7 +41632,7 @@ function DynamicForm(_ref) {
           let {
               icon: Icon
             } = _ref3,
-            form = _objectWithoutProperties(_ref3, _excluded$e);
+            form = _objectWithoutProperties(_ref3, _excluded$f);
           return /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
             type: "link",
             size: "large",
@@ -41859,7 +41850,7 @@ const Navigation = _ref => {
 var _templateObject$7;
 const StyledSelect = styled__default["default"](antd.Select)(_templateObject$7 || (_templateObject$7 = _taggedTemplateLiteral(["\n  width: 100%;\n  \n  .ant-select-arrow {\n    margin-top: 1px !important;\n  }\n"])));
 
-const _excluded$d = ["onChange", "value"];
+const _excluded$e = ["onChange", "value"];
 function AuthForm(_ref) {
   var _steps$currentStep;
   let {
@@ -41989,7 +41980,7 @@ function AuthForm(_ref) {
         {
           var _field$options;
           const _ref3 = field.props || {},
-            restSelectProps = _objectWithoutProperties(_ref3, _excluded$d);
+            restSelectProps = _objectWithoutProperties(_ref3, _excluded$e);
           inputNode = /*#__PURE__*/jsxRuntime.jsx(StyledSelect, _objectSpread2(_objectSpread2({
             placeholder: field.placeholder
           }, restSelectProps), {}, {
@@ -42153,7 +42144,7 @@ function MultiBarProgress(_ref) {
 }
 const Style$x = styled__default["default"].div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteral(["\n\theight: 6px;\n\twidth: 100%;\n\tbackground: var(--base-gray-40);\n\tborder-radius: 8px;\n\tdisplay: flex;\n\toverflow: hidden;\n\tdiv {\n\t\theight: 100%;\n\t}\n"])));
 
-const _excluded$c = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
+const _excluded$d = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
 function MultiColorProgressBar(_ref) {
   let {
       tooltipTitle,
@@ -42165,7 +42156,7 @@ function MultiColorProgressBar(_ref) {
       },
       showInfo = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$c);
+    rest = _objectWithoutProperties(_ref, _excluded$d);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
     title: tooltipTitle,
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Progress, _objectSpread2({
@@ -42212,7 +42203,7 @@ const SideIcon = _ref3 => {
   });
 };
 
-const _excluded$b = ["value", "options", "onChange", "className", "width"];
+const _excluded$c = ["value", "options", "onChange", "className", "width"];
 const ProgressTabs = _ref => {
   let {
       value = 'setup',
@@ -42233,7 +42224,7 @@ const ProgressTabs = _ref => {
       className = '',
       width = '100%'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$b);
+    rest = _objectWithoutProperties(_ref, _excluded$c);
   // Transform options to include icons and handle disabled state
   const transformedOptions = options.map(option => _objectSpread2(_objectSpread2({}, option), {}, {
     label: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -44448,7 +44439,6 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
@@ -44464,10 +44454,12 @@ const filterParams = (value, module) => {
     ...filters
   } = activeFilters || {};
   const params = {};
-  params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
-  });
+  // Use skip and take inside pagination object
+  // Calculate skip from page number (page 1 = skip 1, page 2 = skip 21, etc.)
+  params.pagination = {
+    skip: page ? (page - 1) * (pageSize || 20) + 1 : 1,
+    take: pageSize || 20
+  };
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -44482,12 +44474,24 @@ const filterParams = (value, module) => {
   }
   if (Object.keys(filters).length) {
     if (value.sourceId && value.sourceId === "overview") {
-      params.filters = JSON.stringify(filters);
+      const {
+        activeTab,
+        ...restFilters
+      } = filters;
+      Object.assign(params, restFilters);
+      if (activeTab !== undefined) {
+        params.tab = activeTab;
+      }
     } else {
-      params.filters = JSON.stringify({
-        ...filters,
-        authorId: undefined
-      });
+      const {
+        authorId,
+        activeTab,
+        ...restFilters
+      } = filters;
+      Object.assign(params, restFilters);
+      if (activeTab !== undefined) {
+        params.tab = activeTab;
+      }
     }
   }
   return {
@@ -44785,7 +44789,7 @@ const renderRows = ({
   });
 };
 
-const _excluded$a = ["page", "pageSize"];
+const _excluded$b = ["page", "pageSize"];
 function DataStoreTable$1(_ref) {
   let {
     mod,
@@ -44883,7 +44887,7 @@ function DataStoreTable$1(_ref) {
           page,
           pageSize
         } = activeFilters,
-        rest = _objectWithoutProperties(activeFilters, _excluded$a);
+        rest = _objectWithoutProperties(activeFilters, _excluded$b);
       const params = _objectSpread2({
         pagination: {
           page,
@@ -45203,7 +45207,7 @@ const getLinkedColumns = ({
   ellipsis: true
 }];
 
-const _excluded$9 = ["administrativeLevel1", "administrativeLevel2"];
+const _excluded$a = ["administrativeLevel1", "administrativeLevel2"];
 function DataStoreView(_ref) {
   let {
     mod,
@@ -45266,7 +45270,7 @@ function DataStoreView(_ref) {
           administrativeLevel1,
           administrativeLevel2
         } = _ref2,
-        rest = _objectWithoutProperties(_ref2, _excluded$9);
+        rest = _objectWithoutProperties(_ref2, _excluded$a);
       const levels = [administrativeLevel1, administrativeLevel2].filter(p => !!p);
       let levelsRes = {
         data: []
@@ -46764,14 +46768,14 @@ const TabsStyled = styled__default["default"](antd.Tabs)`
 
 `;
 
-const _excluded$8 = ["defaultActiveKey", "items", "onChange"];
+const _excluded$9 = ["defaultActiveKey", "items", "onChange"];
 const StyledTabs = _ref => {
   let {
       defaultActiveKey,
       items,
       onChange
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$8);
+    rest = _objectWithoutProperties(_ref, _excluded$9);
   return /*#__PURE__*/jsxRuntime.jsx(TabsStyled, _objectSpread2({
     defaultActiveKey: defaultActiveKey,
     items: items,
@@ -46842,7 +46846,7 @@ const Container$1 = styled__default["default"].div`
 	width: ${props => props.isPdf ? props.width ? props.width : '1000px' : 'calc(100% - 48px)'}; 
 `;
 
-const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
+const _excluded$8 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
 const {
   useToken: useToken$g
 } = antd.theme;
@@ -46932,7 +46936,7 @@ function BarChart(_ref) {
       width,
       xAxisConfig = {}
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$7);
+    _objectWithoutProperties(_ref, _excluded$8);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47016,7 +47020,7 @@ function BarChart(_ref) {
   });
 }
 
-const _excluded$6 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
+const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
 const {
   useToken: useToken$f
 } = antd.theme;
@@ -47105,7 +47109,7 @@ function LineChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$6);
+    _objectWithoutProperties(_ref, _excluded$7);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47207,7 +47211,7 @@ function LineChart(_ref) {
   });
 }
 
-const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
+const _excluded$6 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
 const {
   useToken: useToken$e
 } = antd.theme;
@@ -47312,7 +47316,7 @@ function ColumnChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$5);
+    _objectWithoutProperties(_ref, _excluded$6);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47580,7 +47584,7 @@ function RadialBarChart(_ref) {
   });
 }
 
-const _excluded$4 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
+const _excluded$5 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
 const {
   useToken: useToken$c
 } = antd.theme;
@@ -47655,7 +47659,7 @@ function DonutPie(_ref) {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$4);
+    rest = _objectWithoutProperties(_ref, _excluded$5);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -48175,7 +48179,7 @@ function StackChart(_ref) {
   });
 }
 
-const _excluded$3 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
+const _excluded$4 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
 const {
   useToken: useToken$a
 } = antd.theme;
@@ -48252,7 +48256,7 @@ const AreaChart = _ref => {
       legendConfig = {},
       width
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$3);
+    rest = _objectWithoutProperties(_ref, _excluded$4);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -48340,7 +48344,7 @@ const AreaChart = _ref => {
   });
 };
 
-const _excluded$2 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
+const _excluded$3 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
 const {
   useToken: useToken$9
 } = antd.theme;
@@ -48365,7 +48369,7 @@ const RadarChart = _ref => {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$2);
+    rest = _objectWithoutProperties(_ref, _excluded$3);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -50697,7 +50701,7 @@ function StakeholderMappings(_ref3) {
 }
 var index = withProvider(StakeholderMappings);
 
-const _excluded$1 = ["t", "checkboxConfig", "defaultTableFilters", "columns", "children", "data", "loading", "APP", "getApiBaseUrl", "selectOptions", "selectFilters", "showCreate", "location", "goTo", "getRedirectLink", "defaultUrlParams", "view", "module", "filtersConfig", "isMobile"];
+const _excluded$2 = ["t", "checkboxConfig", "defaultTableFilters", "columns", "children", "data", "loading", "APP", "getApiBaseUrl", "selectOptions", "selectFilters", "showCreate", "location", "goTo", "getRedirectLink", "defaultUrlParams", "view", "module", "filtersConfig", "isMobile"];
 const BaseScreen = _ref => {
   var _data$data;
   let {
@@ -50735,7 +50739,7 @@ const BaseScreen = _ref => {
       filtersConfig,
       isMobile
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$1);
+    rest = _objectWithoutProperties(_ref, _excluded$2);
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
   const {
@@ -51168,6 +51172,7 @@ function useUserGrowth({
   const {
     token
   } = useToken$6();
+  console.log("mainData", mainData);
   const fetchData = () => {
     const {
       dates = []
@@ -51303,6 +51308,7 @@ function UserGrowth({
     t,
     translationKeys
   });
+  console.log("usergrowthhhhh", data);
   React.useEffect(() => {
     if (typeof fetchUserGrowth === "function") {
       fetchUserGrowth(selectValue);
@@ -51430,6 +51436,7 @@ function TopContributors({
     data,
     t
   });
+  console.log("topcontributorshhhh", data);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: t(`admin::top-contributors`),
     className: "with-border-header overflow-hidden h-w-btn-header",
@@ -51700,7 +51707,6 @@ function AddUserModal({
       setAccountUsed(true);
     }).catch(() => {});
   };
-  console.log("hellooooooooooooooooooooooooo");
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     open: isOpen,
     title: "admin::edit-user",
@@ -51826,7 +51832,7 @@ const renderTypeTag = ({
   });
 };
 
-const getColumns$6 = ({
+const getColumns$7 = ({
   t,
   show = "show",
   selectOptions,
@@ -52310,7 +52316,7 @@ function UserTable(_ref) {
       role: config.userRoles.filter(c => !c.isForAppAdmin)
     };
   }, [config.userRoles, config.accountTypes, accounts]);
-  const columns = React.useMemo(() => getColumns$6({
+  const columns = React.useMemo(() => getColumns$7({
     t,
     show: activeTab,
     selectOptions,
@@ -52406,7 +52412,7 @@ function UserTable(_ref) {
   });
 }
 
-const getColumns$5 = ({
+const getColumns$6 = ({
   t,
   goTo,
   show = "show",
@@ -52759,7 +52765,7 @@ const getTabs$1 = ({
   label: t("Suspended")
 }];
 
-const getColumns$4 = ({
+const getColumns$5 = ({
   t,
   selectOptions,
   module
@@ -52882,7 +52888,7 @@ function CombineAccountModal({
   } = useToken$4();
   const [MainForm] = antd.Form.useForm();
   const columns = React.useMemo(() => {
-    return getColumns$4({
+    return getColumns$5({
       t,
       selectOptions,
       module
@@ -53051,7 +53057,7 @@ function NewAccount({
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     t: t,
-    title: t(isEdit ? "admin::edit-account" : "admin::add-account"),
+    title: t(isEdit ? "edit-account" : "add-account"),
     open: isOpen,
     onClose: onClose,
     onSuccess: onSubmit,
@@ -53185,7 +53191,7 @@ function AccountTable(_ref) {
       onCancel: () => {}
     });
   }, [t, fetchData, fetchPendingAccounts]);
-  const columns = React.useMemo(() => getColumns$5({
+  const columns = React.useMemo(() => getColumns$6({
     t,
     show: activeTab,
     selectOptions,
@@ -53356,233 +53362,12 @@ const checkboxConfig$8 = {
   name: "Name",
   datastakeId: "ID"
 };
-const getNameByLevel = (data, level) => {
+const getNameByLevel$1 = (data, level) => {
   const entry = Object.values(data || {}).find(item => item.level === level);
   return entry;
 };
 
-const getColumns$3 = ({
-  t,
-  goTo = () => {},
-  show = "show",
-  getRedirectLink = () => {},
-  token,
-  selectedSubjects,
-  setSelectedSubjects,
-  selectOptions,
-  entity
-}) => {
-  const cols = [{
-    title: "",
-    dataIndex: "select",
-    key: "select",
-    width: 50,
-    show: true,
-    render: (v, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
-        onChange: () => setSelectedSubjects(prev => {
-          const isSelected = prev.some(p => p.id === all.id);
-          if (isSelected) {
-            return prev.filter(p => p.id !== all.id);
-          }
-          return [...prev, all];
-        }),
-        checked: selectedSubjects.some(p => p.id === all.id),
-        disabled: selectedSubjects?.length >= 3 && !selectedSubjects.some(p => p.id === all.id)
-      });
-    }
-  }, {
-    title: t("ID"),
-    dataIndex: "datastakeId",
-    key: "datastakeId",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
-      });
-    }
-  }, {
-    title: t("Name"),
-    dataIndex: "name",
-    key: "name",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
-      });
-    }
-  }, {
-    title: t("Category"),
-    dataIndex: "category",
-    key: "category",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const category = findOptions(value, selectOptions?.category || []) || "--";
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: category,
-        children: category
-      });
-    }
-  }, {
-    title: t("Country"),
-    dataIndex: "country",
-    key: "country",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const country = findOptions(value, selectOptions?.country || []) || "--";
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: country,
-        children: country
-      });
-    }
-  }, {
-    title: t("Province"),
-    dataIndex: "administrativeLevel1",
-    key: "administrativeLevel1",
-    ellipsis: true,
-    show: entity.includes("locations"),
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      let label;
-      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-        label = all?.linking?.SCL?.[value]?.name;
-      } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label || '-',
-        children: label || '-'
-      });
-    }
-  }, {
-    title: t("Territory"),
-    dataIndex: "administrativeLevel2",
-    key: "administrativeLevel2",
-    show: entity.includes("locations"),
-    ellipsis: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      let label;
-      if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-        label = all?.linking?.SCL?.[value]?.name;
-      } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label || '-',
-        children: label || '-'
-      });
-    }
-  }, {
-    title: t("Sources"),
-    dataIndex: "sources",
-    key: "sources",
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const MAX_SOURCES = 3;
-      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
-      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
-        max: {
-          count: count,
-          style: {
-            color: token.baseGray90,
-            backgroundColor: token.baseGray20,
-            border: `1px solid ${token.baseGray40}`
-          }
-        },
-        size: "small",
-        children: value.map((v, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Avatar, {
-          size: "small",
-          style: {
-            backgroundColor: token.baseGray20,
-            color: token.baseGray90,
-            border: `1px solid ${token.baseGray40}`,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center"
-          },
-          children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-            name: "Organisation02",
-            width: 18,
-            height: 18,
-            color: token.baseGray90
-          })
-        }, i))
-      }) : '-';
-    }
-  }, {
-    title: "",
-    dataIndex: "actions",
-    key: "actions",
-    width: 60,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "cursor-pointer",
-        onClick: () => {
-          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
-        },
-        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-          name: "Link",
-          width: 18,
-          height: 18
-        })
-      });
-    }
-  }];
-  return cols.filter(c => c[show]);
-};
-
-const getColumns$2 = ({
+const getColumns$4 = ({
   t,
   selectOptions,
   module,
@@ -53645,7 +53430,7 @@ const getColumns$2 = ({
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
+        label = getNameByLevel$1(all?.linking?.SCL, "level_1")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -53662,7 +53447,7 @@ const getColumns$2 = ({
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
+        label = getNameByLevel$1(all?.linking?.SCL, "level_2")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -53691,7 +53476,7 @@ function CombineLocationModal({
   const [MainForm] = antd.Form.useForm();
   const [isDisabled, setIsDisabled] = React.useState(true);
   const columns = React.useMemo(() => {
-    return getColumns$2({
+    return getColumns$4({
       t,
       selectOptions,
       module,
@@ -53809,7 +53594,7 @@ function CombineLocationModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Province"),
               options: selectedLocations.map(location => {
-                const _data = getNameByLevel(location?.linking?.SCL, "level_1");
+                const _data = getNameByLevel$1(location?.linking?.SCL, "level_1");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -53822,7 +53607,7 @@ function CombineLocationModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Territory"),
               options: selectedLocations.map(location => {
-                const _data = getNameByLevel(location?.linking?.SCL, "level_2");
+                const _data = getNameByLevel$1(location?.linking?.SCL, "level_2");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -53840,6 +53625,233 @@ function CombineLocationModal({
   });
 }
 
+const getNameByLevel = (data, level) => {
+  const entry = Object.values(data || {}).find(item => item.level === level);
+  return entry;
+};
+
+const getColumns$3 = ({
+  t,
+  goTo = () => {},
+  show = "show",
+  getRedirectLink = () => {},
+  token,
+  selectedLocations,
+  setSelectedLocations,
+  selectOptions,
+  entity
+}) => {
+  const cols = [{
+    title: "",
+    dataIndex: "select",
+    key: "select",
+    width: 50,
+    show: true,
+    render: (v, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+        onChange: () => setSelectedLocations(prev => {
+          const isSelected = prev.some(p => p.id === all.id);
+          if (isSelected) {
+            return prev.filter(p => p.id !== all.id);
+          }
+          return [...prev, all];
+        }),
+        checked: selectedLocations.some(p => p.id === all.id),
+        disabled: selectedLocations?.length >= 3 && !selectedLocations.some(p => p.id === all.id)
+      });
+    }
+  }, {
+    title: t("ID"),
+    dataIndex: "datastakeId",
+    key: "datastakeId",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: value,
+        children: value
+      });
+    }
+  }, {
+    title: t("Name"),
+    dataIndex: "name",
+    key: "name",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: value,
+        children: value
+      });
+    }
+  }, {
+    title: t("Category"),
+    dataIndex: "category",
+    key: "category",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const category = findOptions(value, selectOptions?.category || []) || "--";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: category,
+        children: category
+      });
+    }
+  }, {
+    title: t("Country"),
+    dataIndex: "country",
+    key: "country",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const country = findOptions(value, selectOptions?.country || []) || "--";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: country,
+        children: country
+      });
+    }
+  }, {
+    title: t("Admin Level 1"),
+    dataIndex: "administrativeLevel1",
+    key: "administrativeLevel1",
+    ellipsis: true,
+    show: entity.includes("location"),
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      let label;
+      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+        label = all?.linking?.SCL?.[value]?.name;
+      } else {
+        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label || '-',
+        children: label || '-'
+      });
+    }
+  }, {
+    title: t("Admin Level 2"),
+    dataIndex: "administrativeLevel2",
+    key: "administrativeLevel2",
+    show: entity.includes("location"),
+    ellipsis: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      let label;
+      if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+        label = all?.linking?.SCL?.[value]?.name;
+      } else {
+        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label || '-',
+        children: label || '-'
+      });
+    }
+  }, {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const MAX_SOURCES = 3;
+      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
+      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
+        max: {
+          count: count,
+          style: {
+            color: token.baseGray90,
+            backgroundColor: token.baseGray20,
+            border: `1px solid ${token.baseGray40}`
+          }
+        },
+        size: "small",
+        children: value.map((v, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Avatar, {
+          size: "small",
+          style: {
+            backgroundColor: token.baseGray20,
+            color: token.baseGray90,
+            border: `1px solid ${token.baseGray40}`,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center"
+          },
+          children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+            name: "Organisation02",
+            width: 18,
+            height: 18,
+            color: token.baseGray90
+          })
+        }, i))
+      }) : '-';
+    }
+  }, {
+    title: "",
+    dataIndex: "actions",
+    key: "actions",
+    width: 60,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "cursor-pointer",
+        onClick: () => {
+          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+        },
+        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+          name: "Link",
+          width: 18,
+          height: 18
+        })
+      });
+    }
+  }];
+  return cols.filter(c => c[show]);
+};
+
+const _excluded$1 = ["pagination", "tab"];
 const {
   useToken: useToken$2
 } = antd.theme;
@@ -53867,6 +53879,29 @@ function LocationTable(_ref) {
     token
   } = useToken$2();
   const [combineLocationVisible, setCombineLocationVisible] = React.useState(false);
+
+  // Wrapper to transform pagination params to strings and ensure tab is at root level
+  const getDataWithStringPagination = async _ref2 => {
+    let {
+      params
+    } = _ref2;
+    // Extract tab from the params (it should already be there from filterParams)
+    const {
+        pagination,
+        tab
+      } = params,
+      otherParams = _objectWithoutProperties(params, _excluded$1);
+    const transformedParams = _objectSpread2(_objectSpread2({}, otherParams), {}, {
+      pagination: {
+        skip: String((pagination === null || pagination === void 0 ? void 0 : pagination.skip) || 1),
+        take: String((pagination === null || pagination === void 0 ? void 0 : pagination.take) || 20)
+      },
+      tab: tab || "active" // Ensure tab is at root level with default value
+    });
+    return getData({
+      params: transformedParams
+    });
+  };
   const {
     filter,
     activeTab,
@@ -53888,7 +53923,7 @@ function LocationTable(_ref) {
     defaultPageSize,
     filtersConfig: filtersConfig$8,
     getRedirectLink,
-    getData,
+    getData: getDataWithStringPagination,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
@@ -53916,7 +53951,7 @@ function LocationTable(_ref) {
     children: [/*#__PURE__*/jsxRuntime.jsxs(AdminTable, {
       filters: filter,
       t: t,
-      headerTitle: headerTitle,
+      headerTitle: "test",
       actionButton: [{
         icon: "Merge",
         onClick: () => setCombineLocationVisible(true),
@@ -53984,6 +54019,7 @@ function LocationTable(_ref) {
         if (typeof mergeSubjectsFunction === 'function') {
           mergeSubjectsFunction(data);
           setSelectedLocations([]);
+          antd.message.success(t("Locations successfully merged."));
         }
       },
       selectedLocations: selectedLocations,
@@ -53994,6 +54030,227 @@ function LocationTable(_ref) {
   });
 }
 
+const getColumns$2 = ({
+  t,
+  goTo = () => {},
+  show = "show",
+  getRedirectLink = () => {},
+  token,
+  selectedSubjects,
+  setSelectedSubjects,
+  selectOptions,
+  entity
+}) => {
+  const cols = [{
+    title: "",
+    dataIndex: "select",
+    key: "select",
+    width: 50,
+    show: true,
+    render: (v, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+        onChange: () => setSelectedSubjects(prev => {
+          const isSelected = prev.some(p => p.id === all.id);
+          if (isSelected) {
+            return prev.filter(p => p.id !== all.id);
+          }
+          return [...prev, all];
+        }),
+        checked: selectedSubjects.some(p => p.id === all.id),
+        disabled: selectedSubjects?.length >= 3 && !selectedSubjects.some(p => p.id === all.id)
+      });
+    }
+  }, {
+    title: t("ID"),
+    dataIndex: "datastakeId",
+    key: "datastakeId",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: value,
+        children: value
+      });
+    }
+  }, {
+    title: t("Name"),
+    dataIndex: "name",
+    key: "name",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: value,
+        children: value
+      });
+    }
+  }, {
+    title: t("Category"),
+    dataIndex: "category",
+    key: "category",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const category = findOptions(value, selectOptions?.category || []) || "--";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: category,
+        children: category
+      });
+    }
+  }, {
+    title: t("Country"),
+    dataIndex: "country",
+    key: "country",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const country = findOptions(value, selectOptions?.country || []) || "--";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: country,
+        children: country
+      });
+    }
+  }, {
+    title: t("Admin Level 1"),
+    dataIndex: "administrativeLevel1",
+    key: "administrativeLevel1",
+    ellipsis: true,
+    show: entity.includes("location"),
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      let label;
+      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+        label = all?.linking?.SCL?.[value]?.name;
+      } else {
+        label = getNameByLevel$1(all?.linking?.SCL, "level_1")?.name;
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label || '-',
+        children: label || '-'
+      });
+    }
+  }, {
+    title: t("Admin Level 2"),
+    dataIndex: "administrativeLevel2",
+    key: "administrativeLevel2",
+    show: entity.includes("location"),
+    ellipsis: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      let label;
+      if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+        label = all?.linking?.SCL?.[value]?.name;
+      } else {
+        label = getNameByLevel$1(all?.linking?.SCL, "level_2")?.name;
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label || '-',
+        children: label || '-'
+      });
+    }
+  }, {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const MAX_SOURCES = 3;
+      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
+      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
+        max: {
+          count: count,
+          style: {
+            color: token.baseGray90,
+            backgroundColor: token.baseGray20,
+            border: `1px solid ${token.baseGray40}`
+          }
+        },
+        size: "small",
+        children: value.map((v, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Avatar, {
+          size: "small",
+          style: {
+            backgroundColor: token.baseGray20,
+            color: token.baseGray90,
+            border: `1px solid ${token.baseGray40}`,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center"
+          },
+          children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+            name: "Organisation02",
+            width: 18,
+            height: 18,
+            color: token.baseGray90
+          })
+        }, i))
+      }) : '-';
+    }
+  }, {
+    title: "",
+    dataIndex: "actions",
+    key: "actions",
+    width: 60,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "cursor-pointer",
+        onClick: () => {
+          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+        },
+        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+          name: "Link",
+          width: 18,
+          height: 18
+        })
+      });
+    }
+  }];
+  return cols.filter(c => c[show]);
+};
+
 const mapToSelectOptions = (items, valueKey, selectOptions, optionKey, customMapper = null) => {
   return items.map(item => {
     if (customMapper) {
@@ -54072,7 +54329,7 @@ const getColumns$1 = ({
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
+        label = getNameByLevel$1(all?.linking?.SCL, "level_1")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -54089,7 +54346,7 @@ const getColumns$1 = ({
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
+        label = getNameByLevel$1(all?.linking?.SCL, "level_2")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -54221,7 +54478,7 @@ function CombineSubjectsModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Province"),
               options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
-                const _data = getNameByLevel(subject?.linking?.SCL, "level_1");
+                const _data = getNameByLevel$1(subject?.linking?.SCL, "level_1");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -54234,7 +54491,7 @@ function CombineSubjectsModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Territory"),
               options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
-                const _data = getNameByLevel(subject?.linking?.SCL, "level_2");
+                const _data = getNameByLevel$1(subject?.linking?.SCL, "level_2");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -54308,11 +54565,11 @@ function SubjectsTable(_ref) {
     return {
       category: (_config$options = config.options) === null || _config$options === void 0 ? void 0 : _config$options.category,
       country: (_config$options2 = config.options) === null || _config$options2 === void 0 ? void 0 : _config$options2.countries,
-      sources: [] //TODO: add sources logic and make sure you only show unique sources only once
+      sources: []
     };
   }, [config.options]);
   const columns = React.useMemo(() => {
-    return getColumns$3({
+    return getColumns$2({
       t,
       goTo,
       token,
@@ -54387,19 +54644,20 @@ function SubjectsTable(_ref) {
     }), /*#__PURE__*/jsxRuntime.jsx(CombineSubjectsModal, {
       isOpen: isCombineModalOpen,
       t: t,
-      onClose: () => {
-        setIsModalOpen(false);
-      },
+      onClose: () => setIsModalOpen(false),
       onSuccess: data => {
         setIsModalOpen(false);
         setLoading(true);
+        antd.message.success(t("Subjects successfully merged."));
         if (typeof mergeSubjectsFunction === 'function') {
-          mergeSubjectsFunction(data);
-          setSelectedSubjects([]);
+          mergeSubjectsFunction(data).finally(() => {
+            setSelectedSubjects([]);
+            fetchData();
+          });
         }
       },
       selectedSubjects: selectedSubjects,
-      selectOptions: selectOptions || {},
+      selectOptions: selectOptions,
       module: module,
       entity: headerTitle
     })]
@@ -54852,10 +55110,7 @@ const getColumns = ({
   }];
   return cols.filter(v => v.show);
 };
-const checkboxConfig$7 = {
-  name: "Name",
-  datastakeId: "ID"
-};
+const checkboxConfig$7 = {};
 const selectFiltersConfig$7 = {
   userRole: {
     type: "select",
@@ -54885,11 +55140,18 @@ const selectFiltersConfig$7 = {
   }
 };
 const filtersConfig$7 = {
-  name: "",
-  datastakeId: ""
+  search: ""
+};
+const defaultUrlParams = {
+  search: "",
+  userRole: null,
+  status: null
+};
+const defaultTableFilters = {
+  search: "",
+  userRole: null,
+  status: null
 };
-const defaultUrlParams = {};
-const defaultTableFilters = {};
 
 function Users({
   t,
@@ -54933,9 +55195,9 @@ function Users({
       userRole: userRoles.filter(u => !u.isForAppAdmin),
       status: accountStatuses
     };
-  }, [userRoles]);
+  }, [userRoles, accountStatuses]);
   const canClearSearch = React.useMemo(() => {
-    return !!activeFilters.search;
+    return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
   }, [activeFilters]);
   const onDeleteUserClick = React.useCallback(id => {
     antd.Modal.confirm({
@@ -55654,9 +55916,9 @@ function AdminDashboardScreen({
     fetchUserGrowth,
     userGrowthDataLoading
   } = useWidgetFetch();
-  console.log({
-    userGrowthData
-  });
+
+  // console.log({userGrowthData});
+
   const actionsWidgetsConfig = React.useMemo(() => getActionWidgetsConfig({
     getRedirectLink
   }), [getRedirectLink, getActionWidgetsConfig]);
@@ -55667,6 +55929,7 @@ function AdminDashboardScreen({
   const safeUserActivity = Array.isArray(data?.data?.userActivity) ? data.data.userActivity : [];
   const safeTopContributors = Array.isArray(data?.topContributors) ? data.topContributors : [];
   const safeUserGrowth = Array.isArray(data?.userGrowthData) ? data.userGrowthData : [];
+  console.log("safeUserGrowth", safeUserGrowth);
   return /*#__PURE__*/jsxRuntime.jsx(AdminDashboard, {
     t: t,
     goTo: goTo,
@@ -55922,7 +56185,10 @@ function AdminSubjectsScreen({
   const handleMergeSubjects = React.useCallback(async mergeData => {
     try {
       if (AdminService.mergeSubjects) {
-        await AdminService.mergeSubjects(mergeData);
+        await AdminService.mergeSubjects({
+          subject: 'stakeholder',
+          ...mergeData
+        });
         antd.message.success(t("Subjects merged successfully"));
       } else {
         console.warn("AdminService.mergeSubjects is not implemented");
@@ -55938,7 +56204,10 @@ function AdminSubjectsScreen({
     if (getData) {
       return getData(params);
     }
-    return AdminService.getSubjects(params);
+    return AdminService.getSubjects({
+      subject: 'stakeholder',
+      params
+    });
   }, [getData, AdminService]);
   return /*#__PURE__*/jsxRuntime.jsx(SubjectsTable, {
     t: t,
@@ -55986,11 +56255,14 @@ function AdminLocationScreen({
   } = config;
   const handleMergeLocations = React.useCallback(async mergeData => {
     try {
-      if (AdminService.mergeLocations) {
-        await AdminService.mergeLocations(mergeData);
+      if (AdminService.mergeSubjects) {
+        await AdminService.mergeSubjects({
+          subject: 'location',
+          ...mergeData
+        });
         antd.message.success(t("Locations merged successfully"));
       } else {
-        console.warn("AdminService.mergeLocations is not implemented");
+        console.warn("AdminService.mergeSubjects is not implemented");
         antd.message.success(t("Locations merged successfully"));
       }
     } catch (err) {
@@ -55998,12 +56270,15 @@ function AdminLocationScreen({
     }
   }, [AdminService, t, handleError]);
 
-  // Use custom getData if provided, otherwise use default AdminService.getLocations
+  // Use custom getData if provided, otherwise use default AdminService.getSubjects
   const getLocations = React.useCallback(params => {
     if (getData) {
       return getData(params);
     }
-    return AdminService.getLocations(params);
+    return AdminService.getSubjects({
+      subject: 'location',
+      params
+    });
   }, [getData, AdminService]);
   return /*#__PURE__*/jsxRuntime.jsx(LocationTable, {
     t: t,
@@ -56108,13 +56383,13 @@ function getAdminRoutes(config) {
     visible: user => userIsAdmin(user),
     component: subjectsIndexComponent
   }, ...(typeof useAdminLocationConfig === "function" ? [{
-    path: "subjects/location",
+    path: "management/subjects/location",
     key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_LOCATIONS"),
     exact: true,
     visible: user => userIsAdmin(user),
     component: /*#__PURE__*/jsxRuntime.jsx(LocationWrapper, {})
   }] : []), ...(typeof useAdminSubjectsConfig === "function" ? [{
-    path: "subjects/stakeholder",
+    path: "management/subjects/stakeholder",
     key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_STAKEHOLDERS"),
     exact: true,
     visible: user => userIsAdmin(user),