datastake-daf 0.6.798 → 0.6.799

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

@@ -0,0 +1,77 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { getNameByLevel } from "./helpers.js";
+import LocationTable from "../../AdminTables/LocationTable/index.jsx";
+
+const isView = true;
+
+export default function View({
+	userRoles = [],
+	conf,
+	data = {},
+	formOptions = {},
+	t,
+	goTo,
+	location,
+	getRedirectLink,
+	accountStatuses,
+	module,
+}) {
+	const renderItem = (item) => {
+		if (item.type === "location") {
+			return (
+				<LocationTable
+					isView={isView}
+					entityData={data}
+					goTo={goTo}
+					getRedirectLink={getRedirectLink}
+					t={t}
+					location={location}
+					module={module}
+				/>
+			);
+		}
+
+		const getValue = () => {
+			const val =
+				item.getFormApps === true
+					? data?.apps?.find((app) => app.app === module)?.[item?.propertyName]
+					: data?.[item.key];
+
+			if (item.type === "select") {
+				const option = findOptions(val, formOptions[item.optionsName] || []);
+				return option ? t(option) : "-";
+			}
+
+			if (item.type === "administrative") {
+				return getNameByLevel(data?.linking?.SCL, item.level) || "-";
+			}
+
+			return val ?? "-";
+		};
+
+		return (
+			<div className="input" key={item.key}>
+				<p className="label">
+					<span>{t(item.label)}</span>
+				</p>
+				<p className="value">{getValue()}</p>
+			</div>
+		);
+	};
+
+
+
+	return (
+		<div className="content">
+			<div className="wrapper" style={{ width: 700 }}>
+				<div className="group">
+					<div className="daf-title with-subtitle">
+						<h1>{t(conf.title)}</h1>
+					</div>
+
+					{conf.items.map((item) => renderItem(item))}
+				</div>
+			</div>
+		</div>
+	);
+}

package/src/@daf/core/components/Screens/Admin/AdminViews/ViewStakeholder/config.js

@@ -0,0 +1,51 @@
+export const config = [
+	{
+		label: "Core Data",
+		key: "core-data",
+		title: "Core Data",
+		description: "this-data-is-used-to-identify-the-stakeholder.Changing-it-will-affect-the-subject-itself,any-forms-where-it-appears-and-any-related-or-linked-subjects.",
+		items: [
+			{ 
+				label: "Name", 
+				key: "name", 
+				type: "text",
+				placeholder: "Enter stakeholder name",
+				rules: [
+					{ required: true, message: "errors::Name is required" }
+				]
+			},
+			{ 
+				label: "Category", 
+				key: "category", 
+				type: "select", 
+				optionsName: "category",
+				placeholder: "Select a category",
+				rules: [
+					{ required: true, message: "errors::Category is required" }
+				]
+			},
+			{ 
+				label: "Country", 
+				key: "country", 
+				type: "select", 
+				optionsName: "countries",
+				placeholder: "Select a country",
+				rules: [
+					{ required: true, message: "errors::Country is required" }
+				]
+			},
+			// { 
+			// 	label: "Province", 
+			// 	key: "administrativeLevel1", 
+			// 	type: "administrative",
+			// 	level: "level_1"
+			// },
+			// { 
+			// 	label: "Territory", 
+			// 	key: "administrativeLevel2", 
+			// 	type: "administrative",
+			// 	level: "level_2"
+			// },
+		],
+	},
+];

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

