datastake-daf 0.6.811 → 0.6.813

package/dist/components/index.js

@@ -8011,7 +8011,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
 
 const _excluded$y = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
-  useToken: useToken$n
+  useToken: useToken$p
 } = antd.theme;
 
 /**
@@ -8105,7 +8105,7 @@ function Multiselect(_ref) {
     restProps = _objectWithoutProperties(_ref, _excluded$y);
   const {
     token
-  } = useToken$n();
+  } = useToken$p();
   const [selectValue, setSelectValue] = React.useState(Array.isArray(defaultSelected) ? defaultSelected.length > 0 ? defaultSelected : [] : [defaultSelected]);
   function onSelectChange(value) {
     if (!canUnselectLast && value.length === 0) {
@@ -8659,7 +8659,7 @@ const useHeader = _ref => {
 };
 
 const {
-  useToken: useToken$m
+  useToken: useToken$o
 } = antd.theme;
 function BreadCrumbs({
   breadcrumbs = [],
@@ -8668,7 +8668,7 @@ function BreadCrumbs({
   const [splitIndex, setSplitIndex] = React.useState(0);
   const {
     token
-  } = useToken$m();
+  } = useToken$o();
   const _renderBreadcrumb = (b, i, isLast, noOnClickLast = false) => {
     return /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex breadcrumb-item",
@@ -18410,7 +18410,7 @@ const {
   Meta
 } = antd.Card;
 const {
-  useToken: useToken$l
+  useToken: useToken$n
 } = antd.theme;
 function ProjectWidget(_ref) {
   let {
@@ -18429,7 +18429,7 @@ function ProjectWidget(_ref) {
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
-  } = useToken$l();
+  } = useToken$n();
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Card, _objectSpread2(_objectSpread2({
     style: {
       // flex: 1,
@@ -18533,7 +18533,7 @@ const Style$E = styled__default["default"].div`
 `;
 
 const {
-  useToken: useToken$k
+  useToken: useToken$m
 } = antd.theme;
 const WidgetCard = _ref => {
   let {
@@ -18552,7 +18552,7 @@ const WidgetCard = _ref => {
     width,
     t = () => {}
   } = _ref;
-  useToken$k();
+  useToken$m();
   return /*#__PURE__*/jsxRuntime.jsx(Style$E, {
     backgroundColor: backgroundColor,
     backgroundBorderColor: backgroundBorderColor,
@@ -19415,8 +19415,6 @@ function FaunaWidget(_ref) {
         $itemWidth: itemWidth,
         $itemHeight: itemHeight,
         children: faunaConfig.map(item => {
-          // Use colored SVG if the item's key exists in faunaPresent array
-          // Otherwise use default SVG
           const isPresent = Array.isArray(faunaPresent) && faunaPresent.includes(item.key);
           const shouldUseColored = isPresent;
           return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -19860,12 +19858,12 @@ function GroupInfos({
 }
 
 const {
-  useToken: useToken$j
+  useToken: useToken$l
 } = antd.theme;
 function Smart() {
   const {
     token
-  } = useToken$j();
+  } = useToken$l();
   const [isOpen, setIsOpen] = React.useState(false);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     style: {
@@ -19949,7 +19947,7 @@ function SmartWidget({
 }) {
   const {
     token
-  } = useToken$j();
+  } = useToken$l();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     noTitle: true,
     className: "no-p-body p-xs",
@@ -20994,7 +20992,7 @@ function DataLink$1({
 }
 
 const {
-  useToken: useToken$i
+  useToken: useToken$k
 } = antd.theme;
 const disabledTypes = ["dataLink"];
 function Versions({
@@ -21007,7 +21005,7 @@ function Versions({
 }) {
   const {
     token
-  } = useToken$i();
+  } = useToken$k();
   const dataSource = React.useMemo(() => {
     if (!versionsDatapoints) {
       return [];
@@ -42981,12 +42979,17 @@ function AuthForm(_ref) {
     errors,
     t = key => key,
     executeRecaptcha = () => {},
-    getCurrentStep = () => {}
+    getCurrentStep = () => {},
+    theme
   } = _ref;
   const [formInstance] = antd.Form.useForm(form);
   const [currentStep, setCurrentStep] = React.useState(0);
   const [allFormValues, setAllFormValues] = React.useState(initialValues);
   const [formErrors, setFormErrors] = React.useState(null);
+  const buttonStyle = theme !== null && theme !== void 0 && theme.colorPrimary ? {
+    backgroundColor: theme.colorPrimary,
+    borderColor: theme.colorPrimary
+  } : {};
   const isMultiStep = !!steps;
   const currentFields = isMultiStep ? steps === null || steps === void 0 || (_steps$currentStep = steps[currentStep]) === null || _steps$currentStep === void 0 ? void 0 : _steps$currentStep.fields : fields || [];
   React.useEffect(() => {
@@ -43127,6 +43130,7 @@ function AuthForm(_ref) {
       name: field.name,
       label: field.label,
       rules: field.rules,
+      dependencies: field.dependencies,
       style: {
         marginBottom: 0
       }
@@ -43173,6 +43177,7 @@ function AuthForm(_ref) {
                 disabled: isLastStep && !allFieldsFilled,
                 block: true,
                 className: "normal-br",
+                style: buttonStyle,
                 children: isLastStep ? submitText : t("Next")
               })
             });
@@ -43186,6 +43191,7 @@ function AuthForm(_ref) {
             onClick: prev,
             block: true,
             className: "normal-br",
+            style: buttonStyle,
             children: t("Back")
           })
         })]
@@ -43199,6 +43205,7 @@ function AuthForm(_ref) {
           htmlType: "submit",
           block: true,
           className: "normal-br",
+          style: buttonStyle,
           children: isMultiStep ? t("Next") : submitText
         })
       })]
@@ -45228,11 +45235,11 @@ function DataStore(_ref) {
   });
 }
 
-const filtersConfig$c = {
+const filtersConfig$e = {
   datastakeId: '',
   name: ''
 };
-const selectFiltersConfig$c = {
+const selectFiltersConfig$e = {
   country: {
     type: 'select',
     label: 'Country',
@@ -45273,7 +45280,7 @@ const selectFiltersConfig$c = {
     getValue: option => option.value
   }
 };
-const checkboxConfig$c = {
+const checkboxConfig$e = {
   datastakeId: 'ID',
   name: 'Name'
 };
@@ -45590,14 +45597,15 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
+const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page = 1,
-    pageSize = 20,
+    page,
+    pageSize,
     sortDir,
     sortBy,
     search,
@@ -45606,10 +45614,9 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    page,
-    pageSize
+    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
   });
-  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -45622,6 +45629,16 @@ 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
@@ -45999,12 +46016,12 @@ function DataStoreTable$1(_ref) {
     goNext,
     setPagination
   } = useFilters({
-    selectFiltersConfig: selectFiltersConfig$c,
+    selectFiltersConfig: selectFiltersConfig$e,
     view,
     goTo,
     location,
     module: mod,
-    filtersConfig: filtersConfig$c,
+    filtersConfig: filtersConfig$e,
     getRedirectLink,
     defaultPageSize
   });
@@ -46077,7 +46094,7 @@ function DataStoreTable$1(_ref) {
           hasError: hasError,
           setHasError: setHasError,
           filtersConfig: newFiltersConfig,
-          checkboxConfig: checkboxConfig$c,
+          checkboxConfig: checkboxConfig$e,
           onSearch: onSearch,
           activeFilters: activeFilters,
           canClear: canClearSearch,
@@ -46093,7 +46110,7 @@ function DataStoreTable$1(_ref) {
           rowKey: "key",
           doEmptyRows: true,
           selectOptions,
-          filtersConfig: selectFiltersConfig$c,
+          filtersConfig: selectFiltersConfig$e,
           onFilterChange: onFiltersChange,
           showFilters,
           defaultFilters,
@@ -47920,7 +47937,7 @@ StyledTabs.propTypes = {
 };
 
 const {
-  useToken: useToken$h
+  useToken: useToken$j
 } = antd.theme;
 const MAX_LENGTH = 3;
 function AvatarGroup(_ref) {
@@ -47932,7 +47949,7 @@ function AvatarGroup(_ref) {
   const count = items.length === maxLength + 1 ? items.length : maxLength;
   const {
     token
-  } = useToken$h();
+  } = useToken$j();
   return /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
     max: {
       count: count,
@@ -47976,7 +47993,7 @@ const Container$1 = styled__default["default"].div`
 
 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
+  useToken: useToken$i
 } = antd.theme;
 
 /**
@@ -48069,7 +48086,7 @@ function BarChart(_ref) {
   const chartRef = React__default["default"].useRef(null);
   const {
     token
-  } = useToken$g();
+  } = useToken$i();
   const {
     legendEnabled,
     legendItems,
@@ -48150,7 +48167,7 @@ function BarChart(_ref) {
 
 const _excluded$8 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isSmooth", "seriesField", "isArea", "formattedYAxis", "formattedXAxis", "color", "isPercentage", "height", "autoHideXLabel", "t", "isPdf", "legendConfig", "width", "yAxis", "xAxis"];
 const {
-  useToken: useToken$f
+  useToken: useToken$h
 } = antd.theme;
 
 /**
@@ -48242,7 +48259,7 @@ function LineChart(_ref) {
   const chartRef = React__default["default"].useRef(null);
   const {
     token
-  } = useToken$f();
+  } = useToken$h();
   const {
     legendEnabled,
     legendItems,
@@ -48341,7 +48358,7 @@ function LineChart(_ref) {
 
 const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "seriesField", "isPercentage", "showBackground", "formattedYAxis", "formattedXAxis", "color", "height", "groupField", "width", "legendConfig", "isPdf", "yAxis", "xAxis"];
 const {
-  useToken: useToken$e
+  useToken: useToken$g
 } = antd.theme;
 
 /**
@@ -48449,7 +48466,7 @@ function ColumnChart(_ref) {
   const chartRef = React__default["default"].useRef(null);
   const {
     token
-  } = useToken$e();
+  } = useToken$g();
   const {
     legendEnabled,
     legendItems,
@@ -48539,7 +48556,7 @@ function ColumnChart(_ref) {
 }
 
 const {
-  useToken: useToken$d
+  useToken: useToken$f
 } = antd.theme;
 /**
  * RadialBarChart Component
@@ -48601,7 +48618,7 @@ function RadialBarChart(_ref) {
   const chartRef = React__default["default"].useRef(null);
   const {
     token
-  } = useToken$d();
+  } = useToken$f();
   const {
     legendEnabled,
     legendItems,
@@ -48714,7 +48731,7 @@ function RadialBarChart(_ref) {
 
 const _excluded$6 = ["data", "angleField", "colorField", "color", "height", "innerRadius", "radius", "legend", "label", "statistic", "tooltip", "renderTooltipContent", "tooltipConfig", "meta", "animation", "t", "isPdf", "legendConfig"];
 const {
-  useToken: useToken$c
+  useToken: useToken$e
 } = antd.theme;
 
 /**
@@ -48792,7 +48809,7 @@ function DonutPie(_ref) {
   const chartRef = React.useRef(null);
   const {
     token
-  } = useToken$c();
+  } = useToken$e();
   const {
     legendEnabled,
     legendItems,
@@ -49047,7 +49064,7 @@ styled__default["default"].div`
 `;
 
 const {
-  useToken: useToken$b
+  useToken: useToken$d
 } = antd.theme;
 /**
  * StackChart Component
@@ -49136,7 +49153,7 @@ function StackChart(_ref) {
   const ref = React__default["default"].useRef();
   const {
     token
-  } = useToken$b();
+  } = useToken$d();
   const isEmpty = !data.length;
   const [mouseY, setMouseY] = React__default["default"].useState(0);
   const [mouseX, setMouseX] = React__default["default"].useState(0);
@@ -49309,7 +49326,7 @@ function StackChart(_ref) {
 
 const _excluded$5 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "legendConfig", "width"];
 const {
-  useToken: useToken$a
+  useToken: useToken$c
 } = antd.theme;
 
 /**
@@ -49389,7 +49406,7 @@ const AreaChart = _ref => {
   const chartRef = React.useRef(null);
   const {
     token
-  } = useToken$a();
+  } = useToken$c();
   const {
     legendEnabled,
     legendItems,
@@ -49474,7 +49491,7 @@ const AreaChart = _ref => {
 
 const _excluded$4 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "score", "height", "isPdf", "legendConfig"];
 const {
-  useToken: useToken$9
+  useToken: useToken$b
 } = antd.theme;
 const RadarChart = _ref => {
   let {
@@ -49502,7 +49519,7 @@ const RadarChart = _ref => {
   const chartRef = React.useRef(null);
   const {
     token
-  } = useToken$9();
+  } = useToken$b();
   const {
     legendEnabled,
     legendItems,
@@ -49617,7 +49634,7 @@ const RadarChart = _ref => {
 };
 
 const {
-  useToken: useToken$8
+  useToken: useToken$a
 } = antd.theme;
 function DualAxesChart(_ref) {
   let {
@@ -49639,7 +49656,7 @@ function DualAxesChart(_ref) {
   const chartRef = React__default["default"].useRef(null);
   const {
     token
-  } = useToken$8();
+  } = useToken$a();
   const {
     legendEnabled,
     legendItems,
@@ -50102,14 +50119,14 @@ const Style$k = styled__default["default"].div`
 // components/Nodes/NameNode.jsx
 const NAME_CARD_WIDTH = 315;
 const {
-  useToken: useToken$7
+  useToken: useToken$9
 } = antd.theme;
 function NameNode({
   data
 }) {
   const {
     token
-  } = useToken$7();
+  } = useToken$9();
   const translateFN = typeof data?.t === "function" ? data.t : key => key;
   const isPdf = data?.isPdf;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -51979,33 +51996,27 @@ const BaseScreen = _ref => {
 
 function AppInvitation(_ref) {
   let {
-    // Redux State
     errors,
     user,
     invitationSuccess,
-    // Actions
     confirmInvitation,
     getUserFromInvitation,
-    // Configuration
+    theme,
     Layout,
     redirectPath = "/",
     loginPath = "/login",
     appRedirectPath = "/app",
-    params: propParams = {}
-  } = _ref;
-  const {
+    params: propParams = {},
+    goTo,
+    isMobile = false,
     t
-  } = useTranslation();
-  const routeParams = useParams();
+  } = _ref;
   const {
     app,
     companyCode,
     userCode
-  } = _objectSpread2(_objectSpread2({}, routeParams), propParams);
-  const [passwords] = antd.Form.useForm();
+  } = propParams;
   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) {
@@ -52026,32 +52037,114 @@ function AppInvitation(_ref) {
           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);
+        if (goTo && typeof goTo === 'function') {
+          goTo(redirectPath);
+        } else {
+          window.location.href = 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'
-    };
-  };
+  React.useEffect(() => {
+    const isInInvitationFlow = checking || invitationSuccess && user && user.inviteToken || invitationSuccess && user && !user.inviteToken;
+    if (!isInInvitationFlow) {
+      if (user) {
+        if (goTo && typeof goTo === 'function') {
+          goTo(appRedirectPath);
+        } else {
+          window.location.href = appRedirectPath;
+        }
+      } else {
+        if (goTo && typeof goTo === 'function') {
+          goTo(redirectPath);
+        } else {
+          window.location.href = redirectPath;
+        }
+      }
+    }
+  }, [user, goTo, appRedirectPath, redirectPath, checking, invitationSuccess]);
   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;
+  const fields = [{
+    name: 'email',
+    label: t("Email"),
+    type: 'input',
+    disabled: true
+  }, {
+    name: 'password',
+    label: t("Password"),
+    type: 'password',
+    required: true,
+    rules: [{
+      required: true,
+      message: t("errors::password should not be empty")
+    }],
+    placeholder: t("Password")
+  }, {
+    name: 'confirmPassword',
+    label: t("Confirm Password"),
+    type: 'password',
+    required: true,
+    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'));
+        }
+      };
+    }],
+    placeholder: t("Confirm Password")
+  }, {
+    name: 'mailUpdates',
+    type: 'custom',
+    valuePropName: 'checked',
+    component: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+      children: t("Sign up to receive updates")
+    })
+  }, {
+    name: 'agreeTerms',
+    type: 'custom',
+    valuePropName: 'checked',
+    rules: [{
+      validator: (_, value) => value ? Promise.resolve() : Promise.reject(new Error(t('You must agree to the terms and conditions')))
+    }],
+    component: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+      children: /*#__PURE__*/jsxRuntime.jsx("p", {
+        className: "mb-0",
+        children: t('Agree to the Terms of Use of this application and the Privacy Policy')
+      })
+    })
+  }];
+  const handleSubmit = values => {
+    const {
+      password,
+      mailUpdates
+    } = values;
+    confirmInvitation({
+      password,
+      mailUpdates
+    }, () => {}, {
+      companyCode,
+      userCode
+    });
+    setPasswordReseted(true);
+  };
   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) {
@@ -52060,106 +52153,29 @@ function AppInvitation(_ref) {
         children: isMobile ? null : /*#__PURE__*/jsxRuntime.jsx(DafButton, {
           type: "primary",
           className: "normal-br",
+          style: theme || window.theme ? {
+            backgroundColor: (theme || window.theme).colorPrimary,
+            borderColor: (theme || window.theme).colorPrimary
+          } : {},
           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")
-          })
-        })]
+      }) : /*#__PURE__*/jsxRuntime.jsx(AuthForm, {
+        fields: fields,
+        onSubmit: handleSubmit,
+        submitText: t("Confirm"),
+        initialValues: {
+          email: user === null || user === void 0 ? void 0 : user.email
+        },
+        errors: errors,
+        t: t,
+        executeRecaptcha: () => Promise.resolve(true),
+        theme: theme || window.theme
       })
     });
     if (Layout) {
-      // Assuming Layout accepts these props as per Nashiriki AuthLayout
       return /*#__PURE__*/jsxRuntime.jsx(Layout, {
         app: app,
         step: 1,
@@ -52181,11 +52197,7 @@ function AppInvitation(_ref) {
       }), Content]
     });
   }
