@acorex/connectivity 20.3.0-next.2 → 20.3.0-next.20

package/fesm2022/acorex-connectivity-api.mjs

@@ -8,12 +8,14 @@ import { kebabCase } from 'lodash-es';
 import { firstValueFrom, catchError, of, map, BehaviorSubject, tap, filter, take, switchMap, delay } from 'rxjs';
 import * as i2 from '@acorex/platform/auth';
 import { AXPAuthStrategy, AXPSessionService, JwtUtil, TimeUtil, PkceUtil, AXPAuthModule, AXP_TENANT_LOADER, AXP_APPLICATION_LOADER, AXP_PERMISSION_LOADER, AXP_FEATURE_LOADER } from '@acorex/platform/auth';
-import { STRATEGY_CONFIG_TOKEN } from '@acorex/platform/widgets';
+import { STRATEGY_CONFIG_TOKEN } from '@acorex/platform/layout/widgets';
 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 { AXCUtilsModule, AXCExternalAuthorizationService } from '@acorex/connectivity/utils';
+import { AXPRuntimeModule, provideCommandSetups } from '@acorex/platform/runtime';
+import { AXP_REPORT_CATEGORY_PROVIDER, AXP_REPORT_DEFINITION_PROVIDER } from '@acorex/modules/report-management';
 
 class AXCApiEntityStorageService {
     constructor(http) {
@@ -22,6 +24,9 @@ class AXCApiEntityStorageService {
         this.filterService = inject(AXPFilterOperatorMiddlewareService);
         this.entityResolver = inject(AXPEntityResolver);
         this.mainUrl = this.configs.baseUrl;
+        // API routing constants
+        this.API_VERSION = 'v1';
+        this.DEFAULT_AREA = 'global';
     }
     get dbName() {
         return 'ACoreXPlatform';
@@ -37,6 +42,7 @@ class AXCApiEntityStorageService {
                 module: moduleKebab,
                 entity: entityKebab,
                 area: areaKebab,
+                version: this.API_VERSION,
             };
         }
         else {
@@ -46,7 +52,8 @@ class AXCApiEntityStorageService {
             return {
                 module: moduleKebab,
                 entity: entityKebab,
-                area: null,
+                area: this.DEFAULT_AREA,
+                version: this.API_VERSION,
             };
         }
     }
@@ -59,22 +66,22 @@ class AXCApiEntityStorageService {
     }
     async getOne(entityName, id) {
         const routeElement = await this.getConfigEntity(entityName);
-        const url = `${this.mainUrl}/${routeElement.area ? routeElement.area + '/' : ''}${routeElement.module}/${routeElement.entity}${id ? '/' + id : ''}`;
+        const url = `${this.mainUrl}/${routeElement.version}/${routeElement.area}/${routeElement.module}/${routeElement.entity}${id ? '/' + id : ''}`;
         return firstValueFrom(this.http.get(url));
     }
     async updateOne(entityName, id, keyValue) {
         const routeElement = await this.getConfigEntity(entityName);
-        const url = `${this.mainUrl}/${routeElement.area ? routeElement.area + '/' : ''}${routeElement.module}/${routeElement.entity}${id ? '/' + id : ''}`;
+        const url = `${this.mainUrl}/${routeElement.version}/${routeElement.area}/${routeElement.module}/${routeElement.entity}${id ? '/' + id : ''}`;
         return firstValueFrom(this.http.put(url, keyValue));
     }
     async deleteOne(entityName, id) {
         const routeElement = await this.getConfigEntity(entityName);
-        const url = `${this.mainUrl}/${routeElement.area ? routeElement.area + '/' : ''}${routeElement.module}/${routeElement.entity}/${id}`;
+        const url = `${this.mainUrl}/${routeElement.version}/${routeElement.area}/${routeElement.module}/${routeElement.entity}/${id}`;
         firstValueFrom(this.http.delete(url));
     }
     async insertOne(entityName, entityItem) {
         const routeElement = await this.getConfigEntity(entityName);
-        const url = `${this.mainUrl}/${routeElement.area ? routeElement.area + '/' : ''}${routeElement.module}/${routeElement.entity}`;
+        const url = `${this.mainUrl}/${routeElement.version}/${routeElement.area}/${routeElement.module}/${routeElement.entity}`;
         return firstValueFrom(this.http.post(url, entityItem));
     }
     async getAll(entityName) {
@@ -124,17 +131,17 @@ class AXCApiEntityStorageService {
         if (queryString) {
             httpParams = httpParams.set('$query', queryString);
         }
-        return firstValueFrom(this.http.get(`${this.mainUrl}/${routeElement.area ? routeElement.area + '/' : ''}${routeElement.module}/${routeElement.entity}`, { params: httpParams })).then((response) => {
+        return firstValueFrom(this.http.get(`${this.mainUrl}/${routeElement.version}/${routeElement.area}/${routeElement.module}/${routeElement.entity}`, { params: httpParams })).then((response) => {
             return {
                 total: response.totalCount,
                 items: response.items,
             };
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCApiEntityStorageService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCApiEntityStorageService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCApiEntityStorageService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCApiEntityStorageService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCApiEntityStorageService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCApiEntityStorageService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
@@ -278,10 +285,10 @@ class AXCFileStorageApiService extends AXPFileStorageService {
             // Silently fail in fallback mode
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCFileStorageApiService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCFileStorageApiService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCFileStorageApiService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCFileStorageApiService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCFileStorageApiService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCFileStorageApiService, decorators: [{
             type: Injectable
         }] });
 
@@ -326,10 +333,10 @@ class AXMOidcApplicationLoader {
             // features: item.features || [],
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcApplicationLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcApplicationLoader }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcApplicationLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcApplicationLoader }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcApplicationLoader, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcApplicationLoader, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
@@ -369,10 +376,10 @@ class AXMConfigurationService {
             switchMap(() => of(this.applicationConfig)));
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMConfigurationService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMConfigurationService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMConfigurationService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMConfigurationService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMConfigurationService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMConfigurationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -621,6 +628,8 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
                     .join('&');
                 const authorizeUrl = `${authorizeEndpoint}?${queryParams}`;
                 window.location.href = authorizeUrl;
+                // Prevent further execution by waiting on a never-resolving Promise after redirect
+                await new Promise(() => { });
             }
         }
         catch (error) {
@@ -631,7 +640,8 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
         localStorage.removeItem('pkce_code_verifier');
         localStorage.removeItem('oauth_provider');
         console.log(this.openidConfigurationInfo?.info?.discoveryDocument);
-        const logoutUrl = `${this.aXMAuthConfigs?.baseUrl}/connect/logout`;
+        // Use configured logoutUrl or derive from baseUrl
+        const logoutUrl = this.aXMAuthConfigs.logoutUrl || `connect/logout`;
         window.location.href = logoutUrl;
     }
     async refreshToken(context) {
@@ -715,10 +725,10 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
     get name() {
         return 'oidc';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCAPIOidcStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCAPIOidcStrategy }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCAPIOidcStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCAPIOidcStrategy }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCAPIOidcStrategy, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCAPIOidcStrategy, decorators: [{
             type: Injectable
         }] });
 
@@ -743,10 +753,10 @@ class AXMOidcPermissionLoader {
         const truePolicies = Object.keys(policies).filter((key) => policies[key] === true);
         return truePolicies;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcPermissionLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcPermissionLoader }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcPermissionLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcPermissionLoader }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcPermissionLoader, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcPermissionLoader, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
@@ -772,17 +782,328 @@ class AXMOidcTenantLoader {
             // Add other fields and defaults as needed, and handle the logo if applicable
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcTenantLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcTenantLoader }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcTenantLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcTenantLoader }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXMOidcTenantLoader, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXMOidcTenantLoader, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
+//#endregion
+//#region ----   Helper Functions   ----
+// /**
+//  * Converts a widget string to AXPWidgetsList key
+//  */
+// function convertWidgetStringToAXPWidgetsListKey(
+//   widgetString: string,
+// )
+// :
+//   | keyof typeof AXPWidgetsList.Editors
+//   | keyof typeof AXPWidgetsList.Layouts
+//   | keyof typeof AXPWidgetsList.Actions
+//   | keyof typeof AXPWidgetsList.Advanced
+//   | keyof typeof AXPWidgetsList.Templates
+//   | keyof typeof AXPWidgetsList.Entity
+//   | keyof typeof AXPWidgetsList.Theme
+//   {
+//   console.log('Converting widget string:', widgetString);
+//   // Check if the string is in format "AXPWidgetsList.Category.Key"
+//   if (widgetString.startsWith('AXPWidgetsList.')) {
+//     // Extract the key from "AXPWidgetsList.Editors.DateTimeBox" -> "DateTimeBox"
+//     const parts = widgetString.split('.');
+//     if (parts.length >= 3) {
+//       const key = parts[parts.length - 1]; // Get the last part (key)
+//       console.log('Extracted key from AXPWidgetsList format:', key);
+//       return key as any;
+//     }
+//   }
+//   // Search through all AXPWidgetsList categories to find matching widget
+//   for (const category of Object.values(AXPWidgetsList)) {
+//     if (typeof category === 'object') {
+//       for (const [key, value] of Object.entries(category)) {
+//         if (value === widgetString) {
+//           console.log('Found matching widget:', key, 'for value:', value);
+//           return key as any; // Return the AXPWidgetsList key (e.g., "DateTimeBox")
+//         }
+//       }
+//     }
+//   }
+//   console.log('Widget not found in AXPWidgetsList, returning original string:', widgetString);
+//   // If not found in AXPWidgetsList, return the original string as fallback
+//   return widgetString as any;
+// }
+//#endregion
+//#region ----   Shared Data Service   ----
+class AXCReportManagementDataService {
+    constructor() {
+        this.http = inject(HttpClient);
+        this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
+        this.baseUrl = this.configs.baseUrl;
+        // Shared cache for all categories data
+        this.allCategoriesData = [];
+        this.dataLoaded = false;
+    }
+    async getAllCategoriesData() {
+        if (!this.dataLoaded) {
+            await this.loadAllCategories();
+        }
+        return this.allCategoriesData;
+    }
+    async loadAllCategories() {
+        const url = `${this.baseUrl}/v1/global/report-management/category`;
+        const params = { Skip: 0, Take: 1000 };
+        const response = await firstValueFrom(this.http.get(url, { params }));
+        this.allCategoriesData = response.items;
+        this.dataLoaded = true;
+    }
+    clearCache() {
+        this.allCategoriesData = [];
+        this.dataLoaded = false;
+    }
+    async executeReport(reportId, parameters = {}) {
+        const url = `{this.dataService['baseUrl']}/api/v1/global/Report-Management/report/Execute`;
+        const body = {
+            reportId,
+            parameters,
+        };
+        const response = await firstValueFrom(this.http.post(url, body));
+        return response;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementDataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementDataService }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementDataService, decorators: [{
+            type: Injectable
+        }] });
+//#endregion
+//#region ----   API Providers   ----
+class AXCReportCategoryApiProvider {
+    constructor() {
+        this.dataService = inject(AXCReportManagementDataService);
+        // Cache to store processed categories
+        this.categoriesCache = new Map();
+    }
+    async getList(parentId) {
+        // Check cache first
+        if (this.categoriesCache.has(parentId)) {
+            return this.categoriesCache.get(parentId);
+        }
+        try {
+            // Get data from shared service
+            const allCategoriesData = await this.dataService.getAllCategoriesData();
+            // Filter categories based on parentId
+            let filteredItems;
+            if (!parentId) {
+                // Root categories (no parent)
+                filteredItems = allCategoriesData.filter((item) => !item.reportCategoryParentId);
+            }
+            else {
+                // Child categories
+                filteredItems = allCategoriesData.filter((item) => item.reportCategoryParentId === parentId);
+            }
+            const categories = filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
+            // Cache the result
+            this.categoriesCache.set(parentId, categories);
+            return categories;
+        }
+        catch (error) {
+            console.error('Error fetching report categories:', error);
+            return [];
+        }
+    }
+    async getById(id) {
+        try {
+            // Get data from shared service
+            const allCategoriesData = await this.dataService.getAllCategoriesData();
+            const apiItem = allCategoriesData.find((item) => item.id === id);
+            if (!apiItem) {
+                return undefined;
+            }
+            return this.mapApiCategoryToReportCategory(apiItem);
+        }
+        catch (error) {
+            console.error('Error fetching report category by ID:', error);
+            return undefined;
+        }
+    }
+    mapApiCategoryToReportCategory(apiItem) {
+        return {
+            id: apiItem.id,
+            title: apiItem.title,
+            description: apiItem.description || undefined,
+            parentId: apiItem.reportCategoryParentId || undefined,
+            hasChild: apiItem.folderCount > 0, // folderItems = folders
+            hasReport: apiItem.itemCount > 0, // reportDefinitionItems = files
+        };
+    }
+    // Method to clear cache when needed
+    clearCache() {
+        this.categoriesCache.clear();
+        this.dataService.clearCache();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportCategoryApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportCategoryApiProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportCategoryApiProvider, decorators: [{
+            type: Injectable
+        }] });
+class AXCReportDefinitionApiProvider {
+    constructor() {
+        this.dataService = inject(AXCReportManagementDataService);
+        this.http = inject(HttpClient);
+        // Cache to store report definitions by category to avoid unnecessary API calls
+        this.reportDefinitionsCache = new Map();
+    }
+    async getList(categoryId) {
+        // Check cache first
+        if (this.reportDefinitionsCache.has(categoryId)) {
+            return this.reportDefinitionsCache.get(categoryId);
+        }
+        try {
+            // Get data from shared service
+            const allCategoriesData = await this.dataService.getAllCategoriesData();
+            // Find the specific category and extract its report definitions
+            const categoryItem = allCategoriesData.find((item) => item.id === categoryId);
+            if (!categoryItem) {
+                // Cache empty result to avoid repeated API calls
+                this.reportDefinitionsCache.set(categoryId, []);
+                return [];
+            }
+            const reportDefinitions = categoryItem.reportDefinitionItems.map((item) => this.mapApiReportDefinitionItemToReportDefinition(item));
+            // Cache the result
+            this.reportDefinitionsCache.set(categoryId, reportDefinitions);
+            return reportDefinitions;
+        }
+        catch (error) {
+            console.error('Error fetching report definitions:', error);
+            // Cache empty result to avoid repeated failed API calls
+            this.reportDefinitionsCache.set(categoryId, []);
+            return [];
+        }
+    }
+    async getById(id) {
+        try {
+            console.log('AXCReportDefinitionApiProvider.getById called with ID:', id);
+            // Make API call to get full report definition with layouts
+            const url = `${this.dataService['baseUrl']}/v1/global/report-management/report/${id}`;
+            console.log('Making API call to:', url);
+            const response = await firstValueFrom(this.http.get(url));
+            return this.mapApiReportDefinitionToReportDefinition(response);
+        }
+        catch (error) {
+            console.error('Error fetching report definition by ID:', error);
+            return undefined;
+        }
+    }
+    mapApiReportDefinitionItemToReportDefinition(apiItem) {
+        return {
+            id: apiItem.id,
+            title: apiItem.title,
+            description: apiItem.description || undefined,
+            categoryIds: apiItem.categoryIds,
+            parameterGroups: [], // These would need to be fetched separately if needed
+            layouts: [], // These would need to be fetched separately if needed
+            defaultLayoutId: '', // This would need to be set based on the first layout
+        };
+    }
+    mapApiReportDefinitionToReportDefinition(apiResponse) {
+        let res = {
+            id: apiResponse.id,
+            title: apiResponse.title,
+            description: apiResponse.description || undefined,
+            categoryIds: apiResponse.categoryIds,
+            parameterGroups: apiResponse.parameterGroups.map((group) => ({
+                name: group.name,
+                title: group.title,
+                parameters: group.parameters.map((param) => ({
+                    path: param.path,
+                    title: param.title,
+                    widget: {
+                        type: param.widget.type,
+                        options: param.widget.options || {},
+                        valueTransforms: param.widget.valueTransforms || {},
+                    },
+                })),
+            })),
+            layouts: apiResponse.layouts.map((layout) => ({
+                id: layout.id,
+                title: layout.title,
+                layout: layout.layout,
+                dataSource: layout.dataSource,
+                export: layout.export,
+                isDefault: layout.isDefault || false,
+            })),
+            defaultLayoutId: apiResponse.defaultLayoutId,
+        };
+        return res;
+    }
+    async executeReport(reportId, parameters = {}) {
+        return await this.dataService.executeReport(reportId, parameters);
+    }
+    // Method to clear cache when needed
+    clearCache() {
+        this.reportDefinitionsCache.clear();
+        this.dataService.clearCache();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportDefinitionApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportDefinitionApiProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportDefinitionApiProvider, decorators: [{
+            type: Injectable
+        }] });
+//#endregion
+//#region ----   Provider Exports   ----
+const AXC_REPORT_CATEGORY_API_PROVIDER = {
+    provide: AXP_REPORT_CATEGORY_PROVIDER,
+    useClass: AXCReportCategoryApiProvider,
+    multi: true,
+};
+const AXC_REPORT_DEFINITION_API_PROVIDER = {
+    provide: AXP_REPORT_DEFINITION_PROVIDER,
+    useClass: AXCReportDefinitionApiProvider,
+    multi: true,
+};
+
+class AXCReportManagementApiModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementApiModule, imports: [AXPRuntimeModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementApiModule, providers: [
+            AXCReportManagementDataService,
+            AXC_REPORT_CATEGORY_API_PROVIDER,
+            AXC_REPORT_DEFINITION_API_PROVIDER,
+            provideCommandSetups([
+                {
+                    key: 'ReportManagement.Report:Execute',
+                    command: () => import('./acorex-connectivity-api-execute.command-BLf56xbu.mjs').then((c) => c.AXCReportExecuteCommand),
+                },
+            ]),
+        ], imports: [AXPRuntimeModule] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCReportManagementApiModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    imports: [AXPRuntimeModule],
+                    exports: [],
+                    declarations: [],
+                    providers: [
+                        AXCReportManagementDataService,
+                        AXC_REPORT_CATEGORY_API_PROVIDER,
+                        AXC_REPORT_DEFINITION_API_PROVIDER,
+                        provideCommandSetups([
+                            {
+                                key: 'ReportManagement.Report:Execute',
+                                command: () => import('./acorex-connectivity-api-execute.command-BLf56xbu.mjs').then((c) => c.AXCReportExecuteCommand),
+                            },
+                        ]),
+                    ],
+                }]
+        }] });
+
 class AXCApiModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.8", ngImport: i0, type: AXCApiModule, imports: [i1$1.OAuthModule, i2.AXPAuthModule, AXCUtilsModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCApiModule, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.3", ngImport: i0, type: AXCApiModule, imports: [i1$1.OAuthModule, i2.AXPAuthModule, AXCUtilsModule,
+            AXCReportManagementApiModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCApiModule, providers: [
             {
                 provide: AXPEntityStorageService,
                 useClass: AXCApiEntityStorageService,
@@ -813,14 +1134,15 @@ class AXCApiModule {
                     selectValueStrategy: 'valueField',
                     lookupValueStrategy: 'valueField',
                 },
-            },
+            }
         ], imports: [OAuthModule.forRoot(),
             AXPAuthModule.forRoot({
                 strategies: [AXCAPIOidcStrategy],
             }),
-            AXCUtilsModule] }); }
+            AXCUtilsModule,
+            AXCReportManagementApiModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: AXCApiModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXCApiModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -829,6 +1151,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImpor
                             strategies: [AXCAPIOidcStrategy],
                         }),
                         AXCUtilsModule,
+                        AXCReportManagementApiModule,
                     ],
                     providers: [
                         {
@@ -861,7 +1184,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImpor
                                 selectValueStrategy: 'valueField',
                                 lookupValueStrategy: 'valueField',
                             },
-                        },
+                        }
                     ],
                 }]
         }] });
@@ -1130,10 +1453,10 @@ class APIGoogleStrategy extends AXPAuthStrategy {
         console.error('Authentication error:', error);
         throw error;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: APIGoogleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: APIGoogleStrategy }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: APIGoogleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: APIGoogleStrategy }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImport: i0, type: APIGoogleStrategy, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: APIGoogleStrategy, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 
@@ -1141,5 +1464,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.8", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
+export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCReportManagementApiModule, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
 //# sourceMappingURL=acorex-connectivity-api.mjs.map