From 336a5a6ce67ad0676bb31d221ce02be6fd71d73b Mon Sep 17 00:00:00 2001
From: TINCU Sebastian-Ion <Sebastian-Ion.TINCU@ext.ec.europa.eu>
Date: Mon, 17 Sep 2018 15:12:28 +0200
Subject: [PATCH] EDELIVERY-3762 Clean the smp-angular project from domibus
object
Clean the providers property across components.
---
smp-angular/src/app/app.module.ts | 2 ++
smp-angular/src/app/security/is-authorized.directive.ts | 3 +--
.../truststore-upload/truststore-upload.component.ts | 5 ++---
smp-angular/src/app/truststore/truststore.component.ts | 3 +--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/smp-angular/src/app/app.module.ts b/smp-angular/src/app/app.module.ts
index 66e1ac195..4562b3254 100644
--- a/smp-angular/src/app/app.module.ts
+++ b/smp-angular/src/app/app.module.ts
@@ -72,6 +72,7 @@ import {ServicegroupMetadataDialogComponent} from "./servicegroup/servicegroup-m
import {DomainDetailsDialogComponent} from "./domain/domain-details-dialog/domain-details-dialog.component";
import {UserDetailsDialogComponent} from "./user/user-details-dialog/user-details-dialog.component";
import {DownloadService} from "./download/download.service";
+import {TrustStoreService} from "./truststore/trustore.service";
export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions: RequestOptions, httpEventService: HttpEventService) {
return new ExtendedHttpClient(xhrBackend, requestOptions, httpEventService);
@@ -166,6 +167,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
DomibusInfoService,
AlertService,
DownloadService,
+ TrustStoreService,
{
provide: Http,
useFactory: extendedHttpClientFactory,
diff --git a/smp-angular/src/app/security/is-authorized.directive.ts b/smp-angular/src/app/security/is-authorized.directive.ts
index e3b94f960..b53cccf91 100644
--- a/smp-angular/src/app/security/is-authorized.directive.ts
+++ b/smp-angular/src/app/security/is-authorized.directive.ts
@@ -2,8 +2,7 @@ import {Directive,ElementRef,Input} from '@angular/core';
import {SecurityService} from './security.service';
@Directive({
- selector:'[isAuthorized]',
- providers:[]
+ selector:'[isAuthorized]'
})
export class IsAuthorized {
@Input('isAuthorized') role:string;
diff --git a/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts b/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts
index 174ecb445..a0f4a6373 100644
--- a/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts
+++ b/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts
@@ -8,7 +8,6 @@ import {isEmpty} from "rxjs/operator/isEmpty";
@Component({
selector: 'app-trustore-upload',
templateUrl: './truststore-upload.component.html',
- providers: [TrustStoreService]
})
export class TrustStoreUploadComponent {
@@ -20,7 +19,7 @@ export class TrustStoreUploadComponent {
enableSubmit = false;
constructor(public dialogRef: MdDialogRef<TrustStoreUploadComponent>,
- private truststorService: TrustStoreService, private alertService: AlertService,
+ private trustStoreService: TrustStoreService, private alertService: AlertService,
@Inject(MD_DIALOG_DATA) public data: any) {
}
@@ -30,7 +29,7 @@ export class TrustStoreUploadComponent {
public submit() {
let fi = this.fileInput.nativeElement;
- this.truststorService.saveTrustStore(fi.files[0], this.password).subscribe(res => {
+ this.trustStoreService.saveTrustStore(fi.files[0], this.password).subscribe(res => {
this.alertService.success(res.text(), false);
this.onTruststoreUploaded.emit();
},
diff --git a/smp-angular/src/app/truststore/truststore.component.ts b/smp-angular/src/app/truststore/truststore.component.ts
index 8f0e94f39..830b4d53e 100644
--- a/smp-angular/src/app/truststore/truststore.component.ts
+++ b/smp-angular/src/app/truststore/truststore.component.ts
@@ -15,8 +15,7 @@ import {AlertService} from "../alert/alert.service";
@Component({
selector: 'app-truststore',
templateUrl: './truststore.component.html',
- styleUrls: ['./truststore.component.css'],
- providers: [TrustStoreService]
+ styleUrls: ['./truststore.component.css']
})
export class TruststoreComponent implements OnInit {
--
GitLab