Skip to content

Commit d1ee808

Browse files
ppelgmvppelgmv
committed
Fix sonar issues
1 parent 8d5ba71 commit d1ee808

File tree

15 files changed

+85
-108
lines changed

15 files changed

+85
-108
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component, Inject, OnInit } from '@angular/core';
2-
import { HttpDataAddress, DataAddress, AssetInput } from '@think-it-labs/edc-connector-client';
3-
import { MatDialogRef } from "@angular/material/dialog";
2+
import { HttpDataAddress, DataAddress } from '@think-it-labs/edc-connector-client';
43
import { JsonDoc } from "../../../shared/models/json-doc";
54
import { StorageType } from "../../../shared/models/storage-type";
65
import { AmazonS3DataAddress } from "../../../shared/models/amazon-s3-data-address";
@@ -101,7 +100,7 @@ export class AssetCreateComponent implements OnInit {
101100
config = CKEDITOR_CONFIG
102101
selectedAssetTypeVocabularies: Vocabulary[]
103102

104-
urlPattern: RegExp = /^(file|ftp|http|https|imap|irc|nntp|acap|icap|mtqp|wss):\/\/(localhost|([a-z\d]([a-z\d-]*[a-z\d])*)|(([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|((\d{1,3}\.){3}\d{1,3}))(:\d+)?(\/[-a-z\d%_.~+]*)*(\?[;&a-z\d%_.~+=-]*)?(\#[-a-z\d_]*)?$/i;
103+
urlPattern: RegExp = /^(file|ftp|http|https|imap|irc|nntp|acap|icap|mtqp|wss):\/\/(?:localhost|(?:[a-z\d]([a-z\d-]*[a-z\d])*)|(?:[a-z\d]([a-z\d-]*[a-z\d])*\.?[a-z]{2,})|(?:(\d{1,3}\.){3}\d{1,3}))(:\d+)?(\/[-a-z\d%_.~+]*)*(\?[;&a-z\d%_.~+=-]*)?(\#[-a-z\d_]*)?$/i;
105104

106105
private fetch$ = new BehaviorSubject(null);
107106

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import { Component, OnInit } from '@angular/core';
22
import { BehaviorSubject } from 'rxjs';
3-
import { first } from 'rxjs/operators';
43
import { MatDialog } from '@angular/material/dialog';
5-
import { AssetInput, Asset } from "../../../shared/models/edc-connector-entities";
4+
import { Asset } from "../../../shared/models/edc-connector-entities";
65
import { AssetService } from "../../../shared/services/asset.service";
76
import { ConfirmationDialogComponent, ConfirmDialogModel } from "../../../shared/components/confirmation-dialog/confirmation-dialog.component";
87
import { NotificationService } from "../../../shared/services/notification.service";
9-
import { CONTEXTS, DATA_ADDRESS_TYPES } from 'src/app/shared/utils/app.constants';
108
import { PageEvent } from '@angular/material/paginator';
11-
import { EDC_CONTEXT, QuerySpec, DataAddress } from '@think-it-labs/edc-connector-client';
12-
import { ContractOffersViewerComponent } from '../../catalog/contract-offers-viewer/contract-offers-viewer.component';
9+
import { EDC_CONTEXT, QuerySpec } from '@think-it-labs/edc-connector-client';
1310
import { compact } from 'jsonld';
1411
import { Router } from '@angular/router';
1512

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
import { Component, Inject, OnInit } from '@angular/core';
1+
import { Component, OnInit } from '@angular/core';
22
import { MatDialog } from '@angular/material/dialog';
33
import { CatalogBrowserService } from "../../../shared/services/catalog-browser.service";
44
import { DataOffer } from 'src/app/shared/models/data-offer';
5-
import { ContractOffersViewerComponent } from '../contract-offers-viewer/contract-offers-viewer.component';
6-
import { Policy } from 'src/app/shared/models/edc-connector-entities';
75
import { PageEvent } from '@angular/material/paginator';
86
import { QuerySpec } from '@think-it-labs/edc-connector-client';
9-
import { ContractOffer } from 'src/app/shared/models/contract-offer';
107
import { Router } from '@angular/router';
118

129

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ mat-list-item:hover .property-title,
2121
.property-value {
2222
font-size: 14px;
2323
color: #d7d7d7;
24+
overflow-wrap: anywhere;
25+
white-space: pre-wrap;
2426
}
2527

2628
.property-icon {
@@ -102,11 +104,6 @@ ul {
102104
padding: 20px;
103105
}
104106

105-
.property-value {
106-
overflow-wrap: anywhere;
107-
white-space: pre-wrap;
108-
}
109-
110107
.grey {
111108
margin-bottom: 15px;
112109
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Inject } from '@angular/core';
2-
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
2+
import { MatDialog } from '@angular/material/dialog';
33
import { TransferProcessStates } from "../../../shared/models/transfer-process-states";
44
import { NegotiationResult } from "../../../shared/models/negotiation-result";
55
import { ContractNegotiation, ContractNegotiationRequest, Policy } from "../../../shared/models/edc-connector-entities";
@@ -8,7 +8,6 @@ import { NotificationService } from 'src/app/shared/services/notification.servic
88
import { StorageType } from 'src/app/shared/models/storage-type';
99
import { PolicyCard } from '../../../shared/models/policy/policy-card';
1010
import { DATA_ADDRESS_TYPES } from '../../../shared/utils/app.constants';
11-
import { ContractOffer } from 'src/app/shared/models/contract-offer';
1211
import { PolicyCardBuilder } from 'src/app/shared/models/policy/policy-card-builder';
1312
import { JsonDialogData } from '../../json-dialog/json-dialog/json-dialog.data';
1413
import { JsonDialogComponent } from '../../json-dialog/json-dialog/json-dialog.component'

‎src/app/pages/contract-definitions/contract-definition-new/contract-definition-new.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Component, Inject, OnInit } from '@angular/core';
2-
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
1+
import { Component, OnInit } from '@angular/core';
32
import { AssetService } from "../../../shared/services/asset.service";
43
import { PolicyService } from "../../../shared/services/policy.service";
54
import { Asset, PolicyDefinition, ContractDefinitionInput } from "../../../shared/models/edc-connector-entities";

‎src/app/pages/contract-definitions/contract-definition-viewer/contract-definition-viewer.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
44
import { ContractDefinitionService } from "../../../shared/services/contractDefinition.service";
55
import { ConfirmationDialogComponent, ConfirmDialogModel } from "../../../shared/components/confirmation-dialog/confirmation-dialog.component";
66
import { NotificationService } from "../../../shared/services/notification.service";
7-
import { ContractDefinition, ContractDefinitionInput } from 'src/app/shared/models/edc-connector-entities';
7+
import { ContractDefinition } from 'src/app/shared/models/edc-connector-entities';
88
import { PageEvent } from '@angular/material/paginator';
99
import { QuerySpec } from '@think-it-labs/edc-connector-client';
1010
import { Router } from '@angular/router';

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

Lines changed: 71 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -66,32 +66,42 @@ export class ContractViewerComponent implements OnInit {
6666
onTransferClicked(contract: ContractAgreement) {
6767
const dialogRef = this.dialog.open(ContractTransferDialog, { disableClose: true });
6868

69-
dialogRef.afterClosed().pipe(first()).subscribe(async result => {
70-
if (result !== undefined && result.transferButtonclicked) {
71-
72-
const transferRequest = await this.createTransferRequest(contract, result.dataAddress);
73-
74-
if(result.dataAddress.type === DATA_ADDRESS_TYPES.inesDataStore){
75-
this.transferService.initiateInesdataTransfer(transferRequest)
76-
.subscribe(transferId => {
77-
this.startPolling(transferId, contract["@id"]!);
78-
}, error => {
79-
console.error(error);
80-
this.notificationService.showError("Error initiating transfer");
81-
});
82-
}else{
83-
this.transferService.initiateTransfer(transferRequest)
84-
.subscribe(transferId => {
85-
this.startPolling(transferId, contract["@id"]!);
86-
}, error => {
69+
dialogRef.afterClosed().pipe(first()).subscribe({
70+
next: async (result) => {
71+
if (result !== undefined && result.transferButtonclicked) {
72+
try {
73+
const transferRequest = await this.createTransferRequest(contract, result.dataAddress);
74+
75+
const initiateTransfer$ = result.dataAddress.type === DATA_ADDRESS_TYPES.inesDataStore
76+
? this.transferService.initiateInesdataTransfer(transferRequest)
77+
: this.transferService.initiateTransfer(transferRequest);
78+
79+
initiateTransfer$.subscribe({
80+
next: (transferId) => {
81+
this.startPolling(transferId, contract["@id"]!);
82+
},
83+
error: (error) => {
84+
console.error(error);
85+
this.notificationService.showError("Error initiating transfer");
86+
},
87+
complete: () => {
88+
this.notificationService.showInfo("Transfer initiated successfully");
89+
}
90+
});
91+
} catch (error) {
8792
console.error(error);
88-
this.notificationService.showError("Error initiating transfer");
89-
});
93+
this.notificationService.showError("Failed to create transfer request");
94+
}
9095
}
91-
}
96+
},
97+
error: (error) => {
98+
console.error("Error closing dialog", error);
99+
},
100+
complete: () => {}
92101
});
93102
}
94103

104+
95105
asDate(epochSeconds?: number): string {
96106
if (epochSeconds) {
97107
const d = new Date(0);
@@ -209,24 +219,47 @@ export class ContractViewerComponent implements OnInit {
209219

210220
private pollRunningTransfers() {
211221
return () => {
212-
from(this.runningTransfers) //create from array
213-
.pipe(switchMap(runningTransferProcess => this.catalogService.getTransferProcessesById(runningTransferProcess.processId)), // fetch from API
214-
filter(transferprocess => ContractViewerComponent.isFinishedState(transferprocess['https://w3id.org/edc/v0.0.1/ns/transferType'][0]['@value'], transferprocess.state)), // only use finished ones
222+
from(this.runningTransfers) // Create observable from array
223+
.pipe(
224+
switchMap(runningTransferProcess =>
225+
this.catalogService.getTransferProcessesById(runningTransferProcess.processId)
226+
), // Fetch from API
227+
filter(transferProcess =>
228+
ContractViewerComponent.isFinishedState(
229+
transferProcess['https://w3id.org/edc/v0.0.1/ns/transferType'][0]['@value'],
230+
transferProcess.state
231+
)
232+
), // Only use finished ones
215233
tap(transferProcess => {
216-
// remove from in-progress
217-
this.runningTransfers = this.runningTransfers.filter(rtp => rtp.processId !== transferProcess.id)
218-
this.notificationService.showWarning(`Transfer [${transferProcess.id}] complete! Check if the process was successful`, "Show me!", () => {
219-
this.router.navigate(['/transfer-history'])
220-
})
221-
}),
222-
).subscribe(() => {
223-
// clear interval if necessary
224-
if (this.runningTransfers.length === 0) {
225-
clearInterval(this.pollingHandleTransfer);
226-
this.pollingHandleTransfer = undefined;
234+
// Remove from in-progress
235+
this.runningTransfers = this.runningTransfers.filter(rtp => rtp.processId !== transferProcess.id);
236+
237+
// Show notification
238+
this.notificationService.showWarning(
239+
`Transfer [${transferProcess.id}] complete! Check if the process was successful`,
240+
"Show me!",
241+
() => {
242+
this.router.navigate(['/transfer-history']);
243+
}
244+
);
245+
})
246+
)
247+
.subscribe({
248+
next: () => {
249+
// Clear interval if no running transfers are left
250+
if (this.runningTransfers.length === 0) {
251+
clearInterval(this.pollingHandleTransfer);
252+
this.pollingHandleTransfer = undefined;
253+
}
254+
},
255+
error: (error) => {
256+
this.notificationService.showError(error);
257+
},
258+
complete: () => {
259+
console.log("Polling transfers completed.");
227260
}
228-
}, error => this.notificationService.showError(error))
229-
}
230-
261+
});
262+
};
231263
}
264+
232265
}

‎src/app/pages/vocabularies/vocabulary-viewer/vocabulary-viewer.component.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#wrapper {
2-
}
3-
41
.main-property-icon {
52
font-size: 12px;
63
}

‎src/app/pages/vocabularies/vocabulary-viewer/vocabulary-viewer.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component, OnInit } from '@angular/core';
22
import { BehaviorSubject } from 'rxjs';
3-
import { first } from 'rxjs/operators';
43
import { MatDialog } from '@angular/material/dialog';
54
import { ConfirmationDialogComponent, ConfirmDialogModel } from "../../../shared/components/confirmation-dialog/confirmation-dialog.component";
65
import { NotificationService } from "../../../shared/services/notification.service";

0 commit comments

Comments
 (0)