datastake-daf 0.6.809 → 0.6.810

package/dist/components/index.js

@@ -42089,10 +42089,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => ({
-        ...prevValues,
-        ...resolvedValues
-      }));
+      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);
@@ -42954,17 +42951,12 @@ function AuthForm(_ref) {
     errors,
     t = key => key,
     executeRecaptcha = () => {},
-    getCurrentStep = () => {},
-    theme
+    getCurrentStep = () => {}
   } = _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(() => {
@@ -43105,7 +43097,6 @@ function AuthForm(_ref) {
       name: field.name,
       label: field.label,
       rules: field.rules,
-      dependencies: field.dependencies,
       style: {
         marginBottom: 0
       }
@@ -43152,7 +43143,6 @@ function AuthForm(_ref) {
                 disabled: isLastStep && !allFieldsFilled,
                 block: true,
                 className: "normal-br",
-                style: buttonStyle,
                 children: isLastStep ? submitText : t("Next")
               })
             });
@@ -43166,7 +43156,6 @@ function AuthForm(_ref) {
             onClick: prev,
             block: true,
             className: "normal-br",
-            style: buttonStyle,
             children: t("Back")
           })
         })]
@@ -43180,7 +43169,6 @@ function AuthForm(_ref) {
           htmlType: "submit",
           block: true,
           className: "normal-br",
-          style: buttonStyle,
           children: isMultiStep ? t("Next") : submitText
         })
       })]
@@ -45572,15 +45560,14 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page,
-    pageSize,
+    page = 1,
+    pageSize = 20,
     sortDir,
     sortBy,
     search,
@@ -45589,9 +45576,10 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
+    page,
+    pageSize
   });
+  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -45604,16 +45592,6 @@ const filterParams = (value, module) => {
       by: sortBy
     });
   }
-  if (Object.keys(filters).length) {
-    if (value.sourceId && value.sourceId === "overview") {
-      params.filters = JSON.stringify(filters);
-    } else {
-      params.filters = JSON.stringify({
-        ...filters,
-        authorId: undefined
-      });
-    }
-  }
   return {
     ...rest,
     ...params
@@ -51971,27 +51949,33 @@ const BaseScreen = _ref => {
 
 function AppInvitation(_ref) {
   let {
+    // Redux State
     errors,
     user,
     invitationSuccess,
+    // Actions
     confirmInvitation,
     getUserFromInvitation,
-    theme,
+    // Configuration
     Layout,
     redirectPath = "/",
     loginPath = "/login",
     appRedirectPath = "/app",
-    params: propParams = {},
-    goTo,
-    isMobile = false,
-    t
+    params: propParams = {}
   } = _ref;
+  const {
+    t
+  } = useTranslation();
+  const routeParams = useParams();
   const {
     app,
     companyCode,
     userCode
-  } = propParams;
+  } = _objectSpread2(_objectSpread2({}, routeParams), propParams);
+  const [passwords] = antd.Form.useForm();
   const [checking, setChecking] = React.useState(true);
+  const goTo = useNavigate();
+  const [termsAgreed, setTermsAgreed] = React.useState(false);
   const [passwordReseted, setPasswordReseted] = React.useState(false);
   React.useEffect(() => {
     if (companyCode && userCode) {
@@ -52012,114 +51996,32 @@ function AppInvitation(_ref) {
           localStorage.setItem('token', data.token);
         }
         antd.message.success(t('Invitation accepted'));
-        if (goTo && typeof goTo === 'function') {
-          goTo(redirectPath);
-        } else {
-          window.location.href = redirectPath;
-        }
+        // Fix: ensure we don't rely on a variable from useParams that might not exist
+        // Just use the configured redirectPath
+        goTo(redirectPath);
       }, {
         companyCode,
         userCode
       });
     }
   }, [invitationSuccess, user, confirmInvitation, goTo, redirectPath, companyCode, userCode, t]);
-  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 displayError = name => {
+    return errors && errors[name] && errors[name].length > 0 && {
+      help: errors[name][0],
+      validateStatus: 'error'
+    };
+  };
   const subTitle = !passwordReseted ? 'Set up your password and agree with out terms and conditions.' : isMobile ? 'Your account has been successfully set up. To log in use a desktop device.' : 'Your account has been successfully set up. Please click the button below to log in.';
   const title = passwordReseted ? 'Thank You!' : undefined;
