datastake-daf 0.6.101 → 0.6.102

package/package.json

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

package/src/@daf/core/components/EditForm/components/AjaxSubGroup/index.js

@@ -30,8 +30,6 @@ export default function AjaxSubGroup({
 	const { t } = useEditContext();
 	const isAjaxModal = useMemo(() => !!form?.meta?.namespace, [form]);
 
-	console.log({form, options, k, excludedKeys, values, i, formTitles, data});
-
 	const formScope = useMemo(() => {
 		const val = form.meta.formScope;
 		let toReturn = val;

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

@@ -0,0 +1,106 @@
+import React, { useMemo } from 'react';
+import useAjaxModal from '../utils/useAjaxModal';
+import { handleDataLinkWithTableKeys } from './dataLinkHandler';
+
+const AjaxSubGroup = ({
+  config,
+  value,
+  allData,
+  level,
+  t,
+  rootForm,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
+  const isAjaxModal = useMemo(() => !!config?.meta?.namespace, [config]);
+
+  const ajaxModalValues = useAjaxModal({
+    name: config?.label || 'ajaxSubGroup',
+    user,
+    namespace: config?.meta?.namespace,
+    skipFetch: config?.meta?.skipFetch,
+    isAjaxModal,
+    formScope: config?.meta?.formScope || 'modal',
+    APP: app,
+    apiBaseUrl: getApiBaseUrl(),
+    _getAppHeader: getAppHeader,
+  });
+
+  const ajaxForm = ajaxModalValues?.form;
+
+  console.log({ajaxForm});
+
+  if (ajaxModalValues.isFetching) {
+    return (
+      <div className="ajax-subgroup-loading" style={{ padding: '20px', textAlign: 'center' }}>
+        <span>Loading form configuration...</span>
+      </div>
+    );
+  }
+
+  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');
+    return yearB - yearA; 
+  });
+
+  const children = [];
+
+  sortedRecords.forEach((record, recordIndex) => {
+    const year = record.meta?.year || 'Unknown Year';
+    
+    const fieldKeys = Object.keys(formInputs)
+      .filter((inputKey) => {
+        const metadataKeys = ['id', 'label', 'position', 'subTitle'];
+        if (metadataKeys.includes(inputKey)) {
+          return false;
+        }
+        
+        const excludedKeys = config?.meta?.excludedKeysView || [];
+        return !excludedKeys.includes(inputKey);
+      })
+      .sort((a, b) => {
+        const positionA = formInputs[a]?.position || 0;
+        const positionB = formInputs[b]?.position || 0;
+        return positionA - positionB;
+      });
+
+    const yearInputs = {};
+    fieldKeys.forEach(inputKey => {
+      yearInputs[inputKey] = formInputs[inputKey];
+    });
+    
+    children.push(
+      <TreeNodeComponent
+        key={`year-${year}`}
+        nodeKey={`year-${year}`}
+        config={{ 
+          label: year, 
+          type: 'header', 
+          inputs: yearInputs, 
+          meta: { code: record.datastakeId || '' }
+        }}
+        value={record} 
+        level={level + 1}
+        isLast={recordIndex === sortedRecords.length - 1}
+        t={t}
+        rootForm={rootForm}
+        allData={record}
+        user={user}
+        getApiBaseUrl={getApiBaseUrl}
+        getAppHeader={getAppHeader}
+        app={app}
+      />
+    );
+  });
+
+  return children;
+};
+
+export default AjaxSubGroup;

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import AjaxSubGroup from './AjaxSubGroup';
+
+export const handleAjaxSubGroupChildren = (props) => {
+  if (props.config?.type !== 'ajaxSubGroup' || !Array.isArray(props.value)) {
+    return null;
+  }
+
+  return [
+    <AjaxSubGroup key="ajax-subgroup" {...props} />
+  ];
+};

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