@acorex/connectivity 21.0.0-next.71 → 21.0.0-next.73

package/fesm2022/{acorex-connectivity-api-execute.command-CiBl7z_H.mjs → acorex-connectivity-api-execute.command-CjCFEav4.mjs}

@@ -15,7 +15,7 @@ class AXCReportExecuteCommand {
     //#region ----   Command Implementation   ----
     async execute(context) {
         try {
-            const { reportId, layoutId, filters: parameters } = context;
+            const { reportId, layoutId, filters: parameters, skip, take, sort } = context;
             // Get the report definition to find the layout
             const reportDefinition = await this.reportDefinitionService.getReportById(reportId);
             if (!reportDefinition) {
@@ -30,7 +30,16 @@ class AXCReportExecuteCommand {
             const url = `${this.baseUrl}/v1/global/Report-Management/report/Execute`;
             const body = {
                 reportId,
-                parameters,
+                parameters: {
+                    ...parameters,
+                    ...(skip !== undefined ? { skip } : {}),
+                    ...(take !== undefined ? { take } : {}),
+                    ...(sort?.length
+                        ? {
+                            sort: sort.map((s) => ({ name: s.name, dir: s.dir })),
+                        }
+                        : {}),
+                },
             };
             const executeResult = await firstValueFrom(this.http.post(url, body));
             // Convert ExecuteReportDto to AXPExecutionReportResult format
@@ -40,6 +49,7 @@ class AXCReportExecuteCommand {
                     type: 'table',
                     items: executeResult.items,
                     total: executeResult.totalCount,
+                    summary: executeResult.summary,
                 };
             }
             else if (executeResult.type === 'chart') {
@@ -92,4 +102,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
         }] });
 
 export { AXCReportExecuteCommand };
-//# sourceMappingURL=acorex-connectivity-api-execute.command-CiBl7z_H.mjs.map
+//# sourceMappingURL=acorex-connectivity-api-execute.command-CjCFEav4.mjs.map

package/fesm2022/acorex-connectivity-api-execute.command-CjCFEav4.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"acorex-connectivity-api-execute.command-CjCFEav4.mjs","sources":["../../../../libs/connectivity/api/src/lib/report-management/execute.command.ts"],"sourcesContent":["import {\n  AXPExecutionReportCommand,\n  AXPExecutionReportCommandResult,\n  AXPExecutionReportResult,\n  AXPLayoutExecutionContext,\n  AXPReportViewerService,\n  AXPReportLayoutDefinition,\n} from '@acorex/modules/report-management';\nimport { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/common';\nimport { HttpClient } from '@angular/common/http';\nimport { inject, Injectable } from '@angular/core';\nimport { firstValueFrom } from 'rxjs';\nimport { AXPExecuteReportDto } from './report-management-api.providers';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class AXCReportExecuteCommand implements AXPExecutionReportCommand {\n  private readonly http = inject(HttpClient);\n  private readonly reportDefinitionService = inject(AXPReportViewerService);\n  private readonly configs = inject(AXP_ROOT_CONFIG_TOKEN);\n  private readonly baseUrl = this.configs.baseUrl;\n\n  //#region ----   Command Implementation   ----\n\n  async execute(context: AXPLayoutExecutionContext) {\n    try {\n      const { reportId, layoutId, filters: parameters, skip, take, sort } = context;\n\n      // Get the report definition to find the layout\n      const reportDefinition = await this.reportDefinitionService.getReportById(reportId);\n      if (!reportDefinition) {\n        throw new Error(`Report with ID ${reportId} not found`);\n      }\n\n      // Find the specific layout\n      const layoutDefinition = reportDefinition.layouts.find((l: AXPReportLayoutDefinition) => l.id === layoutId);\n      if (!layoutDefinition) {\n        throw new Error(`Layout with ID ${layoutId} not found in report ${reportId}`);\n      }\n\n      // Call the Execute API endpoint\n      const url = `${this.baseUrl}/v1/global/Report-Management/report/Execute`;\n      const body = {\n        reportId,\n        parameters: {\n          ...parameters,\n          ...(skip !== undefined ? { skip } : {}),\n          ...(take !== undefined ? { take } : {}),\n          ...(sort?.length\n            ? {\n                sort: sort.map((s) => ({ name: s.name, dir: s.dir })),\n              }\n            : {}),\n        },\n      };\n\n      const executeResult: AXPExecuteReportDto = await firstValueFrom(this.http.post<AXPExecuteReportDto>(url, body));\n\n      // Convert ExecuteReportDto to AXPExecutionReportResult format\n      let executionResult: AXPExecutionReportResult;\n\n      if (executeResult.type === 'table') {\n        executionResult = {\n          type: 'table',\n          items: executeResult.items,\n          total: executeResult.totalCount,\n          summary: (executeResult as { summary?: Record<string, number | null> }).summary,\n        };\n      } else if (executeResult.type === 'chart') {\n        executionResult = {\n          type: 'chart',\n          data: executeResult.items[0] || {},\n        };\n      } else if (executeResult.type === 'cards') {\n        executionResult = {\n          type: 'cards',\n          items: executeResult.items,\n        };\n      } else {\n        executionResult = {\n          type: 'custom',\n          data: executeResult.items,\n        };\n      }\n\n      // Return the combined layout configuration and data\n      return {\n        success: true,\n        data: {\n          ...layoutDefinition.layout,\n          data: executionResult,\n        },\n      };\n    } catch (error) {\n      console.error('Error executing report:', error);\n      const errorMessage = error instanceof Error ? error.message : 'Unknown error';\n      return {\n        success: false,\n        message: {\n          type: 'error' as const,\n          text: `Failed to execute report: ${errorMessage}`,\n        },\n      };\n    }\n  }\n\n  //#endregion\n}\n"],"names":[],"mappings":";;;;;;;MAiBa,uBAAuB,CAAA;AAHpC,IAAA,WAAA,GAAA;AAImB,QAAA,IAAA,CAAA,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC;AACzB,QAAA,IAAA,CAAA,uBAAuB,GAAG,MAAM,CAAC,sBAAsB,CAAC;AACxD,QAAA,IAAA,CAAA,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC;AACvC,QAAA,IAAA,CAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO;AAuFhD,IAAA;;IAnFC,MAAM,OAAO,CAAC,OAAkC,EAAA;AAC9C,QAAA,IAAI;AACF,YAAA,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO;;YAG7E,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,QAAQ,CAAC;YACnF,IAAI,CAAC,gBAAgB,EAAE;AACrB,gBAAA,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAA,UAAA,CAAY,CAAC;YACzD;;AAGA,YAAA,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAA4B,KAAK,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC;YAC3G,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,CAAA,eAAA,EAAkB,QAAQ,CAAA,qBAAA,EAAwB,QAAQ,CAAA,CAAE,CAAC;YAC/E;;AAGA,YAAA,MAAM,GAAG,GAAG,CAAA,EAAG,IAAI,CAAC,OAAO,6CAA6C;AACxE,YAAA,MAAM,IAAI,GAAG;gBACX,QAAQ;AACR,gBAAA,UAAU,EAAE;AACV,oBAAA,GAAG,UAAU;AACb,oBAAA,IAAI,IAAI,KAAK,SAAS,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AACvC,oBAAA,IAAI,IAAI,KAAK,SAAS,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;oBACvC,IAAI,IAAI,EAAE;AACR,0BAAE;4BACE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AACtD;0BACD,EAAE,CAAC;AACR,iBAAA;aACF;AAED,YAAA,MAAM,aAAa,GAAwB,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAsB,GAAG,EAAE,IAAI,CAAC,CAAC;;AAG/G,YAAA,IAAI,eAAyC;AAE7C,YAAA,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE;AAClC,gBAAA,eAAe,GAAG;AAChB,oBAAA,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,aAAa,CAAC,KAAK;oBAC1B,KAAK,EAAE,aAAa,CAAC,UAAU;oBAC/B,OAAO,EAAG,aAA6D,CAAC,OAAO;iBAChF;YACH;AAAO,iBAAA,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE;AACzC,gBAAA,eAAe,GAAG;AAChB,oBAAA,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;iBACnC;YACH;AAAO,iBAAA,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE;AACzC,gBAAA,eAAe,GAAG;AAChB,oBAAA,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,aAAa,CAAC,KAAK;iBAC3B;YACH;iBAAO;AACL,gBAAA,eAAe,GAAG;AAChB,oBAAA,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,aAAa,CAAC,KAAK;iBAC1B;YACH;;YAGA,OAAO;AACL,gBAAA,OAAO,EAAE,IAAI;AACb,gBAAA,IAAI,EAAE;oBACJ,GAAG,gBAAgB,CAAC,MAAM;AAC1B,oBAAA,IAAI,EAAE,eAAe;AACtB,iBAAA;aACF;QACH;QAAE,OAAO,KAAK,EAAE;AACd,YAAA,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC;AAC/C,YAAA,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,GAAG,KAAK,CAAC,OAAO,GAAG,eAAe;YAC7E,OAAO;AACL,gBAAA,OAAO,EAAE,KAAK;AACd,gBAAA,OAAO,EAAE;AACP,oBAAA,IAAI,EAAE,OAAgB;oBACtB,IAAI,EAAE,CAAA,0BAAA,EAA6B,YAAY,CAAA,CAAE;AAClD,iBAAA;aACF;QACH;IACF;8GAxFW,uBAAuB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAvB,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,uBAAuB,cAFtB,MAAM,EAAA,CAAA,CAAA;;2FAEP,uBAAuB,EAAA,UAAA,EAAA,CAAA;kBAHnC,UAAU;AAAC,YAAA,IAAA,EAAA,CAAA;AACV,oBAAA,UAAU,EAAE,MAAM;AACnB,iBAAA;;;;;"}

