@solidxai/core-ui 0.1.12-beta.6 → 0.1.12-beta.8

package/dist/components/core/form/fields/SolidRichTextField.tsx

@@ -1,5 +1,5 @@
 
-import React from "react";
+import React, { useEffect } from "react";
 import { SolidMessage } from "../../../shad-cn-ui/SolidMessage";
 import { SolidRichTextEditor } from "../../../shad-cn-ui/SolidRichTextEditor";
 import * as Yup from 'yup';
@@ -10,6 +10,67 @@ import { SolidFieldTooltip } from "../../../../components/common/SolidFieldToolt
 import { ERROR_MESSAGES } from "../../../../constants/error-messages";
 import styles from "./solidFields.module.css";
 
+const normalizeQuillRichTextHtml = (html: string): string => {
+    if (!html || typeof document === "undefined") {
+        return html ?? "";
+    }
+
+    const template = document.createElement("template");
+    template.innerHTML = html;
+
+    const orderedLists = Array.from(template.content.querySelectorAll("ol")).reverse();
+
+    orderedLists.forEach((orderedList) => {
+        const listItems = Array.from(orderedList.children).filter(
+            (child): child is HTMLLIElement => child instanceof HTMLLIElement,
+        );
+
+        if (listItems.length === 0) {
+            return;
+        }
+
+        const hasBulletItems = listItems.some((item) => item.getAttribute("data-list") === "bullet");
+        if (!hasBulletItems) {
+            listItems.forEach((item) => item.removeAttribute("data-list"));
+            return;
+        }
+
+        const replacementFragment = document.createDocumentFragment();
+        let currentList: HTMLOListElement | HTMLUListElement | null = null;
+        let currentListType: "ordered" | "bullet" | null = null;
+
+        const appendCurrentList = () => {
+            if (currentList) {
+                replacementFragment.appendChild(currentList);
+                currentList = null;
+                currentListType = null;
+            }
+        };
+
+        Array.from(orderedList.childNodes).forEach((node) => {
+            if (!(node instanceof HTMLLIElement)) {
+                appendCurrentList();
+                replacementFragment.appendChild(node);
+                return;
+            }
+
+            const listType = node.getAttribute("data-list") === "bullet" ? "bullet" : "ordered";
+            if (!currentList || currentListType !== listType) {
+                appendCurrentList();
+                currentList = document.createElement(listType === "bullet" ? "ul" : "ol");
+                currentListType = listType;
+            }
+
+            node.removeAttribute("data-list");
+            currentList.appendChild(node);
+        });
+
+        orderedList.replaceWith(replacementFragment);
+    });
+
+    return template.innerHTML;
+};
+
 export class SolidRichTextField implements ISolidField {
 
     private fieldContext: SolidFieldProps;
@@ -127,6 +188,26 @@ export const DefaultRichTextFormEditWidget = ({ formik, fieldContext }: SolidFor
 
     const formDisabled = solidFormViewMetaData.data.solidView?.layout?.attrs?.disabled;
     const formReadonly = solidFormViewMetaData.data.solidView?.layout?.attrs?.readonly;
+    const fieldName = fieldLayoutInfo.attrs.name;
+    const fieldValue = formik.values[fieldName] || "";
+    const normalizedFieldValue = normalizeQuillRichTextHtml(fieldValue);
+
+    useEffect(() => {
+        if (fieldValue === normalizedFieldValue) {
+            return;
+        }
+
+        fieldContext.onChange(
+            {
+                target: {
+                    name: fieldName,
+                    value: normalizedFieldValue,
+                    type: "text",
+                },
+            } as any,
+            "onFieldChange"
+        );
+    }, [fieldContext, fieldName, fieldValue, normalizedFieldValue]);
 
 
     return (
@@ -140,14 +221,15 @@ export const DefaultRichTextFormEditWidget = ({ formik, fieldContext }: SolidFor
             }
             <SolidRichTextEditor
                 readOnly={formReadonly || fieldReadonly || readOnlyPermission || formDisabled || fieldDisabled}
-                id={fieldLayoutInfo.attrs.name}
-                value={formik.values[fieldLayoutInfo.attrs.name] || ""}
+                id={fieldName}
+                value={normalizedFieldValue}
                 onChange={(value) => {
+                    const normalizedValue = normalizeQuillRichTextHtml(value ?? "");
                     fieldContext.onChange(
                         {
                             target: {
-                                name: fieldLayoutInfo.attrs.name,
-                                value: value ?? "",
+                                name: fieldName,
+                                value: normalizedValue,
                                 type: "text",
                             },
                         } as any,
@@ -157,8 +239,8 @@ export const DefaultRichTextFormEditWidget = ({ formik, fieldContext }: SolidFor
                 className="solid-custom-editor"
                 style={{ minHeight: 180 }}
             />
-            {isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (
-                <p className={styles.fieldError}>{formik?.errors[fieldLayoutInfo.attrs.name]?.toString()}</p>
+            {isFormFieldValid(formik, fieldName) && (
+                <p className={styles.fieldError}>{formik?.errors[fieldName]?.toString()}</p>
             )}
         </div>
     );

package/dist/components/core/form/fields/mediaFieldUtils.d.ts

@@ -0,0 +1,3 @@
+export declare const getPersistedMediaId: (value: unknown) => number | string | null;
+export declare const buildMediaFieldKey: (value: unknown) => string;
+//# sourceMappingURL=mediaFieldUtils.d.ts.map

package/dist/components/core/form/fields/mediaFieldUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mediaFieldUtils.d.ts","sourceRoot":"","sources":["../../../../../src/components/core/form/fields/mediaFieldUtils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,UAAW,OAAO,KAAG,MAAM,GAAG,MAAM,GAAG,IAgBtE,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,OAAO,KAAG,MA0BnD,CAAC"}

package/dist/components/core/form/fields/mediaFieldUtils.js

@@ -0,0 +1,30 @@
+export var getPersistedMediaId = function (value) {
+    if (!value || value instanceof File || typeof value !== "object") {
+        return null;
+    }
+    var mediaId = value.id;
+    if (typeof mediaId === "number" && Number.isFinite(mediaId)) {
+        return mediaId;
+    }
+    if (typeof mediaId === "string" && mediaId.trim().length > 0) {
+        return mediaId;
+    }
+    return null;
+};
+export var buildMediaFieldKey = function (value) {
+    var _a, _b, _c, _d;
+    if (value instanceof File) {
+        return "local-".concat(value.name, "-").concat(value.size, "-").concat(value.lastModified);
+    }
+    var persistedMediaId = getPersistedMediaId(value);
+    if (persistedMediaId !== null) {
+        return "persisted-".concat(persistedMediaId);
+    }
+    if (value && typeof value === "object") {
+        var fileName = String((_b = (_a = value.originalFileName) !== null && _a !== void 0 ? _a : value.name) !== null && _b !== void 0 ? _b : "file");
+        var fileSize = String((_d = (_c = value.fileSize) !== null && _c !== void 0 ? _c : value.size) !== null && _d !== void 0 ? _d : "0");
+        return "unknown-".concat(fileName, "-").concat(fileSize);
+    }
+    return "unknown-file";
+};
+//# sourceMappingURL=mediaFieldUtils.js.map

package/dist/components/core/form/fields/mediaFieldUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mediaFieldUtils.js","sourceRoot":"","sources":["../../../../../src/components/core/form/fields/mediaFieldUtils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,mBAAmB,GAAG,UAAC,KAAc;IAChD,IAAI,CAAC,KAAK,IAAI,KAAK,YAAY,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAChE,OAAO,IAAI,CAAC;KACb;IAED,IAAM,OAAO,GAAI,KAA0B,CAAC,EAAE,CAAC;IAE/C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC3D,OAAO,OAAO,CAAC;KAChB;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5D,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,KAAc;;IAC/C,IAAI,KAAK,YAAY,IAAI,EAAE;QACzB,OAAO,gBAAS,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,YAAY,CAAE,CAAC;KAClE;IAED,IAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpD,IAAI,gBAAgB,KAAK,IAAI,EAAE;QAC7B,OAAO,oBAAa,gBAAgB,CAAE,CAAC;KACxC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtC,IAAM,QAAQ,GAAG,MAAM,CACrB,MAAA,MAAC,KAAwD,CAAC,gBAAgB,mCACzE,KAA4B,CAAC,IAAI,mCAClC,MAAM,CACP,CAAC;QACF,IAAM,QAAQ,GAAG,MAAM,CACrB,MAAA,MAAC,KAAgD,CAAC,QAAQ,mCACzD,KAA4B,CAAC,IAAI,mCAClC,GAAG,CACJ,CAAC;QAEF,OAAO,kBAAW,QAAQ,cAAI,QAAQ,CAAE,CAAC;KAC1C;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC","sourcesContent":["export const getPersistedMediaId = (value: unknown): number | string | null => {\n  if (!value || value instanceof File || typeof value !== \"object\") {\n    return null;\n  }\n\n  const mediaId = (value as { id?: unknown }).id;\n\n  if (typeof mediaId === \"number\" && Number.isFinite(mediaId)) {\n    return mediaId;\n  }\n\n  if (typeof mediaId === \"string\" && mediaId.trim().length > 0) {\n    return mediaId;\n  }\n\n  return null;\n};\n\nexport const buildMediaFieldKey = (value: unknown): string => {\n  if (value instanceof File) {\n    return `local-${value.name}-${value.size}-${value.lastModified}`;\n  }\n\n  const persistedMediaId = getPersistedMediaId(value);\n  if (persistedMediaId !== null) {\n    return `persisted-${persistedMediaId}`;\n  }\n\n  if (value && typeof value === \"object\") {\n    const fileName = String(\n      (value as { originalFileName?: unknown; name?: unknown }).originalFileName ??\n      (value as { name?: unknown }).name ??\n      \"file\"\n    );\n    const fileSize = String(\n      (value as { fileSize?: unknown; size?: unknown }).fileSize ??\n      (value as { size?: unknown }).size ??\n      \"0\"\n    );\n\n    return `unknown-${fileName}-${fileSize}`;\n  }\n\n  return \"unknown-file\";\n};\n"]}

package/dist/components/core/form/fields/mediaFieldUtils.ts

@@ -0,0 +1,45 @@
+export const getPersistedMediaId = (value: unknown): number | string | null => {
+  if (!value || value instanceof File || typeof value !== "object") {
+    return null;
+  }
+
+  const mediaId = (value as { id?: unknown }).id;
+
+  if (typeof mediaId === "number" && Number.isFinite(mediaId)) {
+    return mediaId;
+  }
+
+  if (typeof mediaId === "string" && mediaId.trim().length > 0) {
+    return mediaId;
+  }
+
+  return null;
+};
+
+export const buildMediaFieldKey = (value: unknown): string => {
+  if (value instanceof File) {
+    return `local-${value.name}-${value.size}-${value.lastModified}`;
+  }
+
+  const persistedMediaId = getPersistedMediaId(value);
+  if (persistedMediaId !== null) {
+    return `persisted-${persistedMediaId}`;
+  }
+
+  if (value && typeof value === "object") {
+    const fileName = String(
+      (value as { originalFileName?: unknown; name?: unknown }).originalFileName ??
+      (value as { name?: unknown }).name ??
+      "file"
+    );
+    const fileSize = String(
+      (value as { fileSize?: unknown; size?: unknown }).fileSize ??
+      (value as { size?: unknown }).size ??
+      "0"
+    );
+
+    return `unknown-${fileName}-${fileSize}`;
+  }
+
+  return "unknown-file";
+};

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;AAMD,eAAO,MAAM,0BAA0B,2CAIpC,+BAA+B,4CAuHjC,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,4CAyHjC,CAAC"}

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

@@ -124,7 +124,7 @@ 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: "solid-user-role-grid pt-1", children: group.roles.map(function (item) {
+            return (_jsxs(SolidAccordionItem, { value: key, children: [_jsx("div", { className: "pt-2", 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));

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\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"]}
+{"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                        <div className=\"pt-2\">\n                            <SolidAccordionTrigger>{title}</SolidAccordionTrigger>\n                        </div>\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

@@ -112,7 +112,9 @@ export const RolesGroupedByModuleWidget = ({
                         : `${group.moduleDisplayName} Roles`;
                 return (
                     <SolidAccordionItem key={key} value={key}>
-                        <SolidAccordionTrigger>{title}</SolidAccordionTrigger>
+                        <div className="pt-2">
+                            <SolidAccordionTrigger>{title}</SolidAccordionTrigger>
+                        </div>
                         <SolidAccordionContent>
                             <div className="solid-user-role-grid pt-1">
                                 {group.roles.map((item) => {

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;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"}
+{"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;AAe5E,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;IAqBnB,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,4CAqTzG,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

@@ -73,6 +73,7 @@ import * as Handlebars from "handlebars";
 import { SolidFieldTooltip } from "../../../../../components/common/SolidFieldTooltip";
 import { ERROR_MESSAGES } from "../../../../../constants/error-messages";
 import { getVirtualScrollerOptions } from "../../../../../helpers/autoCompleteVirtualScroll";
+import { getRelatedRecordDisplayText } from "../../../../../helpers/relationDisplay";
 import { buildSyntheticChangeEvent } from "../fieldEventUtils";
 import styles from "../solidFields.module.css";
 var SolidRelationManyToOneField = /** @class */ (function () {
@@ -90,15 +91,16 @@ var SolidRelationManyToOneField = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             var manyToOneFieldData = (_a = this.fieldContext) === null || _a === void 0 ? void 0 : _a.data[(_d = (_c = (_b = this.fieldContext) === null || _b === void 0 ? void 0 : _b.field) === null || _c === void 0 ? void 0 : _c.attrs) === null || _d === void 0 ? void 0 : _d.name];
             var fieldMetadata = (_e = this.fieldContext) === null || _e === void 0 ? void 0 : _e.fieldMetadata;
-            var userKeyField = (_g = (_f = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _f === void 0 ? void 0 : _f.userKeyField) === null || _g === void 0 ? void 0 : _g.name;
-            var manyToOneColVal = manyToOneFieldData ? manyToOneFieldData[userKeyField] : '';
-            if (manyToOneColVal) {
+            var userKeyField = ((_h = (_g = (_f = this.fieldContext) === null || _f === void 0 ? void 0 : _f.field) === null || _g === void 0 ? void 0 : _g.attrs) === null || _h === void 0 ? void 0 : _h.coModelFieldToDisplay) ||
+                ((_k = (_j = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _j === void 0 ? void 0 : _j.userKeyField) === null || _k === void 0 ? void 0 : _k.name);
+            var manyToOneColVal = getRelatedRecordDisplayText(manyToOneFieldData, userKeyField);
+            if (manyToOneFieldData) {
                 return __assign({ solidManyToOneLabel: manyToOneColVal || '', solidManyToOneValue: (manyToOneFieldData === null || manyToOneFieldData === void 0 ? void 0 : manyToOneFieldData.id) || '' }, manyToOneFieldData);
             }
-            var fieldName = (_k = (_j = (_h = this.fieldContext) === null || _h === void 0 ? void 0 : _h.field) === null || _j === void 0 ? void 0 : _j.attrs) === null || _k === void 0 ? void 0 : _k.name;
+            var fieldName = (_o = (_m = (_l = this.fieldContext) === null || _l === void 0 ? void 0 : _l.field) === null || _m === void 0 ? void 0 : _m.attrs) === null || _o === void 0 ? void 0 : _o.name;
             if (this.fieldContext.parentData && this.fieldContext.parentFieldName === fieldName) {
                 var parentDataForKey = this.fieldContext.parentData[userKeyField];
                 if (parentDataForKey && typeof parentDataForKey === 'object') {
@@ -218,7 +220,7 @@ var SolidRelationManyToOneField = /** @class */ (function () {
 }());
 export { SolidRelationManyToOneField };
 export var DefaultRelationManyToOneFormEditWidget = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     var formik = _a.formik, fieldContext = _a.fieldContext;
     var dispatch = useDispatch();
     var fieldMetadata = fieldContext.fieldMetadata;
@@ -228,8 +230,8 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
     var solidFormViewMetaData = fieldContext.solidFormViewMetaData;
     var showFieldLabel = (_d = fieldLayoutInfo === null || fieldLayoutInfo === void 0 ? void 0 : fieldLayoutInfo.attrs) === null || _d === void 0 ? void 0 : _d.showLabel;
     var readOnlyPermission = fieldContext.readOnly;
-    var _p = useState(false), visibleCreateRelationEntity = _p[0], setvisibleCreateRelationEntity = _p[1];
-    var _q = useState(), formViewParams = _q[0], setformViewParams = _q[1];
+    var _s = useState(false), visibleCreateRelationEntity = _s[0], setvisibleCreateRelationEntity = _s[1];
+    var _t = useState(), formViewParams = _t[0], setformViewParams = _t[1];
     // auto complete specific code. 
     var entityApi = createSolidEntityApi(fieldMetadata.relationCoModelSingularName);
     var useLazyGetSolidEntitiesQuery = entityApi.useLazyGetSolidEntitiesQuery;
@@ -239,12 +241,14 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
     var formDisabled = (_j = (_h = (_g = solidFormViewMetaData.data.solidView) === null || _g === void 0 ? void 0 : _g.layout) === null || _h === void 0 ? void 0 : _h.attrs) === null || _j === void 0 ? void 0 : _j.disabled;
     var formReadonly = (_m = (_l = (_k = solidFormViewMetaData.data.solidView) === null || _k === void 0 ? void 0 : _k.layout) === null || _l === void 0 ? void 0 : _l.attrs) === null || _m === void 0 ? void 0 : _m.readonly;
     var whereClause = fieldLayoutInfo.attrs.whereClause;
-    var _r = useState([]), autoCompleteItems = _r[0], setAutoCompleteItems = _r[1];
-    var _s = useState(0), offset = _s[0], setOffset = _s[1];
-    var _t = useState(true), hasMore = _t[0], setHasMore = _t[1];
-    var _u = useState(""), currentQuery = _u[0], setCurrentQuery = _u[1];
+    var _u = useState([]), autoCompleteItems = _u[0], setAutoCompleteItems = _u[1];
+    var _v = useState(0), offset = _v[0], setOffset = _v[1];
+    var _w = useState(true), hasMore = _w[0], setHasMore = _w[1];
+    var _x = useState(""), currentQuery = _x[0], setCurrentQuery = _x[1];
     var LIMIT = 50;
-    var _v = useState(false), loading = _v[0], setLoading = _v[1];
+    var _y = useState(false), loading = _y[0], setLoading = _y[1];
+    var userKeyField = ((_o = fieldLayoutInfo === null || fieldLayoutInfo === void 0 ? void 0 : fieldLayoutInfo.attrs) === null || _o === void 0 ? void 0 : _o.coModelFieldToDisplay) ||
+        ((_q = (_p = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _p === void 0 ? void 0 : _p.userKeyField) === null || _q === void 0 ? void 0 : _q.name);
     useEffect(function () {
         var _a, _b;
         var formviewparams = {
@@ -335,8 +339,7 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
                     autocompleteData = autocompleteResponse.data;
                     if (autocompleteData) {
                         autoCompleteItems_1 = autocompleteData.records.map(function (item) {
-                            var _a, _b;
-                            return __assign({ solidManyToOneLabel: item[(_b = (_a = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _a === void 0 ? void 0 : _a.userKeyField) === null || _b === void 0 ? void 0 : _b.name], solidManyToOneValue: item['id'] }, item);
+                            return __assign({ solidManyToOneLabel: getRelatedRecordDisplayText(item, userKeyField), solidManyToOneValue: item['id'] }, item);
                         });
                         setAutoCompleteItems(autoCompleteItems_1);
                         setOffset(autocompleteData.records.length);
@@ -427,10 +430,7 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
                     records_1 = ((_m = response.data) === null || _m === void 0 ? void 0 : _m.records) || [];
                     if (records_1.length < LIMIT)
                         setHasMore(false);
-                    setAutoCompleteItems(function (prev) { return __spreadArray(__spreadArray([], prev, true), records_1.map(function (item) {
-                        var _a, _b;
-                        return (__assign({ solidManyToOneLabel: item[(_b = (_a = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _a === void 0 ? void 0 : _a.userKeyField) === null || _b === void 0 ? void 0 : _b.name], solidManyToOneValue: item.id }, item));
-                    }), true); });
+                    setAutoCompleteItems(function (prev) { return __spreadArray(__spreadArray([], prev, true), records_1.map(function (item) { return (__assign({ solidManyToOneLabel: getRelatedRecordDisplayText(item, userKeyField), solidManyToOneValue: item.id }, item)); }), true); });
                     setOffset(function (prev) { return prev + records_1.length; });
                     return [3 /*break*/, 4];
                 case 3:
@@ -442,12 +442,11 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
     }); };
     var isFormFieldValid = function (formik, fieldName) { return formik.touched[fieldName] && formik.errors[fieldName]; };
     var customCreateHandler = function (values) {
-        var _a, _b;
         var currentRelationData = formik.values[fieldLayoutInfo.attrs.name] || [];
         var jsonValues = Object.fromEntries(values.entries());
         var updatedRelationData = __spreadArray(__spreadArray([], currentRelationData, true), [
             {
-                solidManyToOneLabel: jsonValues[(_b = (_a = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _a === void 0 ? void 0 : _a.userKeyField) === null || _b === void 0 ? void 0 : _b.name],
+                solidManyToOneLabel: getRelatedRecordDisplayText(jsonValues, userKeyField),
                 solidManyToOneValue: "new",
                 original: jsonValues,
             },
@@ -474,7 +473,7 @@ export var DefaultRelationManyToOneFormEditWidget = function (_a) {
                                     lazy: true,
                                     onLazyLoad: onLazyLoad,
                                 }) }), fieldLayoutInfo.attrs.inlineCreate === "true" && readOnlyPermission === false && formViewParams &&
-                                _jsx(RenderSolidFormEmbededView, { formik: formik, fieldContext: fieldContext, customCreateHandler: customCreateHandler, visibleCreateRelationEntity: visibleCreateRelationEntity, setvisibleCreateRelationEntity: setvisibleCreateRelationEntity, formViewParams: formViewParams })] })] }), isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (_jsx("div", { className: "absolute mt-1", children: _jsx(SolidMessage, { severity: "error", text: (_o = formik === null || formik === void 0 ? void 0 : formik.errors[fieldLayoutInfo.attrs.name]) === null || _o === void 0 ? void 0 : _o.toString() }) }))] }));
+                                _jsx(RenderSolidFormEmbededView, { formik: formik, fieldContext: fieldContext, customCreateHandler: customCreateHandler, visibleCreateRelationEntity: visibleCreateRelationEntity, setvisibleCreateRelationEntity: setvisibleCreateRelationEntity, formViewParams: formViewParams })] })] }), isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (_jsx("div", { className: "absolute mt-1", children: _jsx(SolidMessage, { severity: "error", text: (_r = formik === null || formik === void 0 ? void 0 : formik.errors[fieldLayoutInfo.attrs.name]) === null || _r === void 0 ? void 0 : _r.toString() }) }))] }));
 };
 export var RenderSolidFormEmbededView = function (_a) {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
@@ -517,7 +516,7 @@ export var DefaultRelationManyToOneFormViewWidget = function (_a) {
     var showFieldLabel = (_c = fieldLayoutInfo === null || fieldLayoutInfo === void 0 ? void 0 : fieldLayoutInfo.attrs) === null || _c === void 0 ? void 0 : _c.showLabel;
     var value = formik.values[fieldLayoutInfo.attrs.name];
     var userKeyField = ((_d = fieldLayoutInfo === null || fieldLayoutInfo === void 0 ? void 0 : fieldLayoutInfo.attrs) === null || _d === void 0 ? void 0 : _d.coModelFieldToDisplay) ? (_e = fieldLayoutInfo === null || fieldLayoutInfo === void 0 ? void 0 : fieldLayoutInfo.attrs) === null || _e === void 0 ? void 0 : _e.coModelFieldToDisplay : (_g = (_f = fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.relationModel) === null || _f === void 0 ? void 0 : _f.userKeyField) === null || _g === void 0 ? void 0 : _g.name;
-    var displayValue = value === null || value === void 0 ? void 0 : value[userKeyField];
+    var displayValue = getRelatedRecordDisplayText(value, userKeyField);
     return (_jsxs("div", { className: styles.fieldViewWrapper, children: [showFieldLabel !== false && (_jsx("p", { className: "".concat(styles.fieldViewLabel, " form-field-label"), children: fieldLabel })), _jsx("p", { className: styles.fieldViewValue, children: displayValue || '' })] }));
 };
 export var PseudoRelationManyToOneFormWidget = function (_a) {