datastake-daf 0.6.809 → 0.6.811

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/index.jsx

@@ -13,6 +13,7 @@ import {
 } from "./helper.js";
 import { getColumns } from "./columns.js";
 import CombineSubjectsModal from "../../AdminModals/CombineSubjects/index.jsx";
+
 const { useToken } = theme;
 
 export default function SubjectsTable({
@@ -39,7 +40,10 @@ export default function SubjectsTable({
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
-	const getDataWithStringPagination = async ({ params }) => {
+
+
+
+const getDataWithStringPagination = async ({ params }) => {
 		const { pagination, tab, filters, search, sort, ...otherParams } = params;
 		
 		let paginationObj = { page: 1, pageSize: 20 };
@@ -61,14 +65,10 @@ export default function SubjectsTable({
 			}
 		}
 		
-		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,
 		};
@@ -133,7 +133,7 @@ export default function SubjectsTable({
 					{
 						icon: "Merge",
 						onClick: () => setIsModalOpen(true),
-						tooltip: t("merge-subjects"),
+						tooltip: t("admin::merge-subjects"),
 						disabled: selectedSubjects.length < 2,
 					},
 				]}
@@ -192,13 +192,11 @@ export default function SubjectsTable({
 				onSuccess={(data) => {
 					setIsModalOpen(false);
 					setLoading(true);
+					message.success(t("Subjects successfully merged."))
 					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data).then(() => {
-							setTimeout(() => {
-								fetchData();
-							}, 500);
-						}).finally(() => {
+						mergeSubjectsFunction(data).finally(() => {
 							setSelectedSubjects([]);
+							fetchData();
 						});
 					}
 				}}
@@ -209,4 +207,4 @@ export default function SubjectsTable({
 			/>
 		</>
 	);
-}
+}

package/src/@daf/core/components/Screens/Admin/AdminTables/UserTable/index.jsx

@@ -56,6 +56,7 @@ export default function UserTable({
 		defaultPageSize,
 		fetchPendingOnMount: true, // Users table needs pending count
 	});
+
 	const selectOptions = useMemo(() => {
 		return {
 			account: accounts,

package/src/@daf/core/components/Screens/Admin/AdminTables/hook.js

@@ -32,7 +32,6 @@ export function useAdminTable({
 		defaultPageSize: defaultPageSize || 20,
 		getRedirectLink,
 	});
-	console.log(filter, "filter.activeFilters");
 
 	const activeTab = useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
 
@@ -60,14 +59,12 @@ export function useAdminTable({
 		fetchPendingAccounts();
 	}, []);
 
-	
 	const fetchData = useCallback(async () => {
 		try {
 			setLoading(true);
 			const params = filterParams({
 				activeFilters: filter.activeFilters,
 			});
-			console.log(params, "params");
 			const { data } = await getData({ params });
 			setData(data.data || data);
 			filter.setPagination((prev) => ({ ...prev, total: data?.meta?.total || data?.length || 0 }));

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Edit/index.jsx

@@ -3,7 +3,7 @@ import { ExclamationCircleOutlined } from "@ant-design/icons";
 import { useCallback, useEffect } from "react";
 import { useForms } from "../../../../../../context/Forms/index.js";
 import Users from "../Users/index.jsx";
-import AdminService from "../../../../../../../services/AdminService.js";
+
 export default function Edit({
 	t,
 	goTo,
@@ -37,17 +37,14 @@ export default function Edit({
 	}, [isChanged, addCheck, removeCheck]);
 
 	const deleteUser = useCallback(
-		async (id) => {
-			try {
-				await AdminService.removeUserFromAccount({ accountId: data.id, userId: id });
-				message.success(t("User removed successfully"));
-				fetchData();
-			} catch (err) {
-				handleError(err);
-			}
+		(id) => {
+			// TODO: add call 
+			console.log("DELETE", id);
+			fetchData();
 		},
-		[fetchData, data.id, t, handleError],
+		[fetchData],
 	);
+
 	const updateUser = useCallback((id, val) => {
 		setIsChanged(true);
 		setData((prev) => ({
@@ -74,9 +71,9 @@ export default function Edit({
 
 	const onSuspend = () => {
 		Modal.confirm({
-			title: t("Are-you-sure-you-want-to-suspend-this-account?"),
+			title: t("sbg-admin::suspend-title"),
 			icon: <ExclamationCircleOutlined />,
-			content: <span style={{ color: "#888" }}>{t("Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
+			content: t("sbg-admin::suspend-content"),
 			okText: t("Yes"),
 			cancelText: t("No"),
 			onOk: async () => {

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/index.jsx

@@ -34,7 +34,6 @@ export default function Users({
 	inviteCompanyAccount = () => {},
 	companyId,
 	handleError = () => {},
-
 }) {
 	const [hasError, setHasError] = useState(false);
 	const [showFilters, setShowFilters] = useState(false);
@@ -73,9 +72,9 @@ export default function Users({
 	const onDeleteUserClick = useCallback(
 		(id) => {
 			Modal.confirm({
-				title: t("Are-you-sure-you-want-to-remove-the-user-from-this-account?"),
+				title: t("sbg-admin::remove-user-title"),
 				icon: <ExclamationCircleOutlined />,
-				content: <span style={{ color: "#888" }}>{t("The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
+				content: t("sbg-admin::remove-user-body"),
 				okText: t("Yes"),
 				cancelText: t("No"),
 				onOk: () => {
@@ -88,15 +87,8 @@ export default function Users({
 	);
 
 	const data = useMemo(() => {
-		const { users = [], pendingUsers = [] } = accountData;
-		let filtered = [
-			...users,
-			...pendingUsers.map(u => ({ 
-				...u, 
-				status: 'pending',
-				id: u.invitationToken || u.email // ensure pending users have an ID
-			}))
-		];
+		const { users = [] } = accountData;
+		let filtered = [...users];
 
 		if (!isEmptyOrSpaces(activeFilters.search)) {
 			const search = activeFilters.search.toLowerCase();
@@ -194,10 +186,6 @@ export default function Users({
 			inviteCompanyAccount={inviteCompanyAccount}
 			companyId={companyId}
 			handleError={handleError}
-			existingEmails={[
-				...(accountData?.users || []).map(u => u.email?.toLowerCase()),
-				...(accountData?.pendingUsers || []).map(u => u.email?.toLowerCase()),
-			].filter(Boolean)}
 		/>
 		</div>
 	);

package/src/@daf/core/components/Screens/Admin/AdminViews/components/View/helpers.js

@@ -1,15 +1,23 @@
 import { Tag } from "antd";
 
 export const renderStatus = ({ val, t = (s) => s }) => {
-	if (val === 'pending') {
-		return <Tag color="orange">{t("Pending")}</Tag>;
-	}
-	if (val === 'unsaved') {
-		return <Tag color="red">{t("Unsaved")}</Tag>;
-	}
-	if (val === 'active' || val === true) {
+	// 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 <Tag color="green">{t("Active")}</Tag>;
+	} else {
+		return <Tag color="red">{t("Suspended")}</Tag>;
 	}
-	
-	return <Tag color="red">{t("Suspended")}</Tag>;
 };

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

@@ -172,15 +172,14 @@ function AdminView({
 									try {
 										const { pendingCompanyId, status, ...userDataToInvite } = user;
 										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: {
+												...userDataToInvite,
+												pendingCompanyId,
+											},
+										});
+										console.log('Invitation sent successfully for:', user.email);
 									} catch (inviteError) {
 										console.error('Failed to invite user:', user.email, inviteError);
 										handleError(inviteError);

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

@@ -1,30 +1,30 @@
 import React, { useState, useEffect } from "react";
-import { Checkbox, message } from 'antd';
+import { Checkbox, Form, Input, message } from 'antd';
 import DafButton from '../../../Button/index.jsx';
 import Loading from "../../../Loading/index.jsx";
-import AuthForm from "../../../AuthForm/index.jsx";
 
-
-
-const theme = window.theme;
 export default function AppInvitation({
+  // Redux State
   errors,
   user,
   invitationSuccess,
+  // Actions
   confirmInvitation,
   getUserFromInvitation,
-  theme,
+  // Configuration
   Layout,
   redirectPath = "/",
   loginPath = "/login",
   appRedirectPath = "/app",
   params: propParams = {},
-  goTo,
-  isMobile = false,
-  t,
 }) {
-  const { app, companyCode, userCode } = propParams;
+  const { t } = useTranslation();
+  const routeParams = useParams();
+  const { app, companyCode, userCode } = { ...routeParams, ...propParams };
+  const [passwords] = Form.useForm();
   const [checking, setChecking] = useState(true);
+  const goTo = useNavigate();
+  const [termsAgreed, setTermsAgreed] = useState(false);
   const [passwordReseted, setPasswordReseted] = useState(false);
 
   useEffect(() => {
@@ -46,125 +46,36 @@ export default function AppInvitation({
             localStorage.setItem('token', data.token);
           }
           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]);
 
-
-  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"),
-        },
-        ({ getFieldValue }) => ({
-          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: <Checkbox>{t("Sign up to receive updates")}</Checkbox>,
-    },
-    {
-      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: (
-        <Checkbox>
-          <p className="mb-0">
-            {t('Agree to the Terms of Use of this application and the Privacy Policy')}
-          </p>
-        </Checkbox>
-      ),
-    }
-  ];
-
-  const handleSubmit = (values) => {
-    const { password, mailUpdates } = values;
-    confirmInvitation(
-      { password, mailUpdates },
-      () => { },
-      { companyCode, userCode }
-    );
-    setPasswordReseted(true);
-  };
-
   if (checking && !invitationSuccess) {
     return <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 <Loading />;
   }
 
@@ -177,7 +88,6 @@ export default function AppInvitation({
               <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;
                 }}
@@ -187,21 +97,86 @@ export default function AppInvitation({
             )}
           </div>
         ) : (
-          <AuthForm
-            fields={fields}
-            onSubmit={handleSubmit}
-            submitText={t("Confirm")}
-            initialValues={{ email: user?.email }}
-            errors={errors}
-            t={t}
-            executeRecaptcha={() => Promise.resolve(true)}
-            theme={theme || window.theme}
-          />
+          <>
+            <Form name="password" layout="vertical" form={passwords} >
+              <Form.Item
+                required
+                name="password"
+                {...displayError('password')}
+                label={t("Password")}
+                rules={[{
+                  required: true,
+                  message: t("errors::password should not be empty")
+                }]}>
+                <Input.Password size="large" placeholder={t("Password")} />
+              </Form.Item>
+              <Form.Item
+                required
+                name="confirmPassword"
+                {...displayError('confirmPassword')}
+                label={t("Confirm Password")}
+                dependencies={['password']}
+                rules={[
+                  {
+                    required: true,
+                    message: t("errors::password should not be empty"),
+                  },
+                  ({ getFieldValue }) => ({
+                    validator(rule, value) {
+                      if (!value || getFieldValue('password') === value) {
+                        return Promise.resolve();
+                      }
+                      return Promise.reject(t('errors::passwordNotMatch'));
+                    },
+                  }),
+                ]}>
+                <Input.Password size="large" placeholder={t("Confirm Password")} />
+              </Form.Item>
+              <Form.Item
+                name="mailUpdates" valuePropName="checked" noStyle>
+                <Checkbox>{t("Sign up to receive updates")}</Checkbox>
+              </Form.Item>
+              <Form.Item
+                name="agreeTerms" valuePropName="checked" noStyle>
+                <Checkbox
+                  checked={termsAgreed}
+                  onChange={(e) => setTermsAgreed(e.target.checked)}
+                >
+                  <p className="mb-0">
+                    {t('Agree to the Terms of Use of this application and the Privacy Policy')}
+                  </p>
+                </Checkbox>
+              </Form.Item>
+            </Form>
+            <div className="buttons">
+              <DafButton
+                className="normal-br"
+                type="primary"
+                block
+                size="large"
+                disabled={!termsAgreed}
+                onClick={() => {
+                  passwords.validateFields().then(data => {
+                    const { password, mailUpdates } = data;
+                    confirmInvitation(
+                      { password, mailUpdates },
+                      () => { },
+                      { companyCode, userCode }
+                    );
+                    setPasswordReseted(true);
+                  });
+                }}
+              >
+                {t("Confirm")}
+              </DafButton>
+            </div>
+          </>
         )}
       </>
     );
 
     if (Layout) {
+      // Assuming Layout accepts these props as per Nashiriki AuthLayout
       return <Layout app={app} step={1} subTitle={subTitle} title={title}>{Content}</Layout>;
     }
 
@@ -214,5 +189,5 @@ export default function AppInvitation({
     );
   }
 
-  return null;
+  return user ? <Navigate to={appRedirectPath} /> : <Navigate to={redirectPath} />;
 }

package/src/@daf/hooks/useAdminDashboard.js

@@ -46,20 +46,15 @@ export function useAdminDashboard({ dashboardService, onError }) {
 	}, [dashboardService, onError]);
 
 	const fetchUserGrowth = useCallback(
-		async (activeFilter) => {
+		async (params) => {
 			if (!dashboardService?.getUserGrowth) {
 				console.warn("dashboardService.getUserGrowth not provided");
 				return;
 			}
 
-			if (activeFilter === undefined || activeFilter === null) {
-				console.warn("activeFilter not provided to fetchUserGrowth");
-				return;
-			}
-
 			setUserGrowthDataLoading(true);
 			try {
-				const response = await dashboardService.getUserGrowth(activeFilter);
+				const response = await dashboardService.getUserGrowth(params);
 				setUserGrowthData(response || []);
 			} catch (err) {
 				if (onError) {
@@ -73,9 +68,11 @@ export function useAdminDashboard({ dashboardService, onError }) {
 		},
 		[dashboardService, onError]
 	);
+
 	useEffect(() => {
 		fetchDashboardData();
 	}, [fetchDashboardData]);
+
 	return {
 		data,
 		loading,

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -39,7 +39,24 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
           return <Tooltip title={v}>{v}</Tooltip>;
         },
-    },    
+    },
+    {
+      dataIndex: 'category',
+      title: t('Category'),
+      ellipsis: true,
+      show: true,
+      render: (v, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />
+        }
+
+        const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])]
+
+        const category = findOptions(v, locationCategories);
+  
+        return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+      },
+    },     
     {
         dataIndex: 'region',
         title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),

package/src/@daf/pages/Locations/MineSite/config.js

@@ -85,8 +85,8 @@ export const getFiltersConfig = ({t}) => {
 		},		
 		category: {
 		  type: 'select',
-		  label: 'Type',
-		  placeholder: () => `${t('Filter by')} ${t('Type').toLowerCase()}`,
+		  label: 'Category',
+		  placeholder: () => `${t('Filter by')} ${t('Category').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,