@acorex/platform 21.0.0-next.7 → 21.0.0-next.8

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

@@ -606,7 +606,30 @@ class AXPEntityFormBuilderService {
     //#endregion
     //#region ----   Public API   ----
     entity(fullName) {
-        return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.deviceService, fullName);
+        return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.deviceService, fullName, this);
+    }
+    /**
+     * Fetches a record by ID for the specified entity.
+     * @param fullName - Entity full name in "module.entity" format
+     * @param id - Record ID to fetch
+     * @returns Promise resolving to the record data, or empty object if not found
+     */
+    async getRecordById(fullName, id) {
+        if (!id) {
+            throw new Error('Record id is required.');
+        }
+        const { moduleName, entityName } = parseEntityFullName(fullName);
+        const entity = await this.entityRegistry.resolve(moduleName, entityName);
+        try {
+            const byKeyFn = entity?.queries?.byKey?.execute;
+            if (typeof byKeyFn === 'function') {
+                return (await byKeyFn(id)) ?? {};
+            }
+        }
+        catch {
+            // Return empty object if fetch fails
+        }
+        return {};
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityFormBuilderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityFormBuilderService, providedIn: 'root' }); }
@@ -617,14 +640,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
         }] });
 //#region ----   Builders   ----
 class InterfaceSelector {
-    constructor(entityRegistry, layoutBuilder, deviceService, fullName) {
+    constructor(entityRegistry, layoutBuilder, deviceService, fullName, formBuilderService) {
         this.entityRegistry = entityRegistry;
         this.layoutBuilder = layoutBuilder;
         this.deviceService = deviceService;
         this.fullName = fullName;
+        this.formBuilderService = formBuilderService;
     }
     create(initialData) {
-        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'create');
+        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'create', undefined, this.formBuilderService);
         if (initialData) {
             filter.context(initialData);
         }
@@ -640,7 +664,7 @@ class InterfaceSelector {
             initialData = data;
             recordId = data['id'] || data['_id'];
         }
-        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'update', recordId);
+        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'update', recordId, this.formBuilderService);
         return filter;
     }
     single(data) {
@@ -653,7 +677,7 @@ class InterfaceSelector {
             initialData = data;
             recordId = data['id'] || data['_id'];
         }
-        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'single', recordId);
+        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'single', recordId, this.formBuilderService);
         if (Object.keys(initialData).length > 0) {
             filter.context(initialData);
         }
@@ -661,12 +685,13 @@ class InterfaceSelector {
     }
 }
 class PropertyFilter {
-    constructor(entityRegistry, layoutBuilder, deviceService, fullName, kind, recordId) {
+    constructor(entityRegistry, layoutBuilder, deviceService, fullName, kind, recordId, formBuilderService) {
         this.entityRegistry = entityRegistry;
         this.layoutBuilder = layoutBuilder;
         this.deviceService = deviceService;
         this.fullName = fullName;
         this.kind = kind;
+        this.formBuilderService = formBuilderService;
         this.includeList = null;
         this.excludeList = null;
         this.initialContext = {};
@@ -721,21 +746,28 @@ class PropertyFilter {
         // Only fetch by key if we don't already have initial data
         const hasInitialData = this.initialContext && Object.keys(this.initialContext).length > 0;
         if ((this.kind === 'update' || this.kind === 'single') && !hasInitialData) {
-            const { moduleName, entityName } = parseEntityFullName(this.fullName);
-            const entity = await this.entityRegistry.resolve(moduleName, entityName);
-            try {
-                const id = this.recordId;
-                if (!id) {
-                    throw new Error(`Record id is required for ${this.kind}().`);
+            const id = this.recordId;
+            if (!id) {
+                throw new Error(`Record id is required for ${this.kind}().`);
+            }
+            // Use the public method if service is available, otherwise fallback to direct entity access
+            if (this.formBuilderService) {
+                baseContext = await this.formBuilderService.getRecordById(this.fullName, id);
+            }
+            else {
+                // Fallback to original implementation if service is not available
+                const { moduleName, entityName } = parseEntityFullName(this.fullName);
+                const entity = await this.entityRegistry.resolve(moduleName, entityName);
+                try {
+                    const byKeyFn = entity?.queries?.byKey?.execute;
+                    if (typeof byKeyFn === 'function') {
+                        baseContext = (await byKeyFn(id)) ?? {};
+                    }
                 }
-                const byKeyFn = entity?.queries?.byKey?.execute;
-                if (typeof byKeyFn === 'function') {
-                    baseContext = (await byKeyFn(id)) ?? {};
+                catch {
+                    baseContext = {};
                 }
             }
-            catch {
-                baseContext = {};
-            }
         }
         const effectiveContext = merge({}, baseContext, this.initialContext);
         dialog.setContext(effectiveContext);
@@ -2274,7 +2306,7 @@ class AXPEntityCreateViewElementViewModel {
                 triggers: widget.triggers,
                 defaultValue: schema.defaultValue,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options, {
+                options: merge({}, schema.interface?.options, {
                     validations: this.property.validations?.map((c) => ({ rule: c.rule, message: c.message, options: c.options })),
                 }),
             };
@@ -3582,7 +3614,7 @@ class AXPEntityMasterUpdateElementViewModel {
                 children: widget.children,
                 triggers: widget.triggers,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options, {
+                options: merge({}, schema.interface?.options, {
                     validations: this.property.validations?.map((c) => ({ rule: c.rule, message: c.message, options: c.options })),
                 }),
             };
@@ -3838,7 +3870,7 @@ class AXPEntityMasterSingleElementViewModel {
                 path: this.path(),
                 children: widget.children,
                 valueTransforms: widget.valueTransforms,
-                options: merge(schema.interface?.options),
+                options: merge({}, schema.interface?.options),
             };
         }, ...(ngDevMode ? [{ debugName: "node" }] : []));
     }
@@ -5274,7 +5306,6 @@ class AXPMainEntityContentBuilder {
                                                 : editablePropertyNames.has(p.name);
                                             // Check if property has its own disabled option
                                             const hasOwnDisabled = p.schema.interface?.options?.disabled !== undefined;
-                                            console.log('visible: ', p.schema.visible);
                                             return {
                                                 type: 'grid-item-layout',
                                                 name: prefixed,
@@ -5300,7 +5331,7 @@ class AXPMainEntityContentBuilder {
                                                                 children: p.schema.interface?.children,
                                                                 triggers: p.schema.interface?.triggers,
                                                                 valueTransforms: p.schema.interface?.valueTransforms,
-                                                                options: merge(p.schema.interface?.options, {
+                                                                options: merge({}, p.schema.interface?.options, {
                                                                     validations: p.validations?.map((c) => ({
                                                                         rule: c.rule,
                                                                         message: c.message,