datastake-daf 0.6.798 → 0.6.800

package/dist/components/index.js

@@ -4778,7 +4778,7 @@ const config$2 = {
   Down: config$3
 };
 
-const _excluded$D = ["width", "height", "size", "name", "fill"];
+const _excluded$F = ["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$D);
+    props = _objectWithoutProperties(_ref, _excluded$F);
   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$C = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$E = ["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$C);
+    rest = _objectWithoutProperties(data, _excluded$E);
   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$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$D = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -5879,7 +5879,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$B);
+    rest = _objectWithoutProperties(_ref, _excluded$D);
   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$g;
-const _excluded$A = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$C = ["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$A);
+    props = _objectWithoutProperties(_ref, _excluded$C);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7236,7 +7236,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$z = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$B = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7250,7 +7250,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$z);
+    restProps = _objectWithoutProperties(_ref, _excluded$B);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7369,12 +7369,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$y = ["children"];
+const _excluded$A = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$y);
+    props = _objectWithoutProperties(_ref, _excluded$A);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7514,12 +7514,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$x = ["icon"];
+const _excluded$z = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$x);
+    props = _objectWithoutProperties(_ref, _excluded$z);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -7849,7 +7849,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$w = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$y = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$n
 } = antd.theme;
@@ -7942,7 +7942,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$w);
+    restProps = _objectWithoutProperties(_ref, _excluded$y);
   const {
     token
   } = useToken$n();
@@ -8664,7 +8664,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$v = ["tabs", "onChange", "value", "className"];
+const _excluded$x = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8672,7 +8672,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$v);
+    rest = _objectWithoutProperties(_ref, _excluded$x);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8769,7 +8769,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$u = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$w = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8804,7 +8804,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$u);
+              restProps = _objectWithoutProperties(button, _excluded$w);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -9615,27 +9615,25 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
   }
 };
 
-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) {
@@ -9676,8 +9674,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';
   }
@@ -9687,21 +9685,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) => {
@@ -11689,7 +11685,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$t = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$v = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11700,7 +11696,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$t);
+    props = _objectWithoutProperties(_ref, _excluded$v);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11760,7 +11756,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$d;
-const _excluded$s = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$u = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11772,7 +11768,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$s);
+    rest = _objectWithoutProperties(_ref, _excluded$u);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -15488,7 +15484,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$r = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$t = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15502,7 +15498,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$t);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17702,14 +17698,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$q = ["config", "title", "loading"];
+const _excluded$s = ["config", "title", "loading"];
 const Details = _ref => {
   let {
       config = [],
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header card",
     loading: loading,
@@ -17725,14 +17721,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$p = ["config", "title", "loading"];
+const _excluded$r = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$p);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17762,7 +17758,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$o = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$q = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17770,7 +17766,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$o);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -17946,14 +17942,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$b;
-const _excluded$n = ["title", "activeSdgGoals", "t"];
+const _excluded$p = ["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$p);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18251,7 +18247,7 @@ function SdgList({
   });
 }
 
-const _excluded$m = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$o = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18271,7 +18267,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18543,13 +18539,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$l = ["title", "children"];
+const _excluded$n = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$l);
+    rest = _objectWithoutProperties(_ref, _excluded$n);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18713,7 +18709,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$k = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$m = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18728,7 +18724,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$k);
+    rest = _objectWithoutProperties(_ref, _excluded$m);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -19097,7 +19093,7 @@ const getVegetationConfig = () => {
 };
 
 var _templateObject$9, _templateObject2$1;
-const _excluded$j = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
+const _excluded$l = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
 function VegetationWidget(_ref) {
   let {
       title = "Vegetation Health",
@@ -19109,7 +19105,7 @@ function VegetationWidget(_ref) {
       growthObservations = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$j);
+    props = _objectWithoutProperties(_ref, _excluded$l);
   let vegetationConfig = getVegetationConfig();
 
   // Get all VEGETATION_KEYS values before filtering (needed for mapping check)
@@ -24445,8 +24441,8 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$i = ["viewGroup"],
-  _excluded2$1 = ["label", "icon", "position"];
+const _excluded$k = ["viewGroup"],
+  _excluded2$2 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
     style = {},
@@ -24514,7 +24510,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$k);
         items[gKey] = gCfg;
       }
       return items;
@@ -24736,7 +24732,7 @@ const Content$1 = _ref => {
           showIcon: true
         });
       }
