datastake-daf 0.6.808 → 0.6.809

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

@@ -34,6 +34,7 @@ export default function Users({
 	inviteCompanyAccount = () => {},
 	companyId,
 	handleError = () => {},
+
 }) {
 	const [hasError, setHasError] = useState(false);
 	const [showFilters, setShowFilters] = useState(false);
@@ -72,9 +73,9 @@ export default function Users({
 	const onDeleteUserClick = useCallback(
 		(id) => {
 			Modal.confirm({
-				title: t("sbg-admin::remove-user-title"),
+				title: t("Are-you-sure-you-want-to-remove-the-user-from-this-account?"),
 				icon: <ExclamationCircleOutlined />,
-				content: t("sbg-admin::remove-user-body"),
+				content: <span style={{ color: "#888" }}>{t("The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
 				okText: t("Yes"),
 				cancelText: t("No"),
 				onOk: () => {
@@ -87,8 +88,15 @@ export default function Users({
 	);
 
 	const data = useMemo(() => {
-		const { users = [] } = accountData;
-		let filtered = [...users];
+		const { users = [], pendingUsers = [] } = accountData;
+		let filtered = [
+			...users,
+			...pendingUsers.map(u => ({ 
+				...u, 
+				status: 'pending',
+				id: u.invitationToken || u.email // ensure pending users have an ID
+			}))
+		];
 
 		if (!isEmptyOrSpaces(activeFilters.search)) {
 			const search = activeFilters.search.toLowerCase();
@@ -186,6 +194,10 @@ 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,23 +1,15 @@
 import { Tag } from "antd";
 
 export const renderStatus = ({ val, t = (s) => s }) => {
-	// switch (val) {
-	// 	case "active":
-	// 		return <Tag color="green">{t("Active")}</Tag>;
-	// 	case "unsaved":
-	// 		return <Tag color="red">{t("Unsaved")}</Tag>;
-	// 	case "inactive":
-	// 	case "suspended":
-	// 		return <Tag color="red">{t("Suspended")}</Tag>;
-	// 	case "pending":
-	// 		return <Tag color="orange">{t("Pending")}</Tag>;
-	// 	default:
-	// 		return <Tag color="default">{t("Unknown")}</Tag>;
-	// }
-
-	if (val) {
+	if (val === 'pending') {
+		return <Tag color="orange">{t("Pending")}</Tag>;
+	}
+	if (val === 'unsaved') {
+		return <Tag color="red">{t("Unsaved")}</Tag>;
+	}
+	if (val === 'active' || val === true) {
 		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,14 +172,15 @@ function AdminView({
 									try {
 										const { pendingCompanyId, status, ...userDataToInvite } = user;
 										console.log('Sending invitation for:', user.email, userDataToInvite);
-										await inviteCompanyAccount({
-											companyId: editData.id,
-											data: {
-												...userDataToInvite,
-												pendingCompanyId,
-											},
-										});
-										console.log('Invitation sent successfully for:', user.email);
+										// Use the standalone invite function, don't mix it with updateAccount
+										// await inviteCompanyAccount({
+										// 	companyId: editData.id,
+										// 	data: {
+										// 		...userDataToInvite,
+										// 		pendingCompanyId,
+										// 	},
+										// });
+										// console.log('Invitation sent successfully for:', user.email);
 									} catch (inviteError) {
 										console.error('Failed to invite user:', user.email, inviteError);
 										handleError(inviteError);

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

@@ -1,30 +1,30 @@
 import React, { useState, useEffect } from "react";
-import { Checkbox, Form, Input, message } from 'antd';
+import { Checkbox, 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,
-  // Configuration
+  theme,
   Layout,
   redirectPath = "/",
   loginPath = "/login",
   appRedirectPath = "/app",
   params: propParams = {},
+  goTo,
+  isMobile = false,
+  t,
 }) {
-  const { t } = useTranslation();
-  const routeParams = useParams();
-  const { app, companyCode, userCode } = { ...routeParams, ...propParams };
-  const [passwords] = Form.useForm();
+  const { app, companyCode, userCode } = propParams;
   const [checking, setChecking] = useState(true);
-  const goTo = useNavigate();
-  const [termsAgreed, setTermsAgreed] = useState(false);
   const [passwordReseted, setPasswordReseted] = useState(false);
 
   useEffect(() => {
@@ -46,36 +46,125 @@ export default function AppInvitation({
             localStorage.setItem('token', data.token);
           }
           message.success(t('Invitation accepted'));
-          // Fix: ensure we don't rely on a variable from useParams that might not exist
-          // Just use the configured redirectPath
-          goTo(redirectPath);
+          if (goTo && typeof goTo === 'function') {
+            goTo(redirectPath);
+          } else {
+            window.location.href = redirectPath;
+          }
         },
         { companyCode, userCode }
       );
     }
   }, [invitationSuccess, user, confirmInvitation, goTo, redirectPath, companyCode, userCode, t]);
 
-  const displayError = (name) => {
-    return errors && errors[name] && errors[name].length > 0 && {
-      help: errors[name][0],
-      validateStatus: 'error',
-    };
-  };
+
+  useEffect(() => {
+
+    const isInInvitationFlow = checking || 
+      (invitationSuccess && user && user.inviteToken) || 
+      (invitationSuccess && user && !user.inviteToken);
+    
+    if (!isInInvitationFlow) {
+      if (user) {
+        if (goTo && typeof goTo === 'function') {
+          goTo(appRedirectPath);
+        } else {
+          window.location.href = appRedirectPath;
+        }
+      } else {
+        if (goTo && typeof goTo === 'function') {
+          goTo(redirectPath);
+        } else {
+          window.location.href = redirectPath;
+        }
+      }
+    }
+  }, [user, goTo, appRedirectPath, redirectPath, checking, invitationSuccess]);
 
   const subTitle = !passwordReseted ? 'Set up your password and agree with out terms and conditions.' :
     isMobile ? 'Your account has been successfully set up. To log in use a desktop device.'
       : 'Your account has been successfully set up. Please click the button below to log in.';
   const title = passwordReseted ? 'Thank You!' : undefined;
 
+  const fields = [
+    {
+      name: 'email',
+      label: t("Email"),
+      type: 'input',
+      disabled: true,
+    },
+    {
+      name: 'password',
+      label: t("Password"),
+      type: 'password',
+      required: true,
+      rules: [{
+        required: true,
+        message: t("errors::password should not be empty")
+      }],
+      placeholder: t("Password"),
+    },
+    {
+      name: 'confirmPassword',
+      label: t("Confirm Password"),
+      type: 'password',
+      required: true,
+      dependencies: ['password'],
+      rules: [
+        {
+          required: true,
+          message: t("errors::password should not be empty"),
+        },
+        ({ 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 />;
   }
 
@@ -88,6 +177,7 @@ 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;
                 }}
@@ -97,86 +187,21 @@ export default function AppInvitation({
             )}
           </div>
         ) : (
-          <>
-            <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>
-          </>
+          <AuthForm
+            fields={fields}
+            onSubmit={handleSubmit}
+            submitText={t("Confirm")}
+            initialValues={{ email: user?.email }}
+            errors={errors}
+            t={t}
+            executeRecaptcha={() => Promise.resolve(true)}
+            theme={theme || window.theme}
+          />
         )}
       </>
     );
 
     if (Layout) {
-      // Assuming Layout accepts these props as per Nashiriki AuthLayout
       return <Layout app={app} step={1} subTitle={subTitle} title={title}>{Content}</Layout>;
     }
 
@@ -189,5 +214,5 @@ export default function AppInvitation({
     );
   }
 
-  return user ? <Navigate to={appRedirectPath} /> : <Navigate to={redirectPath} />;
+  return null;
 }

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

@@ -46,15 +46,20 @@ export function useAdminDashboard({ dashboardService, onError }) {
 	}, [dashboardService, onError]);
 
 	const fetchUserGrowth = useCallback(
-		async (params) => {
+		async (activeFilter) => {
 			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(params);
+				const response = await dashboardService.getUserGrowth(activeFilter);
 				setUserGrowthData(response || []);
 			} catch (err) {
 				if (onError) {
@@ -68,11 +73,9 @@ export function useAdminDashboard({ dashboardService, onError }) {
 		},
 		[dashboardService, onError]
 	);
-
 	useEffect(() => {
 		fetchDashboardData();
 	}, [fetchDashboardData]);
-
 	return {
 		data,
 		loading,

package/src/@daf/services/AdminService.js

@@ -17,6 +17,8 @@ class AdminService extends BaseService {
     }
 
 
+
+
   inviteCompanyAccount({ companyId, data }) {
     return this.apiPost({
       url: `/accounts/${companyId}/invite`,
@@ -24,6 +26,10 @@ class AdminService extends BaseService {
     })
   }
 
+  
+
+
+
     inviteAccount(data) {
         return this.apiPost({
           url: `/accounts/inviteAccount`, 
@@ -166,7 +172,7 @@ class AdminService extends BaseService {
       const type = subject === 'location' ? 'location' : 'stakeholder';
       return this.apiPut({
         url: `/management/subject/${type}/${id}`,
-        data: filterCreateData(data),
+        data: data,
       });
     }
 
@@ -177,15 +183,20 @@ class AdminService extends BaseService {
       });
     }
 
-    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.apiDelete({
+        url: `/accounts/${accountId}/users/${userId}`,
+      })
+    }
 }
 
 export default createLazyService(AdminService);

package/src/@daf/services/DashboardService.js

@@ -9,13 +9,13 @@ 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() { 

package/src/@daf/utils/filters.js

@@ -63,29 +63,19 @@ export const getDefaultActiveFilters = (
 };
 
 const NEW_PAGINATION_APPS = ["nashiriki"];
-
 export const filterParams = (value, module) => {
 	const { activeFilters, ...rest } = value;
 
-	const {
-		page = 1,
-		pageSize = 20,
-		sortDir,
-		sortBy,
-		search,
-		searchParams,
-		...filters
-	} = activeFilters || {};
+	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
+		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,
@@ -100,6 +90,14 @@ export const filterParams = (value, module) => {
 		});
 	}
 
+	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 };
 };
 

package/src/constants/locales/en/translation.js

@@ -1,4 +1,13 @@
 const en = {
+  "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",
+  "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",

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow: