datastake-daf 0.6.104 → 0.6.105

package/dist/components/index.js

@@ -13147,7 +13147,7 @@ PdfView.propTypes = {
   documentId: PropTypes__default["default"].string
 };
 
-const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app) => {
+const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, formValues = {}) => {
   const url = getApiBaseUrl();
   const queryOptionsApps = ["kota", "nashiriki", "straatos"];
   const queryOptionsAppEndpoints = {
@@ -13165,7 +13165,15 @@ const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getA
     const filtersMatch = methodWithFilters.match(/\((.*)\)/s);
     if (filtersMatch && filtersMatch[1]) {
       try {
-        filters = JSON.parse(filtersMatch[1]);
+        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 = {};
@@ -13203,13 +13211,14 @@ const AjaxSelectRenderer = ({
   config,
   getApiBaseUrl = () => {},
   getAppHeader = () => {},
-  app
+  app,
+  formValues = {}
 }) => {
   const [displayValue, setDisplayValue] = React.useState('Loading...');
   React.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);
           setDisplayValue(option || value || 'Unknown');
@@ -13226,7 +13235,7 @@ const AjaxSelectRenderer = ({
     } else {
       setDisplayValue(value || 'No configuration');
     }
-  }, [value, config, getApiBaseUrl]);
+  }, [value, config, getApiBaseUrl, formValues]);
   return /*#__PURE__*/jsxRuntime.jsx("span", {
     children: displayValue
   });
@@ -13531,7 +13540,7 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues) => {
+const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
@@ -13559,7 +13568,8 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
         config: config,
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
-        app: app
+        app: app,
+        formValues: formValues
       });
     case 'percentage':
       return `${value} %`;
@@ -13591,7 +13601,8 @@ const renderValue = ({
   user,
   getApiBaseUrl = () => {},
   getAppHeader = () => {},
-  app
+  app,
+  allData = {}
 }) => {
   if (config?.type === 'groupInputs') {
     if (!config?.inputs) return null;
@@ -13616,6 +13627,9 @@ const renderValue = ({
         return String(inputValue);
       }
     }).filter(val => val !== '');
+    console.log({
+      allData
+    });
     const combinedValue = values.join(' ');
     return combinedValue ? /*#__PURE__*/jsxRuntime.jsx("span", {
       className: "tree-value groupInputs-type",
@@ -13647,7 +13661,7 @@ const renderValue = ({
   if (displayValue === '-') {
     cssClass += ' empty';
   }
-  displayValue = renderFieldData(fieldType, displayValue, user, config, getApiBaseUrl, getAppHeader, app, value);
+  displayValue = renderFieldData(fieldType, displayValue, user, config, getApiBaseUrl, getAppHeader, app, value, allData);
   return /*#__PURE__*/jsxRuntime.jsx("span", {
     className: cssClass,
     children: displayValue
@@ -14517,15 +14531,9 @@ const TreeNode = _ref => {
     user,
     getApiBaseUrl,
     getAppHeader,
-    app
+    app,
+    allData
   });
-  if (nodeKey === 'keyIncidents') {
-    console.log({
-      config,
-      value,
-      hasChildren
-    });
-  }
   const renderChildren = () => {
     if (!hasChildren) return null;
     let children = [];

package/package.json

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

package/src/@daf/core/components/PdfForm/index.js

@@ -28,10 +28,7 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
   const label = resolveDynamicLabel(config?.label, allData || value, nodeKey);
   const nodeType = config?.type || 'field';
 
-  let renderNodeValue = () => renderValue({ value, hasChildren: originalHasChildren, config, user, getApiBaseUrl, getAppHeader, app });
-  if(nodeKey === 'keyIncidents') {
-    console.log({config, value, hasChildren})
-  }
+  let renderNodeValue = () => renderValue({ value, hasChildren: originalHasChildren, config, user, getApiBaseUrl, getAppHeader, app, allData });
 
   const renderChildren = () => {
     if (!hasChildren) return null;