#422753 - Renamed AmazonS3HttpData filename and removed TODO comments

Author: ppelgmv

src/app/pages/assets/asset-editor-dialog/asset-editor-dialog.component.ts

@@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core';
 import { AssetInput, HttpDataAddress, DataAddress } from '@think-it-labs/edc-connector-client';
 import { MatDialogRef } from "@angular/material/dialog";
 import { StorageType } from "../../../shared/models/storage-type";
-import { AmazonS3DataAddress } from "../../../shared/models/inesdata-data-address";
+import { AmazonS3DataAddress } from "../../../shared/models/amazon-s3-data-address";
 import { NotificationService } from 'src/app/shared/services/notification.service';
 import { DATA_ADDRESS_TYPES } from 'src/app/shared/utils/app.constants';
 

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

@@ -75,13 +75,6 @@
 
             <mat-divider inset></mat-divider>
             <mat-card-actions class="card-actions">
-              <!-- TODO: Pendiente de abordar en #422765 -->
-              <!-- <button (click)="onNegotiateClicked(contractOffer)"
-                      [disabled]="isBusy(contractOffer) || isNegotiated(contractOffer)"
-                      color="accent" mat-stroked-button>
-                <mat-icon>drive_file_rename_outline</mat-icon>
-                Negotiate
-              </button> -->
             </mat-card-actions>
             <mat-card-footer>
               <mat-progress-bar *ngIf="isBusy(contractOffer)" color="accent" mode="indeterminate"></mat-progress-bar>

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

@@ -54,63 +54,6 @@ export class CatalogBrowserComponent implements OnInit {
     this.fetch$.next(null);
   }
 
-  // TODO: Pendiente de abordar en #422765
-  /* onNegotiateClicked(contractOffer: ContractOffer) {
-    const initiateRequest: ContractNegotiationRequest = {
-      connectorAddress: contractOffer.originator,
-      offer: {
-        offerId: contractOffer.id,
-        assetId: contractOffer.assetId,
-        policy: contractOffer.policy,
-      },
-      connectorId: 'connector',
-      providerId: contractOffer.properties.provider
-    };
-
-    const finishedNegotiationStates = [
-      "VERIFIED",
-      "TERMINATED",
-      "ERROR"];
-
-    this.apiService.initiateNegotiation(initiateRequest).subscribe(negotiationId => {
-      this.finishedNegotiations.delete(initiateRequest.offer.offerId);
-      this.runningNegotiations.set(initiateRequest.offer.offerId, {
-        id: negotiationId,
-        offerId: initiateRequest.offer.offerId
-      });
-
-      if (!this.pollingHandleNegotiation) {
-        // there are no active negotiations
-        this.pollingHandleNegotiation = setInterval(() => {
-          // const finishedNegotiations: NegotiationResult[] = [];
-
-          for (const negotiation of this.runningNegotiations.values()) {
-            this.apiService.getNegotiationState(negotiation.id).subscribe(updatedNegotiation => {
-              if (finishedNegotiationStates.includes(updatedNegotiation.state!)) {
-                let offerId = negotiation.offerId;
-                this.runningNegotiations.delete(offerId);
-                if (updatedNegotiation["edc:state"] === "VERIFIED") {
-                  this.finishedNegotiations.set(offerId, updatedNegotiation);
-                  this.notificationService.showInfo("Contract Negotiation complete!", "Show me!", () => {
-                    this.router.navigate(['/contracts'])
-                  })
-                }
-              }
-
-              if (this.runningNegotiations.size === 0) {
-                clearInterval(this.pollingHandleNegotiation);
-                this.pollingHandleNegotiation = undefined;
-              }
-            });
-          }
-        }, 1000);
-      }
-    }, error => {
-      console.error(error);
-      this.notificationService.showError("Error starting negotiation");
-    });
-  } */
-
   isBusy(contractOffer: ContractOffer) {
     return this.runningNegotiations.get(contractOffer.id) !== undefined || !!this.runningTransferProcesses.find(tp => tp.assetId === contractOffer.assetId);
   }

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

@@ -30,12 +30,7 @@
 
           <mat-divider inset></mat-divider>
           <mat-card-actions class="card-actions">
-            <!-- TODO: Pendiente de abordar en #422768 -->
-            <!-- <button (click)="onTransferClicked(contract)" [disabled]="isTransferInProgress(contract.id!)" color="accent"
-                    mat-stroked-button>
-              <mat-icon>downloading</mat-icon>
-              Transfer
-            </button> -->
+
           </mat-card-actions>
           <mat-card-footer class="contract-card-footer">
             <mat-progress-bar *ngIf="isTransferInProgress(contract.id!)" color="accent" mode="indeterminate"></mat-progress-bar>

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

@@ -62,53 +62,10 @@ export class ContractViewerComponent implements OnInit {
     return '';
   }
 
-  // TODO: Pendiente de abordar en #422768
-/*   onTransferClicked(contract: ContractAgreement) {
-    const dialogRef = this.dialog.open(CatalogBrowserTransferDialog);
-
-    dialogRef.afterClosed().pipe(first()).subscribe(result => {
-      const storageTypeId: string = result.storageTypeId;
-      if (storageTypeId !== 'AzureStorage') {
-        this.notificationService.showError("Only storage type \"AzureStorage\" is implemented currently!")
-        return;
-      }
-      this.createTransferRequest(contract, storageTypeId)
-        .pipe(switchMap(trq => this.transferService.initiateTransfer(trq)))
-        .subscribe(transferId => {
-          this.startPolling(transferId, contract["@id"]!);
-        }, error => {
-          console.error(error);
-          this.notificationService.showError("Error initiating transfer");
-        });
-    });
-  } */
-
   isTransferInProgress(contractId: string): boolean {
     return !!this.runningTransfers.find(rt => rt.contractId === contractId);
   }
 
-  // TODO: Pendiente de abordar en #422768
-/*   private createTransferRequest(contract: ContractAgreement, storageTypeId: string): Observable<TransferProcessInput> {
-    return this.getContractOfferForAssetId(contract.assetId!).pipe(map(contractOffer => {
-
-      const iniateTransfer : TransferProcessInput = {
-        assetId: contractOffer.assetId,
-        connectorAddress: contractOffer.originator,
-
-        connectorId: "consumer", //doesn't matter, but cannot be null
-        contractId: contract.id,
-        dataDestination: {
-          "type": storageTypeId,
-          account: this.homeConnectorStorageAccount, // CAUTION: hardcoded value for AzureBlob
-          // container: omitted, so it will be auto-assigned by the EDC runtime
-        }
-      };
-
-      return iniateTransfer;
-    }));
-
-  } */
-
   /**
    * This method is used to obtain that URL of the connector that is offering a particular asset from the catalog.
    * This is a bit of a hack, because currently there is no "clean" way to get the counter-party's URL for a ContractAgreement.