datastake-daf 0.6.819 → 0.6.821

package/dist/services/index.js

@@ -780,6 +780,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`,
@@ -796,8 +810,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}`
@@ -811,11 +832,11 @@ class AdminService extends BaseService {
     });
   }
   transferAdmin({
-    userId,
-    id
+    companyId,
+    userId
   }) {
     return this.apiPut({
-      url: `/accounts/transfer-rights/${id}`,
+      url: `/companies/${companyId}/transfer-rights`,
       data: {
         userId
       }
@@ -912,6 +933,58 @@ class AdminService extends BaseService {
       url: `/management/subject/${subject}/${id}`
     });
   }
+  getItems({
+    item
+  }) {
+    return this.apiGet({
+      url: `/management/items/${item}`
+    });
+  }
+  getItemForm({
+    item,
+    scope = "create"
+  }) {
+    return this.apiGet({
+      url: `/forms/${item}`,
+      params: {
+        scope
+      }
+    });
+  }
+  getItemData({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
+  deleteItem({
+    item,
+    id
+  }) {
+    return this.apiDelete({
+      url: `/management/item/${item}/${id}`
+    });
+  }
+  updateItem({
+    item,
+    id,
+    data
+  }) {
+    return this.apiPut({
+      url: `/management/item/${item}/${id}`,
+      data
+    });
+  }
+  viewItem({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
   viewLocation({
     id
   }) {
@@ -934,7 +1007,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({
@@ -946,14 +1019,33 @@ 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}`
+    });
+  }
+  getTopContributors({
+    params
+  }) {
+    return this.apiGet({
+      url: `/accounts/dashboard/top-contributors`,
+      params
+    });
   }
 }
 var AdminService$1 = createLazyService(AdminService);
@@ -1405,14 +1497,17 @@ class DashboardService extends BaseService {
       isApp: true
     });
   }
-  getUserGrowth(activeFilter) {
-    return this.apiGet({
+  async getUserGrowth(activeFilter) {
+    const {
+      data
+    } = await this.apiGet({
       url: `/accounts/dashboard/user-growth`,
       isUserManager: true,
       params: {
         activeFilter
       }
     });
+    return data;
   }
   getAdminDashboard() {
     return this.apiGet({

package/dist/utils/index.js

@@ -7592,14 +7592,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,
@@ -7608,10 +7609,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,
@@ -7624,6 +7624,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
@@ -7828,9 +7838,25 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "admin::events": "Events",
+  "admin::Deleted": "Deleted",
+  "admin::document": "Documents",
+  "events": "Events",
+  "merge-locations": "Merge Locations",
+  "edit-account": "Edit Account",
+  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Are you sure you want to remove the user from this account?",
+  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "The user will lose access to the application and to all data created for this account.",
+  "merge": "Merge",
+  "add-new": "Add new",
+  "sbg-admin::remove-user-body": "The user will lose access to the application and to all data created for this account.",
+  "Are-you-sure-you-want-to-suspend-this-account?": "Are you sure you want to suspend this account?",
+  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Associated users will lose access to the application and to all data created for this account.",
+  "current_subjects": "Current Subjects",
+  "merged_output": "Merged Output",
+  "merge-subjects": "Merge Subjects",
   "All Data": "All Data",
-  "sbg-admin::remove-user-title": "Remove User Title",
-  "sbg-admin::remove-user-body": "Remove User Body",
+  "sbg-admin::remove-user-title": "Are you sure you want to remove the user from this account?",
+  "sbg-admin::remove-user-body": "The user will lose access to the application and to all data created for this account.",
   "Administrative-level-1": "Administrative Level 1",
   "Administrative-level-2": "Administrative Level 2",
   "merge-output": "Merge Output",
@@ -9095,6 +9121,7 @@ const en = {
   FB00005: "Link copied to the clipboard",
   FB00006: "Account successfully activated",
   FB00007: "Make sure that this has been properly communicated, as the account admin holds critical user management privileges.",
+  MD0004: "Are you sure you want to remove this user from this account?",
   admin: {
     "merge-subjects": "Merge Subjects",
     "events": "Events",
@@ -9122,11 +9149,13 @@ const en = {
     "reactivate-title": "Are you sure you want to reactivate this account?",
     "reactivate-content": "All associated users will be able to access the application.",
     "transfer-admin-rights": "Transfer admin rights",
+    "transfer-account-admin-rights": "Transfer Account Admin Rights",
     "remove-user-from-acc": "Remove user from account",
     "remove-user-title": "Are you sure you want to remove the user from this account?",
-    "remove-user-body": "The user will lose access to the application and to all data created for this account.",
     "curr-admin": "Current Admin",
     "new-admin": "New Admin",
+    "role-after-transfer": "Your New Role",
+    "role-after-transfer-help": "After transferring admin rights, you will be assigned this role",
     "new-user": "New User",
     "add-user": "Add User",
     "edit-user": "Edit User",
@@ -9157,6 +9186,23 @@ const en = {
 };
 
 const fr = {
+  "admin::events": "Événements",
+  "admin::document": "Documents",
+  "events": "Événements",
+  "admin::Deleted": "Supprimé",
+  "stakeholders": "Parties prenantes",
+  "merge-locations": "Fusionner les lieux",
+  "edit-account": "Modifier le compte",
+  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Êtes-vous sûr de vouloir retirer l'utilisateur de ce compte ?",
+  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "L'utilisateur perdra l'accès à l'application et à toutes les données créées pour ce compte.",
+  "merge": "Fusionner",
+  "Are-you-sure-you-want-to-suspend-this-account?": "Êtes-vous sûr de vouloir suspendre ce compte ?",
+  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Les utilisateurs associés perdront l'accès à l'application et à toutes les données créées pour ce compte.",
+  "current_subjects": "Sujets actuels",
+  "merged_output": "Résultat fusionné",
+  "merge-subjects": "Fusionner les sujets",
+  "FB00007": "Assurez-vous que cela a été correctement communiqué, car l’administrateur du compte détient des privilèges critiques de gestion des utilisateurs.",
+  "add-new": "Ajouter un nouveau",
   "All Data": "Toutes les données",
   "Site": "Site",
   "Production Sites": "Sites de production",
@@ -11113,6 +11159,24 @@ const fr = {
 };
 
 const sp = {
+  "admin::events": "Eventos",
+  "admin::document": "Documentos",
+  "events": "Eventos",
+  "admin::Deleted": "Eliminado",
+  "stakeholders": "Partes interesadas",
+  "merge-locations": "Fusionar ubicaciones",
+  "edit-account": "Editar cuenta",
+  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "¿Está seguro de que desea eliminar al usuario de esta cuenta?",
+  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "El usuario perderá el acceso a la aplicación y a todos los datos creados para esta cuenta.",
+  "merge": "Fusionar",
+  "FB00007": "Asegúrese de que esto se haya comunicado correctamente, ya que el administrador de la cuenta tiene privilegios críticos de gestión de usuarios.",
+  "Custodian": "Custodio",
+  "add-new": "Añadir nuevo",
+  "Are-you-sure-you-want-to-suspend-this-account?": "¿Está seguro de que desea suspender esta cuenta?",
+  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Los usuarios asociados perderán el acceso a la aplicación y a todos los datos creados para esta cuenta.",
+  "current_subjects": "Sujetos actuales",
+  "merged_output": "Resultado fusionado",
+  "merge-subjects": "Fusionar sujetos",
   "All Data": "Todos los datos",
   "Site": "Sitio",
   "Production Sites": "Centros de producción",
@@ -13050,11 +13114,14 @@ const sp = {
     "reactivate-title": "¿Está seguro de que desea reactivar esta cuenta?",
     "reactivate-content": "Todos los usuarios asociados podrán acceder a la aplicación.",
     "transfer-admin-rights": "Transferir derechos de administrador",
+    "transfer-account-admin-rights": "Transferir Derechos de Administrador de Cuenta",
     "remove-user-from-acc": "Eliminar usuario de la cuenta",
     "remove-user-title": "¿Está seguro de que desea eliminar al usuario de esta cuenta?",
     "remove-user-body": "El usuario perderá el acceso a la aplicación y a todos los datos creados para esta cuenta.",
     "curr-admin": "Administrador Actual",
     "new-admin": "Nuevo Administrador",
+    "role-after-transfer": "Su Nuevo Rol",
+    "role-after-transfer-help": "Después de transferir los derechos de administrador, se le asignará este rol",
     "add-user": "Añadir Usuario",
     "edit-user": "Editar Usuario",
     "edit-account": "Editar Cuenta",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.819",
+	"version": "0.6.821",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/AuthForm/index.jsx

@@ -13,13 +13,20 @@ function AuthForm ({
   errors,
   t = (key) => key,
   executeRecaptcha = () => {},
-  getCurrentStep = () => {}
+  getCurrentStep = () => {},
+  theme,
 }){
   const [formInstance] = Form.useForm(form);
   const [currentStep, setCurrentStep] = useState(0);
   const [allFormValues, setAllFormValues] = useState(initialValues);
   const [formErrors, setFormErrors] = useState(null);
 
+  const buttonStyle = theme?.colorPrimary ? {
+    backgroundColor: theme.colorPrimary,
+    borderColor: theme.colorPrimary,
+  } : {};
+
+
   const isMultiStep = !!steps;
   const currentFields = isMultiStep ? steps?.[currentStep]?.fields : fields || [];
 
@@ -166,6 +173,7 @@ function AuthForm ({
       name: field.name,
       label: field.label,
       rules: field.rules,
+      dependencies: field.dependencies,
       style: { marginBottom: 0 }
     };
     if (field.valuePropName && field.type !== 'select') {
@@ -217,6 +225,7 @@ function AuthForm ({
                                 htmlType="submit"
                                 disabled={isLastStep && !allFieldsFilled}
                                 block className="normal-br"
+                                style={buttonStyle}
                             >
                                 {isLastStep ? submitText : t("Next")}
                             </BorderedButton>
@@ -225,14 +234,14 @@ function AuthForm ({
                 }}
                 </Form.Item>
                 <div className="buttons" style={{ marginTop: 0}}>
-                    <BorderedButton onClick={prev} block className="normal-br">
+                    <BorderedButton onClick={prev} block className="normal-br" style={buttonStyle}>
                         {t("Back")}
                     </BorderedButton>
                 </div>
             </div>
         ) : (
             <div className="buttons" style={{ marginTop: isMultiStep ? '16px' : 0}}>
-                <BorderedButton type="primary" htmlType="submit" block className="normal-br">
+                <BorderedButton type="primary" htmlType="submit" block className="normal-br" style={buttonStyle}>
                     {isMultiStep ? t("Next") : submitText}
                 </BorderedButton>
             </div>

package/src/@daf/core/components/DynamicForm/_index.scss

@@ -1,7 +1,5 @@
 .daf-dynamic-form {
-  .ant-upload-list {
-    width: var(--static-width, 196px) !important;
-  }
+
 
   .ant-select-selector {
     width: var(--static-width) !important;    

package/src/@daf/core/components/EditForm/_index.scss

@@ -1953,10 +1953,6 @@
     }
   }
 
-  .ant-upload-list {
-    width: var(--static-width, 614px) !important;
-  }
-
   // MIGHT BE PROBLEMATIC
   // .ant-select-selector {
   //   width: var(--static-width) !important;

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/TopContributors/hook.js

@@ -4,12 +4,36 @@ import { renderNumber } from "../../../../../../../../utils/numbers";
 import { getRangeOfTicks } from "../../../../../../../../../helpers/chart";
 import { Column } from "@antv/g2plot";
 import { theme } from "antd";
+import AdminService from "../../../../../../../../services/AdminService";
 
 const { useToken } = theme;
 
-export default function useTopContributors({ container, data = [], t }) {
+export default function useTopContributors({ container, params, t }) {
 	const [mainGraph, setMainGraph] = useState(null);
+	const [data, setData] = useState([]);
+	const [loading, setLoading] = useState(false);
 	const { token } = useToken();
+
+	useEffect(() => {
+		const fetchTopContributors = async () => {
+			try {
+				setLoading(true);
+				const response = await AdminService.getTopContributors({ params });
+				const transformedData = (response?.data || []).map(item => ({
+					label: item.name,
+					Score: item.value
+				}));
+				setData(transformedData);
+			} catch (error) {
+				console.error("Error fetching top contributors:", error);
+				setData([]);
+			} finally {
+				setLoading(false);
+			}
+		};
+
+		fetchTopContributors();
+	}, [params]);
 	useEffect(() => {
 		if (container.current) {
 			if (mainGraph) {
@@ -80,4 +104,6 @@ export default function useTopContributors({ container, data = [], t }) {
 			}
 		}
 	}, [container, data, t, token]);
+
+	return { loading };
 }

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/TopContributors/index.jsx

@@ -4,11 +4,10 @@ import useTopContributors from "./hook.js";
 
 import Style from "../style.js";
 
-export default function TopContributors({ data, loading, t }) {
+export default function TopContributors({ params, t }) {
 	const container = useRef(null);
 
-	useTopContributors({ container, data, t });
-console.log("topcontributorshhhh", data);
+	const { loading } = useTopContributors({ container, params, t });
 	return (
 		<Widget
 			title={t(`admin::top-contributors`)}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/hook.js

@@ -12,7 +12,6 @@ export default function useUserGrowth({ container, data: mainData = {}, t, trans
 	const [mainGraph, setMainGraph] = useState(null);
 	const [data, setData] = useState([]);
 	const { token } = useToken();
-console.log("mainData", mainData);
 	const fetchData = () => {
 		const { dates = [] } = mainData;
 		const _data = [];

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/index.jsx

@@ -9,13 +9,11 @@ export default function UserGrowth({ loading, data = [], t, translationKeys, fet
 	const [selectValue, setSelectValue] = useState(selectOptions[0]?.value);
 
 	useUserGrowth({ container, data, t, translationKeys });
-console.log("usergrowthhhhh", data);
-
 	useEffect(() => {
 		if (typeof fetchUserGrowth === "function") {
 			fetchUserGrowth(selectValue);
 		}
-	}, [selectValue]);
+	}, [selectValue, fetchUserGrowth]);
 
 	return (
 		<Widget

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/index.jsx

@@ -28,7 +28,7 @@ export default function UserStatistics({
         <UserActivity loading={loading} data={data.userActivityData || []} t={t} />
 
         <div className="flex flex-row flex-col-mobile gap-6">
-          <TopContributors data={data.topContributorsData || []} loading={loading} t={t} />
+          <TopContributors params={{}} t={t} />
           <UserGrowth
             t={t}
             loading={loadingUserGrowth}

package/src/@daf/core/components/Screens/Admin/AdminModals/AddAccount/index.jsx

@@ -1,14 +1,58 @@
 import Modal from "../../../../Modal/index.jsx";
-import { Form, Input, Select } from "antd";
-export default function AddAccountModal({ isOpen, t, onClose, userTypes = [] }) {
+import { Form, Input, Select, Alert } from "antd";
+import { useState } from "react";
+
+export default function AddAccountModal({ 
+	isOpen, 
+	t, 
+	onClose, 
+	userTypes = [], 
+	inviteAccount,
+	fetchData = () => {},
+}) {
 	const [MainForm] = Form.useForm();
+	const [loading, setLoading] = useState(false);
+	const [emailError, setEmailError] = useState(null);
+
+	const onSubmit = async () => {
+		try {
+			const data = await MainForm.validateFields();
+			setLoading(true);
+			setEmailError(null);
+
+			await inviteAccount({
+				name: data.name,
+				email: data.email,
+				type: data.type,
+			});
+
+			await fetchData();
+			onClose();
+			MainForm.resetFields();
+		} catch (err) {
+			if (err.errorFields) {
+				return;
+			}
+
+			if (err?.response?.data?.statusCode === 400 || err?.statusCode === 400) {
+				const errorMessage = err?.response?.data?.message || err?.message;
+				if (errorMessage && (
+					errorMessage.includes("email already exists") || 
+					errorMessage.includes("This email already exists")
+				)) {
+					setEmailError(errorMessage);
+				}
+			}
+			console.error(err);
+		} finally {
+			setLoading(false);
+		}
+	};
 
-	const onSubmit = () => {
-		MainForm.validateFields()
-			.then((data) => {
-				console.log(data);
-			})
-			.catch((err) => console.log(err));
+	const handleEmailChange = () => {
+		if (emailError) {
+			setEmailError(null);
+		}
 	};
 
 	return (
@@ -18,14 +62,42 @@ export default function AddAccountModal({ isOpen, t, onClose, userTypes = [] })
 			t={t}
 			onClose={onClose}
 			onSuccess={onSubmit}
+			loading={loading}
 		>
 			<Form form={MainForm} layout="vertical" className="main-form pb-2">
-				<Form.Item name="account" label={t("Account")} rules={[{ required: true }]}>
+				<Form.Item name="name" label={t("Name")} rules={[{ required: true }]}>
 					<Input placeholder={t("Type")} />
 				</Form.Item>
+
+				<Form.Item 
+					name="email" 
+					label={t("Email")} 
+					rules={[
+						{ required: true, message: t("Email is required") },
+						{ type: "email", message: t("Please enter a valid email") }
+					]}
+					validateStatus={emailError ? "error" : ""}
+				>
+					<Input 
+						placeholder={t("Type")} 
+						onChange={handleEmailChange}
+					/>
+				</Form.Item>
+
+				{emailError && (
+					<Alert
+						message={emailError}
+						type="error"
+						showIcon
+						className="mb-2"
+						closable
+						onClose={() => setEmailError(null)}
+					/>
+				)}
+
 				<Form.Item
 					name="type"
-					label={t("admin::account-type")}
+					label={t("Type")}
 					rules={[{ required: true }]}
 				>
 					<Select placeholder={t("Select")} options={userTypes} />