@solidxai/core-ui 0.1.12-beta.5 → 0.1.12-beta.7

package/dist/components/core/form/SolidFormView.tsx

@@ -341,7 +341,7 @@ const SolidGroup = ({ children, attrs }: any) => {
 
 const SolidRow = ({ children, attrs }: any) => {
     const className = [
-        "row",
+        "flex-row w-full",
         "solid-form-layout-row",
         "px-2",
         "pt-2",

package/dist/components/core/form/fields/relations/RolesGroupedByModuleWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RolesGroupedByModuleWidget.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/RolesGroupedByModuleWidget.tsx"],"names":[],"mappings":"AAaA,UAAU,+BAA+B;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,0BAA0B,2CAIpC,+BAA+B,4CAoHjC,CAAC"}
+{"version":3,"file":"RolesGroupedByModuleWidget.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/RolesGroupedByModuleWidget.tsx"],"names":[],"mappings":"AAaA,UAAU,+BAA+B;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAMD,eAAO,MAAM,0BAA0B,2CAIpC,+BAA+B,4CAuHjC,CAAC"}

package/dist/components/core/form/fields/relations/RolesGroupedByModuleWidget.js

@@ -41,6 +41,13 @@ import { SolidAccordion, SolidAccordionItem, SolidAccordionTrigger, SolidAccordi
 import { SolidCheckbox } from '../../../../shad-cn-ui/SolidCheckbox';
 import { SolidPanel } from '../../../../shad-cn-ui/SolidPanel';
 import { solidGet } from '../../../../../http/solidHttp';
+function cx() {
+    var parts = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        parts[_i] = arguments[_i];
+    }
+    return parts.filter(Boolean).join(' ');
+}
 export var RolesGroupedByModuleWidget = function (_a) {
     var selectedRoles = _a.selectedRoles, onToggle = _a.onToggle, _b = _a.readOnly, readOnly = _b === void 0 ? false : _b;
     var _c = useState([]), allRoles = _c[0], setAllRoles = _c[1];
@@ -117,7 +124,10 @@ export var RolesGroupedByModuleWidget = function (_a) {
             var title = group.moduleId === null
                 ? 'Default Roles'
                 : "".concat(group.moduleDisplayName, " Roles");
-            return (_jsxs(SolidAccordionItem, { value: key, children: [_jsx(SolidAccordionTrigger, { children: title }), _jsx(SolidAccordionContent, { children: _jsx("div", { className: "flex flex-wrap -mx-2 -mt-2 pt-1", children: group.roles.map(function (item, i) { return (_jsxs("div", { className: "field flex w-1/2 gap-2 ".concat(i >= 2 ? 'mt-3' : ''), children: [_jsx(SolidCheckbox, { disabled: readOnly, id: "role-".concat(item.value), checked: selectedRoles.includes(item.label), onChange: function () { return onToggle(item.label); } }), _jsx("label", { htmlFor: "role-".concat(item.value), className: "form-field-label m-0", children: item.label })] }, item.value)); }) }) })] }, key));
+            return (_jsxs(SolidAccordionItem, { value: key, children: [_jsx(SolidAccordionTrigger, { children: title }), _jsx(SolidAccordionContent, { children: _jsx("div", { className: "solid-user-role-grid pt-1", children: group.roles.map(function (item) {
+                                var isSelected = selectedRoles.includes(item.label);
+                                return (_jsx("div", { className: cx('solid-user-role-card', isSelected && 'is-selected'), children: _jsx(SolidCheckbox, { className: "solid-user-role-control", disabled: readOnly, id: "role-".concat(item.value), checked: isSelected, onChange: function () { return onToggle(item.label); }, label: item.label }) }, item.value));
+                            }) }) })] }, key));
         }) }));
 };
 //# sourceMappingURL=RolesGroupedByModuleWidget.js.map

