datastake-daf 0.6.842 → 0.6.843

package/src/@daf/core/components/Graphs/TradeRelationship/index.jsx

@@ -21,7 +21,6 @@ function TradeRelationship({
   onFilterChange = () => {},
   renderTooltipItems = () => [],
   getTotal = () => 0,
-  onRenderComplete = () => {},
 }) {
   const reactFlowWrapper = useRef(null);
   const [nodes, setNodes] = useNodesState([]);
@@ -31,31 +30,6 @@ function TradeRelationship({
   // const [initCenter, setInitCenter] = useState(true);
   const [associatedNodes, setAssociatedNodes] = useState(null);
 
-  const isFullyRenderedRef = useRef(false);
-  const [isFullyRendered, setIsFullyRendered] = useState(false);
-
-  useEffect(() => {
-    isFullyRenderedRef.current = false;
-    setIsFullyRendered(false);
-    setActiveNode(null);
-  }, [data]);
-
-  useEffect(() => {
-    if (nodes.length > 0 && edges.length > 0 && !isFullyRenderedRef.current) {
-      const timeoutId = setTimeout(() => {
-        isFullyRenderedRef.current = true;
-        setIsFullyRendered(true);
-        onRenderComplete(true);
-      }, 200);
-      
-      return () => clearTimeout(timeoutId);
-    } 
-    if(nodes.length === 0 || edges.length === 0) {
-      setIsFullyRendered(true);
-      onRenderComplete(true);
-    }
-  }, [nodes.length, edges.length, associatedNodes]);
-  
   useEffect(() => {
     setActiveNode(null);
   }, [data]);
@@ -274,7 +248,7 @@ function TradeRelationship({
     
     // Cleanup to prevent memory leaks if component unmounts quickly
     return () => clearTimeout(timeoutId);
-  }, [data, activeNode]);
+  }, [data]);
 
   useEffect(() => {
     if (activeNode) {

package/src/@daf/core/components/Graphs/components/BaseGraph.jsx

@@ -2,7 +2,7 @@ import { ReactFlow, Controls, ControlButton, useReactFlow } from "@xyflow/react"
 import { UpOutlined, DownOutlined, AimOutlined } from "@ant-design/icons";
 
 import ComponentWithFocus from "../../Dashboard/ComponentWithFocus/index.jsx";
-import { forwardRef } from "react";
+import { forwardRef, useRef } from "react";
 import { PrimaryNode, IconNode, NameNode, ExpandedNode } from "./Nodes/index.jsx";
 import { ToolTipEdge, VerticalPathEdge, DefaultEdge } from "./Edges/index.jsx";
 import Filters from "../../Filters/FloatingFilters/index.js";
@@ -38,6 +38,7 @@ const BaseGraph = forwardRef(function BaseGraph(
 	ref,
 ) {
 	const { setViewport, getViewport, fitView } = useReactFlow();
+	const hasInitialFitRef = useRef(false);
 
 	const nodesToFit = useMemo(() => {
 		let result;
@@ -49,31 +50,34 @@ const BaseGraph = forwardRef(function BaseGraph(
 		return result;
 	}, [nodes.length, mandatoryNodesToFit?.length, mandatoryNodesToFit]);
 
-	// In BaseGraph.jsx, replace the useEffect with:
+	// Only auto-fit on initial render or when node count changes, not on property changes
 	useEffect(() => {
 		if (nodesToFit.length === 0) return;
 
-		// Use setTimeout instead of requestAnimationFrame to ensure nodes are rendered
-		const timer = setTimeout(() => {
-			fitView({
-				padding: 0.4,
-				nodes: [...nodesToFit],
-				// duration: withDuration ? 300 : undefined,
-				maxZoom: 0.9,
-			});
-		}, 100); // Small delay to ensure nodes are rendered
+		// Only auto-fit on initial render or when node count changes
+		if (!hasInitialFitRef.current) {
+			hasInitialFitRef.current = true;
+			
+			const timer = setTimeout(() => {
+				fitView({
+					padding: 0.4,
+					nodes: [...nodesToFit],
+					maxZoom: 0.9,
+				});
+			}, 100);
 
-		return () => clearTimeout(timer);
-	}, [nodesToFit.length, nodesToFit.map(n => `${n.id}-${n.width}-${n.height}`).join(','), withDuration]);
+			return () => clearTimeout(timer);
+		}
+	}, [nodesToFit.length, withDuration]);
 
 	return (
 		<ComponentWithFocus>
-			<div style={{ height: "100%", width: "100%" }} ref={ref}>
-				{filtersConfig ? (
-					<Filters t={t} filtersConfig={filtersConfig} onFilterChange={onFilterChange} />
-				) : null}
+			<div style={{ height: "100%", width: "100%", position: "relative" }} ref={ref}>
+			{filtersConfig ? (
+				<Filters t={t} filtersConfig={filtersConfig} onFilterChange={onFilterChange} />
+			) : null}
 
-				<ReactFlow
+			<ReactFlow
 					nodes={nodes}
 					edges={edges}
 					zoomOnDoubleClick={false}

package/src/@daf/core/components/Select/MultiSelect/style.js

@@ -5,7 +5,7 @@ const MultiSelectStyled = styled(Select)`
   &.ant-select-single {
     .ant-select-selector {
         padding-inline-end: 24px !important;
-        padding: 0 !important;
+        padding: 3px !important;
         max-width: 56px !important;
         width: 56px !important;
     }

package/src/@daf/core/components/ViewForm/components/DataLink/flat.js

@@ -177,9 +177,13 @@ export default function DataLinkFlat({
   }, [entity, values.linking])
 
   const dataLinkFormData = useMemo(() => {
-    const _formData = isSingle ? formData && !Array.isArray(formData)
-      ? [{ ...form?.meta?.prefilledValues, ...formData }] : []
-      : (Array.isArray(formData) ? formData : []).map((f) => ({ ...form?.meta?.prefilledValues, ...f }));
+    const filteredPrefilledValues = Object.entries(form?.meta?.prefilledValues || {})
+    .filter(([_, value]) => !(value && typeof value === 'object' && 'combine' in value))
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+
+  const _formData = isSingle ? formData && !Array.isArray(formData)
+    ? [{ ...filteredPrefilledValues, ...formData }] : []
+    : (Array.isArray(formData) ? formData : []).map((f) => ({ ...filteredPrefilledValues, ...f }));
 
     return (_formData || []).map((f, i) => {
       if (isAjaxModal && typeof f === 'string' && linkingData[f]) {

package/src/@daf/core/components/ViewForm/components/DataLink/index.js

@@ -111,9 +111,13 @@ export default function DataLink({
   })
 
   const data = useMemo(() => {
+    const filteredPrefilledValues = Object.entries(form?.meta?.prefilledValues || {})
+    .filter(([_, value]) => !(value && typeof value === 'object' && 'combine' in value))
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+
     const _formData = isSingle ? formData && !Array.isArray(formData)
-      ? [{ ...form?.meta?.prefilledValues, ...formData }] : []
-      : (Array.isArray(formData) ? formData : []).map((f) => ({ ...form?.meta?.prefilledValues, ...f }));
+      ? [{ ...filteredPrefilledValues, ...formData }] : []
+      : (Array.isArray(formData) ? formData : []).map((f) => ({ ...filteredPrefilledValues, ...f }));
 
     return (_formData || []).map((f, i) => {
       if (isAjaxModal && typeof f === 'string' && linkingData[f]) {

package/src/@daf/core/components/ViewForm/components/input.js

@@ -361,13 +361,13 @@ export const BasicInput = ({
       case 'phoneNumber':
       case 'textarea':
         return item
-          ? (propHasValue(item[inputName]) ? item[inputName] : placeholder(item, inputName, withPlaceholder))
-          : (propHasValue(data[inputName]) ? data[inputName] : placeholder(data, inputName, withPlaceholder));
+          ? (propHasValue(item[inputName]) && item[inputName] !== '' ? item[inputName] : placeholder(item, inputName, withPlaceholder))
+          : (propHasValue(data[inputName]) && data[inputName] !== '' ? data[inputName] : placeholder(data, inputName, withPlaceholder));
       case 'website':
       case 'link':
         const v = item
-          ? (propHasValue(item[inputName]) ? item[inputName] : placeholder(item, inputName, withPlaceholder))
-          : (propHasValue(data[inputName]) ? data[inputName] : placeholder(data, inputName, withPlaceholder))
+          ? (propHasValue(item[inputName]) && item[inputName] !== '' ? item[inputName] : placeholder(item, inputName, withPlaceholder))
+          : (propHasValue(data[inputName]) && data[inputName] !== '' ? data[inputName] : placeholder(data, inputName, withPlaceholder))
 
         if (isModal) {
           return (
@@ -1023,7 +1023,7 @@ const Input = ({
           >
           </BasicInput>
         })}
-        {isRepeatable && Array.isArray(modalData) && !modalData.length ? (
+        {isRepeatable && Array.isArray(modalData) && !modalData.length || modalData === "" ? (
           <span className="text-muted">{t('Not answered')}</span>
         ) : null}
       </React.Fragment>
@@ -1068,7 +1068,7 @@ const Input = ({
           })
         }
         {
-          (!modalData || (Array.isArray(modalData) && !modalData.length)) ? (
+          (!modalData || (Array.isArray(modalData) && !modalData.length) || modalData === "") ? (
             <span className="text-muted">{t('Not answered')}</span>
           ) : (
             (Array.isArray(modalData) ? modalData : [modalData]).map((item, itemId) => (
@@ -1174,7 +1174,7 @@ const Input = ({
         >
         </BasicInput>
       })}
-      {(!formData || (Array.isArray(formData) && !formData.length)) ? (
+      {(!formData || (Array.isArray(formData) && !formData.length) || formData === "") ? (
         <span className="text-muted">{t('Not answered')}</span>
       ) : (
         (Array.isArray(formData) ? formData : [formData])?.map((item, itemId) => (

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

@@ -2,7 +2,6 @@ import { useState, useEffect, useRef } from "react";
 import DashboardService from "../services/DashboardService.js";
 import { isErrorResponse, getErrorMessage } from "../../helpers/errorHandling.js";
 import { message } from "antd";
-
 // config: {
 //     stop: boolean,
 //     defaultData: object,
@@ -10,56 +9,48 @@ import { message } from "antd";
 //     url: string
 //     basePath: string,
 // }
-
 export const useWidgetFetch = ({config, getData = DashboardService.getWidget, onFetch = () => {}}) => {
     const { stop, defaultData, ...rest} = config;
     const [ data, setData ] = useState(defaultData || {});
     const [ loading, setLoading ] = useState(false);
     const [ initFetchDone, setInitFetchDone ] = useState(false);
     const isMounted = useRef(true);
-
-	const fetchData = async () => {
-		if (stop) {
-			return;
-		}
-
-		setLoading(true);
-
-		try {
-			const { data } = await getData(rest);
-			if (!isMounted.current) return;
-			setData(data || defaultData);
-			if (isErrorResponse(data)) {
-				const errorMessage = getErrorMessage(data);
-				message.error(errorMessage);
-				return;
-			}
+	
+    const fetchData = async () => {
+        setLoading(true);
+        try {
+            const { data } = await getData(rest);
+            if (!isMounted.current) return;
+            setData(data || defaultData);
+            if (isErrorResponse(data)) {
+                const errorMessage = getErrorMessage(data);
+                message.error(errorMessage);
+                return;
+            }
             onFetch();
             setInitFetchDone(true);
-		} catch (err) {
-			console.log(err);
-		}
-
-		if (isMounted.current) {
-			setLoading(false);
-		}
-	};
-
+        } catch (err) {
+            console.log(err);
+        }
+        if (isMounted.current) {
+            setLoading(false);
+        }
+    };
     useEffect(() => {
         isMounted.current = true;
         return () => {
             isMounted.current = false;
         };
     }, []);
-
-	useEffect(() => {
-		fetchData();
-	}, [JSON.stringify(config)]);
-
+    useEffect(() => {
+        if(!stop) {
+			fetchData();
+		}
+    }, [JSON.stringify(config), stop]);
     return {
         data,
         loading,
-		setData,
+        setData,
         initFetchDone
     }
-} 
+}

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/IncidentsTime/index.js

@@ -92,6 +92,7 @@ export default function IncidentsTimeline({
     if (selectedRange === "12") return baseMonths.map((m) => m.label);
     return baseWeeks.map((w) => w.label);
   }, [selectedRange, baseMonths, baseWeeks]);
+  console.log({filtersConfig})
 
   const getTooltipContent = useCallback(
     ({ item }) => {

package/src/@daf/pages/Summary/Operator/components/KeyInformation/config.js

@@ -43,7 +43,6 @@ export const getKeyIndicatorConfig = ({ t, data = {}, options = {} }) => [
 		label: t("Legal Form"),
 		render: () => {
             const subCategory = findOptions(data?.subCategory, options?.subCategoriesOptions || options?.subCategory);
-			console.log({subCategory, initialSub: data?.subCategory, options: options?.subCategoriesOptions || options?.subCategory})
 			if(subCategory?.length > 22) {
 				const _subCategory = truncateString(subCategory, 22);
 				return <Tooltip title={subCategory}>

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

@@ -2,6 +2,7 @@ import { leftIcons, leftBackgroundColorLocation, leftBackgroundColorStakeholder,
 import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
 export const getFilterConfig = ({operatorData = {}, options = {}, filters = {}, t = () => {}, APP}) => {
+    console.log({operatorData})
     const productSet = new Set();
     const allTradeMineralOptions = [
         ...(operatorData?.suppliers || []),
@@ -33,17 +34,18 @@ const label = options?.[
         return option && index === self.findIndex((o) => o.value === option.value);
     });
 
-    const value = filters.products ? { value: filters.products } : {};
-    return [
-        {
+    const value = filters?.products ? { value: filters?.products } : {};
+    return {
+        products: {
             label: t("Products"),
             placeholder: t("Select"),
             key: "products",
             type: "select",
-            ...value,
+            // ...value,
+            style: { flex: 1 },
             options: combinedMineralOptions,
         },
-    ];
+    };
 }
 
 export const getLeft = (data = {}, mapChildren = () => {}, supplierLocations = []) => {

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

@@ -1,4 +1,4 @@
-import { useEffect, useState, useMemo } from "react";
+import { useEffect, useState, useMemo, useRef } from "react";
 import { useWidgetFetch } from "../../../../../hooks/useWidgetFetch.js";
 import { leftIcons, leftBackgroundColorLocation, leftBackgroundColorStakeholder, topIcons } from './config.js';
 import { findOptions } from '../../../../../../helpers/StringHelper.js';
@@ -8,6 +8,8 @@ import { getLeft, mapItem as _mapItem } from './helper.js';
 export const useTradeRelationship = ({
     id,
     selectedPartners,
+	isProductsFilterReady,
+	hasProducts,
     options,
     goTo,
     getRedirectLink,
@@ -19,26 +21,38 @@ export const useTradeRelationship = ({
     const [graphData, setGraphData] = useState({});
 	const [loading, setLoading] = useState(false);
 	const [fetchedProducts, setFetchedProducts] = useState(false);
-
-    const config = useMemo(() => ({
-        basepath: "analytics",
-        url: `/widgets/trade-relationship-map`,
-        filters: {
+	const initFetchDoneRef = useRef(false);
+
+	const product = useMemo(() => {
+		return filters?.products
+	}, [filters?.products]);
+
+	console.log({hasProducts, product, isProductsFilterReady, stop: !selectedPartners?.partners?.length 
+		|| selectedPartners?.loading || !isProductsFilterReady  || (isProductsFilterReady && hasProducts && !product)}, 
+		!selectedPartners?.partners?.length, 
+		selectedPartners?.loading,
+		!isProductsFilterReady,
+		(isProductsFilterReady && hasProducts && !product))
+	const config = useMemo(() => ({
+		basepath: "analytics",
+		url: `/widgets/trade-relationship-map`,
+		filters: {
 			datastakeId: id,
-            product: filters?.products,
-            sources: selectedPartners?.partners || [],
-        },
-		stop: !selectedPartners?.partners?.length || selectedPartners?.loading,
-    }), [id, filters?.products, selectedPartners?.partners, selectedPartners?.loading]);
-    
-    const { data } = useWidgetFetch({config: config});
+			...(product && {product: product}),
+			sources: selectedPartners?.partners || [],
+		},
+		stop: !selectedPartners?.partners?.length 
+			  || selectedPartners?.loading || !isProductsFilterReady  || (isProductsFilterReady && hasProducts && !product)
+	}), [id, product, selectedPartners?.partners, selectedPartners?.loading, isProductsFilterReady, hasProducts]);
+	
+    const { data, loading: dataLoading } = useWidgetFetch({config: config});
 
     const mapItem = (data) => {
         return _mapItem(data, options, goTo, getRedirectLink, operatorData, APP);
     }
 
     useEffect(() => {
-		if (id && selectedPartners?.partners?.length > 0 && fetchedProducts) {
+		if (id && selectedPartners?.partners?.length > 0) {
 			const _fetch = async () => {
 				setLoading(true);
 
@@ -156,5 +170,6 @@ export const useTradeRelationship = ({
         setGraphData,
         setLoading,
         data,
+		dataLoading
     }
 }

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);
 		}
 	});