datastake-daf 0.6.104 → 0.6.105

package/src/@daf/core/components/PdfForm/utils/ajaxSelectFieldData.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import { getToken } from '../../../../../helpers/Token';
 import { findOptions } from '../../../../../helpers/StringHelper';
 
-export const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app) => {
+export const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, formValues = {}) => {
     const url = getApiBaseUrl();
 
     const queryOptionsApps = ["kota", "nashiriki", "straatos"];
@@ -30,23 +30,35 @@ export const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {
     let filters = {};
         
     if (methodWithFilters.includes('(') && methodWithFilters.includes(')')) {
-            method = methodWithFilters.split('(')[0];
-            
-            const filtersMatch = methodWithFilters.match(/\((.*)\)/s);
-            if (filtersMatch && filtersMatch[1]) {
-                try {
-                    filters = JSON.parse(filtersMatch[1]);
-                } catch (error) {
-                    console.error('Error parsing filters:', error);
-                    filters = {};
-                }
+        method = methodWithFilters.split('(')[0];
+        
+        const filtersMatch = methodWithFilters.match(/\((.*)\)/s);
+        if (filtersMatch && filtersMatch[1]) {
+            try {
+                const parsedFilters = JSON.parse(filtersMatch[1]);
+                
+                filters = {};
+                Object.keys(parsedFilters).forEach(filterKey => {
+                    const fieldName = parsedFilters[filterKey];
+                    const formValue = formValues[fieldName];
+                    
+                    if (formValue !== undefined && 
+                        formValue !== null && 
+                        formValue !== '' && 
+                        formValue !== fieldName) {
+                        filters[filterKey] = formValue;
+                    } 
+                });                
+            } catch (error) {
+                console.error('Error parsing filters:', error);
+                filters = {};
             }
         }
-
+    }
     try {
         const response = await axios.post(
             endpoint,
-              {
+            {
                 entity,
                 method: method,
                 mapper: JSON.parse(mapper),
@@ -73,13 +85,13 @@ export const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {
     }
 }
 
-export const AjaxSelectRenderer = ({ value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app }) => {
+export const AjaxSelectRenderer = ({ value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, formValues = {} }) => {
     const [displayValue, setDisplayValue] = useState('Loading...');
   
     useEffect(() => {
       const fetchData = async () => {
         try {
-          const data = await ajaxSelectFieldData(value, config, getApiBaseUrl, getAppHeader, app);
+          const data = await ajaxSelectFieldData(value, config, getApiBaseUrl, getAppHeader, app, formValues);
           
           if (Array.isArray(data) && data.length > 0) {
             const option = findOptions(value, data);
@@ -98,7 +110,7 @@ export const AjaxSelectRenderer = ({ value, config, getApiBaseUrl = () => {}, ge
       } else {
         setDisplayValue(value || 'No configuration');
       }
-    }, [value, config, getApiBaseUrl]);
+    }, [value, config, getApiBaseUrl, formValues]);
   
     return <span>{displayValue}</span>;
   };

package/src/@daf/core/components/PdfForm/utils/fieldData.js

@@ -72,7 +72,7 @@ export const processConditionalTableKeys = (tableKeys, item) => {
   return processedKeys;
 };
 
-export const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues) => {
+export const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
     switch(type) {
       case 'year':
         return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
@@ -92,7 +92,14 @@ export const renderFieldData = (type, value, user, config, getApiBaseUrl = () =>
         return option.join(', ');
       }
       case 'ajaxSelect':
-        return <AjaxSelectRenderer value={value} config={config} getApiBaseUrl={getApiBaseUrl} getAppHeader={getAppHeader} app={app} />;
+        return <AjaxSelectRenderer 
+          value={value} 
+          config={config} 
+          getApiBaseUrl={getApiBaseUrl} 
+          getAppHeader={getAppHeader} 
+          app={app} 
+          formValues={formValues} 
+        />;
       case 'percentage': 
         return `${value} %`;
       case 'geolocation': {

package/src/@daf/core/components/PdfForm/utils/fieldRenderer.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { renderFieldData } from './fieldData';
 
-export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl = () => {}, getAppHeader = () => {}, app }) => {
+export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allData = {} }) => {
   if (config?.type === 'groupInputs') {
     if (!config?.inputs) return null;
     
@@ -28,7 +28,7 @@ export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl =
         return String(inputValue);
       }
     }).filter(val => val !== '');
-    
+    console.log({allData})
     const combinedValue = values.join(' ');
     return combinedValue ? <span className="tree-value groupInputs-type">{combinedValue}</span> : <span className="tree-value empty">-</span>;
   }
@@ -59,7 +59,7 @@ export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl =
     cssClass += ' empty';
   }
 
-  displayValue = renderFieldData(fieldType, displayValue, user, config, getApiBaseUrl, getAppHeader, app, value);
+  displayValue = renderFieldData(fieldType, displayValue, user, config, getApiBaseUrl, getAppHeader, app, value, allData);
 
   return <span className={cssClass}>{displayValue}</span>;
 };