@acorex/connectivity 20.6.0-next.8 → 21.0.0-next.0

package/fesm2022/acorex-connectivity-api.mjs

@@ -1,13 +1,13 @@
 import { AXP_ROOT_CONFIG_TOKEN, AXPFilterOperatorMiddlewareService, AXPFileStorageService, AXPFileStorageStatus } from '@acorex/platform/common';
-import { AXPEntityResolver, 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';
 import { inject, Injectable, NgModule } from '@angular/core';
 import { kebabCase } from 'lodash-es';
-import { firstValueFrom, catchError, of, map, BehaviorSubject, tap, filter, take, switchMap, delay } from 'rxjs';
+import { firstValueFrom, catchError, of, BehaviorSubject, tap, filter, take, switchMap } 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 { AXPEntityStorageService } from '@acorex/platform/layout/entity';
 import { AXP_USER_AVATAR_PROVIDER } from '@acorex/platform/layout/components';
 import { STRATEGY_CONFIG_TOKEN } from '@acorex/platform/layout/widgets';
 import * as i1$1 from 'angular-oauth2-oidc';
@@ -25,7 +25,6 @@ class AXCApiEntityStorageService {
         this.http = http;
         this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
         this.filterService = inject(AXPFilterOperatorMiddlewareService);
-        this.entityResolver = inject(AXPEntityResolver);
         this.mainUrl = this.configs.baseUrl;
         // API routing constants
         this.API_VERSION = 'v1';
@@ -208,6 +207,9 @@ class AXCFileStorageApiService extends AXPFileStorageService {
             if (request.path !== undefined) {
                 updateData.path = request.path;
             }
+            if (request.name !== undefined) {
+                updateData.name = request.name;
+            }
             if (request.isPrimary !== undefined) {
                 updateData.isPrimary = request.isPrimary;
             }
@@ -302,10 +304,9 @@ class AXMOidcApplicationLoader {
         this.apiGetApps = `${this.configs.baseUrl}/applications/applications-for-current-tenant`;
         this.apiSetApp = `${this.configs.baseUrl}/SetApplication`;
     }
-    getList() {
-        return this.http.get(this.apiGetApps).pipe(map((response) => {
-            return response.items.map((item) => this.mapToAXPApplication(item));
-        }));
+    async getList(context) {
+        const response = await firstValueFrom(this.http.get(this.apiGetApps));
+        return response.items.map((item) => this.mapToAXPApplication(item));
     }
     set(application) {
         return Promise.resolve();
@@ -332,7 +333,13 @@ class AXMOidcApplicationLoader {
             version: item.version || '1.0.0',
             description: item.description,
             logo: item.logo, // Assuming logo is of type AXPLogoConfig or undefined
-            editionName: item.editionName,
+            edition: item.edition
+                ? {
+                    id: item.edition.id,
+                    title: item.edition.title,
+                    description: item.edition.description,
+                }
+                : undefined,
             // features: item.features || [],
         };
     }
@@ -404,8 +411,8 @@ class AXMOidcFeatureLoader {
             }
         ];
     }
-    getList() {
-        return of(this.list).pipe(delay(0));
+    async getList(context) {
+        return this.list;
     }
 }
 
@@ -639,13 +646,40 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
             this.handleError(error);
         }
     }