package/dist/components/core/form/fields/relations/RolesGroupedByModuleWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"RolesGroupedByModuleWidget.js","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/RolesGroupedByModuleWidget.tsx"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useState } from 'react';\nimport qs from 'qs';\nimport { SolidAccordion, SolidAccordionItem, SolidAccordionTrigger, SolidAccordionContent } from '../../../../shad-cn-ui/SolidAccordion';\nimport { SolidCheckbox } from '../../../../shad-cn-ui/SolidCheckbox';\nimport { SolidPanel } from '../../../../shad-cn-ui/SolidPanel';\nimport { solidGet } from '../../../../../http/solidHttp';\n\ntype RoleGroup = {\n    moduleId: number | null;\n    moduleDisplayName: string;\n    roles: { label: string; value: any }[];\n};\n\ninterface RolesGroupedByModuleWidgetProps {\n    selectedRoles: string[];\n    onToggle: (roleName: string) => void;\n    readOnly?: boolean;\n}\n\nexport const RolesGroupedByModuleWidget = ({\n    selectedRoles,\n    onToggle,\n    readOnly = false,\n}: RolesGroupedByModuleWidgetProps) => {\n    const [allRoles, setAllRoles] = useState<any[]>([]);\n    const [groups, setGroups] = useState<RoleGroup[]>([]);\n    const [openItems, setOpenItems] = useState<string[]>([]);\n\n    useEffect(() => {\n        const fetchRoles = async () => {\n            try {\n                const qsStr = qs.stringify(\n                    { offset: 0, limit: 1000, populate: ['module'] },\n                    { encodeValuesOnly: true }\n                );\n                const response = await solidGet(`/role-metadata?${qsStr}`);\n                const records = response?.data?.data?.records ?? [];\n                setAllRoles(records);\n            } catch (e) {\n                console.error('RolesGroupedByModuleWidget: failed to fetch roles', e);\n            }\n        };\n        fetchRoles();\n    }, []);\n\n    useEffect(() => {\n        if (!allRoles.length) return;\n\n        const groupMap = new Map<number | null, { displayName: string; roles: { label: string; value: any }[] }>();\n        groupMap.set(null, { displayName: 'Default', roles: [] });\n\n        allRoles.forEach((role: any) => {\n            const moduleId: number | null = role.moduleId ?? role.module?.id ?? null;\n            const moduleDisplayName: string = role.module?.displayName ?? 'Default';\n            const item = { label: role.name, value: role.id };\n\n            if (moduleId === null || moduleId === undefined) {\n                groupMap.get(null)!.roles.push(item);\n            } else {\n                if (!groupMap.has(moduleId)) {\n                    groupMap.set(moduleId, { displayName: moduleDisplayName, roles: [] });\n                }\n                groupMap.get(moduleId)!.roles.push(item);\n            }\n        });\n\n        const built: RoleGroup[] = [];\n        built.push({ moduleId: null, moduleDisplayName: 'Default', roles: groupMap.get(null)!.roles });\n\n        const moduleKeys = Array.from(groupMap.keys())\n            .filter((k) => k !== null)\n            .sort((a, b) => {\n                const dA = groupMap.get(a as number)!.displayName;\n                const dB = groupMap.get(b as number)!.displayName;\n                return dA.localeCompare(dB);\n            });\n\n        moduleKeys.forEach((moduleId) => {\n            const g = groupMap.get(moduleId as number)!;\n            built.push({ moduleId: moduleId as number, moduleDisplayName: g.displayName, roles: g.roles });\n        });\n\n        const nonEmpty = built.filter((g) => g.roles.length > 0);\n        setGroups(nonEmpty);\n        setOpenItems(nonEmpty.map((g) => String(g.moduleId ?? 'default')));\n    }, [allRoles]);\n\n    if (groups.length === 0) {\n        return (\n            <SolidPanel>\n                <p className=\"text-sm text-muted-foreground m-0\">No roles defined.</p>\n            </SolidPanel>\n        );\n    }\n\n    return (\n        <SolidAccordion\n            type=\"multiple\"\n            value={openItems}\n            onValueChange={setOpenItems}\n            className=\"w-full\"\n        >\n            {groups.map((group) => {\n                const key = String(group.moduleId ?? 'default');\n                const title =\n                    group.moduleId === null\n                        ? 'Default Roles'\n                        : `${group.moduleDisplayName} Roles`;\n                return (\n                    <SolidAccordionItem key={key} value={key}>\n                        <SolidAccordionTrigger>{title}</SolidAccordionTrigger>\n                        <SolidAccordionContent>\n                            <div className=\"flex flex-wrap -mx-2 -mt-2 pt-1\">\n                                {group.roles.map((item, i) => (\n                                    <div\n                                        key={item.value}\n                                        className={`field flex w-1/2 gap-2 ${i >= 2 ? 'mt-3' : ''}`}\n                                    >\n                                        <SolidCheckbox\n                                            disabled={readOnly}\n                                            id={`role-${item.value}`}\n                                            checked={selectedRoles.includes(item.label)}\n                                            onChange={() => onToggle(item.label)}\n                                        />\n                                        <label\n                                            htmlFor={`role-${item.value}`}\n                                            className=\"form-field-label m-0\"\n                                        >\n                                            {item.label}\n                                        </label>\n                                    </div>\n                                ))}\n                            </div>\n                        </SolidAccordionContent>\n                    </SolidAccordionItem>\n                );\n            })}\n        </SolidAccordion>\n    );\n};\n"]}
+{"version":3,"file":"RolesGroupedByModuleWidget.js","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/RolesGroupedByModuleWidget.tsx"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useState } from 'react';\nimport qs from 'qs';\nimport { SolidAccordion, SolidAccordionItem, SolidAccordionTrigger, SolidAccordionContent } from '../../../../shad-cn-ui/SolidAccordion';\nimport { SolidCheckbox } from '../../../../shad-cn-ui/SolidCheckbox';\nimport { SolidPanel } from '../../../../shad-cn-ui/SolidPanel';\nimport { solidGet } from '../../../../../http/solidHttp';\n\ntype RoleGroup = {\n    moduleId: number | null;\n    moduleDisplayName: string;\n    roles: { label: string; value: any }[];\n};\n\ninterface RolesGroupedByModuleWidgetProps {\n    selectedRoles: string[];\n    onToggle: (roleName: string) => void;\n    readOnly?: boolean;\n}\n\nfunction cx(...parts: Array<string | false | undefined>) {\n    return parts.filter(Boolean).join(' ');\n}\n\nexport const RolesGroupedByModuleWidget = ({\n    selectedRoles,\n    onToggle,\n    readOnly = false,\n}: RolesGroupedByModuleWidgetProps) => {\n    const [allRoles, setAllRoles] = useState<any[]>([]);\n    const [groups, setGroups] = useState<RoleGroup[]>([]);\n    const [openItems, setOpenItems] = useState<string[]>([]);\n\n    useEffect(() => {\n        const fetchRoles = async () => {\n            try {\n                const qsStr = qs.stringify(\n                    { offset: 0, limit: 1000, populate: ['module'] },\n                    { encodeValuesOnly: true }\n                );\n                const response = await solidGet(`/role-metadata?${qsStr}`);\n                const records = response?.data?.data?.records ?? [];\n                setAllRoles(records);\n            } catch (e) {\n                console.error('RolesGroupedByModuleWidget: failed to fetch roles', e);\n            }\n        };\n        fetchRoles();\n    }, []);\n\n    useEffect(() => {\n        if (!allRoles.length) return;\n\n        const groupMap = new Map<number | null, { displayName: string; roles: { label: string; value: any }[] }>();\n        groupMap.set(null, { displayName: 'Default', roles: [] });\n\n        allRoles.forEach((role: any) => {\n            const moduleId: number | null = role.moduleId ?? role.module?.id ?? null;\n            const moduleDisplayName: string = role.module?.displayName ?? 'Default';\n            const item = { label: role.name, value: role.id };\n\n            if (moduleId === null || moduleId === undefined) {\n                groupMap.get(null)!.roles.push(item);\n            } else {\n                if (!groupMap.has(moduleId)) {\n                    groupMap.set(moduleId, { displayName: moduleDisplayName, roles: [] });\n                }\n                groupMap.get(moduleId)!.roles.push(item);\n            }\n        });\n\n        const built: RoleGroup[] = [];\n        built.push({ moduleId: null, moduleDisplayName: 'Default', roles: groupMap.get(null)!.roles });\n\n        const moduleKeys = Array.from(groupMap.keys())\n            .filter((k) => k !== null)\n            .sort((a, b) => {\n                const dA = groupMap.get(a as number)!.displayName;\n                const dB = groupMap.get(b as number)!.displayName;\n                return dA.localeCompare(dB);\n            });\n\n        moduleKeys.forEach((moduleId) => {\n            const g = groupMap.get(moduleId as number)!;\n            built.push({ moduleId: moduleId as number, moduleDisplayName: g.displayName, roles: g.roles });\n        });\n\n        const nonEmpty = built.filter((g) => g.roles.length > 0);\n        setGroups(nonEmpty);\n        setOpenItems(nonEmpty.map((g) => String(g.moduleId ?? 'default')));\n    }, [allRoles]);\n\n    if (groups.length === 0) {\n        return (\n            <SolidPanel>\n                <p className=\"text-sm text-muted-foreground m-0\">No roles defined.</p>\n            </SolidPanel>\n        );\n    }\n\n    return (\n        <SolidAccordion\n            type=\"multiple\"\n            value={openItems}\n            onValueChange={setOpenItems}\n            className=\"w-full\"\n        >\n            {groups.map((group) => {\n                const key = String(group.moduleId ?? 'default');\n                const title =\n                    group.moduleId === null\n                        ? 'Default Roles'\n                        : `${group.moduleDisplayName} Roles`;\n                return (\n                    <SolidAccordionItem key={key} value={key}>\n                        <SolidAccordionTrigger>{title}</SolidAccordionTrigger>\n                        <SolidAccordionContent>\n                            <div className=\"solid-user-role-grid pt-1\">\n                                {group.roles.map((item) => {\n                                    const isSelected = selectedRoles.includes(item.label);\n\n                                    return (\n                                        <div\n                                            key={item.value}\n                                            className={cx(\n                                                'solid-user-role-card',\n                                                isSelected && 'is-selected'\n                                            )}\n                                        >\n                                            <SolidCheckbox\n                                                className=\"solid-user-role-control\"\n                                                disabled={readOnly}\n                                                id={`role-${item.value}`}\n                                                checked={isSelected}\n                                                onChange={() => onToggle(item.label)}\n                                                label={item.label}\n                                            />\n                                        </div>\n                                    );\n                                })}\n                            </div>\n                        </SolidAccordionContent>\n                    </SolidAccordionItem>\n                );\n            })}\n        </SolidAccordion>\n    );\n};\n"]}

package/dist/components/core/form/fields/relations/RolesGroupedByModuleWidget.tsx

@@ -17,6 +17,10 @@ interface RolesGroupedByModuleWidgetProps {
     readOnly?: boolean;
 }
 
+function cx(...parts: Array<string | false | undefined>) {
+    return parts.filter(Boolean).join(' ');
+}
+
 export const RolesGroupedByModuleWidget = ({
     selectedRoles,
     onToggle,
@@ -110,26 +114,29 @@ export const RolesGroupedByModuleWidget = ({
                     <SolidAccordionItem key={key} value={key}>
                         <SolidAccordionTrigger>{title}</SolidAccordionTrigger>
                         <SolidAccordionContent>
-                            <div className="flex flex-wrap -mx-2 -mt-2 pt-1">
-                                {group.roles.map((item, i) => (
-                                    <div
-                                        key={item.value}
-                                        className={`field flex w-1/2 gap-2 ${i >= 2 ? 'mt-3' : ''}`}
-                                    >
-                                        <SolidCheckbox
-                                            disabled={readOnly}
-                                            id={`role-${item.value}`}
-                                            checked={selectedRoles.includes(item.label)}
-                                            onChange={() => onToggle(item.label)}
-                                        />
-                                        <label
-                                            htmlFor={`role-${item.value}`}
-                                            className="form-field-label m-0"
+                            <div className="solid-user-role-grid pt-1">
+                                {group.roles.map((item) => {
+                                    const isSelected = selectedRoles.includes(item.label);
+
+                                    return (
+                                        <div
+                                            key={item.value}
+                                            className={cx(
+                                                'solid-user-role-card',
+                                                isSelected && 'is-selected'
+                                            )}
                                         >
-                                            {item.label}
-                                        </label>
-                                    </div>
-                                ))}
+                                            <SolidCheckbox
+                                                className="solid-user-role-control"
+                                                disabled={readOnly}
+                                                id={`role-${item.value}`}
+                                                checked={isSelected}
+                                                onChange={() => onToggle(item.label)}
+                                                label={item.label}
+                                            />
+                                        </div>
+                                    );
+                                })}
                             </div>
                         </SolidAccordionContent>
                     </SolidAccordionItem>

package/dist/components/core/form/fields/relations/SolidRelationManyToOneField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidRelationManyToOneField.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/SolidRelationManyToOneField.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAI5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAc5E,MAAM,MAAM,cAAc,GAAG;IACzB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,EAAE,EAAE,GAAG,CAAC;IACR,OAAO,EAAE,GAAG,CAAC;IACb,oBAAoB,EAAE,GAAG,CAAC;IAC1B,MAAM,EAAE,GAAG,CAAC;CACf,CAAA;AAED,qBAAa,2BAA4B,YAAW,WAAW;IAE3D,OAAO,CAAC,YAAY,CAAkB;gBAE1B,YAAY,EAAE,eAAe;IAIzC,YAAY,IAAI,GAAG;IAmBnB,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;IAOnD,gBAAgB,IAAI,GAAG,CAAC,MAAM;IA2D9B,MAAM,CAAC,MAAM,EAAE,YAAY;IAoC3B,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY;CAYjE;AAED,eAAO,MAAM,sCAAsC,6BAA8B,yBAAyB,4CAgTzG,CAAA;AAED,eAAO,MAAM,0BAA0B,+HAAgI,GAAG,4CA8DzK,CAAA;AAGD,eAAO,MAAM,sCAAsC,6BAA8B,yBAAyB,4CAiBzG,CAAA;AAMD,eAAO,MAAM,iCAAiC,6BAA8B,yBAAyB,4CA0cpG,CAAA"}
+{"version":3,"file":"SolidRelationManyToOneField.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/SolidRelationManyToOneField.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAI5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAc5E,MAAM,MAAM,cAAc,GAAG;IACzB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,EAAE,EAAE,GAAG,CAAC;IACR,OAAO,EAAE,GAAG,CAAC;IACb,oBAAoB,EAAE,GAAG,CAAC;IAC1B,MAAM,EAAE,GAAG,CAAC;CACf,CAAA;AAED,qBAAa,2BAA4B,YAAW,WAAW;IAE3D,OAAO,CAAC,YAAY,CAAkB;gBAE1B,YAAY,EAAE,eAAe;IAIzC,YAAY,IAAI,GAAG;IAmBnB,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;IAUnD,gBAAgB,IAAI,GAAG,CAAC,MAAM;IA4D9B,MAAM,CAAC,MAAM,EAAE,YAAY;IAoC3B,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY;CAYjE;AAED,eAAO,MAAM,sCAAsC,6BAA8B,yBAAyB,4CAkTzG,CAAA;AAED,eAAO,MAAM,0BAA0B,+HAAgI,GAAG,4CA8DzK,CAAA;AAGD,eAAO,MAAM,sCAAsC,6BAA8B,yBAAyB,4CAiBzG,CAAA;AAMD,eAAO,MAAM,iCAAiC,6BAA8B,yBAAyB,4CA2cpG,CAAA"}

package/dist/components/core/form/fields/relations/SolidRelationManyToOneField.js

@@ -117,6 +117,10 @@ var SolidRelationManyToOneField = /** @class */ (function () {
             if (value === null || value === void 0 ? void 0 : value.solidManyToOneValue) {
                 formData.append("".concat(fieldLayoutInfo.attrs.name, "Id"), value.solidManyToOneValue);
             }
+            else {
+                // Explicitly tell backend the field is cleared
+                formData.append("".concat(fieldLayoutInfo.attrs.name, "Id"), '');
+            }
         }
     });
     Object.defineProperty(SolidRelationManyToOneField.prototype, "validationSchema", {
@@ -129,13 +133,14 @@ var SolidRelationManyToOneField = /** @class */ (function () {
             var fieldLayoutInfo = this.fieldContext.field;
             var fieldLabel = (_a = fieldLayoutInfo.attrs.label) !== null && _a !== void 0 ? _a : fieldMetadata.displayName;
             var schema = Yup.mixed();
-            // Custom validation for relation field
             if (fieldMetadata.required) {
                 schema = schema.test(ERROR_MESSAGES.REQUIRED_REALTION, ERROR_MESSAGES.FIELD_REUQIRED(fieldLabel), function (value) {
                     // Handle empty values
                     if (!value)
                         return false;
                     // If it's an object with solidManyToOneValue, check if it's valid
+                    if (typeof value === 'object' && Object.keys(value).length === 0)
+                        return false;
                     if (typeof value === 'object' && value !== null && value.solidManyToOneValue) {
                         return true;
                     }
@@ -149,7 +154,7 @@ var SolidRelationManyToOneField = /** @class */ (function () {
             // Add validation to ensure valid selection
             schema = schema.test(ERROR_MESSAGES.VALIDATE_SELECTION, ERROR_MESSAGES.SELECT_VALID_FROM_DROPDOWN(fieldLabel), function (value) {
                 // If not required and empty, it's valid
-                if (!fieldMetadata.required && (!value || value === '')) {
+                if (!value || value === '' || (typeof value === 'object' && Object.keys(value).length === 0)) {
                     return true;
                 }
                 // If it's an object with solidManyToOneValue, it's a valid selection
@@ -161,7 +166,7 @@ var SolidRelationManyToOneField = /** @class */ (function () {
                     return false;
                 }
                 // Empty value for non-required field
-                return !fieldMetadata.required;
+                return true;
             });
             return schema;
         }
@@ -452,7 +457,9 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
     return (_jsxs("div", { className: "relative", children: [_jsxs("div", { className: styles.fieldWrapper, children: [showFieldLabel != false &&
                         _jsxs("label", { htmlFor: fieldLayoutInfo.attrs.name, className: "".concat(styles.fieldLabel, " form-field-label"), children: [fieldLabel, fieldMetadata.required && _jsx("span", { className: "text-red-500", children: " *" }), _jsx(SolidFieldTooltip, { fieldContext: fieldContext })] }), _jsxs("div", { className: "flex items-center gap-4", children: [_jsx(SolidAutocomplete, { readOnly: formReadonly || fieldReadonly || readOnlyPermission, disabled: formDisabled || fieldDisabled || readOnlyPermission, id: fieldLayoutInfo.attrs.name, field: "solidManyToOneLabel", value: formik.values[fieldLayoutInfo.attrs.name] || '', dropdown: !readOnlyPermission, suggestions: autoCompleteItems, completeMethod: autoCompleteSearch, onChange: function (_a) {
                                     var value = _a.value;
-                                    return fieldContext.onChange(buildSyntheticChangeEvent(fieldLayoutInfo.attrs.name, value, "text"), 'onFieldChange');
+                                    // When user clears the field, set to empty object so validation catches it
+                                    var newValue = (value === '' || value === null || value === undefined) ? {} : value;
+                                    fieldContext.onChange(buildSyntheticChangeEvent(fieldLayoutInfo.attrs.name, newValue, "text"), 'onFieldChange');
                                 }, onSelect: function (_a) {
                                     var value = _a.value;
                                     return fieldContext.onChange(buildSyntheticChangeEvent(fieldLayoutInfo.attrs.name, value, "text"), 'onFieldChange');
@@ -889,7 +896,8 @@ export var PseudoRelationManyToOneFormWidget = function (_a) {
     return (_jsxs("div", { className: "relative", children: [_jsxs("div", { className: styles.fieldWrapper, children: [showFieldLabel != false &&
                         _jsxs("label", { htmlFor: fieldLayoutInfo.attrs.name, className: "".concat(styles.fieldLabel, " form-field-label"), children: [fieldLabel, fieldMetadata.required && _jsx("span", { className: "text-red-500", children: " *" }), _jsx(SolidFieldTooltip, { fieldContext: fieldContext })] }), _jsxs("div", { className: "flex items-center gap-4", children: [_jsx(SolidAutocomplete, { readOnly: formReadonly || fieldReadonly || readOnlyPermission, disabled: formDisabled || fieldDisabled || readOnlyPermission || viewMode === "view", field: "solidManyToOneLabel", id: fieldLayoutInfo.attrs.name, value: resolvedValue || null, dropdown: !readOnlyPermission, suggestions: autoCompleteItems, completeMethod: autoCompleteSearch, onChange: function (_a) {
                                     var value = _a.value;
-                                    return fieldContext.onChange(buildSyntheticChangeEvent(fieldLayoutInfo.attrs.name, value, "text"), 'onFieldChange');
+                                    var newValue = (value === '' || value === null || value === undefined) ? {} : value;
+                                    fieldContext.onChange(buildSyntheticChangeEvent(fieldLayoutInfo.attrs.name, newValue, "text"), 'onFieldChange');
                                 }, onSelect: function (_a) {
                                     var value = _a.value;
                                     return fieldContext.onChange(buildSyntheticChangeEvent(fieldLayoutInfo.attrs.name, value, "text"), 'onFieldChange');