diff --git a/src/app/components/node-version/node-version-form.component.spec.ts b/src/app/components/node-version/node-version-form.component.spec.ts index ffb8caeb7..a0525db5d 100644 --- a/src/app/components/node-version/node-version-form.component.spec.ts +++ b/src/app/components/node-version/node-version-form.component.spec.ts @@ -52,10 +52,14 @@ describe('AppNodeVersionFormComponent', () => { }); it('should emit form state on changes', () => { + const formData = { + comment: 'some text', + version: true + }; spyOn(component.update, 'emit'); - component.form.valueChanges.next({ test: 'test' }); - expect(component.update.emit).toHaveBeenCalledWith({ test: 'test' }); + component.form.valueChanges.next(formData); + expect(component.update.emit).toHaveBeenCalledWith(formData); }); it('form should have valid state upon initialization', () => { diff --git a/src/app/components/node-version/node-version-form.component.ts b/src/app/components/node-version/node-version-form.component.ts index 85b145e03..2f38dba86 100644 --- a/src/app/components/node-version/node-version-form.component.ts +++ b/src/app/components/node-version/node-version-form.component.ts @@ -35,6 +35,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; +export interface VersionFormEntry { + comment: string; + version: boolean; +} + @Component({ selector: 'app-node-version-form', templateUrl: './node-version-form.component.html', @@ -44,14 +49,14 @@ import { takeUntil } from 'rxjs/operators'; exportAs: 'nodeVersionForm' }) export class AppNodeVersionFormComponent implements OnInit, OnDestroy { - @Output() update: EventEmitter = new EventEmitter(); + @Output() update: EventEmitter = new EventEmitter(); form: FormGroup; private onDestroy$: Subject = new Subject(); private versionOptions = [ - { label: 'VERSION.FORM.VERSION.MINOR', value: 'minor' }, - { label: 'VERSION.FORM.VERSION.MAJOR', value: 'major' } + { label: 'VERSION.FORM.VERSION.MINOR', value: false }, + { label: 'VERSION.FORM.VERSION.MAJOR', value: true } ]; constructor(private formBuilder: FormBuilder) {} @@ -64,7 +69,7 @@ export class AppNodeVersionFormComponent implements OnInit, OnDestroy { this.form.valueChanges .pipe(takeUntil(this.onDestroy$)) - .subscribe(values => { + .subscribe((values: VersionFormEntry) => { this.update.emit(values); }); } diff --git a/src/app/store/effects/upload.effects.ts b/src/app/store/effects/upload.effects.ts index 1ab04f69b..432b9cfca 100644 --- a/src/app/store/effects/upload.effects.ts +++ b/src/app/store/effects/upload.effects.ts @@ -130,7 +130,7 @@ export class UploadEffects { file, { comment: form.comment, - majorVersion: form.major ? true : false, + majorVersion: form.version, parentId: node.parentId, path: ((file).webkitRelativePath || '').replace( /\/[^\/]*$/,