datastake-daf 0.6.787 → 0.6.789

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$C = ["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$C);
   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$B = ["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$B);
   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$A = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -5879,7 +5879,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$B);
+    rest = _objectWithoutProperties(_ref, _excluded$A);
   const [source, setSource] = React.useState([]);
   const projectData = (projects || []).find(p => p.id === selectedProject);
   const [filtersInit, setFiltersInit] = React.useState(!loading);
@@ -6697,7 +6697,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$f;
-const _excluded$A = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$z = ["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$z);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7233,7 +7233,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$z = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$y = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7247,7 +7247,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$z);
+    restProps = _objectWithoutProperties(_ref, _excluded$y);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7366,12 +7366,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$y = ["children"];
+const _excluded$x = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$y);
+    props = _objectWithoutProperties(_ref, _excluded$x);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7511,12 +7511,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$x = ["icon"];
+const _excluded$w = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$x);
+    props = _objectWithoutProperties(_ref, _excluded$w);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -7846,7 +7846,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$w = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$v = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$n
 } = antd.theme;
@@ -7939,7 +7939,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$w);
+    restProps = _objectWithoutProperties(_ref, _excluded$v);
   const {
     token
   } = useToken$n();
@@ -8661,7 +8661,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$v = ["tabs", "onChange", "value", "className"];
+const _excluded$u = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8669,7 +8669,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$v);
+    rest = _objectWithoutProperties(_ref, _excluded$u);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8766,7 +8766,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$u = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$t = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8801,7 +8801,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$u);
+              restProps = _objectWithoutProperties(button, _excluded$t);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -9612,25 +9612,27 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
   }
 };
 
