|
|
|
@ -58,9 +58,8 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
|
|
|
|
|
|
|
|
|
viewType: ViewStyleType;
|
|
|
|
|
viewTypeEnum = ViewStyleType;
|
|
|
|
|
private subject$:Subject<DatasetDescriptionFieldEditorModel> = new Subject<DatasetDescriptionFieldEditorModel>();
|
|
|
|
|
// private subject$:Subject<DatasetDescriptionFieldEditorModel> = new Subject<DatasetDescriptionFieldEditorModel>();
|
|
|
|
|
|
|
|
|
|
private myCustomValidators = new EditorCustomValidators();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Input() expandView: boolean = true;
|
|
|
|
@ -85,9 +84,9 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
|
|
|
|
|
|
|
|
|
ngOnInit() {
|
|
|
|
|
|
|
|
|
|
this.subject$.pipe(takeUntil(this._destroyed)).pipe(debounceTime(600)).subscribe(model=>{
|
|
|
|
|
this.previewForm = model.buildForm();
|
|
|
|
|
});
|
|
|
|
|
// this.subject$.pipe(takeUntil(this._destroyed)).pipe(debounceTime(600)).subscribe(model=>{
|
|
|
|
|
// this.previewForm = model.buildForm();
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -168,7 +167,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.showPreview = true;
|
|
|
|
|
// this.showPreview = true;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -297,88 +296,88 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
|
|
|
|
private _formChangesSubscription:Subscription;
|
|
|
|
|
private _showPreview: boolean = false;;
|
|
|
|
|
|
|
|
|
|
get showPreview(): boolean{
|
|
|
|
|
// get showPreview(): boolean{
|
|
|
|
|
|
|
|
|
|
return this._showPreview;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
set showPreview(value:boolean){
|
|
|
|
|
if(value == false){//hide preview
|
|
|
|
|
//close subsciption
|
|
|
|
|
if(this._formChangesSubscription){
|
|
|
|
|
this._formChangesSubscription.unsubscribe();
|
|
|
|
|
this._formChangesSubscription = null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// return this._showPreview;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if(value == true){
|
|
|
|
|
//value is already true
|
|
|
|
|
if(this._showPreview){
|
|
|
|
|
if(this._formChangesSubscription){
|
|
|
|
|
this._formChangesSubscription.unsubscribe();
|
|
|
|
|
this._formChangesSubscription = null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// set showPreview(value:boolean){
|
|
|
|
|
// if(value == false){//hide preview
|
|
|
|
|
// //close subsciption
|
|
|
|
|
// if(this._formChangesSubscription){
|
|
|
|
|
// this._formChangesSubscription.unsubscribe();
|
|
|
|
|
// this._formChangesSubscription = null;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//initialize
|
|
|
|
|
if(this.form.get('viewStyle').get('renderStyle').value){
|
|
|
|
|
this._generatePreviewForm();
|
|
|
|
|
}
|
|
|
|
|
this._formChangesSubscription = this.form.valueChanges.subscribe(()=>{
|
|
|
|
|
this._generatePreviewForm();
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
this._showPreview = value;
|
|
|
|
|
// if(value == true){
|
|
|
|
|
// //value is already true
|
|
|
|
|
// if(this._showPreview){
|
|
|
|
|
// if(this._formChangesSubscription){
|
|
|
|
|
// this._formChangesSubscription.unsubscribe();
|
|
|
|
|
// this._formChangesSubscription = null;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// //initialize
|
|
|
|
|
// if(this.form.get('viewStyle').get('renderStyle').value){
|
|
|
|
|
// this._generatePreviewForm();
|
|
|
|
|
// }
|
|
|
|
|
// this._formChangesSubscription = this.form.valueChanges.subscribe(()=>{
|
|
|
|
|
// this._generatePreviewForm();
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
// this._showPreview = value;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
previewForm: FormGroup;
|
|
|
|
|
// previewForm: FormGroup;
|
|
|
|
|
|
|
|
|
|
private _generatePreviewForm(){
|
|
|
|
|
// private _generatePreviewForm(){
|
|
|
|
|
|
|
|
|
|
if(!this.form.get('data')){
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.previewForm = null;
|
|
|
|
|
const fieldEditorModel = new DatasetDescriptionFieldEditorModel();
|
|
|
|
|
// if(!this.form.get('data')){
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// this.previewForm = null;
|
|
|
|
|
// const fieldEditorModel = new DatasetDescriptionFieldEditorModel();
|
|
|
|
|
|
|
|
|
|
fieldEditorModel.viewStyle= {
|
|
|
|
|
renderStyle: this.form.get('viewStyle').get('renderStyle').value,
|
|
|
|
|
cssClass: null
|
|
|
|
|
};
|
|
|
|
|
// fieldEditorModel.viewStyle= {
|
|
|
|
|
// renderStyle: this.form.get('viewStyle').get('renderStyle').value,
|
|
|
|
|
// cssClass: null
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
|
|
fieldEditorModel.data = (this.form.get('data') as FormGroup).getRawValue();
|
|
|
|
|
fieldEditorModel.value = this.form.get('defaultValue').get('value').value;
|
|
|
|
|
fieldEditorModel.validationRequired = (this.form.get('validations').value as Array<ValidationType>).includes(ValidationType.Required);
|
|
|
|
|
// fieldEditorModel.data = (this.form.get('data') as FormGroup).getRawValue();
|
|
|
|
|
// fieldEditorModel.value = this.form.get('defaultValue').get('value').value;
|
|
|
|
|
// fieldEditorModel.validationRequired = (this.form.get('validations').value as Array<ValidationType>).includes(ValidationType.Required);
|
|
|
|
|
|
|
|
|
|
if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.CheckBox){
|
|
|
|
|
fieldEditorModel.value = this.form.get('defaultValue').get('value').value === 'true';
|
|
|
|
|
}
|
|
|
|
|
// if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.Researchers){
|
|
|
|
|
// fieldEditorModel.data = new ResearchersAutoCompleteFieldDataEditorModel().buildForm().getRawValue();
|
|
|
|
|
// }
|
|
|
|
|
if(fieldEditorModel.viewStyle.renderStyle === DatasetProfileFieldViewStyle.Validation || (fieldEditorModel.viewStyle.renderStyle === DatasetProfileFieldViewStyle.DatasetIdentifier)
|
|
|
|
|
|| (fieldEditorModel.viewStyle.renderStyle === DatasetProfileFieldViewStyle.Tags)
|
|
|
|
|
){
|
|
|
|
|
fieldEditorModel.value = null;
|
|
|
|
|
}
|
|
|
|
|
// if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.CheckBox){
|
|
|
|
|
// fieldEditorModel.value = this.form.get('defaultValue').get('value').value === 'true';
|
|
|
|
|
// }
|
|
|
|
|
// // if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.Researchers){
|
|
|
|
|
// // fieldEditorModel.data = new ResearchersAutoCompleteFieldDataEditorModel().buildForm().getRawValue();
|
|
|
|
|
// // }
|
|
|
|
|
// if(fieldEditorModel.viewStyle.renderStyle === DatasetProfileFieldViewStyle.Validation || (fieldEditorModel.viewStyle.renderStyle === DatasetProfileFieldViewStyle.DatasetIdentifier)
|
|
|
|
|
// || (fieldEditorModel.viewStyle.renderStyle === DatasetProfileFieldViewStyle.Tags)
|
|
|
|
|
// ){
|
|
|
|
|
// fieldEditorModel.value = null;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// const myTicket = Guid.create().toString();
|
|
|
|
|
// this.validTicket = myTicket;
|
|
|
|
|
// setTimeout(() => { //TODO
|
|
|
|
|
// //user hasnt make any new change to inputs /show preview
|
|
|
|
|
// if(myTicket === this.validTicket){
|
|
|
|
|
// this.previewForm = fieldEditorModel.buildForm();
|
|
|
|
|
// }
|
|
|
|
|
// }, 600);
|
|
|
|
|
// // const myTicket = Guid.create().toString();
|
|
|
|
|
// // this.validTicket = myTicket;
|
|
|
|
|
// // setTimeout(() => { //TODO
|
|
|
|
|
// // //user hasnt make any new change to inputs /show preview
|
|
|
|
|
// // if(myTicket === this.validTicket){
|
|
|
|
|
// // this.previewForm = fieldEditorModel.buildForm();
|
|
|
|
|
// // }
|
|
|
|
|
// // }, 600);
|
|
|
|
|
|
|
|
|
|
this.subject$.next(fieldEditorModel);
|
|
|
|
|
// this.subject$.next(fieldEditorModel);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// setTimeout(() => {
|
|
|
|
|
// this.previewForm = fieldEditorModel.buildForm();
|
|
|
|
|
// });
|
|
|
|
|
};
|
|
|
|
|
// // setTimeout(() => {
|
|
|
|
|
// // this.previewForm = fieldEditorModel.buildForm();
|
|
|
|
|
// // });
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
|
|
get canApplyVisibility():boolean{
|
|
|
|
|
|
|
|
|
@ -429,12 +428,13 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
|
|
|
|
|
|
|
|
|
const x = this.viewType;
|
|
|
|
|
|
|
|
|
|
this.showPreview = false;
|
|
|
|
|
// this.showPreview = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const field: Field = this.form.getRawValue();
|
|
|
|
|
field.defaultValue = {type:null, value: null};
|
|
|
|
|
// field.defaultValue = {type:null, value: null};
|
|
|
|
|
field.defaultValue = undefined;
|
|
|
|
|
if(!this.canApplyVisibility){
|
|
|
|
|
field.visible.rules = [];
|
|
|
|
|
}
|
|
|
|
@ -792,9 +792,9 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
setTimeout(() => { //TODO
|
|
|
|
|
this.showPreview = true;
|
|
|
|
|
});
|
|
|
|
|
// setTimeout(() => { //TODO
|
|
|
|
|
// this.showPreview = true;
|
|
|
|
|
// });
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|