fix: limits check should also support unlimited agreements (#806)

sovity · Aug 28, 2024 · 1c945e9 · 1c945e9
1 parent 9ab4084
commit 1c945e9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts
@@ -48,7 +48,10 @@ export class AssetDetailDialogDataService {
     };
   }
 
-  dataOfferDetails(dataOffer: DataOffer): AssetDetailDialogData {
+  dataOfferDetails(
+    dataOffer: DataOffer,
+    consumingLimitsExceeded: boolean,
+  ): AssetDetailDialogData {
     const asset = dataOffer.asset;
     const propertyGridGroups = [
       this.assetPropertyGridGroupBuilder.buildAssetPropertiesGroup(asset, null),
@@ -66,6 +69,7 @@ export class AssetDetailDialogDataService {
       asset: asset,
       dataOffer,
       propertyGridGroups,
+      consumingLimitsExceeded,
     };
   }
 

diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.ts
@@ -8,6 +8,7 @@ export interface AssetDetailDialogData {
   propertyGridGroups: PropertyGridGroup[];
   asset: UiAssetMapped;
   dataOffer?: DataOffer;
+  consumingLimitsExceeded?: boolean;
   contractAgreement?: ContractAgreementCardMapped;
   showDeleteButton?: boolean;
   showEditButton?: boolean;

diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
@@ -101,16 +101,9 @@ export class AssetDetailDialogComponent implements OnDestroy {
 
   setData(data: AssetDetailDialogData) {
     this.data = data;
+    this.limitsExceeded = data.consumingLimitsExceeded ?? null;
     this.asset = this.data.asset;
     this.propGroups = this.data.propertyGridGroups;
-
-    if (this.limitsExceeded == null && this.data.type === 'data-offer') {
-      this.connectorLimitsService
-        .isConsumingAgreementLimitExceeded()
-        .subscribe((limitsExceeded) => {
-          this.limitsExceeded = limitsExceeded;
-        });
-    }
   }
 
   onContactClick() {

diff --git a/src/app/core/services/connector-limits.service.ts b/src/app/core/services/connector-limits.service.ts
@@ -26,6 +26,6 @@ export class ConnectorLimitsService {
     const max = limits.maxActiveConsumingContractAgreements;
     const current = limits.numActiveConsumingContractAgreements;
 
-    return max != null && current >= max;
+    return max != null && max >= 0 && current >= max;
   };
 }
diff --git a/.../connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts b/.../connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
@@ -7,10 +7,12 @@ import {
   Subject,
   distinctUntilChanged,
   sampleTime,
+  switchMap,
 } from 'rxjs';
 import {filter, map} from 'rxjs/operators';
 import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
 import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
+import {ConnectorLimitsService} from '../../../../core/services/connector-limits.service';
 import {DataOffer} from '../../../../core/services/models/data-offer';
 import {value$} from '../../../../core/utils/form-group-utils';
 import {CatalogBrowserFetchDetailDialogComponent} from '../catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component';
@@ -38,6 +40,7 @@ export class CatalogBrowserPageComponent implements OnInit, OnDestroy {
     private catalogBrowserPageService: CatalogBrowserPageService,
     private catalogApiUrlService: CatalogApiUrlService,
     private matDialog: MatDialog,
+    private connectorLimitsService: ConnectorLimitsService,
   ) {}
 
   ngOnInit(): void {
@@ -54,10 +57,18 @@ export class CatalogBrowserPageComponent implements OnInit, OnDestroy {
   }
 
   onDataOfferClick(dataOffer: DataOffer) {
-    const data = this.assetDetailDialogDataService.dataOfferDetails(dataOffer);
-    this.assetDetailDialogService
-      .open(data, this.ngOnDestroy$)
-      .pipe(filter((it) => !!it?.refreshList))
+    this.connectorLimitsService
+      .isConsumingAgreementLimitExceeded()
+      .pipe(
+        switchMap((isConsumingLimitsExceeded) => {
+          const data = this.assetDetailDialogDataService.dataOfferDetails(
+            dataOffer,
+            isConsumingLimitsExceeded,
+          );
+          return this.assetDetailDialogService.open(data, this.ngOnDestroy$);
+        }),
+        filter((it) => !!it?.refreshList),
+      )
       .subscribe(() => this.fetch$.next(null));
   }