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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/api/index.d.ts +40 -65
  2. package/fesm2022/{acorex-connectivity-api-execute.command-BwXw_Kn7.mjs → acorex-connectivity-api-execute.command-SGNBLcOi.mjs} +14 -5
  3. package/fesm2022/acorex-connectivity-api-execute.command-SGNBLcOi.mjs.map +1 -0
  4. package/fesm2022/acorex-connectivity-api.mjs +199 -266
  5. package/fesm2022/acorex-connectivity-api.mjs.map +1 -1
  6. package/fesm2022/{acorex-connectivity-mock-category-with-items.query-NY9J0cQ0.mjs → acorex-connectivity-mock-category-with-items.query-Dsxj98tX.mjs} +2 -2
  7. package/fesm2022/acorex-connectivity-mock-category-with-items.query-Dsxj98tX.mjs.map +1 -0
  8. package/fesm2022/{acorex-connectivity-mock-distribution-record.command-B-Xviv6G.mjs → acorex-connectivity-mock-distribution-record.command-DRiDwlqN.mjs} +12 -3
  9. package/fesm2022/acorex-connectivity-mock-distribution-record.command-DRiDwlqN.mjs.map +1 -0
  10. package/fesm2022/{acorex-connectivity-mock-sample.command-BkxMgq1C.mjs → acorex-connectivity-mock-sample.command-CkH5bmEs.mjs} +4 -1
  11. package/fesm2022/acorex-connectivity-mock-sample.command-CkH5bmEs.mjs.map +1 -0
  12. package/fesm2022/acorex-connectivity-mock.mjs +22194 -14850
  13. package/fesm2022/acorex-connectivity-mock.mjs.map +1 -1
  14. package/mock/index.d.ts +660 -636
  15. package/package.json +6 -6
  16. package/fesm2022/acorex-connectivity-api-execute.command-BwXw_Kn7.mjs.map +0 -1
  17. package/fesm2022/acorex-connectivity-mock-category-with-items.query-NY9J0cQ0.mjs.map +0 -1
  18. package/fesm2022/acorex-connectivity-mock-distribution-record.command-B-Xviv6G.mjs.map +0 -1
  19. package/fesm2022/acorex-connectivity-mock-sample.command-BkxMgq1C.mjs.map +0 -1
@@ -1,13 +1,13 @@
1
1
  import { AXP_ROOT_CONFIG_TOKEN, AXPFilterOperatorMiddlewareService, AXPFileStorageService, AXPFileStorageStatus } from '@acorex/platform/common';
2
- import { AXPEntityResolver, AXPEntityStorageService } from '@acorex/platform/layout/entity';
3
2
  import * as i1 from '@angular/common/http';
4
3
  import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http';
5
4
  import * as i0 from '@angular/core';
6
5
  import { inject, Injectable, NgModule } from '@angular/core';
7
6
  import { kebabCase } from 'lodash-es';
8
- import { firstValueFrom, catchError, of, map, BehaviorSubject, tap, filter, take, switchMap, delay } from 'rxjs';
7
+ import { firstValueFrom, catchError, of, BehaviorSubject, tap, filter, take, switchMap } from 'rxjs';
9
8
  import * as i2 from '@acorex/platform/auth';
10
9
  import { AXPAuthStrategy, AXPSessionService, JwtUtil, TimeUtil, PkceUtil, AXPAuthModule, AXP_TENANT_LOADER, AXP_APPLICATION_LOADER, AXP_PERMISSION_LOADER, AXP_FEATURE_LOADER } from '@acorex/platform/auth';
10
+ import { AXPEntityStorageService } from '@acorex/platform/layout/entity';
11
11
  import { AXP_USER_AVATAR_PROVIDER } from '@acorex/platform/layout/components';
12
12
  import { STRATEGY_CONFIG_TOKEN } from '@acorex/platform/layout/widgets';
13
13
  import * as i1$1 from 'angular-oauth2-oidc';