+    /**
+     * Signs out the user according to OpenID Connect standards.
+     * Tries to call the standard OIDC end_session_endpoint if available, else falls back to configured logoutUrl.
+     * Falls back to root landing page on local logout if nothing is provided.
+     * This runs in the background (without redirecting user immediately to the endpoint).
+     */
     async signout() {
         localStorage.removeItem('pkce_code_verifier');
         localStorage.removeItem('oauth_provider');
-        console.log(this.openidConfigurationInfo?.info?.discoveryDocument);
-        // Use configured logoutUrl or derive from baseUrl
-        const logoutUrl = this.aXMAuthConfigs.logoutUrl || `connect/logout`;
-        window.location.href = logoutUrl;
+        // Standard OIDC logout: try to use end_session_endpoint if found in the discovery document
+        const discoveryDoc = this.openidConfigurationInfo?.info?.discoveryDocument;
+        let logoutUrl;
+        if (discoveryDoc?.end_session_endpoint) {
+            logoutUrl = discoveryDoc.end_session_endpoint;
+            // Optional: append id_token_hint, post_logout_redirect_uri or others as needed by your IdP
+            // For example: logoutUrl += `?post_logout_redirect_uri=${encodeURIComponent(window.location.origin)}`;
+        }
+        else if (this.aXMAuthConfigs.logoutUrl) {
+            logoutUrl = this.aXMAuthConfigs.logoutUrl;
+        }
+        // Call logout in the background (don't redirect)
+        if (logoutUrl) {
+            // Fire-and-forget: Create an invisible iframe to make the logout request in the background
+            const iframe = document.createElement('iframe');
+            iframe.style.display = 'none';
+            iframe.src = logoutUrl;
+            document.body.appendChild(iframe);
+            // Optionally, remove iframe after load
+            iframe.onload = () => {
+                setTimeout(() => document.body.removeChild(iframe), 1000);
+            };
+        }
+        // Always send user to landing page after local logout, regardless
+        window.location.href = '/';
     }
     async refreshToken(context) {
         try {
@@ -741,15 +775,16 @@ class AXMOidcPermissionLoader {
         this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
         this.apiGetConfig = `${this.configs.baseUrl}/abp/application-configuration`;
     }
-    getList(context) {
-        return this.http.get(this.apiGetConfig).pipe(map((response) => this.mapTo(response)));
+    async getList(context) {
+        const response = await firstValueFrom(this.http.get(this.apiGetConfig));
+        return this.mapTo(response);
         // if (context.user == null)
-        //   return of([]);
+        //   return [];
         // else if (context.user.name.toLowerCase() == 'admin')
-        //   return of(['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding']);
+        //   return ['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding'];
         // else
-        //   return of(['asc.user.gliding']);
-        // return of(['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding']);
+        //   return ['asc.user.gliding'];
+        // return ['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding'];
     }
     mapTo(jsonObj) {
         const policies = jsonObj.auth.grantedPolicies;
@@ -769,10 +804,11 @@ class AXMOidcTenantLoader {
         this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
         this.apiGetTenants = `${this.configs.baseUrl}/tenants/available-for-user`;
     }
-    getList() {
-        return this.http.get(this.apiGetTenants).pipe(map((response) => response.items.map((item) => {
+    async getList(context) {
+        const response = await firstValueFrom(this.http.get(this.apiGetTenants));
+        return response.items.map((item) => {
             return this.mapToAXPTenant(item);
-        })));
+        });
     }
     async set(tenant) {
         return Promise.resolve();
@@ -796,43 +832,24 @@ class AXCApiUserAvatarProvider {
     constructor() {
         this.userService = inject(AXMUsersEntityService);
         this.sessionService = inject(AXPSessionService);
-        this.http = inject(HttpClient);
-        this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
-        this.baseUrl = this.configs.baseUrl;
     }
     async provide(userId) {
         // Check if requesting current user info
         const currentUser = this.sessionService.user;
         const isCurrentUser = currentUser?.id === userId;
-        if (isCurrentUser) {
-            // Use OpenIddict /connect/userinfo endpoint for current user
-            try {
-                // Extract base URL without /api suffix and add /connect/userinfo
-                const authority = this.baseUrl.replace(/\/api$/, '');
-                const userInfoUrl = `${authority}/connect/userinfo`;
-                const token = this.sessionService.getToken();
-                // Add Authorization header if token exists (interceptor will also add it, but explicit is better)
-                const headers = new HttpHeaders();
-                if (token) {
-                    headers.set('Authorization', `Bearer ${token}`);
-                }
-                const userInfo = await firstValueFrom(this.http.get(userInfoUrl, { headers }));
-                const [firstName, lastName] = (userInfo.name || userInfo.sub || '').split(' ') || ['', ''];
-                return {
-                    id: userInfo.sub || userId,
-                    username: userInfo.preferred_username || userInfo.name || '',
-                    firstName: firstName || userInfo.given_name || '',
-                    lastName: lastName || userInfo.family_name || '',
-                    status: 'online',
-                    avatarUrl: userInfo.picture || 'https://via.placeholder.com/150',
-                };
-            }
-            catch (error) {
-                console.error('Failed to load userinfo from /connect/userinfo, falling back to entity service', error);
-                // Fallback to entity service if userinfo endpoint fails
-            }
+        if (isCurrentUser && currentUser) {
+            // Use session service user data for current user
+            const [firstName, lastName] = (currentUser.name || '').split(' ') || ['', ''];
+            return {
+                id: currentUser.id,
+                username: currentUser.name || '',
+                firstName: firstName || '',
+                lastName: lastName || '',
+                status: 'online',
+                avatarUrl: currentUser.avatar || AXPDataGenerator.avatar(),
+            };
         }
-        // Use entity service for other users or as fallback
+        // Use entity service for other users
         const user = await this.userService.getOne(userId);
         if (!user) {
             throw new Error(`User not found for ${userId}`);
@@ -844,229 +861,37 @@ class AXCApiUserAvatarProvider {
             firstName: firstName || '',
             lastName: lastName || '',
             status: 'online',
-            avatarUrl: `https://avatar.iran.liara.run/public/${AXPDataGenerator.pick([35, 22, 16, 6, 31])}`,
+            avatarUrl: AXPDataGenerator.avatar(),
         };
     }
 }
 
 //#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 {
+//#region ----   API Providers   ----
+class AXCReportCategoryApiProvider {
     constructor() {
         this.http = inject(HttpClient);
         this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
         this.baseUrl = this.configs.baseUrl;
-        // Cache for category data to avoid duplicate API calls
-        this.categoryDataCache = new Map();
-        this.rootCategoriesCache = null;
-        this.pendingRequests = new Map();
-        this.pendingRootCategoriesRequest = null;
     }
-    //#region ----   Lazy Category/Report Fetching   ----
-    /**
-     * Fetch root categories (no parent). Only root categories without reports and children.
-     * Uses cache and pending requests to avoid duplicate API calls.
-     */
-    async getRootCategories() {
-        // Check if already cached
-        if (this.rootCategoriesCache !== null) {
-            return this.rootCategoriesCache;
-        }
-        // Check if there's already a pending request
-        if (this.pendingRootCategoriesRequest !== null) {
-            return this.pendingRootCategoriesRequest;
-        }
-        // Create the request and cache it
-        const requestPromise = (async () => {
-            try {
-                const url = `${this.baseUrl}/v1/global/report-management/category`;
+    async getList(parentId) {
+        try {
+            let url;
+            if (parentId) {
+                url = `${this.baseUrl}/v1/global/report-management/category/${parentId}`;
+                const response = await firstValueFrom(this.http.get(url));
+                const categoryData = response.items?.[0];
+                const filteredItems = categoryData?.folderItems ?? [];
+                return filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
+            }
+            else {
+                url = `${this.baseUrl}/v1/global/report-management/category`;
                 const params = { Skip: 0, Take: 1000 };
                 const response = await firstValueFrom(this.http.get(url, { params }));
                 const all = response.items ?? [];
                 const rootCategories = all.filter((i) => !i.reportCategoryParentId);
-                // Cache the result
-                this.rootCategoriesCache = rootCategories;
-                return rootCategories;
-            }
-            finally {
-                // Remove from pending requests after completion
-                this.pendingRootCategoriesRequest = null;
-            }
-        })();
-        this.pendingRootCategoriesRequest = requestPromise;
-        return requestPromise;
-    }
-    /**
-     * Fetch category data for a given parentId.
-     * Returns the parent category with its FolderItems (children) and ReportDefinitionItems (reports).
-     * Uses cache to avoid duplicate API calls.
-     */
-    async getCategoryData(parentId) {
-        // Check if already cached
-        if (this.categoryDataCache.has(parentId)) {
-            return this.categoryDataCache.get(parentId);
-        }
-        // Check if there's already a pending request for this category
-        if (this.pendingRequests.has(parentId)) {
-            return this.pendingRequests.get(parentId);
-        }
-        // Create the request and cache it
-        const requestPromise = (async () => {
-            try {
-                const url = `${this.baseUrl}/v1/global/report-management/category/${parentId}`;
-                const response = await firstValueFrom(this.http.get(url));
-                const categoryData = response.items?.[0];
-                // Cache the result
-                this.categoryDataCache.set(parentId, categoryData);
-                return categoryData;
-            }
-            catch {
-                const undefinedResult = undefined;
-                this.categoryDataCache.set(parentId, undefinedResult);
-                return undefinedResult;
-            }
-            finally {
-                // Remove from pending requests after completion
-                this.pendingRequests.delete(parentId);
-            }
-        })();
-        this.pendingRequests.set(parentId, requestPromise);
-        return requestPromise;
-    }
-    /**
-     * Fetch both child categories and reports for a given parentId.
-     * This method ensures only one API call is made and both results are returned.
-     */
-    async getCategoryChildrenAndReports(parentId) {
-        const categoryData = await this.getCategoryData(parentId);
-        return {
-            categories: categoryData?.folderItems ?? [],
-            reports: categoryData?.reportDefinitionItems ?? [],
-        };
-    }
-    /**
-     * Fetch child categories of a given parent.
-     * Uses getCategoryData to get FolderItems (children) from the parent category.
-     */
-    async getChildCategories(parentId) {
-        const categoryData = await this.getCategoryData(parentId);
-        return categoryData?.folderItems ?? [];
-    }
-    /**
-     * Fetch report definitions that belong to a specific category.
-     * Uses getCategoryData to get ReportDefinitionItems (reports) from the category.
-     */
-    async getCategoryReports(categoryId) {
-        const categoryData = await this.getCategoryData(categoryId);
-        return categoryData?.reportDefinitionItems ?? [];
-    }
-    /**
-     * Fetch a single category by id.
-     * First checks cache, then uses getCategoryData if not found in cache.
-     */
-    async getCategoryById(id) {
-        // First check if it's in cache (from previous getCategoryData calls)
-        if (this.categoryDataCache.has(id)) {
-            return this.categoryDataCache.get(id);
-        }
-        // Try to get from category data endpoint (which will cache it)
-        const categoryData = await this.getCategoryData(id);
-        if (categoryData) {
-            return categoryData;
-        }
-        // Fallback: search in root categories cache
-        if (this.rootCategoriesCache) {
-            const found = this.rootCategoriesCache.find((c) => c.id === id);
-            if (found) {
-                return found;
-            }
-        }
-        // Last resort: search in all categories (but this should rarely happen)
-        try {
-            const url = `${this.baseUrl}/v1/global/report-management/category`;
-            const params = { Skip: 0, Take: 1000 };
-            const response = await firstValueFrom(this.http.get(url, { params }));
-            const all = response.items ?? [];
-            return all.find((c) => c.id === id);
-        }
-        catch {
-            return undefined;
-        }
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementDataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementDataService }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementDataService, decorators: [{
-            type: Injectable
-        }] });
-//#endregion
-//#region ----   API Providers   ----
-/**
- * Category provider that uses the shared data service.
- * Both providers use the same dataService instance which ensures proper caching.
- */
-class AXCReportCategoryApiProvider {
-    constructor() {
-        this.dataService = inject(AXCReportManagementDataService);
-    }
-    async getList(parentId) {
-        try {
-            // For root level, get root categories (each category includes folderItems in API response)
-            if (!parentId) {
-                const filteredItems = await this.dataService.getRootCategories();
-                // Each root category has folderItems in the API response, but we only return the root categories themselves
-                // The folderItems are preserved in the API response structure, similar to child state
-                return filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
+                return rootCategories.map((item) => this.mapApiCategoryToReportCategory(item));
             }
-            // For child level, get categories from category data (which includes folderItems)
-            // This ensures we use the same API response that getList for definitions will use
-            // The folderItems structure is preserved, similar to root state
-            const categoryData = await this.dataService.getCategoryData(parentId);
-            const filteredItems = categoryData?.folderItems ?? [];
-            return filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
         }
         catch (error) {
             console.error('Error fetching report categories:', error);
@@ -1075,9 +900,17 @@ class AXCReportCategoryApiProvider {
     }
     async getById(id) {
         try {
-            const apiItem = await this.dataService.getCategoryById(id);
+            const url = `${this.baseUrl}/v1/global/report-management/category/${id}`;
+            const response = await firstValueFrom(this.http.get(url));
+            const apiItem = response.items?.[0];
             if (!apiItem) {
-                return undefined;
+                // Fallback: search in all categories
+                const allUrl = `${this.baseUrl}/v1/global/report-management/category`;
+                const params = { Skip: 0, Take: 1000 };
+                const allResponse = await firstValueFrom(this.http.get(allUrl, { params }));
+                const all = allResponse.items ?? [];
+                const found = all.find((c) => c.id === id);
+                return found ? this.mapApiCategoryToReportCategory(found) : undefined;
             }
             return this.mapApiCategoryToReportCategory(apiItem);
         }
@@ -1092,8 +925,8 @@ class AXCReportCategoryApiProvider {
             title: apiItem.title,
             description: apiItem.description || undefined,
             parentId: apiItem.reportCategoryParentId || undefined,
-            hasChild: apiItem.folderCount > 0, // folderItems = folders
-            hasReport: apiItem.itemCount > 0, // reportDefinitionItems = files
+            childrenCount: apiItem.folderCount ?? 0,
+            itemsCount: apiItem.itemCount ?? 0,
         };
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportCategoryApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -1102,23 +935,31 @@ class AXCReportCategoryApiProvider {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportCategoryApiProvider, decorators: [{
             type: Injectable
         }] });
-/**
- * Definition provider that uses the shared data service.
- * Both providers use the same dataService instance which ensures proper caching.
- */
 class AXCReportDefinitionApiProvider {
     constructor() {
-        this.dataService = inject(AXCReportManagementDataService);
         this.http = inject(HttpClient);
+        this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
+        this.baseUrl = this.configs.baseUrl;
     }
     async getList(categoryId) {
         try {
-            // Use getCategoryData which is cached and shared with getCategories
-            // This ensures only one API call is made when both getCategories and getReportsByCategoryId are called
-            const categoryData = await this.dataService.getCategoryData(categoryId);
+            const url = `${this.baseUrl}/v1/global/report-management/category/${categoryId}`;
+            const response = await firstValueFrom(this.http.get(url));
+            const categoryData = response.items?.[0];
             const defs = categoryData?.reportDefinitionItems ?? [];
-            const reportDefinitions = defs.map((item) => this.mapApiReportDefinitionItemToReportDefinition(item));
-            return reportDefinitions;
+            // Fetch full report definitions for each item to get layouts and parameterGroups
+            const fullDefinitions = await Promise.all(defs.map(async (item) => {
+                try {
+                    const reportUrl = `${this.baseUrl}/v1/global/report-management/report/${item.id}`;
+                    const reportResponse = await firstValueFrom(this.http.get(reportUrl));
+                    return this.mapApiReportDefinitionToReportDefinition(reportResponse);
+                }
+                catch {
+                    // Fallback to item mapping if full fetch fails
+                    return this.mapApiReportDefinitionItemToReportDefinition(item);
+                }
+            }));
+            return fullDefinitions;
         }
         catch (error) {
             console.error('Error fetching report definitions:', error);
@@ -1127,8 +968,7 @@ class AXCReportDefinitionApiProvider {
     }
     async getById(id) {
         try {
-            // Make API call to get full report definition with layouts
-            const url = `${this.dataService['baseUrl']}/v1/global/report-management/report/${id}`;
+            const url = `${this.baseUrl}/v1/global/report-management/report/${id}`;
             const response = await firstValueFrom(this.http.get(url));
             return this.mapApiReportDefinitionToReportDefinition(response);
         }
@@ -1143,13 +983,13 @@ class AXCReportDefinitionApiProvider {
             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
+            parameterGroups: [],
+            layouts: [],
+            defaultLayoutId: '',
         };
     }
     mapApiReportDefinitionToReportDefinition(apiResponse) {
-        let res = {
+        return {
             id: apiResponse.id,
             title: apiResponse.title,
             description: apiResponse.description || undefined,
@@ -1178,7 +1018,6 @@ class AXCReportDefinitionApiProvider {
             })),
             defaultLayoutId: apiResponse.defaultLayoutId,
         };
-        return res;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportDefinitionApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportDefinitionApiProvider }); }
@@ -1187,13 +1026,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
             type: Injectable
         }] });
 //#endregion
-//#endregion
 //#region ----   Provider Exports   ----
-/**
- * Both providers use the same dataService instance (which is a singleton),
- * ensuring they share the same cache and only one API call is made when both
- * getCategories and getReportsByCategoryId are called for the same categoryId.
- */
 const AXC_REPORT_CATEGORY_API_PROVIDER = {
     provide: AXP_REPORT_CATEGORY_PROVIDER,
     useClass: AXCReportCategoryApiProvider,
@@ -1209,14 +1042,13 @@ class AXCReportManagementApiModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementApiModule, imports: [AXPRuntimeModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.12", 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-BwXw_Kn7.mjs').then((c) => c.AXCReportExecuteCommand),
-                },
+                    command: () => import('./acorex-connectivity-api-execute.command-SGNBLcOi.mjs').then((c) => c.AXCReportExecuteCommand),
+                }
             ]),
         ], imports: [AXPRuntimeModule] }); }
 }
@@ -1227,14 +1059,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                     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-BwXw_Kn7.mjs').then((c) => c.AXCReportExecuteCommand),
-                            },
+                                command: () => import('./acorex-connectivity-api-execute.command-SGNBLcOi.mjs').then((c) => c.AXCReportExecuteCommand),
+                            }
                         ]),
                     ],
                 }]
