datastake-daf 0.6.847 → 0.6.848

package/dist/components/index.js

@@ -25847,7 +25847,7 @@ class SourceService extends BaseService {
       ...rest
     } = filters;
     const params = {
-      filters: rest,
+      ...rest,
       pagination: {
         skip: page,
         take: pageSize
@@ -54425,55 +54425,26 @@ const getColumns$8 = ({
   onCopyInvitation = () => {},
   onResendInvitation = () => {},
   onCanelVerification = () => {},
-  setAddAccountVisible = () => {},
-  setSelectedAccounts = () => {},
-  selectedAccounts = []
+  setAddAccountVisible = () => {}
 }) => {
   const cols = [{
-    title: "",
-    dataIndex: "select",
-    key: "select",
-    width: 50,
-    active: true,
-    pending: true,
-    suspended: true,
-    show: true,
-    render: (v, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
-        onChange: () => setSelectedAccounts(prev => {
-          const isSelected = prev.some(p => p.userId === all.userId);
-          if (isSelected) {
-            return prev.filter(p => p.userId !== all.userId);
-          }
-          return [...prev, all];
-        }),
-        checked: selectedAccounts.some(p => p.userId === all.userId),
-        disabled: selectedAccounts.length >= 3 && !selectedAccounts.some(p => p.userId === all.userId)
-      });
-    }
-  }, {
     title: t("ID"),
-    dataIndex: "userId",
     key: "userId",
+    ellipsis: true,
+    width: 160,
     active: true,
     pending: true,
     suspended: true,
-    ellipsis: true,
-    width: 160,
-    render: (v, all) => {
+    render: (_, all) => {
       if (all.empty) {
         return /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "daf-default-cell"
         });
       }
+      const id = all.status === "pending" ? all.users?.[0]?.userId ?? all.invitedUser?.userId ?? all.datastakeId ?? "--" : all.userId ?? "--";
       return /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "daf-default-cell",
-        children: v || "--"
+        children: id
       });
     }
   }, {
@@ -54489,19 +54460,18 @@ const getColumns$8 = ({
     pending: true,
     suspended: true
   }, {
-    title: t("type"),
-    dataIndex: "apps",
-    key: "apps",
-    render: (apps, all) => {
+    title: t("Type"),
+    key: "type",
+    render: (_, all) => {
       if (all.empty) {
         return /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "daf-default-cell"
         });
       }
-      const sbg = all?.interface ? all : (apps || []).find(a => a.app === module);
+      const typeValue = all.status === "pending" ? all.type ?? all.otherData?.interface : all.apps?.[0]?.interface;
       return renderTypeTag({
-        value: sbg?.interface,
-        label: findOptions(sbg?.interface, selectOptions.type)
+        value: typeValue,
+        label: findOptions(typeValue, selectOptions.type)
       });
     },
     active: true,
@@ -54576,7 +54546,8 @@ const getColumns$8 = ({
           className: "daf-default-cell"
         });
       }
-      return verified ? /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+      const isVerified = all.users?.[0]?.emailVerified ?? verified ?? all.emailVerfied;
+      return isVerified ? /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
         color: "green",
         children: t("Yes")
       }) : /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
