@acorex/platform 20.8.18 → 20.8.21

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

@@ -2,14 +2,14 @@ import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import * as i4$1 from '@acorex/platform/common';
-import { AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
+import { AXPNotFoundError, AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, axpRedirectToNotFound, axpIsEntityRecordNotFound, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, NgModule } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService } from '@acorex/platform/layout/builder';
 import { AXPDeviceService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXPColumnWidthService, AXHighlightService, extractValue, setSmart, getChangedPaths, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPSystemActionType } from '@acorex/platform/core';
 import { merge, castArray, cloneDeep, get, set, orderBy, isNil, isEmpty, isEqual } from 'lodash-es';
-import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
+import { AXPSessionService } from '@acorex/platform/auth';
 import { Router, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
 import * as i3 from '@acorex/components/button';
 import { AXButtonModule } from '@acorex/components/button';
@@ -604,7 +604,7 @@ class AXPEntityDefinitionRegistryService {
                 throw error; // Rethrow to allow error handling by caller
             }
             if (!config) {
-                throw new Error(`Invalid entity name: ${key}`);
+                throw new AXPNotFoundError(`Invalid entity name: ${key}`);
             }
         }
         return config;
@@ -3948,7 +3948,7 @@ class AXPEntityMasterListViewModel {
                 this.events$.next({ action: 'refresh' });
             }
         });
