datastake-daf 0.6.796 → 0.6.798

package/dist/utils/index.js

@@ -5762,7 +5762,7 @@ function filterOptions(options, filters, formsValue = {}, repeatValues = {}, fil
  * @param {Array} arr - The array to check.
  * @returns {boolean} - True if the array contains only objects, false otherwise.
  */
-const isArrayOfObjects = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
+const isArrayOfObjects$1 = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
 
 /**
  * Determines if two sets of data have not changed. Used to show Save button disabled or not.
@@ -5793,7 +5793,7 @@ const hasNotChanged = (old, newData) => {
               return old[key] === newData[key].format("YYYY-MM-DD");
             }
             return old[key] === moment__default["default"](newData[key]._d).format("YYYY-MM-DD");
-          } else if (isArrayOfObjects(newData[key])) {
+          } else if (isArrayOfObjects$1(newData[key])) {
             return newData[key].length === (old[key] || []).length && newData[key].map((oKey, i) => hasNotChanged((old[key] || [])[i] || {}, oKey || {})).every(i => i);
           }
         } catch (e) {
@@ -6052,6 +6052,54 @@ const sortForm = ({
   return _form;
 };
 
+// REQUIRED FOR EDIT FORM SUBMIT(SAVE)
+const extractFiles = (fileList = []) => {
+  const processedFiles = fileList.map(file => file.response || file).filter(file => file?.status === "done");
+
+  // Remove duplicates
+  return Array.isArray(processedFiles) ? [...new Set(processedFiles)] : processedFiles;
+};
+const hasFileList = value => {
+  return value && typeof value === "object" && value !== null && "fileList" in value;
+};
+const hasContent = obj => {
+  if (typeof obj !== "object" || obj === null) return true;
+  return Object.keys(obj).some(key => propHasValue(obj[key]));
+};
+const transformPayload = payload => {
+  if (!payload || typeof payload !== "object") return payload;
+  const transformed = {
+    ...payload
+  };
+  Object.keys(transformed).forEach(key => {
+    const value = transformed[key];
+
+    // Skip null or non-object values
+    if (!value || typeof value !== "object" || !propHasValue(value)) return;
+
+    // Handle arrays - filter out empty objects
+    if (Array.isArray(value)) {
+      transformed[key] = value.filter(hasContent);
+      return;
+    }
+
+    // Handle objects with fileLists
+    if (hasFileList(value)) {
+      transformed[key] = extractFiles(value.fileList);
+      return;
+    }
+
+    // Handle nested objects that might have fileLists
+    Object.keys(value).forEach(nestedKey => {
+      const nestedValue = value[nestedKey];
+      if (hasFileList(nestedValue)) {
+        transformed[key][nestedKey] = extractFiles(nestedValue.fileList);
+      }
+    });
+  });
+  return transformed;
+};
+
 ({
   background: PropTypes__default["default"].string,
   style: PropTypes__default["default"].any
@@ -13114,7 +13162,7 @@ const formatErrors = e => {
  */
 const renderNumber = (val, doubleDigit = false) => {
   if (typeof val !== 'number') {
-    return '--';
+    return '-';
   }
   const _string = Number(val).toLocaleString('en-us');
   if (doubleDigit) {
@@ -14958,6 +15006,8 @@ const copyToClipboard = id => {
   }
 };
 
+const isArrayOfObjects = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
+
 exports.ErrorFormat = ErrorFormat;
 exports.MessageTypes = MessageTypes;
 exports.StorageManager = StorageManager;
@@ -14988,6 +15038,7 @@ exports.defaultMapConfig = defaultMapConfig;
 exports.defaultTheme = mmtTheme;
 exports.displayMessage = displayMessage;
 exports.editErrorHandler = editErrorHandler;
+exports.extractFiles = extractFiles;
 exports.fetchImageAsBuffer = fetchImageAsBuffer;
 exports.filterCreateData = filterCreateData;
 exports.filterOptions = filterOptions;
@@ -15016,8 +15067,11 @@ exports.handleError = handleError;
 exports.handleInfo = handleInfo;
 exports.handleSuccess = handleSuccess;
 exports.handleWarning = handleWarning;
+exports.hasContent = hasContent;
+exports.hasFileList = hasFileList;
 exports.hasKeyInObject = hasKeyInObject;
 exports.hasNotChanged = hasNotChanged;
+exports.isArrayOfObjects = isArrayOfObjects;
 exports.isEmptyOrSpaces = isEmptyOrSpaces;
 exports.isModuleApproved = isModuleApproved;
 exports.isProxy = isProxy;
@@ -15050,6 +15104,7 @@ exports.splitStringInMultipleLines = splitStringInMultipleLines;
 exports.tazamaTheme = tazamaTheme;
 exports.tifTheme = tifTheme;
 exports.titleToCamelCase = titleToCamelCase;
+exports.transformPayload = transformPayload;
 exports.truncateString = truncateString;
 exports.userHasInterface = userHasInterface;
 exports.userIsAdmin = userIsAdmin;

package/package.json

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

package/src/@daf/core/components/EditForm/sections.jsx

@@ -1,6 +1,6 @@
 import { Menu } from 'antd';
 import PropTypes from 'prop-types'
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { formPaths } from '../../../../helpers/Forms';
 import { editErrorHandler, getInputLabel, showHideInput } from './helper';
 
@@ -92,9 +92,19 @@ export const Sections = ({
   const [formGroups, setFormGroups] = useState([]);
   const [selectedGroup, setSelectedGroup] = useState(null);
 
+  const formConfigToUse = useMemo(() => {
+    if(Array.isArray(formConf)) {
+      return formConf;
+    }
+    if(typeof formConf === 'object' && Object.keys(formConf)?.length) {
+      return formConf;
+    }
+    return [];
+  },[formConf])
+
   // Build form groups with highlight/disable state
   useEffect(() => {
-    const _formGroups = formConf.map((c) => {
+    const _formGroups = formConfigToUse?.map((c) => {
       const _highlighted = getHighlighted({ ...c }, { ...data });
 
       const disabled = getDisabled({
@@ -113,7 +123,7 @@ export const Sections = ({
 
     setHasMissing(!!_formGroups.find(f => f.hasMissing));
     setFormGroups(_formGroups);
-  }, [formConf, highlightMandatory]);
+  }, [formConfigToUse, highlightMandatory]);
 
   // Initial selection logic
   useEffect(() => {
@@ -121,11 +131,11 @@ export const Sections = ({
 
     if (match?.params?.formId) {
       // Special case: only group id
-      sGroup = group || (formConf.length ? formConf[0].id : null);
+      sGroup = group || (formConf?.length ? formConf?.[0]?.id : null);
     } else {
       // General case: full path
       sGroup = `${group || ''}${subsection ? `/${subsection}` : ''}${subgroup ? `/${subgroup}` : ''}${formid ? `/${formid}` : ''}`;
-      if (!group && formConf.length) {
+      if (!group && formConf?.length) {
         sGroup = formConf[0].id;
       }
     }
@@ -176,12 +186,12 @@ export const Sections = ({
       let sGroup;
       if (match?.params?.formId) {
         // Special case fallback
-        sGroup = group || (formConf.length ? formConf[0].id : null);
+        sGroup = group || (formConf?.length ? formConf?.[0]?.id : null);
       } else {
         // General fallback
         sGroup = `${group || ''}${subsection ? `/${subsection}` : ''}${subgroup ? `/${subgroup}` : ''}${formid ? `/${formid}` : ''}`;
-        if (!group && formConf.length) {
-          sGroup = formConf[0].id;
+        if (!group && formConf?.length) {
+          sGroup = formConf?.[0]?.id;
         }
       }
       setSelectedGroup(sGroup);

package/src/@daf/pages/Edit/hooks/usePrepareForm.js

@@ -0,0 +1,178 @@
+import { useState, useEffect } from "react";
+import { hasKeyInObject } from "../../../utils/object.js"
+import { mapFormGroup } from "../../../core/components/EditForm/helper.js"
+import { changeInputMeta as  changeInputMetaDaf, hasNotChanged} from "../../../../helpers/Forms.js"
+
+export const usePrepareForm = ({
+    isSupported,
+    namespaceConfig,
+    APP,
+    allData,
+    id,
+    MainForm,
+    namespace,
+    setIsChanged,
+    changedPath,
+    setChangedPath,
+}) => {
+    const [form, setForm] = useState({});
+    const [data, setData] = useState({});
+    const [groups, setGroups] = useState({});
+    const [linkingForms, setLinkingForms] = useState({});
+    const [loading, setLoading] = useState(true);
+    const [notFound, setNotFound] = useState(false);
+    const [editValues, setEditValues] = useState({});
+    const [inputsMeta, setInputsMeta] = useState({});
+    const [originalData, setOriginalData] = useState({});
+
+    const prepareForm = (setExtra = true) => {
+		if (isSupported) {
+			const dKey = namespaceConfig?.dataKey;
+			const nKey = `${APP}-${namespaceConfig?.view}`;
+			if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
+				const d = JSON.parse(JSON.stringify(allData[dKey][nKey].data || {}));
+				Object.keys(d).forEach((k) => {
+					if (d[k] === null) {
+						d[k] = undefined;
+					}
+				});
+				if (d.datastakeId === id || d.applicationId === id || id === "user") {
+					const formG = mapFormGroup(allData[dKey][nKey].form || {}, d);
+					setForm(formG);
+
+					if (setExtra) {
+						if (
+							(d || {}).risk &&
+							Array.isArray(formG) &&
+							formG.find((r) => r.id === "risk")
+						) {
+							const form = formG.find((r) => r.id === "risk");
+							if (form && form.options && form.template === "risk") {
+								const newData = Object.keys(d.risk).reduce((all, key) => {
+									const forms = form.options[key].forms;
+									const formsKeys = Object.keys(forms);
+									const formData = formsKeys.map((k) => {
+										const foundValue = d.risk[key].find(
+											(v) => v.subCategory === k,
+										);
+										return (
+											foundValue || {
+												id: k,
+												components: {},
+												config: [],
+												connectedEvents: {},
+												category: key,
+												score: 0,
+												subCategory: k,
+											}
+										);
+									});
+									all[key] = formData;
+									return all;
+								}, {});
+								setData({ ...d, risk: newData });
+								MainForm.resetFields();
+								setEditValues({ ...d });
+								setInputsMeta(d?.meta?.inputs || {});
+								setOriginalData({ ...d });
+								setLinkingForms(allData[dKey][nKey].linkingForms);
+								setLoading(false);
+								return;
+							}
+						}
+						setData({ ...d });
+						MainForm.resetFields();
+						setEditValues({ ...d });
+						setInputsMeta(d?.meta?.inputs || {});
+						setOriginalData({ ...d });
+						setLinkingForms(allData[dKey][nKey].linkingForms);
+						setLoading(false);
+					}
+				}
+			}
+		}
+	};
+    const getCertainData = allData?.[namespaceConfig?.dataKey];
+  
+    useEffect(() => {
+        if(namespace && namespaceConfig) {
+            prepareForm(namespaceConfig?.view);
+        }
+    }, [getCertainData, namespaceConfig]);
+
+    const changeLinking = ({ key, linkingKey, value }) => {
+		const _val = {
+			linking: {
+				...(data?.linking || {}),
+				[key]: {
+					...((data?.linking || {})[key] || {}),
+					[linkingKey]: value,
+				},
+			},
+		};
+
+		const _all = { ...data, ..._val };
+
+		setData(_all);
+	};
+
+    const onValuesChange = (val, all) => {
+		setEditValues(all);
+		const keys = val && typeof val === "object" ? Object.keys(val) : [];
+		if (keys.length === 1) {
+			const changedKey = keys[0];
+			const ogData = originalData[changedKey];
+			const newData = all[changedKey];
+			let changePath = JSON.parse(JSON.stringify(changedPath));
+			if (!hasNotChanged({ [changedKey]: ogData }, { [changedKey]: newData })) {
+				if (!changePath.includes(changedKey)) {
+					changePath.push(changedKey);
+				}
+			} else {
+				changePath = changePath.filter((k) => k !== changedKey);
+			}
+			setChangedPath([...changePath]);
+			setIsChanged(changePath.length > 0 || newData ? true : false);
+		} else {
+			setIsChanged(true);
+		}
+		prepareForm(false);
+	};
+
+    const changeInputMeta = ({ key, type, value, otherValues = {} }) => {
+		return changeInputMetaDaf({
+			key,
+			type,
+			value,
+			otherValues,
+			setInputsMeta,
+			editValues,
+			MainForm,
+			setData,
+			onValuesChange,
+		});
+	};
+
+    return {
+        form,
+        data,
+        groups,
+        linkingForms,
+        loading,
+        notFound,
+        editValues,
+        inputsMeta,
+        originalData,
+        setGroups,
+        setNotFound,
+        setLinkingForms,
+        prepareForm,
+        setInputsMeta,
+        setData,
+        setLoading,
+        setEditValues,
+        changeLinking,
+        changeInputMeta,
+        onValuesChange,
+    }
+}