@@ -0,0 +1,75 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import StakeholderTable from "../../AdminTables/SubjectsTable/index.jsx";
+const isView = true;
+
+export default function View({
+	userRoles = [],
+	conf,
+	data = {},
+	formOptions = {},
+	t,
+	goTo,
+	stakeholder,
+	getRedirectLink,
+	accountStatuses,
+	module,
+}) {
+	const renderItem = (item) => {
+		if (item.type === "stakeholder") {
+			return (
+				<StakeholderTable
+					isView={isView}
+					entityData={data}
+					goTo={goTo}
+					getRedirectLink={getRedirectLink}
+					t={t}
+					stakeholder={stakeholder}
+					module={module}
+				/>
+			);
+		}
+
+		const getValue = () => {
+			const val =
+				item.getFormApps === true
+					? data?.apps?.find((app) => app.app === module)?.[item?.propertyName]
+					: data?.[item.key];
+
+			if (item.type === "select") {
+				const option = findOptions(val, formOptions[item.optionsName] || []);
+				return option ? t(option) : "-";
+			}
+
+			if (item.type === "administrative") {
+				return getNameByLevel(data?.linking?.SCL, item.level) || "-";
+			}
+
+			return val ?? "-";
+		};
+
+		return (
+			<div className="input" key={item.key}>
+				<p className="label">
+					<span>{t(item.label)}</span>
+				</p>
+				<p className="value">{getValue()}</p>
+			</div>
+		);
+	};
+
+
+
+	return (
+		<div className="content">
+			<div className="wrapper" style={{ width: 700 }}>
+				<div className="group">
+					<div className="daf-title with-subtitle">
+						<h1>{t(conf.title)}</h1>
+					</div>
+
+					{conf.items.map((item) => renderItem(item))}
+				</div>
+			</div>
+		</div>
+	);
+}

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