-  return user ? /*#__PURE__*/jsxRuntime.jsx(Navigate, {
-    to: appRedirectPath
-  }) : /*#__PURE__*/jsxRuntime.jsx(Navigate, {
-    to: redirectPath
-  });
+  return null;
 }
 
 /**
@@ -52498,7 +52510,7 @@ const getRangeOfTicks = max => {
 };
 
 const {
-  useToken: useToken$6
+  useToken: useToken$8
 } = antd.theme;
 function useUserGrowth({
   container,
@@ -52510,8 +52522,7 @@ function useUserGrowth({
   const [data, setData] = React.useState([]);
   const {
     token
-  } = useToken$6();
-  console.log("mainData", mainData);
+  } = useToken$8();
   const fetchData = () => {
     const {
       dates = []
@@ -52647,12 +52658,11 @@ function UserGrowth({
     t,
     translationKeys
   });
-  console.log("usergrowthhhhh", data);
   React.useEffect(() => {
     if (typeof fetchUserGrowth === "function") {
       fetchUserGrowth(selectValue);
     }
-  }, [selectValue]);
+  }, [selectValue, fetchUserGrowth]);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: t(`admin::user-growth`),
     loading: loading,
@@ -52686,7 +52696,7 @@ function UserGrowth({
 }
 
 const {
-  useToken: useToken$5
+  useToken: useToken$7
 } = antd.theme;
 function useTopContributors({
   container,
@@ -52696,7 +52706,7 @@ function useTopContributors({
   const [mainGraph, setMainGraph] = React.useState(null);
   const {
     token
-  } = useToken$5();
+  } = useToken$7();
   React.useEffect(() => {
     if (container.current) {
       if (mainGraph) {
@@ -52775,7 +52785,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",
@@ -52907,6 +52916,7 @@ function AdminTable({
   breadcrumbs,
   children
 }) {
+  console.log(tabs, "tabs");
   return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "semibold form-input-output daf-create-view",
@@ -52920,7 +52930,7 @@ function AdminTable({
           className: "mt-6 ml-6 mr-6",
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "flex flex-row",
-            children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+            children: [tabs && tabs.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "mr-2",
               children: /*#__PURE__*/jsxRuntime.jsx(Tabs, {
                 t: t,
@@ -53171,7 +53181,7 @@ const renderTypeTag = ({
   });
 };
 
-const getColumns$7 = ({
+const getColumns$9 = ({
   t,
   show = "show",
   selectOptions,
@@ -53445,11 +53455,11 @@ const getColumns$7 = ({
   }];
   return cols.filter(c => c[show]);
 };
-const checkboxConfig$b = {
+const checkboxConfig$d = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$b = {
+const selectFiltersConfig$d = {
   account: {
     type: "select",
     label: "Account",
@@ -53490,12 +53500,12 @@ const selectFiltersConfig$b = {
     getValue: option => option.value
   }
 };
-const filtersConfig$b = {
+const filtersConfig$d = {
   name: "",
   datastakeId: ""
 };
 const view$2 = "admin-users";
-const defaultUrlParams$4 = {
+const defaultUrlParams$5 = {
   activeTab: "active"
 };
 const defaultTableFilters$2 = {};
@@ -53542,6 +53552,7 @@ function useAdminTable({
     defaultPageSize: defaultPageSize || 20,
     getRedirectLink
   });
+  console.log(filter, "filter.activeFilters");
   const activeTab = React.useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
   const canClearSearch = React.useMemo(() => {
     return !!filter.activeFilters.search;
@@ -53573,6 +53584,7 @@ function useAdminTable({
       const params = filterParams({
         activeFilters: filter.activeFilters
       });
+      console.log(params, "params");
       const {
         data
       } = await getData({
@@ -53639,11 +53651,11 @@ function UserTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$b,
+    selectFiltersConfig: selectFiltersConfig$d,
     view: view$2,
-    defaultUrlParams: defaultUrlParams$4,
+    defaultUrlParams: defaultUrlParams$5,
     module,
-    filtersConfig: filtersConfig$b,
+    filtersConfig: filtersConfig$d,
     getRedirectLink,
     getData,
     defaultPageSize,
@@ -53656,7 +53668,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$9({
     t,
     show: activeTab,
     selectOptions,
@@ -53712,7 +53724,7 @@ function UserTable(_ref) {
       hasError: hasError,
       setHasError: setHasError,
       canClearSearch: canClearSearch,
-      checkboxConfig: checkboxConfig$b,
+      checkboxConfig: checkboxConfig$d,
       defaultTableFilters: defaultTableFilters$2,
       children: /*#__PURE__*/jsxRuntime.jsx(DAFTable, {
         columns: columns,
@@ -53721,7 +53733,7 @@ function UserTable(_ref) {
         pagination: filter.pagination,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$b,
+        filtersConfig: selectFiltersConfig$d,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -53752,7 +53764,7 @@ function UserTable(_ref) {
   });
 }
 
-const getColumns$6 = ({
+const getColumns$8 = ({
   t,
   goTo,
   show = "show",
@@ -54018,11 +54030,7 @@ const getColumns$6 = ({
           })
         });
       }
-      const moreMenuItems = !val.emailVerified ? [{
-        label: t("admin::cancel-invitation"),
-        value: "cancel",
-        onClick: () => onCanelVerification(val)
-      }] : [{
+      const moreMenuItems = [{
         label: t("Edit"),
         value: "edit",
         onClick: () => setAddAccountVisible(val)
@@ -54049,11 +54057,11 @@ const getColumns$6 = ({
   }];
   return cols.filter(c => c[show]);
 };
-const checkboxConfig$a = {
+const checkboxConfig$c = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$a = {
+const selectFiltersConfig$c = {
   type: {
     type: "select",
     label: "Type",
@@ -54081,12 +54089,12 @@ const selectFiltersConfig$a = {
     getValue: option => option.value
   }
 };
-const filtersConfig$a = {
+const filtersConfig$c = {
   name: "",
   datastakeId: ""
 };
 const view$1 = "accounts";
-const defaultUrlParams$3 = {
+const defaultUrlParams$4 = {
   activeTab: "active"
 };
 const defaultTableFilters$1 = {};
@@ -54105,7 +54113,7 @@ const getTabs$2 = ({
   label: t("Suspended")
 }];
 
-const getColumns$5 = ({
+const getColumns$7 = ({
   t,
   selectOptions,
   module
@@ -54212,7 +54220,7 @@ const Container = styled__default["default"].div`
 `;
 
 const {
-  useToken: useToken$4
+  useToken: useToken$6
 } = antd.theme;
 function CombineAccountModal({
   isOpen,
@@ -54225,10 +54233,10 @@ function CombineAccountModal({
 }) {
   const {
     token
-  } = useToken$4();
+  } = useToken$6();
   const [MainForm] = antd.Form.useForm();
   const columns = React.useMemo(() => {
-    return getColumns$5({
+    return getColumns$7({
       t,
       selectOptions,
       module
@@ -54363,37 +54371,60 @@ function NewAccount({
   t,
   isOpen,
   onClose,
-  accountTypes = [],
+  accountTypes,
   fetchData,
-  inviteAccount
+  updateAccount,
+  inviteAccount,
+  isPending = false,
+  accountToEdit
 }) {
   const [MainForm] = antd.Form.useForm();
   const [loading, setLoading] = React.useState(false);
   const [accountUsed, setAccountUsed] = React.useState(false);
-  const isEdit = React.useMemo(() => isOpen && typeof isOpen === "object", [isOpen]);
+  console.log("typesssssssss", accountToEdit);
+  const isEdit = React.useMemo(() => accountToEdit && typeof accountToEdit === "object", [accountToEdit]);
   React.useEffect(() => {
-    if (isOpen && typeof isOpen === "object") {
+    if (accountToEdit && typeof accountToEdit === "object") {
       MainForm.setFieldsValue({
-        name: isOpen.name,
-        email: isOpen?.admin?.email
+        name: accountToEdit.name,
+        email: accountToEdit.email,
+        type: accountToEdit?.otherData?.interface
       });
     } else {
       MainForm.resetFields();
     }
-  }, [isOpen, MainForm]);
-  const onSubmit = () => {
-    MainForm.validateFields().then(async val => {
-      try {
-        setLoading(true);
+  }, [accountToEdit, MainForm]);
+  const onSubmit = async () => {
+    try {
+      const val = await MainForm.validateFields();
+      console.log(val, "val");
+      setLoading(true);
+      if (isEdit && accountToEdit?.id) {
+        // Update existing account
+        await updateAccount({
+          id: accountToEdit.id,
+          data: val,
+          isPending: accountToEdit.status === 'pending' || isPending
+        });
+      } else {
+        // Create new account
+        if (!inviteAccount) {
+          throw new Error("inviteAccount function is required for creating new accounts");
+        }
         await inviteAccount(val);
-        setLoading(false);
-        fetchData();
-        onClose();
-      } catch (err) {
-        console.log(err);
-        setLoading(false);
       }
-    }).catch(() => {});
+      setLoading(false);
+      fetchData();
+      onClose();
+      MainForm.resetFields();
+    } catch (err) {
+      console.log(err);
+      setLoading(false);
+      if (err.errorFields) {
+        // Validation errors, don't show error message
+        return;
+      }
+    }
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     t: t,
@@ -54415,16 +54446,6 @@ function NewAccount({
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: t("Type")
         })
-      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        name: "type",
-        label: t("Type"),
-        rules: [{
-          required: true
-        }],
-        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-          placeholder: t("Select"),
-          options: accountTypes
-        })
       }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "email",
         label: t("Email"),
@@ -54433,12 +54454,17 @@ function NewAccount({
           type: "email"
         }],
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
-          placeholder: t("Type"),
-          onChange: () => {
-            if (accountUsed) {
-              setAccountUsed(false);
-            }
-          }
+          placeholder: t("Type")
+        })
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        name: "type",
+        label: t("Type"),
+        rules: [{
+          required: true
+        }],
+        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+          placeholder: t("Select"),
+          options: accountTypes || []
         })
       }), accountUsed && /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
         message: t("FB00001"),
@@ -54467,6 +54493,7 @@ function AccountTable(_ref) {
     actionButton,
     inviteAccount
   } = _ref;
+  const accountTypes = config === null || config === void 0 ? void 0 : config.accountTypes;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
   const [selectedAccounts, setSelectedAccounts] = React.useState([]);
@@ -54484,12 +54511,12 @@ function AccountTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$a,
+    selectFiltersConfig: selectFiltersConfig$c,
     view: view$1,
-    defaultUrlParams: defaultUrlParams$3,
+    defaultUrlParams: defaultUrlParams$4,
     module,
     defaultPageSize,
-    filtersConfig: filtersConfig$a,
+    filtersConfig: filtersConfig$c,
     getRedirectLink,
     getData,
     fetchPendingOnMount: true
@@ -54498,9 +54525,9 @@ function AccountTable(_ref) {
     var _config$options;
     return {
       country: (_config$options = config.options) === null || _config$options === void 0 ? void 0 : _config$options.countries,
-      type: config.accountTypes
+      type: accountTypes
     };
-  }, [config.options, config.accountTypes]);
+  }, [config.options, accountTypes]);
   React.useEffect(() => {
     if (initFetchDone) {
       filter.setActiveFilters(_objectSpread2(_objectSpread2({}, filter.activeFilters), {}, {
@@ -54532,7 +54559,16 @@ function AccountTable(_ref) {
       onCancel: () => {}
     });
   }, [t, fetchData, fetchPendingAccounts]);
-  const columns = React.useMemo(() => getColumns$6({
+  const onResendInvitation = React.useCallback(async user => {
+    try {
+      await config.onTableClick.onResendInvitation(user);
+      antd.message.success(t("Email successfully sent"));
+    } catch (error) {
+      console.error("Failed to resend invitation:", error);
+      antd.message.error(t("Failed to resend invitation"));
+    }
+  }, [t, config.onTableClick]);
+  const columns = React.useMemo(() => getColumns$8({
     t,
     show: activeTab,
     selectOptions,
@@ -54541,7 +54577,7 @@ function AccountTable(_ref) {
     getRedirectLink,
     onCanelVerification: onCanelVerification,
     onCopyInvitation: config.onTableClick.onCopyInvitation,
-    onResendInvitation: config.onTableClick.onResendInvitation,
+    onResendInvitation: onResendInvitation,
     setAddAccountVisible: config.onTableClick.setAddAccountVisible,
     setSelectedAccounts: setSelectedAccounts,
     selectedAccounts: selectedAccounts
@@ -54551,13 +54587,15 @@ function AccountTable(_ref) {
       filters: filter,
       t: t,
       headerTitle: headerTitle,
-      actionButton: [...actionButton, {
-        icon: "Merge",
-        // type: "primary",
-        onClick: () => setCombineAccountVisible(true),
-        tooltip: "Combine",
-        disabled: selectedAccounts.length < 2
-      }],
+      actionButton: [...actionButton
+      // {
+      // 	icon: "Merge",
+      // 	// type: "primary",
+      // 	onClick: () => setCombineAccountVisible(true),
+      // 	tooltip: "Combine",
+      // 	disabled: selectedAccounts.length < 2,
+      // },
+      ],
       tabs: getTabs$2({
         totalPending: totalPending,
         t
@@ -54570,7 +54608,7 @@ function AccountTable(_ref) {
       setHasError: setHasError,
       canClearSearch: canClearSearch,
       selectOptions: selectOptions,
-      checkboxConfig: checkboxConfig$a,
+      checkboxConfig: checkboxConfig$c,
       defaultTableFilters: defaultTableFilters$1,
       children: [selectedAccounts.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-row  ml-6 mt-5",
@@ -54601,7 +54639,7 @@ function AccountTable(_ref) {
         doEmptyRows: true,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$a,
+        filtersConfig: selectFiltersConfig$c,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -54617,7 +54655,7 @@ function AccountTable(_ref) {
         fetchData();
         fetchPendingAccounts();
       },
-      accountTypes: config.accountTypes,
+      accountTypes: accountTypes,
       inviteAccount: inviteAccount
     }), /*#__PURE__*/jsxRuntime.jsx(CombineAccountModal, {
       isOpen: combineAccountVisible,
@@ -54651,7 +54689,7 @@ const getTabs$1 = ({
     label: t("Suspended")
   }];
 };
-const selectFiltersConfig$9 = {
+const selectFiltersConfig$b = {
   category: {
     type: "select",
     label: "Category",
@@ -54692,14 +54730,14 @@ const selectFiltersConfig$9 = {
     getValue: option => option.value
   }
 };
-const filtersConfig$9 = {
+const filtersConfig$b = {
   name: "",
   datastakeId: ""
 };
-const defaultUrlParams$2 = {
+const defaultUrlParams$3 = {
   activeTab: "active"
 };
-const checkboxConfig$9 = {
+const checkboxConfig$b = {
   name: "Name",
   datastakeId: "ID"
 };
@@ -54709,7 +54747,7 @@ const getAdminLevelName = (data, level) => {
   return entry?.name || "-";
 };
 
-const getColumns$4 = ({
+const getColumns$6 = ({
   t,
   goTo = () => {},
   show = "show",
@@ -54932,7 +54970,7 @@ const getColumns$4 = ({
   return cols.filter(c => c[show]);
 };
 
-const getColumns$3 = ({
+const getColumns$5 = ({
   t,
   selectOptions,
   module,
@@ -55023,7 +55061,7 @@ const getColumns$3 = ({
 };
 
 const {
-  useToken: useToken$3
+  useToken: useToken$5
 } = antd.theme;
 function CombineLocationModal({
   isOpen,
@@ -55037,11 +55075,11 @@ function CombineLocationModal({
 }) {
   const {
     token
-  } = useToken$3();
+  } = useToken$5();
   const [MainForm] = antd.Form.useForm();
   const [isDisabled, setIsDisabled] = React.useState(true);
   const columns = React.useMemo(() => {
-    return getColumns$3({
+    return getColumns$5({
       t,
       selectOptions,
       module,
@@ -55194,7 +55232,7 @@ function CombineLocationModal({
 
 const _excluded$2 = ["pagination", "tab", "filters", "search", "sort"];
 const {
-  useToken: useToken$2
+  useToken: useToken$4
 } = antd.theme;
 function LocationTable(_ref) {
   let {
@@ -55220,7 +55258,7 @@ function LocationTable(_ref) {
   const [selectedLocations, setSelectedLocations] = React.useState([]);
   const {
     token
-  } = useToken$2();
+  } = useToken$4();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
   const getDataWithStringPagination = async _ref2 => {
     let {
@@ -55245,6 +55283,14 @@ function LocationTable(_ref) {
         console.error('Failed to parse pagination', e);
       }
     }
+    const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
+    let pageNumber = 1;
+    if (paginationObj.page || paginationObj.current) {
+      pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
+    } else if (typeof paginationObj.skip === 'number') {
+      pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
+    }
+    pageNumber = pageNumber || 1;
     let activeTab = tab || "active";
     if (!tab && filters) {
       try {
@@ -55256,8 +55302,8 @@ function LocationTable(_ref) {
     }
     const transformedParams = {
       pagination: {
-        skip: String(paginationObj.page || 1),
-        take: String(paginationObj.pageSize || 20)
+        skip: pageNumber,
+        take: pageSize
       },
       tab: activeTab
     };
@@ -55279,12 +55325,12 @@ function LocationTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$9,
+    selectFiltersConfig: selectFiltersConfig$b,
     view,
-    defaultUrlParams: defaultUrlParams$2,
+    defaultUrlParams: defaultUrlParams$3,
     module,
     defaultPageSize,
-    filtersConfig: filtersConfig$9,
+    filtersConfig: filtersConfig$b,
     getRedirectLink,
     getData: getDataWithStringPagination,
     refetchTrigger
@@ -55298,7 +55344,7 @@ function LocationTable(_ref) {
     };
   }, [config.options]);
   const columns = React.useMemo(() => {
-    return getColumns$4({
+    return getColumns$6({
       t,
       goTo,
       token,
@@ -55334,7 +55380,7 @@ function LocationTable(_ref) {
       setHasError: setHasError,
       canClearSearch: canClearSearch,
       selectOptions: selectOptions,
-      checkboxConfig: checkboxConfig$9,
+      checkboxConfig: checkboxConfig$b,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
       children: [selectedLocations.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -55366,7 +55412,7 @@ function LocationTable(_ref) {
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$9,
+        filtersConfig: selectFiltersConfig$b,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -55410,7 +55456,7 @@ const getTabs = ({
     label: t("Suspended")
   }];
 };
-const selectFiltersConfig$8 = {
+const selectFiltersConfig$a = {
   category: {
     type: "select",
     label: "Category",
@@ -55451,19 +55497,19 @@ const selectFiltersConfig$8 = {
     getValue: option => option.value
   }
 };
-const filtersConfig$8 = {
+const filtersConfig$a = {
   name: "",
   datastakeId: ""
 };
-const defaultUrlParams$1 = {
+const defaultUrlParams$2 = {
   activeTab: "active"
 };
-const checkboxConfig$8 = {
+const checkboxConfig$a = {
   name: "Name",
   datastakeId: "ID"
 };
 
-const getColumns$2 = ({
+const getColumns$4 = ({
   t,
   goTo = () => {},
   show = "show",
@@ -55704,7 +55750,7 @@ const mapToSelectOptions = (items, valueKey, selectOptions, optionKey, customMap
   }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value));
 };
 
-const getColumns$1 = ({
+const getColumns$3 = ({
   t,
   selectOptions,
   module,
@@ -55795,7 +55841,7 @@ const getColumns$1 = ({
 };
 
 const {
-  useToken: useToken$1
+  useToken: useToken$3
 } = antd.theme;
 function CombineSubjectsModal({
   isOpen,
@@ -55809,11 +55855,11 @@ function CombineSubjectsModal({
 }) {
   const {
     token
-  } = useToken$1();
+  } = useToken$3();
   const [MainForm] = antd.Form.useForm();
   const [isDisabled, setIsDisabled] = React.useState(true);
   const columns = React.useMemo(() => {
-    return getColumns$1({
+    return getColumns$3({
       t,
       selectOptions,
       module,
@@ -55824,6 +55870,8 @@ function CombineSubjectsModal({
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
       const ids = selectedSubjects.map(subject => subject.id);
+      console.log(ids, "ids");
+      console.log(data, "data");
       onSuccess({
         ids,
         data
@@ -55886,7 +55934,10 @@ function CombineSubjectsModal({
           className: "flex-1",
           name: "id",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: mapToSelectOptions(selectedSubjects, "datastakeId", selectOptions, null),
+            options: selectedSubjects.map(s => ({
+              label: s?.datastakeId || "-",
+              value: s?.id || "-"
+            })),
             placeholder: t("ID")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
@@ -55949,7 +56000,7 @@ function CombineSubjectsModal({
 
 const _excluded$1 = ["pagination", "tab", "filters", "search", "sort"];
 const {
-  useToken
+  useToken: useToken$2
 } = antd.theme;
 function SubjectsTable(_ref) {
   let {
@@ -55975,7 +56026,7 @@ function SubjectsTable(_ref) {
   const [selectedSubjects, setSelectedSubjects] = React.useState([]);
   const {
     token
-  } = useToken();
+  } = useToken$2();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
   const getDataWithStringPagination = async _ref2 => {
     let {
@@ -56000,6 +56051,14 @@ function SubjectsTable(_ref) {
         console.error('Failed to parse pagination', e);
       }
     }
+    const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
+    let pageNumber = 1;
+    if (paginationObj.page || paginationObj.current) {
+      pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
+    } else if (typeof paginationObj.skip === 'number') {
+      pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
+    }
+    pageNumber = pageNumber || 1;
     let activeTab = tab || "active";
     if (!tab && filters) {
       try {
@@ -56011,8 +56070,8 @@ function SubjectsTable(_ref) {
     }
     const transformedParams = {
       pagination: {
-        skip: String(paginationObj.page || 1),
-        take: String(paginationObj.pageSize || 20)
+        skip: pageNumber,
+        take: pageSize
       },
       tab: activeTab
     };
@@ -56034,12 +56093,12 @@ function SubjectsTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$8,
+    selectFiltersConfig: selectFiltersConfig$a,
     view,
-    defaultUrlParams: defaultUrlParams$1,
+    defaultUrlParams: defaultUrlParams$2,
     module,
     defaultPageSize,
-    filtersConfig: filtersConfig$8,
+    filtersConfig: filtersConfig$a,
     getRedirectLink,
     getData: getDataWithStringPagination,
     refetchTrigger
@@ -56053,7 +56112,7 @@ function SubjectsTable(_ref) {
     };
   }, [config.options]);
   const columns = React.useMemo(() => {
-    return getColumns$2({
+    return getColumns$4({
       t,
       goTo,
       token,
@@ -56074,7 +56133,7 @@ function SubjectsTable(_ref) {
       actionButton: [{
         icon: "Merge",
         onClick: () => setIsModalOpen(true),
-        tooltip: t("admin::merge-subjects"),
+        tooltip: t("merge-subjects"),
         disabled: selectedSubjects.length < 2
       }],
       tabs: getTabs({
@@ -56088,7 +56147,7 @@ function SubjectsTable(_ref) {
       setHasError: setHasError,
       canClearSearch: canClearSearch,
       selectOptions: selectOptions,
-      checkboxConfig: checkboxConfig$8,
+      checkboxConfig: checkboxConfig$a,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
       children: [selectedSubjects.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -56120,7 +56179,7 @@ function SubjectsTable(_ref) {
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$8,
+        filtersConfig: selectFiltersConfig$a,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -56133,11 +56192,13 @@ function SubjectsTable(_ref) {
       onSuccess: data => {
         setIsModalOpen(false);
         setLoading(true);
-        antd.message.success(t("Subjects successfully merged."));
         if (typeof mergeSubjectsFunction === 'function') {
-          mergeSubjectsFunction(data).finally(() => {
+          mergeSubjectsFunction(data).then(() => {
+            setTimeout(() => {
+              fetchData();
+            }, 500);
+          }).finally(() => {
             setSelectedSubjects([]);
-            fetchData();
           });
         }
       },
@@ -56254,7 +56315,7 @@ function TransferRights({
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     t: t,
-    title: t("admin::transfer-admin-rights"),
+    title: t("admin::transfer-account-admin-rights"),
     open: isOpen,
     onClose: onClose,
     loading: loading,
@@ -56304,11 +56365,16 @@ function NewUser({
   module = "straatos",
   inviteCompanyAccount = () => {},
   companyId,
-  handleError = () => {}
+  handleError = () => {},
+  existingEmails = []
 }) {
   const [MainForm] = antd.Form.useForm();
   const [accountUsed, setAccountUsed] = React.useState(false);
   const [loading, setLoading] = React.useState(false);
+  const checkEmailExists = email => {
+    if (!email) return false;
+    return existingEmails.includes(email.toLowerCase());
+  };
   React.useEffect(() => {
     if (defaultData) {
       MainForm.setFieldsValue({
@@ -56320,6 +56386,10 @@ function NewUser({
   const onSubmit = async () => {
     try {
       const val = await MainForm.validateFields();
+      if (checkEmailExists(val.email)) {
+        setAccountUsed(true);
+        return;
+      }
       setLoading(true);
       const apiPayload = {
         firstName: val.firstName,
@@ -56336,7 +56406,8 @@ function NewUser({
       });
       const localUserData = {
         ...apiPayload,
-        status: 'pending'
+        status: 'pending',
+        id: apiPayload.email // Add a unique ID for the table key
         // apps: {
         // 	[module]: {
         // 		role: val.role,
@@ -56394,12 +56465,22 @@ function NewUser({
         }],
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: t("Type"),
-          onChange: () => {
-            if (accountUsed) {
-              setAccountUsed(false);
-            }
+          onChange: e => {
+            const emailExists = checkEmailExists(e.target.value);
+            setAccountUsed(emailExists);
+          },
+          onBlur: e => {
+            const emailExists = checkEmailExists(e.target.value);
+            setAccountUsed(emailExists);
           }
         })
+      }), accountUsed && /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
+        message: t("This email corresponds to another account."),
+        type: "error",
+        className: "mb-2",
+        showIcon: true,
+        closable: true,
+        onClose: () => setAccountUsed(false)
       }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "role",
         label: t("Role"),
@@ -56419,34 +56500,31 @@ const renderStatus = ({
   val,
   t = s => s
 }) => {
-  // switch (val) {
-  // 	case "active":
-  // 		return <Tag color="green">{t("Active")}</Tag>;
-  // 	case "unsaved":
-  // 		return <Tag color="red">{t("Unsaved")}</Tag>;
-  // 	case "inactive":
-  // 	case "suspended":
-  // 		return <Tag color="red">{t("Suspended")}</Tag>;
-  // 	case "pending":
-  // 		return <Tag color="orange">{t("Pending")}</Tag>;
-  // 	default:
-  // 		return <Tag color="default">{t("Unknown")}</Tag>;
-  // }
-
-  if (val) {
+  if (val === 'pending') {
     return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
-      color: "green",
-      children: t("Active")
+      color: "orange",
+      children: t("Pending")
     });
-  } else {
+  }
+  if (val === 'unsaved') {
     return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
       color: "red",
-      children: t("Suspended")
+      children: t("Unsaved")
+    });
+  }
+  if (val === 'active' || val === true) {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+      color: "green",
+      children: t("Active")
     });
   }
+  return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+    color: "red",
+    children: t("Suspended")
+  });
 };
 
-const getColumns = ({
+const getColumns$2 = ({
   t,
   isView,
   selectOptions = {},
@@ -56618,8 +56696,8 @@ const getColumns = ({
   }];
   return cols.filter(v => v.show);
 };
-const checkboxConfig$7 = {};
-const selectFiltersConfig$7 = {
+const checkboxConfig$9 = {};
+const selectFiltersConfig$9 = {
   userRole: {
     type: "select",
     label: "Role",
@@ -56647,10 +56725,10 @@ const selectFiltersConfig$7 = {
     getValue: option => option.value
   }
 };
-const filtersConfig$7 = {
+const filtersConfig$9 = {
   search: ""
 };
-const defaultUrlParams = {
+const defaultUrlParams$1 = {
   search: "",
   userRole: null,
   status: null
@@ -56695,10 +56773,10 @@ function Users({
   } = useFilters({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$7,
-    defaultUrlParams,
+    selectFiltersConfig: selectFiltersConfig$9,
+    defaultUrlParams: defaultUrlParams$1,
     module,
-    filtersConfig: filtersConfig$7,
+    filtersConfig: filtersConfig$9,
     getRedirectLink
   });
   const selectOptions = React.useMemo(() => {
@@ -56712,9 +56790,14 @@ function Users({
   }, [activeFilters]);
   const onDeleteUserClick = React.useCallback(id => {
     antd.Modal.confirm({
-      title: t("sbg-admin::remove-user-title"),
+      title: t("Are-you-sure-you-want-to-remove-the-user-from-this-account?"),
       icon: /*#__PURE__*/jsxRuntime.jsx(Icons.ExclamationCircleOutlined, {}),
-      content: t("sbg-admin::remove-user-body"),
+      content: /*#__PURE__*/jsxRuntime.jsx("span", {
+        style: {
+          color: "#888"
+        },
+        children: t("The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")
+      }),
       okText: t("Yes"),
       cancelText: t("No"),
       onOk: () => {
@@ -56725,9 +56808,14 @@ function Users({
   }, [deleteUser]);
   const data = React.useMemo(() => {
     const {
-      users = []
+      users = [],
+      pendingUsers = []
     } = accountData;
-    let filtered = [...users];
+    let filtered = [...users, ...pendingUsers.map(u => ({
+      ...u,
+      status: 'pending',
+      id: u.invitationToken || u.email // ensure pending users have an ID
+    }))];
     if (!isEmptyOrSpaces(activeFilters.search)) {
       const search = activeFilters.search.toLowerCase();
       filtered = filtered.filter(u => `${u.firstName} ${u.lastName}`.toLowerCase().indexOf(search) !== -1 || u.email.toLowerCase().indexOf(search) !== -1);
@@ -56743,7 +56831,7 @@ function Users({
       isAdmin: accountData?.admin?.id === user?.id
     }));
   }, [accountData, activeFilters]);
-  const columns = React.useMemo(() => getColumns({
+  const columns = React.useMemo(() => getColumns$2({
     t,
     isView,
     selectOptions,
@@ -56763,7 +56851,7 @@ function Users({
       hasError: hasError,
       setHasError: setHasError,
       filtersConfig: newFiltersConfig,
-      checkboxConfig: checkboxConfig$7,
+      checkboxConfig: checkboxConfig$9,
       onSearch: onSearch,
       activeFilters: activeFilters,
       canClear: canClearSearch,
@@ -56783,7 +56871,7 @@ function Users({
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
         sourcesKey: "authorId",
-        filtersConfig: selectFiltersConfig$7,
+        filtersConfig: selectFiltersConfig$9,
         onFilterChange: onFiltersChange,
         showFilters: showFilters,
         defaultFilters: defaultFilters,
@@ -56805,7 +56893,8 @@ function Users({
       module: module,
       inviteCompanyAccount: inviteCompanyAccount,
       companyId: companyId,
-      handleError: handleError
+      handleError: handleError,
+      existingEmails: [...(accountData?.users || []).map(u => u.email?.toLowerCase()), ...(accountData?.pendingUsers || []).map(u => u.email?.toLowerCase())].filter(Boolean)
     })]
   });
 }
@@ -56833,6 +56922,20 @@ class AdminService extends BaseService {
       data
     });
   }
+  resendInvitation({
+    invitationToken
+  }) {
+    return this.apiPost({
+      url: `/accounts/resendInvitation/${invitationToken}`
+    });
+  }
+  copyInvitation({
+    invitationToken
+  }) {
+    return this.apiPost({
+      url: `/accounts/copyInvitation/${invitationToken}`
+    });
+  }
   inviteAccount(data) {
     return this.apiPost({
       url: `/accounts/inviteAccount`,
@@ -56849,8 +56952,15 @@ class AdminService extends BaseService {
   }
   updateAccount({
     data,
-    id
+    id,
+    isPending = false
   }) {
+    if (isPending) {
+      return this.apiPut({
+        data,
+        url: `/accounts/invitation/${id}`
+      });
+    }
     return this.apiPut({
       data,
       url: `/accounts/${id}`
@@ -56965,6 +57075,21 @@ class AdminService extends BaseService {
       url: `/management/subject/${subject}/${id}`
     });
   }
+  getItems({
+    item
+  }) {
+    return this.apiGet({
+      url: `/management/items/${item}`
+    });
+  }
+  getItemData({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
   viewLocation({
     id
   }) {
@@ -56987,7 +57112,7 @@ class AdminService extends BaseService {
     const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiPut({
       url: `/management/subject/${type}/${id}`,
-      data: filterCreateData(data)
+      data: data
     });
   }
   deleteSubject({
@@ -56999,14 +57124,25 @@ class AdminService extends BaseService {
       url: `/management/subject/${type}/${id}`
     });
   }
-  getUserGrowth(activeFilter) {
-    return this.apiGet({
+  async getUserGrowth(activeFilter) {
+    const {
+      data
+    } = await this.apiGet({
       url: `/accounts/dashboard/user-growth`,
       isUserManager: true,
       params: {
         activeFilter
       }
     });
+    return data;
+  }
+  removeUserFromAccount({
+    accountId,
+    userId
+  }) {
+    return this.apiPut({
+      url: `/companies/${accountId}/remove-user/${userId}`
+    });
   }
 }
 var AdminService$1 = createLazyService(AdminService);
@@ -57223,11 +57359,18 @@ function Edit({
       removeCheck();
     }
   }, [isChanged, addCheck, removeCheck]);
-  const deleteUser = React.useCallback(id => {
-    // TODO: add call 
-    console.log("DELETE", id);
-    fetchData();
-  }, [fetchData]);
+  const deleteUser = React.useCallback(async id => {
+    try {
+      await AdminService$1.removeUserFromAccount({
+        accountId: data.id,
+        userId: id
+      });
+      antd.message.success(t("User removed successfully"));
+      fetchData();
+    } catch (err) {
+      handleError(err);
+    }
+  }, [fetchData, data.id, t, handleError]);
   const updateUser = React.useCallback((id, val) => {
     setIsChanged(true);
     setData(prev => ({
@@ -57255,9 +57398,14 @@ function Edit({
   }, []);
   const onSuspend = () => {
     antd.Modal.confirm({
-      title: t("sbg-admin::suspend-title"),
+      title: t("Are-you-sure-you-want-to-suspend-this-account?"),
       icon: /*#__PURE__*/jsxRuntime.jsx(Icons.ExclamationCircleOutlined, {}),
-      content: t("sbg-admin::suspend-content"),
+      content: /*#__PURE__*/jsxRuntime.jsx("span", {
+        style: {
+          color: "#888"
+        },
+        children: t("Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")
+      }),
       okText: t("Yes"),
       cancelText: t("No"),
       onOk: async () => {
@@ -57573,13 +57721,15 @@ function AdminView(_ref) {
                     } = 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);
+                  // Use the standalone invite function, don't mix it with updateAccount
+                  // await inviteCompanyAccount({
+                  // 	companyId: editData.id,
+                  // 	data: {
+                  // 		...userDataToInvite,
+                  // 		pendingCompanyId,
+                  // 	},
+                  // });
+                  // console.log('Invitation sent successfully for:', user.email);
                 } catch (inviteError) {
                   console.error('Failed to invite user:', user.email, inviteError);
                   handleError(inviteError);
@@ -57688,8 +57838,7 @@ function AdminDashboardScreen({
   }), [data?.keyIndicators, data?.keyInformation, getRedirectLink, getKeyIndicatorsConfig]);
   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);
+  const safeUserGrowth = userGrowthData || data?.userGrowthData || [];
   return /*#__PURE__*/jsxRuntime.jsx(AdminDashboard, {
     t: t,
     goTo: goTo,
@@ -57698,6 +57847,7 @@ function AdminDashboardScreen({
     loadingUserGrowth: userGrowthDataLoading,
     fetchUserGrowth: fetchUserGrowth,
     adminTranslationIdentifier: appName,
+    userGrowthData: safeUserGrowth,
     data: {
       keyIndicatorsData: keyIndicatorsConfig,
       userActivityData: safeUserActivity,
@@ -57797,6 +57947,77 @@ function AdminUsersScreen({
   });
 }
 
+/**
+ * Copies text content from an element to the clipboard.
+ * 
+ * This function takes an element ID, selects the text content from that element,
+ * and copies it to the clipboard. It handles browser compatibility issues
+ * between IE and modern browsers.
+ * 
+ * @param {string} id - The ID of the HTML element containing text to copy
+ * @returns {boolean} - Returns true if copying succeeded, false otherwise
+ * 
+ * @example
+ * // HTML: <input id="myText" value="Text to copy" />
+ * copyToClipboard('myText'); // Copies "Text to copy" to clipboard
+ */
+
+/**
+ * Copies a string directly to the clipboard.
+ * 
+ * This function takes a string and copies it to the clipboard.
+ * It handles browser compatibility issues between IE and modern browsers.
+ * 
+ * @param {string} text - The string to copy to clipboard
+ * @returns {Promise<boolean>} - Returns true if copying succeeded, false otherwise
+ * 
+ * @example
+ * copyStringToClipboard('Text to copy'); // Copies "Text to copy" to clipboard
+ */
+const copyStringToClipboard = async text => {
+  if (!text) {
+    console.warn("No text provided to copy");
+    return false;
+  }
+
+  // Try modern Clipboard API first
+  if (navigator.clipboard && navigator.clipboard.writeText) {
+    try {
+      await navigator.clipboard.writeText(text);
+      return true;
+    } catch (ex) {
+      console.warn("Clipboard API failed, trying fallback:", ex);
+      // Fall through to fallback methods
+    }
+  }
+
+  // Fallback for older browsers or when Clipboard API fails
+  if (window.clipboardData && window.clipboardData.setData) {
+    // IE: prevent textarea being shown while dialog is visible
+    return window.clipboardData.setData("Text", text);
+  } else if (document.queryCommandSupported && document.queryCommandSupported("copy")) {
+    var textarea = document.createElement("textarea");
+    textarea.textContent = text;
+    // Prevent scrolling to bottom of page in MS Edge
+    textarea.style.position = "fixed";
+    textarea.style.opacity = "0";
+    textarea.style.left = "-9999px";
+    document.body.appendChild(textarea);
+    textarea.select();
+    try {
+      // Security exception may be thrown by some browsers
+      const success = document.execCommand("copy");
+      return success;
+    } catch (ex) {
+      console.warn("Copy to clipboard failed.", ex);
+      return false;
+    } finally {
+      document.body.removeChild(textarea);
+    }
+  }
+  return false;
+};
+
 function AdminAccountsScreen({
   config
 }) {
@@ -57812,31 +58033,50 @@ function AdminAccountsScreen({
     AdminService,
     options,
     useQuery,
-    NewAccountModal
+    NewAccountModal,
+    appUrl
   } = config;
+  console.log(accountTypes, "accountTypes");
+  // const userTypes = useMemo(() => accountTypes.map((c) => ({
+  // 	label: c.label,
+  // 	value: c.value,
+  // })), [accountTypes]);
+
   const AccountModal = NewAccountModal || NewAccount;
   const query = useQuery ? useQuery() : {
     get: () => null
   };
   const [addAccountVisible, setAddAccountVisible] = React.useState(!!query.get("create"));
-  const onResendInvitation = React.useCallback(() => {
-    antd.message.success(t("Invitation email resent"));
-  }, [t]);
-  const onCopyInvitation = React.useCallback(() => {
-    antd.message.success(t("Invitation link copied"));
-  }, [t]);
+  const [accountToEdit, setAccountToEdit] = React.useState(null);
   const actionButtons = React.useMemo(() => [{
     type: "primary",
     onClick: () => setAddAccountVisible(true),
     tooltip: t("Add"),
     icon: "Add"
   }], [t]);
+  function handleAccountModal(data) {
+    console.log(data, "data");
+    setAddAccountVisible(true);
+    setAccountToEdit(data);
+  }
   function handleGetData(params) {
     return AdminService.getAccounts(params);
   }
   function handleCancelVerification(token) {
     return AdminService.cancelInvitation(token);
   }
+  function handleResendInvitation(account) {
+    console.log("account", account);
+    const token = account.invitationToken || account.users?.[0]?.invitationToken || account.admin?.invitationToken;
+    return AdminService.resendInvitation({
+      invitationToken: token
+    });
+  }
+  function handleCopyInvitation(account) {
+    const link = `${appUrl}/register?code=${account.invitationToken}`;
+    copyStringToClipboard(link);
+    antd.message.success(t("Invitation link copied"));
+  }
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsx(AccountTable, {
       t: t,
@@ -57850,23 +58090,38 @@ function AdminAccountsScreen({
       getData: handleGetData,
       config: {
         accountTypes,
+        addAccountVisible,
         options: {
           countries: options?.countries
         },
         onTableClick: {
           onCanelVerification: handleCancelVerification,
-          onCopyInvitation,
-          onResendInvitation,
-          setAddAccountVisible
+          onCopyInvitation: handleCopyInvitation,
+          onResendInvitation: handleResendInvitation,
+          setAddAccountVisible: handleAccountModal
         }
       }
     }), /*#__PURE__*/jsxRuntime.jsx(AccountModal, {
       t: t,
       isOpen: addAccountVisible,
-      onClose: () => setAddAccountVisible(false),
+      onClose: () => {
+        setAddAccountVisible(false);
+        setAccountToEdit(null);
+      },
       accountTypes: accountTypes,
+      countriesOptions: options?.countries,
       fetchData: () => {},
-      inviteAccount: data => AdminService.inviteAccount(data)
+      inviteAccount: data => AdminService.inviteAccount(data),
+      updateAccount: ({
+        data,
+        id,
+        isPending
+      }) => AdminService.updateAccount({
+        data,
+        id,
+        isPending
+      }),
+      accountToEdit: accountToEdit
     })]
   });
 }
@@ -57990,7 +58245,7 @@ function AdminSubjectsScreen({
   });
 }
 
-function AdminLocationScreen({
+function AdminLocationScreen$1({
   config
 }) {
   const {
@@ -58062,6 +58317,855 @@ function AdminLocationScreen({
   });
 }
 
+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 checkboxConfig$8 = {
+  name: "Name",
+  datastakeId: "ID"
+};
+
+const getColumns$1 = ({
+  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("Title"),
+    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("Date"),
+    dataIndex: "date",
+    key: "date",
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: renderDateFormatted(value, "DD MMM YYYY", 'en'),
+        children: renderDateFormatted(value, "DD MMM YYYY", 'en')
+      });
+    }
+  }, {
+    title: t("Last Update"),
+    dataIndex: "updatedAt",
+    key: "updatedAt",
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: renderDateFormatted(value, "DD MMM YYYY", 'en'),
+        children: renderDateFormatted(value, "DD MMM YYYY", 'en')
+      });
+    }
+  }, {
+    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-document/${all.id}`));
+        },
+        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+          name: "Link",
+          width: 18,
+          height: 18
+        })
+      });
+    }
+  }];
+  return cols.filter(c => c[show]);
+};
+
+const {
+  useToken: useToken$1
+} = antd.theme;
+function DocumentsTable({
+  t = text => text,
+  isMobile,
+  goTo,
+  getRedirectLink,
+  location,
+  getData,
+  module,
+  config,
+  defaultPageSize = 20,
+  view,
+  headerTitle,
+  breadcrumbs,
+  refetchTrigger,
+  user,
+  options
+}) {
+  const [showFilters, setShowFilters] = React.useState(false);
+  const [hasError, setHasError] = React.useState(false);
+  const [selectedDocuments, setSelectedDocuments] = React.useState([]);
+  const {
+    token
+  } = useToken$1();
+  const getDataWithStringPagination = async ({
+    params
+  }) => {
+    const {
+      pagination,
+      tab,
+      filters,
+      search,
+      sort,
+      ...otherParams
+    } = params;
+    let paginationObj = {
+      page: 1,
+      pageSize: 20
+    };
+    if (pagination) {
+      try {
+        paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
+      } catch (e) {
+        console.error('Failed to parse pagination', e);
+      }
+    }
+    const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
+    let pageNumber = 1;
+    if (paginationObj.page || paginationObj.current) {
+      pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
+    } else if (typeof paginationObj.skip === 'number') {
+      pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
+    }
+    pageNumber = pageNumber || 1;
+    let activeTab = tab || "active";
+    if (!tab && filters) {
+      try {
+        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+        activeTab = parsedFilters.activeTab || "active";
+      } catch (e) {
+        activeTab = "active";
+      }
+    }
+    const transformedParams = {
+      pagination: {
+        skip: pageNumber,
+        take: pageSize
+      },
+      tab: activeTab
+    };
+    return getData({
+      params: transformedParams
+    });
+  };
+  const {
+    filter,
+    activeTab,
+    canClearSearch,
+    totalPending,
+    data,
+    loading,
+    initFetchDone,
+    fetchData,
+    fetchPendingAccounts,
+    setLoading
+  } = useAdminTable({
+    goTo,
+    location,
+    selectFiltersConfig: selectFiltersConfig$8,
+    view,
+    // defaultUrlParams,
+    module,
+    defaultPageSize,
+    filtersConfig: filtersConfig$8,
+    getRedirectLink,
+    getData: getDataWithStringPagination,
+    refetchTrigger
+  });
+  const selectOptions = React.useMemo(() => {
+    return {
+      category: config.options?.category,
+      country: config.options?.countries,
+      sources: []
+    };
+  }, [config.options]);
+  const columns = React.useMemo(() => {
+    return getColumns$1({
+      t,
+      goTo,
+      token,
+      module,
+      selectedDocuments,
+      setSelectedDocuments,
+      getRedirectLink,
+      selectOptions,
+      entity: headerTitle,
+      options
+    });
+  }, [t, goTo, module, token, selectedDocuments, getRedirectLink, selectOptions, headerTitle, options]);
+  console.log({
+    data
+  }, "data");
+  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: /*#__PURE__*/jsxRuntime.jsxs(AdminTable, {
+      filters: filter,
+      t: t,
+      headerTitle: headerTitle
+      // actionButton={[
+      // 	{
+      // 		icon: "Merge",
+      // 		onClick: () => setIsModalOpen(true),
+      // 		tooltip: t("merge-subjects"),
+      // 		disabled: selectedDocuments.length < 2,
+      // 	},
+      // ]}
+      // tabs={getTabs({ t })}
+      ,
+      isMobile: isMobile
+      // activeTab={activeTab}
+      ,
+      showFilters: showFilters,
+      setShowFilters: setShowFilters,
+      hasError: hasError,
+      setHasError: setHasError,
+      canClearSearch: canClearSearch,
+      selectOptions: selectOptions,
+      checkboxConfig: checkboxConfig$8,
+      defaultTableFilters: {},
+      breadcrumbs: breadcrumbs,
+      children: [selectedDocuments.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "flex flex-row  ml-6 mt-5",
+        style: {
+          flexWrap: "wrap",
+          gap: "8px"
+        },
+        children: selectedDocuments.map(document => /*#__PURE__*/jsxRuntime.jsxs(antd.Tag, {
+          className: "flex flex-row gap-2 items-center",
+          onClick: () => setSelectedDocuments(prev => prev.filter(a => a.id !== document.id)),
+          style: {
+            cursor: "pointer"
+          },
+          children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+            children: document.name
+          }), /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+            name: "Close",
+            size: 10
+          })]
+        }, document.id))
+      }), /*#__PURE__*/jsxRuntime.jsx(DAFTable, {
+        columns: columns,
+        data: data,
+        loading: loading,
+        hideOnLoading: false,
+        pagination: filter.pagination,
+        rowKey: "id",
+        selectOptions: selectOptions,
+        doEmptyRows: true,
+        setShowFilters: setShowFilters,
+        filtersConfig: selectFiltersConfig$8,
+        onFilterChange: filter.onFiltersChange,
+        showFilters: showFilters,
+        defaultFilters: filter.defaultFilters,
+        onChange: filter.onTableChange
+      })]
+    })
+  });
+}
+
+function AdminLocationScreen({
+  config
+}) {
+  const {
+    appName = "app",
+    module,
+    goTo,
+    t,
+    location,
+    isMobile,
+    getRedirectLink,
+    AdminService,
+    options,
+    handleError,
+    defaultPageSize = 20,
+    view,
+    headerTitle = "documents",
+    breadcrumbs,
+    refetchTrigger,
+    getData,
+    user
+  } = config;
+  const getSubjects = React.useCallback(params => {
+    if (getData) {
+      return getData(params);
+    }
+    return AdminService.getItems({
+      item: 'document',
+      params
+    });
+  }, [getData, AdminService]);
+  return /*#__PURE__*/jsxRuntime.jsx(DocumentsTable, {
+    t: t,
+    goTo: goTo,
+    getRedirectLink: getRedirectLink,
+    location: location,
+    module: module,
+    headerTitle: headerTitle,
+    getData: getSubjects,
+    isMobile: isMobile,
+    defaultPageSize: defaultPageSize,
+    view: view,
+    breadcrumbs: breadcrumbs,
+    refetchTrigger: refetchTrigger,
+    config: {
+      options: {
+        category: options?.category,
+        countries: options?.countries
+      }
+    },
+    user: user,
+    options: options
+  });
+}
+
+const selectFiltersConfig$7 = {
+  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$7 = {
+  name: "",
+  datastakeId: ""
+};
+const defaultUrlParams = {
+  activeTab: "active"
+};
+const checkboxConfig$7 = {
+  name: "Name",
+  datastakeId: "ID"
+};
+
+const getColumns = ({
+  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("Title"),
+    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("type"),
+    dataIndex: "typeOfEvent",
+    key: "typeOfEvent",
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "daf-default-cell"
+        });
+      }
+      (options?.eventCategoryOptions || options?.categoryOptions || [])?.map(item => ({
+        value: item.value,
+        label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
+      }));
+      const type = findOptions(value, options?.eventsType || []) || "-";
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+        title: type,
+        children: type
+      });
+    }
+  }, {
+    title: t("Date"),
+    dataIndex: "date",
+    key: "date",
+    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("Scope"),
+    dataIndex: "scope",
+    key: "scope",
+    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: "",
+    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-event/${all.id}`));
+        },
+        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+          name: "Link",
+          width: 18,
+          height: 18
+        })
+      });
+    }
+  }];
+  return cols.filter(c => c[show]);
+};
+
+const {
+  useToken
+} = antd.theme;
+function EventsTable({
+  t = text => text,
+  isMobile,
+  goTo,
+  getRedirectLink,
+  location,
+  getData,
+  module,
+  config,
+  defaultPageSize = 20,
+  view,
+  headerTitle,
+  breadcrumbs,
+  refetchTrigger,
+  user,
+  options
+}) {
+  const [showFilters, setShowFilters] = React.useState(false);
+  const [hasError, setHasError] = React.useState(false);
+  const [selectedEvents, setSelectedEvents] = React.useState([]);
+  const {
+    token
+  } = useToken();
+  const getDataWithStringPagination = async ({
+    params
+  }) => {
+    const {
+      pagination,
+      tab,
+      filters,
+      search,
+      sort,
+      ...otherParams
+    } = params;
+
+    // Don't send pagination to API - we'll fetch all data and slice on frontend
+    let activeTab = tab || "active";
+    if (!tab && filters) {
+      try {
+        const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+        activeTab = parsedFilters.activeTab || "active";
+      } catch (e) {
+        activeTab = "active";
+      }
+    }
+
+    // Fetch all data without pagination - we'll slice on frontend based on URL params
+    const transformedParams = {
+      tab: activeTab,
+      ...otherParams
+    };
+    return getData({
+      params: transformedParams
+    });
+  };
+  const {
+    filter,
+    // activeTab,
+    canClearSearch,
+    totalPending,
+    data,
+    loading,
+    initFetchDone,
+    fetchData,
+    fetchPendingAccounts,
+    setLoading
+  } = useAdminTable({
+    goTo,
+    location,
+    selectFiltersConfig: selectFiltersConfig$7,
+    view,
+    defaultUrlParams,
+    module,
+    defaultPageSize,
+    filtersConfig: filtersConfig$7,
+    getRedirectLink,
+    getData: getDataWithStringPagination,
+    refetchTrigger
+  });
+  const selectOptions = React.useMemo(() => {
+    return {
+      category: config.options?.category,
+      country: config.options?.countries,
+      sources: []
+    };
+  }, [config.options]);
+  const columns = React.useMemo(() => {
+    return getColumns({
+      t,
+      goTo,
+      token,
+      module,
+      selectedEvents,
+      setSelectedEvents,
+      getRedirectLink,
+      selectOptions,
+      entity: headerTitle,
+      options
+    });
+  }, [t, goTo, module, token, selectedEvents, getRedirectLink, selectOptions, headerTitle, options]);
+  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: /*#__PURE__*/jsxRuntime.jsxs(AdminTable, {
+      filters: filter,
+      t: t,
+      headerTitle: headerTitle
+      // actionButton={[
+      // 	{
+      // 		icon: "Merge",
+      // 		onClick: () => setIsModalOpen(true),
+      // 		tooltip: t("merge-subjects"),
+      // 		disabled: selectedEvents.length < 2,
+      // 	},
+      // ]}
+      // tabs={getTabs({ t })}
+      ,
+      isMobile: isMobile
+      // activeTab={activeTab}
+      ,
+      showFilters: showFilters,
+      setShowFilters: setShowFilters,
+      hasError: hasError,
+      setHasError: setHasError,
+      canClearSearch: canClearSearch,
+      selectOptions: selectOptions,
+      checkboxConfig: checkboxConfig$7,
+      defaultTableFilters: {},
+      breadcrumbs: breadcrumbs,
+      children: [selectedEvents.length > 0 && /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "flex flex-row  ml-6 mt-5",
+        style: {
+          flexWrap: "wrap",
+          gap: "8px"
+        },
+        children: selectedEvents.map(event => /*#__PURE__*/jsxRuntime.jsxs(antd.Tag, {
+          className: "flex flex-row gap-2 items-center",
+          onClick: () => setSelectedEvents(prev => prev.filter(a => a.id !== event.id)),
+          style: {
+            cursor: "pointer"
+          },
+          children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+            children: event.title
+          }), /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+            name: "Close",
+            size: 10
+          })]
+        }, event.id))
+      }), /*#__PURE__*/jsxRuntime.jsx(DAFTable, {
+        columns: columns,
+        data: data,
+        loading: loading,
+        hideOnLoading: false,
+        pagination: filter.pagination,
+        rowKey: "id",
+        selectOptions: selectOptions,
+        doEmptyRows: true,
+        setShowFilters: setShowFilters,
+        filtersConfig: selectFiltersConfig$7,
+        onFilterChange: filter.onFiltersChange,
+        showFilters: showFilters,
+        defaultFilters: filter.defaultFilters,
+        onChange: filter.onTableChange
+      })]
+    })
+  });
+}
+
+function AdminEventsScreen({
+  config
+}) {
+  const {
+    appName = "app",
+    module,
+    goTo,
+    t,
+    location,
+    isMobile,
+    getRedirectLink,
+    AdminService,
+    options,
+    handleError,
+    defaultPageSize = 20,
+    view,
+    headerTitle = "events",
+    breadcrumbs,
+    refetchTrigger,
+    getData,
+    user
+  } = config;
+  const getSubjects = React.useCallback(params => {
+    if (getData) {
+      return getData(params);
+    }
+    return AdminService.getItems({
+      item: 'event',
+      params
+    });
+  }, [getData, AdminService]);
+  return /*#__PURE__*/jsxRuntime.jsx(EventsTable, {
+    t: t,
+    goTo: goTo,
+    getRedirectLink: getRedirectLink,
+    location: location,
+    module: module,
+    headerTitle: headerTitle,
+    getData: getSubjects,
+    isMobile: isMobile,
+    defaultPageSize: defaultPageSize,
+    view: view,
+    breadcrumbs: breadcrumbs,
+    refetchTrigger: refetchTrigger,
+    config: {
+      options: options
+    },
+    user: user,
+    options: options
+  });
+}
+
 function getAdminRoutes(config) {
   const {
     appName,
@@ -58073,6 +59177,8 @@ function getAdminRoutes(config) {
     useAdminLocationConfig,
     useAdminSubjectsViewConfig,
     useAdminLocationViewConfig,
+    useAdminDocumentsConfig,
+    useAdminEventsConfig,
     userIsAdmin
   } = config;
   const APP_PREFIX = "APP_".concat(appName.toUpperCase());
@@ -58108,11 +59214,23 @@ function getAdminRoutes(config) {
   }
   function LocationWrapper() {
     const locationConfig = typeof useAdminLocationConfig === "function" ? useAdminLocationConfig() : undefined;
-    return /*#__PURE__*/jsxRuntime.jsx(AdminLocationScreen, {
+    return /*#__PURE__*/jsxRuntime.jsx(AdminLocationScreen$1, {
       config: locationConfig
     });
   }
-  const subjectsIndexComponent = typeof useAdminLocationConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(LocationWrapper, {}) : typeof useAdminSubjectsConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(SubjectsWrapper, {}) : /*#__PURE__*/jsxRuntime.jsx("div", {});
+  function DocumentsWrapper() {
+    const documentsConfig = typeof useAdminDocumentsConfig === "function" ? useAdminDocumentsConfig() : undefined;
+    return /*#__PURE__*/jsxRuntime.jsx(AdminLocationScreen, {
+      config: documentsConfig
+    });
+  }
+  function EventsWrapper() {
+    const eventsConfig = typeof useAdminEventsConfig === "function" ? useAdminEventsConfig() : undefined;
+    return /*#__PURE__*/jsxRuntime.jsx(AdminEventsScreen, {
+      config: eventsConfig
+    });
+  }
+  const subjectsIndexComponent = typeof useAdminLocationConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(LocationWrapper, {}) : typeof useAdminSubjectsConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(SubjectsWrapper, {}) : typeof useAdminDocumentsConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(DocumentsWrapper, {}) : typeof useAdminEventsConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(EventsWrapper, {}) : /*#__PURE__*/jsxRuntime.jsx("div", {});
   const routes = [{
     path: "",
     key: "".concat(APP_PREFIX, "_DASHBOARD"),
@@ -58155,6 +59273,18 @@ function getAdminRoutes(config) {
     exact: true,
     visible: user => userIsAdmin(user),
     component: /*#__PURE__*/jsxRuntime.jsx(SubjectsWrapper, {})
+  }] : []), ...(typeof useAdminDocumentsConfig === "function" ? [{
+    path: "management/subjects/document",
+    key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_DOCUMENTS"),
+    exact: true,
+    visible: user => userIsAdmin(user),
+    component: /*#__PURE__*/jsxRuntime.jsx(DocumentsWrapper, {})
+  }] : []), ...(typeof useAdminEventsConfig === "function" ? [{
+    path: "management/subjects/event",
+    key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_EVENTS"),
+    exact: true,
+    visible: user => userIsAdmin(user),
+    component: /*#__PURE__*/jsxRuntime.jsx(EventsWrapper, {})
   }] : [])];
   return routes;
 }
@@ -64413,7 +65543,7 @@ exports.AdminAccountsScreen = AdminAccountsScreen;
 exports.AdminAccountsViewScreen = AdminAccountsViewScreen;
 exports.AdminDashboard = AdminDashboard;
 exports.AdminDashboardScreen = AdminDashboardScreen;
-exports.AdminLocationScreen = AdminLocationScreen;
+exports.AdminLocationScreen = AdminLocationScreen$1;
 exports.AdminSubjectsScreen = AdminSubjectsScreen;
 exports.AdminUsersScreen = AdminUsersScreen;
 exports.AdminView = AdminView$1;