@@ -25,7 +25,6 @@ class AXCApiEntityStorageService {
25
25
  this.http = http;
26
26
  this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
27
27
  this.filterService = inject(AXPFilterOperatorMiddlewareService);
28
- this.entityResolver = inject(AXPEntityResolver);
29
28
  this.mainUrl = this.configs.baseUrl;
30
29
  // API routing constants
31
30
  this.API_VERSION = 'v1';
@@ -208,6 +207,9 @@ class AXCFileStorageApiService extends AXPFileStorageService {
208
207
  if (request.path !== undefined) {
209
208
  updateData.path = request.path;
210
209
  }
210
+ if (request.name !== undefined) {
211
+ updateData.name = request.name;
212
+ }
211
213
  if (request.isPrimary !== undefined) {
212
214
  updateData.isPrimary = request.isPrimary;
213
215
  }
@@ -302,10 +304,9 @@ class AXMOidcApplicationLoader {
302
304
  this.apiGetApps = `${this.configs.baseUrl}/applications/applications-for-current-tenant`;
303
305
  this.apiSetApp = `${this.configs.baseUrl}/SetApplication`;
304
306
  }
305
- getList() {
306
- return this.http.get(this.apiGetApps).pipe(map((response) => {
307
- return response.items.map((item) => this.mapToAXPApplication(item));
308
- }));
307
+ async getList(context) {
308
+ const response = await firstValueFrom(this.http.get(this.apiGetApps));
309
+ return response.items.map((item) => this.mapToAXPApplication(item));
309
310
  }
310
311
  set(application) {
311
312
  return Promise.resolve();
@@ -332,7 +333,13 @@ class AXMOidcApplicationLoader {
332
333
  version: item.version || '1.0.0',
333
334
  description: item.description,
334
335
  logo: item.logo, // Assuming logo is of type AXPLogoConfig or undefined
335
- editionName: item.editionName,
336
+ edition: item.edition
337
+ ? {
338
+ id: item.edition.id,
339
+ title: item.edition.title,
340
+ description: item.edition.description,
341
+ }
342
+ : undefined,
336
343
  // features: item.features || [],
337
344
  };
338
345
  }
@@ -404,8 +411,8 @@ class AXMOidcFeatureLoader {
404
411
  }
405
412
  ];
406
413
  }
407
- getList() {
408
- return of(this.list).pipe(delay(0));
414
+ async getList(context) {
415
+ return this.list;
409
416
  }
410
417
  }
411
418
 
@@ -639,13 +646,40 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
639
646
  this.handleError(error);
640
647
  }
641
648
  }
649
+ /**
650
+ * Signs out the user according to OpenID Connect standards.
651
+ * Tries to call the standard OIDC end_session_endpoint if available, else falls back to configured logoutUrl.
652
+ * Falls back to root landing page on local logout if nothing is provided.
653
+ * This runs in the background (without redirecting user immediately to the endpoint).
654
+ */
642
655
  async signout() {
643
656
  localStorage.removeItem('pkce_code_verifier');
644
657
  localStorage.removeItem('oauth_provider');
645
- console.log(this.openidConfigurationInfo?.info?.discoveryDocument);
646
- // Use configured logoutUrl or derive from baseUrl
647
- const logoutUrl = this.aXMAuthConfigs.logoutUrl || `connect/logout`;
648
- window.location.href = logoutUrl;
658
+ // Standard OIDC logout: try to use end_session_endpoint if found in the discovery document
659
+ const discoveryDoc = this.openidConfigurationInfo?.info?.discoveryDocument;
660
+ let logoutUrl;
661
+ if (discoveryDoc?.end_session_endpoint) {
662
+ logoutUrl = discoveryDoc.end_session_endpoint;
663
+ // Optional: append id_token_hint, post_logout_redirect_uri or others as needed by your IdP
664
+ // For example: logoutUrl += `?post_logout_redirect_uri=${encodeURIComponent(window.location.origin)}`;
665
+ }
666
+ else if (this.aXMAuthConfigs.logoutUrl) {
667
+ logoutUrl = this.aXMAuthConfigs.logoutUrl;
668
+ }
669
+ // Call logout in the background (don't redirect)
670
+ if (logoutUrl) {
671
+ // Fire-and-forget: Create an invisible iframe to make the logout request in the background
672
+ const iframe = document.createElement('iframe');
673
+ iframe.style.display = 'none';
674
+ iframe.src = logoutUrl;
675
+ document.body.appendChild(iframe);
676
+ // Optionally, remove iframe after load
677
+ iframe.onload = () => {
678
+ setTimeout(() => document.body.removeChild(iframe), 1000);
679
+ };
680
+ }
681
+ // Always send user to landing page after local logout, regardless
682
+ window.location.href = '/';
649
683
  }