@@ -24,6 +24,7 @@ export default function Edit({
 	accountStatuses = [],
 	module,
 	transferAdmin = () => {},
+	inviteCompanyAccount = () => {},
 }) {
 	const { addCheck, removeCheck } = useForms();
 
@@ -37,7 +38,7 @@ export default function Edit({
 
 	const deleteUser = useCallback(
 		(id) => {
-			// TODO: add call
+			// TODO: add call 
 			console.log("DELETE", id);
 			fetchData();
 		},
@@ -131,6 +132,9 @@ export default function Edit({
 					goTo={goTo}
 					accountStatuses={accountStatuses}
 					transferAdmin={transferAdmin}
+					inviteCompanyAccount={inviteCompanyAccount}
+					companyId={data.id}
+					handleError={handleError}
 				/>
 			);
 		}
@@ -174,6 +178,8 @@ export default function Edit({
 		);
 	};
 
+	console.log(conf,"data");
+
 	return (
 		<div className="form-edit flex-row">
 			<Form

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

@@ -1,7 +1,9 @@
 import { Menu } from "antd";
-import { config } from "../../config";
+import { config as defaultConfig } from "../../config";
 
-export default function SideBarMenu({ selectedGroup, onChange = () => {}, t }) {
+export default function SideBarMenu({ selectedGroup, onChange = () => {}, t, config }) {
+	const menuConfig = config || defaultConfig;
+	
 	return (
 		<Menu
 			mode="inline"
@@ -12,7 +14,7 @@ export default function SideBarMenu({ selectedGroup, onChange = () => {}, t }) {
 				onChange(g.key);
 			}}
 			items={
-				config.map((conf) => {
+				menuConfig.map((conf) => {
 					return {
 						key: conf.key,
 						label: t(conf.label),

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/helper.js

@@ -167,10 +167,7 @@ export const getColumns = ({
 	return cols.filter((v) => v.show);
 };
 
-export const checkboxConfig = {
-	name: "Name",
-	datastakeId: "ID",
-};
+export const checkboxConfig = {};
 
 export const selectFiltersConfig = {
 	userRole: {
@@ -194,9 +191,17 @@ export const selectFiltersConfig = {
 };
 
 export const filtersConfig = {
-	name: "",
-	datastakeId: "",
+	search: "",
+};
+
+export const defaultUrlParams = {
+	search: "",
+	userRole: null,
+	status: null,
 };
 
-export const defaultUrlParams = {};
-export const defaultTableFilters = {};
+export const defaultTableFilters = {
+	search: "",
+	userRole: null,
+	status: null,
+};

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

@@ -31,6 +31,9 @@ export default function Users({
 	updateUser = () => {},
 	addUser = () => {},
 	transferAdmin = () => {},
+	inviteCompanyAccount = () => {},
+	companyId,
+	handleError = () => {},
 }) {
 	const [hasError, setHasError] = useState(false);
 	const [showFilters, setShowFilters] = useState(false);
@@ -60,10 +63,10 @@ export default function Users({
 			userRole: userRoles.filter((u) => !u.isForAppAdmin),
 			status: accountStatuses,
 		};
-	}, [userRoles]);
+	}, [userRoles, accountStatuses]);
 
 	const canClearSearch = useMemo(() => {
-		return !!activeFilters.search;
+		return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
 	}, [activeFilters]);
 
 	const onDeleteUserClick = useCallback(
@@ -173,14 +176,17 @@ export default function Users({
 				onClose={() => setTransferModalVisible(false)}
 			/>
 
-			<NewUser
-				t={t}
-				isOpen={newUserModalVisible}
-				onClose={() => setNewUserModalVisible(false)}
-				userRoles={userRoles}
-				addUser={addUser}
-				module={module}
-			/>
+		<NewUser
+			t={t}
+			isOpen={newUserModalVisible}
+			onClose={() => setNewUserModalVisible(false)}
+			userRoles={userRoles}
+			addUser={addUser}
+			module={module}
+			inviteCompanyAccount={inviteCompanyAccount}
+			companyId={companyId}
+			handleError={handleError}
+		/>
 		</div>
 	);
 }

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

@@ -1,6 +1,6 @@
 import { findOptions } from "../../../../../../../../helpers/StringHelper.js";
 import Users from "../Users/index.jsx";
-
+import AdminService from "../../../../../../../services/AdminService.js";
 import { renderStatus } from "./helpers.js";
 
 const isView = true;
@@ -30,6 +30,7 @@ export default function View({
 					location={location}
 					accountStatuses={accountStatuses}
 					module={module}
+					inviteCompanyAccount={AdminService.inviteCompanyAccount}
 				/>
 			);
 		}

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

@@ -40,6 +40,7 @@ function AdminView({
 	handleError,
 	toggleAccountStatus,
 	transferAdmin,
+	inviteCompanyAccount,
 }) {
 	const conf = useMemo(() => config.find((c) => c.key === group), [group]);
 	const [loading, setLoading] = useState(false);
@@ -55,7 +56,6 @@ function AdminView({
 	}, [data]);
 
 	const goToView = useCallback(() => {
-		console.log("goToView");
 		changeNotificationState({
 			onYes: () => {
 				setEditData(data);
@@ -63,7 +63,7 @@ function AdminView({
 				goTo(`/app/accounts/view/${id}/${group}`);
 			},
 		});
-	}, [goTo, changeNotificationState, data]);
+	}, [goTo, changeNotificationState, data, id, group]);
 
 	const breadCrumbs = useMemo(() => {
 		return renderBreadCrumbs({
@@ -99,9 +99,9 @@ function AdminView({
 			setIsChanged(false);
 			setLoading(false);
 		} catch (err) {
-			console.log(err);
+			handleError?.(err);
 		}
-	}, [id]);
+	}, [id, getAccountData, module, handleError]);
 
 	useEffect(() => {
 		fetchData();
@@ -132,30 +132,69 @@ function AdminView({
 							const { accountType, ...rest } = _data;
 							const _accountType = accountType || editData.accountType;
 
-							const newData = {
-								...rest,
-								users: (editData?.users || []).map((v) => ({
-									...v,
-									status: "active",
-								})),
-								apps: editData?.apps?.map((a) => {
-									if (a.app === module) {
-										return { ...a, interface: _accountType };
+						const allUsers = editData?.users || [];
+						const existingUsers = allUsers.filter(u => !u.pendingCompanyId);
+						const pendingUsers = allUsers.filter(u => u.pendingCompanyId);
+
+						console.log('Save operation:', {
+							totalUsers: allUsers.length,
+							existingUsers: existingUsers.length,
+							pendingUsers: pendingUsers.length,
+							accountId: editData.id
+						});
+
+						const newData = {
+							...rest,
+							users: existingUsers.map((v) => ({
+								...v,
+								status: v.status === "unsaved" ? "active" : v.status,
+							})),
+							apps: editData?.apps?.map((a) => {
+								if (a.app === module) {
+									return { ...a, interface: _accountType };
+								}
+								return a;
+							}),
+						};
+
+						try {
+							await updateAccount({ id: editData.id, data: newData });
+
+							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) {
+									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);
+									} catch (inviteError) {
+										console.error('Failed to invite user:', user.email, inviteError);
+										handleError(inviteError);
 									}
-									return a;
-								}),
-							};
-
-							try {
-								await updateAccount({ id: editData.id, data: newData });
-								await fetchData();
-								message.success(t("Information saved successfully"));
-								setNotificationMode(NOTIFICATION_MODE.EMPTY);
-								setIsChanged(false);
-							} catch (err) {
-								handleError(err);
+								}
 							}
 
+							await fetchData();
+							message.success(t("Information saved successfully"));
+							setNotificationMode(NOTIFICATION_MODE.EMPTY);
+							setIsChanged(false);
+						} catch (err) {
+							handleError(err);
+						}
+
 							setLoading(false);
 						})
 						.catch(() => {});
@@ -167,7 +206,7 @@ function AdminView({
 				onClick: goToView,
 			},
 		];
-	}, [t, mode, MainForm, goToView, isChanged, editData, fetchData]);
+	}, [t, mode, MainForm, goToView, isChanged, editData, fetchData, updateAccount, handleError, setNotificationMode, module, inviteCompanyAccount]);
 
 	if (!conf) {
 		return <NotFound />;
@@ -205,6 +244,7 @@ function AdminView({
 						accountStatuses={accountStatuses}
 						module={module}
 						transferAdmin={transferAdmin}
+						inviteCompanyAccount={inviteCompanyAccount}
 					/>
 				) : (
 					<View

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

@@ -0,0 +1,193 @@
+import React, { useState, useEffect } from "react";
+import { Checkbox, Form, Input, message } from 'antd';
+import DafButton from '../../../Button/index.jsx';
+import Loading from "../../../Loading/index.jsx";
+
+export default function AppInvitation({
+  // Redux State
+  errors,
+  user,
+  invitationSuccess,
+  // Actions
+  confirmInvitation,
+  getUserFromInvitation,
+  // Configuration
+  Layout,
+  redirectPath = "/",
+  loginPath = "/login",
+  appRedirectPath = "/app",
+  params: 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(() => {
+    if (companyCode && userCode) {
+      getUserFromInvitation({ companyCode, userCode }, () => {
+        setChecking(false);
+      });
+    } else {
+      setChecking(false);
+    }
+  }, [companyCode, userCode, getUserFromInvitation]);
+
+  useEffect(() => {
+    if (invitationSuccess && user && user.inviteToken) {
+      confirmInvitation(
+        {},
+        (data) => {
+          if (data.token) {
+            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);
+        },
+        { 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',
+    };
+  };
+
+  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;
+
+  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 />;
+  }
+
+  if (invitationSuccess && !user.inviteToken) {
+    const Content = (
+      <>
+        {passwordReseted ? (
+          <div>
+            {isMobile ? null : (
+              <DafButton
+                type="primary"
+                className="normal-br"
+                onClick={() => {
+                  window.location.href = loginPath;
+                }}
+              >
+                {t('Log In')}
+              </DafButton>
+            )}
+          </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>
+          </>
+        )}
+      </>
+    );
+
+    if (Layout) {
+      // Assuming Layout accepts these props as per Nashiriki AuthLayout
+      return <Layout app={app} step={1} subTitle={subTitle} title={title}>{Content}</Layout>;
+    }
+
+    return (
+        <div style={{ padding: 20, maxWidth: 400, margin: '0 auto' }}>
+            <h2>{title}</h2>
+            <p>{subTitle}</p>
+            {Content}
+        </div>
+    );
+  }
+
+  return user ? <Navigate to={appRedirectPath} /> : <Navigate to={redirectPath} />;
+}