datastake-daf 0.6.781 → 0.6.782

package/dist/components/index.js

@@ -8486,20 +8486,22 @@ const useHeader = _ref => {
 const {
   useToken: useToken$m
 } = antd.theme;
-function BreadCrumbs({
-  breadcrumbs = [],
-  mainContWidth = 0
-}) {
+function BreadCrumbs(_ref) {
+  let {
+    breadcrumbs = [],
+    mainContWidth = 0
+  } = _ref;
   const [splitIndex, setSplitIndex] = React.useState(0);
   const {
     token
   } = useToken$m();
-  const _renderBreadcrumb = (b, i, isLast, noOnClickLast = false) => {
+  const _renderBreadcrumb = function (b, i, isLast) {
+    let noOnClickLast = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     return /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex breadcrumb-item",
-      onClick: noOnClickLast && isLast ? undefined : b?.onClick,
+      onClick: noOnClickLast && isLast ? undefined : b === null || b === void 0 ? void 0 : b.onClick,
       children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-        children: b?.label
+        children: b === null || b === void 0 ? void 0 : b.label
       }), !isLast && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-column justify-content-center",
         children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -8509,7 +8511,7 @@ function BreadCrumbs({
           color: token.baseGray50
         })
       })]
-    }, `breadcrumb-item-${i}`);
+    }, "breadcrumb-item-".concat(i));
   };
   React.useEffect(() => {
     const _placeholderCont = document.getElementById("header-breadcrumbs");
@@ -8552,7 +8554,7 @@ function BreadCrumbs({
         placement: "bottomRight",
         menu: {
           items: groupedBreadCrumbs[2].map((it, i) => ({
-            key: `items-${i}`,
+            key: "items-".concat(i),
             label: it.label,
             onClick: it.onClick
           }))
@@ -9544,24 +9546,29 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
+const renderFieldData = function (type, value, user, config) {
+  let getApiBaseUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
+  let getAppHeader = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : () => {};
+  let app = arguments.length > 6 ? arguments[6] : undefined;
+  let allValues = arguments.length > 7 ? arguments[7] : undefined;
+  let formValues = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {};
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
+        const language = user !== null && user !== void 0 && user.language && (user === null || user === void 0 ? void 0 : user.language) === 'sp' ? 'es' : user === null || user === void 0 ? void 0 : user.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9576,7 +9583,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
+      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9590,7 +9597,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues?.map(item => item?.name).join(', ');
+        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
         return documentName;
       }
     default:
@@ -9598,25 +9605,27 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
   }
 };
 
-const renderValue = ({
-  value,
-  hasChildren,
-  config,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  allData = {}
-}) => {
-  if (config?.type === 'groupInputs') {
-    if (!config?.inputs) return null;
+const renderValue = _ref => {
+  let {
+    value,
+    hasChildren,
+    config,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    allData = {}
+  } = _ref;
+  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
+    if (!(config !== null && config !== void 0 && config.inputs)) return null;
     const inputKeys = Object.keys(config.inputs).sort((a, b) => {
-      const positionA = config.inputs[a]?.position || 0;
-      const positionB = config.inputs[b]?.position || 0;
+      var _config$inputs$a, _config$inputs$b;
+      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
+      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
       return positionA - positionB;
     });
     const values = inputKeys.map(inputKey => {
-      let inputValue = value?.[inputKey];
+      let inputValue = value === null || value === void 0 ? void 0 : value[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
       } else if (typeof inputValue === 'object' && inputValue !== null) {
@@ -9657,8 +9666,8 @@ const renderValue = ({
   } else {
     displayValue = String(value);
   }
-  const fieldType = config?.type || 'text';
-  let cssClass = `tree-value ${fieldType}-type`;
+  const fieldType = (config === null || config === void 0 ? void 0 : config.type) || 'text';
+  let cssClass = "tree-value ".concat(fieldType, "-type");
   if (displayValue === '-') {
     cssClass += ' empty';
   }
@@ -9668,19 +9677,21 @@ const renderValue = ({
     children: displayValue
   });
 };
-const determineHasChildren = ({
-  config,
-  level
-}) => {
-  if (config?.type === 'groupInputs') {
+const determineHasChildren = _ref2 => {
+  var _config$meta;
+  let {
+    config,
+    level
+  } = _ref2;
+  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
     return false;
   }
-  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
+  if ((config === null || config === void 0 ? void 0 : config.type) === 'header' && config !== null && config !== void 0 && config.inputs && Object.keys(config.inputs).length > 0) {
     return true;
   }
-  return config?.inputs || config?.type === 'group' || config?.type === 'dataLinkGroup' || config?.type === 'section' || config?.type === 'ajaxSubGroup' ||
+  return (config === null || config === void 0 ? void 0 : config.inputs) || (config === null || config === void 0 ? void 0 : config.type) === 'group' || (config === null || config === void 0 ? void 0 : config.type) === 'dataLinkGroup' || (config === null || config === void 0 ? void 0 : config.type) === 'section' || (config === null || config === void 0 ? void 0 : config.type) === 'ajaxSubGroup' ||
   // Add this line
-  config?.type === 'dataLink' && config?.meta?.tableKeys || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
+  (config === null || config === void 0 ? void 0 : config.type) === 'dataLink' && (config === null || config === void 0 || (_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.tableKeys) || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
 };
 
 const sortByPosition = (items, getConfig) => {
@@ -9714,19 +9725,18 @@ const resolveDynamicLabel = (labelConfig, item, defaultLabel) => {
   return labelConfig || defaultLabel;
 };
 
-const handleSectionChildren = _ref => {
-  let {
-    config,
-    allData,
-    level,
-    t,
-    rootForm,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
+const handleSectionChildren = ({
+  config,
+  allData,
+  level,
+  t,
+  rootForm,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!(level === 0 && config && typeof config === 'object')) {
     return null;
   }
@@ -9740,14 +9750,14 @@ const handleSectionChildren = _ref => {
     let fieldValue;
 
     // Determine field value based on type
-    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData === null || allData === void 0 ? void 0 : allData[fieldKey])) {
+    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData?.[fieldKey])) {
       fieldValue = allData[fieldKey];
-    } else if (fieldConfig.type === 'dataLinkGroup' && allData !== null && allData !== void 0 && allData[fieldKey]) {
+    } else if (fieldConfig.type === 'dataLinkGroup' && allData?.[fieldKey]) {
       fieldValue = allData[fieldKey];
     } else if (fieldConfig.type === 'group') {
       fieldValue = {};
     } else {
-      fieldValue = allData === null || allData === void 0 ? void 0 : allData[fieldKey];
+      fieldValue = allData?.[fieldKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: fieldKey,
@@ -9766,30 +9776,28 @@ const handleSectionChildren = _ref => {
   });
 };
 
-const handleArrayChildren = _ref => {
-  let {
-    value,
-    config,
-    label,
-    level,
-    t,
-    rootForm,
-    allData,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
+const handleArrayChildren = ({
+  value,
+  config,
+  label,
+  level,
+  t,
+  rootForm,
+  allData,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!Array.isArray(value)) {
     return null;
   }
   return value.map((item, itemIndex) => /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "array-item",
     children: Object.keys(config.inputs).sort((a, b) => {
-      var _config$inputs$a, _config$inputs$b;
-      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
-      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
+      const positionA = config.inputs[a]?.position || 0;
+      const positionB = config.inputs[b]?.position || 0;
       return positionA - positionB;
     }).map(subInputKey => {
       const subInputConfig = config.inputs[subInputKey];
@@ -9807,9 +9815,9 @@ const handleArrayChildren = _ref => {
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, "".concat(itemIndex, "-").concat(subInputKey));
+      }, `${itemIndex}-${subInputKey}`);
     })
-  }, "".concat(itemIndex)));
+  }, `${itemIndex}`));
 };
 
 const noDafApps = ['tif', 'cukura']; //PACKAGE_CHANGE_LATER (remove sbg)
@@ -9954,44 +9962,44 @@ function useAjaxModal$2({
 }
 
 const mergeObject = obj => {
-  return Object.entries(obj || {}).reduce((acc, _ref) => {
-    let [key, value] = _ref;
+  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
-      return _objectSpread2(_objectSpread2({}, acc), value);
+      return {
+        ...acc,
+        ...value
+      };
     }
-    return _objectSpread2(_objectSpread2({}, acc), {}, {
+    return {
+      ...acc,
       [key]: value
-    });
+    };
   }, {});
 };
-const handleDataLinkGroupWithTableKeys = _ref2 => {
-  var _inputConfig$meta, _config$meta2, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
-  let {
-    config,
-    inputConfig,
-    inputKey,
-    value,
-    level,
-    t,
-    rootForm,
-    allData,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref2;
+const handleDataLinkGroupWithTableKeys = ({
+  config,
+  inputConfig,
+  inputKey,
+  value,
+  level,
+  t,
+  rootForm,
+  allData,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!(config.type === 'dataLinkGroup' || config.type === 'dataLink')) {
     return null;
   }
-  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
+  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     const parentInputKeys = Object.keys(config.inputs || {});
     const isHandledBySiblingDataLink = parentInputKeys.some(otherInputKey => {
       const otherConfig = config.inputs[otherInputKey];
-      if ((otherConfig === null || otherConfig === void 0 ? void 0 : otherConfig.type) === 'dataLink') {
-        var _otherConfig$meta, _config$meta;
-        const siblingTableKeys = (otherConfig === null || otherConfig === void 0 || (_otherConfig$meta = otherConfig.meta) === null || _otherConfig$meta === void 0 ? void 0 : _otherConfig$meta.tableKeys) || [];
-        const additionalTableKeys = ((_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.additionalTableKeys) || [];
+      if (otherConfig?.type === 'dataLink') {
+        const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
+        const additionalTableKeys = config.meta?.additionalTableKeys || [];
         const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
         return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
@@ -10005,26 +10013,23 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const additionalTableKeys = ((_config$meta2 = config.meta) === null || _config$meta2 === void 0 ? void 0 : _config$meta2.additionalTableKeys) || [];
+  const additionalTableKeys = config.meta?.additionalTableKeys || [];
   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(() => {
-    var _inputConfig$meta2;
-    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
-  }, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
-    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
+    namespace: inputConfig?.meta?.namespace,
+    skipFetch: inputConfig?.meta?.skipFetch,
     isAjaxModal,
-    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
+    formScope: inputConfig?.meta?.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
+  const dataLinkForm = ajaxModalValues?.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10036,12 +10041,12 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
       'videos': 'Video'
     };
     tableKeys.filter(tableKey => tableKey !== 'datastakeId').forEach(tableKey => {
-      var _dataLinkForm$identif;
-      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
+      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
       if (formInputConfig) {
-        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[tableKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10049,7 +10054,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10057,37 +10062,37 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item === null || item === void 0 ? void 0 : item[tableKey];
+        values[tableKey] = item?.[tableKey];
       } else {
-        var _item$linking;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
+          type: inputConfig?.type
         };
-        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
       }
     });
     siblingInputsMatchingTableKeys.forEach(siblingKey => {
       const siblingConfig = config.inputs[siblingKey];
       if (siblingConfig) {
-        inputs[siblingKey] = _objectSpread2(_objectSpread2({}, siblingConfig), {}, {
+        inputs[siblingKey] = {
+          ...siblingConfig,
           label: siblingConfig.label || siblingKey
-        });
-        values[siblingKey] = item === null || item === void 0 ? void 0 : item[siblingKey];
+        };
+        values[siblingKey] = item?.[siblingKey];
       }
     });
-    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
+    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];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
-        var _item$linking2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[fieldKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        });
-        if (formInputConfig !== null && formInputConfig !== void 0 && formInputConfig.label && typeof (formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label) === 'object') {
-          const dynamicLabelKeys = Object.keys(formInputConfig === null || formInputConfig === void 0 ? void 0 : 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 ');
@@ -10096,7 +10101,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
               const flattenedItem = Object.assign({}, item.location, {
                 address: item.address
               });
-              if ((flattenedItem === null || flattenedItem === void 0 ? void 0 : flattenedItem[conditionKey]) === conditionValue) {
+              if (flattenedItem?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10104,7 +10109,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
+        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
       });
     }
     return {
@@ -10114,17 +10119,16 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      var _merged$inputKey;
       const merged = mergeObject(item);
-      const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey = merged[inputKey]) === null || _merged$inputKey === void 0 ? void 0 : _merged$inputKey.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
+      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
       const {
         inputs,
         values
       } = createInputsAndValues(merged);
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
         config: {
-          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
           type: 'custom-datalink-group',
           inputs: inputs
         },
@@ -10138,12 +10142,11 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, "".concat(inputKey, "-").concat(itemIndex));
+      }, `${inputKey}-${itemIndex}`);
     });
   } else {
-    var _merged$inputKey2;
     const merged = mergeObject(value);
-    const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey2 = merged[inputKey]) === null || _merged$inputKey2 === void 0 ? void 0 : _merged$inputKey2.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
+    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
     const {
       inputs,
       values
@@ -10165,7 +10168,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, "".concat(inputKey, "-group"));
+    }, `${inputKey}-group`);
   }
 };
 
@@ -10346,21 +10349,20 @@ const handleDataLinkWithTableKeys = ({
   }
 };
 
-const handleGroupChildren = _ref => {
-  let {
-    config,
-    value,
-    allData,
-    level,
-    t,
-    rootForm,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
-  if (!(config !== null && config !== void 0 && config.inputs)) {
+const handleGroupChildren = ({
+  config,
+  value,
+  allData,
+  level,
+  t,
+  rootForm,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
+  if (!config?.inputs) {
     return null;
   }
   const inputKeys = Object.keys(config.inputs);
@@ -10373,7 +10375,7 @@ const handleGroupChildren = _ref => {
     if (value && typeof value === 'object' && value[inputKey]) {
       inputValue = value[inputKey];
     } else {
-      inputValue = allData === null || allData === void 0 ? void 0 : allData[inputKey];
+      inputValue = allData?.[inputKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: inputKey,

package/dist/pages/index.js

@@ -42783,7 +42783,6 @@ const PlantingLocations = ({
         id: matchingLocation?.id || locationCheckArrival._id || `event-${index}`,
         name: event.name || t("Activity Start"),
         date: event.date,
-        sources: 1,
         subTitle: event.date ? renderDateFormatted(event.date, "DD MMM YY") : locationName,
         plotName: locationName,
         territoryTitle: locationName,
@@ -42802,7 +42801,7 @@ const PlantingLocations = ({
       },
       children: /*#__PURE__*/jsxRuntime.jsx(Map$1, {
         data: mappedData,
-        link: true,
+        link: false,
         style: {
           height: '100%',
           width: '100%'
@@ -42812,6 +42811,7 @@ const PlantingLocations = ({
         onClickLink: () => {},
         onFilterChange: () => {},
         primaryLink: true,
+        showSider: false,
         renderTooltipForLocation: data => {
           const coordinates = data.gps?.latitude && data.gps?.longitude ? convertDMS(data.gps.latitude, data.gps.longitude) : null;
           if (!coordinates) {
@@ -43543,7 +43543,7 @@ const CycleOutcomes = ({
           },
           children: /*#__PURE__*/jsxRuntime.jsx(StatCard, {
             title: t("Total Area Restored"),
-            value: totalAreaRestored ? Number(totalAreaRestored.current).toLocaleString() : 0,
+            value: totalAreaRestored ? Number(totalAreaRestored.current).toLocaleString() + " ha" : 0 + " ha",
             icon: "Tree",
             change: totalAreaRestoredChange
           })

package/package.json

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

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleOutcomes/index.jsx

@@ -82,7 +82,7 @@ const CycleOutcomes = ({
                     <section style={{ flex: 1 }}>
                         <StatCard
                             title={t("Total Area Restored")}
-                            value={totalAreaRestored?Number(totalAreaRestored.current).toLocaleString() : 0}
+                            value={totalAreaRestored?Number(totalAreaRestored.current).toLocaleString() + " ha" : 0 + " ha"}
                             icon="Tree"
                             change={totalAreaRestoredChange}
                         />

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/PlantingLocations/index.jsx

@@ -93,7 +93,6 @@ const PlantingLocations = ({
               id: matchingLocation?.id || locationCheckArrival._id || `event-${index}`,
               name: event.name || t("Activity Start"),
               date: event.date,
-              sources: 1,
               subTitle: event.date ? renderDateFormatted(event.date, "DD MMM YY") : locationName,
               plotName: locationName,
               territoryTitle: locationName,
@@ -111,13 +110,14 @@ const PlantingLocations = ({
           >
               <MineSiteMap
                   data={mappedData}
-                  link
+                  link={false}
                   style={{ height: '100%', width: '100%' }}
                   maxZoom={18}
                   isSatellite={true}
                   onClickLink={() => { }}
                   onFilterChange={() => { }}
                   primaryLink
+                  showSider={false}
                   renderTooltipForLocation={(data) => {
                       const coordinates = data.gps?.latitude && data.gps?.longitude
                           ? convertDMS(data.gps.latitude, data.gps.longitude)