datastake-daf 0.6.785 → 0.6.787

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

@@ -0,0 +1,65 @@
+export const getTabs = ({ t }) => {
+	return [
+		{
+			key: "active",
+			label: t("Active"),
+		},
+		{
+			key: "pending",
+			label: t("Pending"),
+		},
+		{
+			key: 'suspended',
+			label: t("Suspended"),
+		}
+	];
+};
+
+export const selectFiltersConfig = {
+	category: {
+		type: "select",
+		label: "Category",
+		placeholder: (t) => t("Category"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+	country: {
+		type: "select",
+		label: "Country",
+		placeholder: (t) => t("Country"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+	sources: {
+		type: "select",
+		label: "Sources",
+		placeholder: (t) => t("Sources"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+};
+
+export const filtersConfig = {
+	name: "",
+	datastakeId: "",
+};
+
+export const defaultUrlParams = { activeTab: "active" };
+
+export const checkboxConfig = {
+	name: "Name",
+	datastakeId: "ID",
+};
+
+export const getNameByLevel = (data, level) => {
+	const entry = Object.values(data || {}).find(item => item.level === level);
+	return entry;
+  }
+
+

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,
@@ -11,8 +11,8 @@ import {
 	defaultUrlParams,
 	checkboxConfig,
 } from "../SubjectsTable/helper.js";
-import { getColumns } from "../SubjectsTable/columns.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
+import { getColumns } from "./column.js";
 const { useToken } = theme;
 
 export default function LocationTable({
@@ -37,6 +37,22 @@ export default function LocationTable({
 	const { token } = useToken();
 	const [combineLocationVisible, setCombineLocationVisible] = useState(false);
 
+	// Wrapper to transform pagination params to strings and ensure tab is at root level
+	const getDataWithStringPagination = async ({ params }) => {
+		// Extract tab from the params (it should already be there from filterParams)
+		const { pagination, tab, ...otherParams } = params;
+		
+		const transformedParams = {
+			...otherParams,
+			pagination: {
+				skip: String(pagination?.skip || 1),
+				take: String(pagination?.take || 20),
+			},
+			tab: tab || "active", // Ensure tab is at root level with default value
+		};
+		return getData({ params: transformedParams });
+	};
+
 	const {
 		filter,
 		activeTab,
@@ -58,7 +74,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData,
+		getData: getDataWithStringPagination,
 		refetchTrigger,
 	});
 
@@ -80,7 +96,7 @@ export default function LocationTable({
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle
+			entity: headerTitle,
 		});
 	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
 
@@ -89,7 +105,7 @@ export default function LocationTable({
 			<AdminTable
 				filters={filter}
 				t={t}
-				headerTitle={headerTitle}
+				headerTitle={"test"}
 				actionButton={[
 					{
 						icon: "Merge",
@@ -110,6 +126,7 @@ export default function LocationTable({
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
+
 			>
 				{selectedLocations.length > 0 && (
 					<div
@@ -168,6 +185,7 @@ export default function LocationTable({
 					if (typeof mergeSubjectsFunction === 'function') {
 						mergeSubjectsFunction(data);
 						setSelectedLocations([])
+						message.success(t("Locations successfully merged."))
 					}
 				}}
 				selectedLocations={selectedLocations}

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("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",

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,
@@ -67,7 +67,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]);
 
@@ -113,25 +113,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 +150,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/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

@@ -60,10 +60,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(

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

@@ -104,7 +104,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminLocationConfig === "function"
       ? [
           {
-            path: "subjects/location",
+            path: "management/subjects/location",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_LOCATIONS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -115,7 +115,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminSubjectsConfig === "function"
       ? [
           {
-            path: "subjects/stakeholder",
+            path: "management/subjects/stakeholder",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_STAKEHOLDERS`,
             exact: true,
             visible: (user) => userIsAdmin(user),

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

@@ -8,7 +8,7 @@ export const useGetQueryParams = ({location}) => {
     }, [location.search]);
 
     const params = useMemo(() => {
-        const { page, pageSize, search, searchParams: rawSearchParams, sortBy, sortDir, ...rest } = queryParams;
+        const { page, pageSize, search, searchParams: rawSearchParams, sortBy, sortDir, status, product, ...rest } = queryParams;
           
         return {
           paginationQuery: { skip: page, take: pageSize },
@@ -18,6 +18,8 @@ export const useGetQueryParams = ({location}) => {
           },
           otherParams: {
             ...rest,
+            ...(product && { "products.typeOfProduct": product }),
+            ...(status && { published: status === "submitted" ? true : false }),
           },
           sortBy,
           sortDir,

package/src/@daf/pages/Events/Activities/columns.js

@@ -72,7 +72,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },  
     {
       dataIndex: 'province',
-      title: t('Province'),
+      title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
       ellipsis: true,
       show: true,
       render: (v, all) => {
@@ -87,7 +87,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
   },    
   {
       dataIndex: 'territory',
-      title: t('Territory'),
+      title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
       ellipsis: true,
       show: true,
       render: (v, all) => {

package/src/@daf/pages/Events/Activities/config.js

@@ -78,7 +78,7 @@ export const getFiltersConfig = ({t}) => {
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		},
-		category: {
+		eventCategory: {
 		  type: 'select',
 		  label: 'Category',
 		  placeholder: () => `${t('Filter by')} ${t('Category').toLowerCase()}`,
@@ -157,7 +157,7 @@ export const getFilterOptions = (options, t) => {
 				label: t("Private"),
 			},
 		],
-		category: _categoryOptions,
+		eventCategory: _categoryOptions,
 		country: countries,
 		subCategory: subCategoriesOptions,
 		// category: category,

package/src/@daf/pages/Events/Incidents/columns.js

@@ -72,7 +72,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },  
     {
       dataIndex: 'province',
-      title: t('Province'),
+      title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
       ellipsis: true,
       show: true,
       render: (v, all) => {
@@ -87,7 +87,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
   },    
   {
       dataIndex: 'territory',
-      title: t('Territory'),
+      title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
       ellipsis: true,
       show: true,
       render: (v, all) => {

package/src/@daf/pages/Events/Incidents/config.js

@@ -77,7 +77,7 @@ export const getFiltersConfig = ({t}) => {
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		},
-		category: {
+		eventCategory: {
 		  type: 'select',
 		  label: 'Category',
 		  placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
@@ -156,7 +156,7 @@ export const getFilterOptions = (options, t) => {
 				label: t("Private"),
 			},
 		],
-		category: _categoryOptions,
+		eventCategory: _categoryOptions,
 		country: countries,
 		subCategory: subCategoriesOptions,
 		// category: category,

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

@@ -42,7 +42,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },    
     {
         dataIndex: 'region',
-        title: t('Region'),
+        title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -57,7 +57,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },   
     {
         dataIndex: 'territory',
-        title: t('Territory'),
+        title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
         ellipsis: true,
         show: true,
         render: (v, all) => {

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

@@ -65,7 +65,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },      
     {
         dataIndex: 'province',
-        title: t('Province'),
+        title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -80,7 +80,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },    
     {
         dataIndex: 'territory',
-        title: t('Territory'),
+        title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
         ellipsis: true,
         show: true,
         render: (v, all) => {