datastake-daf 0.6.796 → 0.6.798

package/src/@daf/pages/Edit/index.jsx

@@ -0,0 +1,356 @@
+import React, { useMemo, useState, useCallback, useEffect } from 'react'
+import { Form, message } from 'antd';
+import { useViewUrlParams } from '../View/hooks/useViewUrlParams';
+import { usePrepareForm } from './hooks/usePrepareForm';
+import { useViewPermissions } from '../View/hooks/useViewPermissions';
+import { useCallToGetData } from '../View/hooks/useCallToGetData';
+import { MessageTypes } from '../../../helpers/messages.js';
+import { editErrorHandler } from "../../core/components/EditForm/helper.js"
+import { transformPayload } from "../../../helpers/Forms.js"
+import Loading from "../../../@daf/core/components/Loading/index.jsx"
+import NotFound from "../../core/components/Screens/NotFound/index.jsx"
+import Header from "../../core/components/Header/index.jsx"
+import MissingTagButton from "../../core/components/UI/MissingTagButton/index.jsx"
+import { Sections as EditFormSections} from "../../core/components/EditForm/sections.jsx"
+import { EditForm } from "../../core/components/EditForm/form.jsx"
+
+
+const Edit = ({
+    goTo = () => {},
+    allData = {},
+    query,
+    push,
+    searchParams,
+    setSearchParams,
+    setNotificationMode,
+    changeNotificationState,
+    addCheck,
+    removeCheck,
+    ajaxForms,
+    changeAjaxForms,
+    ajaxOptions,
+    changeAjaxOptions,
+    params,
+    clear,
+    getRedirectLink,
+    pathname,
+    search,
+    viewConfig,
+    APP,
+    namespaceConfiguration,
+    user,
+    t,
+    actionMap,
+    submitCall,
+    notificationMode,
+    breadcrumbs,
+    generatePath,
+    getAppHeader,
+    getApiBaseUrl,
+    namespaceOverrides,
+    getSubjectsDetails,
+
+    excludedKeys = [],
+	disabledInputs = [],
+	checkDuplicates = true,
+
+}) => {
+    const [MainForm] = Form.useForm();
+    const [isChanged, setIsChanged] = useState(false);
+    const [highlightMandatory, setHighlightMandatory] = useState(false);
+	const [hasMissing, setHasMissing] = useState(false);
+	const [selectedForm, setSelectedForm] = useState({});
+    const [errors, setErrors] = useState({});
+	const changeErrors = useCallback((key, val) => {
+		setErrors((p) => ({ ...p, [key]: val }));
+	}, []);
+    const {
+		namespace,
+		id,
+		group,
+		subsection,
+		match,
+		subgroup,
+		formId,
+		getViewLink,
+		changedPath,
+		setChangedPath,
+	} = useViewUrlParams({
+		params,
+		push,
+		pathname,
+		search,
+		searchParams,
+		setSearchParams,
+		getRedirectLink,
+	})
+
+    const isSupported = viewConfig?.supportedNamespaces?.[APP] && viewConfig?.supportedNamespaces?.[APP]?.includes(namespace);
+    const getNamespaceConfig = (namespace) => namespaceConfiguration?.[namespace] || {};
+	const namespaceConfig = useMemo(() => getNamespaceConfig(namespace), [namespace]);
+
+    const {
+		form,
+		data,
+		linkingForms,
+		loading,
+		editValues,
+		inputsMeta,
+		setLoading,
+		changeLinking,
+		changeInputMeta,
+		onValuesChange,
+	} = usePrepareForm({
+		isSupported,
+		namespaceConfig,
+		APP,
+		allData,
+		id,
+		MainForm,
+		namespace,
+		setIsChanged,
+		changedPath,
+		setChangedPath,
+	})
+
+    useEffect(() => {
+        if(namespace && id && namespaceConfig && typeof getSubjectsDetails === 'function') {
+            getSubjectsDetails({
+                namespace,
+                id,
+                namespaceConfig,
+            })
+        }
+    }, [namespace, id, namespaceConfig])
+
+
+	const { canEdit } = useViewPermissions({
+		data,
+		id,
+		namespace,
+		user,
+		push,
+		getRedirectLink,
+        namespaceConfig: namespaceConfiguration,
+        APP,
+        viewConfig: viewConfig,
+        namespaceOverrides,
+	});
+
+    const action = useMemo(() => actionMap?.[namespaceConfig?.action], [namespaceConfig?.action, actionMap]);
+
+    const namespaceGet = {
+		[namespace]: () => {
+			return action?.({
+				namespace: namespaceConfig?.namespace,
+				module: APP,
+				view: namespaceConfig?.view,
+				...(namespaceConfig?.scope && { scope: namespaceConfig.scope }),
+				datastakeId: id ? id : 'user',
+			})
+		}
+	}
+
+    useCallToGetData({
+		namespaceConfig,
+		namespace,
+		allData,
+		id,
+		isSupported,
+		namespaceGet,
+		source: null,
+		version: null,
+		user,
+		setLoading,
+		APP,
+	})
+
+    const callback = (type, m) => {
+		localStorage.removeItem(`${id}-loading`);
+		localStorage.setItem(`${id}-updated`, true);
+		if (type === MessageTypes.SUCCESS) {
+			message.success(m);
+			setIsChanged(false);
+		} else {
+			message.error(m);
+		}
+		localStorage.removeItem(`${id}-updated`);
+		setLoading(false);
+	};
+
+    const onSubmitData = () => {
+		clear();
+	
+		// Validate custom errors
+		const _errors = Object.keys(errors)
+			.filter((k) => !!errors[k])
+			.map((k) => ({ name: [k] }));
+	
+		if (_errors.length) {
+			editErrorHandler({ errorFields: _errors, t });
+			return;
+		}
+	
+		// Validate and submit form
+		MainForm.validateFields()
+			.then(() => {
+				// Build base payload
+				const { _id, ..._payloadData } = {
+					...editValues,
+					form: subsection || group,
+					module: APP,
+					view: namespaceConfig?.view,
+					namespace,
+				};
+	
+				// Transform payload (process files, clean arrays)
+				const finalPayload = transformPayload(_payloadData);
+	
+				// Setup UI state
+				setIsChanged(false);
+				setNotificationMode(notificationMode.EMPTY);
+				setLoading(true);
+				localStorage.setItem(`${id}-loading`, true);
+		
+				// Submit
+				submitCall[namespace](
+					!editValues?.id 
+						? finalPayload
+						: Object.assign(finalPayload, { id: data.id }),
+					callback,
+				);
+			})
+			.catch((e) => {
+				console.log(e);
+				editErrorHandler({ errorFields: e.errorFields, t });
+			});
+	};
+
+    useEffect(
+		() => () => {
+			clear();
+		},
+		[],
+	);
+
+    const pageActions = [
+		{
+			tooltip: t("Save"),
+			onClick: () => onSubmitData(true),
+			disabled: !isChanged,
+			type: "primary",
+			icon: "Save",
+		},
+		{
+			icon: "Close",
+			tooltip: t("Back"),
+			onClick: () => {
+				changeNotificationState({ onYes: () => goTo(getViewLink()) });
+			},
+		},
+	];
+
+	useEffect(() => {
+		if (isChanged) {
+			addCheck(() => {
+				goTo(`/app/view/${namespace}/${id}/${group}`);
+			});
+		} else {
+			removeCheck();
+		}
+	}, [isChanged, addCheck, removeCheck]);
+
+    if (!data.id && namespace !== 'kyc') {
+		return <Loading />;
+	}
+
+    if(!isSupported && !canEdit) {
+        return <NotFound t={t} />
+    }
+
+    return (
+        <div className="daf-edit-form">
+            <React.Fragment>
+                <Header 
+                    breadcrumbs={breadcrumbs}
+                    title={(namespace === 'kyc' ? "KYC" : data?.name) || ""}
+                    actionButtons={pageActions}
+                    renderExtraComponents={
+                        () => {
+                            return <MissingTagButton hasMissing={hasMissing} highlightMandatory={highlightMandatory} setHighlightMandatory={setHighlightMandatory} t={t} />
+                        }
+                    }
+                />
+                <div className="view-content">
+                    <EditFormSections
+						t={t}
+						data={editValues}
+						MainForm={MainForm}
+						getRedirectLink={getRedirectLink}
+						highlightMandatory={highlightMandatory}
+						search={search}
+						setHasMissing={setHasMissing}
+						mod={APP}
+						formConf={form}
+						values={data}
+						errors={errors}
+						onChangeForm={(sForm) => {
+							setSelectedForm(sForm);
+						}}
+						match={match}
+						group={group}
+						subsection={subsection}
+						subgroup={subgroup}
+						formid={formId}
+						user={user}
+						{...{
+							goTo,
+							pathname,
+							generatePath,
+						}}
+					/>
+                    					<div className="form-edit">
+						{loading ? (
+							<div style={{ minHeight: 10000 }}>
+								<Loading background="white" />
+							</div>
+						) : (
+							<EditForm
+								errors={errors}
+								changeErrors={changeErrors}
+								highlightMandatory={highlightMandatory}
+								MainForm={MainForm}
+								onValuesChange={onValuesChange}
+								disabledInputs={disabledInputs}
+								checkDuplicates={checkDuplicates}
+								inputsMeta={inputsMeta}
+								changeInputMeta={changeInputMeta}
+								changeLinking={changeLinking}
+								excludedKeys={excludedKeys}
+								hasSections={[]}
+								linkingForms={linkingForms}
+								form={selectedForm}
+								data={data}
+								{...{
+									t,
+									user,
+									ajaxForms,
+									ajaxOptions,
+									getAppHeader,
+									getApiBaseUrl,
+									changeAjaxOptions,
+									app: APP,
+									query,
+									goTo,
+									changeAjaxForms,
+								}}
+							/>
+						)}
+					</div>
+                </div>
+            </React.Fragment>
+        </div>
+    )
+}
+
+export default Edit