package/fesm2022/acorex-connectivity-api.mjs

@@ -1,5 +1,5 @@
 import { AXP_ROOT_CONFIG_TOKEN, AXPFilterOperatorMiddlewareService, AXPFileStorageService, AXPFileStorageStatus } from '@acorex/platform/common';
-import { computeEntityAggregates, AXPEntityStorageService } from '@acorex/platform/layout/entity';
+import { computeEntityAggregates, AXPEntityService, AXPEntityStorageService } from '@acorex/platform/layout/entity';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http';
 import * as i0 from '@angular/core';
@@ -14,7 +14,7 @@ import * as i1$1 from 'angular-oauth2-oidc';
 import { OAuthService, OAuthModule } from 'angular-oauth2-oidc';
 import { AXM_AUTH_CONFIG_TOKEN } from '@acorex/modules/auth';
 import { Router } from '@angular/router';
-import { AXMUsersEntityService } from '@acorex/modules/security-management';
+import { RootConfig } from '@acorex/modules/security-management';
 import { AXPDataGenerator } from '@acorex/platform/core';
 import { AXCUtilsModule, AXCExternalAuthorizationService } from '@acorex/connectivity/utils';
 import { AXPRuntimeModule, provideCommandSetups } from '@acorex/platform/runtime';
@@ -916,7 +916,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
 
 class AXCApiUserAvatarProvider {
     constructor() {
-        this.userService = inject(AXMUsersEntityService);
+        this.entityService = inject(AXPEntityService);
+        this.userService = this.entityService.withEntity(RootConfig.module.name, RootConfig.entities.users.name).data();
         this.sessionService = inject(AXPSessionService);
     }
     async provide(userId) {
@@ -936,7 +937,7 @@ class AXCApiUserAvatarProvider {
             };
         }
         // Use entity service for other users
-        const user = await this.userService.getOne(userId);
+        const user = await this.userService.byKey(userId);
         if (!user) {
             throw new Error(`User not found for ${userId}`);
         }
@@ -1127,7 +1128,7 @@ class AXCReportManagementApiModule {
             provideCommandSetups([
                 {
                     key: 'ReportManagement.Report:Execute',
-                    command: () => import('./acorex-connectivity-api-execute.command-CiBl7z_H.mjs').then((c) => c.AXCReportExecuteCommand),
+                    command: () => import('./acorex-connectivity-api-execute.command-CjCFEav4.mjs').then((c) => c.AXCReportExecuteCommand),
                 }
             ]),
         ], imports: [AXPRuntimeModule] }); }
@@ -1146,7 +1147,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         provideCommandSetups([
                             {
                                 key: 'ReportManagement.Report:Execute',
-                                command: () => import('./acorex-connectivity-api-execute.command-CiBl7z_H.mjs').then((c) => c.AXCReportExecuteCommand),
+                                command: () => import('./acorex-connectivity-api-execute.command-CjCFEav4.mjs').then((c) => c.AXCReportExecuteCommand),
                             }
                         ]),
                     ],