datastake-daf 0.6.798 → 0.6.800

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

@@ -2,7 +2,7 @@ import { useState, useMemo } from "react";
 import { useAdminTable } from "../hook";
 import AdminTable from "../components/index.jsx";
 import DAFTable from "../../../../Table/index.jsx";
-import { theme, Tag } from "antd";
+import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -10,9 +10,10 @@ import {
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
-} from "../SubjectsTable/helper.js";
-import { getColumns } from "../SubjectsTable/columns.js";
+} from "./helper.js";
+import { getColumns } from "./column.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
+
 const { useToken } = theme;
 
 export default function LocationTable({
@@ -28,14 +29,51 @@ export default function LocationTable({
 	view,
 	headerTitle,
 	breadcrumbs,
-	mergeSubjectsFunction,
+	mergeLocationsFunction,
 	refetchTrigger,
+	user,
+	options,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
-	const [selectedLocations, setSelectedLocations] = useState([]);
-	const { token } = useToken();
-	const [combineLocationVisible, setCombineLocationVisible] = useState(false);
+	
+	const [selectedLocations, setSelectedLocations] = useState([]); 
+	
+    const { token } = useToken();
+	const [isCombineModalOpen, setIsModalOpen] = useState(false);
+
+	const getDataWithStringPagination = async ({ params }) => {
+		const { pagination, tab, filters, search, sort, ...otherParams } = params;
+		
+		let paginationObj = { page: 1, pageSize: 20 };
+		if (pagination) {
+			try {
+				paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
+			} catch (e) {
+				console.error('Failed to parse pagination', e);
+			}
+		}
+		
+		let activeTab = tab || "active";
+		if (!tab && filters) {
+			try {
+				const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+				activeTab = parsedFilters.activeTab || "active";
+			} catch (e) {
+				activeTab = "active";
+			}
+		}
+		
+		const transformedParams = {
+			pagination: {
+				skip: String(paginationObj.page || 1),
+				take: String(paginationObj.pageSize || 20),
+			},
+			tab: activeTab,
+		};
+		
+		return getData({ params: transformedParams });
+	};
 
 	const {
 		filter,
@@ -58,7 +96,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData,
+		getData: getDataWithStringPagination,
 		refetchTrigger,
 	});
 
@@ -66,7 +104,7 @@ export default function LocationTable({
 		return {
 			category: config.options?.category,
 			country: config.options?.countries,
-			sources: [], //TODO: add sources logic and make sure you only show unique sources only once
+			sources: [],
 		};
 	}, [config.options]);
 
@@ -76,11 +114,13 @@ export default function LocationTable({
 			goTo,
 			token,
 			module,
-			selectedLocations,
+			selectedLocations, 
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle
+			entity: headerTitle,
+			user,
+			options,
 		});
 	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
 
@@ -93,8 +133,8 @@ export default function LocationTable({
 				actionButton={[
 					{
 						icon: "Merge",
-						onClick: () => setCombineLocationVisible(true),
-						tooltip: "Combine",
+						onClick: () => setIsModalOpen(true),
+						tooltip: t("admin::merge-locations"),
 						disabled: selectedLocations.length < 2,
 					},
 				]}
@@ -112,25 +152,15 @@ export default function LocationTable({
 				breadcrumbs={breadcrumbs}
 			>
 				{selectedLocations.length > 0 && (
-					<div
-						className="flex flex-row  ml-6 mt-5"
-						style={{
-							flexWrap: "wrap",
-							gap: "8px",
-						}}
-					>
+					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
 						{selectedLocations.map((account) => (
 							<Tag
 								key={account.userId}
 								className="flex flex-row gap-2 items-center"
 								onClick={() =>
-									setSelectedLocations((prev) =>
-										prev.filter((a) => a.datastakeId !== account.datastakeId),
-									)
+									setSelectedLocations((prev) => prev.filter((a) => a.datastakeId !== account.datastakeId))
 								}
-								style={{
-									cursor: "pointer",
-								}}
+								style={{ cursor: "pointer" }}
 							>
 								<span>{account.datastakeId}</span>
 								<CustomIcon name="Close" size={10} />
@@ -156,25 +186,27 @@ export default function LocationTable({
 				/>
 			</AdminTable>
 
-			<CombineLocationModal
-				isOpen={combineLocationVisible}
-				t={t}
-				onClose={() => {
-					setCombineLocationVisible(false);
-				}}
-				onSuccess={(data) => {
-					setCombineLocationVisible(false);
-					setLoading(true);
-					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data);
-						setSelectedLocations([])
-					}
-				}}
-				selectedLocations={selectedLocations}
-				selectOptions={selectOptions || {}}
-				module={module}
-				entity={headerTitle}
-			/>
+		<CombineLocationModal
+			isOpen={isCombineModalOpen}
+			t={t}
+			onClose={() => setIsModalOpen(false)}
+			onSuccess={(data) => {
+				console.log("Modal Success triggered", data); // 1. Check if this logs
+				console.log("Is function?", typeof mergeLocationsFunction);
+				setIsModalOpen(false);
+				setLoading(true);
+				if (typeof mergeLocationsFunction === 'function') {
+					mergeLocationsFunction(data).finally(() => {
+						setSelectedLocations([]);
+						fetchData();
+					});
+				}
+			}}
+			selectedLocations={selectedLocations}
+			selectOptions={selectOptions}
+			module={module}
+			entity={headerTitle} 
+		/>
 		</>
 	);
-}
+}

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

@@ -13,6 +13,7 @@ export const getColumns = ({
 	setSelectedSubjects,
 	selectOptions,
 	entity,
+	options,
 }) => {
 	const cols = [
 		{
@@ -84,7 +85,8 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				const category = findOptions(value, selectOptions?.category || []) || "--";
+				console.log({value, options})
+				const category = findOptions(value, options?.categoriesOptions || []) || "-";
 
 				return <Tooltip title={category}>{category}</Tooltip>;
 			},
@@ -99,53 +101,53 @@ export const getColumns = ({
 				if (all.empty) {
 					return <div className="daf-default-cell" />;
 				}
-				const country = findOptions(value, selectOptions?.country || []) || "--";
+				const country = findOptions(value, options?.countries || []) || "-";
 
 				return <Tooltip title={country}>{country}</Tooltip>;
 			},
 		},
-		{
-			title: t("Province"),
-			dataIndex: "administrativeLevel1",
-			key: "administrativeLevel1",
-			ellipsis: true,
-			show: entity.includes("locations"),
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
+	{
+		title: t("Admin Level 1"),
+		dataIndex: "administrativeLevel1",
+		key: "administrativeLevel1",
+		ellipsis: true,
+		show: entity.includes("location"),
+		render: (value, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
 
-				let label;
-				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-					label = all?.linking?.SCL?.[value]?.name
-				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
-				}
+			let label;
+			if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+				label = all?.linking?.SCL?.[value]?.name
+			} else {
+				label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
+			}
 
-				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
-			},
+			return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 		},
-		{
-			title: t("Territory"),
-			dataIndex: "administrativeLevel2",
-			key: "administrativeLevel2",
-			show: entity.includes("locations"),
-			ellipsis: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
+	},
+	{
+		title: t("Admin Level 2"),
+		dataIndex: "administrativeLevel2",
+		key: "administrativeLevel2",
+		show: entity.includes("location"),
+		ellipsis: true,
+		render: (value, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
 
-				let label;
-				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-					label = all?.linking?.SCL?.[value]?.name
-				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
-				}
+			let label;
+			if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+				label = all?.linking?.SCL?.[value]?.name
+			} else {
+				label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
+			}
 
-				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
-			},
+			return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 		},
+	},
 		{
 			title: t("Sources"),
 			dataIndex: "sources",
@@ -210,7 +212,7 @@ export const getColumns = ({
 					<div
 						className="cursor-pointer"
 						onClick={() => {
-							goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+							goTo(getRedirectLink(`/app/view/management-stakeholder/${all.id}`));
 						}}
 					>
 						<CustomIcon name="Link" width={18} height={18} />

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

@@ -2,7 +2,7 @@ import { useState, useMemo } from "react";
 import { useAdminTable } from "../hook";
 import AdminTable from "../components/index.jsx";
 import DAFTable from "../../../../Table/index.jsx";
-import { theme, Tag } from "antd";
+import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -31,6 +31,8 @@ export default function SubjectsTable({
 	breadcrumbs,
 	mergeSubjectsFunction,
 	refetchTrigger,
+	user,
+	options,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -38,6 +40,41 @@ export default function SubjectsTable({
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
+
+
+
+const getDataWithStringPagination = async ({ params }) => {
+		const { pagination, tab, filters, search, sort, ...otherParams } = params;
+		
+		let paginationObj = { page: 1, pageSize: 20 };
+		if (pagination) {
+			try {
+				paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
+			} catch (e) {
+				console.error('Failed to parse pagination', e);
+			}
+		}
+		
+		let activeTab = tab || "active";
+		if (!tab && filters) {
+			try {
+				const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+				activeTab = parsedFilters.activeTab || "active";
+			} catch (e) {
+				activeTab = "active";
+			}
+		}
+		
+		const transformedParams = {
+			pagination: {
+				skip: String(paginationObj.page || 1),
+				take: String(paginationObj.pageSize || 20),
+			},
+			tab: activeTab,
+		};
+		
+		return getData({ params: transformedParams });
+	};
 	const {
 		filter,
 		activeTab,
@@ -59,7 +96,7 @@ export default function SubjectsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData,
+		getData: getDataWithStringPagination,
 		refetchTrigger,
 	});
 
@@ -67,7 +104,7 @@ export default function SubjectsTable({
 		return {
 			category: config.options?.category,
 			country: config.options?.countries,
-			sources: [], //TODO: add sources logic and make sure you only show unique sources only once
+			sources: [],
 		};
 	}, [config.options]);
 
@@ -81,9 +118,10 @@ export default function SubjectsTable({
 			setSelectedSubjects,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle
+			entity: headerTitle,
+			options,
 		});
-	}, [t, goTo, module, token, selectedSubjects, getRedirectLink, selectOptions, headerTitle]);
+	}, [t, goTo, module, token, selectedSubjects, getRedirectLink, selectOptions, headerTitle, options]);
 
 	return (
 		<>
@@ -113,25 +151,15 @@ export default function SubjectsTable({
 				breadcrumbs={breadcrumbs}
 			>
 				{selectedSubjects.length > 0 && (
-					<div
-						className="flex flex-row  ml-6 mt-5"
-						style={{
-							flexWrap: "wrap",
-							gap: "8px",
-						}}
-					>
+					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
 						{selectedSubjects.map((account) => (
 							<Tag
 								key={account.userId}
 								className="flex flex-row gap-2 items-center"
 								onClick={() =>
-									setSelectedSubjects((prev) =>
-										prev.filter((a) => a.datastakeId !== account.datastakeId),
-									)
+									setSelectedSubjects((prev) => prev.filter((a) => a.datastakeId !== account.datastakeId))
 								}
-								style={{
-									cursor: "pointer",
-								}}
+								style={{ cursor: "pointer" }}
 							>
 								<span>{account.datastakeId}</span>
 								<CustomIcon name="Close" size={10} />
@@ -160,19 +188,20 @@ export default function SubjectsTable({
 			<CombineSubjectsModal
 				isOpen={isCombineModalOpen}
 				t={t}
-				onClose={() => {
-					setIsModalOpen(false);
-				}}
+				onClose={() => setIsModalOpen(false)}
 				onSuccess={(data) => {
 					setIsModalOpen(false);
 					setLoading(true);
+					message.success(t("Subjects successfully merged."))
 					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data);
-						setSelectedSubjects([])
+						mergeSubjectsFunction(data).finally(() => {
+							setSelectedSubjects([]);
+							fetchData();
+						});
 					}
 				}}
 				selectedSubjects={selectedSubjects}
-				selectOptions={selectOptions || {}}
+				selectOptions={selectOptions}
 				module={module}
 				entity={headerTitle}
 			/>

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

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

package/src/@daf/core/components/Screens/Admin/AdminViews/EditLocation/configTransformer.js

@@ -0,0 +1,137 @@
+
+export function transformConfigItem(item, formOptions = {}, t = (s) => s) {
+	const { 
+		key, 
+		label, 
+		type, 
+		optionsName, 
+		level, 
+		placeholder,
+		rules,
+		showFormIf,
+		disabled,
+		defaultValue,
+		meta: configMeta = {},
+		...rest 
+	} = item;
+
+	const option = {
+		type: type || "text",
+		label: label,
+		meta: { ...configMeta },
+		...rest,
+	};
+
+	if (placeholder) option.placeholder = placeholder;
+	if (rules && Array.isArray(rules)) option.rules = rules;
+	if (showFormIf) option.showFormIf = showFormIf;
+	if (disabled !== undefined) {
+		option.disabled = disabled;
+		option.meta.disableEdit = disabled;
+	}
+	if (defaultValue !== undefined) option.meta.defaultValue = defaultValue;
+
+
+	const mapOptions = (sourceKey) => {
+		if (sourceKey && formOptions[sourceKey]) {
+			return formOptions[sourceKey].map((opt) => {
+				if (typeof opt === 'object' && opt !== null) {
+					return {
+						value: opt.value,
+						label: t(opt.label || opt.value),
+					};
+				}
+				return { value: opt, label: t(opt) };
+			});
+		}
+		return [];
+	};
+
+
+	if (type === "select" || type === "multiselect") {
+		option.options = mapOptions(optionsName || level);
+		
+		if (option.options.length === 0) {
+			console.warn(`No options found for field "${key}"`);
+		}
+
+		if (type === "multiselect") {
+			option.mode = "multiple";
+			option.type = "select";
+		}
+	}
+
+	if (type === "ajaxSelect") {
+		const { entity, method, mapper, filters } = item;
+		
+		if (!entity || !method || !mapper) {
+			console.error(`ajaxSelect field "${key}" is missing properties`);
+			option.type = "text";
+			option.disabled = true;
+		} else {
+			const filtersString = filters ? JSON.stringify(filters) : "{}";
+			const mapperString = JSON.stringify(mapper);
+			option.meta.call = `${entity}::${method}(${filtersString})::${mapperString}`;
+			option.type = "ajaxSelect";
+			
+			
+			if (optionsName || level) {
+				option.options = mapOptions(optionsName || level);
+			}
+			
+			if (option.meta.noAddNew) {
+				option.onNewSetValue = false;
+			}
+		}
+	}
+
+	if (type === "administrative") {
+		option.type = "text";
+		option.disabled = true;
+		option.meta.disableEdit = false;
+		if (level) option.meta.level = level;
+	}
+	if (type === "switch" || type === "checkbox") {
+		option.type = type;
+		if (defaultValue === undefined) option.meta.defaultValue = false;
+	}
+	if (type === "date" || type === "datetime" || type === "year") option.type = type;
+	if (type === "textarea") {
+		option.type = "textarea";
+		option.rows = item.rows || 4;
+	}
+	if (type === "number") {
+		option.type = "text";
+		option.meta.inputType = "number";
+	}
+	if (option.position === undefined) option.position = 0;
+
+	return option;
+}
+
+export function transformConfigToEditForm(conf, formOptions = {}, t = (s) => s) {
+	if (!conf || !conf.items || !Array.isArray(conf.items)) {
+		return null;
+	}
+
+	const options = {};
+	conf.items.forEach((item, index) => {
+		const transformedOption = transformConfigItem(item, formOptions, t);
+		transformedOption.position = item.position !== undefined ? item.position : index;
+		options[item.key] = transformedOption;
+	});
+
+	return {
+		id: conf.key || "edit-form",
+		introText: "",
+		formTitles: conf.formTitles || {},
+		options,
+	};
+}
+
+export function getConfigFieldKeys(conf) {
+	if (!conf || !conf.items || !Array.isArray(conf.items)) {
+		return [];
+	}
+	return conf.items.map((item) => item.key);
+}

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

@@ -0,0 +1,9 @@
+
+
+export { default } from './index.jsx';
+export { 
+	transformConfigItem, 
+	transformConfigToEditForm, 
+	getConfigFieldKeys 
+} from './configTransformer.js';
+