@rkosafo/cai.components 0.0.24 → 0.0.26

package/dist/forms/FormSelect/FormSelect.svelte

@@ -31,6 +31,7 @@
 			setData({ ...$data, [name]: e.value });
 		} else {
 			const d = e.map((a: any) => a.value);
+			// console.log({ d });
 			setData({ ...$data, [name]: d });
 		}
 		if (onChange) onChange(e);

package/dist/ui/datatable/Datatable.svelte

@@ -271,8 +271,7 @@
 	}
 
 	async function handleAction({ action, data }: { action: string; data: FormData }) {
-		let formData = Object.fromEntries(data.entries());
-
+		let formData = data;
 		try {
 			isLoading = true;
 			const ret = editing

package/dist/ui/drawer/Drawer.svelte

@@ -132,7 +132,6 @@
 			return (hidden = true);
 		}
 	}
-
 	function _onsubmit(ev: SubmitEvent & { currentTarget: HTMLFormElement }) {
 		onsubmit?.(ev as any);
 		if (ev.defaultPrevented) return;
@@ -142,20 +141,13 @@
 		const mainForm = ev.currentTarget;
 		let returnValue = '';
 
-		// Find all nested forms within the main form
 		const nestedForms = mainForm.querySelectorAll('form');
 		const combinedFormData = new FormData();
 
-		// Add data from main form (excluding nested forms)
-		new FormData(mainForm).forEach((value, key) => {
-			combinedFormData.append(key, value);
-		});
-
-		// Add data from all nested forms
+		// Collect all form data
+		new FormData(mainForm).forEach((value, key) => combinedFormData.append(key, value));
 		nestedForms.forEach((nestedForm) => {
-			new FormData(nestedForm).forEach((value, key) => {
-				combinedFormData.append(key, value);
-			});
+			new FormData(nestedForm).forEach((value, key) => combinedFormData.append(key, value));
 		});
 
 		if (ev.submitter instanceof HTMLButtonElement || ev.submitter instanceof HTMLInputElement) {
@@ -166,14 +158,42 @@
 			return (hidden = true);
 		}
 
-		if (
-			typeof onaction === 'function' &&
-			onaction({ action: returnValue, data: combinedFormData }) === false
-		) {
+		// Convert FormData → object
+		const data: Record<string, any> = {};
+		for (const [key, value] of combinedFormData.entries()) {
+			if (data[key] !== undefined) {
+				if (!Array.isArray(data[key])) data[key] = [data[key]];
+				data[key].push(value);
+			} else {
+				data[key] = value;
+			}
+		}
+
+		// Cast values and normalize arrays
+		Object.keys(data).forEach((key) => {
+			const val = data[key];
+			if (Array.isArray(val)) {
+				data[key] = val.map((v) => tryCast(v));
+			} else {
+				// Force array for certain fields
+				if (['dashboards', 'permissions', 'reports'].includes(key)) {
+					data[key] = [tryCast(val)];
+				} else {
+					data[key] = tryCast(val);
+				}
+			}
+		});
+
+		if (typeof onaction === 'function' && onaction({ action: returnValue, data }) === false) {
 			return;
 		}
+	}
 
-		// hidden = true;
+	function tryCast(v: any) {
+		if (v === 'true') return true;
+		if (v === 'false') return false;
+		if (!isNaN(Number(v)) && v !== '') return Number(v);
+		return v;
 	}
 
 	createDismissableContext(close);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rkosafo/cai.components",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "files": [
     "dist",
     "!dist/**/*.test.*",