Merge branch 'bugfix/defects' into 'develop'

bugfix/defects

See merge request upm-inesdata/inesdata-connector-interface!49

Author: ralconada-gmv

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

@@ -293,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;

src/app/pages/contracts/contract-viewer/contract-viewer.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ContractAgreementService } from "../../../shared/services/contractAgreement.service";
-import { firstValueFrom, from, interval, Observable, of, timer } from "rxjs";
+import { firstValueFrom, from, interval, Observable, of, timer, Subscription } from "rxjs";
 import { ContractAgreement, IdResponse, TransferProcessInput } from "../../../shared/models/edc-connector-entities";
 import { catchError, filter, finalize, first, switchMap, takeUntil, tap } from "rxjs/operators";
 import { NotificationService } from "../../../shared/services/notification.service";
@@ -32,6 +32,7 @@ export class ContractViewerComponent implements OnInit {
   contracts: ContractAgreement[] = [];
   private runningTransfers: RunningTransferProcess[] = [];
   private pollingHandleTransfer?: any;
+  private timeoutSubscription?: Subscription;
   PARTICIPANT_ID = `${environment.runtime.participantId}`;
 
   // Pagination
@@ -203,22 +204,23 @@ export class ContractViewerComponent implements OnInit {
       })
     );
 
+    this.timeoutSubscription = timeout$.subscribe();
+
     this.runningTransfers.push({
       processId: transferProcessId.id,
       state: TransferProcessStates.REQUESTED,
       contractId: contractId
     });
 
     if (!this.pollingHandleTransfer) {
-      this.pollingHandleTransfer = this.pollRunningTransfers(timeout$)
+      this.pollingHandleTransfer = this.pollRunningTransfers()
         .pipe(finalize(() => this.cleanupPolling()))
         .subscribe();
     }
   }
 
-  private pollRunningTransfers(timeout$: Observable<number>) {
+  private pollRunningTransfers() {
     return interval(2000).pipe(
-      takeUntil(timeout$),
       switchMap(() => from([...this.runningTransfers])),
       switchMap(runningTransferProcess =>
         this.catalogService.getTransferProcessesById(runningTransferProcess.processId).pipe(
@@ -237,6 +239,7 @@ export class ContractViewerComponent implements OnInit {
         )
       ),
       tap(transferProcess => {
+        this.timeoutSubscription?.unsubscribe();
         this.removeTransferFromList(transferProcess.id);
         this.notificationService.showWarning(
           `Transfer [${transferProcess.id}] complete! Check if the process was successful`,
@@ -259,7 +262,6 @@ export class ContractViewerComponent implements OnInit {
   private cleanupPolling() {
     clearInterval(this.pollingHandleTransfer);
     this.pollingHandleTransfer = undefined;
+    this.timeoutSubscription?.unsubscribe();
   }
-
-
 }

src/app/pages/transfer-history/pipes/replace.pipe.ts

@@ -1,16 +1,11 @@
 import { NgModule } from '@angular/core';
 import { TransferHistoryRoutingModule } from './transfer-history-routing.module'
-import {ReplacePipe} from "./pipes/replace.pipe";
-import {SafePipe} from "./pipes/safe.pipe";
-
 import { TransferHistoryViewerComponent } from './transfer-history-viewer.component';
 import { SharedModule } from 'src/app/shared/shared.module';
 
 @NgModule({
   declarations: [
-    TransferHistoryViewerComponent,
-    ReplacePipe,
-    SafePipe
+    TransferHistoryViewerComponent
   ],
   imports: [
     TransferHistoryRoutingModule,

src/app/pages/transfer-history/pipes/safe.pipe.ts

@@ -5,27 +5,34 @@ export function adjustDate(date: Date, operator: OperatorDto): string | null {
     return null;
   }
 
-  if(operator === 'LEQ' || operator === 'LT') {
-    const adjustedDate = new Date(Date.UTC(
-      date.getFullYear(),
-      date.getMonth(),
-      date.getDate(),
-      23, 59, 59, 999
-    ));
+  let adjustedDate: Date;
 
-    return adjustedDate.toISOString();
-  } else {
-    const adjustedDate = new Date(Date.UTC(
-      date.getFullYear(),
-      date.getMonth(),
-      date.getDate(),
-      0, 0, 0, 0
-    ));
-
-    return adjustedDate.toISOString();
+  switch (operator) {
+    case 'LT':
+    case 'GEQ':
+      adjustedDate = new Date(Date.UTC(
+        date.getFullYear(),
+        date.getMonth(),
+        date.getDate(),
+        0, 0, 0, 0
+      ));
+      break;
+    case 'LEQ':
+    case 'GT':
+      adjustedDate = new Date(Date.UTC(
+        date.getFullYear(),
+        date.getMonth(),
+        date.getDate(),
+        23, 59, 59, 999
+      ));
+      break;
+    default:
+      return null;
   }
 
+  return adjustedDate.toISOString();
 }
+
  export function convertUTCToLocalDate(utcISOString: string): Date {
   const utcDate = new Date(utcISOString);