datastake-daf 0.6.794 → 0.6.795

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, message } from "antd";
+import { theme, Tag } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -10,10 +10,9 @@ import {
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
-} from "./helper.js";
-import { getColumns } from "./column.js";
+} from "../SubjectsTable/helper.js";
+import { getColumns } from "../SubjectsTable/columns.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
-
 const { useToken } = theme;
 
 export default function LocationTable({
@@ -29,49 +28,14 @@ export default function LocationTable({
 	view,
 	headerTitle,
 	breadcrumbs,
-	mergeLocationsFunction,
+	mergeSubjectsFunction,
 	refetchTrigger,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = 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 [selectedLocations, setSelectedLocations] = useState([]);
+	const { token } = useToken();
+	const [combineLocationVisible, setCombineLocationVisible] = useState(false);
 
 	const {
 		filter,
@@ -94,7 +58,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData,
 		refetchTrigger,
 	});
 
@@ -102,7 +66,7 @@ export default function LocationTable({
 		return {
 			category: config.options?.category,
 			country: config.options?.countries,
-			sources: [],
+			sources: [], //TODO: add sources logic and make sure you only show unique sources only once
 		};
 	}, [config.options]);
 
@@ -112,7 +76,7 @@ export default function LocationTable({
 			goTo,
 			token,
 			module,
-			selectedLocations, 
+			selectedLocations,
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
@@ -129,8 +93,8 @@ export default function LocationTable({
 				actionButton={[
 					{
 						icon: "Merge",
-						onClick: () => setIsModalOpen(true),
-						tooltip: t("admin::merge-locations"),
+						onClick: () => setCombineLocationVisible(true),
+						tooltip: "Combine",
 						disabled: selectedLocations.length < 2,
 					},
 				]}
@@ -148,15 +112,25 @@ 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} />
@@ -182,27 +156,25 @@ export default function LocationTable({
 				/>
 			</AdminTable>
 
-		<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} 
-		/>
+			<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}
+			/>
 		</>
 	);
-}
+}

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

@@ -104,48 +104,48 @@ export const getColumns = ({
 				return <Tooltip title={country}>{country}</Tooltip>;
 			},
 		},
-	{
-		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" />;
-			}
+		{
+			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" />;
+				}
 
-			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("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" />;
-			}
+		{
+			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" />;
+				}
 
-			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 +210,7 @@ export const getColumns = ({
 					<div
 						className="cursor-pointer"
 						onClick={() => {
-							goTo(getRedirectLink(`/app/management/subject/stakeholder/${all.id}`));
+							goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
 						}}
 					>
 						<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, message } from "antd";
+import { theme, Tag } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -38,41 +38,6 @@ 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,
@@ -94,7 +59,7 @@ const getDataWithStringPagination = async ({ params }) => {
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData,
 		refetchTrigger,
 	});
 
@@ -102,7 +67,7 @@ const getDataWithStringPagination = async ({ params }) => {
 		return {
 			category: config.options?.category,
 			country: config.options?.countries,
-			sources: [],
+			sources: [], //TODO: add sources logic and make sure you only show unique sources only once
 		};
 	}, [config.options]);
 
@@ -148,15 +113,25 @@ const getDataWithStringPagination = async ({ params }) => {
 				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} />
@@ -185,20 +160,19 @@ const getDataWithStringPagination = async ({ params }) => {
 			<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).finally(() => {
-							setSelectedSubjects([]);
-							fetchData();
-						});
+						mergeSubjectsFunction(data);
+						setSelectedSubjects([])
 					}
 				}}
 				selectedSubjects={selectedSubjects}
-				selectOptions={selectOptions}
+				selectOptions={selectOptions || {}}
 				module={module}
 				entity={headerTitle}
 			/>

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

@@ -54,7 +54,6 @@ 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/components/Edit/index.jsx

