@acorex/modules 21.0.0-next.83 → 21.0.0-next.85

package/fesm2022/acorex-modules-task-management.mjs

@@ -1,4 +1,4 @@
-import { AXPBroadcastEventService, AXPPlatformScope, AXP_DATASOURCE_DEFINITION_PROVIDER, AXP_MODULE_MANIFEST_PROVIDER } from '@acorex/platform/core';
+import { AXPBroadcastEventService, AXPPlatformScope, applyFilterArray, AXP_DATASOURCE_DEFINITION_PROVIDER, AXP_MODULE_MANIFEST_PROVIDER } from '@acorex/platform/core';
 import { AXPEntityService, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, entityMasterCrudActions, entityMasterDeleteAction, entityDetailsSimpleCondition, entityMasterRecordActions, entityDetailsCrudActions } from '@acorex/platform/layout/entity';
 import * as i1$1 from '@angular/common';
 import { CommonModule, DOCUMENT } from '@angular/common';
@@ -2372,6 +2372,13 @@ class AXMTaskBoardAssigneeDataSourceDefinition {
         this.sessionService = inject(AXPSessionService);
         this.translationService = inject(AXTranslationService);
     }
+    /** Check whether a synthetic item survives the widget's current (search) filter. */
+    matchesFilter(item, filter) {
+        if (!filter || (!filter.field && !filter.filters?.length)) {
+            return true;
+        }
+        return applyFilterArray([item], [filter], filter.logic ?? 'and').length > 0;
+    }
     items() {
         return Promise.resolve([
             {
@@ -2380,13 +2387,14 @@ class AXMTaskBoardAssigneeDataSourceDefinition {
                 source: () => {
                     return new AXDataSource({
                         key: 'id',
-                        load: async () => {
+                        load: async (request) => {
+                            const skip = request?.skip ?? 0;
                             const selfItem = resolveTaskBoardCurrentUserAssigneeItem(this.sessionService);
                             if (!canViewAllTaskAssignees(this.sessionService)) {
-                                if (!selfItem) {
+                                if (!selfItem || !this.matchesFilter(selfItem, request?.filter)) {
                                     return { items: [], total: 0 };
                                 }
-                                return { items: [selfItem], total: 1 };
+                                return { items: skip === 0 ? [selfItem] : [], total: 1 };
                             }
                             const unassignedLabel = await this.translationService.translateAsync('@task-management:task-board.filter.unassigned');
                             const unassignedItem = {
@@ -2394,13 +2402,15 @@ class AXMTaskBoardAssigneeDataSourceDefinition {
                                 displayName: unassignedLabel,
                                 username: '',
                             };
-                            const res = await this.userService.query();
+                            const includeUnassigned = this.matchesFilter(unassignedItem, request?.filter);
+                            const res = await this.userService.query(request ?? { skip: 0, take: 100 });
                             const userItems = res.items.map((item) => ({
                                 ...item,
                                 displayName: item.displayName,
                             }));
-                            const items = [...userItems, unassignedItem];
-                            return { items, total: items.length };
+                            const items = skip === 0 && includeUnassigned ? [unassignedItem, ...userItems] : userItems;
+                            const total = res.total + (includeUnassigned ? 1 : 0);
+                            return { items, total };
                         },
                         byKey: async (key) => {
                             const userId = String(key);
@@ -2488,7 +2498,7 @@ function createAppRoute() {
         children: [
             {
                 path: '',
-                loadComponent: () => import('./acorex-modules-task-management-task-board.page-Dx6oov4j.mjs').then((c) => c.AXMTaskBoardPage),
+                loadComponent: () => import('./acorex-modules-task-management-task-board.page-D8kQVaxY.mjs').then((c) => c.AXMTaskBoardPage),
             },
         ],
     };