650
684
  async refreshToken(context) {
651
685
  try {
@@ -741,15 +775,16 @@ class AXMOidcPermissionLoader {
741
775
  this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
742
776
  this.apiGetConfig = `${this.configs.baseUrl}/abp/application-configuration`;
743
777
  }
744
- getList(context) {
745
- return this.http.get(this.apiGetConfig).pipe(map((response) => this.mapTo(response)));
778
+ async getList(context) {
779
+ const response = await firstValueFrom(this.http.get(this.apiGetConfig));
780
+ return this.mapTo(response);
746
781
  // if (context.user == null)
747
- // return of([]);
782
+ // return [];
748
783
  // else if (context.user.name.toLowerCase() == 'admin')
749
- // return of(['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding']);
784
+ // return ['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding'];
750
785
  // else
751
- // return of(['asc.user.gliding']);
752
- // return of(['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding']);
786
+ // return ['asc.user.gliding'];
787
+ // return ['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding'];
753
788
  }
754
789
  mapTo(jsonObj) {
755
790
  const policies = jsonObj.auth.grantedPolicies;
@@ -769,10 +804,11 @@ class AXMOidcTenantLoader {
769
804
  this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
770
805
  this.apiGetTenants = `${this.configs.baseUrl}/tenants/available-for-user`;
771
806
  }
772
- getList() {
773
- return this.http.get(this.apiGetTenants).pipe(map((response) => response.items.map((item) => {
807
+ async getList(context) {
808
+ const response = await firstValueFrom(this.http.get(this.apiGetTenants));
809
+ return response.items.map((item) => {
774
810
  return this.mapToAXPTenant(item);
775
- })));
811
+ });
776
812
  }
777
813
  async set(tenant) {
778
814
  return Promise.resolve();
@@ -810,7 +846,7 @@ class AXCApiUserAvatarProvider {
810
846
  firstName: firstName || '',
811
847
  lastName: lastName || '',
812
848
  status: 'online',
813
- avatarUrl: currentUser.avatar || `https://avatar.iran.liara.run/public/${AXPDataGenerator.pick([35, 22, 16, 6, 31])}`,
849
+ avatarUrl: currentUser.avatar || AXPDataGenerator.avatar(),
814
850
  };
815
851
  }
816
852
  // Use entity service for other users
@@ -825,229 +861,37 @@ class AXCApiUserAvatarProvider {
825
861
  firstName: firstName || '',
826
862
  lastName: lastName || '',
827
863
  status: 'online',
828
- avatarUrl: `https://avatar.iran.liara.run/public/${AXPDataGenerator.pick([35, 22, 16, 6, 31])}`,
864
+ avatarUrl: AXPDataGenerator.avatar(),
829
865
  };
830
866
  }
831
867
  }
832
868
 
833
869
  //#endregion
834
- //#region ---- Helper Functions ----
835
- // /**
836
- // * Converts a widget string to AXPWidgetsList key
837
- // */
838
- // function convertWidgetStringToAXPWidgetsListKey(
839
- // widgetString: string,
840
- // )
841
- // :
842
- // | keyof typeof AXPWidgetsList.Editors
843
- // | keyof typeof AXPWidgetsList.Layouts
844
- // | keyof typeof AXPWidgetsList.Actions
845
- // | keyof typeof AXPWidgetsList.Advanced
846
- // | keyof typeof AXPWidgetsList.Templates
847
- // | keyof typeof AXPWidgetsList.Entity
848
- // | keyof typeof AXPWidgetsList.Theme
849
- // {
850
- // console.log('Converting widget string:', widgetString);
851
- // // Check if the string is in format "AXPWidgetsList.Category.Key"
852
- // if (widgetString.startsWith('AXPWidgetsList.')) {
853
- // // Extract the key from "AXPWidgetsList.Editors.DateTimeBox" -> "DateTimeBox"
854
- // const parts = widgetString.split('.');
855
- // if (parts.length >= 3) {
856
- // const key = parts[parts.length - 1]; // Get the last part (key)
857
- // console.log('Extracted key from AXPWidgetsList format:', key);
858
- // return key as any;
859
- // }
860
- // }
861
- // // Search through all AXPWidgetsList categories to find matching widget
862
- // for (const category of Object.values(AXPWidgetsList)) {
863
- // if (typeof category === 'object') {
864
- // for (const [key, value] of Object.entries(category)) {
865
- // if (value === widgetString) {
866
- // console.log('Found matching widget:', key, 'for value:', value);
867
- // return key as any; // Return the AXPWidgetsList key (e.g., "DateTimeBox")
868
- // }
869
- // }
870
- // }
871
- // }
872
- // console.log('Widget not found in AXPWidgetsList, returning original string:', widgetString);
873
- // // If not found in AXPWidgetsList, return the original string as fallback
874
- // return widgetString as any;
875
- // }
876
- //#endregion
877
- //#region ---- Shared Data Service ----
878
- class AXCReportManagementDataService {
870
+ //#region ---- API Providers ----
871
+ class AXCReportCategoryApiProvider {
879
872
  constructor() {
880
873
  this.http = inject(HttpClient);
881
874
  this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
882
875
  this.baseUrl = this.configs.baseUrl;
883
- // Cache for category data to avoid duplicate API calls
884
- this.categoryDataCache = new Map();
885
- this.rootCategoriesCache = null;
886
- this.pendingRequests = new Map();
887
- this.pendingRootCategoriesRequest = null;
888
876
  }
889
- //#region ---- Lazy Category/Report Fetching ----
890
- /**
891
- * Fetch root categories (no parent). Only root categories without reports and children.
892
- * Uses cache and pending requests to avoid duplicate API calls.
893
- */
894
- async getRootCategories() {
895
- // Check if already cached
896
- if (this.rootCategoriesCache !== null) {
897
- return this.rootCategoriesCache;
898
- }
899
- // Check if there's already a pending request
900
- if (this.pendingRootCategoriesRequest !== null) {
901
- return this.pendingRootCategoriesRequest;
902
- }
903
- // Create the request and cache it
904
- const requestPromise = (async () => {
905
- try {
906
- const url = `${this.baseUrl}/v1/global/report-management/category`;
877
+ async getList(parentId) {
878
+ try {
879
+ let url;
880
+ if (parentId) {
881
+ url = `${this.baseUrl}/v1/global/report-management/category/${parentId}`;
882
+ const response = await firstValueFrom(this.http.get(url));
883
+ const categoryData = response.items?.[0];
884
+ const filteredItems = categoryData?.folderItems ?? [];
885
+ return filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
886
+ }
887
+ else {
888
+ url = `${this.baseUrl}/v1/global/report-management/category`;
907
889
  const params = { Skip: 0, Take: 1000 };
908
890
  const response = await firstValueFrom(this.http.get(url, { params }));
909
891
  const all = response.items ?? [];
910
892
  const rootCategories = all.filter((i) => !i.reportCategoryParentId);
911
- // Cache the result
912
- this.rootCategoriesCache = rootCategories;
913
- return rootCategories;
914
- }
915
- finally {
916
- // Remove from pending requests after completion
917
- this.pendingRootCategoriesRequest = null;
918
- }
919
- })();
920
- this.pendingRootCategoriesRequest = requestPromise;
921
- return requestPromise;
922
- }
923
- /**
924
- * Fetch category data for a given parentId.
925
- * Returns the parent category with its FolderItems (children) and ReportDefinitionItems (reports).
926
- * Uses cache to avoid duplicate API calls.
927
- */
928
- async getCategoryData(parentId) {
929
- // Check if already cached
930
- if (this.categoryDataCache.has(parentId)) {
931
- return this.categoryDataCache.get(parentId);
932
- }
933
- // Check if there's already a pending request for this category
934
- if (this.pendingRequests.has(parentId)) {
935
- return this.pendingRequests.get(parentId);
936
- }
937
- // Create the request and cache it
938
- const requestPromise = (async () => {
939
- try {
940
- const url = `${this.baseUrl}/v1/global/report-management/category/${parentId}`;
941
- const response = await firstValueFrom(this.http.get(url));
942
- const categoryData = response.items?.[0];
943
- // Cache the result
944
- this.categoryDataCache.set(parentId, categoryData);
945
- return categoryData;
946
- }
947
- catch {
948
- const undefinedResult = undefined;
949
- this.categoryDataCache.set(parentId, undefinedResult);
950
- return undefinedResult;
951
- }
952
- finally {
953
- // Remove from pending requests after completion
954
- this.pendingRequests.delete(parentId);
955
- }
956
- })();
957
- this.pendingRequests.set(parentId, requestPromise);
958
- return requestPromise;
959
- }
960
- /**
961
- * Fetch both child categories and reports for a given parentId.
962
- * This method ensures only one API call is made and both results are returned.
963
- */
964
- async getCategoryChildrenAndReports(parentId) {
965
- const categoryData = await this.getCategoryData(parentId);
966
- return {
967
- categories: categoryData?.folderItems ?? [],
968
- reports: categoryData?.reportDefinitionItems ?? [],
969
- };
970
- }
971
- /**
972
- * Fetch child categories of a given parent.
973
- * Uses getCategoryData to get FolderItems (children) from the parent category.
974
- */
975
- async getChildCategories(parentId) {
976
- const categoryData = await this.getCategoryData(parentId);
977
- return categoryData?.folderItems ?? [];
978
- }
979
- /**
980
- * Fetch report definitions that belong to a specific category.
981
- * Uses getCategoryData to get ReportDefinitionItems (reports) from the category.
982
- */
983
- async getCategoryReports(categoryId) {
984
- const categoryData = await this.getCategoryData(categoryId);
985
- return categoryData?.reportDefinitionItems ?? [];
986
- }
987
- /**
988
- * Fetch a single category by id.
989
- * First checks cache, then uses getCategoryData if not found in cache.
990
- */
991
- async getCategoryById(id) {
992
- // First check if it's in cache (from previous getCategoryData calls)
993
- if (this.categoryDataCache.has(id)) {
994
- return this.categoryDataCache.get(id);
995
- }
996
- // Try to get from category data endpoint (which will cache it)
997
- const categoryData = await this.getCategoryData(id);
998
- if (categoryData) {
999
- return categoryData;
1000
- }
1001
- // Fallback: search in root categories cache
1002
- if (this.rootCategoriesCache) {
1003
- const found = this.rootCategoriesCache.find((c) => c.id === id);
1004
- if (found) {
1005
- return found;
1006
- }
1007
- }
1008
- // Last resort: search in all categories (but this should rarely happen)
1009
- try {
1010
- const url = `${this.baseUrl}/v1/global/report-management/category`;
1011
- const params = { Skip: 0, Take: 1000 };
1012
- const response = await firstValueFrom(this.http.get(url, { params }));
1013
- const all = response.items ?? [];
1014
- return all.find((c) => c.id === id);
1015
- }
1016
- catch {
1017
- return undefined;
1018
- }
1019
- }
1020
- static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementDataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
1021
- static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementDataService }); }
1022
- }
1023
- i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementDataService, decorators: [{
1024
- type: Injectable
1025
- }] });
1026
- //#endregion
1027
- //#region ---- API Providers ----
1028
- /**
1029
- * Category provider that uses the shared data service.
1030
- * Both providers use the same dataService instance which ensures proper caching.
1031
- */
1032
- class AXCReportCategoryApiProvider {
1033
- constructor() {
1034
- this.dataService = inject(AXCReportManagementDataService);
1035
- }
1036
- async getList(parentId) {
1037
- try {
1038
- // For root level, get root categories (each category includes folderItems in API response)
1039
- if (!parentId) {
1040
- const filteredItems = await this.dataService.getRootCategories();
1041
- // Each root category has folderItems in the API response, but we only return the root categories themselves
1042
- // The folderItems are preserved in the API response structure, similar to child state
1043
- return filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
893
+ return rootCategories.map((item) => this.mapApiCategoryToReportCategory(item));
1044
894
  }
1045
- // For child level, get categories from category data (which includes folderItems)
1046
- // This ensures we use the same API response that getList for definitions will use
1047
- // The folderItems structure is preserved, similar to root state
1048
- const categoryData = await this.dataService.getCategoryData(parentId);
1049
- const filteredItems = categoryData?.folderItems ?? [];
1050
- return filteredItems.map((item) => this.mapApiCategoryToReportCategory(item));
1051
895
  }
1052
896
  catch (error) {
1053
897
  console.error('Error fetching report categories:', error);
@@ -1056,9 +900,17 @@ class AXCReportCategoryApiProvider {
1056
900
  }
1057
901
  async getById(id) {
1058
902
  try {
1059
- const apiItem = await this.dataService.getCategoryById(id);
903
+ const url = `${this.baseUrl}/v1/global/report-management/category/${id}`;
904
+ const response = await firstValueFrom(this.http.get(url));
905
+ const apiItem = response.items?.[0];
1060
906
  if (!apiItem) {
1061
- return undefined;
907
+ // Fallback: search in all categories
908
+ const allUrl = `${this.baseUrl}/v1/global/report-management/category`;
909
+ const params = { Skip: 0, Take: 1000 };
910
+ const allResponse = await firstValueFrom(this.http.get(allUrl, { params }));
911
+ const all = allResponse.items ?? [];
912
+ const found = all.find((c) => c.id === id);
913
+ return found ? this.mapApiCategoryToReportCategory(found) : undefined;
1062
914
  }
1063
915
  return this.mapApiCategoryToReportCategory(apiItem);
1064
916
  }
@@ -1073,8 +925,8 @@ class AXCReportCategoryApiProvider {
1073
925
  title: apiItem.title,
1074
926
  description: apiItem.description || undefined,
1075
927
  parentId: apiItem.reportCategoryParentId || undefined,
1076
- hasChild: apiItem.folderCount > 0, // folderItems = folders
1077
- hasReport: apiItem.itemCount > 0, // reportDefinitionItems = files
928
+ childrenCount: apiItem.folderCount ?? 0,
929
+ itemsCount: apiItem.itemCount ?? 0,
1078
930
  };
1079
931
  }
1080
932
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportCategoryApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -1083,23 +935,31 @@ class AXCReportCategoryApiProvider {
1083
935
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportCategoryApiProvider, decorators: [{
1084
936
  type: Injectable
1085
937
  }] });
1086
- /**
1087
- * Definition provider that uses the shared data service.
1088
- * Both providers use the same dataService instance which ensures proper caching.
1089
- */
1090
938
  class AXCReportDefinitionApiProvider {
1091
939
  constructor() {
1092
- this.dataService = inject(AXCReportManagementDataService);
1093
940
  this.http = inject(HttpClient);
941
+ this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
942
+ this.baseUrl = this.configs.baseUrl;
1094
943
  }
1095
944
  async getList(categoryId) {
1096
945
  try {
1097
- // Use getCategoryData which is cached and shared with getCategories
1098
- // This ensures only one API call is made when both getCategories and getReportsByCategoryId are called
1099
- const categoryData = await this.dataService.getCategoryData(categoryId);
946
+ const url = `${this.baseUrl}/v1/global/report-management/category/${categoryId}`;
947
+ const response = await firstValueFrom(this.http.get(url));
948
+ const categoryData = response.items?.[0];
1100
949
  const defs = categoryData?.reportDefinitionItems ?? [];
1101
- const reportDefinitions = defs.map((item) => this.mapApiReportDefinitionItemToReportDefinition(item));
1102
- return reportDefinitions;
950
+ // Fetch full report definitions for each item to get layouts and parameterGroups
951
+ const fullDefinitions = await Promise.all(defs.map(async (item) => {
952
+ try {
953
+ const reportUrl = `${this.baseUrl}/v1/global/report-management/report/${item.id}`;
954
+ const reportResponse = await firstValueFrom(this.http.get(reportUrl));
955
+ return this.mapApiReportDefinitionToReportDefinition(reportResponse);
956
+ }
957
+ catch {
958
+ // Fallback to item mapping if full fetch fails
959
+ return this.mapApiReportDefinitionItemToReportDefinition(item);
960
+ }
961
+ }));
962
+ return fullDefinitions;
1103
963
  }
1104
964
  catch (error) {
1105
965
  console.error('Error fetching report definitions:', error);
@@ -1108,8 +968,7 @@ class AXCReportDefinitionApiProvider {
1108
968
  }
1109
969
  async getById(id) {
1110
970
  try {
1111
- // Make API call to get full report definition with layouts
1112
- const url = `${this.dataService['baseUrl']}/v1/global/report-management/report/${id}`;
971
+ const url = `${this.baseUrl}/v1/global/report-management/report/${id}`;
1113
972
  const response = await firstValueFrom(this.http.get(url));
1114
973
  return this.mapApiReportDefinitionToReportDefinition(response);
1115
974
  }
@@ -1124,13 +983,13 @@ class AXCReportDefinitionApiProvider {
1124
983
  title: apiItem.title,
1125
984
  description: apiItem.description || undefined,
1126
985
  categoryIds: apiItem.categoryIds,
1127
- parameterGroups: [], // These would need to be fetched separately if needed
1128
- layouts: [], // These would need to be fetched separately if needed
1129
- defaultLayoutId: '', // This would need to be set based on the first layout
986
+ parameterGroups: [],
987
+ layouts: [],
988
+ defaultLayoutId: '',
1130
989
  };
1131
990
  }
1132
991
  mapApiReportDefinitionToReportDefinition(apiResponse) {
1133
- let res = {
992
+ return {
1134
993
  id: apiResponse.id,
1135
994
  title: apiResponse.title,
1136
995
  description: apiResponse.description || undefined,
@@ -1159,7 +1018,6 @@ class AXCReportDefinitionApiProvider {
1159
1018
  })),
1160
1019
  defaultLayoutId: apiResponse.defaultLayoutId,
1161
1020
  };
1162
- return res;
1163
1021
  }
1164
1022
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportDefinitionApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
1165
1023
  static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportDefinitionApiProvider }); }
@@ -1168,13 +1026,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
1168
1026
  type: Injectable
1169
1027
  }] });