-      let groups = _objectWithoutProperties(f, _excluded2$1);
+      let groups = _objectWithoutProperties(f, _excluded2$2);
       groups = Object.keys(groups).reduce((items, key) => {
         var _groups$key2;
         if (!((_groups$key2 = groups[key]) !== null && _groups$key2 !== void 0 && (_groups$key2 = _groups$key2.meta) !== null && _groups$key2 !== void 0 && _groups$key2.excludeFromView)) {
@@ -24772,7 +24768,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$h = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$j = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -24788,7 +24784,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -35341,8 +35337,8 @@ const beforeUpload = allowedExtensions => file => {
 };
 const allowedImageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.avif', '.bmp', '.tiff', '.tif', '.heif', '.heic', '.svg', '.ico'];
 
-const _excluded$g = ["placeholder"],
-  _excluded2 = ["label", "description", "excludeFromEdit", "showFormIf", "icon", "position", "template", "formClass"];
+const _excluded$i = ["placeholder"],
+  _excluded2$1 = ["label", "description", "excludeFromEdit", "showFormIf", "icon", "position", "template", "formClass"];
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(timezone);
 dayjs__default["default"].tz.setDefault("UTC");
@@ -36290,7 +36286,7 @@ const inputTypeComponent$1 = {
         },
         commentHint
       } = _ref19,
-      props = _objectWithoutProperties(_ref19.props, _excluded$g);
+      props = _objectWithoutProperties(_ref19.props, _excluded$i);
     let {
       onChange,
       value,
@@ -37657,7 +37653,7 @@ const mapFormGroup = (f, d) => Object.keys(f).map(key => {
       template,
       formClass
     } = _ref72,
-    fc = _objectWithoutProperties(_ref72, _excluded2);
+    fc = _objectWithoutProperties(_ref72, _excluded2$1);
   const fConf = {
     id: key,
     label,
@@ -38972,7 +38968,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-const _excluded$f = ["placeholder"];
+const _excluded$h = ["placeholder"];
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -39727,7 +39723,7 @@ const inputTypeComponent = {
         },
         commentHint
       } = _ref15,
-      props = _objectWithoutProperties(_ref15.props, _excluded$f);
+      props = _objectWithoutProperties(_ref15.props, _excluded$h);
     let {
       onChange,
       value
@@ -41365,7 +41361,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   });
 };
 
-const _excluded$e = ["icon"];
+const _excluded$g = ["icon"];
 function DynamicForm(_ref) {
   var _data$meta;
   let {
@@ -41980,7 +41976,7 @@ function DynamicForm(_ref) {
           let {
               icon: Icon
             } = _ref3,
-            form = _objectWithoutProperties(_ref3, _excluded$e);
+            form = _objectWithoutProperties(_ref3, _excluded$g);
           return /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
             type: "link",
             size: "large",
@@ -42198,7 +42194,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$f = ["onChange", "value"];
 function AuthForm(_ref) {
   var _steps$currentStep;
   let {
@@ -42331,7 +42327,7 @@ function AuthForm(_ref) {
         {
           var _field$options;
           const _ref3 = field.props || {},
-            restSelectProps = _objectWithoutProperties(_ref3, _excluded$d);
+            restSelectProps = _objectWithoutProperties(_ref3, _excluded$f);
           inputNode = /*#__PURE__*/jsxRuntime.jsx(StyledSelect, _objectSpread2(_objectSpread2({
             placeholder: field.placeholder,
             disabled: field.disabled
@@ -42497,7 +42493,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$e = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
 function MultiColorProgressBar(_ref) {
   let {
       tooltipTitle,
@@ -42509,7 +42505,7 @@ function MultiColorProgressBar(_ref) {
       },
       showInfo = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$c);
+    rest = _objectWithoutProperties(_ref, _excluded$e);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
     title: tooltipTitle,
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Progress, _objectSpread2({
@@ -42584,7 +42580,7 @@ function ProgressBarWithIcon(_ref) {
   });
 }
 
-const _excluded$b = ["value", "options", "onChange", "className", "width"];
+const _excluded$d = ["value", "options", "onChange", "className", "width"];
 const ProgressTabs = _ref => {
   let {
       value = 'setup',
@@ -42605,7 +42601,7 @@ const ProgressTabs = _ref => {
       className = '',
       width = '100%'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$b);
+    rest = _objectWithoutProperties(_ref, _excluded$d);
   // Transform options to include icons and handle disabled state
   const transformedOptions = options.map(option => _objectSpread2(_objectSpread2({}, option), {}, {
     label: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -44458,11 +44454,11 @@ function DataStore(_ref) {
   });
 }
 
-const filtersConfig$b = {
+const filtersConfig$c = {
   datastakeId: '',
   name: ''
 };
-const selectFiltersConfig$b = {
+const selectFiltersConfig$c = {
   country: {
     type: 'select',
     label: 'Country',
@@ -44503,7 +44499,7 @@ const selectFiltersConfig$b = {
     getValue: option => option.value
   }
 };
-const checkboxConfig$b = {
+const checkboxConfig$c = {
   datastakeId: 'ID',
   name: 'Name'
 };
@@ -44820,15 +44816,14 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page,
-    pageSize,
+    page = 1,
+    pageSize = 20,
     sortDir,
     sortBy,
     search,
@@ -44837,9 +44832,10 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
+    page,
+    pageSize
   });
+  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -44852,16 +44848,6 @@ const filterParams = (value, module) => {
       by: sortBy
     });
   }
-  if (Object.keys(filters).length) {
-    if (value.sourceId && value.sourceId === "overview") {
-      params.filters = JSON.stringify(filters);
-    } else {
-      params.filters = JSON.stringify({
-        ...filters,
-        authorId: undefined
-      });
-    }
-  }
   return {
     ...rest,
     ...params
@@ -45157,7 +45143,7 @@ const renderRows = ({
   });
 };
 
-const _excluded$a = ["page", "pageSize"];
+const _excluded$c = ["page", "pageSize"];
 function DataStoreTable$1(_ref) {
   let {
     mod,
@@ -45239,12 +45225,12 @@ function DataStoreTable$1(_ref) {
     goNext,
     setPagination
   } = useFilters({
-    selectFiltersConfig: selectFiltersConfig$b,
+    selectFiltersConfig: selectFiltersConfig$c,
     view,
     goTo,
     location,
     module: mod,
-    filtersConfig: filtersConfig$b,
+    filtersConfig: filtersConfig$c,
     getRedirectLink,
     defaultPageSize
   });
@@ -45255,7 +45241,7 @@ function DataStoreTable$1(_ref) {
           page,
           pageSize
         } = activeFilters,
-        rest = _objectWithoutProperties(activeFilters, _excluded$a);
+        rest = _objectWithoutProperties(activeFilters, _excluded$c);
       const params = _objectSpread2({
         pagination: {
           page,
@@ -45317,7 +45303,7 @@ function DataStoreTable$1(_ref) {
           hasError: hasError,
           setHasError: setHasError,
           filtersConfig: newFiltersConfig,
-          checkboxConfig: checkboxConfig$b,
+          checkboxConfig: checkboxConfig$c,
           onSearch: onSearch,
           activeFilters: activeFilters,
           canClear: canClearSearch,
@@ -45333,7 +45319,7 @@ function DataStoreTable$1(_ref) {
           rowKey: "key",
           doEmptyRows: true,
           selectOptions,
-          filtersConfig: selectFiltersConfig$b,
+          filtersConfig: selectFiltersConfig$c,
           onFilterChange: onFiltersChange,
           showFilters,
           defaultFilters,
@@ -45575,7 +45561,7 @@ const getLinkedColumns = ({
   ellipsis: true
 }];
 
-const _excluded$9 = ["administrativeLevel1", "administrativeLevel2"];
+const _excluded$b = ["administrativeLevel1", "administrativeLevel2"];
 function DataStoreView(_ref) {
   let {
     mod,
@@ -45638,7 +45624,7 @@ function DataStoreView(_ref) {
           administrativeLevel1,
           administrativeLevel2
         } = _ref2,
-        rest = _objectWithoutProperties(_ref2, _excluded$9);
+        rest = _objectWithoutProperties(_ref2, _excluded$b);
       const levels = [administrativeLevel1, administrativeLevel2].filter(p => !!p);
       let levelsRes = {
         data: []
@@ -47136,14 +47122,14 @@ const TabsStyled = styled__default["default"](antd.Tabs)`
 
 `;
 
-const _excluded$8 = ["defaultActiveKey", "items", "onChange"];
+const _excluded$a = ["defaultActiveKey", "items", "onChange"];
 const StyledTabs = _ref => {
   let {
       defaultActiveKey,
       items,
       onChange
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$8);
+    rest = _objectWithoutProperties(_ref, _excluded$a);
   return /*#__PURE__*/jsxRuntime.jsx(TabsStyled, _objectSpread2({
     defaultActiveKey: defaultActiveKey,
     items: items,
@@ -47214,7 +47200,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$9 = ["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;
@@ -47304,7 +47290,7 @@ function BarChart(_ref) {
       width,
       xAxisConfig = {}
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$7);
+    _objectWithoutProperties(_ref, _excluded$9);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47388,7 +47374,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$8 = ["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;
@@ -47477,7 +47463,7 @@ function LineChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$6);
+    _objectWithoutProperties(_ref, _excluded$8);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47579,7 +47565,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$7 = ["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;
@@ -47684,7 +47670,7 @@ function ColumnChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$5);
+    _objectWithoutProperties(_ref, _excluded$7);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47952,7 +47938,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$6 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
 const {
   useToken: useToken$c
 } = antd.theme;
@@ -48027,7 +48013,7 @@ function DonutPie(_ref) {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$4);
+    rest = _objectWithoutProperties(_ref, _excluded$6);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -48547,7 +48533,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$5 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
 const {
   useToken: useToken$a
 } = antd.theme;
@@ -48624,7 +48610,7 @@ const AreaChart = _ref => {
       legendConfig = {},
       width
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$3);
+    rest = _objectWithoutProperties(_ref, _excluded$5);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -48712,7 +48698,7 @@ const AreaChart = _ref => {
   });
 };
 
-const _excluded$2 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
+const _excluded$4 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
 const {
   useToken: useToken$9
 } = antd.theme;
@@ -48737,7 +48723,7 @@ const RadarChart = _ref => {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$2);
+    rest = _objectWithoutProperties(_ref, _excluded$4);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -51069,7 +51055,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$3 = ["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 {
@@ -51107,7 +51093,7 @@ const BaseScreen = _ref => {
       filtersConfig,
       isMobile
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$1);
+    rest = _objectWithoutProperties(_ref, _excluded$3);
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
   const {
@@ -51217,6 +51203,217 @@ const BaseScreen = _ref => {
   });
 };
 
+function AppInvitation(_ref) {
+  let {
+    // Redux State
+    errors,
+    user,
+    invitationSuccess,
+    // Actions
+    confirmInvitation,
+    getUserFromInvitation,
+    // Configuration
+    Layout,
+    redirectPath = "/",
+    loginPath = "/login",
+    appRedirectPath = "/app",
+    params: propParams = {}
+  } = _ref;
+  const {
+    t
+  } = useTranslation();
+  const routeParams = useParams();
+  const {
+    app,
+    companyCode,
+    userCode
+  } = _objectSpread2(_objectSpread2({}, routeParams), propParams);
+  const [passwords] = antd.Form.useForm();
+  const [checking, setChecking] = React.useState(true);
+  const goTo = useNavigate();
+  const [termsAgreed, setTermsAgreed] = React.useState(false);
+  const [passwordReseted, setPasswordReseted] = React.useState(false);
+  React.useEffect(() => {
+    if (companyCode && userCode) {
+      getUserFromInvitation({
+        companyCode,
+        userCode
+      }, () => {
+        setChecking(false);
+      });
+    } else {
+      setChecking(false);
+    }
+  }, [companyCode, userCode, getUserFromInvitation]);
+  React.useEffect(() => {
+    if (invitationSuccess && user && user.inviteToken) {
+      confirmInvitation({}, data => {
+        if (data.token) {
+          localStorage.setItem('token', data.token);
+        }
+        antd.message.success(t('Invitation accepted'));
+        // Fix: ensure we don't rely on a variable from useParams that might not exist
+        // Just use the configured redirectPath
+        goTo(redirectPath);
+      }, {
+        companyCode,
+        userCode
+      });
+    }
+  }, [invitationSuccess, user, confirmInvitation, goTo, redirectPath, companyCode, userCode, t]);
+  const displayError = name => {
+    return errors && errors[name] && errors[name].length > 0 && {
+      help: errors[name][0],
+      validateStatus: 'error'
+    };
+  };
+  const subTitle = !passwordReseted ? 'Set up your password and agree with out terms and conditions.' : isMobile ? 'Your account has been successfully set up. To log in use a desktop device.' : 'Your account has been successfully set up. Please click the button below to log in.';
+  const title = passwordReseted ? 'Thank You!' : undefined;
+  if (checking && !invitationSuccess) {
+    return /*#__PURE__*/jsxRuntime.jsx(Loading, {});
+  }
+
+  // If auto-confirming (inviteToken present), we might want to show loading or nothing until redirect
+  if (invitationSuccess && user && user.inviteToken) {
+    // The useEffect will handle the redirect/confirm. 
+    // We can show loading here too or just return null.
+    // Original code: checks invitationSuccess && !user.inviteToken for form, else redirect.
+    return /*#__PURE__*/jsxRuntime.jsx(Loading, {});
+  }
+  if (invitationSuccess && !user.inviteToken) {
+    const Content = /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+      children: passwordReseted ? /*#__PURE__*/jsxRuntime.jsx("div", {
+        children: isMobile ? null : /*#__PURE__*/jsxRuntime.jsx(DafButton, {
+          type: "primary",
+          className: "normal-br",
+          onClick: () => {
+            window.location.href = loginPath;
+          },
+          children: t('Log In')
+        })
+      }) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
+          name: "password",
+          layout: "vertical",
+          form: passwords,
+          children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
+            required: true,
+            name: "password"
+          }, displayError('password')), {}, {
+            label: t("Password"),
+            rules: [{
+              required: true,
+              message: t("errors::password should not be empty")
+            }],
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Input.Password, {
+              size: "large",
+              placeholder: t("Password")
+            })
+          })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
+            required: true,
+            name: "confirmPassword"
+          }, displayError('confirmPassword')), {}, {
+            label: t("Confirm Password"),
+            dependencies: ['password'],
+            rules: [{
+              required: true,
+              message: t("errors::password should not be empty")
+            }, _ref2 => {
+              let {
+                getFieldValue
+              } = _ref2;
+              return {
+                validator(rule, value) {
+                  if (!value || getFieldValue('password') === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(t('errors::passwordNotMatch'));
+                }
+              };
+            }],
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Input.Password, {
+              size: "large",
+              placeholder: t("Confirm Password")
+            })
+          })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+            name: "mailUpdates",
+            valuePropName: "checked",
+            noStyle: true,
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+              children: t("Sign up to receive updates")
+            })
+          }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+            name: "agreeTerms",
+            valuePropName: "checked",
+            noStyle: true,
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+              checked: termsAgreed,
+              onChange: e => setTermsAgreed(e.target.checked),
+              children: /*#__PURE__*/jsxRuntime.jsx("p", {
+                className: "mb-0",
+                children: t('Agree to the Terms of Use of this application and the Privacy Policy')
+              })
+            })
+          })]
+        }), /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "buttons",
+          children: /*#__PURE__*/jsxRuntime.jsx(DafButton, {
+            className: "normal-br",
+            type: "primary",
+            block: true,
+            size: "large",
+            disabled: !termsAgreed,
+            onClick: () => {
+              passwords.validateFields().then(data => {
+                const {
+                  password,
+                  mailUpdates
+                } = data;
+                confirmInvitation({
+                  password,
+                  mailUpdates
+                }, () => {}, {
+                  companyCode,
+                  userCode
+                });
+                setPasswordReseted(true);
+              });
+            },
+            children: t("Confirm")
+          })
+        })]
+      })
+    });
+    if (Layout) {
+      // Assuming Layout accepts these props as per Nashiriki AuthLayout
+      return /*#__PURE__*/jsxRuntime.jsx(Layout, {
+        app: app,
+        step: 1,
+        subTitle: subTitle,
+        title: title,
+        children: Content
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsxs("div", {
+      style: {
+        padding: 20,
+        maxWidth: 400,
+        margin: '0 auto'
+      },
+      children: [/*#__PURE__*/jsxRuntime.jsx("h2", {
+        children: title
+      }), /*#__PURE__*/jsxRuntime.jsx("p", {
+        children: subTitle
+      }), Content]
+    });
+  }
+  return user ? /*#__PURE__*/jsxRuntime.jsx(Navigate, {
+    to: appRedirectPath
+  }) : /*#__PURE__*/jsxRuntime.jsx(Navigate, {
+    to: redirectPath
+  });
+}
+
 /**
  * Formats a number for display with locale-specific formatting
  * @param {any} val - The value to format
@@ -51540,6 +51737,7 @@ function useUserGrowth({
   const {
     token
   } = useToken$6();
+  console.log("mainData", mainData);
   const fetchData = () => {
     const {
       dates = []
@@ -51675,6 +51873,7 @@ function UserGrowth({
     t,
     translationKeys
   });
+  console.log("usergrowthhhhh", data);
   React.useEffect(() => {
     if (typeof fetchUserGrowth === "function") {
       fetchUserGrowth(selectValue);
@@ -51802,6 +52001,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",
@@ -52072,7 +52272,6 @@ function AddUserModal({
       setAccountUsed(true);
     }).catch(() => {});
   };
-  console.log("hellooooooooooooooooooooooooo");
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     open: isOpen,
     title: "admin::edit-user",
@@ -52198,7 +52397,7 @@ const renderTypeTag = ({
   });
 };
 
-const getColumns$6 = ({
+const getColumns$7 = ({
   t,
   show = "show",
   selectOptions,
@@ -52472,11 +52671,11 @@ const getColumns$6 = ({
   }];
   return cols.filter(c => c[show]);
 };
-const checkboxConfig$a = {
+const checkboxConfig$b = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$a = {
+const selectFiltersConfig$b = {
   account: {
     type: "select",
     label: "Account",
@@ -52517,16 +52716,16 @@ const selectFiltersConfig$a = {
     getValue: option => option.value
   }
 };
-const filtersConfig$a = {
+const filtersConfig$b = {
   name: "",
   datastakeId: ""
 };
 const view$2 = "admin-users";
-const defaultUrlParams$3 = {
+const defaultUrlParams$4 = {
   activeTab: "active"
 };
 const defaultTableFilters$2 = {};
-const getTabs$2 = ({
+const getTabs$3 = ({
   totalPending = 0,
   t
 }) => [{
@@ -52666,14 +52865,15 @@ function UserTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$a,
+    selectFiltersConfig: selectFiltersConfig$b,
     view: view$2,
-    defaultUrlParams: defaultUrlParams$3,
+    defaultUrlParams: defaultUrlParams$4,
     module,
-    filtersConfig: filtersConfig$a,
+    filtersConfig: filtersConfig$b,
     getRedirectLink,
     getData,
-    defaultPageSize
+    defaultPageSize,
+    fetchPendingOnMount: true // Users table needs pending count
   });
   const selectOptions = React.useMemo(() => {
     return {
@@ -52682,7 +52882,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,
@@ -52727,7 +52927,7 @@ function UserTable(_ref) {
       t: t,
       headerTitle: headerTitle,
       actionButton: actionButton,
-      tabs: getTabs$2({
+      tabs: getTabs$3({
         totalPending: totalPending,
         t
       }),
@@ -52738,7 +52938,7 @@ function UserTable(_ref) {
       hasError: hasError,
       setHasError: setHasError,
       canClearSearch: canClearSearch,
-      checkboxConfig: checkboxConfig$a,
+      checkboxConfig: checkboxConfig$b,
       defaultTableFilters: defaultTableFilters$2,
       children: /*#__PURE__*/jsxRuntime.jsx(DAFTable, {
         columns: columns,
@@ -52747,7 +52947,7 @@ function UserTable(_ref) {
         pagination: filter.pagination,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$a,
+        filtersConfig: selectFiltersConfig$b,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -52778,7 +52978,7 @@ function UserTable(_ref) {
   });
 }
 
-const getColumns$5 = ({
+const getColumns$6 = ({
   t,
   goTo,
   show = "show",
@@ -53075,11 +53275,11 @@ const getColumns$5 = ({
   }];
   return cols.filter(c => c[show]);
 };
-const checkboxConfig$9 = {
+const checkboxConfig$a = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$9 = {
+const selectFiltersConfig$a = {
   type: {
     type: "select",
     label: "Type",
@@ -53107,16 +53307,16 @@ const selectFiltersConfig$9 = {
     getValue: option => option.value
   }
 };
-const filtersConfig$9 = {
+const filtersConfig$a = {
   name: "",
   datastakeId: ""
 };
 const view$1 = "accounts";
-const defaultUrlParams$2 = {
+const defaultUrlParams$3 = {
   activeTab: "active"
 };
 const defaultTableFilters$1 = {};
-const getTabs$1 = ({
+const getTabs$2 = ({
   totalPending = 0,
   t
 }) => [{
@@ -53131,7 +53331,7 @@ const getTabs$1 = ({
   label: t("Suspended")
 }];
 
-const getColumns$4 = ({
+const getColumns$5 = ({
   t,
   selectOptions,
   module
@@ -53254,7 +53454,7 @@ function CombineAccountModal({
   } = useToken$4();
   const [MainForm] = antd.Form.useForm();
   const columns = React.useMemo(() => {
-    return getColumns$4({
+    return getColumns$5({
       t,
       selectOptions,
       module
@@ -53423,7 +53623,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,
@@ -53510,14 +53710,15 @@ function AccountTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$9,
+    selectFiltersConfig: selectFiltersConfig$a,
     view: view$1,
-    defaultUrlParams: defaultUrlParams$2,
+    defaultUrlParams: defaultUrlParams$3,
     module,
     defaultPageSize,
-    filtersConfig: filtersConfig$9,
+    filtersConfig: filtersConfig$a,
     getRedirectLink,
-    getData
+    getData,
+    fetchPendingOnMount: true
   });
   const selectOptions = React.useMemo(() => {
     var _config$options;
@@ -53557,7 +53758,7 @@ function AccountTable(_ref) {
       onCancel: () => {}
     });
   }, [t, fetchData, fetchPendingAccounts]);
-  const columns = React.useMemo(() => getColumns$5({
+  const columns = React.useMemo(() => getColumns$6({
     t,
     show: activeTab,
     selectOptions,
@@ -53583,7 +53784,7 @@ function AccountTable(_ref) {
         tooltip: "Combine",
         disabled: selectedAccounts.length < 2
       }],
-      tabs: getTabs$1({
+      tabs: getTabs$2({
         totalPending: totalPending,
         t
       }),
@@ -53595,7 +53796,7 @@ function AccountTable(_ref) {
       setHasError: setHasError,
       canClearSearch: canClearSearch,
       selectOptions: selectOptions,
-      checkboxConfig: checkboxConfig$9,
+      checkboxConfig: checkboxConfig$a,
       defaultTableFilters: defaultTableFilters$1,
       children: [selectedAccounts.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-row  ml-6 mt-5",
@@ -53626,7 +53827,7 @@ function AccountTable(_ref) {
         doEmptyRows: true,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$9,
+        filtersConfig: selectFiltersConfig$a,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -53662,7 +53863,7 @@ function AccountTable(_ref) {
   });
 }
 
-const getTabs = ({
+const getTabs$1 = ({
   t
 }) => {
   return [{
@@ -53676,7 +53877,7 @@ const getTabs = ({
     label: t("Suspended")
   }];
 };
-const selectFiltersConfig$8 = {
+const selectFiltersConfig$9 = {
   category: {
     type: "select",
     label: "Category",
@@ -53717,32 +53918,35 @@ const selectFiltersConfig$8 = {
     getValue: option => option.value
   }
 };
-const filtersConfig$8 = {
+const filtersConfig$9 = {
   name: "",
   datastakeId: ""
 };
-const defaultUrlParams$1 = {
+const defaultUrlParams$2 = {
   activeTab: "active"
 };
-const checkboxConfig$8 = {
+const checkboxConfig$9 = {
   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;
+  return entry?.name || "-";
 };
 
-const getColumns$3 = ({
+const getColumns$4 = ({
   t,
   goTo = () => {},
   show = "show",
   getRedirectLink = () => {},
   token,
-  selectedSubjects,
-  setSelectedSubjects,
+  selectedLocations,
+  setSelectedLocations,
   selectOptions,
-  entity
+  entity,
+  user,
+  options
 }) => {
   const cols = [{
     title: "",
@@ -53757,15 +53961,15 @@ const getColumns$3 = ({
         });
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
-        onChange: () => setSelectedSubjects(prev => {
+        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: selectedSubjects.some(p => p.id === all.id),
-        disabled: selectedSubjects?.length >= 3 && !selectedSubjects.some(p => p.id === all.id)
+        checked: selectedLocations.some(p => p.id === all.id),
+        disabled: selectedLocations?.length >= 3 && !selectedLocations.some(p => p.id === all.id)
       });
     }
   }, {
@@ -53839,11 +54043,11 @@ const getColumns$3 = ({
       });
     }
   }, {
-    title: t("Province"),
+    title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
     dataIndex: "administrativeLevel1",
     key: "administrativeLevel1",
     ellipsis: true,
-    show: entity.includes("locations"),
+    show: entity.includes("location"),
     render: (value, all) => {
       if (all.empty) {
         return /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -53854,7 +54058,7 @@ const getColumns$3 = ({
       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 || '-',
@@ -53862,10 +54066,10 @@ const getColumns$3 = ({
       });
     }
   }, {
-    title: t("Territory"),
+    title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
     dataIndex: "administrativeLevel2",
     key: "administrativeLevel2",
-    show: entity.includes("locations"),
+    show: entity.includes("location"),
     ellipsis: true,
     render: (value, all) => {
       if (all.empty) {
@@ -53877,7 +54081,7 @@ const getColumns$3 = ({
       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 || '-',
@@ -53941,7 +54145,7 @@ const getColumns$3 = ({
       return /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "cursor-pointer",
         onClick: () => {
-          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+          goTo(getRedirectLink(`/app/view/management-location/${all.id}`));
         },
         children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
           name: "Link",
@@ -53954,7 +54158,78 @@ const getColumns$3 = ({
   return cols.filter(c => c[show]);
 };
 
-const getColumns$2 = ({
+const getTabs = ({
+  t
+}) => {
+  return [{
+    key: "active",
+    label: t("Active")
+  }, {
+    key: "pending",
+    label: t("Pending")
+  }, {
+    key: 'suspended',
+    label: t("Suspended")
+  }];
+};
+const selectFiltersConfig$8 = {
+  category: {
+    type: "select",
+    label: "Category",
+    placeholder: t => t("Category"),
+    style: {
+      flex: 1
+    },
+    labelStyle: {
+      flex: 1
+    },
+    getLabel: option => option.label,
+    getValue: option => option.value
+  },
+  country: {
+    type: "select",
+    label: "Country",
+    placeholder: t => t("Country"),
+    style: {
+      flex: 1
+    },
+    labelStyle: {
+      flex: 1
+    },
+    getLabel: option => option.label,
+    getValue: option => option.value
+  },
+  sources: {
+    type: "select",
+    label: "Sources",
+    placeholder: t => t("Sources"),
+    style: {
+      flex: 1
+    },
+    labelStyle: {
+      flex: 1
+    },
+    getLabel: option => option.label,
+    getValue: option => option.value
+  }
+};
+const filtersConfig$8 = {
+  name: "",
+  datastakeId: ""
+};
+const defaultUrlParams$1 = {
+  activeTab: "active"
+};
+const checkboxConfig$8 = {
+  name: "Name",
+  datastakeId: "ID"
+};
+const getNameByLevel = (data, level) => {
+  const entry = Object.values(data || {}).find(item => item.level === level);
+  return entry;
+};
+
+const getColumns$3 = ({
   t,
   selectOptions,
   module,
@@ -54011,7 +54286,7 @@ const getColumns$2 = ({
     dataIndex: "administrativeLevel1",
     key: "administrativeLevel1",
     ellipsis: true,
-    show: entity.includes("locations"),
+    show: entity?.includes("location"),
     render: (value, all) => {
       let label;
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
@@ -54028,7 +54303,7 @@ const getColumns$2 = ({
     title: t("Territory"),
     dataIndex: "administrativeLevel2",
     key: "administrativeLevel2",
-    show: entity.includes("locations"),
+    show: entity?.includes("location"),
     render: (value, all) => {
       let label;
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
@@ -54063,7 +54338,7 @@ function CombineLocationModal({
   const [MainForm] = antd.Form.useForm();
   const [isDisabled, setIsDisabled] = React.useState(true);
   const columns = React.useMemo(() => {
-    return getColumns$2({
+    return getColumns$3({
       t,
       selectOptions,
       module,
@@ -54073,10 +54348,12 @@ function CombineLocationModal({
   }, [selectedLocations, t, selectOptions, module, entity]);
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
-      const ids = selectedLocations.map(location => location._id);
+      const ids = selectedLocations.map(location => location.id);
+      const allowedKeys = ["id", "name", "country", "category", "administrativeLevel1", "administrativeLevel2"];
+      const filteredData = Object.fromEntries(Object.entries(data).filter(([key]) => allowedKeys.includes(key)));
       onSuccess({
         ids,
-        data
+        data: filteredData
       });
     });
   };
@@ -54092,7 +54369,7 @@ function CombineLocationModal({
     onValuesChange: () => {
       setIsDisabled(() => {
         const values = MainForm.getFieldsValue();
-        const requiredFields = entity === "location" ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"] : ["id", "name", "category", "country"];
+        const requiredFields = entity?.includes("location") ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"] : ["id", "name", "category", "country"];
         return requiredFields.some(field => values[field] === undefined);
       });
     },
@@ -54139,7 +54416,7 @@ function CombineLocationModal({
             options: selectedLocations.map(location => {
               return {
                 label: location?.datastakeId || "-",
-                value: location?.datastakeId || "-"
+                value: location?.id || "-"
               };
             }),
             placeholder: t("ID")
@@ -54174,7 +54451,7 @@ function CombineLocationModal({
             }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
             placeholder: t("admin::country")
           })
-        }), entity.includes("locations") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        }), entity?.includes("location") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "flex-1",
             name: "administrativeLevel1",
@@ -54212,6 +54489,7 @@ function CombineLocationModal({
   });
 }
 
+const _excluded$2 = ["pagination", "tab", "filters", "search", "sort"];
 const {
   useToken: useToken$2
 } = antd.theme;
@@ -54229,8 +54507,10 @@ function LocationTable(_ref) {
     view,
     headerTitle,
     breadcrumbs,
-    mergeSubjectsFunction,
-    refetchTrigger
+    mergeLocationsFunction,
+    refetchTrigger,
+    user,
+    options
   } = _ref;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -54238,7 +54518,50 @@ function LocationTable(_ref) {
   const {
     token
   } = useToken$2();
-  const [combineLocationVisible, setCombineLocationVisible] = React.useState(false);
+  const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
+  const getDataWithStringPagination = async _ref2 => {
+    let {
+      params
+    } = _ref2;
+    const {
+        pagination,
+        tab,
+        filters,
+        search,
+        sort
+      } = params;
+      _objectWithoutProperties(params, _excluded$2);
+    let paginationObj = {
+      page: 1,
+      pageSize: 20
+    };
+    if (pagination) {
+      try {
+        paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
+      } catch (e) {
+        console.error('Failed to parse pagination', e);
+      }
+    }
+    let activeTab = tab || "active";
+    if (!tab && filters) {
+      try {
+        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+        activeTab = parsedFilters.activeTab || "active";
+      } catch (e) {
+        activeTab = "active";
+      }
+    }
+    const transformedParams = {
+      pagination: {
+        skip: String(paginationObj.page || 1),
+        take: String(paginationObj.pageSize || 20)
+      },
+      tab: activeTab
+    };
+    return getData({
+      params: transformedParams
+    });
+  };
   const {
     filter,
     activeTab,
@@ -54253,14 +54576,14 @@ function LocationTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$8,
+    selectFiltersConfig: selectFiltersConfig$9,
     view,
-    defaultUrlParams: defaultUrlParams$1,
+    defaultUrlParams: defaultUrlParams$2,
     module,
     defaultPageSize,
-    filtersConfig: filtersConfig$8,
+    filtersConfig: filtersConfig$9,
     getRedirectLink,
-    getData,
+    getData: getDataWithStringPagination,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
@@ -54268,11 +54591,11 @@ function LocationTable(_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$4({
       t,
       goTo,
       token,
@@ -54281,7 +54604,9 @@ function LocationTable(_ref) {
       setSelectedLocations,
       getRedirectLink,
       selectOptions,
-      entity: headerTitle
+      entity: headerTitle,
+      user,
+      options
     });
   }, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -54291,11 +54616,11 @@ function LocationTable(_ref) {
       headerTitle: headerTitle,
       actionButton: [{
         icon: "Merge",
-        onClick: () => setCombineLocationVisible(true),
-        tooltip: "Combine",
+        onClick: () => setIsModalOpen(true),
+        tooltip: t("admin::merge-locations"),
         disabled: selectedLocations.length < 2
       }],
-      tabs: getTabs({
+      tabs: getTabs$1({
         t
       }),
       isMobile: isMobile,
@@ -54306,7 +54631,7 @@ function LocationTable(_ref) {
       setHasError: setHasError,
       canClearSearch: canClearSearch,
       selectOptions: selectOptions,
-      checkboxConfig: checkboxConfig$8,
+      checkboxConfig: checkboxConfig$9,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
       children: [selectedLocations.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -54338,34 +54663,262 @@ function LocationTable(_ref) {
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$8,
+        filtersConfig: selectFiltersConfig$9,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
         onChange: filter.onTableChange
       })]
     }), /*#__PURE__*/jsxRuntime.jsx(CombineLocationModal, {
-      isOpen: combineLocationVisible,
+      isOpen: isCombineModalOpen,
       t: t,
-      onClose: () => {
-        setCombineLocationVisible(false);
-      },
+      onClose: () => setIsModalOpen(false),
       onSuccess: data => {
-        setCombineLocationVisible(false);
+        console.log("Modal Success triggered", data); // 1. Check if this logs
+        console.log("Is function?", typeof mergeLocationsFunction);
+        setIsModalOpen(false);
         setLoading(true);
-        if (typeof mergeSubjectsFunction === 'function') {
-          mergeSubjectsFunction(data);
-          setSelectedLocations([]);
+        if (typeof mergeLocationsFunction === 'function') {
+          mergeLocationsFunction(data).finally(() => {
+            setSelectedLocations([]);
+            fetchData();
+          });
         }
       },
       selectedLocations: selectedLocations,
-      selectOptions: selectOptions || {},
+      selectOptions: selectOptions,
       module: module,
       entity: headerTitle
     })]
   });
 }
 
+const getColumns$2 = ({
+  t,
+  goTo = () => {},
+  show = "show",
+  getRedirectLink = () => {},
+  token,
+  selectedSubjects,
+  setSelectedSubjects,
+  selectOptions,
+  entity,
+  options
+}) => {
+  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"
+        });
+      }
+      console.log({
+        value,
+        options
+      });
+      const category = findOptions(value, options?.categoriesOptions || []) || "-";
+      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, options?.countries || []) || "-";
+      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/view/management-stakeholder/${all.id}`));
+        },
+        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) {
@@ -54500,7 +55053,7 @@ function CombineSubjectsModal({
   }, [selectedSubjects, t, selectOptions, module, entity]);
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
-      const ids = selectedSubjects.map(subject => subject._id);
+      const ids = selectedSubjects.map(subject => subject.id);
       onSuccess({
         ids,
         data
@@ -54509,7 +55062,7 @@ function CombineSubjectsModal({
   };
   return /*#__PURE__*/jsxRuntime.jsxs(Modal, {
     open: isOpen,
-    title: t("admin::merge"),
+    title: t("merge"),
     onClose: onClose,
     onSuccess: onSubmit,
     withModalFormWrapper: false,
@@ -54519,7 +55072,7 @@ function CombineSubjectsModal({
     onValuesChange: () => {
       setIsDisabled(() => {
         const values = MainForm.getFieldsValue();
-        const requiredFields = entity === "location" ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"] : ["id", "name", "category", "country"];
+        const requiredFields = entity.includes("location") ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"] : ["id", "name", "category", "country"];
         return requiredFields.some(field => values[field] === undefined);
       });
     },
@@ -54531,7 +55084,7 @@ function CombineSubjectsModal({
           style: {
             color: token.baseGray90
           },
-          children: t("admin::current_subjects")
+          children: t("current_subjects")
         }), /*#__PURE__*/jsxRuntime.jsx(DAFTable, {
           columns: columns,
           data: selectedSubjects,
@@ -54545,7 +55098,7 @@ function CombineSubjectsModal({
           color: token.baseGray90,
           marginTop: 14
         },
-        children: t("admin::merged_output")
+        children: t("merged_output")
       }), /*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
         form: MainForm,
         clearOnDestroy: true,
@@ -54586,7 +55139,7 @@ function CombineSubjectsModal({
             options: mapToSelectOptions(selectedSubjects, "country", selectOptions, "country"),
             placeholder: t("admin::country")
           })
-        }), entity.includes("locations") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        }), entity.includes("location") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "flex-1",
             name: "administrativeLevel1",
@@ -54624,6 +55177,7 @@ function CombineSubjectsModal({
   });
 }
 
+const _excluded$1 = ["pagination", "tab", "filters", "search", "sort"];
 const {
   useToken
 } = antd.theme;
@@ -54642,7 +55196,9 @@ function SubjectsTable(_ref) {
     headerTitle,
     breadcrumbs,
     mergeSubjectsFunction,
-    refetchTrigger
+    refetchTrigger,
+    user,
+    options
   } = _ref;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -54651,6 +55207,49 @@ function SubjectsTable(_ref) {
     token
   } = useToken();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
+  const getDataWithStringPagination = async _ref2 => {
+    let {
+      params
+    } = _ref2;
+    const {
+        pagination,
+        tab,
+        filters,
+        search,
+        sort
+      } = params;
+      _objectWithoutProperties(params, _excluded$1);
+    let paginationObj = {
+      page: 1,
+      pageSize: 20
+    };
+    if (pagination) {
+      try {
+        paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
+      } catch (e) {
+        console.error('Failed to parse pagination', e);
+      }
+    }
+    let activeTab = tab || "active";
+    if (!tab && filters) {
+      try {
+        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+        activeTab = parsedFilters.activeTab || "active";
+      } catch (e) {
+        activeTab = "active";
+      }
+    }
+    const transformedParams = {
+      pagination: {
+        skip: String(paginationObj.page || 1),
+        take: String(paginationObj.pageSize || 20)
+      },
+      tab: activeTab
+    };
+    return getData({
+      params: transformedParams
+    });
+  };
   const {
     filter,
     activeTab,
@@ -54672,7 +55271,7 @@ function SubjectsTable(_ref) {
     defaultPageSize,
     filtersConfig: filtersConfig$8,
     getRedirectLink,
-    getData,
+    getData: getDataWithStringPagination,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
@@ -54680,11 +55279,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,
@@ -54693,9 +55292,10 @@ function SubjectsTable(_ref) {
       setSelectedSubjects,
       getRedirectLink,
       selectOptions,
-      entity: headerTitle
+      entity: headerTitle,
+      options
     });
-  }, [t, goTo, module, token, selectedSubjects, getRedirectLink, selectOptions, headerTitle]);
+  }, [t, goTo, module, token, selectedSubjects, getRedirectLink, selectOptions, headerTitle, options]);
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs(AdminTable, {
       filters: filter,
@@ -54759,19 +55359,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
     })]
@@ -54817,8 +55418,10 @@ const config$1 = [{
 function SideBarMenu({
   selectedGroup,
   onChange = () => {},
-  t
+  t,
+  config
 }) {
+  const menuConfig = config || config$1;
   return /*#__PURE__*/jsxRuntime.jsx(antd.Menu, {
     mode: "inline",
     defaultSelectedKeys: [selectedGroup],
@@ -54830,7 +55433,7 @@ function SideBarMenu({
     onSelect: g => {
       onChange(g.key);
     },
-    items: config$1.map(conf => {
+    items: menuConfig.map(conf => {
       return {
         key: conf.key,
         label: t(conf.label)
@@ -54928,10 +55531,14 @@ function NewUser({
   defaultData,
   userRoles = [],
   addUser = () => {},
-  module = "straatos"
+  module = "straatos",
+  inviteCompanyAccount = () => {},
+  companyId,
+  handleError = () => {}
 }) {
   const [MainForm] = antd.Form.useForm();
   const [accountUsed, setAccountUsed] = React.useState(false);
+  const [loading, setLoading] = React.useState(false);
   React.useEffect(() => {
     if (defaultData) {
       MainForm.setFieldsValue({
@@ -54940,28 +55547,44 @@ function NewUser({
       });
     }
   }, [defaultData]);
-  const onSubmit = () => {
-    MainForm.validateFields().then(val => {
-      // Create user object with the form data
-      const userData = {
+  const onSubmit = async () => {
+    try {
+      const val = await MainForm.validateFields();
+      setLoading(true);
+      const apiPayload = {
         firstName: val.firstName,
         lastName: val.lastName,
         email: val.email,
         role: val.role,
-        apps: {
-          [module]: {
-            role: val.role
-          }
-        }
+        type: 'user',
+        pendingCompanyId: companyId,
+        name: `${val.firstName} ${val.lastName}`
       };
-
-      // Add user to local state
-      addUser(userData);
-
-      // Close modal and reset form
+      await inviteCompanyAccount({
+        companyId: companyId,
+        data: apiPayload
+      });
+      const localUserData = {
+        ...apiPayload,
+        status: 'pending'
+        // apps: {
+        // 	[module]: {
+        // 		role: val.role,
+        // 	}
+        // },
+      };
+      addUser(localUserData);
+      antd.message.success(t("User added successfully"));
       onClose();
       MainForm.resetFields();
-    }).catch(() => {});
+    } catch (error) {
+      if (error.errorFields) {
+        return;
+      }
+      handleError(error);
+    } finally {
+      setLoading(false);
+    }
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     t: t,
@@ -54969,6 +55592,7 @@ function NewUser({
     open: isOpen,
     onClose: onClose,
     onSuccess: onSubmit,
+    loading: loading,
     children: /*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
       form: MainForm,
       layout: "vertical",
@@ -55224,10 +55848,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",
@@ -55257,11 +55878,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,
@@ -55277,7 +55905,10 @@ function Users({
   deleteUser = () => {},
   updateUser = () => {},
   addUser = () => {},
-  transferAdmin = () => {}
+  transferAdmin = () => {},
+  inviteCompanyAccount = () => {},
+  companyId,
+  handleError = () => {}
 }) {
   const [hasError, setHasError] = React.useState(false);
   const [showFilters, setShowFilters] = React.useState(false);
@@ -55305,9 +55936,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({
@@ -55401,11 +56032,215 @@ function Users({
       onClose: () => setNewUserModalVisible(false),
       userRoles: userRoles,
       addUser: addUser,
-      module: module
+      module: module,
+      inviteCompanyAccount: inviteCompanyAccount,
+      companyId: companyId,
+      handleError: handleError
     })]
   });
 }
 
+class AdminService extends BaseService {
+  updateCompany(id, data) {
+    return this.apiPut({
+      url: `/companies/${id}`,
+      data
+    });
+  }
+  getAccount({
+    id
+  }) {
+    return this.apiGet({
+      url: `/accounts/${id}`
+    });
+  }
+  inviteCompanyAccount({
+    companyId,
+    data
+  }) {
+    return this.apiPost({
+      url: `/accounts/${companyId}/invite`,
+      data
+    });
+  }
+  inviteAccount(data) {
+    return this.apiPost({
+      url: `/accounts/inviteAccount`,
+      data
+    });
+  }
+  getAccounts({
+    params
+  }) {
+    return this.apiGet({
+      params,
+      url: `/accounts`
+    });
+  }
+  updateAccount({
+    data,
+    id
+  }) {
+    return this.apiPut({
+      data,
+      url: `/accounts/${id}`
+    });
+  }
+  toggleAccountStatus({
+    id
+  }) {
+    return this.apiPut({
+      url: `/accounts/suspendActivate/${id}`
+    });
+  }
+  transferAdmin({
+    userId,
+    id
+  }) {
+    return this.apiPut({
+      url: `/accounts/transfer-rights/${id}`,
+      data: {
+        userId
+      }
+    });
+  }
+  getUsers({
+    params
+  }) {
+    return this.apiGet({
+      params,
+      url: `/accounts/users`
+    });
+  }
+  impersonate({
+    id
+  }) {
+    return this.apiGet({
+      url: `/accounts/impersonate/${id}`
+    });
+  }
+  cancelInvitation({
+    token
+  }) {
+    return this.apiPut({
+      url: `/accounts/cancelInvitation/${token}`
+    });
+  }
+  getSubjects({
+    subject,
+    params
+  }) {
+    return this.apiGet({
+      url: `/management/subjects/${subject}`,
+      params
+    });
+  }
+  mergeLocations({
+    ids,
+    data
+  }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/location/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
+    return this.apiPost({
+      url,
+      data: payload
+    });
+  }
+  mergeSubjects({
+    subject,
+    ids,
+    data
+  }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/${subject}/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
+    return this.apiPost({
+      url,
+      data: payload
+    });
+  }
+  getSubjectForm({
+    subject,
+    scope = 'global'
+  }) {
+    return this.apiGet({
+      url: `/forms/${subject}`,
+      params: {
+        scope
+      }
+    });
+  }
+  getSubjectData({
+    subject,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/${subject}/${id}`
+    });
+  }
+  viewLocation({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/location/${id}`
+    });
+  }
+  viewStakeholder({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/stakeholder/${id}`
+    });
+  }
+  updateSubject({
+    subject,
+    id,
+    data
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiPut({
+      url: `/management/subject/${type}/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  deleteSubject({
+    subject,
+    id
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiDelete({
+      url: `/management/subject/${type}/${id}`
+    });
+  }
+  getUserGrowth(activeFilter) {
+    return this.apiGet({
+      url: `/accounts/dashboard/user-growth`,
+      isUserManager: true,
+      params: {
+        activeFilter
+      }
+    });
+  }
+}
+var AdminService$1 = createLazyService(AdminService);
+
 const isView = true;
 function View({
   userRoles = [],
@@ -55430,7 +56265,8 @@ function View({
         t: t,
         location: location,
         accountStatuses: accountStatuses,
-        module: module
+        module: module,
+        inviteCompanyAccount: AdminService$1.inviteCompanyAccount
       });
     }
     const getValue = () => {
@@ -55603,7 +56439,8 @@ function Edit({
   toggleAccountStatus = () => {},
   accountStatuses = [],
   module,
-  transferAdmin = () => {}
+  transferAdmin = () => {},
+  inviteCompanyAccount = () => {}
 }) {
   const {
     addCheck,
@@ -55617,7 +56454,7 @@ function Edit({
     }
   }, [isChanged, addCheck, removeCheck]);
   const deleteUser = React.useCallback(id => {
-    // TODO: add call
+    // TODO: add call 
     console.log("DELETE", id);
     fetchData();
   }, [fetchData]);
@@ -55706,7 +56543,10 @@ function Edit({
         addUser: addUser,
         goTo: goTo,
         accountStatuses: accountStatuses,
-        transferAdmin: transferAdmin
+        transferAdmin: transferAdmin,
+        inviteCompanyAccount: inviteCompanyAccount,
+        companyId: data.id,
+        handleError: handleError
       });
     }
     const getValue = () => {
@@ -55745,6 +56585,7 @@ function Edit({
       })
     }, item.key);
   };
+  console.log(conf, "data");
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "form-edit flex-row",
     children: /*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
@@ -55801,7 +56642,8 @@ NotFound.propTypes = {
   errorCode: PropTypes__default["default"].oneOf([404, 403, 500])
 };
 
-const _excluded = ["accountType"];
+const _excluded = ["accountType"],
+  _excluded2 = ["pendingCompanyId", "status"];
 function withFormsProvider(Component) {
   return function WrappedWithFormsProvider(props) {
     return /*#__PURE__*/jsxRuntime.jsx(FormsProvider, {
@@ -55828,7 +56670,8 @@ function AdminView(_ref) {
     updateAccount,
     handleError,
     toggleAccountStatus,
-    transferAdmin
+    transferAdmin,
+    inviteCompanyAccount
   } = _ref;
   const conf = React.useMemo(() => config$1.find(c => c.key === group), [group]);
   const [loading, setLoading] = React.useState(false);
@@ -55845,7 +56688,6 @@ function AdminView(_ref) {
     setEditData(data);
   }, [data]);
   const goToView = React.useCallback(() => {
-    console.log("goToView");
     changeNotificationState({
       onYes: () => {
         setEditData(data);
@@ -55853,7 +56695,7 @@ function AdminView(_ref) {
         goTo("/app/accounts/view/".concat(id, "/").concat(group));
       }
     });
-  }, [goTo, changeNotificationState, data]);
+  }, [goTo, changeNotificationState, data, id, group]);
   const breadCrumbs = React.useMemo(() => {
     return renderBreadCrumbs({
       view: "accounts",
@@ -55890,9 +56732,9 @@ function AdminView(_ref) {
       setIsChanged(false);
       setLoading(false);
     } catch (err) {
-      console.log(err);
+      handleError === null || handleError === void 0 || handleError(err);
     }
-  }, [id]);
+  }, [id, getAccountData, module, handleError]);
   React.useEffect(() => {
     fetchData();
   }, [fetchData]);
@@ -55919,9 +56761,18 @@ function AdminView(_ref) {
             } = _data,
             rest = _objectWithoutProperties(_data, _excluded);
           const _accountType = accountType || editData.accountType;
+          const allUsers = (editData === null || editData === void 0 ? void 0 : editData.users) || [];
+          const existingUsers = allUsers.filter(u => !u.pendingCompanyId);
+          const pendingUsers = allUsers.filter(u => u.pendingCompanyId);
+          console.log('Save operation:', {
+            totalUsers: allUsers.length,
+            existingUsers: existingUsers.length,
+            pendingUsers: pendingUsers.length,
+            accountId: editData.id
+          });
           const newData = _objectSpread2(_objectSpread2({}, rest), {}, {
-            users: ((editData === null || editData === void 0 ? void 0 : editData.users) || []).map(v => _objectSpread2(_objectSpread2({}, v), {}, {
-              status: "active"
+            users: existingUsers.map(v => _objectSpread2(_objectSpread2({}, v), {}, {
+              status: v.status === "unsaved" ? "active" : v.status
             })),
             apps: editData === null || editData === void 0 || (_editData$apps = editData.apps) === null || _editData$apps === void 0 ? void 0 : _editData$apps.map(a => {
               if (a.app === module) {
@@ -55937,6 +56788,34 @@ function AdminView(_ref) {
               id: editData.id,
               data: newData
             });
+            console.log('Checking for pending users...', {
+              hasPendingUsers: pendingUsers.length > 0,
+              hasInviteFunction: !!inviteCompanyAccount,
+              pendingUsers: pendingUsers
+            });
+            if (pendingUsers.length > 0 && inviteCompanyAccount) {
+              console.log('Inviting pending users:', pendingUsers.length);
+              for (const user of pendingUsers) {
+                try {
+                  const {
+                      pendingCompanyId,
+                      status
+                    } = user,
+                    userDataToInvite = _objectWithoutProperties(user, _excluded2);
+                  console.log('Sending invitation for:', user.email, userDataToInvite);
+                  await inviteCompanyAccount({
+                    companyId: editData.id,
+                    data: _objectSpread2(_objectSpread2({}, userDataToInvite), {}, {
+                      pendingCompanyId
+                    })
+                  });
+                  console.log('Invitation sent successfully for:', user.email);
+                } catch (inviteError) {
+                  console.error('Failed to invite user:', user.email, inviteError);
+                  handleError(inviteError);
+                }
+              }
+            }
             await fetchData();
             antd.message.success(t("Information saved successfully"));
             setNotificationMode(NOTIFICATION_MODE.EMPTY);
@@ -55952,7 +56831,7 @@ function AdminView(_ref) {
       icon: "Close",
       onClick: goToView
     }];
-  }, [t, mode, MainForm, goToView, isChanged, editData, fetchData]);
+  }, [t, mode, MainForm, goToView, isChanged, editData, fetchData, updateAccount, handleError, setNotificationMode, module, inviteCompanyAccount]);
   if (!conf) {
     return /*#__PURE__*/jsxRuntime.jsx(NotFound, {});
   }
@@ -55989,7 +56868,8 @@ function AdminView(_ref) {
         data: editData,
         accountStatuses: accountStatuses,
         module: module,
-        transferAdmin: transferAdmin
+        transferAdmin: transferAdmin,
+        inviteCompanyAccount: inviteCompanyAccount
       }) : /*#__PURE__*/jsxRuntime.jsx(View, {
         userRoles: userRoles,
         formOptions: formOptions,
@@ -56026,9 +56906,9 @@ function AdminDashboardScreen({
     fetchUserGrowth,
     userGrowthDataLoading
   } = useWidgetFetch();
-  console.log({
-    userGrowthData
-  });
+
+  // console.log({userGrowthData});
+
   const actionsWidgetsConfig = React.useMemo(() => getActionWidgetsConfig({
     getRedirectLink
   }), [getRedirectLink, getActionWidgetsConfig]);
@@ -56039,6 +56919,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,
@@ -56161,17 +57042,14 @@ function AdminAccountsScreen({
     AdminService,
     options,
     useQuery,
-    NewAccountModal // If not provided, use DAF's default
+    NewAccountModal
   } = config;
-
-  // Use provided modal or fallback to DAF's default
   const AccountModal = NewAccountModal || NewAccount;
   const query = useQuery ? useQuery() : {
     get: () => null
   };
   const [addAccountVisible, setAddAccountVisible] = React.useState(!!query.get("create"));
   const onResendInvitation = React.useCallback(() => {
-    // TODO: implement in calling app if needed
     antd.message.success(t("Invitation email resent"));
   }, [t]);
   const onCopyInvitation = React.useCallback(() => {
@@ -56217,9 +57095,7 @@ function AdminAccountsScreen({
       isOpen: addAccountVisible,
       onClose: () => setAddAccountVisible(false),
       accountTypes: accountTypes,
-      fetchData: () => {
-        // Refresh table data - handled by AccountTable internally
-      },
+      fetchData: () => {},
       inviteAccount: data => AdminService.inviteAccount(data)
     })]
   });
@@ -56246,7 +57122,8 @@ function AdminAccountsViewScreen({
     updateAccount,
     handleError,
     toggleAccountStatus,
-    transferAdmin
+    transferAdmin,
+    inviteCompanyAccount
   } = config;
   return /*#__PURE__*/jsxRuntime.jsx(AdminView$1, {
     t: t,
@@ -56266,7 +57143,8 @@ function AdminAccountsViewScreen({
     updateAccount: updateAccount,
     handleError: handleError,
     toggleAccountStatus: toggleAccountStatus,
-    transferAdmin: transferAdmin
+    transferAdmin: transferAdmin,
+    inviteCompanyAccount: inviteCompanyAccount
   });
 }
 
@@ -56289,12 +57167,16 @@ function AdminSubjectsScreen({
     headerTitle = "subjects",
     breadcrumbs,
     refetchTrigger,
-    getData
+    getData,
+    user
   } = config;
   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");
@@ -56304,13 +57186,14 @@ function AdminSubjectsScreen({
       handleError?.(err);
     }
   }, [AdminService, t, handleError]);
-
-  // Use custom getData if provided, otherwise use default AdminService.getSubjects
   const getSubjects = React.useCallback(params => {
     if (getData) {
       return getData(params);
     }
-    return AdminService.getSubjects(params);
+    return AdminService.getSubjects({
+      subject: 'stakeholder',
+      params
+    });
   }, [getData, AdminService]);
   return /*#__PURE__*/jsxRuntime.jsx(SubjectsTable, {
     t: t,
@@ -56331,7 +57214,9 @@ function AdminSubjectsScreen({
         category: options?.category,
         countries: options?.countries
       }
-    }
+    },
+    user: user,
+    options: options
   });
 }
 
@@ -56354,28 +57239,33 @@ function AdminLocationScreen({
     headerTitle = "location",
     breadcrumbs,
     refetchTrigger,
-    getData
+    getData,
+    user
   } = config;
   const handleMergeLocations = React.useCallback(async mergeData => {
     try {
       if (AdminService.mergeLocations) {
-        await AdminService.mergeLocations(mergeData);
+        await AdminService.mergeLocations({
+          subject: 'location',
+          ...mergeData
+        });
         antd.message.success(t("Locations merged successfully"));
       } else {
         console.warn("AdminService.mergeLocations is not implemented");
-        antd.message.success(t("Locations merged successfully"));
+        antd.message.error(t("Locations not merged"));
       }
     } catch (err) {
       handleError?.(err);
     }
   }, [AdminService, t, handleError]);
-
-  // Use custom getData if provided, otherwise use default AdminService.getLocations
-  const getLocations = React.useCallback(params => {
+  const getSubjects = 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,
@@ -56384,19 +57274,21 @@ function AdminLocationScreen({
     location: location,
     module: module,
     headerTitle: headerTitle,
-    getData: getLocations,
+    getData: getSubjects,
     isMobile: isMobile,
     defaultPageSize: defaultPageSize,
     view: view,
     breadcrumbs: breadcrumbs,
-    mergeSubjectsFunction: handleMergeLocations,
+    mergeLocationsFunction: handleMergeLocations,
     refetchTrigger: refetchTrigger,
     config: {
       options: {
         category: options?.category,
         countries: options?.countries
       }
-    }
+    },
+    user: user,
+    options: options
   });
 }
 
@@ -56409,6 +57301,8 @@ function getAdminRoutes(config) {
     useAdminAccountsViewConfig,
     useAdminSubjectsConfig,
     useAdminLocationConfig,
+    useAdminSubjectsViewConfig,
+    useAdminLocationViewConfig,
     userIsAdmin
   } = config;
   const APP_PREFIX = "APP_".concat(appName.toUpperCase());
@@ -56480,13 +57374,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),
@@ -62755,6 +63649,7 @@ exports.AdminUsersScreen = AdminUsersScreen;
 exports.AdminView = AdminView$1;
 exports.AjaxSelect = AjaxSelectMain;
 exports.Animated = Animated;
+exports.AppInvitation = AppInvitation;
 exports.Applications = Applications;
 exports.AreaChart = AreaChart;
 exports.AuthForm = AuthForm;