datastake-daf 0.6.819 → 0.6.820

package/src/@daf/core/components/Screens/Admin/AdminScreens/SubjectsView.jsx

@@ -1,395 +0,0 @@
-import React, { useState, useEffect, useCallback, useMemo } from "react";
-import Header from "../../../Header/index.jsx";
-import Loading from "../../../Loading/index.jsx";
-import SideBarMenu from "../AdminViews/components/SidebarMenu/index.jsx";
-import ViewLocation from "../AdminViews/ViewLocation/index.jsx";
-import ViewStakeholder from "../AdminViews/ViewStakeholder/index.jsx";
-import EditLocation from "../AdminViews/EditLocation/index.jsx";
-import EditStakeholder from "../AdminViews/EditStakeholder/index.jsx";
-import { config as locationConfig } from "../AdminViews/ViewLocation/config.js";
-import { config as stakeholderConfig } from "../AdminViews/ViewStakeholder/config.js";
-import NotFound from "../../NotFound/index.jsx";
-import { Form, message, Modal } from "antd";
-import { ExclamationCircleOutlined } from "@ant-design/icons";
-import { NOTIFICATION_MODE, useForms, FormsProvider } from "../../../../context/Forms/index.js";
-import { getMainApiUrl, getAppHeader as getBaseAppHeader } from "../../../../../services/BaseService.js";
-
-function withFormsProvider(Component) {
-	return function WrappedWithFormsProvider(props) {
-		return (
-			<FormsProvider>
-				<Component {...props} />
-			</FormsProvider>
-		);
-	};
-}
-
-
-function normalizeFormData(data) {
-	if (!data || typeof data !== 'object') {
-		return data;
-	}
-
-	const normalized = { ...data };
-
-	Object.keys(normalized).forEach(key => {
-		const value = normalized[key];
-
-		if (value === null || value === undefined) {
-			return;
-		}
-
-		if (Array.isArray(value)) {
-			if (value.length > 0 && typeof value[0] === 'object' && value[0] !== null) {
-				if ('value' in value[0]) {
-					normalized[key] = value.map(item => item.value);
-				}
-			}
-			return;
-		}
-
-		if (typeof value === 'object' && 'value' in value) {
-			normalized[key] = value.value;
-		}
-	});
-
-	return normalized;
-}
-
-/**
- * Admin Subjects View Screen
- * This component handles viewing and editing individual subjects (locations or stakeholders)
- * 
- * @param {Object} config - Application configuration
- * @param {string} config.subject - Subject type: "location" or "stakeholder"
- * @param {string} config.id - Subject ID from route params
- * @param {string} config.mode - Mode: "view" or "edit"
- * @param {string} config.module - Module identifier
- * @param {Function} config.goTo - Navigation function
- * @param {Function} config.t - Translation function
- * @param {Object} config.location - Router location object
- * @param {Function} config.getRedirectLink - Function to get redirect links
- * @param {Function} config.renderBreadCrumbs - Function to render breadcrumbs
- * @param {Object} config.options - Options object with countries, categories, etc.
- * @param {Function} config.AdminService - Admin service for API calls
- * @param {Function} config.handleError - Error handling function
- */
-function AdminSubjectsViewScreen({ config }) {
-	const {
-		subject,
-		id,
-		mode = "view",
-		module,
-		goTo,
-		t,
-		location,
-		getRedirectLink,
-		renderBreadCrumbs,
-		options,
-		AdminService,
-		handleError,
-		userRoles = [],
-		accountStatuses = [],
-		getApiBaseUrl = getMainApiUrl,
-		getAppHeader = getBaseAppHeader,
-	} = config;
-
-	const [loading, setLoading] = useState(false);
-	const [data, setData] = useState({});
-	const [editData, setEditData] = useState({});
-	const [isChanged, setIsChanged] = useState(false);
-	const [selectedGroup, setSelectedGroup] = useState("");
-	const [MainForm] = Form.useForm();
-	const { setNotificationMode, changeNotificationState, ajaxForms } = useForms();
-
-	const configs = useMemo(() => {
-		return subject === "location" ? locationConfig : stakeholderConfig;
-	}, [subject]);
-
-	const conf = useMemo(() => {
-		if (!Array.isArray(configs) || configs.length === 0) {
-			console.warn("configs is not a valid array:", configs);
-			return null;
-		}
-
-		if (!selectedGroup) {
-			setSelectedGroup(configs[0].key);
-			return configs[0];
-		}
-		
-		const foundConfig = configs.find((c) => c.key === selectedGroup);
-		return foundConfig || configs[0];
-	}, [selectedGroup, configs]);
-
-	useEffect(() => {
-		const normalizedData = normalizeFormData(data);
-		
-		console.log(' Form Data Normalization:', {
-			rawData: data,
-			normalizedData: normalizedData,
-			changes: Object.keys(data).filter(key => 
-				JSON.stringify(data[key]) !== JSON.stringify(normalizedData[key])
-			).map(key => ({
-				field: key,
-				original: data[key],
-				normalized: normalizedData[key]
-			}))
-		});
-		
-		MainForm.setFieldsValue(normalizedData);
-		setEditData(normalizedData);
-	}, [data, MainForm]);
-
-	const goToView = useCallback(() => {
-		changeNotificationState({
-			onYes: () => {
-				setEditData(data);
-				setIsChanged(false);
-				goTo(`/app/view/management-${subject}/${id}`);
-			},
-		});
-	}, [goTo, changeNotificationState, data, subject, id]);
-
-	const fetchData = useCallback(async () => {
-		try {
-			setLoading(true);
-			
-			let response;
-			if (subject === "location") {
-				response = await AdminService.viewLocation({ id });
-			} else if (subject === "stakeholder") {
-				response = await AdminService.viewStakeholder({ id });
-			}
-			
-			if (response?.data) {
-			
-				
-				if (!response.data.id) {
-					console.error(' Warning: Backend response missing UUID (id field). Only datastakeId present:', {
-						datastakeId: response.data.datastakeId,
-						fullData: response.data
-					});
-				}
-				
-				setData(response.data);
-			}
-			
-			setLoading(false);
-		} catch (err) {
-			if (handleError) {
-				handleError(err);
-			}
-			setLoading(false);
-		}
-	}, [id, subject, AdminService, handleError]);
-
-	useEffect(() => {
-		fetchData();
-	}, [fetchData]);
-
-	const breadCrumbs = useMemo(() => {
-		if (renderBreadCrumbs) {
-			return renderBreadCrumbs({
-				view: subject === "location" ? "location" : "stakeholder",
-				t,
-				goTo,
-				id,
-				isView: mode === "view",
-				isEdit: mode === "edit",
-			});
-		}
-		return [];
-	}, [renderBreadCrumbs, subject, t, goTo, id, mode]);
-
-	const formOptions = useMemo(() => {
-		const opts = options || {};
-		
-	
-		return {
-			...opts, 
-			
-			countries: opts.countries || [],
-			// category: opts.categoriesOptions || [],
-			locationCategories: opts.locationCategories || [],
-			
-		};
-	}, [options]);
-
-	const handleDelete = useCallback(() => {
-		const subjectName = subject === "location" ? t("location") : t("stakeholder");
-		
-		Modal.confirm({
-			title: t("Delete") + " " + subjectName,
-			icon: <ExclamationCircleOutlined />,
-			content: t(`Are you sure you want to delete this ${subjectName}? This action cannot be undone.`),
-			okText: t("Delete"),
-			okType: "danger",
-			cancelText: t("Cancel"),
-			onOk: async () => {
-				setLoading(true);
-				try {
-					const uuid = data.id;
-					
-					if (!uuid) {
-						throw new Error('UUID not found in subject data');
-					}
-
-					await AdminService.deleteSubject({ 
-						subject, 
-						id: uuid 
-					});
-					
-					message.success(t(`${subjectName} deleted successfully`));
-					goTo(`/app/management/subject/${subject}`);
-				} catch (err) {
-					handleError(err);
-					setLoading(false);
-				}
-			},
-		});
-	}, [subject, data, AdminService, handleError, t, goTo]);
-
-	const actionButtons = useMemo(() => {
-		if (mode === "view") {
-			return [
-				{
-					type: "primary",
-					tooltip: t("Edit"),
-					icon: "Edit",
-					onClick: () => goTo(`/app/edit/management-${subject}/${id}`),
-				},
-				{
-					type: "danger",
-					tooltip: t("Delete"),
-					icon: "Delete",
-					onClick: handleDelete,
-				},
-			];
-		}
-
-		return [
-			{
-				type: "primary",
-				tooltip: t("Save"),
-				icon: "Save",
-				disabled: !isChanged,
-				onClick: () => {
-					MainForm.validateFields()
-						.then(async (formData) => {
-							setLoading(true);
-
-							try {
-								const allowedKeys = conf?.items?.map(item => item.key) || [];
-								const filteredData = {};
-								allowedKeys.forEach(key => {
-									if (formData[key] !== undefined) {
-										filteredData[key] = formData[key];
-									}
-								});
-
-								const uuid = editData.id || data.id;
-								
-								console.log('🔍 Debug - Save operation:', {
-									editDataId: editData.id,
-									dataId: data.id,
-									editDataDatastakeId: editData.datastakeId,
-									dataDatastakeId: data.datastakeId,
-									uuidUsed: uuid,
-									routeParamId: id
-								});
-								
-								if (!uuid) {
-									console.error('UUID not found. Available data:', { 
-										editData, 
-										data,
-										routeParamId: id 
-									});
-									throw new Error('UUID not found in subject data. Please refresh the page and try again.');
-								}
-
-								if (typeof uuid !== 'string' || uuid.length < 20) {
-									console.error('Invalid UUID format detected:', uuid);
-									throw new Error('Invalid UUID format');
-								}
-
-								await AdminService.updateSubject({ 
-									subject, 
-									id: uuid, 
-									data: filteredData 
-								});
-								await fetchData();
-								message.success(t("Information saved successfully"));
-								setNotificationMode(NOTIFICATION_MODE.EMPTY);
-								setIsChanged(false);
-								goTo(`/app/view/management-${subject}/${id}`);
-							} catch (err) {
-								handleError(err);
-							}
-
-							setLoading(false);
-						})
-						.catch(() => {});
-				},
-			},
-			{
-				tooltip: t("Cancel"),
-				icon: "Close",
-				onClick: goToView,
-			},
-		];
-	}, [t, mode, MainForm, goToView, isChanged, editData, fetchData, subject, id, goTo, handleError, AdminService, setNotificationMode, data, conf, handleDelete]);
-
-	const ViewComponent = subject === "location" ? ViewLocation : ViewStakeholder;
-	const EditComponent = subject === "location" ? EditLocation : EditStakeholder;
-
-	return (
-		<div className={mode === "view" ? "daf-view-form" : "daf-edit-form"}>
-			{loading && <Loading background="white" />}
-			<Header 
-				title={data.name || t("Loading...")} 
-				breadcrumbs={breadCrumbs}
-				actionButtons={actionButtons}
-			/>
-			<div className="view-content">
-				<SideBarMenu
-					selectedGroup={selectedGroup}
-					onChange={(v) => setSelectedGroup(v)}
-					t={t}
-					config={configs}
-				/>
-			{mode === "edit" ? (
-				<EditComponent
-					t={t}
-					conf={conf}
-					data={editData}
-					formOptions={formOptions}
-					MainForm={MainForm}
-					setData={setEditData}
-					isChanged={isChanged}
-					setIsChanged={setIsChanged}
-					goToView={goToView}
-					getApiBaseUrl={getApiBaseUrl}
-					getAppHeader={getAppHeader}
-					ajaxForms={ajaxForms}
-				/>
-			) : (
-					<ViewComponent
-						userRoles={userRoles}
-						formOptions={formOptions}
-						conf={conf}
-						data={data}
-						t={t}
-						goTo={goTo}
-						location={location}
-						getRedirectLink={getRedirectLink}
-						accountStatuses={accountStatuses}
-						module={module}
-					/>
-				)}
-			</div>
-		</div>
-	);
-}
-
-export default withFormsProvider(AdminSubjectsViewScreen);
-

