@solidxai/core-ui 0.1.9-beta.17 → 0.1.9-beta.19

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

@@ -884,7 +884,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                         const baseFormPath = normalizeSolidFormActionPath(pathname, "form");
                         const queryParams = new URLSearchParams(searchParams.toString());
                         queryParams.set("viewMode", "view");
-                        router.push(`${baseFormPath}/${result?.data?.id}?${queryParams.toString()}`);
+                        router.replace(`${baseFormPath}/${result?.data?.id}?${queryParams.toString()}`);
                         setViewMode("view")
                     }
                     return result;

package/dist/components/core/form/SolidFormViewContextMenuHeaderButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidFormViewContextMenuHeaderButton.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewContextMenuHeaderButton.tsx"],"names":[],"mappings":"AAIA,UAAU,yCAAyC;IAC/C,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,qBAAqB,EAAE,GAAG,CAAC;IAC3B,uBAAuB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,GAAG,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAChC;AAED,wBAAgB,oCAAoC,CAAC,EACjD,MAAM,EACN,MAAM,EACN,MAAM,EACN,qBAAqB,EACrB,uBAAuB,EACvB,QAAQ,EACR,gBAAgB,EAChB,OAAmB,EACtB,EAAE,yCAAyC,kDAyD3C"}
+{"version":3,"file":"SolidFormViewContextMenuHeaderButton.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewContextMenuHeaderButton.tsx"],"names":[],"mappings":"AAKA,UAAU,yCAAyC;IAC/C,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,qBAAqB,EAAE,GAAG,CAAC;IAC3B,uBAAuB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,GAAG,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAChC;AAED,wBAAgB,oCAAoC,CAAC,EACjD,MAAM,EACN,MAAM,EACN,MAAM,EACN,qBAAqB,EACrB,uBAAuB,EACvB,QAAQ,EACR,gBAAgB,EAChB,OAAmB,EACtB,EAAE,yCAAyC,kDA6D3C"}