@@ -1609,9 +1440,92 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
             type: Injectable
         }], ctorParameters: () => [] });
 
+//#region ----   Imports   ----
+//#endregion
+//#region ----   API Providers   ----
+class AXCSystemInsightReportCategoryApiProvider {
+    constructor() {
+        this.http = inject(HttpClient);
+    }
+    async getList(parentId) {
+        try {
+            // Call API to get report categories
+            const params = {};
+            if (parentId) {
+                params.parentId = parentId;
+            }
+            const response = await firstValueFrom(this.http.get('/api/system-insight/report-categories', { params }));
+            return response;
+        }
+        catch (error) {
+            console.error('Failed to fetch system insight report categories from API:', error);
+            return [];
+        }
+    }
+    async getById(id) {
+        try {
+            const response = await firstValueFrom(this.http.get(`/api/system-insight/report-categories/${id}`));
+            return response;
+        }
+        catch (error) {
+            console.error(`Failed to fetch system insight report category ${id} from API:`, error);
+            return undefined;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportCategoryApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportCategoryApiProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportCategoryApiProvider, decorators: [{
+            type: Injectable
+        }] });
+class AXCSystemInsightReportDefinitionApiProvider {
+    constructor() {
+        this.http = inject(HttpClient);
+    }
+    async getList(categoryId) {
+        try {
+            const response = await firstValueFrom(this.http.get(`/api/system-insight/report-definitions`, {
+                params: { categoryId }
+            }));
+            return response;
+        }
+        catch (error) {
+            console.error(`Failed to fetch system insight report definitions for category ${categoryId} from API:`, error);
+            return [];
+        }
+    }
+    async getById(id) {
+        try {
+            const response = await firstValueFrom(this.http.get(`/api/system-insight/report-definitions/${id}`));
+            return response;
+        }
+        catch (error) {
+            console.error(`Failed to fetch system insight report definition ${id} from API:`, error);
+            return undefined;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportDefinitionApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportDefinitionApiProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportDefinitionApiProvider, decorators: [{
+            type: Injectable
+        }] });
+//#endregion
+//#region ----   Provider Exports   ----
+const AXC_SYSTEM_INSIGHT_REPORT_CATEGORY_API_PROVIDER = {
+    provide: AXP_REPORT_CATEGORY_PROVIDER,
+    useClass: AXCSystemInsightReportCategoryApiProvider,
+    multi: true,
+};
+const AXC_SYSTEM_INSIGHT_REPORT_DEFINITION_API_PROVIDER = {
+    provide: AXP_REPORT_DEFINITION_PROVIDER,
+    useClass: AXCSystemInsightReportDefinitionApiProvider,
+    multi: true,
+};
+
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCApiUserAvatarProvider, AXCReportCategoryApiProvider, AXCReportDefinitionApiProvider, AXCReportManagementApiModule, AXCReportManagementDataService, AXC_REPORT_CATEGORY_API_PROVIDER, AXC_REPORT_DEFINITION_API_PROVIDER, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
+export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCApiUserAvatarProvider, AXCReportCategoryApiProvider, AXCReportDefinitionApiProvider, AXCReportManagementApiModule, AXCSystemInsightReportCategoryApiProvider, AXCSystemInsightReportDefinitionApiProvider, AXC_REPORT_CATEGORY_API_PROVIDER, AXC_REPORT_DEFINITION_API_PROVIDER, AXC_SYSTEM_INSIGHT_REPORT_CATEGORY_API_PROVIDER, AXC_SYSTEM_INSIGHT_REPORT_DEFINITION_API_PROVIDER, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
 //# sourceMappingURL=acorex-connectivity-api.mjs.map