chore: minor code refactoring with renaming functions

sovity · Jul 3, 2023 · cd4bcf5 · cd4bcf5
1 parent dbb1441
commit cd4bcf5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
@@ -101,7 +101,7 @@
         "
         mat-raised-button
         color="primary"
-        [disabled]="data.contractAgreement?.statusText == 'Inactive'"
+        [disabled]="!data.contractAgreement?.canTransfer"
         (click)="onTransferClick()">
         Transfer
       </button>

diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts
@@ -6,21 +6,25 @@ import {Policy} from '../../../core/services/api/legacy-managent-api-client';
 import {AssetProperties} from '../../../core/services/asset-properties';
 import {Asset} from '../../../core/services/models/asset';
 import {BrokerDataOffer} from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer';
-import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped';
+import {
+  ContractAgreementCardMapped
+} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped';
 import {JsonDialogComponent} from '../../json-dialog/json-dialog/json-dialog.component';
 import {JsonDialogData} from '../../json-dialog/json-dialog/json-dialog.data';
 import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group';
 import {PropertyGridField} from '../../property-grid/property-grid/property-grid-field';
 import {PropertyGridFieldService} from '../../property-grid/property-grid/property-grid-field.service';
 import {formatDateAgo} from '../../ui-elements/ago/formatDateAgo';
 
+
 @Injectable()
 export class AssetPropertyGridGroupBuilder {
   constructor(
     private matDialog: MatDialog,
     private activeFeatureSet: ActiveFeatureSet,
     private propertyGridUtils: PropertyGridFieldService,
-  ) {}
+  ) {
+  }
 
   buildAssetPropertiesGroup(
     asset: Asset,
@@ -236,8 +240,7 @@ export class AssetPropertyGridGroupBuilder {
   }
 
   buildContractAgreementGroup(contractAgreement: ContractAgreementCardMapped) {
-    let properties: PropertyGridField[] = [];
-    properties = [
+    let properties: PropertyGridField[] = [
       {
         icon: 'category',
         label: 'Signed',
@@ -288,6 +291,7 @@ export class AssetPropertyGridGroupBuilder {
         ),
       },
     ];
+
     if (contractAgreement.isConsumingLimitsEnforced) {
       properties.push({
         icon: 'info',

diff --git a/src/app/component-library/property-grid/property-grid/property-grid.component.html b/src/app/component-library/property-grid/property-grid/property-grid.component.html
@@ -9,15 +9,15 @@
   <!-- Property Icon -->
   <mat-icon
     style="flex-shrink: 0; margin-top: 6px"
-    matTooltip="{{ prop.tooltip }}"
+   [matTooltip]="prop.tooltip!"
     [attr.title]="prop.labelTitle"
     >{{ prop.icon }}</mat-icon
   >
   <div class="flex flex-col">
     <!-- Property Label -->
     <div
       class="uppercase text-slate text-sm break-all"
-      matTooltip="{{ prop.tooltip }}"
+     [matTooltip]="prop.tooltip!"
       [attr.title]="prop.labelTitle">
       {{ prop.label }}
     </div>
@@ -46,11 +46,11 @@
     <!-- Property Value (Text) with tooltip -->
     <span
       *ngIf="!(prop.url || prop.onclick)"
-      matTooltip="{{ prop.tooltip }}"
+     [matTooltip]="prop.tooltip!"
       [ngClass]="prop.additionalClasses"
       >{{ prop.text }}
       <mat-icon *ngIf="prop.tooltip" class="mat-icon-[10px]"
-        >info
+        >{{prop.icon}}
       </mat-icon></span
     >
   </div>

diff --git a/...ontract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped.service.ts b/...ontract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped.service.ts
@@ -31,6 +31,7 @@ export class ContractAgreementCardMappedService {
       isConsumingLimitsEnforced: false,
       statusText: '',
       statusTooltipText: '',
+      canTransfer: true,
       searchTargets: [
         contractAgreement.contractAgreementId,
         contractAgreement.counterPartyId,
@@ -47,7 +48,7 @@ export class ContractAgreementCardMappedService {
     return search(cards, searchText, (card) => card.searchTargets);
   }
 
-  setStatus(
+  withEnforcedLimits(
     maxConsumingContracts: number,
     agreements: ContractAgreementCardMapped[],
   ): ContractAgreementCardMapped[] {
@@ -59,6 +60,7 @@ export class ContractAgreementCardMappedService {
         index,
         maxConsumingContracts,
       ),
+      canTransfer: index < maxConsumingContracts,
     }));
   }
 
@@ -67,11 +69,9 @@ export class ContractAgreementCardMappedService {
     maxConsumingContracts: number,
   ): string {
     if (index >= maxConsumingContracts) {
-      if (maxConsumingContracts == 1) {
-        return `This connector is configured with a limit of ${maxConsumingContracts} active consuming contract agreement, causing contract agreement to get disabled if new ones are negotiated.`;
-      } else {
-        return `This connector is configured with a limit of ${maxConsumingContracts} active consuming contract agreements, causing contract agreements to get disabled if new ones are negotiated.`;
-      }
+      return `This connector is licensed for a maximum number of ${maxConsumingContracts} consuming contract${
+        maxConsumingContracts == 1 ? '' : 's'
+      }. When negotiating new contracts, older contracts will be deactivated.`;
     } else {
       return '';
     }

diff --git a/...tor-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped.ts b/...tor-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped.ts
@@ -10,5 +10,6 @@ export type ContractAgreementCardMapped = Omit<
   isConsumingLimitsEnforced: boolean;
   statusText: string;
   statusTooltipText: string;
+  canTransfer: boolean;
   searchTargets: (string | null)[];
 };
diff --git a/...tor-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.service.ts b/...tor-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.service.ts
@@ -13,6 +13,7 @@ import {ContractAgreementCardMapped} from '../contract-agreement-cards/contract-
 import {ContractAgreementCardMappedService} from '../contract-agreement-cards/contract-agreement-card-mapped.service';
 import {ContractAgreementPageData} from './contract-agreement-page.data';
 
+
 @Injectable({providedIn: 'root'})
 export class ContractAgreementPageService {
   constructor(
@@ -80,7 +81,7 @@ export class ContractAgreementPageService {
       connectorLimits.maxActiveConsumingContractAgreements >= 0;
     if (isConsumingLimitsEnforced) {
       consumingContractAgreements =
-        this.contractAgreementCardMappedService.setStatus(
+        this.contractAgreementCardMappedService.withEnforcedLimits(
           connectorLimits?.maxActiveConsumingContractAgreements!,
           consumingContractAgreements,
         );