package/dist/components/core/form/SolidFormViewContextMenuHeaderButton.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { hasAnyRole } from "../../../helpers/rolesHelper";
+import { resolveButtonPresentation } from "../../../helpers/buttonPresentation";
 import { useSession } from "../../../hooks/useSession";
 import { SolidButton, SolidIcon, parseSolidIconMeta } from "../../shad-cn-ui";
 export function SolidFormViewContextMenuHeaderButton(_a) {
@@ -8,11 +9,19 @@ export function SolidFormViewContextMenuHeaderButton(_a) {
     var _o = useSession(), session = _o.data, status = _o.status;
     var user = session === null || session === void 0 ? void 0 : session.user;
     var hasRole = !((_b = button.attrs) === null || _b === void 0 ? void 0 : _b.roles) || ((_c = button === null || button === void 0 ? void 0 : button.attrs) === null || _c === void 0 ? void 0 : _c.roles.length) === 0 ? true : hasAnyRole(user === null || user === void 0 ? void 0 : user.roles, (_d = button === null || button === void 0 ? void 0 : button.attrs) === null || _d === void 0 ? void 0 : _d.roles);
+    var presentation = resolveButtonPresentation(button === null || button === void 0 ? void 0 : button.attrs);
     if (!hasRole)
         return null;
     if (((_e = button.attrs) === null || _e === void 0 ? void 0 : _e.visible) == false)
         return null;
-    var iconMeta = parseSolidIconMeta((_g = (_f = button === null || button === void 0 ? void 0 : button.attrs) === null || _f === void 0 ? void 0 : _f.icon) !== null && _g !== void 0 ? _g : "si si-pencil");
+    if (!presentation.showIcon && !presentation.showLabel)
+        return null;
+    var iconMeta = presentation.icon ? parseSolidIconMeta(presentation.icon) : undefined;
+    var iconNode = presentation.showIcon
+        ? (iconMeta
+            ? _jsx(SolidIcon, { name: iconMeta.name, spin: iconMeta.spin, className: "solid-row-action-button-icon", "aria-hidden": true })
+            : _jsx("i", { className: "".concat(presentation.icon, " solid-row-action-button-icon"), "aria-hidden": true }))
+        : null;
     var handleClick = function () {
         var event = {
             action: button.attrs.action,
@@ -25,8 +34,8 @@ export function SolidFormViewContextMenuHeaderButton(_a) {
         onActionComplete === null || onActionComplete === void 0 ? void 0 : onActionComplete();
     };
     if (variant === "menu") {
-        return (_jsxs("button", { type: "button", className: "solid-row-action-button ".concat(((_h = button === null || button === void 0 ? void 0 : button.attrs) === null || _h === void 0 ? void 0 : _h.className) ? (_j = button === null || button === void 0 ? void 0 : button.attrs) === null || _j === void 0 ? void 0 : _j.className : ''), onClick: handleClick, children: [iconMeta ? (_jsx(SolidIcon, { name: iconMeta.name, spin: iconMeta.spin, className: "solid-row-action-button-icon", "aria-hidden": true })) : null, _jsx("span", { className: "solid-row-action-button-label", children: button.attrs.label })] }));
+        return (_jsxs("button", { type: "button", className: "solid-row-action-button ".concat(presentation.buttonClassName ? presentation.buttonClassName : ''), onClick: handleClick, title: presentation.tooltip, "aria-label": presentation.isIconOnly ? ((_h = (_f = presentation.tooltip) !== null && _f !== void 0 ? _f : (_g = button === null || button === void 0 ? void 0 : button.attrs) === null || _g === void 0 ? void 0 : _g.action) !== null && _h !== void 0 ? _h : "Action") : undefined, children: [presentation.iconPos === "left" ? iconNode : null, presentation.showLabel ? _jsx("span", { className: "solid-row-action-button-label", children: presentation.label }) : null, presentation.iconPos === "right" ? iconNode : null] }));
     }
-    return (_jsx("div", { children: _jsx(SolidButton, { text: true, type: "button", className: "w-full text-left gap-2 ".concat(((_k = button === null || button === void 0 ? void 0 : button.attrs) === null || _k === void 0 ? void 0 : _k.className) ? (_l = button === null || button === void 0 ? void 0 : button.attrs) === null || _l === void 0 ? void 0 : _l.className : ''), label: button.attrs.label, size: "sm", leftIcon: iconMeta ? _jsx(SolidIcon, { name: iconMeta.name, spin: iconMeta.spin, "aria-hidden": true }) : undefined, onClick: handleClick }) }));
+    return (_jsx("div", { children: _jsx(SolidButton, { text: true, type: "button", className: "w-full text-left gap-2 ".concat(presentation.buttonClassName ? presentation.buttonClassName : ''), label: presentation.label, size: "sm", icon: presentation.icon, iconPos: presentation.iconPos, tooltip: presentation.tooltip, "aria-label": presentation.isIconOnly ? ((_l = (_j = presentation.tooltip) !== null && _j !== void 0 ? _j : (_k = button === null || button === void 0 ? void 0 : button.attrs) === null || _k === void 0 ? void 0 : _k.action) !== null && _l !== void 0 ? _l : "Action") : undefined, onClick: handleClick }) }));
 }
 //# sourceMappingURL=SolidFormViewContextMenuHeaderButton.js.map

package/dist/components/core/form/SolidFormViewContextMenuHeaderButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolidFormViewContextMenuHeaderButton.js","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewContextMenuHeaderButton.tsx"],"names":[],"mappings":"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","sourcesContent":["import { hasAnyRole } from \"../../../helpers/rolesHelper\";\nimport { useSession } from \"../../../hooks/useSession\";\nimport { SolidButton, SolidIcon, parseSolidIconMeta } from \"../../shad-cn-ui\";\n\ninterface SolidFormViewContextMenuHeaderButtonProps {\n    button: any;\n    params: any;\n    formik: any;\n    solidFormViewMetaData: any;\n    handleCustomButtonClick: (attrs: any, event: any) => void;\n    formData: any;\n    onActionComplete?: () => void;\n    variant?: \"default\" | \"menu\";\n}\n\nexport function SolidFormViewContextMenuHeaderButton({\n    button,\n    params,\n    formik,\n    solidFormViewMetaData,\n    handleCustomButtonClick,\n    formData,\n    onActionComplete,\n    variant = \"default\"\n}: SolidFormViewContextMenuHeaderButtonProps) {\n\n    const { data: session, status } = useSession();\n    const user = session?.user;\n\n    const hasRole = !button.attrs?.roles || button?.attrs?.roles.length === 0 ? true : hasAnyRole(user?.roles, button?.attrs?.roles);\n\n    if (!hasRole) return null;\n    if (button.attrs?.visible == false) return null\n    const iconMeta = parseSolidIconMeta(button?.attrs?.icon ?? \"si si-pencil\");\n    const handleClick = () => {\n        const event = {\n            action: button.attrs.action,\n            params,\n            formik,\n            solidFormViewMetaData: solidFormViewMetaData.data,\n            formData\n        };\n        handleCustomButtonClick(button.attrs, event);\n        onActionComplete?.();\n    };\n\n    if (variant === \"menu\") {\n        return (\n            <button\n                type=\"button\"\n                className={`solid-row-action-button ${button?.attrs?.className ? button?.attrs?.className : ''}`}\n                onClick={handleClick}\n            >\n                {iconMeta ? (\n                    <SolidIcon\n                        name={iconMeta.name}\n                        spin={iconMeta.spin}\n                        className=\"solid-row-action-button-icon\"\n                        aria-hidden\n                    />\n                ) : null}\n                <span className=\"solid-row-action-button-label\">{button.attrs.label}</span>\n            </button>\n        );\n    }\n\n    return (\n        <div>\n            <SolidButton\n                text\n                type=\"button\"\n                className={`w-full text-left gap-2 ${button?.attrs?.className ? button?.attrs?.className : ''}`}\n                label={button.attrs.label}\n                size=\"sm\"\n                leftIcon={\n                    iconMeta ? <SolidIcon name={iconMeta.name} spin={iconMeta.spin} aria-hidden /> : undefined\n                }\n                onClick={handleClick}\n            />\n        </div>\n    );\n}\n"]}
+{"version":3,"file":"SolidFormViewContextMenuHeaderButton.js","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewContextMenuHeaderButton.tsx"],"names":[],"mappings":"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","sourcesContent":["import { hasAnyRole } from \"../../../helpers/rolesHelper\";\nimport { resolveButtonPresentation } from \"../../../helpers/buttonPresentation\";\nimport { useSession } from \"../../../hooks/useSession\";\nimport { SolidButton, SolidIcon, parseSolidIconMeta } from \"../../shad-cn-ui\";\n\ninterface SolidFormViewContextMenuHeaderButtonProps {\n    button: any;\n    params: any;\n    formik: any;\n    solidFormViewMetaData: any;\n    handleCustomButtonClick: (attrs: any, event: any) => void;\n    formData: any;\n    onActionComplete?: () => void;\n    variant?: \"default\" | \"menu\";\n}\n\nexport function SolidFormViewContextMenuHeaderButton({\n    button,\n    params,\n    formik,\n    solidFormViewMetaData,\n    handleCustomButtonClick,\n    formData,\n    onActionComplete,\n    variant = \"default\"\n}: SolidFormViewContextMenuHeaderButtonProps) {\n\n    const { data: session, status } = useSession();\n    const user = session?.user;\n\n    const hasRole = !button.attrs?.roles || button?.attrs?.roles.length === 0 ? true : hasAnyRole(user?.roles, button?.attrs?.roles);\n    const presentation = resolveButtonPresentation(button?.attrs);\n\n    if (!hasRole) return null;\n    if (button.attrs?.visible == false) return null\n    if (!presentation.showIcon && !presentation.showLabel) return null;\n    const iconMeta = presentation.icon ? parseSolidIconMeta(presentation.icon) : undefined;\n    const iconNode = presentation.showIcon\n        ? (iconMeta\n            ? <SolidIcon name={iconMeta.name} spin={iconMeta.spin} className=\"solid-row-action-button-icon\" aria-hidden />\n            : <i className={`${presentation.icon} solid-row-action-button-icon`} aria-hidden />)\n        : null;\n    const handleClick = () => {\n        const event = {\n            action: button.attrs.action,\n            params,\n            formik,\n            solidFormViewMetaData: solidFormViewMetaData.data,\n            formData\n        };\n        handleCustomButtonClick(button.attrs, event);\n        onActionComplete?.();\n    };\n\n    if (variant === \"menu\") {\n        return (\n            <button\n                type=\"button\"\n                className={`solid-row-action-button ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}\n                onClick={handleClick}\n                title={presentation.tooltip}\n                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? \"Action\") : undefined}\n            >\n                {presentation.iconPos === \"left\" ? iconNode : null}\n                {presentation.showLabel ? <span className=\"solid-row-action-button-label\">{presentation.label}</span> : null}\n                {presentation.iconPos === \"right\" ? iconNode : null}\n            </button>\n        );\n    }\n\n    return (\n        <div>\n            <SolidButton\n                text\n                type=\"button\"\n                className={`w-full text-left gap-2 ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}\n                label={presentation.label}\n                size=\"sm\"\n                icon={presentation.icon}\n                iconPos={presentation.iconPos}\n                tooltip={presentation.tooltip}\n                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? \"Action\") : undefined}\n                onClick={handleClick}\n            />\n        </div>\n    );\n}\n"]}

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

