datastake-daf 0.6.816 → 0.6.817

package/dist/services/index.js

@@ -1458,6 +1458,11 @@ class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
   }, language = "en", scope) {
+    console.log({
+      namespace,
+      language,
+      scope
+    });
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,
@@ -1727,6 +1732,201 @@ class PartnerService extends BaseService {
 }
 var PartnerService$1 = createLazyService(PartnerService);
 
+class EventsService extends BaseService {
+  getForm({
+    scope
+  }, language = "en") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/event`,
+      params: {
+        scope,
+        language
+      }
+    });
+  }
+  getWithModule({
+    query,
+    signal,
+    module
+  }) {
+    return this.apiGet({
+      isApp: true,
+      url: `/${module}/event`,
+      params: query,
+      signal
+    });
+  }
+  getOne({
+    id,
+    module,
+    signal
+  }) {
+    return this.apiGet({
+      url: `/${module}/event/${id}`,
+      isApp: true,
+      signal
+    });
+  }
+  get(query, signal) {
+    return this.apiGet({
+      isApp: true,
+      url: "/event",
+      params: query,
+      signal
+    });
+  }
+  getData(id, sourceId, source, version) {
+    return this.apiGet({
+      isApp: true,
+      url: `/event/${id}`,
+      params: {
+        authorId: sourceId,
+        source,
+        version
+      }
+    });
+  }
+  getLinking(query) {
+    return this.apiGet({
+      isApp: true,
+      url: "/event/linking",
+      params: query
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      return this.apiPut({
+        isApp: true,
+        url: `/event/${payload.id}`,
+        data: filterCreateData(payload)
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPut({
+        isApp: true,
+        url: "/event",
+        data: filterCreateData(payload)
+      });
+    }
+    return this.apiPost({
+      isApp: true,
+      url: "/event",
+      data: filterCreateData(payload)
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/event/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      isApp: true,
+      url: `/event/${id}/remove`,
+      data: data
+    });
+  }
+  submitForm(id) {
+    const app = window.globalServicesConfig.application;
+    return this.apiPost({
+      isApp: true,
+      url: `/${app}/versioning/submit/Event/${id}`
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id: "categoryOptions,eventsType,testimonialsType,eventCategory,countries,eventCategoryOptions"
+      }
+    });
+  }
+}
+var EventsService$1 = createLazyService(EventsService);
+
+class WorkersService extends BaseService {
+  get(params) {
+    return this.apiGet({
+      isApp: true,
+      url: "/stakeholder",
+      params
+    });
+  }
+  getForm(scope = "modalNashirikiWorker", language = "en") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/stakeholder`,
+      params: {
+        scope,
+        language
+      }
+    });
+  }
+  getData(id, sourceId, version, source) {
+    return this.apiGet({
+      isApp: true,
+      url: `/stakeholder/${id}`,
+      params: {
+        authorId: sourceId,
+        version,
+        source
+      }
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      // const { id, ...data } = payload;
+      return this.apiPut({
+        isApp: true,
+        url: `/stakeholder/${payload.id}`,
+        data: filterCreateData(payload)
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPost({
+        isApp: true,
+        url: "/stakeholder",
+        data: filterCreateData(payload)
+      });
+    }
+    return this.apiPost({
+      isApp: true,
+      url: "/stakeholder",
+      data: filterCreateData(payload)
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/stakeholder/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      isApp: true,
+      url: `/stakeholder/${id}/remove`,
+      data: data
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id: "activityAtSiteOptions,category,countries,optionPositionSupplyChain,subCategory"
+      }
+    });
+  }
+}
+var WorkersService$1 = createLazyService(WorkersService);
+
 exports.AdminService = AdminService$1;
 exports.AuthenticationService = AuthenticationService$1;
 exports.BaseHTTPService = BaseHTTPService;
@@ -1736,6 +1936,7 @@ exports.DashboardService = DashboardService$1;
 exports.DataStoreService = DataStoreService$1;
 exports.ErrorHandler = ErrorHandler;
 exports.ErrorService = ErrorService;
+exports.EventsService = EventsService$1;
 exports.LinkedSubjectsService = LinkedSubjects;
 exports.NotificationService = NotificationService$1;
 exports.OperatorService = OperatorService$1;
@@ -1743,6 +1944,7 @@ exports.PartnerService = PartnerService$1;
 exports.QueryService = QueryService$1;
 exports.SourceService = SourceService$1;
 exports.UserService = UserService$1;
+exports.WorkersService = WorkersService$1;
 exports.configureServices = configureServices;
 exports.createLazyService = createLazyService;
 exports.getServicesConfig = getServicesConfig;

package/dist/utils/index.js

@@ -14105,6 +14105,32 @@ const buildQueryString = params => {
   return query ? `?${query}` : '';
 };
 
+/**
+ * Check if a successful response contains embedded error data
+ */
+const isErrorResponse = data => {
+  if (!data) return false;
+  return (
+    // Check for Exception names
+    data.name && data.name.includes('Exception') ||
+    // Check for nested response with error status
+    data.response?.statusCode && data.response.statusCode >= 400 ||
+    // Check for top-level error status
+    data.statusCode && data.statusCode >= 400 ||
+    // Check for explicit error flag
+    data.error === true ||
+    // Check for nested error property
+    data.response?.error && data.response.error !== null
+  );
+};
+
+/**
+ * Extract error message from various error response formats
+ */
+const getErrorMessage = data => {
+  return data?.message || data?.response?.message || data?.response?.error || 'An error occurred';
+};
+
 /**
  * Generic error handler factory for axios requests
  * Highly configurable to adapt to different project needs
@@ -15091,6 +15117,7 @@ exports.formatToKebabCase = formatToKebabCase$1;
 exports.getAdminLevelName = getAdminLevelName;
 exports.getDefaultActiveFilters = getDefaultActiveFilters;
 exports.getDivergenceOrEqual = getDivergenceOrEqual;
+exports.getErrorMessage = getErrorMessage;
 exports.getImageUploadViewValue = getImageUploadViewValue;
 exports.getInterface = getInterface;
 exports.getNkey = getNkey;
@@ -15114,6 +15141,7 @@ exports.hasKeyInObject = hasKeyInObject;
 exports.hasNotChanged = hasNotChanged;
 exports.isArrayOfObjects = isArrayOfObjects;
 exports.isEmptyOrSpaces = isEmptyOrSpaces;
+exports.isErrorResponse = isErrorResponse;
 exports.isModuleApproved = isModuleApproved;
 exports.isProxy = isProxy;
 exports.isSuperAdmin = isSuperAdmin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.816",
+	"version": "0.6.817",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Charts/RadarChart/index.jsx

@@ -59,18 +59,9 @@ const RadarChart = ({
 				  }
 				: { showCrosshairs: false, showMarkers: true, ...tooltipConfig },
 			color: color || token.colorPrimary7,
-			
-			paddingX: 60,
-			paddingY: 60,
 			xAxis: {
 				label: {
 					formatter: formattedXAxis,
-					offset: 15,
-					style: {
-						fontSize: 12,
-						fill: '#666',
-						textAlign: 'center',
-					},
 				},
 				line: null,
 				tickLine: null,
@@ -151,9 +142,9 @@ const RadarChart = ({
 	}, []);
 
 	return (
-		<div className="flex flex-1 flex-column justify-content-center" style={{ overflow: 'visible' }}>
-			<div className="flex justify-content-center" style={{ paddingX: '30px', overflow: 'visible', width: '100%' }}>
-				<Container ref={containerRef} height={height} isPdf={isPdf} style={{ paddingX: '30px' }}></Container>
+		<div className="flex flex-1 flex-column justify-content-center">
+			<div className="flex justify-content-center">
+				<Container ref={containerRef} height={height} isPdf={isPdf}></Container>
 			</div>
 			{legendEnabled && legendPosition === 'bottom' && (
 				<CustomLegend

package/src/@daf/core/components/Charts/style.js

@@ -2,8 +2,7 @@ import styled from "styled-components";
 
 const Container = styled.div`
 	height: ${props => props.height || '300px'};
-	width: ${props => props.isPdf ? (props.width ? props.width : '1000px') : 'calc(100% - 48px)'};
-	overflow: ${props => props.style?.overflow || 'visible'};
+	width: ${props => props.isPdf ? (props.width ? props.width : '1000px') : 'calc(100% - 48px)'}; 
 `;
 
 export default Container;

package/src/@daf/core/components/Dashboard/Map/ChainIcon/index.js

@@ -1,4 +1,5 @@
 import { useMemo, useEffect, useRef, useState } from "react";
+import { createPortal } from "react-dom";
 import {
 	isMineSite,
 	getStakeholderPosition,
@@ -10,7 +11,6 @@ import {
 import MineSiteMarker from "./Markers/SVG/MinesiteMarker.js";
 import VillageMarker from "./Markers/SVG/VillageMarker.js";
 import StakeholderIcon from "./Markers/StakeholderMarker.js";
-import { createRoot } from "react-dom/client";
 import * as L from "leaflet";
 import { Popover } from "antd";
 import { renderTooltipJsx } from "../../../../../utils/tooltip.js";
@@ -32,8 +32,8 @@ export default function LocationIcon({
 	activeMarker,
 	setActiveMarker,
 }) {
-	const rootsMapRef = useRef(new Map());
-	const markersRef = useRef([])
+	const markersRef = useRef([]);
+	const [portalContainers, setPortalContainers] = useState([]);
 	const isSelected = selectedMarkersId.includes(data.datastakeId);
 	const Marker = useMemo(() => {
 		if (isMineSite(data.type)) {
@@ -114,25 +114,31 @@ export default function LocationIcon({
 	}, [JSON.stringify(allData), JSON.stringify(data.links), JSON.stringify(data.stakeholders), zoom]);
 
 	const stakeholdersOfLocation = useMemo(() => {
-		return data?.stakeholders || [];
-	}, [data.stakeholders, zoom]);
+		return (data?.stakeholders || []).filter(stakeholder => {
+			if (!stakeholder.links || stakeholder.links.length === 0) {
+				return true;
+			}
+			
+			const locationsWithThisStakeholder = allData
+				.filter(loc => 
+					loc.stakeholders?.some(s => s.datastakeId === stakeholder.datastakeId)
+				)
+				.map(loc => loc.datastakeId);
+			
+			const primaryLocation = locationsWithThisStakeholder.sort()[0];
+			return data.datastakeId === primaryLocation;
+		});
+	}, [data.stakeholders, data.datastakeId, allData, zoom]);
 
 	useEffect(() => {
-		const currentRoots = rootsMapRef.current;
-		const currentMarkers = markersRef.current;
-
-		currentMarkers.forEach(marker => {
-			if (mapRef.hasLayer(marker)) {
+		markersRef.current.forEach(marker => {
+			if (mapRef && mapRef.hasLayer(marker)) {
 				mapRef.removeLayer(marker);
 			}
 		});
-		currentRoots.forEach(root => {
-			root.unmount();
-		});
-		currentRoots.clear();
 		markersRef.current = [];
+		setPortalContainers([]);
 
-		// Only create stakeholder markers if this location or any of its stakeholders are selected
 		const shouldShowStakeholders = isSelected || stakeholdersOfLocation.some(stk => 
 			selectedMarkersId.includes(stk.datastakeId)
 		);
@@ -141,9 +147,11 @@ export default function LocationIcon({
 			return;
 		}
 
-		// Create new markers only when selected
+		// Create markers and store their container references
+		const containers = [];
+		
 		stakeholdersOfLocation.forEach((stakeholder, index) => {
-			const markerId = `${stakeholder.datastakeId}`;
+			const markerId = `${data.datastakeId}-${stakeholder.datastakeId}`;
 			const { x, y, radius, center } = getStakeholderPosition({
 				zoom,
 				totalMarkers: stakeholdersOfLocation.length,
@@ -162,46 +170,30 @@ export default function LocationIcon({
 			const isForceOpen = activeMarker?.datastakeId === data.datastakeId;
 			const iconSize = isSmallMarker(zoom) || isExtraSmallMarker(zoom) ? [11, 11] : [25, 25];
 			
+			// Create container div
+			const containerDiv = document.createElement('div');
+			containerDiv.id = markerId;
+			
 			const marker = L.marker(stakeholderLatLng, {
 				icon: L.divIcon({
-					html: `<div id="${markerId}"></div>`,
+					html: containerDiv.outerHTML,
 					className: "marker-chain",
 					iconSize: iconSize,
 				}),
 			}).addTo(mapRef);
 
 			markersRef.current.push(marker);
-
-			setTimeout(() => {
-				const div = document.getElementById(markerId);
-				if (div && !rootsMapRef.current.has(markerId)) {
-					const root = createRoot(div);
-					rootsMapRef.current.set(markerId, root);
-					
-					root.render(
-						<StakeholderIcon
-							data={stakeholder}
-							zoom={zoom}
-							allData={allData}
-							link={link}
-							parentId={data.datastakeId}
-							renderTooltip={renderTooltip}
-							onClickLink={onClickLink}
-							selectedMarkersId={selectedMarkersId}
-							handleSelectMarker={handleSelectMarker}
-							mapRef={mapRef}
-							radius={radius}
-							index={index}
-							x={x}
-							y={y}
-							openPopupIdRef={openPopupIdRef}
-							polylinesRef={polylinesRef}
-							isForceOpen={isForceOpen}
-							activeMarker={activeMarker}
-						/>,
-					);
-				}
-			}, 0);
+			
+			// Store container info for portal rendering
+			containers.push({
+				markerId,
+				stakeholder,
+				x,
+				y,
+				radius,
+				index,
+				isForceOpen,
+			});
 
 			setMapMarkers((prev) => {
 				const array = [
@@ -236,21 +228,23 @@ export default function LocationIcon({
 				isForceOpen,
 				listOfPolylines: polylinesRef.current,
 				stakeholderType: stakeholder.type,
-				animated: true,                     
+				animated: true,
 			});
 		});
 
+		// Update portal containers after markers are created
+		setTimeout(() => {
+			setPortalContainers(containers);
+		}, 0);
+
 		return () => {
 			markersRef.current.forEach(marker => {
-				if (mapRef.hasLayer(marker)) {
+				if (mapRef && mapRef.hasLayer(marker)) {
 					mapRef.removeLayer(marker);
 				}
 			});
-			rootsMapRef.current.forEach(root => {
-				root.unmount();
-			});
-			rootsMapRef.current.clear();
 			markersRef.current = [];
+			setPortalContainers([]);
 		};
 	}, [stakeholdersOfLocation, selectedMarkersId, activeMarker, zoom]);
 
@@ -344,56 +338,81 @@ useEffect(() => {
 }, [linkedNodesData, selectedMarkersId, zoom, stakeholdersOfLocation, isSelected]);
 
 	return (
-		<Popover
-			content={renderTooltipJsx({
-				title: data.name,
-				subTitle: data.subTitle,
-				total: data.sources,
-				className: "pt-0 pb-0",
-				items: renderTooltip(data),
-				link,
-				onClickLink: () => onClickLink(data),
-				isNewTab: true,
-			})}
-			// open={
-			// 	(!openPopupIdRef.current || openPopupIdRef.current === data.datastakeId) &&
-			// 	isHovering
-			// }
-			getPopupContainer={(triggerNode) => {
-				const mapElement = document.getElementById("map");
-				return mapElement || triggerNode.parentElement || document.body;
-			}}
-		>
-			<div style={{ position: "relative", display: "inline-block" }}>
-				{(isSelected || selectedMarkersId.length === 0) && (
-					<div
-						style={{
-							position: "absolute",
-							bottom: "0",
-							left: "50%",
-							transform: "translateX(-50%)",
-							width: "12px",
-							height: "6px",
-							background: "rgba(0,0,0,0.15)",
-							borderRadius: "50%",
-							filter: "blur(3px)",
+		<>
+			<Popover
+				content={renderTooltipJsx({
+					title: data.name,
+					subTitle: data.subTitle,
+					total: data.sources,
+					className: "pt-0 pb-0",
+					items: renderTooltip(data),
+					link,
+					onClickLink: () => onClickLink(data),
+					isNewTab: true,
+				})}
+				getPopupContainer={(triggerNode) => {
+					const mapElement = document.getElementById("map");
+					return mapElement || triggerNode.parentElement || document.body;
+				}}
+			>
+				<div style={{ position: "relative", display: "inline-block" }}>
+					{(isSelected || selectedMarkersId.length === 0) && (
+						<div
+							style={{
+								position: "absolute",
+								bottom: "0",
+								left: "50%",
+								transform: "translateX(-50%)",
+								width: "12px",
+								height: "6px",
+								background: "rgba(0,0,0,0.15)",
+								borderRadius: "50%",
+								filter: "blur(3px)",
+							}}
+						/>
+					)}
+					<Marker
+						isSelected={isSelected}
+						onClick={() => {
+							handleSelectMarker(data);
+							setActiveMarker(isSelected ? null : data);
 						}}
+						zoom={zoom}
+						selectedMarkersId={selectedMarkersId}
 					/>
-				)}
-				<Marker
-					isSelected={isSelected}
-					onClick={() => {
-						handleSelectMarker(data);
-						setActiveMarker(isSelected ? null : data);
-					}}
-					zoom={zoom}
-					onMouseEnter={() => setIsHovering(true)}
-					onMouseLeave={() => {
-						setIsHovering(false);
-					}}
-					selectedMarkersId={selectedMarkersId}
-				/>
-			</div>
-		</Popover>
+				</div>
+			</Popover>
+			
+			{/* Render stakeholder icons via portals */}
+			{portalContainers.map(({markerId, stakeholder, x, y, radius, index, isForceOpen}) => {
+				const container = document.getElementById(markerId);
+				if (!container) return null;
+				
+				return createPortal(
+					<StakeholderIcon
+						key={markerId}
+						data={stakeholder}
+						zoom={zoom}
+						allData={allData}
+						link={link}
+						parentId={data.datastakeId}
+						renderTooltip={renderTooltip}
+						onClickLink={onClickLink}
+						selectedMarkersId={selectedMarkersId}
+						handleSelectMarker={handleSelectMarker}
+						mapRef={mapRef}
+						radius={radius}
+						index={index}
+						x={x}
+						y={y}
+						openPopupIdRef={openPopupIdRef}
+						polylinesRef={polylinesRef}
+						isForceOpen={isForceOpen}
+						activeMarker={activeMarker}
+					/>,
+					container
+				);
+			})}
+		</>
 	);
 }

