datastake-daf 0.6.110 → 0.6.112

package/dist/components/index.js

@@ -13548,6 +13548,13 @@ function Geolocation$2({
 
 const evaluateShowIfCondition = (condition, item) => {
   if (!condition || !item) return false;
+  if (condition.includes(' notEmpty ')) {
+    const parts = condition.split(' notEmpty ');
+    if (parts.length === 2) {
+      const [field, expectedValue] = parts.map(p => p.trim());
+      return item[field] !== '' || item[field] !== null || item[field] !== undefined;
+    }
+  }
 
   // Handle boolean AND operations
   if (condition.includes(' && ')) {
@@ -13711,7 +13718,7 @@ const renderValue = ({
     displayValue = '-';
   } else if (typeof value === 'object' && value !== null) {
     if (Array.isArray(value)) {
-      displayValue = value.length > 0 ? value.join(', ') : '-'; // Changed from '' to '-'
+      displayValue = value.length > 0 ? value.join(', ') : '-';
     } else if (value.name || value.fullName) {
       displayValue = value.name || value.fullName;
     } else if (value.label) {
@@ -14015,6 +14022,20 @@ function useAjaxModal$2({
   };
 }
 
+const mergeObject = obj => {
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    if (typeof value === "object" && !Array.isArray(value) && value !== null) {
+      return {
+        ...acc,
+        ...value
+      };
+    }
+    return {
+      ...acc,
+      [key]: value
+    };
+  }, {});
+};
 const handleDataLinkGroupWithTableKeys = ({
   config,
   inputConfig,
@@ -14039,9 +14060,9 @@ const handleDataLinkGroupWithTableKeys = ({
       const otherConfig = config.inputs[otherInputKey];
       if (otherConfig?.type === 'dataLink') {
         const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
-        const siblingAdditionalTableKeys = config.meta?.additionalTableKeys || [];
-        const siblingAllTableKeys = [...siblingTableKeys, ...siblingAdditionalTableKeys];
-        return siblingAllTableKeys.includes(inputKey) && otherInputKey !== inputKey;
+        const additionalTableKeys = config.meta?.additionalTableKeys || [];
+        const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
+        return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
       return false;
     });
@@ -14054,8 +14075,9 @@ const handleDataLinkGroupWithTableKeys = ({
   }
   const tableKeys = inputConfig.meta.tableKeys;
   const additionalTableKeys = config.meta?.additionalTableKeys || [];
-  [...new Set([...tableKeys, ...additionalTableKeys])];
-  Object.keys(config.inputs || {});
+  const parentInputKeys = Object.keys(config.inputs || {});
+  const siblingInputsMatchingTableKeys = parentInputKeys.filter(siblingKey => siblingKey !== inputKey).filter(siblingKey => tableKeys.includes(siblingKey) || additionalTableKeys.includes(siblingKey));
+  [...new Set([...tableKeys, ...siblingInputsMatchingTableKeys])];
   const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
@@ -14110,6 +14132,16 @@ const handleDataLinkGroupWithTableKeys = ({
         values[tableKey] = item?.[tableKey];
       }
     });
+    siblingInputsMatchingTableKeys.forEach(siblingKey => {
+      const siblingConfig = config.inputs[siblingKey];
+      if (siblingConfig) {
+        inputs[siblingKey] = {
+          ...siblingConfig,
+          label: siblingConfig.label || siblingKey
+        };
+        values[siblingKey] = item?.[siblingKey];
+      }
+    });
     if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey)).filter(fieldKey => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
@@ -14120,14 +14152,17 @@ const handleDataLinkGroupWithTableKeys = ({
           ...formInputConfig,
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
         };
-        if (formInputConfig.label && typeof formInputConfig.label === 'object') {
-          const dynamicLabelKeys = Object.keys(formInputConfig.label);
+        if (formInputConfig?.label && typeof formInputConfig?.label === 'object') {
+          const dynamicLabelKeys = Object.keys(formInputConfig?.label);
           let resolvedLabel = null;
           for (const labelKey of dynamicLabelKeys) {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              const flattenedItem = Object.assign({}, item.location, {
+                address: item.address
+              });
+              if (flattenedItem?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -14135,7 +14170,7 @@ const handleDataLinkGroupWithTableKeys = ({
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = item?.[fieldKey];
+        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
       });
     }
     return {
@@ -14145,11 +14180,12 @@ const handleDataLinkGroupWithTableKeys = ({
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      const datastakeIdValue = item?.[inputKey]?.datastakeId || item?.datastakeId;
+      const merged = mergeObject(item);
+      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
       const {
         inputs,
         values
-      } = createInputsAndValues(item);
+      } = createInputsAndValues(merged);
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
         nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
         config: {
@@ -14170,11 +14206,12 @@ const handleDataLinkGroupWithTableKeys = ({
       }, `${inputKey}-${itemIndex}`);
     });
   } else {
-    const datastakeIdValue = value?.[inputKey]?.datastakeId || value?.datastakeId;
+    const merged = mergeObject(value);
+    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
     const {
       inputs,
       values
-    } = createInputsAndValues(value);
+    } = createInputsAndValues(merged);
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: datastakeIdValue || t('No ID'),
       config: {
@@ -14267,7 +14304,7 @@ const handleDataLinkWithTableKeys = ({
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item?.[tableKey];
+        values[tableKey] = item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[tableKey];
       } else {
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
@@ -14306,7 +14343,7 @@ const handleDataLinkWithTableKeys = ({
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = item?.[fieldKey];
+        values[fieldKey] = item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[fieldKey];
       });
     }
     return {
@@ -14486,9 +14523,6 @@ const AjaxSubGroup$2 = ({
     _getAppHeader: getAppHeader
   });
   const ajaxForm = ajaxModalValues?.form;
-  console.log({
-    ajaxForm
-  });
   if (ajaxModalValues.isFetching) {
     return /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "ajax-subgroup-loading",
@@ -14502,9 +14536,6 @@ const AjaxSubGroup$2 = ({
     });
   }
   const formInputs = Object.values(ajaxForm || {})[0] || {};
-  console.log({
-    formInputs
-  });
   const sortedRecords = value.sort((a, b) => {
     const yearA = parseInt(a.meta?.year || '0');
     const yearB = parseInt(b.meta?.year || '0');
@@ -20351,7 +20382,7 @@ function SDGWidget(_ref) {
     })
   }));
 }
-const SDGContainer = dt.div(_templateObject$8 || (_templateObject$8 = _taggedTemplateLiteral(["\n\tdisplay: grid;\n\tgrid-template-columns: repeat(auto-fit, minmax(50px, 1fr));\n\tgap: 8px;\n\n\t.sdg-item {\n\t\theight: 50px;\n\t\twidth: 50px;\n\t\tborder-radius: 8px;\n\t\tbackground-size: cover;\n\t\tbackground-position: center;\n\t\tbackground-repeat: no-repeat;\n\t}\n\n\t.sdg-item-content {\n\t\tdisplay: flex;\n\t\talign-items: center;\n\t\theight: 100%;\n\t\tcolor: white;\n\t\ttext-align: center;\n\t}\n"])));
+const SDGContainer = dt.div(_templateObject$8 || (_templateObject$8 = _taggedTemplateLiteral(["\n\tdisplay: grid;\n\tgrid-template-columns: repeat(auto-fit, minmax(50px, 1fr));\n\tgap: 8px;\n\n\t.sdg-item {\n\t\theight: 50px;\n\t\twidth: 50px;\n\t\tborder-radius: 8px;\n\t\tbackground-size: cover;\n\t\tbackground-position: center;\n\t\tbackground-repeat: no-repeat;\n\t}\n\n\t.sdg-item-content {\n\t\tdisplay: flex;\n\t\talign-items: center;\n\t\theight: 100%; \n\t\tcolor: white;\n\t\ttext-align: center;\n\t}\n"])));
 
 var Style$w = dt.div`
   border: 1px solid var(--base-gray-40);

package/package.json

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

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

@@ -1,6 +1,7 @@
 import Widget from "../index.jsx";
 import styled from "styled-components";
 import { getGoalConfig } from "./config.js";
+
 export default function SDGWidget({
 	title = "Sustainable Development Goals",
 	activeSdgGoals = [],
@@ -47,7 +48,7 @@ const SDGContainer = styled.div`
 	.sdg-item-content {
 		display: flex;
 		align-items: center;
-		height: 100%;
+		height: 100%; 
 		color: white;
 		text-align: center;
 	}

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

@@ -31,8 +31,6 @@ const AjaxSubGroup = ({
 
   const ajaxForm = ajaxModalValues?.form;
 
-  console.log({ajaxForm});
-
   if (ajaxModalValues.isFetching) {
     return (
       <div className="ajax-subgroup-loading" style={{ padding: '20px', textAlign: 'center' }}>
@@ -42,7 +40,6 @@ const AjaxSubGroup = ({
   }
 
   const formInputs = Object.values(ajaxForm || {})[0] || {};
-  console.log({formInputs})
 
   const sortedRecords = value.sort((a, b) => {
     const yearA = parseInt(a.meta?.year || '0');

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

@@ -1,6 +1,15 @@
 import React, { useMemo } from 'react';
 import useAjaxModal from '../utils/useAjaxModal';
 
+const mergeObject = (obj) => {
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    if (typeof value === "object" && !Array.isArray(value) && value !== null) {
+      return { ...acc, ...value };
+    }
+    return { ...acc, [key]: value };
+  }, {});
+}
+
 export const handleDataLinkGroupWithTableKeys = ({
   config,
   inputConfig,
@@ -26,10 +35,10 @@ export const handleDataLinkGroupWithTableKeys = ({
       const otherConfig = config.inputs[otherInputKey];
       if (otherConfig?.type === 'dataLink') {
         const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
-        const siblingAdditionalTableKeys = config.meta?.additionalTableKeys || [];
-        const siblingAllTableKeys = [...siblingTableKeys, ...siblingAdditionalTableKeys];
+        const additionalTableKeys = config.meta?.additionalTableKeys || [];
+        const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
         
-        return siblingAllTableKeys.includes(inputKey) && otherInputKey !== inputKey;
+        return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
       return false;
     });
@@ -42,8 +51,13 @@ export const handleDataLinkGroupWithTableKeys = ({
 
   const tableKeys = inputConfig.meta.tableKeys;
   const additionalTableKeys = config.meta?.additionalTableKeys || [];
-  const allTableKeys = [...new Set([...tableKeys, ...additionalTableKeys])];
+  
   const parentInputKeys = Object.keys(config.inputs || {});
+  const siblingInputsMatchingTableKeys = parentInputKeys
+    .filter(siblingKey => siblingKey !== inputKey)
+    .filter(siblingKey => tableKeys.includes(siblingKey) || additionalTableKeys.includes(siblingKey));
+  
+  const allTableKeys = [...new Set([...tableKeys, ...siblingInputsMatchingTableKeys])];
 
   const isAjaxModal = useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
 
@@ -132,6 +146,17 @@ export const handleDataLinkGroupWithTableKeys = ({
         }
       });
 
+    siblingInputsMatchingTableKeys.forEach(siblingKey => {
+      const siblingConfig = config.inputs[siblingKey];
+      if (siblingConfig) {
+        inputs[siblingKey] = {
+          ...siblingConfig,
+          label: siblingConfig.label || siblingKey
+        };
+        values[siblingKey] = item?.[siblingKey];
+      }
+    });
+
     if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification)
         .filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey))
@@ -149,25 +174,25 @@ export const handleDataLinkGroupWithTableKeys = ({
               : (formInputConfig.label || formInputConfig.tableLabel || fieldKey)
           };
 
-          if (formInputConfig.label && typeof formInputConfig.label === 'object') {
-            const dynamicLabelKeys = Object.keys(formInputConfig.label);
+          if (formInputConfig?.label && typeof formInputConfig?.label === 'object') {
+            const dynamicLabelKeys = Object.keys(formInputConfig?.label);
             let resolvedLabel = null;
 
             for (const labelKey of dynamicLabelKeys) {
               const parts = labelKey.split(' is '); 
               if (parts.length === 2) {
                 const [conditionKey, conditionValue] = parts;
-                if (item?.[conditionKey] === conditionValue) {
+                const flattenedItem = Object.assign({}, item.location, { address: item.address });
+                if (flattenedItem?.[conditionKey] === conditionValue) {
                   resolvedLabel = formInputConfig.label[labelKey];
                   break; 
-                }
+                } 
               }
             }
             inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
               (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
           }
-          
-          values[fieldKey] = item?.[fieldKey];
+          values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
         });
     }
 
@@ -176,8 +201,9 @@ export const handleDataLinkGroupWithTableKeys = ({
 
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      const datastakeIdValue = item?.[inputKey]?.datastakeId || item?.datastakeId;
-      const { inputs, values } = createInputsAndValues(item);
+      const merged = mergeObject(item);
+      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
+      const { inputs, values } = createInputsAndValues(merged);
 
       return (
         <TreeNodeComponent
@@ -202,8 +228,9 @@ export const handleDataLinkGroupWithTableKeys = ({
       );
     });
   } else {
-    const datastakeIdValue = value?.[inputKey]?.datastakeId || value?.datastakeId;
-    const { inputs, values } = createInputsAndValues(value);
+    const merged = mergeObject(value);
+    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
+    const { inputs, values } = createInputsAndValues(merged);
 
     return (
       <TreeNodeComponent

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

@@ -90,8 +90,7 @@ export const handleDataLinkWithTableKeys = ({
             inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
               (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
           }
-          
-          values[tableKey] = item?.[tableKey]; 
+          values[tableKey] = item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[tableKey]; 
         } else {
           inputs[tableKey] = {
             label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
@@ -140,8 +139,7 @@ export const handleDataLinkWithTableKeys = ({
             inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
               (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
           }
-          
-          values[fieldKey] = item?.[fieldKey];
+          values[fieldKey] = item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[fieldKey];
         });
     }
 

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

@@ -6,6 +6,14 @@ import Geolocation from '../../ViewForm/components/geolocation';
 
 export const evaluateShowIfCondition = (condition, item) => {
   if (!condition || !item) return false;
+
+  if(condition.includes(' notEmpty ')) {
+    const parts = condition.split(' notEmpty ');
+    if (parts.length === 2) {
+      const [field, expectedValue] = parts.map(p => p.trim());
+      return item[field] !== '' || item[field] !== null || item[field] !== undefined;
+    }
+  }
   
   // Handle boolean AND operations
   if (condition.includes(' && ')) {

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

@@ -39,7 +39,7 @@ export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl =
     displayValue = '-';
   } else if (typeof value === 'object' && value !== null) {
     if (Array.isArray(value)) {
-      displayValue = value.length > 0 ? value.join(', ') : '-'; // Changed from '' to '-'
+      displayValue = value.length > 0 ? value.join(', ') : '-';
     } else if (value.name || value.fullName) {
       displayValue = value.name || value.fullName;
     } else if (value.label) {