@@ -1,4 +1,5 @@
 import { hasAnyRole } from "../../../helpers/rolesHelper";
+import { resolveButtonPresentation } from "../../../helpers/buttonPresentation";
 import { useSession } from "../../../hooks/useSession";
 import { SolidButton, SolidIcon, parseSolidIconMeta } from "../../shad-cn-ui";
 
@@ -28,10 +29,17 @@ export function SolidFormViewContextMenuHeaderButton({
     const user = session?.user;
 
     const hasRole = !button.attrs?.roles || button?.attrs?.roles.length === 0 ? true : hasAnyRole(user?.roles, button?.attrs?.roles);
+    const presentation = resolveButtonPresentation(button?.attrs);
 
     if (!hasRole) return null;
     if (button.attrs?.visible == false) return null
-    const iconMeta = parseSolidIconMeta(button?.attrs?.icon ?? "si si-pencil");
+    if (!presentation.showIcon && !presentation.showLabel) return null;
+    const iconMeta = presentation.icon ? parseSolidIconMeta(presentation.icon) : undefined;
+    const iconNode = presentation.showIcon
+        ? (iconMeta
+            ? <SolidIcon name={iconMeta.name} spin={iconMeta.spin} className="solid-row-action-button-icon" aria-hidden />
+            : <i className={`${presentation.icon} solid-row-action-button-icon`} aria-hidden />)
+        : null;
     const handleClick = () => {
         const event = {
             action: button.attrs.action,
@@ -48,18 +56,14 @@ export function SolidFormViewContextMenuHeaderButton({
         return (
             <button
                 type="button"
-                className={`solid-row-action-button ${button?.attrs?.className ? button?.attrs?.className : ''}`}
+                className={`solid-row-action-button ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}
                 onClick={handleClick}
+                title={presentation.tooltip}
+                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? "Action") : undefined}
             >
-                {iconMeta ? (
-                    <SolidIcon
-                        name={iconMeta.name}
-                        spin={iconMeta.spin}
-                        className="solid-row-action-button-icon"
-                        aria-hidden
-                    />
-                ) : null}
-                <span className="solid-row-action-button-label">{button.attrs.label}</span>
+                {presentation.iconPos === "left" ? iconNode : null}
+                {presentation.showLabel ? <span className="solid-row-action-button-label">{presentation.label}</span> : null}
+                {presentation.iconPos === "right" ? iconNode : null}
             </button>
         );
     }
@@ -69,12 +73,13 @@ export function SolidFormViewContextMenuHeaderButton({
             <SolidButton
                 text
                 type="button"
-                className={`w-full text-left gap-2 ${button?.attrs?.className ? button?.attrs?.className : ''}`}
-                label={button.attrs.label}
+                className={`w-full text-left gap-2 ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}
+                label={presentation.label}
                 size="sm"
-                leftIcon={
-                    iconMeta ? <SolidIcon name={iconMeta.name} spin={iconMeta.spin} aria-hidden /> : undefined
-                }
+                icon={presentation.icon}
+                iconPos={presentation.iconPos}
+                tooltip={presentation.tooltip}
+                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? "Action") : undefined}
                 onClick={handleClick}
             />
         </div>

package/dist/components/core/form/SolidFormViewNormalHeaderButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidFormViewNormalHeaderButton.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewNormalHeaderButton.tsx"],"names":[],"mappings":"AAKA,UAAU,oCAAoC;IAC1C,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,qBAAqB,EAAE,GAAG,CAAC;IAC3B,uBAAuB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,GAAG,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAChC;AAED,wBAAgB,+BAA+B,CAAC,EAC5C,MAAM,EACN,MAAM,EACN,MAAM,EACN,qBAAqB,EACrB,uBAAuB,EACvB,QAAQ,EACR,gBAAgB,EAChB,OAAmB,EACtB,EAAE,oCAAoC,kDAkDtC"}
+{"version":3,"file":"SolidFormViewNormalHeaderButton.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewNormalHeaderButton.tsx"],"names":[],"mappings":"AAMA,UAAU,oCAAoC;IAC1C,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,qBAAqB,EAAE,GAAG,CAAC;IAC3B,uBAAuB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,GAAG,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAChC;AAED,wBAAgB,+BAA+B,CAAC,EAC5C,MAAM,EACN,MAAM,EACN,MAAM,EACN,qBAAqB,EACrB,uBAAuB,EACvB,QAAQ,EACR,gBAAgB,EAChB,OAAmB,EACtB,EAAE,oCAAoC,kDA6DtC"}

package/dist/components/core/form/SolidFormViewNormalHeaderButton.js

@@ -12,18 +12,22 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { hasAnyRole } from '../../../helpers/rolesHelper';
 import { useSession } from "../../../hooks/useSession";
+import { resolveButtonPresentation } from '../../../helpers/buttonPresentation';
 import { SolidButton } from '../../shad-cn-ui';
 import { SolidIcon, parseSolidIconMeta } from "../../shad-cn-ui/SolidIcon";
 export function SolidFormViewNormalHeaderButton(_a) {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var button = _a.button, params = _a.params, formik = _a.formik, solidFormViewMetaData = _a.solidFormViewMetaData, handleCustomButtonClick = _a.handleCustomButtonClick, formData = _a.formData, onActionComplete = _a.onActionComplete, _o = _a.variant, variant = _o === void 0 ? "default" : _o;
-    var _p = useSession(), session = _p.data, status = _p.status;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var button = _a.button, params = _a.params, formik = _a.formik, solidFormViewMetaData = _a.solidFormViewMetaData, handleCustomButtonClick = _a.handleCustomButtonClick, formData = _a.formData, onActionComplete = _a.onActionComplete, _m = _a.variant, variant = _m === void 0 ? "default" : _m;
+    var _o = useSession(), session = _o.data, status = _o.status;
     var user = session === null || session === void 0 ? void 0 : session.user;
     var hasRole = !((_b = button === null || button === void 0 ? void 0 : button.attrs) === null || _b === void 0 ? void 0 : _b.roles) || ((_c = button === null || button === void 0 ? void 0 : button.attrs) === null || _c === void 0 ? void 0 : _c.roles.length) === 0 ? true : hasAnyRole(user === null || user === void 0 ? void 0 : user.roles, (_d = button === null || button === void 0 ? void 0 : button.attrs) === null || _d === void 0 ? void 0 : _d.roles);
+    var presentation = resolveButtonPresentation(button === null || button === void 0 ? void 0 : button.attrs);
     if (!hasRole)
         return null;
     if (((_e = button === null || button === void 0 ? void 0 : button.attrs) === null || _e === void 0 ? void 0 : _e.visible) == false)
         return null;
+    if (!presentation.showIcon && !presentation.showLabel)
+        return null;
     var handleClick = function () {
         var event = {
             action: button.attrs.action,
@@ -36,8 +40,14 @@ export function SolidFormViewNormalHeaderButton(_a) {
         onActionComplete === null || onActionComplete === void 0 ? void 0 : onActionComplete();
     };
     if (variant === "menu") {
-        return (_jsxs("button", { type: "button", className: "solid-row-action-button ".concat(((_f = button === null || button === void 0 ? void 0 : button.attrs) === null || _f === void 0 ? void 0 : _f.className) ? (_g = button === null || button === void 0 ? void 0 : button.attrs) === null || _g === void 0 ? void 0 : _g.className : ''), onClick: handleClick, children: [((_h = button === null || button === void 0 ? void 0 : button.attrs) === null || _h === void 0 ? void 0 : _h.icon) && ((function () { var m = parseSolidIconMeta(button.attrs.icon); return m ? _jsx(SolidIcon, { name: m.name, spin: m.spin, className: "solid-row-action-button-icon" }) : _jsx("i", { className: "".concat(button.attrs.icon, " solid-row-action-button-icon") }); })()), _jsx("span", { className: "solid-row-action-button-label", children: button.attrs.label })] }));
+        var iconMeta = presentation.icon ? parseSolidIconMeta(presentation.icon) : undefined;
+        var iconNode = presentation.showIcon
+            ? (iconMeta
+                ? _jsx(SolidIcon, { name: iconMeta.name, spin: iconMeta.spin, className: "solid-row-action-button-icon" })
+                : _jsx("i", { className: "".concat(presentation.icon, " solid-row-action-button-icon") }))
+            : null;
+        return (_jsxs("button", { type: "button", className: "solid-row-action-button ".concat(presentation.buttonClassName ? presentation.buttonClassName : ''), onClick: handleClick, title: presentation.tooltip, "aria-label": presentation.isIconOnly ? ((_h = (_f = presentation.tooltip) !== null && _f !== void 0 ? _f : (_g = button === null || button === void 0 ? void 0 : button.attrs) === null || _g === void 0 ? void 0 : _g.action) !== null && _h !== void 0 ? _h : "Action") : undefined, children: [presentation.iconPos === "left" ? iconNode : null, presentation.showLabel ? _jsx("span", { className: "solid-row-action-button-label", children: presentation.label }) : null, presentation.iconPos === "right" ? iconNode : null] }));
     }
-    return (_jsx("div", { children: _jsx(SolidButton, __assign({ type: "button", className: "w-full text-left gap-2 solid-icon-button ".concat(((_j = button === null || button === void 0 ? void 0 : button.attrs) === null || _j === void 0 ? void 0 : _j.className) ? (_k = button === null || button === void 0 ? void 0 : button.attrs) === null || _k === void 0 ? void 0 : _k.className : '') }, button.attrs, { label: button.attrs.label, size: "sm", iconPos: "left", icon: ((_l = button === null || button === void 0 ? void 0 : button.attrs) === null || _l === void 0 ? void 0 : _l.icon) ? (_m = button === null || button === void 0 ? void 0 : button.attrs) === null || _m === void 0 ? void 0 : _m.icon : "", onClick: handleClick })) }));
+    return (_jsx("div", { children: _jsx(SolidButton, __assign({ type: "button", className: "w-full text-left gap-2 solid-icon-button ".concat(presentation.buttonClassName ? presentation.buttonClassName : '') }, button.attrs, { label: presentation.label, size: "sm", iconPos: presentation.iconPos, icon: presentation.icon, tooltip: presentation.tooltip, "aria-label": presentation.isIconOnly ? ((_l = (_j = presentation.tooltip) !== null && _j !== void 0 ? _j : (_k = button === null || button === void 0 ? void 0 : button.attrs) === null || _k === void 0 ? void 0 : _k.action) !== null && _l !== void 0 ? _l : "Action") : undefined, onClick: handleClick })) }));
 }
 //# sourceMappingURL=SolidFormViewNormalHeaderButton.js.map

package/dist/components/core/form/SolidFormViewNormalHeaderButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolidFormViewNormalHeaderButton.js","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewNormalHeaderButton.tsx"],"names":[],"mappings":"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","sourcesContent":["import { hasAnyRole } from '../../../helpers/rolesHelper';\nimport { useSession } from \"../../../hooks/useSession\";\nimport { SolidButton } from '../../shad-cn-ui';\nimport { SolidIcon, parseSolidIconMeta } from \"../../shad-cn-ui/SolidIcon\";\n\ninterface SolidFormViewNormalHeaderButtonProps {\n    button: any;\n    params: any;\n    formik: any;\n    solidFormViewMetaData: any;\n    handleCustomButtonClick: (attrs: any, event: any) => void;\n    formData: any;\n    onActionComplete?: () => void;\n    variant?: \"default\" | \"menu\";\n}\n\nexport function SolidFormViewNormalHeaderButton({\n    button,\n    params,\n    formik,\n    solidFormViewMetaData,\n    handleCustomButtonClick,\n    formData,\n    onActionComplete,\n    variant = \"default\"\n}: SolidFormViewNormalHeaderButtonProps) {\n\n    const { data: session, status } = useSession();\n    const user = session?.user;\n\n    const hasRole = !button?.attrs?.roles || button?.attrs?.roles.length === 0 ? true : hasAnyRole(user?.roles, button?.attrs?.roles);\n\n    if (!hasRole) return null;\n    if (button?.attrs?.visible == false) return null\n    const handleClick = () => {\n        const event = {\n            action: button.attrs.action,\n            params,\n            formik,\n            solidFormViewMetaData: solidFormViewMetaData.data,\n            formData\n        };\n        handleCustomButtonClick(button.attrs, event);\n        onActionComplete?.();\n    };\n\n    if (variant === \"menu\") {\n        return (\n            <button\n                type=\"button\"\n                className={`solid-row-action-button ${button?.attrs?.className ? button?.attrs?.className : ''}`}\n                onClick={handleClick}\n            >\n                {button?.attrs?.icon && (\n                    (() => { const m = parseSolidIconMeta(button.attrs.icon); return m ? <SolidIcon name={m.name} spin={m.spin} className=\"solid-row-action-button-icon\" /> : <i className={`${button.attrs.icon} solid-row-action-button-icon`} />; })()\n                )}\n                <span className=\"solid-row-action-button-label\">{button.attrs.label}</span>\n            </button>\n        );\n    }\n\n    return (\n        <div>\n            <SolidButton\n                type=\"button\"\n                className={`w-full text-left gap-2 solid-icon-button ${button?.attrs?.className ? button?.attrs?.className : ''}`}\n                {...button.attrs}\n                label={button.attrs.label}\n                size=\"sm\"\n                iconPos=\"left\"\n                icon={button?.attrs?.icon ? button?.attrs?.icon : \"\"}\n                onClick={handleClick}\n            />\n        </div>\n    );\n}\n"]}
+{"version":3,"file":"SolidFormViewNormalHeaderButton.js","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormViewNormalHeaderButton.tsx"],"names":[],"mappings":"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","sourcesContent":["import { hasAnyRole } from '../../../helpers/rolesHelper';\nimport { useSession } from \"../../../hooks/useSession\";\nimport { resolveButtonPresentation } from '../../../helpers/buttonPresentation';\nimport { SolidButton } from '../../shad-cn-ui';\nimport { SolidIcon, parseSolidIconMeta } from \"../../shad-cn-ui/SolidIcon\";\n\ninterface SolidFormViewNormalHeaderButtonProps {\n    button: any;\n    params: any;\n    formik: any;\n    solidFormViewMetaData: any;\n    handleCustomButtonClick: (attrs: any, event: any) => void;\n    formData: any;\n    onActionComplete?: () => void;\n    variant?: \"default\" | \"menu\";\n}\n\nexport function SolidFormViewNormalHeaderButton({\n    button,\n    params,\n    formik,\n    solidFormViewMetaData,\n    handleCustomButtonClick,\n    formData,\n    onActionComplete,\n    variant = \"default\"\n}: SolidFormViewNormalHeaderButtonProps) {\n\n    const { data: session, status } = useSession();\n    const user = session?.user;\n\n    const hasRole = !button?.attrs?.roles || button?.attrs?.roles.length === 0 ? true : hasAnyRole(user?.roles, button?.attrs?.roles);\n    const presentation = resolveButtonPresentation(button?.attrs);\n\n    if (!hasRole) return null;\n    if (button?.attrs?.visible == false) return null\n    if (!presentation.showIcon && !presentation.showLabel) return null;\n    const handleClick = () => {\n        const event = {\n            action: button.attrs.action,\n            params,\n            formik,\n            solidFormViewMetaData: solidFormViewMetaData.data,\n            formData\n        };\n        handleCustomButtonClick(button.attrs, event);\n        onActionComplete?.();\n    };\n\n    if (variant === \"menu\") {\n        const iconMeta = presentation.icon ? parseSolidIconMeta(presentation.icon) : undefined;\n        const iconNode = presentation.showIcon\n            ? (iconMeta\n                ? <SolidIcon name={iconMeta.name} spin={iconMeta.spin} className=\"solid-row-action-button-icon\" />\n                : <i className={`${presentation.icon} solid-row-action-button-icon`} />)\n            : null;\n        return (\n            <button\n                type=\"button\"\n                className={`solid-row-action-button ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}\n                onClick={handleClick}\n                title={presentation.tooltip}\n                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? \"Action\") : undefined}\n            >\n                {presentation.iconPos === \"left\" ? iconNode : null}\n                {presentation.showLabel ? <span className=\"solid-row-action-button-label\">{presentation.label}</span> : null}\n                {presentation.iconPos === \"right\" ? iconNode : null}\n            </button>\n        );\n    }\n\n    return (\n        <div>\n            <SolidButton\n                type=\"button\"\n                className={`w-full text-left gap-2 solid-icon-button ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}\n                {...button.attrs}\n                label={presentation.label}\n                size=\"sm\"\n                iconPos={presentation.iconPos}\n                icon={presentation.icon}\n                tooltip={presentation.tooltip}\n                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? \"Action\") : undefined}\n                onClick={handleClick}\n            />\n        </div>\n    );\n}\n"]}

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

@@ -1,5 +1,6 @@
 import { hasAnyRole } from '../../../helpers/rolesHelper';
 import { useSession } from "../../../hooks/useSession";
+import { resolveButtonPresentation } from '../../../helpers/buttonPresentation';
 import { SolidButton } from '../../shad-cn-ui';
 import { SolidIcon, parseSolidIconMeta } from "../../shad-cn-ui/SolidIcon";
 
@@ -29,9 +30,11 @@ export function SolidFormViewNormalHeaderButton({
     const user = session?.user;
 
     const hasRole = !button?.attrs?.roles || button?.attrs?.roles.length === 0 ? true : hasAnyRole(user?.roles, button?.attrs?.roles);
+    const presentation = resolveButtonPresentation(button?.attrs);
 
     if (!hasRole) return null;
     if (button?.attrs?.visible == false) return null
+    if (!presentation.showIcon && !presentation.showLabel) return null;
     const handleClick = () => {
         const event = {
             action: button.attrs.action,
@@ -45,16 +48,23 @@ export function SolidFormViewNormalHeaderButton({
     };
 
     if (variant === "menu") {
+        const iconMeta = presentation.icon ? parseSolidIconMeta(presentation.icon) : undefined;
+        const iconNode = presentation.showIcon
+            ? (iconMeta
+                ? <SolidIcon name={iconMeta.name} spin={iconMeta.spin} className="solid-row-action-button-icon" />
+                : <i className={`${presentation.icon} solid-row-action-button-icon`} />)
+            : null;
         return (
             <button
                 type="button"
-                className={`solid-row-action-button ${button?.attrs?.className ? button?.attrs?.className : ''}`}
+                className={`solid-row-action-button ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}
                 onClick={handleClick}
+                title={presentation.tooltip}
+                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? "Action") : undefined}
             >
-                {button?.attrs?.icon && (
-                    (() => { const m = parseSolidIconMeta(button.attrs.icon); return m ? <SolidIcon name={m.name} spin={m.spin} className="solid-row-action-button-icon" /> : <i className={`${button.attrs.icon} solid-row-action-button-icon`} />; })()
-                )}
-                <span className="solid-row-action-button-label">{button.attrs.label}</span>
+                {presentation.iconPos === "left" ? iconNode : null}
+                {presentation.showLabel ? <span className="solid-row-action-button-label">{presentation.label}</span> : null}
+                {presentation.iconPos === "right" ? iconNode : null}
             </button>
         );
     }
@@ -63,12 +73,14 @@ export function SolidFormViewNormalHeaderButton({
         <div>
             <SolidButton
                 type="button"
-                className={`w-full text-left gap-2 solid-icon-button ${button?.attrs?.className ? button?.attrs?.className : ''}`}
+                className={`w-full text-left gap-2 solid-icon-button ${presentation.buttonClassName ? presentation.buttonClassName : ''}`}
                 {...button.attrs}
-                label={button.attrs.label}
+                label={presentation.label}
                 size="sm"
-                iconPos="left"
-                icon={button?.attrs?.icon ? button?.attrs?.icon : ""}
+                iconPos={presentation.iconPos}
+                icon={presentation.icon}
+                tooltip={presentation.tooltip}
+                aria-label={presentation.isIconOnly ? (presentation.tooltip ?? button?.attrs?.action ?? "Action") : undefined}
                 onClick={handleClick}
             />
         </div>

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

@@ -0,0 +1,12 @@
+import { SolidFormFieldWidgetProps } from '../../../../../types/solid-core';
+/**
+ * RolesGroupedByModuleWidget
+ *
+ * Groups roles by their associated module on the User form:
+ *   - Roles with no module → "Default Roles" accordion (first)
+ *   - Roles linked to a module → "<Module Display Name> Roles" accordion
+ *
+ * Each checkbox immediately fires a link/unlink API call.
+ */
+export declare const RolesGroupedByModuleWidget: ({ formik, fieldContext }: SolidFormFieldWidgetProps) => import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=RolesGroupedByModuleWidget.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RolesGroupedByModuleWidget.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/form/fields/relations/RolesGroupedByModuleWidget.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAmB5E;;;;;;;;GAQG;AACH,eAAO,MAAM,0BAA0B,6BAA8B,yBAAyB,4CAkN7F,CAAC"}

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

@@ -0,0 +1,168 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import qs from 'qs';
+import { useRelationEntityHandler } from './widgets/helpers/useRelationEntityHandler';
+import { SolidAccordion, SolidAccordionItem, SolidAccordionTrigger, SolidAccordionContent } from '../../../../shad-cn-ui/SolidAccordion';
+import { SolidCheckbox } from '../../../../shad-cn-ui/SolidCheckbox';
+import { SolidMessage } from '../../../../shad-cn-ui/SolidMessage';
+import { SolidPanel } from '../../../../shad-cn-ui/SolidPanel';
+import { SolidButton } from '../../../../shad-cn-ui/SolidButton';
+import { capitalize } from 'lodash';
+import { InlineRelationEntityDialog } from './widgets/helpers/InlineRelationEntityDialog';
+import { SolidFieldTooltip } from '../../../../../components/common/SolidFieldTooltip';
+import { solidGet } from '../../../../../http/solidHttp';
+import styles from '../solidFields.module.css';
+/**
+ * RolesGroupedByModuleWidget
+ *
+ * Groups roles by their associated module on the User form:
+ *   - Roles with no module → "Default Roles" accordion (first)
+ *   - Roles linked to a module → "<Module Display Name> Roles" accordion
+ *
+ * Each checkbox immediately fires a link/unlink API call.
+ */
+export var RolesGroupedByModuleWidget = function (_a) {
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var formik = _a.formik, fieldContext = _a.fieldContext;
+    var fieldMetadata = fieldContext.fieldMetadata;
+    var fieldLayoutInfo = fieldContext.field;
+    var fieldLabel = (_b = fieldLayoutInfo.attrs.label) !== null && _b !== void 0 ? _b : fieldMetadata.displayName;
+    var showFieldLabel = (_c = fieldLayoutInfo === null || fieldLayoutInfo === void 0 ? void 0 : fieldLayoutInfo.attrs) === null || _c === void 0 ? void 0 : _c.showLabel;
+    var readOnlyPermission = fieldContext.readOnly;
+    var _o = useState(false), visibleCreateDialog = _o[0], setVisibleCreateDialog = _o[1];
+    var _p = useState([]), allRoles = _p[0], setAllRoles = _p[1];
+    var _q = useState([]), groups = _q[0], setGroups = _q[1];
+    var _r = useState([]), openItems = _r[0], setOpenItems = _r[1];
+    var _s = useRelationEntityHandler({ fieldContext: fieldContext }), currentValues = _s.currentValues, fetchCurrentValues = _s.fetchCurrentValues, linkItem = _s.linkItem, unlinkItem = _s.unlinkItem, addNewRelation = _s.addNewRelation;
+    // Sync currentValues to Formik for validation
+    useEffect(function () {
+        formik.setFieldValue(fieldLayoutInfo.attrs.name, currentValues);
+    }, [currentValues]);
+    // On mount: load currently linked roles
+    useEffect(function () {
+        fetchCurrentValues();
+    }, [(_d = fieldContext.data) === null || _d === void 0 ? void 0 : _d.id]);
+    // Fetch all roles with module populated
+    useEffect(function () {
+        var fetchRoles = function () { return __awaiter(void 0, void 0, void 0, function () {
+            var qsStr, response, records, e_1;
+            var _a, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _d.trys.push([0, 2, , 3]);
+                        qsStr = qs.stringify({ offset: 0, limit: 1000, populate: ['module'] }, { encodeValuesOnly: true });
+                        return [4 /*yield*/, solidGet("/role-metadata?".concat(qsStr))];
+                    case 1:
+                        response = _d.sent();
+                        records = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.records) !== null && _c !== void 0 ? _c : [];
+                        setAllRoles(records);
+                        return [3 /*break*/, 3];
+                    case 2:
+                        e_1 = _d.sent();
+                        console.error('RolesGroupedByModuleWidget: failed to fetch roles', e_1);
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); };
+        fetchRoles();
+    }, [(_e = fieldContext.data) === null || _e === void 0 ? void 0 : _e.id]);
+    // Rebuild groups whenever allRoles changes
+    useEffect(function () {
+        if (!allRoles.length)
+            return;
+        var groupMap = new Map();
+        groupMap.set(null, { displayName: 'Default', roles: [] });
+        allRoles.forEach(function (role) {
+            var _a, _b, _c, _d, _e;
+            var moduleId = (_c = (_a = role.moduleId) !== null && _a !== void 0 ? _a : (_b = role.module) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : null;
+            var moduleDisplayName = (_e = (_d = role.module) === null || _d === void 0 ? void 0 : _d.displayName) !== null && _e !== void 0 ? _e : 'Default';
+            var item = { label: role.name, value: role.id, original: role };
+            if (moduleId === null || moduleId === undefined) {
+                groupMap.get(null).roles.push(item);
+            }
+            else {
+                if (!groupMap.has(moduleId)) {
+                    groupMap.set(moduleId, { displayName: moduleDisplayName, roles: [] });
+                }
+                groupMap.get(moduleId).roles.push(item);
+            }
+        });
+        // Default group first, then modules sorted alphabetically by displayName
+        var built = [];
+        built.push({ moduleId: null, moduleDisplayName: 'Default', roles: groupMap.get(null).roles });
+        var moduleKeys = Array.from(groupMap.keys())
+            .filter(function (k) { return k !== null; })
+            .sort(function (a, b) {
+            var dA = groupMap.get(a).displayName;
+            var dB = groupMap.get(b).displayName;
+            return dA.localeCompare(dB);
+        });
+        moduleKeys.forEach(function (moduleId) {
+            var g = groupMap.get(moduleId);
+            built.push({ moduleId: moduleId, moduleDisplayName: g.displayName, roles: g.roles });
+        });
+        var nonEmpty = built.filter(function (g) { return g.roles.length > 0; });
+        setGroups(nonEmpty);
+        setOpenItems(nonEmpty.map(function (g) { var _a; return String((_a = g.moduleId) !== null && _a !== void 0 ? _a : 'default'); }));
+    }, [allRoles]);
+    var handleCheckboxChange = function (item) {
+        var isLinked = currentValues.some(function (s) { return s.value === item.value; });
+        if (isLinked)
+            unlinkItem(item);
+        else
+            linkItem(item);
+    };
+    var isUnsaved = ((_f = fieldContext.data) === null || _f === void 0 ? void 0 : _f.id) === undefined || ((_g = fieldContext.data) === null || _g === void 0 ? void 0 : _g.id) === 'new';
+    var entityName = ((_l = (_k = (_j = (_h = fieldContext.solidFormViewMetaData) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.solidView) === null || _k === void 0 ? void 0 : _k.model) === null || _l === void 0 ? void 0 : _l.displayName) ||
+        capitalize(fieldContext.modelName);
+    var isFormFieldValid = function (fmk, fieldName) {
+        return fmk.touched[fieldName] && fmk.errors[fieldName];
+    };
+    return (_jsxs("div", { children: [isUnsaved && (_jsx("div", { className: "mb-2", children: _jsx(SolidMessage, { severity: "warn", text: "Please save the ".concat(entityName, " first to assign ").concat(fieldLabel, "."), className: "w-full justify-content-start" }) })), _jsxs("div", { className: "flex align-items-center gap-3 mb-2", children: [showFieldLabel !== false && (_jsxs("label", { className: "".concat(styles.fieldLabel, " form-field-label"), children: [fieldLabel, fieldMetadata.required && _jsx("span", { className: "text-red-500", children: " *" }), _jsx(SolidFieldTooltip, { fieldContext: fieldContext })] })), fieldLayoutInfo.attrs.inlineCreate && (_jsxs(_Fragment, { children: [_jsx(SolidButton, { icon: "si si-plus", rounded: true, variant: "outline", "aria-label": "Add role", type: "button", size: "sm", onClick: function () { return setVisibleCreateDialog(true); }, className: "custom-add-button", disabled: isUnsaved }), _jsx(InlineRelationEntityDialog, { visible: visibleCreateDialog, setVisible: setVisibleCreateDialog, fieldContext: fieldContext, onCreate: addNewRelation })] }))] }), groups.length === 0 && !isUnsaved && (_jsx(SolidPanel, { children: _jsx("p", { className: "text-sm text-muted-foreground m-0", children: "No roles defined." }) })), groups.length > 0 && (_jsx(SolidAccordion, { type: "multiple", value: openItems, onValueChange: setOpenItems, className: "w-full", children: groups.map(function (group) {
+                    var _a;
+                    var key = String((_a = group.moduleId) !== null && _a !== void 0 ? _a : 'default');
+                    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: "formgrid grid pt-1", children: group.roles.map(function (item, i) { return (_jsxs("div", { className: "field col-6 flex gap-2 ".concat(i >= 2 ? 'mt-3' : ''), children: [_jsx(SolidCheckbox, { disabled: readOnlyPermission || isUnsaved, id: "role-".concat(item.value), checked: currentValues.some(function (s) { return s.value === item.value; }), onChange: function () { return handleCheckboxChange(item); } }), _jsx("label", { htmlFor: "role-".concat(item.value), className: "".concat(styles.fieldLabel, " form-field-label m-0"), children: item.label })] }, item.value)); }) }) })] }, key));
+                }) })), isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (_jsx("div", { className: "mt-1", children: _jsx(SolidMessage, { severity: "error", text: (_m = formik === null || formik === void 0 ? void 0 : formik.errors[fieldLayoutInfo.attrs.name]) === null || _m === void 0 ? void 0 : _m.toString() }) }))] }));
+};
+//# sourceMappingURL=RolesGroupedByModuleWidget.js.map

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

@@ -0,0 +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 { SolidFormFieldWidgetProps } from '../../../../../types/solid-core';\nimport { useRelationEntityHandler, RelationItem } from './widgets/helpers/useRelationEntityHandler';\nimport { SolidAccordion, SolidAccordionItem, SolidAccordionTrigger, SolidAccordionContent } from '../../../../shad-cn-ui/SolidAccordion';\nimport { SolidCheckbox } from '../../../../shad-cn-ui/SolidCheckbox';\nimport { SolidMessage } from '../../../../shad-cn-ui/SolidMessage';\nimport { SolidPanel } from '../../../../shad-cn-ui/SolidPanel';\nimport { SolidButton } from '../../../../shad-cn-ui/SolidButton';\nimport { capitalize } from 'lodash';\nimport { InlineRelationEntityDialog } from './widgets/helpers/InlineRelationEntityDialog';\nimport { SolidFieldTooltip } from '../../../../../components/common/SolidFieldTooltip';\nimport { solidGet } from '../../../../../http/solidHttp';\nimport styles from '../solidFields.module.css';\n\ntype RoleGroup = {\n    moduleId: number | null;\n    moduleDisplayName: string;\n    roles: RelationItem[];\n};\n\n/**\n * RolesGroupedByModuleWidget\n *\n * Groups roles by their associated module on the User form:\n *   - Roles with no module → \"Default Roles\" accordion (first)\n *   - Roles linked to a module → \"<Module Display Name> Roles\" accordion\n *\n * Each checkbox immediately fires a link/unlink API call.\n */\nexport const RolesGroupedByModuleWidget = ({ formik, fieldContext }: SolidFormFieldWidgetProps) => {\n    const fieldMetadata = fieldContext.fieldMetadata;\n    const fieldLayoutInfo = fieldContext.field;\n    const fieldLabel = fieldLayoutInfo.attrs.label ?? fieldMetadata.displayName;\n    const showFieldLabel = fieldLayoutInfo?.attrs?.showLabel;\n    const readOnlyPermission = fieldContext.readOnly;\n\n    const [visibleCreateDialog, setVisibleCreateDialog] = useState(false);\n    const [allRoles, setAllRoles] = useState<any[]>([]);\n    const [groups, setGroups] = useState<RoleGroup[]>([]);\n    const [openItems, setOpenItems] = useState<string[]>([]);\n\n    const {\n        currentValues,\n        fetchCurrentValues,\n        linkItem,\n        unlinkItem,\n        addNewRelation,\n    } = useRelationEntityHandler({ fieldContext });\n\n    // Sync currentValues to Formik for validation\n    useEffect(() => {\n        formik.setFieldValue(fieldLayoutInfo.attrs.name, currentValues);\n    }, [currentValues]);\n\n    // On mount: load currently linked roles\n    useEffect(() => {\n        fetchCurrentValues();\n    }, [fieldContext.data?.id]);\n\n    // Fetch all roles with module populated\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    }, [fieldContext.data?.id]);\n\n    // Rebuild groups whenever allRoles changes\n    useEffect(() => {\n        if (!allRoles.length) return;\n\n        const groupMap = new Map<number | null, { displayName: string; roles: RelationItem[] }>();\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: RelationItem = { label: role.name, value: role.id, original: role };\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        // Default group first, then modules sorted alphabetically by displayName\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    const handleCheckboxChange = (item: RelationItem) => {\n        const isLinked = currentValues.some((s) => s.value === item.value);\n        if (isLinked) unlinkItem(item);\n        else linkItem(item);\n    };\n\n    const isUnsaved = fieldContext.data?.id === undefined || fieldContext.data?.id === 'new';\n    const entityName =\n        fieldContext.solidFormViewMetaData?.data?.solidView?.model?.displayName ||\n        capitalize(fieldContext.modelName);\n\n    const isFormFieldValid = (fmk: any, fieldName: string) =>\n        fmk.touched[fieldName] && fmk.errors[fieldName];\n\n    return (\n        <div>\n            {isUnsaved && (\n                <div className=\"mb-2\">\n                    <SolidMessage\n                        severity=\"warn\"\n                        text={`Please save the ${entityName} first to assign ${fieldLabel}.`}\n                        className=\"w-full justify-content-start\"\n                    />\n                </div>\n            )}\n\n            <div className=\"flex align-items-center gap-3 mb-2\">\n                {showFieldLabel !== false && (\n                    <label className={`${styles.fieldLabel} form-field-label`}>\n                        {fieldLabel}\n                        {fieldMetadata.required && <span className=\"text-red-500\"> *</span>}\n                        <SolidFieldTooltip fieldContext={fieldContext} />\n                    </label>\n                )}\n                {fieldLayoutInfo.attrs.inlineCreate && (\n                    <>\n                        <SolidButton\n                            icon=\"si si-plus\"\n                            rounded\n                            variant=\"outline\"\n                            aria-label=\"Add role\"\n                            type=\"button\"\n                            size=\"sm\"\n                            onClick={() => setVisibleCreateDialog(true)}\n                            className=\"custom-add-button\"\n                            disabled={isUnsaved}\n                        />\n                        <InlineRelationEntityDialog\n                            visible={visibleCreateDialog}\n                            setVisible={setVisibleCreateDialog}\n                            fieldContext={fieldContext}\n                            onCreate={addNewRelation}\n                        />\n                    </>\n                )}\n            </div>\n\n            {groups.length === 0 && !isUnsaved && (\n                <SolidPanel>\n                    <p className=\"text-sm text-muted-foreground m-0\">No roles defined.</p>\n                </SolidPanel>\n            )}\n\n            {groups.length > 0 && (\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=\"formgrid grid pt-1\">\n                                        {group.roles.map((item, i) => (\n                                            <div\n                                                key={item.value}\n                                                className={`field col-6 flex gap-2 ${i >= 2 ? 'mt-3' : ''}`}\n                                            >\n                                                <SolidCheckbox\n                                                    disabled={readOnlyPermission || isUnsaved}\n                                                    id={`role-${item.value}`}\n                                                    checked={currentValues.some((s) => s.value === item.value)}\n                                                    onChange={() => handleCheckboxChange(item)}\n                                                />\n                                                <label\n                                                    htmlFor={`role-${item.value}`}\n                                                    className={`${styles.fieldLabel} 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            {isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (\n                <div className=\"mt-1\">\n                    <SolidMessage\n                        severity=\"error\"\n                        text={formik?.errors[fieldLayoutInfo.attrs.name]?.toString()}\n                    />\n                </div>\n            )}\n        </div>\n    );\n};\n"]}