-const renderValue = ({
-  value,
-  hasChildren,
-  config,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  allData = {}
-}) => {
-  if (config?.type === 'groupInputs') {
-    if (!config?.inputs) return null;
+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 inputKeys = Object.keys(config.inputs).sort((a, b) => {
-      const positionA = config.inputs[a]?.position || 0;
-      const positionB = config.inputs[b]?.position || 0;
+      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;
       return positionA - positionB;
     });
     const values = inputKeys.map(inputKey => {
-      let inputValue = value?.[inputKey];
+      let inputValue = value === null || value === void 0 ? void 0 : value[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
       } else if (typeof inputValue === 'object' && inputValue !== null) {
@@ -9671,8 +9673,8 @@ const renderValue = ({
   } else {
     displayValue = String(value);
   }
-  const fieldType = config?.type || 'text';
-  let cssClass = `tree-value ${fieldType}-type`;
+  const fieldType = (config === null || config === void 0 ? void 0 : config.type) || 'text';
+  let cssClass = "tree-value ".concat(fieldType, "-type");
   if (displayValue === '-') {
     cssClass += ' empty';
   }
@@ -9682,19 +9684,21 @@ const renderValue = ({
     children: displayValue
   });
 };
-const determineHasChildren = ({
-  config,
-  level
-}) => {
-  if (config?.type === 'groupInputs') {
+const determineHasChildren = _ref2 => {
+  var _config$meta;
+  let {
+    config,
+    level
+  } = _ref2;
+  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
     return false;
   }
-  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
+  if ((config === null || config === void 0 ? void 0 : config.type) === 'header' && config !== null && config !== void 0 && config.inputs && Object.keys(config.inputs).length > 0) {
     return true;
   }
-  return config?.inputs || config?.type === 'group' || config?.type === 'dataLinkGroup' || config?.type === 'section' || config?.type === 'ajaxSubGroup' ||
+  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' ||
   // Add this line
-  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);
+  (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);
 };
 
 const sortByPosition = (items, getConfig) => {
@@ -9965,44 +9969,44 @@ function useAjaxModal$2({
 }
 
 const mergeObject = obj => {
-  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
+  return Object.entries(obj || {}).reduce((acc, _ref) => {
+    let [key, value] = _ref;
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
-      return {
-        ...acc,
-        ...value
-      };
+      return _objectSpread2(_objectSpread2({}, acc), value);
     }
-    return {
-      ...acc,
+    return _objectSpread2(_objectSpread2({}, acc), {}, {
       [key]: value
-    };
+    });
   }, {});
 };
-const handleDataLinkGroupWithTableKeys = ({
-  config,
-  inputConfig,
-  inputKey,
-  value,
-  level,
-  t,
-  rootForm,
-  allData,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
+const handleDataLinkGroupWithTableKeys = _ref2 => {
+  var _inputConfig$meta, _config$meta2, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
+  let {
+    config,
+    inputConfig,
+    inputKey,
+    value,
+    level,
+    t,
+    rootForm,
+    allData,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref2;
   if (!(config.type === 'dataLinkGroup' || config.type === 'dataLink')) {
     return null;
   }
-  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
+  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
     const parentInputKeys = Object.keys(config.inputs || {});
     const isHandledBySiblingDataLink = parentInputKeys.some(otherInputKey => {
       const otherConfig = config.inputs[otherInputKey];
-      if (otherConfig?.type === 'dataLink') {
-        const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
-        const additionalTableKeys = config.meta?.additionalTableKeys || [];
+      if ((otherConfig === null || otherConfig === void 0 ? void 0 : otherConfig.type) === 'dataLink') {
+        var _otherConfig$meta, _config$meta;
+        const siblingTableKeys = (otherConfig === null || otherConfig === void 0 || (_otherConfig$meta = otherConfig.meta) === null || _otherConfig$meta === void 0 ? void 0 : _otherConfig$meta.tableKeys) || [];
+        const additionalTableKeys = ((_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.additionalTableKeys) || [];
         const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
         return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
@@ -10016,23 +10020,26 @@ const handleDataLinkGroupWithTableKeys = ({
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const additionalTableKeys = config.meta?.additionalTableKeys || [];
+  const additionalTableKeys = ((_config$meta2 = config.meta) === null || _config$meta2 === void 0 ? void 0 : _config$meta2.additionalTableKeys) || [];
   const parentInputKeys = Object.keys(config.inputs || {});
   const siblingInputsMatchingTableKeys = parentInputKeys.filter(siblingKey => siblingKey !== inputKey).filter(siblingKey => tableKeys.includes(siblingKey) || additionalTableKeys.includes(siblingKey));
   [...new Set([...tableKeys, ...siblingInputsMatchingTableKeys])];
-  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => {
+    var _inputConfig$meta2;
+    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
+  }, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig?.meta?.namespace,
-    skipFetch: inputConfig?.meta?.skipFetch,
+    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
+    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
     isAjaxModal,
-    formScope: inputConfig?.meta?.formScope,
+    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues?.form;
+  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10044,12 +10051,12 @@ const handleDataLinkGroupWithTableKeys = ({
       'videos': 'Video'
     };
     tableKeys.filter(tableKey => tableKey !== 'datastakeId').forEach(tableKey => {
-      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
+      var _dataLinkForm$identif;
+      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
       if (formInputConfig) {
-        inputs[tableKey] = {
-          ...formInputConfig,
+        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        };
+        });
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10057,7 +10064,7 @@ const handleDataLinkGroupWithTableKeys = ({
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10065,37 +10072,37 @@ const handleDataLinkGroupWithTableKeys = ({
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item?.[tableKey];
+        values[tableKey] = item === null || item === void 0 ? void 0 : item[tableKey];
       } else {
+        var _item$linking;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig?.type
+          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
         };
-        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
+        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
       }
     });
     siblingInputsMatchingTableKeys.forEach(siblingKey => {
       const siblingConfig = config.inputs[siblingKey];
       if (siblingConfig) {
-        inputs[siblingKey] = {
-          ...siblingConfig,
+        inputs[siblingKey] = _objectSpread2(_objectSpread2({}, siblingConfig), {}, {
           label: siblingConfig.label || siblingKey
-        };
-        values[siblingKey] = item?.[siblingKey];
+        });
+        values[siblingKey] = item === null || item === void 0 ? void 0 : item[siblingKey];
       }
     });
-    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey)).filter(fieldKey => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
+        var _item$linking2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = {
-          ...formInputConfig,
+        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        };
-        if (formInputConfig?.label && typeof formInputConfig?.label === 'object') {
-          const dynamicLabelKeys = Object.keys(formInputConfig?.label);
+        });
+        if (formInputConfig !== null && formInputConfig !== void 0 && formInputConfig.label && typeof (formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label) === 'object') {
+          const dynamicLabelKeys = Object.keys(formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label);
           let resolvedLabel = null;
           for (const labelKey of dynamicLabelKeys) {
             const parts = labelKey.split(' is ');
@@ -10104,7 +10111,7 @@ const handleDataLinkGroupWithTableKeys = ({
               const flattenedItem = Object.assign({}, item.location, {
                 address: item.address
               });
-              if (flattenedItem?.[conditionKey] === conditionValue) {
+              if ((flattenedItem === null || flattenedItem === void 0 ? void 0 : flattenedItem[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10112,7 +10119,7 @@ const handleDataLinkGroupWithTableKeys = ({
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
+        values[fieldKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
       });
     }
     return {
@@ -10122,16 +10129,17 @@ const handleDataLinkGroupWithTableKeys = ({
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
+      var _merged$inputKey;
       const merged = mergeObject(item);
-      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
+      const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey = merged[inputKey]) === null || _merged$inputKey === void 0 ? void 0 : _merged$inputKey.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
       const {
         inputs,
         values
       } = createInputsAndValues(merged);
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
         config: {
-          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
           type: 'custom-datalink-group',
           inputs: inputs
         },
@@ -10145,11 +10153,12 @@ const handleDataLinkGroupWithTableKeys = ({
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, `${inputKey}-${itemIndex}`);
+      }, "".concat(inputKey, "-").concat(itemIndex));
     });
   } else {
+    var _merged$inputKey2;
     const merged = mergeObject(value);
-    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
+    const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey2 = merged[inputKey]) === null || _merged$inputKey2 === void 0 ? void 0 : _merged$inputKey2.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
     const {
       inputs,
       values
@@ -10171,7 +10180,7 @@ const handleDataLinkGroupWithTableKeys = ({
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, `${inputKey}-group`);
+    }, "".concat(inputKey, "-group"));
   }
 };
 
@@ -11682,7 +11691,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$t = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$s = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11693,7 +11702,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$t);
+    props = _objectWithoutProperties(_ref, _excluded$s);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11753,7 +11762,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$c;
-const _excluded$s = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$r = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11765,7 +11774,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$s);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -12022,12 +12031,45 @@ const Style$O = styled__default["default"].div`
 				margin-top: 14px;
 			}
 		}
+
+		&.row-item-with-icon {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			gap: 8px;
+
+			h4 {
+				margin-bottom: 0;
+				flex: 0 0 auto;
+			}
+
+			.flex {
+				flex: 0 0 auto;
+				display: flex;
+				align-items: center;
+				font-size: 16px;
+				font-weight: 500;
+				line-height: 38px;
+				letter-spacing: 0;
+				color: var(--base-gray-90);
+				font-family: 'SF UI Display', -apple-system, BlinkMacSystemFont, sans-serif;
+			}
+		}
 	}
 
 	&.small-content {
 		span {
 			font-size: 16px;
 		}
+
+		.row-item-with-icon {
+			.flex {
+				font-size: 16px;
+				line-height: 38px;
+				font-weight: 500;
+				color: var(--base-gray-90);
+			}
+		}
 	}
 
 	.ant-tag {
@@ -12137,6 +12179,50 @@ const NoMinWidth$1 = styled__default["default"].div`
 	}
 `;
 
+const LabelWithIcon = ({
+  t,
+  name,
+  icon,
+  iconColor = "#028788",
+  iconWidth = 16,
+  iconHeight = 16
+}) => {
+  // name is expected to be already translated (string) or a translation key
+  // If it's a string that looks like a translation key (contains '::'), translate it
+  // Otherwise, use it as-is (already translated)
+  const displayText = typeof name === 'string' && name.includes('::') && t && typeof t === 'function' ? t(name) : name;
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    className: "flex items-center",
+    style: {
+      gap: 8
+    },
+    children: [icon && /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+      name: icon,
+      color: iconColor,
+      width: iconWidth,
+      height: iconHeight
+    }), /*#__PURE__*/jsxRuntime.jsx("span", {
+      style: {
+        fontSize: '14px',
+        fontWeight: 500,
+        lineHeight: '26px',
+        letterSpacing: '0%',
+        color: 'var(--base-gray-70)',
+        fontFamily: 'SF UI Display, -apple-system, BlinkMacSystemFont, sans-serif'
+      },
+      children: displayText
+    })]
+  });
+};
+LabelWithIcon.propTypes = {
+  t: PropTypes__default["default"].func,
+  name: PropTypes__default["default"].string.isRequired,
+  icon: PropTypes__default["default"].string,
+  iconColor: PropTypes__default["default"].string,
+  iconWidth: PropTypes__default["default"].number,
+  iconHeight: PropTypes__default["default"].number
+};
+
 function KeyIndicatorsWidget$1(_ref) {
   let {
     t = s => s,
@@ -12158,10 +12244,12 @@ function KeyIndicatorsWidget$1(_ref) {
     children: [children, /*#__PURE__*/jsxRuntime.jsx(Style$O, {
       className: formatClassname(["flex", className]),
       children: config.map((c, i) => /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "row-item",
+        className: "row-item ".concat(c.icon ? 'row-item-with-icon' : ''),
         children: [/*#__PURE__*/jsxRuntime.jsx(Label$2, {
           label: c.label,
-          withTooltip: withTooltip
+          icon: c.icon,
+          withTooltip: withTooltip,
+          t: t
         }), /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex",
           children: c.render()
@@ -12179,8 +12267,29 @@ function KeyIndicatorsWidget$1(_ref) {
 function Label$2(_ref2) {
   let {
     label,
-    withTooltip
+    icon,
+    withTooltip,
+    t
   } = _ref2;
+  if (icon) {
+    const labelContent = /*#__PURE__*/jsxRuntime.jsx(LabelWithIcon, {
+      t: t,
+      name: label,
+      icon: icon
+    });
+    if (withTooltip) {
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label,
+        placement: "topLeft",
+        children: /*#__PURE__*/jsxRuntime.jsx("h4", {
+          children: labelContent
+        })
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx("h4", {
+      children: labelContent
+    });
+  }
   if (withTooltip) {
     return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: label,
@@ -12294,6 +12403,40 @@ const Style$N = styled__default["default"].div`
 			}
 		}
 	}
+
+	&.single-column {
+		grid-template-columns: 1fr;
+
+		.indicator-item {
+			/* Remove the 2-column specific separators first */
+			&:nth-child(1),
+			&:nth-child(2),
+			&:nth-child(3),
+			&:nth-child(4) {
+				&::after {
+					display: none !important;
+				}
+			}
+
+			/* On single column, all items except last get separator */
+			&:not(:last-child) {
+				&::after {
+					content: '' !important;
+					position: absolute;
+					bottom: 0;
+					left: var(--size-lg);
+					right: var(--size-lg);
+					height: 1px;
+					background-color: var(--border-color, #E5E7EB);
+					display: block !important;
+				}
+			}
+			
+			&:last-child::after {
+				display: none !important;
+			}
+		}
+	}
 `;
 const NoMinWidth = styled__default["default"].div`
 	.indicator-item {
@@ -15318,7 +15461,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$r = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$q = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15332,7 +15475,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17532,14 +17675,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$q = ["config", "title", "loading"];
+const _excluded$p = ["config", "title", "loading"];
 const Details = _ref => {
   let {
       config = [],
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header card",
     loading: loading,
@@ -17555,14 +17698,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$p = ["config", "title", "loading"];
+const _excluded$o = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$p);
+    rest = _objectWithoutProperties(_ref, _excluded$o);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17592,7 +17735,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$o = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$n = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17600,7 +17743,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$o);
+    rest = _objectWithoutProperties(_ref, _excluded$n);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -17776,14 +17919,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$a;
-const _excluded$n = ["title", "activeSdgGoals", "t"];
+const _excluded$m = ["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$m);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18081,7 +18224,7 @@ function SdgList({
   });
 }
 
-const _excluded$m = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$l = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18101,7 +18244,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$l);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18373,13 +18516,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$l = ["title", "children"];
+const _excluded$k = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$l);
+    rest = _objectWithoutProperties(_ref, _excluded$k);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18543,7 +18686,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$k = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$j = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18558,7 +18701,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$k);
+    rest = _objectWithoutProperties(_ref, _excluded$j);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -24114,7 +24257,7 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$j = ["viewGroup"],
+const _excluded$i = ["viewGroup"],
   _excluded2$1 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
@@ -24183,7 +24326,7 @@ const Content$1 = _ref => {
       if (groups[gKey].viewGroup === key) {
         // eslint-disable-next-line no-unused-vars
         const _groups$gKey = groups[gKey],
-          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$j);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$i);
         items[gKey] = gCfg;
       }
       return items;
@@ -24441,7 +24584,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$i = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$h = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -24457,7 +24600,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$i);
+    props = _objectWithoutProperties(_ref, _excluded$h);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -34993,7 +35136,7 @@ const beforeUpload = allowedExtensions => file => {
 };
 const allowedImageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.avif', '.bmp', '.tiff', '.tif', '.heif', '.heic', '.svg', '.ico'];
 
-const _excluded$h = ["placeholder"],
+const _excluded$g = ["placeholder"],
   _excluded2 = ["label", "description", "excludeFromEdit", "showFormIf", "icon", "position", "template", "formClass"];
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(timezone);
@@ -35942,7 +36085,7 @@ const inputTypeComponent$1 = {
         },
         commentHint
       } = _ref19,
-      props = _objectWithoutProperties(_ref19.props, _excluded$h);
+      props = _objectWithoutProperties(_ref19.props, _excluded$g);
     let {
       onChange,
       value,
@@ -38624,7 +38767,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-const _excluded$g = ["placeholder"];
+const _excluded$f = ["placeholder"];
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -39379,7 +39522,7 @@ const inputTypeComponent = {
         },
         commentHint
       } = _ref15,
-      props = _objectWithoutProperties(_ref15.props, _excluded$g);
+      props = _objectWithoutProperties(_ref15.props, _excluded$f);
     let {
       onChange,
       value
@@ -41017,7 +41160,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   });
 };
 
-const _excluded$f = ["icon"];
+const _excluded$e = ["icon"];
 function DynamicForm(_ref) {
   var _data$meta;
   let {
@@ -41632,7 +41775,7 @@ function DynamicForm(_ref) {
           let {
               icon: Icon
             } = _ref3,
-            form = _objectWithoutProperties(_ref3, _excluded$f);
+            form = _objectWithoutProperties(_ref3, _excluded$e);
           return /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
             type: "link",
             size: "large",
@@ -41850,7 +41993,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$e = ["onChange", "value"];
+const _excluded$d = ["onChange", "value"];
 function AuthForm(_ref) {
   var _steps$currentStep;
   let {
@@ -41980,7 +42123,7 @@ function AuthForm(_ref) {
         {
           var _field$options;
           const _ref3 = field.props || {},
-            restSelectProps = _objectWithoutProperties(_ref3, _excluded$e);
+            restSelectProps = _objectWithoutProperties(_ref3, _excluded$d);
           inputNode = /*#__PURE__*/jsxRuntime.jsx(StyledSelect, _objectSpread2(_objectSpread2({
             placeholder: field.placeholder
           }, restSelectProps), {}, {
@@ -42144,7 +42287,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$d = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
+const _excluded$c = ["tooltipTitle", "percentage", "strokeColor", "showInfo"];
 function MultiColorProgressBar(_ref) {
   let {
       tooltipTitle,
@@ -42156,7 +42299,7 @@ function MultiColorProgressBar(_ref) {
       },
       showInfo = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$d);
+    rest = _objectWithoutProperties(_ref, _excluded$c);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
     title: tooltipTitle,
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Progress, _objectSpread2({
@@ -42203,7 +42346,7 @@ const SideIcon = _ref3 => {
   });
 };
 
-const _excluded$c = ["value", "options", "onChange", "className", "width"];
+const _excluded$b = ["value", "options", "onChange", "className", "width"];
 const ProgressTabs = _ref => {
   let {
       value = 'setup',
@@ -42224,7 +42367,7 @@ const ProgressTabs = _ref => {
       className = '',
       width = '100%'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$c);
+    rest = _objectWithoutProperties(_ref, _excluded$b);
   // Transform options to include icons and handle disabled state
   const transformedOptions = options.map(option => _objectSpread2(_objectSpread2({}, option), {}, {
     label: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -44439,6 +44582,7 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
+const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
@@ -44454,12 +44598,10 @@ const filterParams = (value, module) => {
     ...filters
   } = activeFilters || {};
   const params = {};
-  // Use skip and take inside pagination object
-  // Calculate skip from page number (page 1 = skip 1, page 2 = skip 21, etc.)
-  params.pagination = {
-    skip: page ? (page - 1) * (pageSize || 20) + 1 : 1,
-    take: pageSize || 20
-  };
+  params.pagination = JSON.stringify({
+    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
+  });
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -44474,24 +44616,12 @@ const filterParams = (value, module) => {
   }
   if (Object.keys(filters).length) {
     if (value.sourceId && value.sourceId === "overview") {
-      const {
-        activeTab,
-        ...restFilters
-      } = filters;
-      Object.assign(params, restFilters);
-      if (activeTab !== undefined) {
-        params.tab = activeTab;
-      }
+      params.filters = JSON.stringify(filters);
     } else {
-      const {
-        authorId,
-        activeTab,
-        ...restFilters
-      } = filters;
-      Object.assign(params, restFilters);
-      if (activeTab !== undefined) {
-        params.tab = activeTab;
-      }
+      params.filters = JSON.stringify({
+        ...filters,
+        authorId: undefined
+      });
     }
   }
   return {
@@ -44789,7 +44919,7 @@ const renderRows = ({
   });
 };
 
-const _excluded$b = ["page", "pageSize"];
+const _excluded$a = ["page", "pageSize"];
 function DataStoreTable$1(_ref) {
   let {
     mod,
@@ -44887,7 +45017,7 @@ function DataStoreTable$1(_ref) {
           page,
           pageSize
         } = activeFilters,
-        rest = _objectWithoutProperties(activeFilters, _excluded$b);
+        rest = _objectWithoutProperties(activeFilters, _excluded$a);
       const params = _objectSpread2({
         pagination: {
           page,
@@ -45207,7 +45337,7 @@ const getLinkedColumns = ({
   ellipsis: true
 }];
 
-const _excluded$a = ["administrativeLevel1", "administrativeLevel2"];
+const _excluded$9 = ["administrativeLevel1", "administrativeLevel2"];
 function DataStoreView(_ref) {
   let {
     mod,
@@ -45270,7 +45400,7 @@ function DataStoreView(_ref) {
           administrativeLevel1,
           administrativeLevel2
         } = _ref2,
-        rest = _objectWithoutProperties(_ref2, _excluded$a);
+        rest = _objectWithoutProperties(_ref2, _excluded$9);
       const levels = [administrativeLevel1, administrativeLevel2].filter(p => !!p);
       let levelsRes = {
         data: []
@@ -46768,14 +46898,14 @@ const TabsStyled = styled__default["default"](antd.Tabs)`
 
 `;
 
-const _excluded$9 = ["defaultActiveKey", "items", "onChange"];
+const _excluded$8 = ["defaultActiveKey", "items", "onChange"];
 const StyledTabs = _ref => {
   let {
       defaultActiveKey,
       items,
       onChange
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$9);
+    rest = _objectWithoutProperties(_ref, _excluded$8);
   return /*#__PURE__*/jsxRuntime.jsx(TabsStyled, _objectSpread2({
     defaultActiveKey: defaultActiveKey,
     items: items,
@@ -46846,7 +46976,7 @@ const Container$1 = styled__default["default"].div`
 	width: ${props => props.isPdf ? props.width ? props.width : '1000px' : 'calc(100% - 48px)'}; 
 `;
 
-const _excluded$8 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
+const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
 const {
   useToken: useToken$g
 } = antd.theme;
@@ -46936,7 +47066,7 @@ function BarChart(_ref) {
       width,
       xAxisConfig = {}
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$8);
+    _objectWithoutProperties(_ref, _excluded$7);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47020,7 +47150,7 @@ function BarChart(_ref) {
   });
 }
 
-const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
+const _excluded$6 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
 const {
   useToken: useToken$f
 } = antd.theme;
@@ -47109,7 +47239,7 @@ function LineChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$7);
+    _objectWithoutProperties(_ref, _excluded$6);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47211,7 +47341,7 @@ function LineChart(_ref) {
   });
 }
 
-const _excluded$6 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
+const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
 const {
   useToken: useToken$e
 } = antd.theme;
@@ -47316,7 +47446,7 @@ function ColumnChart(_ref) {
       yAxis: customYAxis,
       xAxis: customXAxis
     } = _ref;
-    _objectWithoutProperties(_ref, _excluded$6);
+    _objectWithoutProperties(_ref, _excluded$5);
   const containerRef = React__default["default"].useRef(null);
   const chartRef = React__default["default"].useRef(null);
   const {
@@ -47584,7 +47714,7 @@ function RadialBarChart(_ref) {
   });
 }
 
-const _excluded$5 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
+const _excluded$4 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
 const {
   useToken: useToken$c
 } = antd.theme;
@@ -47659,7 +47789,7 @@ function DonutPie(_ref) {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$5);
+    rest = _objectWithoutProperties(_ref, _excluded$4);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -48179,7 +48309,7 @@ function StackChart(_ref) {
   });
 }
 
-const _excluded$4 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
+const _excluded$3 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
 const {
   useToken: useToken$a
 } = antd.theme;
@@ -48256,7 +48386,7 @@ const AreaChart = _ref => {
       legendConfig = {},
       width
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$4);
+    rest = _objectWithoutProperties(_ref, _excluded$3);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -48344,7 +48474,7 @@ const AreaChart = _ref => {
   });
 };
 
-const _excluded$3 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
+const _excluded$2 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
 const {
   useToken: useToken$9
 } = antd.theme;
@@ -48369,7 +48499,7 @@ const RadarChart = _ref => {
       isPdf = false,
       legendConfig = {}
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$3);
+    rest = _objectWithoutProperties(_ref, _excluded$2);
   const containerRef = React.useRef(null);
   const chartRef = React.useRef(null);
   const {
@@ -50701,7 +50831,7 @@ function StakeholderMappings(_ref3) {
 }
 var index = withProvider(StakeholderMappings);
 
-const _excluded$2 = ["t", "checkboxConfig", "defaultTableFilters", "columns", "children", "data", "loading", "APP", "getApiBaseUrl", "selectOptions", "selectFilters", "showCreate", "location", "goTo", "getRedirectLink", "defaultUrlParams", "view", "module", "filtersConfig", "isMobile"];
+const _excluded$1 = ["t", "checkboxConfig", "defaultTableFilters", "columns", "children", "data", "loading", "APP", "getApiBaseUrl", "selectOptions", "selectFilters", "showCreate", "location", "goTo", "getRedirectLink", "defaultUrlParams", "view", "module", "filtersConfig", "isMobile"];
 const BaseScreen = _ref => {
   var _data$data;
   let {
@@ -50739,7 +50869,7 @@ const BaseScreen = _ref => {
       filtersConfig,
       isMobile
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$2);
+    rest = _objectWithoutProperties(_ref, _excluded$1);
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
   const {
@@ -51172,7 +51302,6 @@ function useUserGrowth({
   const {
     token
   } = useToken$6();
-  console.log("mainData", mainData);
   const fetchData = () => {
     const {
       dates = []
@@ -51308,7 +51437,6 @@ function UserGrowth({
     t,
     translationKeys
   });
-  console.log("usergrowthhhhh", data);
   React.useEffect(() => {
     if (typeof fetchUserGrowth === "function") {
       fetchUserGrowth(selectValue);
@@ -51436,7 +51564,6 @@ 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",
@@ -51707,6 +51834,7 @@ function AddUserModal({
       setAccountUsed(true);
     }).catch(() => {});
   };
+  console.log("hellooooooooooooooooooooooooo");
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     open: isOpen,
     title: "admin::edit-user",
@@ -51832,7 +51960,7 @@ const renderTypeTag = ({
   });
 };
 
-const getColumns$7 = ({
+const getColumns$6 = ({
   t,
   show = "show",
   selectOptions,
@@ -52316,7 +52444,7 @@ function UserTable(_ref) {
       role: config.userRoles.filter(c => !c.isForAppAdmin)
     };
   }, [config.userRoles, config.accountTypes, accounts]);
-  const columns = React.useMemo(() => getColumns$7({
+  const columns = React.useMemo(() => getColumns$6({
     t,
     show: activeTab,
     selectOptions,
@@ -52412,7 +52540,7 @@ function UserTable(_ref) {
   });
 }
 
-const getColumns$6 = ({
+const getColumns$5 = ({
   t,
   goTo,
   show = "show",
@@ -52765,7 +52893,7 @@ const getTabs$1 = ({
   label: t("Suspended")
 }];
 
-const getColumns$5 = ({
+const getColumns$4 = ({
   t,
   selectOptions,
   module
@@ -52888,7 +53016,7 @@ function CombineAccountModal({
   } = useToken$4();
   const [MainForm] = antd.Form.useForm();
   const columns = React.useMemo(() => {
-    return getColumns$5({
+    return getColumns$4({
       t,
       selectOptions,
       module
@@ -53057,7 +53185,7 @@ function NewAccount({
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     t: t,
-    title: t(isEdit ? "edit-account" : "add-account"),
+    title: t(isEdit ? "admin::edit-account" : "admin::add-account"),
     open: isOpen,
     onClose: onClose,
     onSuccess: onSubmit,
@@ -53191,7 +53319,7 @@ function AccountTable(_ref) {
       onCancel: () => {}
     });
   }, [t, fetchData, fetchPendingAccounts]);
-  const columns = React.useMemo(() => getColumns$6({
+  const columns = React.useMemo(() => getColumns$5({
     t,
     show: activeTab,
     selectOptions,
@@ -53362,12 +53490,233 @@ const checkboxConfig$8 = {
   name: "Name",
   datastakeId: "ID"
 };
-const getNameByLevel$1 = (data, level) => {
+const getNameByLevel = (data, level) => {
   const entry = Object.values(data || {}).find(item => item.level === level);
   return entry;
 };
 
-const getColumns$4 = ({
+const getColumns$3 = ({
+  t,
+  goTo = () => {},
+  show = "show",
+  getRedirectLink = () => {},
+  token,
+  selectedSubjects,
+  setSelectedSubjects,
+  selectOptions,
+  entity
+}) => {
+  const cols = [{
+    title: "",
+    dataIndex: "select",
+    key: "select",
+    width: 50,
+    show: true,
+    render: (v, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+        onChange: () => setSelectedSubjects(prev => {
+          const isSelected = prev.some(p => p.id === all.id);
+          if (isSelected) {
+            return prev.filter(p => p.id !== all.id);
+          }
+          return [...prev, all];
+        }),
+        checked: selectedSubjects.some(p => p.id === all.id),
+        disabled: selectedSubjects?.length >= 3 && !selectedSubjects.some(p => p.id === all.id)
+      });
+    }
+  }, {
+    title: t("ID"),
+    dataIndex: "datastakeId",
+    key: "datastakeId",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: value,
+        children: value
+      });
+    }
+  }, {
+    title: t("Name"),
+    dataIndex: "name",
+    key: "name",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: value,
+        children: value
+      });
+    }
+  }, {
+    title: t("Category"),
+    dataIndex: "category",
+    key: "category",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const category = findOptions(value, selectOptions?.category || []) || "--";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: category,
+        children: category
+      });
+    }
+  }, {
+    title: t("Country"),
+    dataIndex: "country",
+    key: "country",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const country = findOptions(value, selectOptions?.country || []) || "--";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: country,
+        children: country
+      });
+    }
+  }, {
+    title: t("Province"),
+    dataIndex: "administrativeLevel1",
+    key: "administrativeLevel1",
+    ellipsis: true,
+    show: entity.includes("locations"),
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      let label;
+      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+        label = all?.linking?.SCL?.[value]?.name;
+      } else {
+        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label || '-',
+        children: label || '-'
+      });
+    }
+  }, {
+    title: t("Territory"),
+    dataIndex: "administrativeLevel2",
+    key: "administrativeLevel2",
+    show: entity.includes("locations"),
+    ellipsis: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      let label;
+      if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+        label = all?.linking?.SCL?.[value]?.name;
+      } else {
+        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: label || '-',
+        children: label || '-'
+      });
+    }
+  }, {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      const MAX_SOURCES = 3;
+      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
+      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
+        max: {
+          count: count,
+          style: {
+            color: token.baseGray90,
+            backgroundColor: token.baseGray20,
+            border: `1px solid ${token.baseGray40}`
+          }
+        },
+        size: "small",
+        children: value.map((v, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Avatar, {
+          size: "small",
+          style: {
+            backgroundColor: token.baseGray20,
+            color: token.baseGray90,
+            border: `1px solid ${token.baseGray40}`,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center"
+          },
+          children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+            name: "Organisation02",
+            width: 18,
+            height: 18,
+            color: token.baseGray90
+          })
+        }, i))
+      }) : '-';
+    }
+  }, {
+    title: "",
+    dataIndex: "actions",
+    key: "actions",
+    width: 60,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "cursor-pointer",
+        onClick: () => {
+          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+        },
+        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+          name: "Link",
+          width: 18,
+          height: 18
+        })
+      });
+    }
+  }];
+  return cols.filter(c => c[show]);
+};
+
+const getColumns$2 = ({
   t,
   selectOptions,
   module,
@@ -53430,7 +53779,7 @@ const getColumns$4 = ({
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel$1(all?.linking?.SCL, "level_1")?.name;
+        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -53447,7 +53796,7 @@ const getColumns$4 = ({
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel$1(all?.linking?.SCL, "level_2")?.name;
+        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -53476,7 +53825,7 @@ function CombineLocationModal({
   const [MainForm] = antd.Form.useForm();
   const [isDisabled, setIsDisabled] = React.useState(true);
   const columns = React.useMemo(() => {
-    return getColumns$4({
+    return getColumns$2({
       t,
       selectOptions,
       module,
@@ -53594,7 +53943,7 @@ function CombineLocationModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Province"),
               options: selectedLocations.map(location => {
-                const _data = getNameByLevel$1(location?.linking?.SCL, "level_1");
+                const _data = getNameByLevel(location?.linking?.SCL, "level_1");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -53607,7 +53956,7 @@ function CombineLocationModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Territory"),
               options: selectedLocations.map(location => {
-                const _data = getNameByLevel$1(location?.linking?.SCL, "level_2");
+                const _data = getNameByLevel(location?.linking?.SCL, "level_2");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -53625,233 +53974,6 @@ function CombineLocationModal({
   });
 }
 
-const getNameByLevel = (data, level) => {
-  const entry = Object.values(data || {}).find(item => item.level === level);
-  return entry;
-};
-
-const getColumns$3 = ({
-  t,
-  goTo = () => {},
-  show = "show",
-  getRedirectLink = () => {},
-  token,
-  selectedLocations,
-  setSelectedLocations,
-  selectOptions,
-  entity
-}) => {
-  const cols = [{
-    title: "",
-    dataIndex: "select",
-    key: "select",
-    width: 50,
-    show: true,
-    render: (v, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
-        onChange: () => setSelectedLocations(prev => {
-          const isSelected = prev.some(p => p.id === all.id);
-          if (isSelected) {
-            return prev.filter(p => p.id !== all.id);
-          }
-          return [...prev, all];
-        }),
-        checked: selectedLocations.some(p => p.id === all.id),
-        disabled: selectedLocations?.length >= 3 && !selectedLocations.some(p => p.id === all.id)
-      });
-    }
-  }, {
-    title: t("ID"),
-    dataIndex: "datastakeId",
-    key: "datastakeId",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
-      });
-    }
-  }, {
-    title: t("Name"),
-    dataIndex: "name",
-    key: "name",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
-      });
-    }
-  }, {
-    title: t("Category"),
-    dataIndex: "category",
-    key: "category",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const category = findOptions(value, selectOptions?.category || []) || "--";
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: category,
-        children: category
-      });
-    }
-  }, {
-    title: t("Country"),
-    dataIndex: "country",
-    key: "country",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const country = findOptions(value, selectOptions?.country || []) || "--";
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: country,
-        children: country
-      });
-    }
-  }, {
-    title: t("Admin Level 1"),
-    dataIndex: "administrativeLevel1",
-    key: "administrativeLevel1",
-    ellipsis: true,
-    show: entity.includes("location"),
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      let label;
-      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-        label = all?.linking?.SCL?.[value]?.name;
-      } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label || '-',
-        children: label || '-'
-      });
-    }
-  }, {
-    title: t("Admin Level 2"),
-    dataIndex: "administrativeLevel2",
-    key: "administrativeLevel2",
-    show: entity.includes("location"),
-    ellipsis: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      let label;
-      if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-        label = all?.linking?.SCL?.[value]?.name;
-      } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label || '-',
-        children: label || '-'
-      });
-    }
-  }, {
-    title: t("Sources"),
-    dataIndex: "sources",
-    key: "sources",
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const MAX_SOURCES = 3;
-      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
-      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
-        max: {
-          count: count,
-          style: {
-            color: token.baseGray90,
-            backgroundColor: token.baseGray20,
-            border: `1px solid ${token.baseGray40}`
-          }
-        },
-        size: "small",
-        children: value.map((v, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Avatar, {
-          size: "small",
-          style: {
-            backgroundColor: token.baseGray20,
-            color: token.baseGray90,
-            border: `1px solid ${token.baseGray40}`,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center"
-          },
-          children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-            name: "Organisation02",
-            width: 18,
-            height: 18,
-            color: token.baseGray90
-          })
-        }, i))
-      }) : '-';
-    }
-  }, {
-    title: "",
-    dataIndex: "actions",
-    key: "actions",
-    width: 60,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "cursor-pointer",
-        onClick: () => {
-          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
-        },
-        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-          name: "Link",
-          width: 18,
-          height: 18
-        })
-      });
-    }
-  }];
-  return cols.filter(c => c[show]);
-};
-
-const _excluded$1 = ["pagination", "tab"];
 const {
   useToken: useToken$2
 } = antd.theme;
@@ -53879,29 +54001,6 @@ function LocationTable(_ref) {
     token
   } = useToken$2();
   const [combineLocationVisible, setCombineLocationVisible] = React.useState(false);
-
-  // Wrapper to transform pagination params to strings and ensure tab is at root level
-  const getDataWithStringPagination = async _ref2 => {
-    let {
-      params
-    } = _ref2;
-    // Extract tab from the params (it should already be there from filterParams)
-    const {
-        pagination,
-        tab
-      } = params,
-      otherParams = _objectWithoutProperties(params, _excluded$1);
-    const transformedParams = _objectSpread2(_objectSpread2({}, otherParams), {}, {
-      pagination: {
-        skip: String((pagination === null || pagination === void 0 ? void 0 : pagination.skip) || 1),
-        take: String((pagination === null || pagination === void 0 ? void 0 : pagination.take) || 20)
-      },
-      tab: tab || "active" // Ensure tab is at root level with default value
-    });
-    return getData({
-      params: transformedParams
-    });
-  };
   const {
     filter,
     activeTab,
@@ -53923,7 +54022,7 @@ function LocationTable(_ref) {
     defaultPageSize,
     filtersConfig: filtersConfig$8,
     getRedirectLink,
-    getData: getDataWithStringPagination,
+    getData,
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
@@ -53951,7 +54050,7 @@ function LocationTable(_ref) {
     children: [/*#__PURE__*/jsxRuntime.jsxs(AdminTable, {
       filters: filter,
       t: t,
-      headerTitle: "test",
+      headerTitle: headerTitle,
       actionButton: [{
         icon: "Merge",
         onClick: () => setCombineLocationVisible(true),
@@ -54019,7 +54118,6 @@ function LocationTable(_ref) {
         if (typeof mergeSubjectsFunction === 'function') {
           mergeSubjectsFunction(data);
           setSelectedLocations([]);
-          antd.message.success(t("Locations successfully merged."));
         }
       },
       selectedLocations: selectedLocations,
@@ -54030,227 +54128,6 @@ function LocationTable(_ref) {
   });
 }
 
-const getColumns$2 = ({
-  t,
-  goTo = () => {},
-  show = "show",
-  getRedirectLink = () => {},
-  token,
-  selectedSubjects,
-  setSelectedSubjects,
-  selectOptions,
-  entity
-}) => {
-  const cols = [{
-    title: "",
-    dataIndex: "select",
-    key: "select",
-    width: 50,
-    show: true,
-    render: (v, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
-        onChange: () => setSelectedSubjects(prev => {
-          const isSelected = prev.some(p => p.id === all.id);
-          if (isSelected) {
-            return prev.filter(p => p.id !== all.id);
-          }
-          return [...prev, all];
-        }),
-        checked: selectedSubjects.some(p => p.id === all.id),
-        disabled: selectedSubjects?.length >= 3 && !selectedSubjects.some(p => p.id === all.id)
-      });
-    }
-  }, {
-    title: t("ID"),
-    dataIndex: "datastakeId",
-    key: "datastakeId",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
-      });
-    }
-  }, {
-    title: t("Name"),
-    dataIndex: "name",
-    key: "name",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
-      });
-    }
-  }, {
-    title: t("Category"),
-    dataIndex: "category",
-    key: "category",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const category = findOptions(value, selectOptions?.category || []) || "--";
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: category,
-        children: category
-      });
-    }
-  }, {
-    title: t("Country"),
-    dataIndex: "country",
-    key: "country",
-    ellipsis: true,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const country = findOptions(value, selectOptions?.country || []) || "--";
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: country,
-        children: country
-      });
-    }
-  }, {
-    title: t("Admin Level 1"),
-    dataIndex: "administrativeLevel1",
-    key: "administrativeLevel1",
-    ellipsis: true,
-    show: entity.includes("location"),
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      let label;
-      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-        label = all?.linking?.SCL?.[value]?.name;
-      } else {
-        label = getNameByLevel$1(all?.linking?.SCL, "level_1")?.name;
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label || '-',
-        children: label || '-'
-      });
-    }
-  }, {
-    title: t("Admin Level 2"),
-    dataIndex: "administrativeLevel2",
-    key: "administrativeLevel2",
-    show: entity.includes("location"),
-    ellipsis: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      let label;
-      if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-        label = all?.linking?.SCL?.[value]?.name;
-      } else {
-        label = getNameByLevel$1(all?.linking?.SCL, "level_2")?.name;
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label || '-',
-        children: label || '-'
-      });
-    }
-  }, {
-    title: t("Sources"),
-    dataIndex: "sources",
-    key: "sources",
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      const MAX_SOURCES = 3;
-      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
-      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
-        max: {
-          count: count,
-          style: {
-            color: token.baseGray90,
-            backgroundColor: token.baseGray20,
-            border: `1px solid ${token.baseGray40}`
-          }
-        },
-        size: "small",
-        children: value.map((v, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Avatar, {
-          size: "small",
-          style: {
-            backgroundColor: token.baseGray20,
-            color: token.baseGray90,
-            border: `1px solid ${token.baseGray40}`,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center"
-          },
-          children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-            name: "Organisation02",
-            width: 18,
-            height: 18,
-            color: token.baseGray90
-          })
-        }, i))
-      }) : '-';
-    }
-  }, {
-    title: "",
-    dataIndex: "actions",
-    key: "actions",
-    width: 60,
-    show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "cursor-pointer",
-        onClick: () => {
-          goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
-        },
-        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-          name: "Link",
-          width: 18,
-          height: 18
-        })
-      });
-    }
-  }];
-  return cols.filter(c => c[show]);
-};
-
 const mapToSelectOptions = (items, valueKey, selectOptions, optionKey, customMapper = null) => {
   return items.map(item => {
     if (customMapper) {
@@ -54329,7 +54206,7 @@ const getColumns$1 = ({
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel$1(all?.linking?.SCL, "level_1")?.name;
+        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -54346,7 +54223,7 @@ const getColumns$1 = ({
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
         label = all?.linking?.SCL?.[value]?.name;
       } else {
-        label = getNameByLevel$1(all?.linking?.SCL, "level_2")?.name;
+        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -54478,7 +54355,7 @@ function CombineSubjectsModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Province"),
               options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
-                const _data = getNameByLevel$1(subject?.linking?.SCL, "level_1");
+                const _data = getNameByLevel(subject?.linking?.SCL, "level_1");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -54491,7 +54368,7 @@ function CombineSubjectsModal({
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Territory"),
               options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
-                const _data = getNameByLevel$1(subject?.linking?.SCL, "level_2");
+                const _data = getNameByLevel(subject?.linking?.SCL, "level_2");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
@@ -54565,11 +54442,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: []
+      sources: [] //TODO: add sources logic and make sure you only show unique sources only once
     };
   }, [config.options]);
   const columns = React.useMemo(() => {
-    return getColumns$2({
+    return getColumns$3({
       t,
       goTo,
       token,
@@ -54644,20 +54521,19 @@ 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).finally(() => {
-            setSelectedSubjects([]);
-            fetchData();
-          });
+          mergeSubjectsFunction(data);
+          setSelectedSubjects([]);
         }
       },
       selectedSubjects: selectedSubjects,
-      selectOptions: selectOptions,
+      selectOptions: selectOptions || {},
       module: module,
       entity: headerTitle
     })]
@@ -55110,7 +54986,10 @@ const getColumns = ({
   }];
   return cols.filter(v => v.show);
 };
-const checkboxConfig$7 = {};
+const checkboxConfig$7 = {
+  name: "Name",
+  datastakeId: "ID"
+};
 const selectFiltersConfig$7 = {
   userRole: {
     type: "select",
@@ -55140,18 +55019,11 @@ const selectFiltersConfig$7 = {
   }
 };
 const filtersConfig$7 = {
-  search: ""
-};
-const defaultUrlParams = {
-  search: "",
-  userRole: null,
-  status: null
-};
-const defaultTableFilters = {
-  search: "",
-  userRole: null,
-  status: null
+  name: "",
+  datastakeId: ""
 };
+const defaultUrlParams = {};
+const defaultTableFilters = {};
 
 function Users({
   t,
@@ -55195,9 +55067,9 @@ function Users({
       userRole: userRoles.filter(u => !u.isForAppAdmin),
       status: accountStatuses
     };
-  }, [userRoles, accountStatuses]);
+  }, [userRoles]);
   const canClearSearch = React.useMemo(() => {
-    return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
+    return !!activeFilters.search;
   }, [activeFilters]);
   const onDeleteUserClick = React.useCallback(id => {
     antd.Modal.confirm({
@@ -55916,9 +55788,9 @@ function AdminDashboardScreen({
     fetchUserGrowth,
     userGrowthDataLoading
   } = useWidgetFetch();
-
-  // console.log({userGrowthData});
-
+  console.log({
+    userGrowthData
+  });
   const actionsWidgetsConfig = React.useMemo(() => getActionWidgetsConfig({
     getRedirectLink
   }), [getRedirectLink, getActionWidgetsConfig]);
@@ -55929,7 +55801,6 @@ 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,
@@ -56185,10 +56056,7 @@ function AdminSubjectsScreen({
   const handleMergeSubjects = React.useCallback(async mergeData => {
     try {
       if (AdminService.mergeSubjects) {
-        await AdminService.mergeSubjects({
-          subject: 'stakeholder',
-          ...mergeData
-        });
+        await AdminService.mergeSubjects(mergeData);
         antd.message.success(t("Subjects merged successfully"));
       } else {
         console.warn("AdminService.mergeSubjects is not implemented");
@@ -56204,10 +56072,7 @@ function AdminSubjectsScreen({
     if (getData) {
       return getData(params);
     }
-    return AdminService.getSubjects({
-      subject: 'stakeholder',
-      params
-    });
+    return AdminService.getSubjects(params);
   }, [getData, AdminService]);
   return /*#__PURE__*/jsxRuntime.jsx(SubjectsTable, {
     t: t,
@@ -56255,14 +56120,11 @@ function AdminLocationScreen({
   } = config;
   const handleMergeLocations = React.useCallback(async mergeData => {
     try {
-      if (AdminService.mergeSubjects) {
-        await AdminService.mergeSubjects({
-          subject: 'location',
-          ...mergeData
-        });
+      if (AdminService.mergeLocations) {
+        await AdminService.mergeLocations(mergeData);
         antd.message.success(t("Locations merged successfully"));
       } else {
-        console.warn("AdminService.mergeSubjects is not implemented");
+        console.warn("AdminService.mergeLocations is not implemented");
         antd.message.success(t("Locations merged successfully"));
       }
     } catch (err) {
@@ -56270,15 +56132,12 @@ function AdminLocationScreen({
     }
   }, [AdminService, t, handleError]);
 
-  // Use custom getData if provided, otherwise use default AdminService.getSubjects
+  // Use custom getData if provided, otherwise use default AdminService.getLocations
   const getLocations = React.useCallback(params => {
     if (getData) {
       return getData(params);
     }
-    return AdminService.getSubjects({
-      subject: 'location',
-      params
-    });
+    return AdminService.getLocations(params);
   }, [getData, AdminService]);
   return /*#__PURE__*/jsxRuntime.jsx(LocationTable, {
     t: t,
@@ -56383,13 +56242,13 @@ function getAdminRoutes(config) {
     visible: user => userIsAdmin(user),
     component: subjectsIndexComponent
   }, ...(typeof useAdminLocationConfig === "function" ? [{
-    path: "management/subjects/location",
+    path: "subjects/location",
     key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_LOCATIONS"),
     exact: true,
     visible: user => userIsAdmin(user),
     component: /*#__PURE__*/jsxRuntime.jsx(LocationWrapper, {})
   }] : []), ...(typeof useAdminSubjectsConfig === "function" ? [{
-    path: "management/subjects/stakeholder",
+    path: "subjects/stakeholder",
     key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_STAKEHOLDERS"),
     exact: true,
     visible: user => userIsAdmin(user),