package/src/@daf/core/components/Screens/Admin/AdminViews/EditLocation/configTransformer.js

@@ -1,137 +0,0 @@
-
-export function transformConfigItem(item, formOptions = {}, t = (s) => s) {
-	const { 
-		key, 
-		label, 
-		type, 
-		optionsName, 
-		level, 
-		placeholder,
-		rules,
-		showFormIf,
-		disabled,
-		defaultValue,
-		meta: configMeta = {},
-		...rest 
-	} = item;
-
-	const option = {
-		type: type || "text",
-		label: label,
-		meta: { ...configMeta },
-		...rest,
-	};
-
-	if (placeholder) option.placeholder = placeholder;
-	if (rules && Array.isArray(rules)) option.rules = rules;
-	if (showFormIf) option.showFormIf = showFormIf;
-	if (disabled !== undefined) {
-		option.disabled = disabled;
-		option.meta.disableEdit = disabled;
-	}
-	if (defaultValue !== undefined) option.meta.defaultValue = defaultValue;
-
-
-	const mapOptions = (sourceKey) => {
-		if (sourceKey && formOptions[sourceKey]) {
-			return formOptions[sourceKey].map((opt) => {
-				if (typeof opt === 'object' && opt !== null) {
-					return {
-						value: opt.value,
-						label: t(opt.label || opt.value),
-					};
-				}
-				return { value: opt, label: t(opt) };
-			});
-		}
-		return [];
-	};
-
-
-	if (type === "select" || type === "multiselect") {
-		option.options = mapOptions(optionsName || level);
-		
-		if (option.options.length === 0) {
-			console.warn(`No options found for field "${key}"`);
-		}
-
-		if (type === "multiselect") {
-			option.mode = "multiple";
-			option.type = "select";
-		}
-	}
-
-	if (type === "ajaxSelect") {
-		const { entity, method, mapper, filters } = item;
-		
-		if (!entity || !method || !mapper) {
-			console.error(`ajaxSelect field "${key}" is missing properties`);
-			option.type = "text";
-			option.disabled = true;
-		} else {
-			const filtersString = filters ? JSON.stringify(filters) : "{}";
-			const mapperString = JSON.stringify(mapper);
-			option.meta.call = `${entity}::${method}(${filtersString})::${mapperString}`;
-			option.type = "ajaxSelect";
-			
-			
-			if (optionsName || level) {
-				option.options = mapOptions(optionsName || level);
-			}
-			
-			if (option.meta.noAddNew) {
-				option.onNewSetValue = false;
-			}
-		}
-	}
-
-	if (type === "administrative") {
-		option.type = "text";
-		option.disabled = true;
-		option.meta.disableEdit = false;
-		if (level) option.meta.level = level;
-	}
-	if (type === "switch" || type === "checkbox") {
-		option.type = type;
-		if (defaultValue === undefined) option.meta.defaultValue = false;
-	}
-	if (type === "date" || type === "datetime" || type === "year") option.type = type;
-	if (type === "textarea") {
-		option.type = "textarea";
-		option.rows = item.rows || 4;
-	}
-	if (type === "number") {
-		option.type = "text";
-		option.meta.inputType = "number";
-	}
-	if (option.position === undefined) option.position = 0;
-
-	return option;
-}
-
-export function transformConfigToEditForm(conf, formOptions = {}, t = (s) => s) {
-	if (!conf || !conf.items || !Array.isArray(conf.items)) {
-		return null;
-	}
-
-	const options = {};
-	conf.items.forEach((item, index) => {
-		const transformedOption = transformConfigItem(item, formOptions, t);
-		transformedOption.position = item.position !== undefined ? item.position : index;
-		options[item.key] = transformedOption;
-	});
-
-	return {
-		id: conf.key || "edit-form",
-		introText: "",
-		formTitles: conf.formTitles || {},
-		options,
-	};
-}
-
-export function getConfigFieldKeys(conf) {
-	if (!conf || !conf.items || !Array.isArray(conf.items)) {
-		return [];
-	}
-	return conf.items.map((item) => item.key);
-}

package/src/@daf/core/components/Screens/Admin/AdminViews/EditLocation/index.js

@@ -1,9 +0,0 @@
-
-
-export { default } from './index.jsx';
-export { 
-	transformConfigItem, 
-	transformConfigToEditForm, 
-	getConfigFieldKeys 
-} from './configTransformer.js';
-