datastake-daf 0.6.753 → 0.6.755

package/dist/components/index.js

@@ -9436,29 +9436,24 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-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] : {};
+const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        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;
+        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
+        const options = config?.options || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
+        const options = config?.options || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9473,7 +9468,7 @@ const renderFieldData = function (type, value, user, config) {
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
+      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9487,7 +9482,7 @@ const renderFieldData = function (type, value, user, config) {
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
+        const documentName = allValues?.map(item => item?.name).join(', ');
         return documentName;
       }
     default:
@@ -9495,27 +9490,25 @@ const renderFieldData = function (type, value, user, config) {
   }
 };
 
-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 renderValue = ({
+  value,
+  hasChildren,
+  config,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  allData = {}
+}) => {
+  if (config?.type === 'groupInputs') {
+    if (!config?.inputs) return null;
     const inputKeys = 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;
     });
     const values = inputKeys.map(inputKey => {
-      let inputValue = value === null || value === void 0 ? void 0 : value[inputKey];
+      let inputValue = value?.[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
       } else if (typeof inputValue === 'object' && inputValue !== null) {
@@ -9556,8 +9549,8 @@ const renderValue = _ref => {
   } else {
     displayValue = String(value);
   }
-  const fieldType = (config === null || config === void 0 ? void 0 : config.type) || 'text';
-  let cssClass = "tree-value ".concat(fieldType, "-type");
+  const fieldType = config?.type || 'text';
+  let cssClass = `tree-value ${fieldType}-type`;
   if (displayValue === '-') {
     cssClass += ' empty';
   }
@@ -9567,21 +9560,19 @@ const renderValue = _ref => {
     children: displayValue
   });
 };
-const determineHasChildren = _ref2 => {
-  var _config$meta;
-  let {
-    config,
-    level
-  } = _ref2;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
+const determineHasChildren = ({
+  config,
+  level
+}) => {
+  if (config?.type === 'groupInputs') {
     return false;
   }
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'header' && config !== null && config !== void 0 && config.inputs && Object.keys(config.inputs).length > 0) {
+  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
     return true;
   }
-  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' ||
+  return config?.inputs || config?.type === 'group' || config?.type === 'dataLinkGroup' || config?.type === 'section' || config?.type === 'ajaxSubGroup' ||
   // Add this line
-  (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);
+  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);
 };
 
 const sortByPosition = (items, getConfig) => {
@@ -10247,20 +10238,21 @@ const handleDataLinkWithTableKeys = ({
   }
 };
 
-const handleGroupChildren = ({
-  config,
-  value,
-  allData,
-  level,
-  t,
-  rootForm,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
-  if (!config?.inputs) {
+const handleGroupChildren = _ref => {
+  let {
+    config,
+    value,
+    allData,
+    level,
+    t,
+    rootForm,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
+  if (!(config !== null && config !== void 0 && config.inputs)) {
     return null;
   }
   const inputKeys = Object.keys(config.inputs);
@@ -10273,7 +10265,7 @@ const handleGroupChildren = ({
     if (value && typeof value === 'object' && value[inputKey]) {
       inputValue = value[inputKey];
     } else {
-      inputValue = allData?.[inputKey];
+      inputValue = allData === null || allData === void 0 ? void 0 : allData[inputKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: inputKey,
@@ -10292,20 +10284,22 @@ const handleGroupChildren = ({
   });
 };
 
-const GroupInputsHandler = ({
-  config,
-  allData,
-  value
-}) => {
+const GroupInputsHandler = _ref => {
+  let {
+    config,
+    allData,
+    value
+  } = _ref;
   const renderGroupInputsValue = () => {
-    if (!config?.inputs) return '';
+    if (!(config !== null && config !== void 0 && config.inputs)) return '';
     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 = allData?.[inputKey] || value?.[inputKey];
+      let inputValue = (allData === null || allData === void 0 ? void 0 : allData[inputKey]) || (value === null || value === void 0 ? void 0 : value[inputKey]);
       const inputConfig = config.inputs[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
@@ -10318,7 +10312,7 @@ const GroupInputsHandler = ({
           return JSON.stringify(inputValue);
         }
       } else {
-        if (inputConfig?.options) {
+        if (inputConfig !== null && inputConfig !== void 0 && inputConfig.options) {
           const option = findOptions(inputValue, inputConfig.options);
           return option || String(inputValue);
         }
@@ -10423,12 +10417,11 @@ const AjaxSubGroup$2 = ({
 };
 
 const handleAjaxSubGroupChildren = props => {
-  if (props.config?.type !== 'ajaxSubGroup' || !Array.isArray(props.value)) {
+  var _props$config;
+  if (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.type) !== 'ajaxSubGroup' || !Array.isArray(props.value)) {
     return null;
   }
-  return [/*#__PURE__*/jsxRuntime.jsx(AjaxSubGroup$2, {
-    ...props
-  }, "ajax-subgroup")];
+  return [/*#__PURE__*/jsxRuntime.jsx(AjaxSubGroup$2, _objectSpread2({}, props), "ajax-subgroup")];
 };
 
 const TreeNode = _ref => {
@@ -39899,43 +39892,56 @@ function DynamicForm(_ref) {
       //   setOriginalData({});
       //   setValues({});
       //   MainForm.resetFields();
+    } else if (isCreate) {
+      // Reset form when data is empty in create mode (e.g., when switching contexts)
+      setOriginalData({});
+      setValues({});
+      MainForm.resetFields();
     }
-  }, [data]);
+  }, [data, isCreate]);
 
   // Initialize default values for hidden and disabled fields
   React.useEffect(() => {
     if (Object.keys(form).length > 0) {
-      const updatedValues = _objectSpread2({}, values);
-      let hasChanges = false;
-      const isEditMode = data && (data.id || data._id);
-
-      // Process all form fields to set default values for hidden and disabled fields
-      Object.keys(form).forEach(formKey => {
-        Object.keys(form[formKey]).forEach(fieldKey => {
-          var _field$meta, _field$meta2, _field$meta3, _field$meta4, _field$meta5, _field$meta6;
-          const field = form[formKey][fieldKey];
-          const fieldId = field.dataId || fieldKey;
-
-          // Check if field is disabled
-          const isDisabled = field !== null && field !== void 0 && (_field$meta = field.meta) !== null && _field$meta !== void 0 && _field$meta.disableEdit && typeof (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.disableEdit) === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field === null || field === void 0 || (_field$meta3 = field.meta) === null || _field$meta3 === void 0 || (_field$meta3 = _field$meta3.disableEdit) === null || _field$meta3 === void 0 ? void 0 : _field$meta3.edit) && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field === null || field === void 0 || (_field$meta4 = field.meta) === null || _field$meta4 === void 0 || (_field$meta4 = _field$meta4.disableEdit) === null || _field$meta4 === void 0 ? void 0 : _field$meta4.edit) && isEditMode : field === null || field === void 0 || (_field$meta5 = field.meta) === null || _field$meta5 === void 0 ? void 0 : _field$meta5.disableEdit;
-
-          // Set default value for hidden fields or disabled fields with default values
-          if ((field === null || field === void 0 || (_field$meta6 = field.meta) === null || _field$meta6 === void 0 ? void 0 : _field$meta6.defaultValue) !== undefined && !propHasValue(updatedValues[fieldId])) {
-            var _field$meta7;
-            if ((field === null || field === void 0 || (_field$meta7 = field.meta) === null || _field$meta7 === void 0 ? void 0 : _field$meta7.hidden) === true || isDisabled) {
-              updatedValues[fieldId] = field.meta.defaultValue;
-              hasChanges = true;
+      setValues(prevValues => {
+        // Use data prop as base, or current values if data is empty
+        const baseValues = Object.keys(data).length > 0 ? data : prevValues;
+        const updatedValues = _objectSpread2({}, baseValues);
+        let hasChanges = false;
+        const isEditMode = data && (data.id || data._id);
+
+        // Process all form fields to set default values for hidden and disabled fields
+        Object.keys(form).forEach(formKey => {
+          Object.keys(form[formKey]).forEach(fieldKey => {
+            var _field$meta, _field$meta2, _field$meta3, _field$meta4, _field$meta5, _field$meta6;
+            const field = form[formKey][fieldKey];
+            const fieldId = field.dataId || fieldKey;
+
+            // Check if field is disabled
+            const isDisabled = field !== null && field !== void 0 && (_field$meta = field.meta) !== null && _field$meta !== void 0 && _field$meta.disableEdit && typeof (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.disableEdit) === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field === null || field === void 0 || (_field$meta3 = field.meta) === null || _field$meta3 === void 0 || (_field$meta3 = _field$meta3.disableEdit) === null || _field$meta3 === void 0 ? void 0 : _field$meta3.edit) && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field === null || field === void 0 || (_field$meta4 = field.meta) === null || _field$meta4 === void 0 || (_field$meta4 = _field$meta4.disableEdit) === null || _field$meta4 === void 0 ? void 0 : _field$meta4.edit) && isEditMode : field === null || field === void 0 || (_field$meta5 = field.meta) === null || _field$meta5 === void 0 ? void 0 : _field$meta5.disableEdit;
+
+            // Set default value for hidden fields or disabled fields with default values
+            if ((field === null || field === void 0 || (_field$meta6 = field.meta) === null || _field$meta6 === void 0 ? void 0 : _field$meta6.defaultValue) !== undefined) {
+              var _field$meta7, _field$meta8;
+              // In create mode, always update disabled/hidden fields with default values when form config changes
+              // This ensures context switching (Operation -> Restoration) updates the field correctly
+              const shouldUpdate = !propHasValue(updatedValues[fieldId]) || isCreate && !isEditMode && ((field === null || field === void 0 || (_field$meta7 = field.meta) === null || _field$meta7 === void 0 ? void 0 : _field$meta7.hidden) === true || isDisabled);
+              if (shouldUpdate && ((field === null || field === void 0 || (_field$meta8 = field.meta) === null || _field$meta8 === void 0 ? void 0 : _field$meta8.hidden) === true || isDisabled)) {
+                updatedValues[fieldId] = field.meta.defaultValue;
+                hasChanges = true;
+              }
             }
-          }
+          });
         });
+        if (hasChanges) {
+          // Also set the values in the Ant Design form
+          MainForm.setFieldsValue(updatedValues);
+          return updatedValues;
+        }
+        return prevValues;
       });
-      if (hasChanges) {
-        setValues(updatedValues);
-        // Also set the values in the Ant Design form
-        MainForm.setFieldsValue(updatedValues);
-      }
     }
-  }, [form, data, isModal]);
+  }, [form, data, isModal, isCreate]);
   const setSelectedForm = id => {
     setForms(Forms.map(form => {
       id === form.id ? form.selected = true : form.selected = false;