datastake-daf 0.6.841 → 0.6.843

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/index.js

@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useEffect } from 'react'
+import React, { useState, useMemo, useEffect, useRef } from 'react'
 import { getFilterConfig } from './helper.js';
 import { useTradeRelationship } from './hook.js';
 import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx';
@@ -16,19 +16,33 @@ const TradeRelationships = ({
     options = {},
     getRedirectLink = () => {},
 	APP,
+	user = {}
 }) => {
     const [filters, setFilters] = useState({});
 	const [isFullyRendered, setIsFullyRendered] = useState(true);
+	const [isProductsFilterReady, setIsProductsFilterReady] = useState(false);
+	const [hasProducts, setHasProducts] = useState(true);
+	const [delayedLoading, setDelayedLoading] = useState(false);
+	const [delayedDataLoading, setDelayedDataLoading] = useState(false);
 
     const onFilterChange = (filters) => {
-		setFilters((p) => ({ ...p, ...filters }));
+		setFilters(filters);
 	};
 
     const filterConfig = useMemo(() => {
-        return getFilterConfig({operatorData, options, filters, t, APP});
+        const filterConfig = Object.keys(operatorData).length > 0 ? getFilterConfig({operatorData, options, filters, t, APP}) : {};
+		return filterConfig;
 	}, [filters.products, t, options?.mineralOptions, operatorData, options?.minerals, APP]);
 
-    const { graphData, loading, fetchedProducts, setFetchedProducts } = useTradeRelationship({
+	useEffect(() => {
+		if (filterConfig?.products?.options?.length >= 0 && !isProductsFilterReady) {
+			console.log('setting has products', filterConfig?.products?.options?.length)
+			setHasProducts(filterConfig?.products?.options?.length > 0);
+			setIsProductsFilterReady(true);
+		}
+	}, [filterConfig, isProductsFilterReady]);
+
+    const { graphData, loading, fetchedProducts, setFetchedProducts, dataLoading } = useTradeRelationship({
         id,
         selectedPartners,
         options,
@@ -36,31 +50,68 @@ const TradeRelationships = ({
         getRedirectLink,
         filters,
 		operatorData,
-		APP
+		APP,
+		isProductsFilterReady,
+		hasProducts,
     });
 
-	console.log({graphData});
+	const defaultProduct = useMemo(() => {
+		if (filterConfig?.products?.options?.length) {
+			return filterConfig?.products?.options?.[0]?.value || null;
+		}
+	}, [filterConfig]);
 
-    useEffect(() => {
-		const defaultProduct = filterConfig?.[0]?.options?.[0]?.value;
 
-		if (!filters.products && defaultProduct) {
-			setFilters((prev) => {
-				const data = { ...prev, products: defaultProduct };
-				return data;
-			});
+	useEffect(() => {
+		if (defaultProduct) {
+			setFilters({ products: defaultProduct });
 		}
+	}, [defaultProduct]);
+
+
+	const _filtersConfig = useMemo(() => ({
+		filtersConfig: {
+			...filterConfig,
+		},
+		options: Object.fromEntries(
+			Object.keys(filterConfig).map(key => [key, filterConfig[key].options])
+		),
+		language: user?.language,
+		selectedFilters: filters,
+		onApply: onFilterChange,
+		t: t,
+	}), [filterConfig, user?.language, filters, t]);
 
-		if (!fetchedProducts) {
-			setFetchedProducts(true);
+	useEffect(() => {
+		if (loading) {
+			setDelayedLoading(true);
+		} else {
+			const timer = setTimeout(() => {
+				setDelayedLoading(false);
+			}, 500);
+
+			return () => clearTimeout(timer);
 		}
-	}, [filterConfig]);
+	}, [loading]);
+
+	useEffect(() => {
+		if (dataLoading) {
+			setDelayedDataLoading(true);
+		} else {
+			const timer = setTimeout(() => {
+				setDelayedDataLoading(false);
+			}, 500);
+
+			return () => clearTimeout(timer);
+		}
+	}, [dataLoading]);
 
     return (
         <Widget
             title={t("Trade Relationships")}
             className="flex flex-1 with-border-header no-p-body"
-            loading={loading || isFullyRendered}
+            loading={delayedLoading || delayedDataLoading}
+			filtersConfig={_filtersConfig}
         >
             <div className="flex flex-1 flex-column justify-content-center">
 				<div style={{ height: 600 }} className="flex flex-column">
@@ -84,12 +135,10 @@ const TradeRelationships = ({
 						maxZoom={1.2}
 						minZoom={0.4}
 						tooltipTitle="Trade"
-						filtersConfig={filterConfig}
-						onFilterChange={onFilterChange}
 						onRenderComplete={(data) => {
-							console.log("onRenderComplete");
 							setIsFullyRendered(!data);
 						}}
+						filters={filters}
 					/>
 				</div>
 			</div>

package/src/@daf/pages/Summary/Operator/index.jsx

@@ -160,6 +160,7 @@ const OperatorSummary = ({
                     getRedirectLink={getRedirectLink}
                     operatorData={singleItemData}
                     APP={APP}
+                    user={user}
                 />
             </section>
             <section>

package/src/@daf/pages/View/index.jsx

@@ -260,7 +260,7 @@ const View = ({
                             <Multiselect
                                 options={[...sourceOptions]}
                                 isAvatarGroup
-                                selectionType="checkbox"
+                                selectionType="radio"
                                 key={partners?.length}
                                 canUnselectLast={false}
                                 isSingle

package/src/helpers/Forms.js

@@ -6,6 +6,7 @@ import dayjs from "dayjs";
 import customParseFormat from "dayjs/plugin/customParseFormat";
 import utc from "dayjs/plugin/utc";
 import localizedFormat from "dayjs/plugin/localizedFormat";
+import { findOptions } from "./StringHelper";
 import "dayjs/locale/fr"; // import desired locales
 import "dayjs/locale/es";
 import "dayjs/locale/en";
@@ -897,7 +898,7 @@ export const transformPayload = (payload) => {
  * @param {object} obj - Object to traverse
  * @returns {any} - Resolved value or undefined
  */
-export const resolveValuePath = (path, obj) => {
+export const resolveValuePath = (path, obj, form) => {
 	if (!path || !obj) return undefined;
 	
 	// Split by / and traverse the object
@@ -918,7 +919,8 @@ export const resolveValuePath = (path, obj) => {
 		}
 	}
 	
-	return current;
+	const value = Object.keys(form || {})?.length > 0 ? findOptions(current, form?.options || []) : current;
+	return value;
 };
 
 /**
@@ -989,7 +991,7 @@ export const getCombinedPrefilledValues = (form) => {
  * @param {object} parentValues - Parent form values
  * @returns {string|null} - Resolved string with placeholders replaced by actual values, or null if not ready
  */
-export const resolveCombinedPrefilledValue = (template, values = {}, parentValues = {}) => {
+export const resolveCombinedPrefilledValue = (template, values = {}, parentValues = {}, form) => {
 	if (!template || typeof template !== 'string') return '';
 	
 	// Regular expression to match placeholders like {path} or {path^subpath}
@@ -1005,7 +1007,7 @@ export const resolveCombinedPrefilledValue = (template, values = {}, parentValue
 	if (nonParentPaths.length > 0) {
 		// Check if at least one non-parent value has actual data
 		hasNonParentValue = nonParentPaths.some(path => {
-			const value = resolveValuePath(path, values);
+			const value = resolveValuePath(path, values, form?.inputs?.[path]);
 			return value !== undefined && value !== null && value !== '';
 		});
 		
@@ -1027,7 +1029,7 @@ export const resolveCombinedPrefilledValue = (template, values = {}, parentValue
 			return formatValue(resolved);
 		} else {
 			// Regular path in current values
-			const resolved = resolveValuePath(path, values);
+			const resolved = resolveValuePath(path, values, form?.inputs?.[path]);
 			return formatValue(resolved);
 		}
 	});