@acorex/platform 20.9.34 → 20.9.36

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

@@ -1,16 +1,16 @@
-import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, AXPEntityCommandScope, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, AXPEntityDataSourceKeys, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, isEntityActionPermitted, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, resolveLookupWidgetCreateOptions, buildPageListWidgetName, AXPEntityQueryType, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
+import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, AXPEntityCommandScope, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, resolveEntityListFilterContextField, resolveEntityListFilterQueryField, AXPEntityDataSourceKeys, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, isEntityActionPermitted, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, resolveLookupWidgetCreateOptions, buildPageListWidgetName, AXPEntityQueryType, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
 export * from '@acorex/platform/layout/entity-contracts';
 export { collectNestedCreateHiddenProperties, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, mergeForeignKeyFieldIntoCreateActions } from '@acorex/platform/layout/entity-contracts';
 import { AXToastService } from '@acorex/components/toast';
 import * as i3$1 from '@acorex/core/translation';
 import { AXTranslationService, resolveMultiLanguageString, AXTranslationModule, translateSync } from '@acorex/core/translation';
 import * as i4$2 from '@acorex/platform/common';
-import { AXPNotFoundError, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, resolveEntityCreateListBehavior, AXPRefreshEvent, resolveEntityModifyPopupTitle, resolveSearchableText, evaluateEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, AXPReloadEvent, axpRedirectToNotFound, AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, coerceAXPSettingRawValueByKind, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPWorkflowNavigateAction, axpIsEntityListPath, axpIsEntityDetailsPath, axpParseEntityListRoute, axpParseEntityDetailsRoute, axpSaveEntityListReturnUrl, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_DEFINITION_LAZY_RESOLVER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import { AXPNotFoundError, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, resolveEntityCreateListBehavior, AXPRefreshEvent, resolveEntityModifyPopupTitle, resolveSearchableText, evaluateEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, AXPReloadEvent, axpRedirectToNotFound, AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE, CONTAINS_OPER, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, coerceAXPSettingRawValueByKind, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPWorkflowNavigateAction, axpIsEntityListPath, axpIsEntityDetailsPath, axpParseEntityListRoute, axpParseEntityDetailsRoute, axpSaveEntityListReturnUrl, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_DEFINITION_LAZY_RESOLVER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
 import * as i1$3 from '@acorex/platform/workflow';
 import { AXPWorkflowEventService, AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, ChangeDetectorRef, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, NgModule, viewChild, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, EnvironmentInjector, DestroyRef, makeEnvironmentProviders } from '@angular/core';
-import { cloneDeep, merge, get, castArray, set, orderBy, defaultTo, isNil, isEmpty, isEqual, isObjectLike, isArray, has, isString, isPlainObject } from 'lodash-es';
+import { cloneDeep, merge, get, isString, isPlainObject, castArray, set, orderBy, defaultTo, isNil, isEmpty, isEqual, isObjectLike, isArray, has } from 'lodash-es';
 import { Subject, filter, takeUntil } from 'rxjs';
 import { AXPWidgetsCatalog, resolveActionLook, AXPPlatformScope, extractValue, setSmart, getChangedPaths, isSelectionValueEqual, AXPDataGenerator, AXPSystemActionType } from '@acorex/platform/contracts';
 import { AXPLayoutBuilderService, LayoutBuilderModule } from '@acorex/platform/layout/builder';
@@ -3955,6 +3955,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 
+//#region ---- Filter operator helpers ----
+const PRELOAD_FILTER_OPERATOR_TYPES = new Set([
+    'endsWith',
+    'startsWith',
+    'in',
+    'equal',
+    'isNull',
+    'isEmpty',
+    'lt',
+    'lte',
+    'gt',
+    'gte',
+    'contains',
+]);
+function coercePreloadFilterOperator(type) {
+    if (!isString(type) || !PRELOAD_FILTER_OPERATOR_TYPES.has(type)) {
+        return undefined;
+    }
+    return { type: type };
+}
+//#endregion
 class AXPEntityPreloadFiltersContainerComponent extends AXPPageLayoutBaseComponent {
     constructor() {
         super(...arguments);
@@ -4062,18 +4083,55 @@ class AXPEntityPreloadFiltersContainerComponent extends AXPPageLayoutBaseCompone
         const filters = [];
         const filterDefs = this.preloadFiltersDef();
         for (const filterDef of filterDefs) {
-            const fieldName = filterDef.field;
-            const value = fieldName ? context[fieldName] : undefined;
-            if (value !== undefined && value !== null && value !== '') {
-                filters.push({
-                    field: fieldName,
-                    operator: { type: 'equal' },
-                    value,
-                });
+            const contextField = resolveEntityListFilterContextField(filterDef);
+            if (!contextField) {
+                continue;
             }
+            const raw = context[contextField];
+            if (raw === undefined || raw === null || raw === '') {
+                continue;
+            }
+            const entry = this.unwrapFilterWidgetEntry(raw);
+            if (entry.value === undefined || entry.value === null || entry.value === '') {
+                continue;
+            }
+            const operator = entry.operator ??
+                coercePreloadFilterOperator(filterDef.operator?.type) ??
+                { type: 'equal' };
+            const field = resolveEntityListFilterQueryField(filterDef, operator);
+            if (!field) {
+                continue;
+            }
+            const filterQuery = {
+                field,
+                operator,
+                value: entry.value,
+            };
+            if (isString(entry.displayText)) {
+                filterQuery.displayText = entry.displayText;
+            }
+            filters.push(filterQuery);
         }
         return filters;
     }
+    /**
+     * Filter widgets store `{ value, operation, displayText? }`; plain values are treated as equal filters.
+     */
+    unwrapFilterWidgetEntry(raw) {
+        if (!isPlainObject(raw)) {
+            return { value: raw };
+        }
+        const entry = raw;
+        const hasFilterShape = 'value' in entry || 'operation' in entry;
+        if (!hasFilterShape) {
+            return { value: raw };
+        }
+        return {
+            value: entry.value,
+            operator: coercePreloadFilterOperator(entry.operation?.type),
+            displayText: isString(entry.displayText) ? entry.displayText : undefined,
+        };
+    }
     buildListQueryFilter(filterQueries) {
         return this.filterOperatorMiddleware.transformFilter({
             field: null,
@@ -6953,10 +7011,9 @@ const AXPEntityListViewModelResolver = async (route, state, service = inject(AXP
     const entityName = route.paramMap.get('entity');
     try {
         const vm = await service.create(moduleName, entityName);
-        // URL `filters` are for one-off deep links only; persisted list state loads from user settings.
+        // URL `filters` (preload / deep link) always win over persisted list filters when present.
         const filtersParam = route.queryParamMap.get('filters');
-        const shouldLoadPersisted = await vm.shouldLoadPersistedListState();
-        if (filtersParam && !shouldLoadPersisted) {
+        if (filtersParam) {
             const applied = vm.applyFiltersFromQueryParams(filtersParam);
             if (applied) {
                 await vm.applyFilterAndSort();
@@ -7725,10 +7782,22 @@ class AXPEntityPreloadFiltersViewModel {
             return this.entityDef.interfaces?.master?.list?.description ?? null;
         }, ...(ngDevMode ? [{ debugName: "description" }] : /* istanbul ignore next */ []));
         /**
-         * All filter definitions for properties with preload enabled
+         * Preload filter definitions with a single `contains` operator (hides the filter operations menu).
          */
         this.preloadFiltersDef = computed(() => {
-            return this.filterDefinitions().filter((definition) => definition.filterType.preload?.enabled);
+            return this.filterDefinitions()
+                .filter((definition) => definition.filterType.preload?.enabled)
+                .map((definition) => ({
+                ...definition,
+                operator: { type: 'contains' },
+                widget: {
+                    ...definition.widget,
+                    options: {
+                        ...definition.widget?.options,
+                        operations: [CONTAINS_OPER],
+                    },
+                },
+            }));
         }, ...(ngDevMode ? [{ debugName: "preloadFiltersDef" }] : /* istanbul ignore next */ []));
         /**
          * Required filter definitions only