Merge branch 'develop'

Author: ppelgmv

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "inesdata-connector-interface",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "project": "com.gmv.inesdata",
   "scripts": {
     "ng": "ng",
@@ -14,17 +14,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.1.2",
+    "@angular/animations": "^17.3.11",
     "@angular/cdk": "~15.2.9",
-    "@angular/common": "^17.1.2",
-    "@angular/compiler": "^17.1.2",
-    "@angular/core": "^17.1.2",
+    "@angular/common": "^17.3.11",
+    "@angular/compiler": "^17.3.11",
+    "@angular/core": "^17.3.11",
     "@angular/flex-layout": "~15.0.0-beta.42",
     "@angular/forms": "^17.3.4",
     "@angular/material": "~15.2.9",
-    "@angular/platform-browser": "^17.1.2",
-    "@angular/platform-browser-dynamic": "^17.1.2",
-    "@angular/router": "^17.1.2",
+    "@angular/platform-browser": "^17.3.11",
+    "@angular/platform-browser-dynamic": "^17.3.11",
+    "@angular/router": "^17.3.11",
     "@auth0/angular-jwt": "^5.2.0",
     "@ckeditor/ckeditor5-angular": "^7.0.1",
     "@ckeditor/ckeditor5-build-classic": "^43.1.0",
@@ -52,9 +52,9 @@
     "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.1.2",
-    "@angular/cli": "^17.1.2",
-    "@angular/compiler-cli": "^17.1.2",
+    "@angular-devkit/build-angular": "^17.3.11",
+    "@angular/cli": "^17.3.11",
+    "@angular/compiler-cli": "^17.3.11",
     "@types/jasmine": "~4.0.3",
     "@types/jsonld": "^1.5.13",
     "@types/node": "^20.8.7",

package.json

@@ -105,7 +105,7 @@ export function jwtOptionsFactory(authService: AuthService) {
     },
     {
       provide: 'TRANSFER_TYPES',
-      useFactory: () => [{id: DATA_ADDRESS_TYPES.httpData, name: DATA_ADDRESS_TYPES.httpData}, {id: DATA_ADDRESS_TYPES.amazonS3, name: 'ExternalStoreS3'}, {id: DATA_ADDRESS_TYPES.inesDataStore, name: DATA_ADDRESS_TYPES.inesDataStore}],
+      useFactory: () => [{id: DATA_ADDRESS_TYPES.amazonS3, name: 'ExternalStoreS3'}, {id: DATA_ADDRESS_TYPES.inesDataStore, name: DATA_ADDRESS_TYPES.inesDataStore}],
     },
     { provide: HTTP_INTERCEPTORS, useClass: Oauth2Interceptor, multi: true },
     {

src/app/app.module.ts

@@ -64,7 +64,7 @@
       </div>
     </mat-tab>
 
-    <mat-tab label="Detailed information" *ngIf="vocabularies?.length > 0">
+    <mat-tab label="Detailed information" *ngIf="vocabularies?.length > 0 && ((defaultVocabularies?.length>0 && defaultForms?.length>0) || selectedVocabularies?.length>0)">
       <mat-tab-group animationDuration="0ms" mat-stretch-tabs="false" mat-align-tabs="start">
         <mat-tab label="Default information" *ngIf="defaultVocabularies?.length>0 && defaultForms?.length>0">
           <div class="asset-creation-vocabularies">
@@ -140,7 +140,7 @@
 
           <mat-form-field class="form-field" color="accent">
             <mat-label>Base URL</mat-label>
-            <input [(ngModel)]="httpDataAddress.baseUrl" [pattern]="urlPattern" matInput required>
+            <input [(ngModel)]="httpDataAddress.baseUrl" matInput required>
           </mat-form-field>
 
           <mat-form-field class="form-field" color="accent">
@@ -197,7 +197,7 @@
 
           <mat-form-field class="form-field" color="accent">
             <mat-label>Bucket Name</mat-label>
-            <input [(ngModel)]="amazonS3DataAddress.bucketName" matInput>
+            <input required [(ngModel)]="amazonS3DataAddress.bucketName" matInput>
           </mat-form-field>
 
           <mat-form-field class="form-field" color="accent">
@@ -212,17 +212,17 @@
 
           <mat-form-field class="form-field" color="accent">
             <mat-label>Access Key Id</mat-label>
-            <input [(ngModel)]="amazonS3DataAddress.accessKeyId" matInput>
+            <input required [(ngModel)]="amazonS3DataAddress.accessKeyId" matInput>
           </mat-form-field>
 
           <mat-form-field class="form-field" color="accent">
             <mat-label>Secret Access Key</mat-label>
-            <input [(ngModel)]="amazonS3DataAddress.secretAccessKey" matInput>
+            <input required [(ngModel)]="amazonS3DataAddress.secretAccessKey" matInput>
           </mat-form-field>
 
           <mat-form-field class="form-field" color="accent">
             <mat-label>Endpoint Override</mat-label>
-            <input [(ngModel)]="amazonS3DataAddress.endpointOverride" matInput>
+            <input required [(ngModel)]="amazonS3DataAddress.endpointOverride" matInput>
           </mat-form-field>
         </div>
 

src/app/pages/assets/asset-create/asset-create.component.html

@@ -103,8 +103,6 @@ export class AssetCreateComponent implements OnInit {
   config = CKEDITOR_CONFIG
   selectedAssetTypeVocabularies: Vocabulary[]
 
-  urlPattern: RegExp = /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)$/;
-
   private fetch$ = new BehaviorSubject(null);
 
   ngOnInit(): void {
@@ -295,7 +293,7 @@ export class AssetCreateComponent implements OnInit {
       if (this.storageTypeId === DATA_ADDRESS_TYPES.httpData && (!this.httpDataAddress.name || !this.httpDataAddress.baseUrl || !this.validateUrl())) {
         return false;
       }
-      if (this.storageTypeId === DATA_ADDRESS_TYPES.amazonS3 && !this.amazonS3DataAddress.region) {
+      if (this.storageTypeId === DATA_ADDRESS_TYPES.amazonS3 && (!this.amazonS3DataAddress.region || !this.amazonS3DataAddress.accessKeyId || !this.amazonS3DataAddress.secretAccessKey || !this.amazonS3DataAddress.bucketName || !this.amazonS3DataAddress.endpointOverride)) {
         return false;
       } else if (this.storageTypeId === DATA_ADDRESS_TYPES.inesDataStore && !this.inesDataStoreAddress.file) {
         return false;
@@ -370,8 +368,12 @@ export class AssetCreateComponent implements OnInit {
   }
 
   validateUrl(): boolean {
-    const regex = new RegExp(this.urlPattern);
-    return regex.test(this.httpDataAddress.baseUrl);
+    try {
+      var url = new URL(this.httpDataAddress.baseUrl);
+    } catch (e) {
+      return false;
+    }
+    return url.protocol === "http:" || url.protocol === "https:";
   }
 
 

src/app/pages/assets/asset-create/asset-create.component.ts

@@ -17,7 +17,7 @@ import { Router } from '@angular/router';
 })
 export class AssetViewerComponent implements OnInit {
 
-  assets: Asset[];
+  assets: Asset[] = [];
 
   isTransferring = false;
   private fetch$ = new BehaviorSubject(null);

src/app/pages/assets/asset-viewer/asset-viewer.component.ts

@@ -15,7 +15,7 @@ import { Router } from '@angular/router';
 })
 export class CatalogBrowserComponent implements OnInit {
 
-  dataOffers: DataOffer[];
+  dataOffers: DataOffer[] = [];
 
   // Pagination
   pageSize = 10;

src/app/pages/catalog/catalog-browser/catalog-browser.component.ts

@@ -174,4 +174,5 @@ mat-expansion-panel-header {
 mat-card-actions {
   padding-right: 10px !important;
   padding-bottom: 15px !important;
+  text-align: end !important;
 }

src/app/pages/catalog/contract-offers-viewer/contract-offers-viewer.component.scss

@@ -13,6 +13,7 @@ import { JsonDialogData } from '../../json-dialog/json-dialog/json-dialog.data';
 import { JsonDialogComponent } from '../../json-dialog/json-dialog/json-dialog.component'
 import { PolicyBuilder } from '@think-it-labs/edc-connector-client';
 import { Router } from '@angular/router';
+import { catchError, filter, from, interval, of, switchMap, takeUntil, tap, timer } from 'rxjs';
 
 export interface ContractOffersDialogData {
   assetId: string;
@@ -192,48 +193,66 @@ export class ContractOffersViewerComponent {
         offerId: initiateRequest.policy["@id"]
       });
 
-
-      if (!this.pollingHandleNegotiation) {
-        this.checkActiveNegotiations();
-      }
+      this.checkActiveNegotiations(negotiationId, initiateRequest.policy["@id"]);
     }, error => {
       console.error(error);
       this.notificationService.showError("Error starting negotiation");
     });
   }
 
-  checkActiveNegotiations() {
-    // there are no active negotiations
-    this.pollingHandleNegotiation = setInterval(() => {
-
-      const finishedNegotiationStates = [
-        "VERIFIED",
-        "TERMINATED",
-        "FINALIZED",
-        "ERROR"];
-
-      for (const negotiation of this.runningNegotiations.values()) {
-        this.apiService.getNegotiationState(negotiation.id).subscribe(updatedNegotiation => {
-          if (finishedNegotiationStates.includes(updatedNegotiation.state)) {
-            let offerId = negotiation.offerId;
+  checkActiveNegotiations(negotiationId: string, offerId: string) {
+    const timeout$ = timer(30000).pipe(
+      tap(() => {
+        if (this.runningNegotiations.has(offerId)) {
+          this.notificationService.showWarning(
+            `Negotiation [${negotiationId}] timed out after 30 seconds.`
+          );
+          this.runningNegotiations.delete(offerId);
+        }
+      })
+    );
+
+    this.pollingHandleNegotiation = interval(2000).pipe(
+      takeUntil(timeout$),
+      switchMap(() => from([...this.runningNegotiations.values()])),
+      switchMap(negotiation =>
+        this.apiService.getNegotiationState(negotiation.id).pipe(
+          catchError(error => {
+            console.error("Polling error:", error);
+            this.notificationService.showError("Error polling negotiation");
+            this.runningNegotiations.delete(negotiation.offerId);
+            return of(null);
+          })
+        )
+      ),
+      filter(updatedNegotiation => updatedNegotiation !== null),
+      tap(updatedNegotiation => {
+        const finishedStates = ["VERIFIED", "TERMINATED", "FINALIZED", "ERROR"];
+        if (finishedStates.includes(updatedNegotiation.state)) {
             this.runningNegotiations.delete(offerId);
+
+          if (updatedNegotiation.state === "VERIFIED" || updatedNegotiation.state === "FINALIZED") {
+            this.finishedNegotiations.set(offerId, updatedNegotiation);
+            this.notificationService.showInfo("Contract Negotiation complete!");
+          } else if (updatedNegotiation.state === "TERMINATED") {
             const errorDetail = updatedNegotiation.optionalValue("edc", "errorDetail");
-            if (updatedNegotiation["state"] === "VERIFIED" || updatedNegotiation["state"] === "FINALIZED") {
-              this.finishedNegotiations.set(offerId, updatedNegotiation);
-              this.notificationService.showInfo("Contract Negotiation complete!");
-            } else if (updatedNegotiation["state"] === "TERMINATED" && typeof errorDetail === 'string' &&  errorDetail.includes("Contract offer is not valid")) {
+            if (typeof errorDetail === 'string' && errorDetail.includes("Contract offer is not valid")) {
               this.finishedNegotiations.set(offerId, updatedNegotiation);
               this.notificationService.showError("Contract offer is not valid.");
             }
           }
 
           if (this.runningNegotiations.size === 0) {
-            clearInterval(this.pollingHandleNegotiation);
-            this.pollingHandleNegotiation = undefined;
+            this.cleanupPolling();
           }
-        });
-      }
-    }, 1000);
+        }
+      })
+    ).subscribe();
+  }
+
+  private cleanupPolling() {
+    this.pollingHandleNegotiation?.unsubscribe();
+    this.pollingHandleNegotiation = undefined;
   }
 
   getJsonPolicy(policy: Policy): any {

src/app/pages/catalog/contract-offers-viewer/contract-offers-viewer.component.ts

@@ -17,7 +17,7 @@ import { Router } from '@angular/router';
 })
 export class ContractDefinitionViewerComponent implements OnInit {
 
-  contractDefinitions: ContractDefinition[];
+  contractDefinitions: ContractDefinition[] = [];
   private fetch$ = new BehaviorSubject(null);
 
   // Pagination