chore: run formatting and updated CHANGELOG.md

sovity · Jun 28, 2023 · 8508441 · 8508441
1 parent de7587b
commit 8508441
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ the detailed section referring to by linking pull requests or issues.
 
 #### Added
 
+- Added connector limit restriction to Enterprise Edition Connectors
+
 #### Changed
 
 #### Removed

diff --git a/fake-backend/json/contractAgreementPage.json b/fake-backend/json/contractAgreementPage.json
@@ -3,7 +3,7 @@
     {
       "contractAgreementId": "my-own-asset-cd:f52a5d30-6356-4a55-a75a-3c45d7a88c3e",
       "direction": "PROVIDING",
-      "counterPartyAddress": "http://edc2:11003/api/v1/ids/data/blaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+      "counterPartyAddress": "http://edc2:11003/api/v1/ids/data",
       "counterPartyId": "urn:connector:example-connector",
       "contractSigningDate": "2022-03-20T11:18:59.659Z",
       "contractStartDate": "2022-03-20T11:18:59.659Z",
@@ -110,7 +110,7 @@
     {
       "contractAgreementId": "my-test-asset-cd:6ebbc301-9b1e-4cd7-9f17-97b5b7867531",
       "direction": "CONSUMING",
-      "counterPartyAddress": "http://edc2:11003/api/v1/ids/data/blaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+      "counterPartyAddress": "http://edc2:11003/api/v1/ids/data",
       "counterPartyId": "my-connector",
       "contractSigningDate": "2022-03-25T11:18:59.659Z",
       "contractStartDate": "2022-03-25T11:18:59.659Z",
@@ -181,7 +181,7 @@
     {
       "contractAgreementId": "my-test-asset-2-cd:6ebbc301-9b1e-4cd7-9f17-08b5b7867533",
       "direction": "CONSUMING",
-      "counterPartyAddress": "http://edc2:11003/api/v1/ids/data/blaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+      "counterPartyAddress": "http://edc2:11003/api/v1/ids/data",
       "counterPartyId": "my-connector",
       "contractSigningDate": "2022-03-25T11:18:59.659Z",
       "contractStartDate": "2022-03-25T11:18:59.659Z",

diff --git a/src/app/core/services/api/edc-api.service.ts b/src/app/core/services/api/edc-api.service.ts
@@ -3,12 +3,13 @@ import {Observable, from} from 'rxjs';
 import {
   CatalogPageQuery,
   CatalogPageResult,
+  ConnectorLimits,
   ConnectorPageQuery,
   ConnectorPageResult,
   ContractAgreementPage,
   EdcClient,
   KpiResult,
-  buildEdcClient, ConnectorLimits,
+  buildEdcClient,
 } from '@sovity.de/edc-client';
 import {APP_CONFIG, AppConfig} from '../../config/app-config';
 

diff --git a/src/app/core/services/api/legacy-managent-api-client/api/catalog.service.ts b/src/app/core/services/api/legacy-managent-api-client/api/catalog.service.ts
@@ -1,4 +1,5 @@
 // @ts-nocheck
+
 /**
  * EDC REST API
  * All files merged by open api merger

diff --git a/.../contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html b/.../contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
@@ -94,28 +94,36 @@
             *ngIf="card.isActivated && card.connectorMaxLimit! > 1"
             class="text-right"
             data-toggle="tooltip"
-            title="Be aware that only transferring of the {{card.connectorMaxLimit}} newest consuming contract agreements are allowed.">
+            title="Be aware that only transferring of the {{
+              card.connectorMaxLimit
+            }} newest consuming contract agreements are allowed.">
             {{ 'Activated' }}
           </div>
           <div
             *ngIf="!card.isActivated && card.connectorMaxLimit! > 1"
             class="text-right"
             data-toggle="tooltip"
-            title="Be aware that only transferring of the {{card.connectorMaxLimit}} newest consuming contract agreements are allowed.">
+            title="Be aware that only transferring of the {{
+              card.connectorMaxLimit
+            }} newest consuming contract agreements are allowed.">
             {{ 'Deactivated' }}
           </div>
           <div
             *ngIf="card.isActivated && card.connectorMaxLimit === 1"
             class="text-right"
             data-toggle="tooltip"
-            title="Be aware that only transferring of the {{card.connectorMaxLimit}} newest consuming contract agreement is allowed.">
+            title="Be aware that only transferring of the {{
+              card.connectorMaxLimit
+            }} newest consuming contract agreement is allowed.">
             {{ 'Activated' }}
           </div>
           <div
             *ngIf="!card.isActivated && card.connectorMaxLimit === 1"
             class="text-right"
             data-toggle="tooltip"
-            title="Be aware that only transferring of the {{card.connectorMaxLimit}} newest consuming contract agreement is allowed.">
+            title="Be aware that only transferring of the {{
+              card.connectorMaxLimit
+            }} newest consuming contract agreement is allowed.">
             {{ 'Deactivated' }}
           </div>
         </div>

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
@@ -73,13 +73,13 @@ export class ContractAgreementPageService {
     );
 
     if (connectorLimits?.maxActiveConsumingContractAgreements != null) {
-      consumingContractAgreements.map(
-        (it) =>
-        {it.isActivated =
-            consumingContractAgreements.indexOf(it) <
-            connectorLimits?.maxActiveConsumingContractAgreements!;
-        it.connectorMaxLimit = connectorLimits?.maxActiveConsumingContractAgreements!;}
-      );
+      consumingContractAgreements.map((it) => {
+        it.isActivated =
+          consumingContractAgreements.indexOf(it) <
+          connectorLimits?.maxActiveConsumingContractAgreements!;
+        it.connectorMaxLimit =
+          connectorLimits?.maxActiveConsumingContractAgreements!;
+      });
     }
 
     return {