package/src/@daf/core/components/Dashboard/Widget/VegetationWidget/index.jsx

@@ -16,12 +16,16 @@ export default function VegetationWidget({
 }) {
 	let vegetationConfig = getVegetationConfig();
 	
+	// Get all VEGETATION_KEYS values before filtering (needed for mapping check)
 	const allVegetationKeys = vegetationConfig.map(item => item.key);
 	
+	// Filter to show only specific keys if filterKeys is provided
 	if (filterKeys && Array.isArray(filterKeys)) {
 		vegetationConfig = vegetationConfig.filter(item => filterKeys.includes(item.key));
 	}
 
+	// Map growthObservations to VEGETATION_KEYS
+	// Handle both formats: growthObservations keys (e.g., "yellowing_leaves") and VEGETATION_KEYS (e.g., "yellowing")
 	const mappedGrowthObservations = Array.isArray(growthObservations)
 		? growthObservations
 			.map(obs => {

package/src/@daf/core/components/Table/index.jsx

@@ -36,7 +36,12 @@ export default function DAFTable({
   doEmptyRows,
   ...rest
 }) {
-  const [source, setSource] = useState([]);
+  const source = useMemo(() => {
+    if (data && Array.isArray(data)) {
+      return data;
+    }
+    return [];
+  }, [data]);
   const projectData = (projects || []).find(p => p.id === selectedProject);
   const [filtersInit, setFiltersInit] = useState(!loading);
 
@@ -85,11 +90,11 @@ export default function DAFTable({
     } : filtersConfig;
   }, [sourcesKey, sources, filtersConfig, t]);
 
-  useEffect(() => {
-    if (data && Array.isArray(data)) {
-      setSource(data);
-    }
-  }, [data, data.length]);
+  // useEffect(() => {
+  //   if (data && Array.isArray(data)) {
+  //     setSource(data);
+  //   }
+  // }, [data, data.length]);
 
   const paginationPageSize = pagination?.pageSize;
   const dataSource = useMemo(() => {