-  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) {
@@ -52128,29 +52030,106 @@ 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.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
+      }) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
+          name: "password",
+          layout: "vertical",
+          form: passwords,
+          children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
+            required: true,
+            name: "password"
+          }, displayError('password')), {}, {
+            label: t("Password"),
+            rules: [{
+              required: true,
+              message: t("errors::password should not be empty")
+            }],
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Input.Password, {
+              size: "large",
+              placeholder: t("Password")
+            })
+          })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
+            required: true,
+            name: "confirmPassword"
+          }, displayError('confirmPassword')), {}, {
+            label: t("Confirm Password"),
+            dependencies: ['password'],
+            rules: [{
+              required: true,
+              message: t("errors::password should not be empty")
+            }, _ref2 => {
+              let {
+                getFieldValue
+              } = _ref2;
+              return {
+                validator(rule, value) {
+                  if (!value || getFieldValue('password') === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(t('errors::passwordNotMatch'));
+                }
+              };
+            }],
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Input.Password, {
+              size: "large",
+              placeholder: t("Confirm Password")
+            })
+          })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+            name: "mailUpdates",
+            valuePropName: "checked",
+            noStyle: true,
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+              children: t("Sign up to receive updates")
+            })
+          }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+            name: "agreeTerms",
+            valuePropName: "checked",
+            noStyle: true,
+            children: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
+              checked: termsAgreed,
+              onChange: e => setTermsAgreed(e.target.checked),
+              children: /*#__PURE__*/jsxRuntime.jsx("p", {
+                className: "mb-0",
+                children: t('Agree to the Terms of Use of this application and the Privacy Policy')
+              })
+            })
+          })]
+        }), /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "buttons",
+          children: /*#__PURE__*/jsxRuntime.jsx(DafButton, {
+            className: "normal-br",
+            type: "primary",
+            block: true,
+            size: "large",
+            disabled: !termsAgreed,
+            onClick: () => {
+              passwords.validateFields().then(data => {
+                const {
+                  password,
+                  mailUpdates
+                } = data;
+                confirmInvitation({
+                  password,
+                  mailUpdates
+                }, () => {}, {
+                  companyCode,
+                  userCode
+                });
+                setPasswordReseted(true);
+              });
+            },
+            children: t("Confirm")
+          })
+        })]
       })
     });
     if (Layout) {
+      // Assuming Layout accepts these props as per Nashiriki AuthLayout
       return /*#__PURE__*/jsxRuntime.jsx(Layout, {
         app: app,
         step: 1,
@@ -52172,7 +52151,11 @@ function AppInvitation(_ref) {
       }), Content]
     });
   }