@@ -56996,7 +56967,7 @@ function NewUser({
       const localUserData = {
         ...apiPayload,
         status: 'pending',
-        id: apiPayload.email // Add a unique ID for the table key
+        id: apiPayload.email
         // apps: {
         // 	[module]: {
         // 		role: val.role,
@@ -58062,14 +58033,6 @@ function AdminView(_ref) {
               id: editData.id,
               data: newData
             });
-            console.log({
-              data
-            });
-            console.log('Checking for pending users...', {
-              hasPendingUsers: pendingUsers.length > 0,
-              hasInviteFunction: !!inviteCompanyAccount,
-              pendingUsers: pendingUsers
-            });
             if (pendingUsers.length > 0 && inviteCompanyAccount) {
               console.log('Inviting pending users:', pendingUsers.length);
               for (const user of pendingUsers) {
@@ -58079,8 +58042,6 @@ function AdminView(_ref) {
                       status
                     } = 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: {
@@ -65382,7 +65343,7 @@ const Style$1 = styled__default["default"].div`
     margin-top: 28px;
   }
 `;
-function ResetPassword({
+function ResetPassword$1({
   config = {},
   onPasswordChange,
   t = key => key
@@ -65567,7 +65528,7 @@ function EditForm({
       if (input.disabled) {
         return null;
       }
-      return /*#__PURE__*/jsxRuntime.jsx(ResetPassword, {
+      return /*#__PURE__*/jsxRuntime.jsx(ResetPassword$1, {
         config: config,
         t: t
       }, input.key);
@@ -65901,6 +65862,178 @@ function Settings(_ref) {
   });
 }
 
+const step = 1;
+function ResetPassword(_ref) {
+  let {
+    resetRequestSuccedded,
+    resetRequestError,
+    submitting,
+    requestResetPassword,
+    resetPassword,
+    params: propParams = {},
+    Layout,
+    goTo,
+    t,
+    theme,
+    errors,
+    loginPath: loginPathProp
+  } = _ref;
+  const {
+    app,
+    confirmationToken
+  } = propParams;
+  const getLogInLink = () => {
+    if (loginPathProp) return loginPathProp;
+    if (app) return "/".concat(app, "/login");
+    return "/login";
+  };
+  const handleGoToLogin = () => {
+    const link = getLogInLink();
+    if (goTo && typeof goTo === "function") {
+      goTo(link);
+    } else {
+      window.location.href = link;
+    }
+  };
+  const title = !confirmationToken ? resetRequestSuccedded ? "Thank you" : "Reset Password" : resetRequestSuccedded ? "Password updated" : "Create Password";
+  const subTitle = !confirmationToken ? resetRequestSuccedded ? "A password reset link has been sent to your email address. If you can’t find the message in your inbox, please check your spam folder!" : "Please enter your email, to get a link and request a new password." : resetRequestSuccedded ? "Your password has been updated, click in the button below to log in." : "Please set up your new password.";
+  const requestResetFields = [{
+    name: "email",
+    label: t("Email"),
+    type: "input",
+    required: true,
+    rules: [{
+      required: true,
+      message: t("errors::email should not be empty")
+    }, {
+      pattern: /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
+      message: t("errors::email is not valid")
+    }],
+    placeholder: t("Email")
+  }];
+  const resetPasswordFields = [{
+    name: "password",
+    label: t("Enter password"),
+    type: "password",
+    required: true,
+    rules: [{
+      required: true,
+      message: t("errors::password should not be empty")
+    }],
+    placeholder: t("••••••••")
+  }, {
+    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("••••••••")
+  }];
+  const handleRequestResetSubmit = values => {
+    requestResetPassword(values);
+  };
+  const handleResetPasswordSubmit = values => {
+    resetPassword(_objectSpread2(_objectSpread2({}, values), {}, {
+      passConfirmationToken: confirmationToken
+    }));
+  };
+  const currentTheme = theme || window.theme;
+  const Content = /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [!resetRequestSuccedded && !confirmationToken && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/jsxRuntime.jsx(AuthForm, {
+        fields: requestResetFields,
+        onSubmit: handleRequestResetSubmit,
+        submitText: t("Get Link"),
+        errors: errors,
+        t: t,
+        executeRecaptcha: () => Promise.resolve(true),
+        theme: currentTheme,
+        submitButtonProps: {
+          loading: submitting
+        }
+      }), /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "mt-4",
+        children: /*#__PURE__*/jsxRuntime.jsx(DafButton, {
+          type: "default",
+          className: "normal-br",
+          style: currentTheme ? {
+            borderColor: currentTheme.colorPrimary,
+            color: currentTheme.colorPrimary
+          } : {},
+          onClick: handleGoToLogin,
+          children: t("Back")
+        })
+      }), resetRequestError ? /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "ant-form-item-explain errors-cont no-pt mt-3",
+        style: {
+          color: "#ff4d4f"
+        },
+        children: t(resetRequestError)
+      }) : null]
+    }), !resetRequestSuccedded && confirmationToken && /*#__PURE__*/jsxRuntime.jsx(AuthForm, {
+      fields: resetPasswordFields,
+      onSubmit: handleResetPasswordSubmit,
+      submitText: t("Reset Password"),
+      errors: errors,
+      t: t,
+      executeRecaptcha: () => Promise.resolve(true),
+      theme: currentTheme,
+      submitButtonProps: {
+        loading: submitting
+      }
+    }), resetRequestSuccedded && confirmationToken && /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "buttons",
+      children: /*#__PURE__*/jsxRuntime.jsx(DafButton, {
+        type: "primary",
+        className: "normal-br",
+        style: currentTheme ? {
+          backgroundColor: currentTheme.colorPrimary,
+          borderColor: currentTheme.colorPrimary
+        } : {},
+        onClick: handleGoToLogin,
+        children: t("Log In")
+      })
+    }), resetRequestSuccedded && !confirmationToken && null]
+  });
+  if (Layout) {
+    return /*#__PURE__*/jsxRuntime.jsx(Layout, {
+      app: app,
+      step: step,
+      title: title,
+      subTitle: subTitle,
+      children: Content
+    });
+  }
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    style: {
+      padding: 20,
+      maxWidth: 400,
+      margin: "0 auto"
+    },
+    children: [/*#__PURE__*/jsxRuntime.jsx("h2", {
+      children: title
+    }), /*#__PURE__*/jsxRuntime.jsx("p", {
+      children: subTitle
+    }), Content]
+  });
+}
+
 exports.ACTIVE_FORM_KEY = ACTIVE_FORM_KEY;
 exports.AccountTable = AccountTable;
 exports.ActionWidget = ActionWidget;
