Service Provider Name (Dashboard Display Only)
-
diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts b/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts
index a2fb97fae..afcba83c2 100644
--- a/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts
+++ b/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts
@@ -1,7 +1,7 @@
import { Component, ViewChild } from '@angular/core';
import { TestBed, ComponentFixture, async } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
import { StoreModule, Store, combineReducers } from '@ngrx/store';
import { UploadProviderComponent } from './upload-provider.component';
@@ -87,7 +87,7 @@ describe('Upload Provider Page', () => {
describe('saveFromFile method', () => {
it('should retrieve the file text from a service and call the provided upload emitter', async((done) => {
fixture.detectChanges();
- spyOn(fileService, 'readAsText').and.callFake(() => Observable.of('foo'));
+ spyOn(fileService, 'readAsText').and.callFake(() => of('foo'));
form.providerForm.setValue({ serviceProviderName: 'foo', file: '', url: '' });
form.saveFromFile(getFakeFile('foo'), 'foo');
form.upload.subscribe(v => {
diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.ts b/ui/src/app/metadata-provider/container/upload-provider.component.ts
index b90ef8018..57ddec391 100644
--- a/ui/src/app/metadata-provider/container/upload-provider.component.ts
+++ b/ui/src/app/metadata-provider/container/upload-provider.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy, Output, EventEmitter } from '@angular/core';
import { FormBuilder, FormGroup, FormControl, FormControlName, Validators, AbstractControl } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject } from 'rxjs';
+import { takeUntil, debounceTime } from 'rxjs/operators';
import { Store } from '@ngrx/store';
import { EntityValidators } from '../../domain/service/entity-validators.service';
import { FileService } from '../../core/service/file.service';
@@ -40,18 +40,16 @@ export class UploadProviderComponent implements OnInit, OnDestroy {
this.formValue = changes;
});
- this.providerForm
- .get('file')
- .valueChanges
- .takeUntil(this.ngUnsubscribe)
- .debounceTime(100)
- .subscribe(changes => {
- let url = this.providerForm.get('url');
- url[changes ? 'disable' : 'enable']();
- if (!!url.value) {
- url.setValue(null);
- }
- });
+ this.providerForm.get('file').valueChanges.pipe(
+ takeUntil(this.ngUnsubscribe),
+ debounceTime(100)
+ ).subscribe(changes => {
+ let url = this.providerForm.get('url');
+ url[changes ? 'disable' : 'enable']();
+ if (!!url.value) {
+ url.setValue(null);
+ }
+ });
}
save(): void {
diff --git a/ui/src/app/metadata-provider/directive/info-label.directive.spec.ts b/ui/src/app/metadata-provider/directive/info-label.directive.spec.ts
index 32b3e3cb8..e1e6d5b59 100644
--- a/ui/src/app/metadata-provider/directive/info-label.directive.spec.ts
+++ b/ui/src/app/metadata-provider/directive/info-label.directive.spec.ts
@@ -9,7 +9,7 @@ import * as utility from '../../../testing/utility';
@Component({
- template: `Preview XML