@acorex/platform 20.3.0-next.13 → 20.3.0-next.14

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -3551,6 +3551,11 @@ class AXPMainEntityContentBuilder {
     async build(entity, rootContext, dependencies, rootTitle) {
         const groups = entity?.groups ?? [];
         const singleInterface = entity?.interfaces?.master?.single;
+        const updateInterface = entity?.interfaces?.master?.update;
+        // Get list of visible property names from single interface
+        const visiblePropertyNames = new Set(singleInterface?.properties?.map((p) => p.name) ?? []);
+        // Get list of editable property names from update interface
+        const editablePropertyNames = new Set(updateInterface?.properties?.map((p) => p.name) ?? []);
         // Accumulate groups from main and merge-detail related entities for validation/title lookup
         const allGroups = [...groups];
         // Create expression evaluator for actions
@@ -3970,9 +3975,15 @@ class AXPMainEntityContentBuilder {
                                                 },
                                             },
                                         },
-                                        children: (await getVisiblePropertyByGroupId(s.id)).map((p) => {
+                                        children: (await getVisiblePropertyByGroupId(s.id))
+                                            .filter((p) => visiblePropertyNames.has(p.name))
+                                            .map((p) => {
                                             const layout = getPropertyLayout(p.name, p);
                                             const prefixed = p.__dataPath ? `${p.__dataPath}.${p.name}` : p.name;
+                                            // Check if property is editable (exists in update interface)
+                                            const isEditable = editablePropertyNames.has(p.name);
+                                            // Check if property has its own disabled option
+                                            const hasOwnDisabled = p.schema.interface?.options?.disabled !== undefined;
                                             return {
                                                 type: 'grid-item-layout',
                                                 name: prefixed,
@@ -4006,7 +4017,9 @@ class AXPMainEntityContentBuilder {
                                                                     })),
                                                                     // Attach dataPath for merged properties to be available in widgets/options if needed
                                                                     dataPath: p.__dataPath,
-                                                                }),
+                                                                }, 
+                                                                // Only set disabled if property doesn't have its own disabled option
+                                                                hasOwnDisabled ? {} : { disabled: !isEditable }),
                                                             },
                                                         ],
                                                     },
@@ -4654,6 +4667,9 @@ class AXPEntityListToolbarService {
             filterDefinitions: this.createFilterDefinitions(entity),
             columnDefinitions: this.createColumnDefinitions(entity, options),
             sortDefinitions: this.createSortDefinitions(entity),
+            canFilter: true,
+            canColumns: true,
+            canSort: true,
         };
         return toolbarOptions;
     }