@acorex/platform 21.0.0-next.73 → 21.0.0-next.74

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

@@ -2,7 +2,7 @@ import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule, resolveMultiLanguageString, translateSync } from '@acorex/core/translation';
 import * as i4$3 from '@acorex/platform/common';
-import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, normalizeEntityDisplayTemplate, isUnresolvedEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPRefreshEvent, AXPReloadEvent, axpRedirectToNotFound, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, buildEntitySearchTitleContext, resolveEntityRowTitleTemplate, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, normalizeEntityDisplayTemplate, isUnresolvedEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPRefreshEvent, AXPReloadEvent, axpRedirectToNotFound, ENTITY_ROW_POPUP_TITLE_OPTION, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, buildEntitySearchTitleContext, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, computed, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, NgModule, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, makeEnvironmentProviders } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
@@ -12037,6 +12037,11 @@ var entityDefinitionProviderWidgetEdit_component = /*#__PURE__*/Object.freeze({
 });
 
 //#region ----   Column Mapping Helpers   ----
+function resolveEntityListRowTitleTemplate(entity) {
+    return (entity.interfaces?.master?.single?.title ??
+        entity.formats?.searchResult?.title ??
+        entity.formats?.individual);
+}
 /**
  * Maps an entity property to a list widget column configuration.
  * Preserves readonly behavior and leverages the property's interface options when available.
@@ -12068,6 +12073,7 @@ function mapPropertyToWidgetColumn(property) {
  */
 function mapEntityColumnToWidgetColumn(entity, column) {
     const property = entity.properties.find((p) => p.name === column.name);
+    const entityRowTitleTemplate = resolveEntityListRowTitleTemplate(entity);
     const interfaceType = property?.schema?.interface?.type;
     const widgetFromProperty = property?.schema?.interface
         ? {
@@ -12077,6 +12083,9 @@ function mapEntityColumnToWidgetColumn(entity, column) {
                 readonly: true,
                 columnName: column.name,
                 ...property.schema.interface.options,
+                ...(entityRowTitleTemplate
+                    ? { [ENTITY_ROW_POPUP_TITLE_OPTION]: entityRowTitleTemplate }
+                    : {}),
                 ...(interfaceType === 'attachments'
                     ? {
                         entityName: property.schema.interface.options?.['entityName'] ??
@@ -19062,63 +19071,6 @@ function hasFileUploaderTitleOrDescriptionFields(editDialog) {
 }
 //#endregion
 
-//#region ---- Imports ----
-//#endregion
-//#region ---- Title template resolution ----
-const INVALID_DISPLAY_TEXT = '[object Object]';
-/** Resolves a row field or format result to a plain display string for the active locale. */
-function resolveEntityRowDisplayText(value, activeLang) {
-    if (value == null || value === '') {
-        return '';
-    }
-    if (typeof value === 'string') {
-        const text = value.trim();
-        if (!text || text === INVALID_DISPLAY_TEXT || isUnresolvedEntityDisplayTemplate(text)) {
-            return '';
-        }
-        return text;
-    }
-    if (typeof value === 'number' || typeof value === 'boolean') {
-        return String(value);
-    }
-    if (typeof value === 'object' && !Array.isArray(value)) {
-        const text = resolveMultiLanguageString(value, activeLang).trim();
-        if (!text || text === INVALID_DISPLAY_TEXT) {
-            return '';
-        }
-        return text;
-    }
-    return '';
-}
-/**
- * Formats the entity row title for display using entity-driven templates and property paths.
- */
-function formatEntityRowDisplayTitle(entity, rowData, formatService, activeLang) {
-    if (!rowData) {
-        return '';
-    }
-    const titleContext = buildEntitySearchTitleContext(entity ?? {});
-    for (const path of titleContext.fallbackFields) {
-        const fromField = resolveEntityRowDisplayText(get(rowData, path), activeLang);
-        if (fromField) {
-            return fromField;
-        }
-    }
-    const templates = [
-        resolveEntityRowTitleTemplate(entity),
-        ...titleContext.fallbackTemplates,
-    ].filter((template) => !!template?.trim());
-    for (const template of templates) {
-        const formatted = formatService.format(normalizeEntityDisplayTemplate(template), 'string', rowData);
-        const fromTemplate = resolveEntityRowDisplayText(formatted, activeLang);
-        if (fromTemplate) {
-            return fromTemplate;
-        }
-    }
-    return '';
-}
-//#endregion
-
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Component   ----
@@ -19152,21 +19104,16 @@ class AXPFileUploaderWidgetColumnComponent extends AXPColumnWidgetComponent {
         this.popoverTitle = computed(() => {
             const row = this.rowData;
             const lang = this.translation.getActiveLang();
-            const titleRaw = get(row, 'title');
-            if (titleRaw != null &&
-                typeof titleRaw === 'object' &&
-                !Array.isArray(titleRaw) &&
-                this.translation.isValidMultiLanguageObject(titleRaw)) {
-                return titleRaw;
-            }
-            const resolved = formatEntityRowDisplayTitle(this.entityDef(), row, this.formatService, lang);
+            const resolved = resolveEntityRowDisplayTitle({
+                data: row,
+                widgetOptions: this.options,
+                formatService: this.formatService,
+                activeLang: lang,
+                entity: this.entityDef(),
+            });
             if (resolved) {
                 return resolved;
             }
-            const fallback = this.entityDef()?.formats?.individual;
-            if (fallback != null && fallback !== '') {
-                return resolveEntityRowDisplayText(fallback, lang) || fallback;
-            }
             return '@document-management:terms.common.file';
         }, ...(ngDevMode ? [{ debugName: "popoverTitle" }] : /* istanbul ignore next */ []));
         effect(() => {