package/src/@daf/pages/View/hooks/useViewUrlParams.js

@@ -7,15 +7,19 @@ export const useViewUrlParams = ({
     search,
     searchParams,
     setSearchParams,
+    getRedirectLink,
 }) => {
     const [namespace, setNamespace] = useState(params?.namespace);
     const [id, setId] = useState(params?.id);
     const [group, setGroup] = useState(params?.group);
     const [subsection, setSubSection] = useState(params?.subsection);
+    const [formId, setFormId] = useState(params?.formid);
+    const [subgroup, setSubGroup] = useState(params?.subgroup);
     const sourceUrl = searchParams.get("source");
     const versionUrl = searchParams.get("version");
     const [source, setSource] = useState(sourceUrl || null);
     const [version, setVersion] = useState(versionUrl || null);
+    const [changedPath, setChangedPath] = useState([]);
 
     useEffect(() => {
         if ((id && params.id !== id) || (namespace && namespace !== params.namespace)) {
@@ -29,6 +33,8 @@ export const useViewUrlParams = ({
         }
         setNamespace(params.namespace);
         setId(params.id);
+        setSubGroup(params.subgroup);
+        setFormId(params.formid);
     }, [params]);
 
     useEffect(() => {
@@ -64,7 +70,18 @@ export const useViewUrlParams = ({
           push(`${previous}/edit/${extra}`);
         }
       }, [pathname, search, push]);
-    
+
+      const getViewLink = useCallback(() => {
+        switch (namespace) {
+          default:
+        }
+        return getRedirectLink(
+          `/app/view/${namespace}/${id}/${group}${subsection ? `/${subsection}` : ""}${
+            subgroup ? `/${subgroup}` : ""
+          }${search ? `/${search}` : ""}`,
+        );
+      }, [namespace, id, group, subsection, subgroup, search, getRedirectLink, pathname, search]);
+
       const match = useMemo(
         () => ({
           params,
@@ -89,5 +106,10 @@ export const useViewUrlParams = ({
         getEditLink,
         match,
         search,
+        formId,
+        subgroup,
+        getViewLink,
+        changedPath,
+        setChangedPath,
       };
 }

package/src/@daf/pages/View/index.jsx

@@ -77,6 +77,7 @@ const View = ({
         search,
         searchParams,
         setSearchParams,
+        getRedirectLink,
     });
 
     const namespaceConfig = useMemo(() => getNamespaceConfig(namespace), [namespace]);

package/src/@daf/utils/arrays.js

@@ -0,0 +1 @@
+export const isArrayOfObjects = (arr) => Array.isArray(arr) && arr.map((i) => typeof i === "object").every((i) => i);

package/src/@daf/utils/numbers.js

@@ -6,7 +6,7 @@
  */
 export const renderNumber = (val, doubleDigit = false) => {
   if (typeof val !== 'number') {
-    return '--';
+    return '-';
   }
 
   const _string = Number(val).toLocaleString('en-us');

package/src/helpers/Forms.js

@@ -829,3 +829,63 @@ export const getValueOnSelectFromDefaultKeys = (val, options, uniqueDefaultKeys)
 	}
 	return null;
 }
+
+// REQUIRED FOR EDIT FORM SUBMIT(SAVE)
+export 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;
+};
+
+export const hasFileList = (value) => {
+	return value && 
+		typeof value === "object" && 
+		value !== null && 
+		"fileList" in value;
+};
+
+export const hasContent = (obj) => {
+	if (typeof obj !== "object" || obj === null) return true;
+	return Object.keys(obj).some(key => propHasValue(obj[key]));
+};
+
+export 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;
+};

package/src/pages.js

@@ -16,4 +16,7 @@ export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx'
 export { default as MonitoringActivitySummary } from './@daf/pages/Summary/Activities/Monitoring/index.jsx';
 
 // View
-export { default as View } from './@daf/pages/View/index.jsx';
+export { default as View } from './@daf/pages/View/index.jsx';
+
+// Edit
+export { default as Edit } from './@daf/pages/Edit/index.jsx';

package/src/utils.js

@@ -12,7 +12,7 @@ export { propHasValue } from './helpers/deepFind'
 export { isEmptyOrSpaces, capitalizeAll, capitalize, camelCaseToTitle, snakeCaseToTitleCase, titleToCamelCase, findOptions, getOptionAsObject, nowToIso, renderTemplateString, renderTemplateStringInObject, truncateString, splitStringInMultipleLines, safeJsonParse, cleanJSON, formatToKebabCase } from './helpers/StringHelper.js'
 export { getNkey, groupSubsections, getImageUploadViewValue } from './@daf/core/components/ViewForm/helper'
 export { renderRows } from './@daf/core/components/Table/helper'
-export { filterOptions, filterString, hasNotChanged, filterSelectOptions, mapSubGroupsInSubmit, mapSubGroupsInGet, filterCreateData, changeInputMeta, renderDateFormatted, sortForm } from './helpers/Forms'
+export { filterOptions, filterString, hasNotChanged, filterSelectOptions, mapSubGroupsInSubmit, mapSubGroupsInGet, filterCreateData, changeInputMeta, renderDateFormatted, sortForm, extractFiles, hasFileList, hasContent, transformPayload } from './helpers/Forms'
 export { mapFormGroup, showHideInput, editErrorHandler } from './@daf/core/components/EditForm/helper'
 
 export { defaultFilterKeys, getDefaultActiveFilters, filterParams } from './@daf/utils/filters';
@@ -62,4 +62,6 @@ export {
 
 export { renderBreadCrumbs, buildBreadCrumbs as buildBreadCrumbsHelper } from './helpers/breadCrumbs.js'
 
-export { copyToClipboard } from './helpers/copyToClipboard.js'
+export { copyToClipboard } from './helpers/copyToClipboard.js'
+
+export { isArrayOfObjects } from './@daf/utils/arrays.js'