@acorex/platform 20.2.4-next.3 → 20.2.4-next.6

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

@@ -971,6 +971,7 @@ class AXPEntityMasterCreateViewModel {
             const createProps = interfaces?.master?.create?.properties?.map(({ name }) => name) ?? [];
             const visibleProperties = properties.filter(({ groupId, schema, name }) => groupId && !schema.hidden && createProps.includes(name));
             const sections = interfaces?.master?.create?.sections?.filter(({ id }) => visibleProperties.some(({ groupId }) => groupId === id)) ?? [];
+            console.log({ sections, visibleProperties });
             return sections.map((section) => new AXPEntityCreateViewSectionViewModel(this.entityDef, section));
         }, ...(ngDevMode ? [{ debugName: "sections" }] : []));
         if (!initialData)
@@ -1992,7 +1993,6 @@ class AXPEntityMasterSingleViewGroupViewModel {
         this.group = this.entity.groups?.find((c) => c.id == this.section.id);
         this.name = signal(this.group.id, ...(ngDevMode ? [{ debugName: "name" }] : []));
         this.isLoading = signal(false, ...(ngDevMode ? [{ debugName: "isLoading" }] : []));
-        this.type = signal(this.section.type ?? 'section', ...(ngDevMode ? [{ debugName: "type" }] : []));
         this.title = computed(() => {
             return this.group.title ?? this.group.id;
         }, ...(ngDevMode ? [{ debugName: "title" }] : []));
@@ -2578,6 +2578,7 @@ class AXPLayoutAdapterBuilder {
     }
     build() {
         return {
+            name: `${this.entity?.module}.${this.entity?.name}`,
             title: `${this.entity?.interfaces?.master?.single?.title}`,
             label: this.entity?.formats.plural,
             actions: [],
@@ -2606,7 +2607,7 @@ class AXPLayoutAdapterBuilder {
                 command: {
                     name: 'navigate',
                     options: {
-                        path: `/${session.application?.name}/m/${moduleName}/e/${entityName}/${this.rootContext.id}/view`,
+                        path: `/${session.application?.name}/m/${moduleName}/e/${entityName}/${this.rootContext.id}/new-view`,
                     },
                 },
             },
@@ -2784,7 +2785,20 @@ class AXPBaseRelatedEntityConverter {
 class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
     async convert(relatedEntity, context) {
         const { entityDef } = await this.getEntityDefinition(relatedEntity, context.entityResolver);
-        const helpers = this.createEntityHelpers(entityDef);
+        const baseHelpers = this.createEntityHelpers(entityDef);
+        // If referenced strategy with mapping and detail type, exclude mapped properties from UI
+        const p = relatedEntity?.persistence || {};
+        const strategy = p.strategy || 'embedded';
+        const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
+        const helpers = {
+            ...baseHelpers,
+            getPropertyByGroupId: (groupId) => {
+                const props = baseHelpers.getPropertyByGroupId(groupId) ?? [];
+                if (strategy !== 'referenced' || mappedTargets.length === 0)
+                    return props;
+                return props.filter((prop) => !mappedTargets.includes(prop?.name));
+            },
+        };
         const evaluateExpressions = async (actionData) => {
             const scope = {
                 context: {
@@ -3043,7 +3057,20 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
 class AXPTabDetailsConverter extends AXPBaseRelatedEntityConverter {
     async convert(relatedEntity, context) {
         const { entityDef } = await this.getEntityDefinition(relatedEntity, context.entityResolver);
-        const helpers = this.createEntityHelpers(entityDef);
+        const baseHelpers = this.createEntityHelpers(entityDef);
+        // If referenced strategy with mapping and detail type, exclude mapped properties from UI
+        const p = relatedEntity?.persistence || {};
+        const strategy = p.strategy || 'embedded';
+        const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
+        const helpers = {
+            ...baseHelpers,
+            getPropertyByGroupId: (groupId) => {
+                const props = baseHelpers.getPropertyByGroupId(groupId) ?? [];
+                if (strategy !== 'referenced' || mappedTargets.length === 0)
+                    return props;
+                return props.filter((prop) => !mappedTargets.includes(prop?.name));
+            },
+        };
         return {
             id: entityDef?.name ?? '',
             title: relatedEntity.title ?? entityDef?.title ?? '',
@@ -3145,41 +3172,252 @@ class AXPMainEntityContentBuilder {
         this.workflowService = inject(AXPWorkflowService);
         this.commandService = inject(AXPCommandService);
     }
-    async build(entity, rootContext, dependencies) {
+    async build(entity, rootContext, dependencies, rootTitle) {
         const groups = entity?.groups ?? [];
         const singleInterface = entity?.interfaces?.master?.single;
+        // Accumulate groups from main and merge-detail related entities for validation/title lookup
+        const allGroups = [...groups];
+        // Prepare merge-details structures (sections and properties per section)
+        const mergeDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
+        const mainPropsByGroup = (entity?.properties ?? []).reduce((acc, p) => {
+            if (!acc[p.groupId])
+                acc[p.groupId] = [];
+            acc[p.groupId].push(p);
+            return acc;
+        }, {});
+        // Will hold merged properties per group (section)
+        const mergedPropsByGroup = { ...mainPropsByGroup };
+        // Collect sections from main interface (validated later) and related ones for ordering
+        const mainSections = singleInterface?.sections ?? [];
+        // Track extra sections with entity-level ordering context
+        const beforeExtraSections = [];
+        const middleExtraSections = [];
+        const afterExtraSections = [];
+        const beforeExtraIds = new Set();
+        const middleExtraIds = new Set();
+        const afterExtraIds = new Set();
+        // Effective order overrides for main sections when merged with BEFORE related entities
+        let beforeOverrideSectionOrders = {};
+        // Collect tab-list tabs from merge-detail related entities to merge with main tabs
+        const nestedTabListTabs = [];
+        // Helper to append related-only sections into before/after buckets
+        const queueRelatedSection = (section, position, entityOrder) => {
+            if (!section)
+                return;
+            if (position === 'before') {
+                if (!beforeExtraIds.has(section.id)) {
+                    beforeExtraIds.add(section.id);
+                    beforeExtraSections.push({ section, entityOrder });
+                }
+            }
+            else if (position === 'middle') {
+                if (!middleExtraIds.has(section.id)) {
+                    middleExtraIds.add(section.id);
+                    middleExtraSections.push({ section });
+                }
+            }
+            else {
+                if (!afterExtraIds.has(section.id)) {
+                    afterExtraIds.add(section.id);
+                    afterExtraSections.push({ section, entityOrder });
+                }
+            }
+        };
+        // Resolve and merge merge-detail entities
+        // Sort related entities by position group then by layout.order
+        if (mergeDetailEntities?.length && dependencies?.entityResolver) {
+            const beforeEntities = (mergeDetailEntities || [])
+                .filter((re) => (re.layout?.position ?? 'middle') === 'before')
+                .sort((a, b) => (a.layout?.order ?? Number.MAX_SAFE_INTEGER) - (b.layout?.order ?? Number.MAX_SAFE_INTEGER));
+            const middleEntities = (mergeDetailEntities || []).filter((re) => (re.layout?.position ?? 'middle') === 'middle');
+            const afterEntities = (mergeDetailEntities || [])
+                .filter((re) => (re.layout?.position ?? 'middle') === 'after')
+                .sort((a, b) => (a.layout?.order ?? Number.MAX_SAFE_INTEGER) - (b.layout?.order ?? Number.MAX_SAFE_INTEGER));
+            const processRelated = async (relatedEntity) => {
+                try {
+                    const [moduleName, entityName] = relatedEntity.entity.split('.');
+                    const entityDef = await dependencies.entityResolver.resolve(moduleName, entityName);
+                    if (!entityDef) {
+                        return;
+                    }
+                    const relSingle = entityDef?.interfaces?.master?.single;
+                    const relGroups = entityDef?.groups ?? [];
+                    // Merge related groups into allGroups (avoid duplicates by id)
+                    for (const rg of relGroups) {
+                        if (!allGroups.some((g) => g.id === rg.id)) {
+                            allGroups.push(rg);
+                        }
+                    }
+                    // Collect nested tab-list related entities from this merge-detail entity and convert to tabs
+                    try {
+                        const nestedTabListEntities = entityDef?.relatedEntities?.filter((re) => !re.hidden && (!re.layout?.type || re.layout?.type === 'tab-list'));
+                        if (nestedTabListEntities?.length) {
+                            const converter = this.relatedEntityConverterFactory.createTabListConverter();
+                            const nestedDataPath = relatedEntity?.persistence?.dataPath || entityName;
+                            const nestedContext = get(rootContext, nestedDataPath) ?? rootContext;
+                            for (const nre of nestedTabListEntities) {
+                                try {
+                                    const tab = await converter.convert(nre, {
+                                        entityResolver: dependencies.entityResolver,
+                                        expressionEvaluator: dependencies.expressionEvaluator,
+                                        // Evaluate conditions relative to the merge-detail entity's dataPath
+                                        context: nestedContext,
+                                    });
+                                    nestedTabListTabs.push(tab);
+                                }
+                                catch { }
+                            }
+                        }
+                    }
+                    catch { }
+                    // Build related props map per group with metadata: __dataPath and __layout
+                    // If referenced strategy with mapping, exclude mapped target property names from UI props
+                    const p = relatedEntity?.persistence || {};
+                    const strategy = p.strategy || 'embedded';
+                    const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
+                    const relPropsByGroup = (entityDef?.properties ?? []).reduce((acc, p) => {
+                        if (strategy === 'referenced' &&
+                            (relatedEntity?.layout?.type === 'merge-detail' ||
+                                relatedEntity?.layout?.type === 'page-detail' ||
+                                relatedEntity?.layout?.type === 'tab-detail') &&
+                            mappedTargets.includes(p.name)) {
+                            return acc; // skip mapped properties
+                        }
+                        if (!acc[p.groupId])
+                            acc[p.groupId] = [];
+                        // Clone shallow to not mutate original definitions
+                        const propClone = { ...p };
+                        propClone.__dataPath = relatedEntity?.persistence?.dataPath || entityName;
+                        propClone.__layout = relSingle?.properties?.find((x) => x.name === p.name)?.layout;
+                        acc[p.groupId].push(propClone);
+                        return acc;
+                    }, {});
+                    // Merge properties by section id
+                    const position = relatedEntity.layout?.position ?? 'middle';
+                    const entityOrder = relatedEntity.layout?.order ?? Number.MAX_SAFE_INTEGER;
+                    const relSections = (relSingle?.sections ?? []).filter((s) => relGroups.some((g) => g.id === s.id));
+                    for (const rs of relSections) {
+                        const sectionId = rs.id;
+                        const mainHasSection = !!mainSections?.some((s) => s.id === sectionId);
+                        const relProps = relPropsByGroup[sectionId] ?? [];
+                        if (mainHasSection) {
+                            const current = mergedPropsByGroup[sectionId] ?? [];
+                            mergedPropsByGroup[sectionId] =
+                                position === 'before' ? [...relProps, ...current] : [...current, ...relProps];
+                            // Capture override order for main section when position is 'before'
+                            if (position === 'before') {
+                                const order = rs?.order ?? 0;
+                                const prev = beforeOverrideSectionOrders[sectionId] ?? Number.MAX_SAFE_INTEGER;
+                                beforeOverrideSectionOrders[sectionId] = Math.min(prev, order);
+                            }
+                        }
+                        else {
+                            // Section isn't in main; queue section for rendering and set its props
+                            if (!mergedPropsByGroup[sectionId]) {
+                                mergedPropsByGroup[sectionId] = [];
+                            }
+                            mergedPropsByGroup[sectionId] =
+                                position === 'before'
+                                    ? [...(relProps ?? []), ...(mergedPropsByGroup[sectionId] ?? [])]
+                                    : [...(mergedPropsByGroup[sectionId] ?? []), ...(relProps ?? [])];
+                            queueRelatedSection(rs, position, entityOrder);
+                        }
+                    }
+                }
+                catch {
+                    // Silently ignore failures to resolve or merge
+                }
+            };
+            // Process BEFORE entities first (sorted), then AFTER entities
+            for (const re of beforeEntities) {
+                await processRelated(re);
+            }
+            for (const re of middleEntities) {
+                await processRelated(re);
+            }
+            for (const re of afterEntities) {
+                await processRelated(re);
+            }
+        }
         const getGroupById = (id) => {
             return groups.find((s) => s.id === id);
         };
         const filterValidSections = (sections) => {
             return (sections?.filter((section) => {
-                return groups.some((group) => group.id === section.id);
+                return allGroups.some((group) => group.id === section.id);
             }) ?? []);
         };
+        // Utility: sort related-only sections by entity order then section order
+        const sortRelatedSections = (sections) => [...(sections ?? [])]
+            .filter((e) => !!e?.section)
+            .sort((a, b) => {
+            const ae = a.entityOrder ?? Number.MAX_SAFE_INTEGER;
+            const be = b.entityOrder ?? Number.MAX_SAFE_INTEGER;
+            if (ae !== be)
+                return ae - be;
+            const ao = a.section?.order ?? 0;
+            const bo = b.section?.order ?? 0;
+            return ao - bo;
+        })
+            .map((e) => e.section);
+        // Determine effective order for main sections: if any BEFORE related merged that section, use its order; otherwise keep main order
+        const computeEffectiveMainOrder = (s) => {
+            const defaultOrder = s?.order ?? 0;
+            const beforeOverride = beforeOverrideSectionOrders?.[s?.id ?? ''];
+            return beforeOverride != null ? beforeOverride : defaultOrder;
+        };
+        // Build combined section list:
+        // 1) related-before (entity-sorted)
+        // 2) middle block: main sections + related-middle-only sections sorted by their section.order (with effective order for main)
+        // 3) related-after (entity-sorted)
+        const beforeSections = sortRelatedSections(beforeExtraSections);
+        const mainSectionsList = [...filterValidSections(mainSections)];
+        const middleOnlySections = middleExtraSections.map((e) => e.section);
+        const middleBlock = [...mainSectionsList, ...middleOnlySections].sort((a, b) => {
+            const ao = computeEffectiveMainOrder(a);
+            const bo = computeEffectiveMainOrder(b);
+            return ao - bo;
+        });
+        const afterSections = sortRelatedSections(afterExtraSections);
+        const combinedSections = [...beforeSections, ...middleBlock, ...afterSections];
+        // Debug: Log final sorted sections for verification
+        try {
+            const beforeEntityOrderMap = new Map(beforeExtraSections.map((e) => [e.section?.id, e.entityOrder ?? Number.MAX_SAFE_INTEGER]));
+            const afterEntityOrderMap = new Map(afterExtraSections.map((e) => [e.section?.id, e.entityOrder ?? Number.MAX_SAFE_INTEGER]));
+            const debugSections = [
+                ...beforeSections.map((s) => ({
+                    bucket: 'before',
+                    id: s?.id,
+                    sectionOrder: s?.order ?? 0,
+                    entityOrder: beforeEntityOrderMap.get(s?.id) ?? Number.MAX_SAFE_INTEGER,
+                })),
+                ...middleBlock.map((s) => ({
+                    bucket: 'middle',
+                    id: s?.id,
+                    sectionOrder: s?.order ?? 0,
+                    effectiveOrder: computeEffectiveMainOrder(s),
+                })),
+                ...afterSections.map((s) => ({
+                    bucket: 'after',
+                    id: s?.id,
+                    sectionOrder: s?.order ?? 0,
+                    entityOrder: afterEntityOrderMap.get(s?.id) ?? Number.MAX_SAFE_INTEGER,
+                })),
+            ];
+            // eslint-disable-next-line no-console
+            console.debug('[AXP] merge-details sorted sections', debugSections);
+        }
+        catch { }
         // Create expression evaluator for actions
         const evaluateExpressions = dependencies?.expressionEvaluator
             ? this.createExpressionEvaluator(rootContext, dependencies.expressionEvaluator)
             : null;
         const getVisiblePropertyByGroupId = async (groupId) => {
-            const properties = entity?.properties.filter((p) => p.groupId === groupId) ?? [];
-            const evaluated = await Promise.all(properties.map(async (p) => {
-                // If you later need expression-based hidden logic, evaluate it here
-                let hidden = p?.schema?.hidden;
-                if (typeof hidden === 'string' && evaluateExpressions) {
-                    try {
-                        const res = await evaluateExpressions({ hidden });
-                        hidden = res.hidden;
-                    }
-                    catch {
-                        hidden = false;
-                    }
-                }
-                return { prop: p, hidden: !!hidden };
-            }));
-            return evaluated.filter((x) => !x.hidden).map((x) => x.prop);
+            return (mergedPropsByGroup[groupId] ?? []);
         };
-        const getPropertyLayout = (name) => {
-            return singleInterface?.properties?.find((p) => p.name === name)?.layout;
+        const getPropertyLayout = (name, prop) => {
+            // Prefer per-property layout (for merged related props), fallback to main entity layout
+            return prop?.__layout ?? singleInterface?.properties?.find((p) => p.name === name)?.layout;
         };
         // Get related entities for tabs
         const tabDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'tab-detail');
@@ -3189,9 +3427,11 @@ class AXPMainEntityContentBuilder {
         const tabListTabs = await this.buildTabLists(tabListEntities ?? [], rootContext, dependencies);
         // Build actions from single interface
         const actions = this.buildActions(entity, singleInterface);
+        console.log({ rootContext, dependencies });
         return {
             id: entity?.name ?? '',
-            title: singleInterface?.title ?? entity?.formats.individual ?? '',
+            // title: singleInterface?.title ?? entity?.formats.individual ?? '',
+            title: rootTitle ?? entity?.formats.individual,
             label: entity?.formats.displayName ?? singleInterface?.title ?? '',
             icon: entity?.icon,
             actions: await this.buildEvaluatedActions(actions, evaluateExpressions),
@@ -3278,7 +3518,7 @@ class AXPMainEntityContentBuilder {
                     };
                 }
             },
-            tabs: [...tabDetailTabs, ...tabListTabs],
+            tabs: [...tabDetailTabs, ...tabListTabs, ...nestedTabListTabs],
             content: [
                 {
                     type: 'grid-layout',
@@ -3292,7 +3532,7 @@ class AXPMainEntityContentBuilder {
                             },
                         },
                     },
-                    children: await Promise.all(filterValidSections(singleInterface?.sections ?? []).map(async (s) => ({
+                    children: await Promise.all(combinedSections.map(async (s) => ({
                         type: 'grid-item-layout',
                         name: s.id,
                         options: {
@@ -3304,9 +3544,10 @@ class AXPMainEntityContentBuilder {
                             {
                                 type: 'fieldset-layout',
                                 options: {
-                                    title: getGroupById(s.id)?.title ?? '',
+                                    title: allGroups.find((g) => g.id === s.id)?.title ?? '',
                                     collapsible: true,
                                     isOpen: !s.collapsed,
+                                    look: 'card'
                                 },
                                 children: [
                                     {
@@ -3321,14 +3562,16 @@ class AXPMainEntityContentBuilder {
                                             },
                                         },
                                         children: (await getVisiblePropertyByGroupId(s.id)).map((p) => {
-                                            const layout = getPropertyLayout(p.name);
+                                            const layout = getPropertyLayout(p.name, p);
+                                            const prefixed = p.__dataPath ? `${p.__dataPath}.${p.name}` : p.name;
                                             return {
                                                 type: 'grid-item-layout',
-                                                name: p.name,
+                                                name: prefixed,
                                                 options: {
                                                     colSpan: layout?.positions?.lg?.colSpan,
                                                     colStart: layout?.positions?.lg?.colStart,
                                                     colEnd: layout?.positions?.lg?.colEnd,
+                                                    hidden: p.schema.hidden,
                                                 },
                                                 children: [
                                                     {
@@ -3340,8 +3583,8 @@ class AXPMainEntityContentBuilder {
                                                         children: [
                                                             {
                                                                 type: p.schema.interface?.type ?? '',
-                                                                path: p.name,
-                                                                name: p.name,
+                                                                path: prefixed,
+                                                                name: prefixed,
                                                                 defaultValue: p.schema.defaultValue,
                                                                 children: p.schema.interface?.children,
                                                                 triggers: p.schema.interface?.triggers,
@@ -3352,6 +3595,8 @@ class AXPMainEntityContentBuilder {
                                                                         message: c.message,
                                                                         options: c.options,
                                                                     })),
+                                                                    // Attach dataPath for merged properties to be available in widgets/options if needed
+                                                                    dataPath: p.__dataPath,
                                                                 }),
                                                             },
                                                         ],
@@ -3506,10 +3751,11 @@ class AXPLayoutAdapterFactory {
         return await fn(id);
     }
     async buildMainPage(entity, rootContext, dependencies) {
-        return this.mainEntityContentBuilder.build(entity, rootContext, dependencies);
+        return this.mainEntityContentBuilder.build(entity, rootContext, dependencies, await this.getRootTitle(entity, rootContext, dependencies));
     }
     async buildRelatedPages(entity, rootContext, dependencies) {
         const pages = [];
+        const rootTitle = await this.getRootTitle(entity, rootContext, dependencies);
         // Page Details
         const pageDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
         for (const relatedEntity of pageDetailEntities || []) {
@@ -3517,7 +3763,7 @@ class AXPLayoutAdapterFactory {
             pages.push(await converter.convert(relatedEntity, {
                 ...dependencies,
                 context: rootContext,
-                rootTitle: await this.getRootTitle(entity, rootContext, dependencies),
+                rootTitle: rootTitle,
             }));
         }
         // Page Lists
@@ -3527,9 +3773,43 @@ class AXPLayoutAdapterFactory {
             pages.push(await converter.convert(relatedEntity, {
                 ...dependencies,
                 context: rootContext,
-                rootTitle: await this.getRootTitle(entity, rootContext, dependencies),
+                rootTitle: rootTitle,
             }));
         }
+        // Include nested page-related entities from merge-detail related entities
+        const mergeDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
+        for (const mergeRelated of mergeDetailEntities || []) {
+            try {
+                const [moduleName, childEntityName] = (mergeRelated.entity || '').split('.');
+                const childEntity = await dependencies.entityResolver.resolve(moduleName, childEntityName);
+                if (!childEntity) {
+                    continue;
+                }
+                const nestedDataPath = mergeRelated?.persistence?.dataPath || childEntityName;
+                const nestedContext = get(rootContext, nestedDataPath) ?? rootContext;
+                const nestedPageDetailEntities = childEntity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
+                for (const nestedRelated of nestedPageDetailEntities || []) {
+                    const converter = this.relatedEntityConverterFactory.createPageDetailsConverter();
+                    pages.push(await converter.convert(nestedRelated, {
+                        ...dependencies,
+                        context: nestedContext,
+                        rootTitle: rootTitle,
+                    }));
+                }
+                const nestedPageListEntities = childEntity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-list');
+                for (const nestedRelated of nestedPageListEntities || []) {
+                    const converter = this.relatedEntityConverterFactory.createPageListConverter();
+                    pages.push(await converter.convert(nestedRelated, {
+                        ...dependencies,
+                        context: nestedContext,
+                        rootTitle: rootTitle,
+                    }));
+                }
+            }
+            catch {
+                // Silently ignore failures for nested page inclusions
+            }
+        }
         return pages;
     }
     composePagesWithPositions(mainPage, relatedPages, entity) {
@@ -5389,6 +5669,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLookupWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXPLookupWidgetEditComponent, isStandalone: true, selector: "axp-lookup-widget-edit", viewQueries: [{ propertyName: "textbox", first: true, predicate: AXTagBoxComponent, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
+  @if(vm()) {
     @if (look() == 'select') {
       <ax-select-box
         [dataSource]="vm()?.dataSource!"
@@ -5407,7 +5688,6 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
       </ax-select-box>
     } @else {
-      {{selectedItemsText()}}
       <ax-tag-box
         [ngModel]="selectedItems()"
         [textField]="displayField()"
@@ -5447,15 +5727,17 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         </ax-suffix>
       </ax-tag-box>
     }
+  }
   `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: 
                 //
-                AXButtonModule }, { kind: "component", type: i3$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i1.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "pipe", type: i7.AsyncPipe, name: "async" }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+                AXButtonModule }, { kind: "component", type: i3$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i1.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "pipe", type: i7.AsyncPipe, name: "async" }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-lookup-widget-edit',
                     template: `
+  @if(vm()) {
     @if (look() == 'select') {
       <ax-select-box
         [dataSource]="vm()?.dataSource!"
@@ -5474,7 +5756,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
         }
       </ax-select-box>
     } @else {
-      {{selectedItemsText()}}
       <ax-tag-box
         [ngModel]="selectedItems()"
         [textField]="displayField()"
@@ -5514,6 +5795,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
         </ax-suffix>
       </ax-tag-box>
     }
+  }
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     imports: [
@@ -5791,7 +6073,7 @@ class AXPTagableBoxWidgetEditComponent extends AXPValueWidgetComponent {
         </ax-prefix>
       </ax-button>
     </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i5.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i5.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPTagableBoxWidgetEditComponent, decorators: [{
             type: Component,
@@ -6399,7 +6681,7 @@ class AXPShowDetailViewAction extends AXPWorkflowAction {
         const [module, entity] = context.getVariable('entity').split('.');
         const { id } = context.getVariable('data');
         const newPayload = {
-            commands: `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${id}/view`,
+            commands: `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${id}/new-view`,
         };
         context.setVariable('payload', newPayload);
         this.navigation.execute(context);
@@ -6860,7 +7142,7 @@ function entityDetailsSimpleCondition(fk) {
         value: '{{context.eval("id")}}',
     };
 }
-function entityDetailsReferenceCondition() {
+function entityDetailsReferenceCondition(type) {
     return [
         {
             name: 'reference.id',
@@ -6870,7 +7152,7 @@ function entityDetailsReferenceCondition() {
         {
             name: 'reference.type',
             operator: { type: 'equal' },
-            value: '{{context.eval("entityName")}}',
+            value: type,
         },
     ];
 }
@@ -6880,6 +7162,7 @@ function entityDetailsEditAction() {
         command: 'quick-modify-entity',
         priority: 'secondary',
         type: 'update',
+        default: true,
         scope: AXPEntityCommandScope.Individual,
     };
 }
@@ -6896,7 +7179,7 @@ function entityOverrideDetailsViewAction() {
 function entityDetailsCrudActions(parentId) {
     return [entityDetailsCreateActions(parentId), entityDetailsEditAction(), entityOverrideDetailsViewAction()];
 }
-function entityDetailsReferenceCreateActions() {
+function entityDetailsReferenceCreateActions(type) {
     return [
         {
             title: '@general:actions.create.title',
@@ -6909,7 +7192,7 @@ function entityDetailsReferenceCreateActions() {
                         data: {
                             reference: {
                                 id: '{{context.eval("id")}}',
-                                type: '{{context.eval("entityName")}}',
+                                type: type,
                             },
                         },
                     },