-        this.sortedFields.set(this.sortableFields());
+        this.sortedFields.set([]);
         void this.syncShowRowIndexColumnSetting();
         this.settings.onLoaded.pipe(takeUntil(this.destroyed)).subscribe(() => {
             void this.syncShowRowIndexColumnSetting();
@@ -4051,10 +4051,8 @@ class AXPEntityMasterListViewModel {
                     .sort((a, b) => columns.findIndex((col) => col.name === (a.column?.options?.dataPath ?? a.name)) -
                     columns.findIndex((col) => col.name === (b.column?.options?.dataPath ?? b.name))));
             }
-            if (Array.isArray(sorts)) {
-                // sorts are AXPSortQuery[]; ensure we map by name
-                const sortsMap = new Map(sorts.map((s) => [s.name, s.dir]));
-                this.sortedFields.update((prev) => prev.map((sf) => ({ ...sf, dir: sortsMap.get(sf.name) || sf.dir })));
+            if (Array.isArray(sorts) && sorts.length) {
+                this.setActiveSortsFromQueries(sorts);
             }
             // Don't override filters if they came from queryParams
             if (Array.isArray(filters) && !this.hasQueryParamsFilters) {
@@ -4569,18 +4567,80 @@ class AXPEntityMasterListViewModel {
     resetSorts() {
         this.applyViewSorts();
     }
+    /**
+     * Applies active sorts in the given order (click order, saved settings, or view defaults).
+     */
+    setActiveSortsFromQueries(sorts) {
+        const sortableByName = new Map(this.sortableFields().map((f) => [f.name, f]));
+        this.sortedFields.set(sorts
+            .filter((s) => s.dir && sortableByName.has(s.name))
+            .map((s) => ({
+            name: s.name,
+            title: sortableByName.get(s.name).title,
+            dir: s.dir,
+        })));
+    }
     applyViewSorts() {
-        const viewSorts = this.view().sorts;
-        this.sortedFields.update((prev) => {
-            const viewSortsMap = new Map(viewSorts.map((vs) => [vs.name, vs]));
-            return prev.map((sf) => {
-                const updatedSort = viewSortsMap.get(sf.name);
-                if (updatedSort) {
-                    return { ...updatedSort, title: sf.title };
-                }
-                return sf;
-            });
-        });
+        const viewSorts = this.view().sorts ?? [];
+        this.setActiveSortsFromQueries(viewSorts);
+    }
+    /**
+     * Active sort direction for a column (synced with toolbar sort UI and dataSource).
+     */
+    getColumnSortDirection(columnName) {
+        const dir = this.sortedFields().find((sf) => sf.name === columnName)?.dir;
+        return dir === 'asc' || dir === 'desc' ? dir : undefined;
+    }
+    /**
+     * 1-based priority index when multiple columns are sorted (Ctrl+click order).
+     */
+    getColumnSortIndex(columnName) {
+        const index = this.sortedFields().findIndex((sf) => sf.name === columnName);
+        return index >= 0 ? index + 1 : undefined;
+    }
+    /** True when active sorts still match the current view defaults (not yet customized). */
+    isViewDefaultSorts(activeSorts) {
+        const viewSorts = this.view().sorts ?? [];
+        if (activeSorts.length !== viewSorts.length) {
+            return false;
+        }
+        return activeSorts.every((s, i) => s.name === viewSorts[i]?.name && s.dir === viewSorts[i]?.dir);
+    }
+    /**
+     * Toggles column sort (asc → desc → none). Without Ctrl, only one column is active.
+     * With Ctrl/Cmd, multiple columns are sorted in click order (first clicked = primary).
+     */
+    async toggleColumnSort(columnName, multiSort) {
+        const fieldMeta = this.sortableFields().find((f) => f.name === columnName);
+        if (!fieldMeta) {
+            return;
+        }
+        let activeSorts = [...this.sortedFields()];
+        const index = activeSorts.findIndex((sf) => sf.name === columnName);
+        const currentDir = index >= 0 ? activeSorts[index].dir : undefined;
+        const newDir = currentDir === 'asc' ? 'desc' : currentDir === 'desc' ? undefined : 'asc';
+        if (!multiSort) {
+            activeSorts = newDir ? [{ name: columnName, title: fieldMeta.title, dir: newDir }] : [];
+        }
+        else if (index >= 0) {
+            const [item] = activeSorts.splice(index, 1);
+            if (newDir) {
+                // Re-click moves column to end so click order can override view/default order.
+                activeSorts.push({ ...item, title: fieldMeta.title, dir: newDir });
+            }
+        }
+        else if (newDir) {
+            if (this.isViewDefaultSorts(activeSorts)) {
+                activeSorts = [{ name: columnName, title: fieldMeta.title, dir: newDir }];
+            }
+            else {
+                activeSorts.push({ name: columnName, title: fieldMeta.title, dir: newDir });
+            }
+        }
+        this.sortedFields.set(activeSorts);
+        this.lastAppliedSortKey = null;
+        await this.saveSettings('sorts', activeSorts.map((s) => ({ name: s.name, dir: s.dir })));
+        await this.applyFilterAndSort();
     }
     //******************  Commands ******************//
     async executeCommand(commandName, data = null) {
@@ -4718,20 +4778,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImpo
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
-const AXPEntityListViewModelResolver = async (route, state, service = inject(AXPEntityListViewModelFactory)) => {
+const AXPEntityListViewModelResolver = async (route, state, service = inject(AXPEntityListViewModelFactory), router = inject(Router)) => {
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
-    const vm = await service.create(moduleName, entityName);
-    // Check if filters are provided in query params
-    const filtersParam = route.queryParamMap.get('filters');
-    if (filtersParam) {
-        const applied = vm.applyFiltersFromQueryParams(filtersParam);
-        if (applied) {
-            // Trigger filter and sort application
-            await vm.applyFilterAndSort();
+    try {
+        const vm = await service.create(moduleName, entityName);
+        // Check if filters are provided in query params
+        const filtersParam = route.queryParamMap.get('filters');
+        if (filtersParam) {
+            const applied = vm.applyFiltersFromQueryParams(filtersParam);
+            if (applied) {
+                // Trigger filter and sort application
+                await vm.applyFilterAndSort();
+            }
         }
+        return vm;
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
+        }
+        throw error;
     }
-    return vm;
 };
 
 const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
@@ -5523,10 +5591,19 @@ class AXPEntityPreloadFiltersViewModel {
 const AXPEntityPreloadFiltersViewModelResolver = async (route, state) => {
     const injector = inject(Injector);
     const entityRegistry = inject(AXPEntityDefinitionRegistryService);
+    const router = inject(Router);
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
-    const entity = await entityRegistry.resolve(moduleName, entityName);
-    return new AXPEntityPreloadFiltersViewModel(injector, entity);
+    try {
+        const entity = await entityRegistry.resolve(moduleName, entityName);
+        return new AXPEntityPreloadFiltersViewModel(injector, entity);
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
+        }
+        throw error;
+    }
 };
 //#endregion
 
@@ -7101,9 +7178,12 @@ class AXPLayoutAdapterFactory {
     async createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies) {
         const entity = await entityResolver.resolve(moduleName, entityName);
         if (!entity) {
-            throw new Error(`Entity ${moduleName}.${entityName} not found`);
+            throw new AXPNotFoundError(`Entity ${moduleName}.${entityName} not found`);
         }
         const rootContext = await this.loadRootContext(entity, id);
+        if (axpIsEntityRecordNotFound(rootContext)) {
+            throw new AXPNotFoundError(`Entity record ${moduleName}.${entityName}#${id} not found`);
+        }
         // Evaluate hidden expressions for related entities once, reuse across building and composing
         const evaluatedRelatedEntities = await this.evaluateRelatedEntitiesHidden(entity?.relatedEntities ?? [], rootContext, dependencies);
         // Build main and related pages using evaluated related entities
@@ -7274,7 +7354,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImpo
                 }]
         }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }, { type: i4$1.AXPFilterOperatorMiddlewareService }] });
 
-const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), commandService = inject(AXPCommandService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory)) => {
+const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), commandService = inject(AXPCommandService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory), router = inject(Router)) => {
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
     const id = route.paramMap.get('id');
@@ -7286,7 +7366,15 @@ const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver =
         workflowService,
         commandService,
     };
-    return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+    try {
+        return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
+        }
+        throw error;
+    }
 };
 
 class AXPEntityPreloadFilterGuard {
@@ -16155,7 +16243,7 @@ function routesFacory() {
             loadComponent: () => {
                 return config.viewers.root();
             },
-            canActivate: [AXPAuthGuard],
+            canActivate: [...AXP_PROTECTED_ROUTE_GUARDS],
             children: [
                 {
                     path: ':module',
@@ -16211,8 +16299,16 @@ function routesFacory() {
                             redirectTo: ':entity/list',
                             pathMatch: 'full',
                         },
+                        {
+                            path: '**',
+                            redirectTo: AXP_NOT_FOUND_ROUTE,
+                        },
                     ],
                 },
+                {
+                    path: '**',
+                    redirectTo: AXP_NOT_FOUND_ROUTE,
+                },
             ],
         },
     ];