1170
1028
  //#endregion
1171
- //#endregion
1172
1029
  //#region ---- Provider Exports ----
1173
- /**
1174
- * Both providers use the same dataService instance (which is a singleton),
1175
- * ensuring they share the same cache and only one API call is made when both
1176
- * getCategories and getReportsByCategoryId are called for the same categoryId.
1177
- */
1178
1030
  const AXC_REPORT_CATEGORY_API_PROVIDER = {
1179
1031
  provide: AXP_REPORT_CATEGORY_PROVIDER,
1180
1032
  useClass: AXCReportCategoryApiProvider,
@@ -1190,14 +1042,13 @@ class AXCReportManagementApiModule {
1190
1042
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
1191
1043
  static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementApiModule, imports: [AXPRuntimeModule] }); }
1192
1044
  static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCReportManagementApiModule, providers: [
1193
- AXCReportManagementDataService,
1194
1045
  AXC_REPORT_CATEGORY_API_PROVIDER,
1195
1046
  AXC_REPORT_DEFINITION_API_PROVIDER,
1196
1047
  provideCommandSetups([
1197
1048
  {
1198
1049
  key: 'ReportManagement.Report:Execute',
1199
- command: () => import('./acorex-connectivity-api-execute.command-BwXw_Kn7.mjs').then((c) => c.AXCReportExecuteCommand),
1200
- },
1050
+ command: () => import('./acorex-connectivity-api-execute.command-SGNBLcOi.mjs').then((c) => c.AXCReportExecuteCommand),
1051
+ }
1201
1052
  ]),