-  return null;
+  return user ? /*#__PURE__*/jsxRuntime.jsx(Navigate, {
+    to: appRedirectPath
+  }) : /*#__PURE__*/jsxRuntime.jsx(Navigate, {
+    to: redirectPath
+  });
 }
 
 /**
@@ -52498,6 +52481,7 @@ function useUserGrowth({
   const {
     token
   } = useToken$6();
+  console.log("mainData", mainData);
   const fetchData = () => {
     const {
       dates = []
@@ -52633,11 +52617,12 @@ function UserGrowth({
     t,
     translationKeys
   });
+  console.log("usergrowthhhhh", data);
   React.useEffect(() => {
     if (typeof fetchUserGrowth === "function") {
       fetchUserGrowth(selectValue);
     }
-  }, [selectValue, fetchUserGrowth]);
+  }, [selectValue]);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: t(`admin::user-growth`),
     loading: loading,
@@ -52760,6 +52745,7 @@ function TopContributors({
     data,
     t
   });
+  console.log("topcontributorshhhh", data);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: t(`admin::top-contributors`),
     className: "with-border-header overflow-hidden h-w-btn-header",
@@ -53526,7 +53512,6 @@ 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;
@@ -53558,7 +53543,6 @@ function useAdminTable({
       const params = filterParams({
         activeFilters: filter.activeFilters
       });
-      console.log(params, "params");
       const {
         data
       } = await getData({
@@ -54004,7 +53988,11 @@ const getColumns$6 = ({
           })
         });
       }
-      const moreMenuItems = [{
+      const moreMenuItems = !val.emailVerified ? [{
+        label: t("admin::cancel-invitation"),
+        value: "cancel",
+        onClick: () => onCanelVerification(val)
+      }] : [{
         label: t("Edit"),
         value: "edit",
         onClick: () => setAddAccountVisible(val)
@@ -54341,246 +54329,23 @@ function CombineAccountModal({
   });
 }
 
-class AuthenticationService extends BaseService {
-  register(form) {
-    return this.apiPost({
-      url: '/register',
-      data: form
-    });
-  }
-  login(username, password, firebaseToken, rest) {
-    const headers = {
-      CheckApplicationAccess: rest?.invited ? false : undefined
-    };
-    if (firebaseToken) {
-      headers.FbToken = firebaseToken;
-      headers.Platform = 'web';
-    }
-    return this.apiPost({
-      url: rest?.invited ? '/auth/app-invitation' : '/login',
-      data: rest?.invited ? {
-        email: username,
-        password,
-        ...rest,
-        invited: undefined
-      } : {
-        email: username,
-        password
-      },
-      headers
-    });
-  }
-  updateCompany(id, data) {
-    return this.apiPut({
-      url: `/companies/${id}`,
-      data,
-      isDaf: true
-    });
-  }
-  getApplications() {
-    return this.apiGet({
-      url: '/applications',
-      isDaf: true
-    });
-  }
-  getRegistrationData(code) {
-    return this.apiGet({
-      url: `requests/registration-data/${code}`,
-      isUserManager: true
-    });
-  }
-  getRegistrationOptions(data) {
-    return this.apiPost({
-      url: '/auth/registration-options',
-      isDaf: true,
-      data
-    });
-  }
-  verify(code) {
-    return this.apiGet({
-      url: '/register/confirm',
-      params: {
-        token: code
-      },
-      isDaf: true
-    });
-  }
-  exitImpersonation() {
-    return this.apiGet({
-      url: '/users/impersonate/exit'
-    });
-  }
-  resetPasswordRequest(payload) {
-    const lang = StorageManager.get('datastakeLng') || 'en';
-    const req = {
-      ...payload,
-      language: lang
-    };
-    return this.apiPut({
-      url: '/profile/reset-password',
-      data: req,
-      headers: {
-        Language: lang
-      }
-    });
-  }
-  changePassword(payload) {
-    return this.apiPut({
-      url: '/profile/change-password',
-      data: payload
-    });
-  }
-  resetPassword(payload) {
-    return this.apiPut({
-      url: '/forgot-password/reset',
-      data: payload
-    });
-  }
-  updateLanguage(language) {
-    return this.apiPut({
-      url: '/profile',
-      data: {
-        language
-      }
-    });
-  }
-  resendVerification() {
-    return this.apiGet({
-      url: '/auth/rverification'
-    });
-  }
-  getInvitedUsers(id) {
-    return this.apiGet({
-      url: `/companies/${id}`
-    });
-  }
-  inviteUser(payload, id) {
-    if (id) {
-      return this.apiPost({
-        url: `/companies/${id}/invite`,
-        data: payload
-      });
-    }
-    return this.apiPost({
-      url: '/companies/invite',
-      data: payload
-    });
-  }
-  confirmInvitation({
-    password,
-    mailUpdates
-  }, token, code = {}) {
-    return this.apiPost({
-      url: `/register/${code.companyCode}/sub-user/${code.userCode}`,
-      data: {
-        password: password || '',
-        mailUpdates
-      },
-      headers: token ? {
-        Authorization: `Bearer ${token}`
-      } : undefined
-    });
-  }
-  getUserFromInvitation(code = {}) {
-    return this.apiGet({
-      url: `/companies/${code.companyCode}/sub-user/${code.userCode}`
-    });
-  }
-  demoLogin(token) {
-    return this.apiGet({
-      url: `/demo/${token}`
-    });
-  }
-  demoSignup(payload) {
-    return this.apiPost({
-      url: '/demo-signup',
-      data: payload
-    });
-  }
-  resendEmail(email) {
-    return this.apiPost({
-      url: `/register/resendConfirmation`,
-      data: {
-        email
-      }
-    });
-  }
-  editUserSettings(data = {}) {
-    return this.apiPut({
-      url: `/profile`,
-      data
-    });
-  }
-  editSubUser(data = {}) {
-    return this.apiPut({
-      url: `/users/updateRole/${data.id}`,
-      data
-    });
-  }
-  removeSubUser(companyId, userId) {
-    return this.apiPut({
-      url: `/companies/${companyId}/remove-user/${userId}`
-    });
-  }
-  resendSubUserInvite(id) {
-    return this.apiPost({
-      url: `/companies/resendInvitation/${id}`
-    });
-  }
-  getFormOptions({
-    references = ['countries', 'categoriesOptions', 'subCategoriesOptions', 'locationCategoriesOptions', 'documentationTypesOptions'],
-    language,
-    ...params
-  }) {
-    return this.apiPost({
-      url: '/query/form-options',
-      isDaf: true,
-      data: {
-        references,
-        language
-      }
-    });
-  }
-}
-var AuthenticationService$1 = createLazyService(AuthenticationService);
-
 function NewAccount({
   t,
   isOpen,
   onClose,
   accountTypes = [],
   fetchData,
-  inviteAccount,
-  selectOptions
+  inviteAccount
 }) {
   const [MainForm] = antd.Form.useForm();
   const [loading, setLoading] = React.useState(false);
   const [accountUsed, setAccountUsed] = React.useState(false);
-  const [countries, setCountries] = React.useState([]);
-  React.useEffect(() => {
-    const getCountries = async () => {
-      try {
-        const language = StorageManager.get("datastakeLng") || "en";
-        const {
-          data
-        } = await AuthenticationService$1.getFormOptions({
-          references: ["countries"],
-          language
-        });
-        setCountries(data?.countries || []);
-      } catch (e) {
-        console.error(e);
-      }
-    };
-    getCountries();
-  }, []);
   const isEdit = React.useMemo(() => isOpen && typeof isOpen === "object", [isOpen]);
   React.useEffect(() => {
     if (isOpen && typeof isOpen === "object") {
       MainForm.setFieldsValue({
         name: isOpen.name,
-        country: isOpen?.country,
-        type: isOpen?.type
+        email: isOpen?.admin?.email
       });
     } else {
       MainForm.resetFields();
@@ -54620,21 +54385,17 @@ function NewAccount({
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: t("Type")
         })
-      }), isEdit ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        name: "country",
-        label: t("Country"),
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        name: "type",
+        label: t("Type"),
         rules: [{
-          required: true,
-          type: "country"
+          required: true
         }],
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
           placeholder: t("Select"),
-          options: (countries || []).map(c => ({
-            label: c?.label,
-            value: c?.value
-          }))
+          options: accountTypes
         })
-      }) : /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "email",
         label: t("Email"),
         rules: [{
@@ -54642,17 +54403,12 @@ function NewAccount({
           type: "email"
         }],
         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 || []
+          placeholder: t("Type"),
+          onChange: () => {
+            if (accountUsed) {
+              setAccountUsed(false);
+            }
+          }
         })
       }), accountUsed && /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
         message: t("FB00001"),
@@ -54681,7 +54437,6 @@ 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([]);
@@ -54713,9 +54468,9 @@ function AccountTable(_ref) {
     var _config$options;
     return {
       country: (_config$options = config.options) === null || _config$options === void 0 ? void 0 : _config$options.countries,
-      type: accountTypes
+      type: config.accountTypes
     };
-  }, [config.options, accountTypes]);
+  }, [config.options, config.accountTypes]);
   React.useEffect(() => {
     if (initFetchDone) {
       filter.setActiveFilters(_objectSpread2(_objectSpread2({}, filter.activeFilters), {}, {
@@ -54832,7 +54587,7 @@ function AccountTable(_ref) {
         fetchData();
         fetchPendingAccounts();
       },
-      accountTypes: accountTypes,
+      accountTypes: config.accountTypes,
       inviteAccount: inviteAccount
     }), /*#__PURE__*/jsxRuntime.jsx(CombineAccountModal, {
       isOpen: combineAccountVisible,
@@ -55469,13 +55224,10 @@ function LocationTable(_ref) {
         activeTab = "active";
       }
     }
-    const page = Number(paginationObj.page) || 1;
-    const pageSize = Number(paginationObj.pageSize) || 20;
-    const skip = (page - 1) * pageSize;
     const transformedParams = {
       pagination: {
-        skip,
-        take: pageSize
+        skip: String(paginationObj.page || 1),
+        take: String(paginationObj.pageSize || 20)
       },
       tab: activeTab
     };
@@ -56042,8 +55794,6 @@ 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
@@ -56106,10 +55856,7 @@ function CombineSubjectsModal({
           className: "flex-1",
           name: "id",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: selectedSubjects.map(s => ({
-              label: s?.datastakeId || "-",
-              value: s?.id || "-"
-            })),
+            options: mapToSelectOptions(selectedSubjects, "datastakeId", selectOptions, null),
             placeholder: t("ID")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
@@ -56232,13 +55979,10 @@ function SubjectsTable(_ref) {
         activeTab = "active";
       }
     }
-    const page = Number(paginationObj.page) || 1;
-    const pageSize = Number(paginationObj.pageSize) || 20;
-    const skip = (page - 1) * pageSize;
     const transformedParams = {
       pagination: {
-        skip,
-        take: pageSize
+        skip: String(paginationObj.page || 1),
+        take: String(paginationObj.pageSize || 20)
       },
       tab: activeTab
     };
@@ -56300,7 +56044,7 @@ function SubjectsTable(_ref) {
       actionButton: [{
         icon: "Merge",
         onClick: () => setIsModalOpen(true),
-        tooltip: t("merge-subjects"),
+        tooltip: t("admin::merge-subjects"),
         disabled: selectedSubjects.length < 2
       }],
       tabs: getTabs({
@@ -56359,13 +56103,11 @@ function SubjectsTable(_ref) {
       onSuccess: data => {
         setIsModalOpen(false);
         setLoading(true);
+        antd.message.success(t("Subjects successfully merged."));
         if (typeof mergeSubjectsFunction === 'function') {
-          mergeSubjectsFunction(data).then(() => {
-            setTimeout(() => {
-              fetchData();
-            }, 500);
-          }).finally(() => {
+          mergeSubjectsFunction(data).finally(() => {
             setSelectedSubjects([]);
+            fetchData();
           });
         }
       },
@@ -56482,7 +56224,7 @@ function TransferRights({
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     t: t,
-    title: t("admin::transfer-account-admin-rights"),
+    title: t("admin::transfer-admin-rights"),
     open: isOpen,
     onClose: onClose,
     loading: loading,
@@ -56532,16 +56274,11 @@ function NewUser({
   module = "straatos",
   inviteCompanyAccount = () => {},
   companyId,
-  handleError = () => {},
-  existingEmails = []
+  handleError = () => {}
 }) {
   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({
@@ -56553,10 +56290,6 @@ 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,
@@ -56573,8 +56306,7 @@ function NewUser({
       });
       const localUserData = {
         ...apiPayload,
-        status: 'pending',
-        id: apiPayload.email // Add a unique ID for the table key
+        status: 'pending'
         // apps: {
         // 	[module]: {
         // 		role: val.role,
@@ -56632,22 +56364,12 @@ function NewUser({
         }],
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: t("Type"),
-          onChange: e => {
-            const emailExists = checkEmailExists(e.target.value);
-            setAccountUsed(emailExists);
-          },
-          onBlur: e => {
-            const emailExists = checkEmailExists(e.target.value);
-            setAccountUsed(emailExists);
+          onChange: () => {
+            if (accountUsed) {
+              setAccountUsed(false);
+            }
           }
         })
-      }), 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"),
@@ -56667,28 +56389,31 @@ const renderStatus = ({
   val,
   t = s => s
 }) => {
-  if (val === 'pending') {
+  // 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) {
     return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
-      color: "orange",
-      children: t("Pending")
+      color: "green",
+      children: t("Active")
     });
-  }
-  if (val === 'unsaved') {
+  } else {
     return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
       color: "red",
-      children: t("Unsaved")
+      children: t("Suspended")
     });
   }
-  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 = ({
@@ -56957,14 +56682,9 @@ function Users({
   }, [activeFilters]);
   const onDeleteUserClick = React.useCallback(id => {
     antd.Modal.confirm({
-      title: t("Are-you-sure-you-want-to-remove-the-user-from-this-account?"),
+      title: t("sbg-admin::remove-user-title"),
       icon: /*#__PURE__*/jsxRuntime.jsx(Icons.ExclamationCircleOutlined, {}),
-      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.")
-      }),
+      content: t("sbg-admin::remove-user-body"),
       okText: t("Yes"),
       cancelText: t("No"),
       onOk: () => {
@@ -56975,14 +56695,9 @@ function Users({
   }, [deleteUser]);
   const data = React.useMemo(() => {
     const {
-      users = [],
-      pendingUsers = []
+      users = []
     } = accountData;
-    let filtered = [...users, ...pendingUsers.map(u => ({
-      ...u,
-      status: 'pending',
-      id: u.invitationToken || u.email // ensure pending users have an ID
-    }))];
+    let filtered = [...users];
     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);
@@ -57060,8 +56775,7 @@ function Users({
       module: module,
       inviteCompanyAccount: inviteCompanyAccount,
       companyId: companyId,
-      handleError: handleError,
-      existingEmails: [...(accountData?.users || []).map(u => u.email?.toLowerCase()), ...(accountData?.pendingUsers || []).map(u => u.email?.toLowerCase())].filter(Boolean)
+      handleError: handleError
     })]
   });
 }
@@ -57243,7 +56957,7 @@ class AdminService extends BaseService {
     const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiPut({
       url: `/management/subject/${type}/${id}`,
-      data: data
+      data: filterCreateData(data)
     });
   }
   deleteSubject({
@@ -57255,25 +56969,14 @@ class AdminService extends BaseService {
       url: `/management/subject/${type}/${id}`
     });
   }
-  async getUserGrowth(activeFilter) {
-    const {
-      data
-    } = await this.apiGet({
+  getUserGrowth(activeFilter) {
+    return this.apiGet({
       url: `/accounts/dashboard/user-growth`,
       isUserManager: true,
       params: {
         activeFilter
       }
     });
-    return data;
-  }
-  removeUserFromAccount({
-    accountId,
-    userId
-  }) {
-    return this.apiDelete({
-      url: `/accounts/${accountId}/users/${userId}`
-    });
   }
 }
 var AdminService$1 = createLazyService(AdminService);
@@ -57490,18 +57193,11 @@ function Edit({
       removeCheck();
     }
   }, [isChanged, addCheck, removeCheck]);
-  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 deleteUser = React.useCallback(id => {
+    // TODO: add call 
+    console.log("DELETE", id);
+    fetchData();
+  }, [fetchData]);
   const updateUser = React.useCallback((id, val) => {
     setIsChanged(true);
     setData(prev => ({
@@ -57529,14 +57225,9 @@ function Edit({
   }, []);
   const onSuspend = () => {
     antd.Modal.confirm({
-      title: t("Are-you-sure-you-want-to-suspend-this-account?"),
+      title: t("sbg-admin::suspend-title"),
       icon: /*#__PURE__*/jsxRuntime.jsx(Icons.ExclamationCircleOutlined, {}),
-      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.")
-      }),
+      content: t("sbg-admin::suspend-content"),
       okText: t("Yes"),
       cancelText: t("No"),
       onOk: async () => {
@@ -57852,15 +57543,13 @@ function AdminView(_ref) {
                     } = user,
                     userDataToInvite = _objectWithoutProperties(user, _excluded2);
                   console.log('Sending invitation for:', user.email, userDataToInvite);
-                  // 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);
+                  await inviteCompanyAccount({
+                    companyId: editData.id,
+                    data: _objectSpread2(_objectSpread2({}, userDataToInvite), {}, {
+                      pendingCompanyId
+                    })
+                  });
+                  console.log('Invitation sent successfully for:', user.email);
                 } catch (inviteError) {
                   console.error('Failed to invite user:', user.email, inviteError);
                   handleError(inviteError);
@@ -57969,7 +57658,8 @@ 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 = userGrowthData || data?.userGrowthData || [];
+  const safeUserGrowth = Array.isArray(data?.userGrowthData) ? data.userGrowthData : [];
+  console.log("safeUserGrowth", safeUserGrowth);
   return /*#__PURE__*/jsxRuntime.jsx(AdminDashboard, {
     t: t,
     goTo: goTo,
@@ -57978,7 +57668,6 @@ function AdminDashboardScreen({
     loadingUserGrowth: userGrowthDataLoading,
     fetchUserGrowth: fetchUserGrowth,
     adminTranslationIdentifier: appName,
-    userGrowthData: safeUserGrowth,
     data: {
       keyIndicatorsData: keyIndicatorsConfig,
       userActivityData: safeUserActivity,
@@ -58146,7 +57835,6 @@ function AdminAccountsScreen({
       isOpen: addAccountVisible,
       onClose: () => setAddAccountVisible(false),
       accountTypes: accountTypes,
-      countriesOptions: options?.countries,
       fetchData: () => {},
       inviteAccount: data => AdminService.inviteAccount(data)
     })]