datastake-daf 0.6.100 → 0.6.102

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

@@ -19,8 +19,7 @@ export const handleDataLinkGroupWithTableKeys = ({
   if (!(config.type === 'dataLinkGroup' || config.type === 'dataLink')) {
     return null;
   }
-  console.log({app})
-  
+      
   if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     const parentInputKeys = Object.keys(config.inputs || {});
     const isHandledBySiblingDataLink = parentInputKeys.some(otherInputKey => {
@@ -41,10 +40,6 @@ export const handleDataLinkGroupWithTableKeys = ({
     return null;
   }
 
-  if (!(value && typeof value === 'object')) {
-    return null;
-  }
-
   const tableKeys = inputConfig.meta.tableKeys;
   const additionalTableKeys = config.meta?.additionalTableKeys || [];
   const allTableKeys = [...new Set([...tableKeys, ...additionalTableKeys])];
@@ -88,6 +83,14 @@ export const handleDataLinkGroupWithTableKeys = ({
     const inputs = {};
     const values = {};
 
+    const uploadTypeFields = ['documents', 'links', 'pictures', 'videos'];
+    const uploadTypeLabels = {
+      'documents': 'File',
+      'links': 'Link',
+      'pictures': 'Image', 
+      'videos': 'Video'
+    };
+
     tableKeys
       .filter(tableKey => tableKey !== 'datastakeId')
       .forEach(tableKey => {
@@ -96,7 +99,9 @@ export const handleDataLinkGroupWithTableKeys = ({
         if (formInputConfig) {
           inputs[tableKey] = {
             ...formInputConfig,
-            label: formInputConfig.label || formInputConfig.tableLabel || tableKey
+            label: uploadTypeFields.includes(tableKey) 
+              ? uploadTypeLabels[tableKey] 
+              : (formInputConfig.label || formInputConfig.tableLabel || tableKey)
           };
 
           if (formInputConfig.label && typeof formInputConfig.label === 'object') {
@@ -113,13 +118,14 @@ export const handleDataLinkGroupWithTableKeys = ({
                 }
               }
             }
-            inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || tableKey;
+            inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
+              (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
           }
           
           values[tableKey] = item?.[tableKey]; 
         } else {
           inputs[tableKey] = {
-            label: tableKey,
+            label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
             type: inputConfig?.type
           };
           values[tableKey] = item?.[tableKey];
@@ -138,7 +144,9 @@ export const handleDataLinkGroupWithTableKeys = ({
           
           inputs[fieldKey] = {
             ...formInputConfig,
-            label: formInputConfig.label || formInputConfig.tableLabel || fieldKey
+            label: uploadTypeFields.includes(fieldKey) 
+              ? uploadTypeLabels[fieldKey] 
+              : (formInputConfig.label || formInputConfig.tableLabel || fieldKey)
           };
 
           if (formInputConfig.label && typeof formInputConfig.label === 'object') {
@@ -155,7 +163,8 @@ export const handleDataLinkGroupWithTableKeys = ({
                 }
               }
             }
-            inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || fieldKey;
+            inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
+              (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
           }
           
           values[fieldKey] = item?.[fieldKey];
@@ -173,9 +182,9 @@ export const handleDataLinkGroupWithTableKeys = ({
       return (
         <TreeNodeComponent
           key={`${inputKey}-${itemIndex}`}
-          nodeKey={datastakeIdValue || `Unknown ID ${itemIndex + 1}`}
+          nodeKey={datastakeIdValue || t(`No ID ${itemIndex + 1}`)}
           config={{
-            label: datastakeIdValue || `Unknown ID ${itemIndex + 1}`,
+            label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
             type: 'custom-datalink-group',
             inputs: inputs
           }}
@@ -199,9 +208,9 @@ export const handleDataLinkGroupWithTableKeys = ({
     return (
       <TreeNodeComponent
         key={`${inputKey}-group`}
-        nodeKey={datastakeIdValue || 'Unknown ID'}
+        nodeKey={datastakeIdValue || t('No ID')}
         config={{
-          label: datastakeIdValue || 'Unknown ID',
+          label: datastakeIdValue || t('No ID'),
           type: 'custom-datalink-group',
           inputs: inputs 
         }}

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

@@ -1,5 +1,6 @@
 import React, { useMemo } from 'react';
 import useAjaxModal from '../utils/useAjaxModal';
+import { processConditionalTableKeys } from '../utils/fieldData';
 
 export const handleDataLinkWithTableKeys = ({
   inputConfig,
@@ -15,14 +16,9 @@ export const handleDataLinkWithTableKeys = ({
   app,
   TreeNodeComponent
 }) => {
-
   if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     return null;
   }
-
-  if (!(value && typeof value === 'object')) {
-    return null;
-  }
   
   const tableKeys = inputConfig.meta.tableKeys;
   const isAjaxModal = useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
@@ -45,15 +41,36 @@ export const handleDataLinkWithTableKeys = ({
     const inputs = {};
     const values = {};
 
-    tableKeys
+    const uploadTypeFields = ['documents', 'links', 'pictures', 'videos'];
+    const uploadTypeLabels = {
+      'documents': 'File',
+      'links': 'Link',
+      'pictures': 'Image', 
+      'videos': 'Video'
+    };
+
+    const isUploadFieldEmpty = (fieldKey, itemToCheck) => {
+      if (uploadTypeFields.includes(fieldKey)) {
+        const itemValue = itemToCheck?.[fieldKey];
+        return itemValue === undefined || itemValue === null || (Array.isArray(itemValue) && itemValue.length === 0);
+      }
+      return false;
+    };
+
+    const processedTableKeys = processConditionalTableKeys(tableKeys, item);
+
+    processedTableKeys
       .filter(tableKey => tableKey !== 'datastakeId')
+      .filter(tableKey => !isUploadFieldEmpty(tableKey, item))
       .forEach(tableKey => {
         const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
 
         if (formInputConfig) {
           inputs[tableKey] = {
             ...formInputConfig,
-            label: formInputConfig.label || formInputConfig.tableLabel || tableKey
+            label: uploadTypeFields.includes(tableKey) 
+              ? uploadTypeLabels[tableKey] 
+              : (formInputConfig.label || formInputConfig.tableLabel || tableKey)
           };
 
           if (formInputConfig.label && typeof formInputConfig.label === 'object') {
@@ -70,13 +87,14 @@ export const handleDataLinkWithTableKeys = ({
                 }
               }
             }
-            inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || tableKey;
+            inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
+              (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
           }
           
           values[tableKey] = item?.[tableKey]; 
         } else {
           inputs[tableKey] = {
-            label: tableKey,
+            label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
             type: inputConfig?.type
           };
           values[tableKey] = item?.[tableKey];
@@ -85,7 +103,13 @@ export const handleDataLinkWithTableKeys = ({
 
     if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification)
-        .filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey))
+        .filter(fieldKey => {
+          if (uploadTypeFields.includes(fieldKey)) {
+            return !isUploadFieldEmpty(fieldKey, item);
+          }
+          return true;
+        })
+        .filter(fieldKey => fieldKey !== 'datastakeId' && !processedTableKeys.includes(fieldKey))
         .filter(fieldKey => {
           const formInputConfig = dataLinkForm.identification[fieldKey];
           return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
@@ -95,9 +119,10 @@ export const handleDataLinkWithTableKeys = ({
           
           inputs[fieldKey] = {
             ...formInputConfig,
-            label: formInputConfig.label || formInputConfig.tableLabel || fieldKey
+            label: uploadTypeFields.includes(fieldKey) 
+              ? uploadTypeLabels[fieldKey] 
+              : (formInputConfig.label || formInputConfig.tableLabel || fieldKey)
           };
-
           if (formInputConfig.label && typeof formInputConfig.label === 'object') {
             const dynamicLabelKeys = Object.keys(formInputConfig.label);
             let resolvedLabel = null;
@@ -112,7 +137,8 @@ export const handleDataLinkWithTableKeys = ({
                 }
               }
             }
-            inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || fieldKey;
+            inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || 
+              (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
           }
           
           values[fieldKey] = item?.[fieldKey];
@@ -127,12 +153,16 @@ export const handleDataLinkWithTableKeys = ({
       const datastakeIdValue = item?.datastakeId;
       const { inputs, values } = createInputsAndValues(item);
 
+      if (Object.keys(inputs).length === 0) {
+          return null; 
+      }
+
       return (
         <TreeNodeComponent
           key={`${inputKey}-${itemIndex}`}
-          nodeKey={datastakeIdValue || `Unknown ID ${itemIndex + 1}`}
+          nodeKey={datastakeIdValue || t(`No ID ${itemIndex + 1}`)}
           config={{
-            label: datastakeIdValue || `Unknown ID ${itemIndex + 1}`,
+            label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
             type: 'custom-datalink',
             inputs: inputs
           }}
@@ -153,12 +183,16 @@ export const handleDataLinkWithTableKeys = ({
     const datastakeIdValue = value?.datastakeId;
     const { inputs, values } = createInputsAndValues(value);
 
+    if (Object.keys(inputs).length === 0) {
+        return null;
+    }
+
     return (
       <TreeNodeComponent
         key={`${inputKey}-single`}
-        nodeKey={datastakeIdValue || 'Unknown ID'}
+        nodeKey={datastakeIdValue || t('No ID')}
         config={{
-          label: datastakeIdValue || 'Unknown ID',
+          label: datastakeIdValue || t('No ID'),
           type: 'custom-datalink',
           inputs: inputs
         }}

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

@@ -12,14 +12,26 @@ import './style.scss';
 import { resolveDynamicLabel } from './utils.js';
 import { findOptions } from '../../../../helpers/StringHelper.js';
 import GroupInputsHandler from './components/groupInputsHandler.js';
+import { handleAjaxSubGroupChildren } from './components/ajaxSubGroupHandler.js';
+import { evaluateShowIfCondition } from './utils/fieldData.js';
 
 const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootForm, allData, user, getApiBaseUrl = () => {}, getAppHeader = () => {}, app }) => {
-  const hasChildren = determineHasChildren({ config, level });
+  if (config.showIf && !evaluateShowIfCondition(config.showIf, allData)) {
+    return null; 
+  }
+
+  const hasMetaComment = level <= 2 && allData?.meta?.[nodeKey]?.comment;
+  
+  const originalHasChildren = determineHasChildren({ config, level });
+  const hasChildren = originalHasChildren || hasMetaComment;
+  
   const label = resolveDynamicLabel(config?.label, allData || value, nodeKey);
   const nodeType = config?.type || 'field';
 
-  let renderNodeValue = () => renderValue({ value, hasChildren, config, user, getApiBaseUrl, getAppHeader, app });
-
+  let renderNodeValue = () => renderValue({ value, hasChildren: originalHasChildren, config, user, getApiBaseUrl, getAppHeader, app });
+  if(nodeKey === 'keyIncidents') {
+    console.log({config, value, hasChildren})
+  }
 
   const renderChildren = () => {
     if (!hasChildren) return null;
@@ -39,11 +51,27 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
       TreeNodeComponent: TreeNode
     });
     
-    if (sectionChildren) {
+    if (config.type === 'ajaxSubGroup') {
+      const ajaxSubGroupChildren = handleAjaxSubGroupChildren({
+        config,
+        value,
+        allData,
+        level,
+        t,
+        rootForm,
+        user,
+        app,
+        getApiBaseUrl,
+        getAppHeader,
+        TreeNodeComponent: TreeNode
+      });
+
+      if (ajaxSubGroupChildren) {
+        children = ajaxSubGroupChildren;
+      }
+    } else if (sectionChildren) {
       children = sectionChildren;
-    } else if (config.type === 'groupInputs') {
-      console.log({value})
-    } else if (config.type === 'dataLink' && config?.meta?.tableKeys && !config.inputs) {
+    } else if (config.type === 'dataLink') {
         const singleDataLinkChildren = handleDataLinkWithTableKeys({
             inputConfig: config,
             inputKey: nodeKey, 
@@ -64,11 +92,20 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
           }
     }  else if (config?.inputs) {
       if (config.type === 'dataLinkGroup' || config.type === 'dataLink') {
-        const inputKeys = Object.keys(config.inputs).sort((a, b) => {
-          const positionA = config.inputs[a]?.position || 0;
-          const positionB = config.inputs[b]?.position || 0;
-          return positionA - positionB;
-        });
+        const inputKeys = Object.keys(config.inputs)
+          .filter(inputKey => {
+            const inputConfig = config.inputs[inputKey];
+            // Check showIf condition for input
+            if (inputConfig?.showIf && !evaluateShowIfCondition(inputConfig.showIf, allData)) {
+              return false;
+            }
+            return true;
+          })
+          .sort((a, b) => {
+            const positionA = config.inputs[a]?.position || 0;
+            const positionB = config.inputs[b]?.position || 0;
+            return positionA - positionB;
+          });
 
         children = inputKeys.map((inputKey, index, array) => {
           const inputConfig = config.inputs[inputKey];
@@ -153,11 +190,20 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
           if (arrayChildren) {
             children = arrayChildren;
           } else {
-            const inputKeys = Object.keys(config.inputs).sort((a, b) => {
-              const positionA = config.inputs[a]?.position || 0;
-              const positionB = config.inputs[b]?.position || 0;
-              return positionA - positionB;
-            });
+            const inputKeys = Object.keys(config.inputs)
+              .filter(inputKey => {
+                const inputConfig = config.inputs[inputKey];
+                // Check showIf condition for input
+                if (inputConfig?.showIf && !evaluateShowIfCondition(inputConfig.showIf, allData)) {
+                  return false;
+                }
+                return true;
+              })
+              .sort((a, b) => {
+                const positionA = config.inputs[a]?.position || 0;
+                const positionB = config.inputs[b]?.position || 0;
+                return positionA - positionB;
+              });
 
             children = inputKeys.map((inputKey, index, array) => {
               const inputConfig = config.inputs[inputKey];
@@ -208,6 +254,37 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
       }
     }
 
+    // Ensure children is always an array before adding meta comment
+    if (!Array.isArray(children)) {
+      children = children ? [children] : [];
+    }
+
+    // Add meta comment as a child if it exists
+    if (hasMetaComment) {
+      const commentChild = (
+        <TreeNode
+          key={`${nodeKey}-comment`}
+          nodeKey="comment"
+          config={{
+            label: "Comment",
+            type: "field",
+            meta: { isComment: true } // Add a marker to identify this as a comment
+          }}
+          value={allData.meta[nodeKey].comment}
+          level={level + 1}
+          isLast={children.length === 0} // This will be the last child if no other children
+          t={t}
+          rootForm={rootForm}
+          allData={allData}
+          user={user}
+          app={app}
+          getApiBaseUrl={getApiBaseUrl}
+          getAppHeader={getAppHeader}
+        />
+      );
+      children.push(commentChild);
+    }
+
     return (
       <div className="tree-children">
         {children}
@@ -221,7 +298,7 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
     };
   }
   return (
-    <div className={`tree-node level-${level} ${hasChildren ? 'parent' : 'leaf'} ${isLast ? 'last' : ''}`}>
+    <div className={`tree-node level-${level} ${hasChildren ? 'parent' : 'leaf'} ${isLast ? 'last' : ''} ${nodeKey === 'comment' ? 'comment-node' : ''}`}>
       <div className="tree-node-content">
         <div className="tree-indent">
           {Array.from({ length: level }, (_, i) => (
@@ -230,7 +307,7 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
         </div>
         
         <div className="tree-node-title">
-          <span className="tree-label">{label}{!hasChildren && renderNodeValue() ? ':' : ''}</span>
+          <span className={`tree-label ${nodeKey === 'comment' ? 'comment-label' : ''}`}>{label}{!hasChildren && renderNodeValue() && !label.endsWith('?') ? ':' : ''}</span>
           <div className="tree-value-container">
             {renderNodeValue()}
           </div>
@@ -269,6 +346,11 @@ const PdfFormContent = ({
       <div className="pdf-tree">
         {Object.keys(form)
           .filter(sectionKey => {
+            const section = form[sectionKey];
+            // Check if section should be shown based on showIf condition
+            if (section?.showIf && !evaluateShowIfCondition(section.showIf, data)) {
+              return false;
+            }
             return !(sectionKey === 'id' || sectionKey === 'label' || sectionKey === 'position' || sectionKey === 'subTitle');
           })
           .sort((a, b) => {
@@ -321,11 +403,115 @@ const PdfForm = ({
   getAppHeader = () => {},
   app
 }) => {
+  // Group objects under headers based on position
+  const organizeFormByHeaders = (formData) => {
+    const organizedSections = {};
+    
+    Object.keys(formData).forEach((sectionKey) => {
+      const section = formData[sectionKey];
+      
+      if (typeof section !== 'object' || !section.label) {
+        return;
+      }
+
+      // Get all objects from this section and sort by position
+      const allObjects = Object.keys(section)
+        .filter(key => {
+          return !(key === 'id' || key === 'label' || key === 'position' || key === 'subTitle');
+        })
+        .map(key => ({
+          key,
+          ...section[key]
+        }))
+        .sort((a, b) => {
+          const positionA = a.position || 0;
+          const positionB = b.position || 0;
+          return positionA - positionB;
+        });
+
+      // Identify headers and regular objects
+      const headers = allObjects.filter(obj => obj.type === 'header');
+      const nonHeaders = allObjects.filter(obj => obj.type !== 'header');
+
+      if (headers.length === 0) {
+        // No headers found, keep original structure
+        organizedSections[sectionKey] = section;
+        return;
+      }
+
+      const organizedSection = {
+        ...section,
+        // Keep the section-level properties
+      };
+
+      // Clear the section of its original objects
+      Object.keys(section).forEach(key => {
+        if (!(key === 'id' || key === 'label' || key === 'position' || key === 'subTitle')) {
+          delete organizedSection[key];
+        }
+      });
+
+      headers.forEach((header, index) => {
+        const headerPosition = header.position || 0;
+        const nextHeaderPosition = index < headers.length - 1 
+          ? (headers[index + 1].position || 0) 
+          : Infinity;
+
+        // Find objects that belong under this header
+        const childrenObjects = nonHeaders.filter(obj => {
+          const objPosition = obj.position || 0;
+          return objPosition > headerPosition && objPosition < nextHeaderPosition;
+        });
+
+        // Create the header structure with children as inputs
+        const headerWithChildren = { ...header };
+        delete headerWithChildren.key; // Remove the key we added temporarily
+
+        if (childrenObjects.length > 0) {
+          headerWithChildren.inputs = {};
+          childrenObjects.forEach(child => {
+            const childKey = child.key;
+            const childData = { ...child };
+            delete childData.key; // Remove the temporary key
+            headerWithChildren.inputs[childKey] = childData;
+          });
+        }
+
+        organizedSection[header.key] = headerWithChildren;
+      });
+
+      // Add any remaining objects that don't fall under any header
+      const uncategorizedObjects = nonHeaders.filter(obj => {
+        const objPosition = obj.position || 0;
+        return !headers.some((header, index) => {
+          const headerPosition = header.position || 0;
+          const nextHeaderPosition = index < headers.length - 1 
+            ? (headers[index + 1].position || 0) 
+            : Infinity;
+          return objPosition > headerPosition && objPosition < nextHeaderPosition;
+        });
+      });
+
+      uncategorizedObjects.forEach(obj => {
+        const objKey = obj.key;
+        const objData = { ...obj };
+        delete objData.key;
+        organizedSection[objKey] = objData;
+      });
+
+      organizedSections[sectionKey] = organizedSection;
+    });
+
+    return organizedSections;
+  };
+
+  const organizedForm = useMemo(() => organizeFormByHeaders(form), [form]);
+
   const pdfConfig = useMemo(() => {
     const sections = [];
     
-    Object.keys(form).forEach((sectionKey) => {
-      const section = form[sectionKey];
+    Object.keys(organizedForm).forEach((sectionKey) => {
+      const section = organizedForm[sectionKey];
       
       if (typeof section !== 'object' || !section.label) {
         return;
@@ -356,7 +542,7 @@ const PdfForm = ({
     });
 
     return sections;
-  }, [form, data, t, getApiBaseUrl, getAppHeader, app]);
+  }, [organizedForm, data, t, getApiBaseUrl, getAppHeader, app, formName, source, version]);
 
   return (
     <PdfView