@@ -37,7 +37,7 @@ export default function Edit({
 
 	const deleteUser = useCallback(
 		(id) => {
-			// TODO: add call 
+			// TODO: add call
 			console.log("DELETE", id);
 			fetchData();
 		},
@@ -174,8 +174,6 @@ 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,9 +1,7 @@
 import { Menu } from "antd";
-import { config as defaultConfig } from "../../config";
+import { config } from "../../config";
 
-export default function SideBarMenu({ selectedGroup, onChange = () => {}, t, config }) {
-	const menuConfig = config || defaultConfig;
-	
+export default function SideBarMenu({ selectedGroup, onChange = () => {}, t }) {
 	return (
 		<Menu
 			mode="inline"
@@ -14,7 +12,7 @@ export default function SideBarMenu({ selectedGroup, onChange = () => {}, t, con
 				onChange(g.key);
 			}}
 			items={
-				menuConfig.map((conf) => {
+				config.map((conf) => {
 					return {
 						key: conf.key,
 						label: t(conf.label),

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

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

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

@@ -60,10 +60,10 @@ export default function Users({
 			userRole: userRoles.filter((u) => !u.isForAppAdmin),
 			status: accountStatuses,
 		};
-	}, [userRoles, accountStatuses]);
+	}, [userRoles]);
 
 	const canClearSearch = useMemo(() => {
-		return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
+		return !!activeFilters.search;
 	}, [activeFilters]);
 
 	const onDeleteUserClick = useCallback(

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

@@ -55,6 +55,7 @@ function AdminView({
 	}, [data]);
 
 	const goToView = useCallback(() => {
+		console.log("goToView");
 		changeNotificationState({
 			onYes: () => {
 				setEditData(data);
@@ -62,7 +63,7 @@ function AdminView({
 				goTo(`/app/accounts/view/${id}/${group}`);
 			},
 		});
-	}, [goTo, changeNotificationState, data, id, group]);
+	}, [goTo, changeNotificationState, data]);
 
 	const breadCrumbs = useMemo(() => {
 		return renderBreadCrumbs({
@@ -98,9 +99,9 @@ function AdminView({
 			setIsChanged(false);
 			setLoading(false);
 		} catch (err) {
-			handleError?.(err);
+			console.log(err);
 		}
-	}, [id, getAccountData, module, handleError]);
+	}, [id]);
 
 	useEffect(() => {
 		fetchData();

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -5,7 +5,6 @@ import AdminAccountsScreen from "./AdminScreens/Accounts.jsx";
 import AdminAccountsViewScreen from "./AdminScreens/AccountsView.jsx";
 import AdminSubjectsScreen from "./AdminScreens/Subjects.jsx";
 import AdminLocationScreen from "./AdminScreens/Location.jsx";
-import AdminSubjectsViewScreen from "./AdminScreens/SubjectsView.jsx";
 
 export function getAdminRoutes(config) {
   const {
@@ -16,8 +15,6 @@ export function getAdminRoutes(config) {
     useAdminAccountsViewConfig,
     useAdminSubjectsConfig,
     useAdminLocationConfig,
-    useAdminSubjectsViewConfig,
-    useAdminLocationViewConfig,
     userIsAdmin,
   } = config;
 
@@ -59,38 +56,6 @@ export function getAdminRoutes(config) {
     return <AdminLocationScreen config={locationConfig} />;
   }
 
-  function LocationViewWrapper() {
-    const locationViewConfig =
-      typeof useAdminLocationViewConfig === "function"
-        ? useAdminLocationViewConfig()
-        : undefined;
-    return <AdminSubjectsViewScreen config={{ ...locationViewConfig, subject: "location" }} />;
-  }
-
-  function StakeholderViewWrapper() {
-    const stakeholderViewConfig =
-      typeof useAdminSubjectsViewConfig === "function"
-        ? useAdminSubjectsViewConfig()
-        : undefined;
-    return <AdminSubjectsViewScreen config={{ ...stakeholderViewConfig, subject: "stakeholder" }} />;
-  }
-
-  function LocationEditWrapper() {
-    const locationViewConfig =
-      typeof useAdminLocationViewConfig === "function"
-        ? useAdminLocationViewConfig()
-        : undefined;
-    return <AdminSubjectsViewScreen config={{ ...locationViewConfig, subject: "location", mode: "edit" }} />;
-  }
-
-  function StakeholderEditWrapper() {
-    const stakeholderViewConfig =
-      typeof useAdminSubjectsViewConfig === "function"
-        ? useAdminSubjectsViewConfig()
-        : undefined;
-    return <AdminSubjectsViewScreen config={{ ...stakeholderViewConfig, subject: "stakeholder", mode: "edit" }} />;
-  }
-
   const subjectsIndexComponent =
     typeof useAdminLocationConfig === "function"
       ? <LocationWrapper />
@@ -139,7 +104,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminLocationConfig === "function"
       ? [
           {
-            path: "management/subjects/location",
+            path: "subjects/location",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_LOCATIONS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -150,7 +115,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminSubjectsConfig === "function"
       ? [
           {
-            path: "management/subjects/stakeholder",
+            path: "subjects/stakeholder",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_STAKEHOLDERS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -158,50 +123,6 @@ export function getAdminRoutes(config) {
           },
         ]
       : []),
-    ...(typeof useAdminLocationViewConfig === "function"
-      ? [
-          {
-            path: "management/subject/location/:id",
-            key: `${APP_PREFIX}_ADMIN_LOCATION_VIEW`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <LocationViewWrapper />,
-          },
-        ]
-      : []),
-    ...(typeof useAdminSubjectsViewConfig === "function"
-      ? [
-          {
-            path: "management/subject/stakeholder/:id",
-            key: `${APP_PREFIX}_ADMIN_STAKEHOLDER_VIEW`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <StakeholderViewWrapper />,
-          },
-        ]
-      : []),
-    ...(typeof useAdminLocationViewConfig === "function"
-      ? [
-          {
-            path: "management/subject/location/edit/:id",
-            key: `${APP_PREFIX}_ADMIN_LOCATION_EDIT`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <LocationEditWrapper />,
-          },
-        ]
-      : []),
-    ...(typeof useAdminSubjectsViewConfig === "function"
-      ? [
-          {
-            path: "management/subject/stakeholder/edit/:id",
-            key: `${APP_PREFIX}_ADMIN_STAKEHOLDER_EDIT`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <StakeholderEditWrapper />,
-          },
-        ]
-      : []),
   ];
 
   return routes;

package/src/@daf/pages/Dashboards/SelfAssesment/components/AssociatedInformation/index.jsx

@@ -49,7 +49,7 @@ function AssociatedInformation({
                     <div className="daf-table-wrapper">
                             <DafTable
                                 columns={columns}
-                                data={data[activeTab]}
+                                data={data[activeTab] || []}
                                 className="pr-0"
                                 doEmptyRows
                                 rowKey={"datas"}

package/src/@daf/pages/Dashboards/SelfAssesment/components/OrganisationInformation/columns.js

@@ -77,7 +77,6 @@ export const getColumns = ({
                   let link = `/app/view/kyc/user`;
                   goTo(getRedirectLink(link));
                 },
-                disabled: true,
               },
           ];