1202
1053
  ], imports: [AXPRuntimeModule] }); }
1203
1054
  }
@@ -1208,14 +1059,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
1208
1059
  exports: [],
1209
1060
  declarations: [],
1210
1061
  providers: [
1211
- AXCReportManagementDataService,
1212
1062
  AXC_REPORT_CATEGORY_API_PROVIDER,
1213
1063
  AXC_REPORT_DEFINITION_API_PROVIDER,
1214
1064
  provideCommandSetups([
1215
1065
  {
1216
1066
  key: 'ReportManagement.Report:Execute',
1217
- command: () => import('./acorex-connectivity-api-execute.command-BwXw_Kn7.mjs').then((c) => c.AXCReportExecuteCommand),
1218
- },
1067
+ command: () => import('./acorex-connectivity-api-execute.command-SGNBLcOi.mjs').then((c) => c.AXCReportExecuteCommand),
1068
+ }
1219
1069
  ]),
1220
1070
  ],
1221
1071
  }]
@@ -1590,9 +1440,92 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
1590
1440
  type: Injectable
1591
1441
  }], ctorParameters: () => [] });
1592
1442
 
1443
+ //#region ---- Imports ----
1444
+ //#endregion
1445
+ //#region ---- API Providers ----
1446
+ class AXCSystemInsightReportCategoryApiProvider {
1447
+ constructor() {
1448
+ this.http = inject(HttpClient);
1449
+ }
1450
+ async getList(parentId) {
1451
+ try {
1452
+ // Call API to get report categories
1453
+ const params = {};
1454
+ if (parentId) {
1455
+ params.parentId = parentId;
1456
+ }
1457
+ const response = await firstValueFrom(this.http.get('/api/system-insight/report-categories', { params }));
1458
+ return response;
1459
+ }
1460
+ catch (error) {
1461
+ console.error('Failed to fetch system insight report categories from API:', error);
1462
+ return [];
1463
+ }
1464
+ }
1465
+ async getById(id) {
1466
+ try {
1467
+ const response = await firstValueFrom(this.http.get(`/api/system-insight/report-categories/${id}`));
1468
+ return response;
1469
+ }
1470
+ catch (error) {
1471
+ console.error(`Failed to fetch system insight report category ${id} from API:`, error);
1472
+ return undefined;
1473
+ }
1474
+ }
1475
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportCategoryApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
1476
+ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportCategoryApiProvider }); }
1477
+ }
1478
+ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportCategoryApiProvider, decorators: [{
1479
+ type: Injectable
1480
+ }] });
1481
+ class AXCSystemInsightReportDefinitionApiProvider {
1482
+ constructor() {
1483
+ this.http = inject(HttpClient);
1484
+ }
1485
+ async getList(categoryId) {
1486
+ try {
1487
+ const response = await firstValueFrom(this.http.get(`/api/system-insight/report-definitions`, {
1488
+ params: { categoryId }
1489
+ }));
1490
+ return response;
1491
+ }
1492
+ catch (error) {
1493
+ console.error(`Failed to fetch system insight report definitions for category ${categoryId} from API:`, error);
1494
+ return [];
1495
+ }
1496
+ }
1497
+ async getById(id) {
1498
+ try {
1499
+ const response = await firstValueFrom(this.http.get(`/api/system-insight/report-definitions/${id}`));
1500
+ return response;
1501
+ }
1502
+ catch (error) {
1503
+ console.error(`Failed to fetch system insight report definition ${id} from API:`, error);
1504
+ return undefined;
1505
+ }
1506
+ }
1507
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportDefinitionApiProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
1508
+ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportDefinitionApiProvider }); }
1509
+ }
1510
+ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXCSystemInsightReportDefinitionApiProvider, decorators: [{
1511
+ type: Injectable
1512
+ }] });
1513
+ //#endregion
1514
+ //#region ---- Provider Exports ----
1515
+ const AXC_SYSTEM_INSIGHT_REPORT_CATEGORY_API_PROVIDER = {
1516
+ provide: AXP_REPORT_CATEGORY_PROVIDER,
1517
+ useClass: AXCSystemInsightReportCategoryApiProvider,
1518
+ multi: true,
1519
+ };
1520
+ const AXC_SYSTEM_INSIGHT_REPORT_DEFINITION_API_PROVIDER = {
1521
+ provide: AXP_REPORT_DEFINITION_PROVIDER,
1522
+ useClass: AXCSystemInsightReportDefinitionApiProvider,
1523
+ multi: true,
1524
+ };
1525
+
1593
1526
  /**
1594
1527
  * Generated bundle index. Do not edit.
1595
1528
  */
1596
1529
 
1597
- 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 };
1530
+ 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 };
1598
1531
  //# sourceMappingURL=acorex-connectivity-api.mjs.map