@@ -66008,6 +66141,7 @@ exports.ProjectWidget = ProjectWidget;
 exports.RadarChart = RadarChart;
 exports.RadialBarChart = RadialBarChart;
 exports.Records = Records;
+exports.ResetPassword = ResetPassword;
 exports.SDGIcons = SDGIcons;
 exports.SDGWidget = SDGWidget;
 exports.SearchFilters = SearchFilters;

package/dist/hooks/index.js

@@ -1699,7 +1699,7 @@ class SourceService extends BaseService {
       ...rest
     } = filters;
     const params = {
-      filters: rest,
+      ...rest,
       pagination: {
         skip: page,
         take: pageSize
@@ -1732,7 +1732,8 @@ function useSource({
   user = {},
   t = () => {},
   getData = () => {},
-  id
+  id,
+  stop
 }) {
   const [loading, setLoading] = React.useState(true);
   const [partners, setPartners] = React.useState([]);
@@ -1786,8 +1787,10 @@ function useSource({
         console.error("Error fetching partners:", error);
       }
     }
-    fetchPartners();
-  }, [user.language, id]);
+    if (!stop) {
+      fetchPartners();
+    }
+  }, [user.language, id, stop]);
   function handleSelectedPartnersChange(selected) {
     setSelectedPartners(prev => ({
       ...prev,
@@ -1813,9 +1816,6 @@ const useSources = ({
   stop
 }) => {
   function getData(params) {
-    if (stop) return Promise.resolve({
-      data: []
-    });
     if (id !== undefined && id !== null) {
       return SourceService$1.getSources({
         type,
@@ -1834,7 +1834,8 @@ const useSources = ({
     user,
     t,
     getData: getData,
-    id
+    id,
+    stop
   });
   const informationSources = partners?.length > 0 ? partners?.length - 1 : 0;
   return {