inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2026-09-09 18:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-213] Upload Version - version options use boolean values (#940)

Browse Source 
* version form data interface

* subscribe value data type

* use form data  boolean value

* update tests
This commit is contained in:
Cilibiu Bogdan
2019-02-13 17:26:11 +00:00
committed by Denys Vuika
parent 9b2cbdde49
commit 51b08d2283
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/node-version/node-version-form.component.spec.ts
+6 -2
View File
@@ -52,10 +52,14 @@ describe('AppNodeVersionFormComponent', () => {
}); });
it('should emit form state on changes', () => { it('should emit form state on changes', () => {
const formData = {
comment: 'some text',
version: true
};
spyOn(component.update, 'emit'); spyOn(component.update, 'emit');
component.form.valueChanges.next({ test: 'test' }); component.form.valueChanges.next(formData);
expect(component.update.emit).toHaveBeenCalledWith({ test: 'test' }); expect(component.update.emit).toHaveBeenCalledWith(formData);
}); });
it('form should have valid state upon initialization', () => { it('form should have valid state upon initialization', () => {
src/app/components/node-version/node-version-form.component.ts
+9 -4
View File
@@ -35,6 +35,11 @@ import { FormBuilder, FormGroup } from '@angular/forms';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
export interface VersionFormEntry {
comment: string;
version: boolean;
}
@Component({ @Component({
selector: 'app-node-version-form', selector: 'app-node-version-form',
templateUrl: './node-version-form.component.html', templateUrl: './node-version-form.component.html',
@@ -44,14 +49,14 @@ import { takeUntil } from 'rxjs/operators';
exportAs: 'nodeVersionForm' exportAs: 'nodeVersionForm'
}) })
export class AppNodeVersionFormComponent implements OnInit, OnDestroy { export class AppNodeVersionFormComponent implements OnInit, OnDestroy {
@Output() update: EventEmitter<string> = new EventEmitter(); @Output() update: EventEmitter<VersionFormEntry> = new EventEmitter();
form: FormGroup; form: FormGroup;
private onDestroy$: Subject<boolean> = new Subject<boolean>(); private onDestroy$: Subject<boolean> = new Subject<boolean>();
private versionOptions = [ private versionOptions = [
{ label: 'VERSION.FORM.VERSION.MINOR', value: 'minor' }, { label: 'VERSION.FORM.VERSION.MINOR', value: false },
{ label: 'VERSION.FORM.VERSION.MAJOR', value: 'major' } { label: 'VERSION.FORM.VERSION.MAJOR', value: true }
]; ];
constructor(private formBuilder: FormBuilder) {} constructor(private formBuilder: FormBuilder) {}
@@ -64,7 +69,7 @@ export class AppNodeVersionFormComponent implements OnInit, OnDestroy {
this.form.valueChanges this.form.valueChanges
.pipe(takeUntil(this.onDestroy$)) .pipe(takeUntil(this.onDestroy$))
.subscribe(values => { .subscribe((values: VersionFormEntry) => {
this.update.emit(values); this.update.emit(values);
}); });
} }
src/app/store/effects/upload.effects.ts
+1 -1
View File
@@ -130,7 +130,7 @@ export class UploadEffects {
file, file,
{ {
comment: form.comment, comment: form.comment,
majorVersion: form.major ? true : false, majorVersion: form.version,
parentId: node.parentId, parentId: node.parentId,
path: ((<any>file).webkitRelativePath || '').replace( path: ((<any>file).webkitRelativePath || '').replace(
/\/[^\/]*$/, /\/[^\/]*$/,