@rkosafo/cai.components 0.0.25 → 0.0.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -31,6 +31,7 @@
31
31
  setData({ ...$data, [name]: e.value });
32
32
  } else {
33
33
  const d = e.map((a: any) => a.value);
34
+ // console.log({ d });
34
35
  setData({ ...$data, [name]: d });
35
36
  }
36
37
  if (onChange) onChange(e);
@@ -132,7 +132,6 @@
132
132
  return (hidden = true);
133
133
  }
134
134
  }
135
-
136
135
  function _onsubmit(ev: SubmitEvent & { currentTarget: HTMLFormElement }) {
137
136
  onsubmit?.(ev as any);
138
137
  if (ev.defaultPrevented) return;
@@ -142,20 +141,13 @@
142
141
  const mainForm = ev.currentTarget;
143
142
  let returnValue = '';
144
143
 
145
- // Find all nested forms within the main form
146
144
  const nestedForms = mainForm.querySelectorAll('form');
147
145
  const combinedFormData = new FormData();
148
146
 
149
- // Add data from main form (excluding nested forms)
150
- new FormData(mainForm).forEach((value, key) => {
151
- combinedFormData.append(key, value);
152
- });
153
-
154
- // Add data from all nested forms
147
+ // Collect all form data
148
+ new FormData(mainForm).forEach((value, key) => combinedFormData.append(key, value));
155
149
  nestedForms.forEach((nestedForm) => {
156
- new FormData(nestedForm).forEach((value, key) => {
157
- combinedFormData.append(key, value);
158
- });
150
+ new FormData(nestedForm).forEach((value, key) => combinedFormData.append(key, value));
159
151
  });
160
152
 
161
153
  if (ev.submitter instanceof HTMLButtonElement || ev.submitter instanceof HTMLInputElement) {
@@ -166,34 +158,42 @@
166
158
  return (hidden = true);
167
159
  }
168
160
 
169
- // Convert FormData into a proper object with arrays
161
+ // Convert FormData object
170
162
  const data: Record<string, any> = {};
171
- combinedFormData.forEach((value, key) => {
163
+ for (const [key, value] of combinedFormData.entries()) {
172
164
  if (data[key] !== undefined) {
173
- // Already exists, convert to array (or push to existing array)
174
- if (!Array.isArray(data[key])) {
175
- data[key] = [data[key]];
176
- }
165
+ if (!Array.isArray(data[key])) data[key] = [data[key]];
177
166
  data[key].push(value);
178
167
  } else {
179
168
  data[key] = value;
180
169
  }
181
- });
170
+ }
182
171
 
183
- // Optionally cast certain values
172
+ // Cast values and normalize arrays
184
173
  Object.keys(data).forEach((key) => {
185
- if (data[key] === 'true') data[key] = true;
186
- else if (data[key] === 'false') data[key] = false;
187
- else if (!isNaN(data[key]) && data[key] !== '' && !Array.isArray(data[key])) {
188
- data[key] = Number(data[key]);
174
+ const val = data[key];
175
+ if (Array.isArray(val)) {
176
+ data[key] = val.map((v) => tryCast(v));
177
+ } else {
178
+ // Force array for certain fields
179
+ if (['dashboards', 'permissions', 'reports'].includes(key)) {
180
+ data[key] = [tryCast(val)];
181
+ } else {
182
+ data[key] = tryCast(val);
183
+ }
189
184
  }
190
185
  });
191
186
 
192
187
  if (typeof onaction === 'function' && onaction({ action: returnValue, data }) === false) {
193
188
  return;
194
189
  }
190
+ }
195
191
 
196
- // hidden = true;
192
+ function tryCast(v: any) {
193
+ if (v === 'true') return true;
194
+ if (v === 'false') return false;
195
+ if (!isNaN(Number(v)) && v !== '') return Number(v);
196
+ return v;
197
197
  }
198
198
 
199
199
  createDismissableContext(close);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rkosafo/cai.components",
3
- "version": "0.0.25",
3
+ "version": "0.0.26",
4
4
  "files": [
5
5
  "dist",
6
6
  "!dist/**/*.test.*",