Fix issue with RDA Common Standards
This commit is contained in:
parent
29919f981a
commit
6de12fd0e8
|
@ -18,7 +18,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- <mat-form-field class="col">
|
<!-- <mat-form-field class="col">
|
||||||
<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.ID' | translate}}" type="text" [formControl]="this.form.get('id')"
|
<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.ID' | translate}}" type="text" [formControl]="this.form.get('id')"
|
||||||
|
@ -36,15 +36,15 @@
|
||||||
<mat-option [value]="viewStyleEnum.BooleanDecision">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.BooleanDecision)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.BooleanDecision">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.BooleanDecision)}}</mat-option>
|
||||||
<mat-option [value]="viewStyleEnum.RadioBox">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.RadioBox)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.RadioBox">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.RadioBox)}}</mat-option>
|
||||||
<mat-option [value]="viewStyleEnum.CheckBox">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.CheckBox)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.CheckBox">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.CheckBox)}}</mat-option>
|
||||||
|
|
||||||
<mat-option [value]="viewStyleEnum.ComboBox">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.ComboBox)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.ComboBox">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.ComboBox)}}</mat-option>
|
||||||
<mat-divider></mat-divider>
|
<mat-divider></mat-divider>
|
||||||
|
|
||||||
<mat-option [value]="viewStyleEnum.DatePicker">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.DatePicker)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.DatePicker">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.DatePicker)}}</mat-option>
|
||||||
<mat-option [value]="viewStyleEnum.Currency">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.Currency)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.Currency">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.Currency)}}</mat-option>
|
||||||
|
|
||||||
<mat-divider></mat-divider>
|
<mat-divider></mat-divider>
|
||||||
|
|
||||||
|
|
||||||
<mat-optgroup label="APIs">
|
<mat-optgroup label="APIs">
|
||||||
<mat-option [value]="viewStyleEnum.Registries">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.Registries)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.Registries">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.Registries)}}</mat-option>
|
||||||
|
@ -54,7 +54,7 @@
|
||||||
<mat-option [value]="viewStyleEnum.ExternalDatasets">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.ExternalDatasets)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.ExternalDatasets">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.ExternalDatasets)}}</mat-option>
|
||||||
<mat-option [value]="viewStyleEnum.DataRepositories">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.DataRepositories)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.DataRepositories">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.DataRepositories)}}</mat-option>
|
||||||
</mat-optgroup>
|
</mat-optgroup>
|
||||||
|
|
||||||
<mat-divider></mat-divider>
|
<mat-divider></mat-divider>
|
||||||
<mat-optgroup label="Argos Entities">
|
<mat-optgroup label="Argos Entities">
|
||||||
<mat-option [value]="viewStyleEnum.InternalDmpEntities">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.InternalDmpEntities)}}</mat-option>
|
<mat-option [value]="viewStyleEnum.InternalDmpEntities">{{enumUtils.toDatasetProfileFieldViewStyleString(viewStyleEnum.InternalDmpEntities)}}</mat-option>
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
</mat-option>
|
</mat-option>
|
||||||
<!-- TODO -->
|
<!-- TODO -->
|
||||||
<mat-divider></mat-divider>
|
<mat-divider></mat-divider>
|
||||||
|
|
||||||
<mat-option [value]="viewTypeEnum.DatePicker">
|
<mat-option [value]="viewTypeEnum.DatePicker">
|
||||||
<img src="/assets/images/editor/icons/date_picker.svg" class="input_icon" alt="DatePicker icon">
|
<img src="/assets/images/editor/icons/date_picker.svg" class="input_icon" alt="DatePicker icon">
|
||||||
{{enumUtils.toDatasetProfileViewTypeString(viewTypeEnum.DatePicker)}}
|
{{enumUtils.toDatasetProfileViewTypeString(viewTypeEnum.DatePicker)}}
|
||||||
|
@ -167,7 +167,7 @@
|
||||||
<!-- <mat-error *ngIf="this.form.get('viewStyle').get('renderStyle').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
|
<!-- <mat-error *ngIf="this.form.get('viewStyle').get('renderStyle').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
|
||||||
<mat-error >{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
<mat-error >{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
<!-- <mat-error *ngIf="this.form.hasError('inputTypeNotValid')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
|
<!-- <mat-error *ngIf="this.form.hasError('inputTypeNotValid')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
|
||||||
|
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<!-- Combo Box -->
|
<!-- Combo Box -->
|
||||||
|
@ -187,7 +187,7 @@
|
||||||
<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.RDA-COMMON-STANDARDS' | translate}}</mat-label>
|
<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.RDA-COMMON-STANDARDS' | translate}}</mat-label>
|
||||||
<mat-select [formControl]="this.form.get('rdaCommonStandard')">
|
<mat-select [formControl]="this.form.get('rdaCommonStandard')">
|
||||||
<mat-option>--</mat-option>
|
<mat-option>--</mat-option>
|
||||||
<mat-option *ngFor="let property of rdaCommonStandards" [value]="property">
|
<mat-option *ngFor="let property of datasetProfileService.getRDACommonStandards()" [value]="property">
|
||||||
{{property}}
|
{{property}}
|
||||||
</mat-option>
|
</mat-option>
|
||||||
</mat-select>
|
</mat-select>
|
||||||
|
@ -253,28 +253,28 @@
|
||||||
<div class="col-12" *ngIf="expandView && previewForm">
|
<div class="col-12" *ngIf="expandView && previewForm">
|
||||||
<span style="font-weight: bold">{{'DATASET-PROFILE-EDITOR.ACTIONS.FIELD.PREVIEW' | translate}}</span>
|
<span style="font-weight: bold">{{'DATASET-PROFILE-EDITOR.ACTIONS.FIELD.PREVIEW' | translate}}</span>
|
||||||
</div> -->
|
</div> -->
|
||||||
<!-- <div class="col-12">
|
<!-- <div class="col-12">
|
||||||
<mat-radio-group [(ngModel)]="showPreview">
|
<mat-radio-group [(ngModel)]="showPreview">
|
||||||
<mat-radio-button [value]="true">Yes</mat-radio-button>
|
<mat-radio-button [value]="true">Yes</mat-radio-button>
|
||||||
<mat-radio-button [value]="false">No</mat-radio-button>
|
<mat-radio-button [value]="false">No</mat-radio-button>
|
||||||
</mat-radio-group>
|
</mat-radio-group>
|
||||||
</div> -->
|
</div> -->
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
<div class="col-12" *ngIf="showPreview">
|
<div class="col-12" *ngIf="showPreview">
|
||||||
<ng-container *ngIf="viewType === viewTypeEnum.Other else regularField">
|
<ng-container *ngIf="viewType === viewTypeEnum.Other else regularField">
|
||||||
<app-form-field [form]="previewForm" *ngIf="previewForm" [autocompleteOptions]="form.get('data').get('autoCompleteSingleDataList').getRawValue()">
|
<app-form-field [form]="previewForm" *ngIf="previewForm" [autocompleteOptions]="form.get('data').get('autoCompleteSingleDataList').getRawValue()">
|
||||||
|
|
||||||
</app-form-field>
|
</app-form-field>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-template #regularField>
|
<ng-template #regularField>
|
||||||
<app-form-field [form]="previewForm" *ngIf="previewForm">
|
<app-form-field [form]="previewForm" *ngIf="previewForm">
|
||||||
|
|
||||||
</app-form-field>
|
</app-form-field>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12" *ngIf="!this.form.get('viewStyle').get('renderStyle').value">
|
<div class="col-12" *ngIf="!this.form.get('viewStyle').get('renderStyle').value">
|
||||||
<em>
|
<em>
|
||||||
{{'DATASET-PROFILE-EDITOR.ACTIONS.FIELD.NOT-INITIALIZED' | translate}}
|
{{'DATASET-PROFILE-EDITOR.ACTIONS.FIELD.NOT-INITIALIZED' | translate}}
|
||||||
</em>
|
</em>
|
||||||
|
|
|
@ -35,7 +35,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
viewType: ViewStyleType;
|
viewType: ViewStyleType;
|
||||||
viewTypeEnum = ViewStyleType;
|
viewTypeEnum = ViewStyleType;
|
||||||
// private subject$:Subject<DatasetDescriptionFieldEditorModel> = new Subject<DatasetDescriptionFieldEditorModel>();
|
// private subject$:Subject<DatasetDescriptionFieldEditorModel> = new Subject<DatasetDescriptionFieldEditorModel>();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Input() expandView: boolean = true;
|
@Input() expandView: boolean = true;
|
||||||
|
@ -44,21 +44,21 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
@Output() delete = new EventEmitter<void>();
|
@Output() delete = new EventEmitter<void>();
|
||||||
|
|
||||||
|
|
||||||
rdaCommonStandards = this.datasetProfileService.getRDACommonStandards();
|
//rdaCommonStandards = this.datasetProfileService.getRDACommonStandards(); //GK: Don't do that again. The service has a weird async behaviour.
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public enumUtils: EnumUtils,
|
public enumUtils: EnumUtils,
|
||||||
public datasetProfileService: DatasetProfileService,
|
public datasetProfileService: DatasetProfileService,
|
||||||
private dialog: MatDialog
|
private dialog: MatDialog
|
||||||
) { super();
|
) { super();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
isErrorState(control: FormControl, form: FormGroupDirective | NgForm): boolean {
|
isErrorState(control: FormControl, form: FormGroupDirective | NgForm): boolean {
|
||||||
|
|
||||||
if(this.form.get('viewStyle').untouched) return false;
|
if(this.form.get('viewStyle').untouched) return false;
|
||||||
|
|
||||||
return this.form.get('viewStyle').invalid;
|
return this.form.get('viewStyle').invalid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,7 +70,6 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// if (this.form.get('multiplicity')) {
|
// if (this.form.get('multiplicity')) {
|
||||||
// if (this.form.get('multiplicity').value.min > 1 && this.form.get('multiplicity').value.max > 1) {
|
// if (this.form.get('multiplicity').value.min > 1 && this.form.get('multiplicity').value.max > 1) {
|
||||||
// this.isFieldMultiplicityEnabled = true;
|
// this.isFieldMultiplicityEnabled = true;
|
||||||
|
@ -82,7 +81,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
|
|
||||||
// this.matcher.setReference(this.form);
|
// this.matcher.setReference(this.form);
|
||||||
const type = this.form.get('viewStyle').get('renderStyle').value;
|
const type = this.form.get('viewStyle').get('renderStyle').value;
|
||||||
|
|
||||||
switch(type){
|
switch(type){
|
||||||
case DatasetProfileFieldViewStyle.BooleanDecision:
|
case DatasetProfileFieldViewStyle.BooleanDecision:
|
||||||
this.viewType = this.viewTypeEnum.BooleanDecision;
|
this.viewType = this.viewTypeEnum.BooleanDecision;
|
||||||
|
@ -145,7 +144,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
this.viewType = this.viewTypeEnum.Validation;
|
this.viewType = this.viewTypeEnum.Validation;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// this.showPreview = true;
|
// this.showPreview = true;
|
||||||
|
@ -309,7 +308,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
// });
|
// });
|
||||||
// }
|
// }
|
||||||
// this._showPreview = value;
|
// this._showPreview = value;
|
||||||
|
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// previewForm: FormGroup;
|
// previewForm: FormGroup;
|
||||||
|
@ -321,18 +320,18 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
// }
|
// }
|
||||||
// this.previewForm = null;
|
// this.previewForm = null;
|
||||||
// const fieldEditorModel = new DatasetDescriptionFieldEditorModel();
|
// const fieldEditorModel = new DatasetDescriptionFieldEditorModel();
|
||||||
|
|
||||||
// fieldEditorModel.viewStyle= {
|
// fieldEditorModel.viewStyle= {
|
||||||
// renderStyle: this.form.get('viewStyle').get('renderStyle').value,
|
// renderStyle: this.form.get('viewStyle').get('renderStyle').value,
|
||||||
// cssClass: null
|
// cssClass: null
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// fieldEditorModel.data = (this.form.get('data') as FormGroup).getRawValue();
|
// fieldEditorModel.data = (this.form.get('data') as FormGroup).getRawValue();
|
||||||
// fieldEditorModel.value = this.form.get('defaultValue').get('value').value;
|
// fieldEditorModel.value = this.form.get('defaultValue').get('value').value;
|
||||||
// fieldEditorModel.validationRequired = (this.form.get('validations').value as Array<ValidationType>).includes(ValidationType.Required);
|
// fieldEditorModel.validationRequired = (this.form.get('validations').value as Array<ValidationType>).includes(ValidationType.Required);
|
||||||
|
|
||||||
// if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.CheckBox){
|
// if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.CheckBox){
|
||||||
// fieldEditorModel.value = this.form.get('defaultValue').get('value').value === 'true';
|
// fieldEditorModel.value = this.form.get('defaultValue').get('value').value === 'true';
|
||||||
// }
|
// }
|
||||||
// // if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.Researchers){
|
// // if(this.form.get('viewStyle').get('renderStyle').value == DatasetProfileFieldViewStyle.Researchers){
|
||||||
// // fieldEditorModel.data = new ResearchersAutoCompleteFieldDataEditorModel().buildForm().getRawValue();
|
// // fieldEditorModel.data = new ResearchersAutoCompleteFieldDataEditorModel().buildForm().getRawValue();
|
||||||
|
@ -362,7 +361,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
|
|
||||||
get canApplyVisibility():boolean{
|
get canApplyVisibility():boolean{
|
||||||
|
|
||||||
|
|
||||||
switch(this.viewType){
|
switch(this.viewType){
|
||||||
case this.viewTypeEnum.TextArea:
|
case this.viewTypeEnum.TextArea:
|
||||||
case this.viewTypeEnum.FreeText:
|
case this.viewTypeEnum.FreeText:
|
||||||
|
@ -383,7 +382,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
// validTicket:string;
|
// validTicket:string;
|
||||||
// generatePreview(){
|
// generatePreview(){
|
||||||
// const fieldEditorModel = new DatasetDescriptionFieldEditorModel();
|
// const fieldEditorModel = new DatasetDescriptionFieldEditorModel();
|
||||||
|
|
||||||
// fieldEditorModel.viewStyle= {
|
// fieldEditorModel.viewStyle= {
|
||||||
// renderStyle: this.form.get('viewStyle').get('renderStyle').value,
|
// renderStyle: this.form.get('viewStyle').get('renderStyle').value,
|
||||||
// cssClass: null
|
// cssClass: null
|
||||||
|
@ -391,11 +390,11 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
// fieldEditorModel.defaultValue = this.form.get('defaultValue').value;
|
// fieldEditorModel.defaultValue = this.form.get('defaultValue').value;
|
||||||
// switch (this.form.get('viewStyle').get('renderStyle').value) {
|
// switch (this.form.get('viewStyle').get('renderStyle').value) {
|
||||||
// case DatasetProfileFieldViewStyle.TextArea:
|
// case DatasetProfileFieldViewStyle.TextArea:
|
||||||
// fieldEditorModel.data = {
|
// fieldEditorModel.data = {
|
||||||
// label: this.form.get('data').get('label').value
|
// label: this.form.get('data').get('label').value
|
||||||
// };
|
// };
|
||||||
// break;
|
// break;
|
||||||
|
|
||||||
// default:
|
// default:
|
||||||
// break;
|
// break;
|
||||||
// }
|
// }
|
||||||
|
@ -405,13 +404,13 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
|
|
||||||
// }
|
// }
|
||||||
onInputTypeChange(){
|
onInputTypeChange(){
|
||||||
|
|
||||||
|
|
||||||
const x = this.viewType;
|
const x = this.viewType;
|
||||||
|
|
||||||
// this.showPreview = false;
|
// this.showPreview = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const field: Field = this.form.getRawValue();
|
const field: Field = this.form.getRawValue();
|
||||||
// field.defaultValue = {type:null, value: null};
|
// field.defaultValue = {type:null, value: null};
|
||||||
|
@ -425,7 +424,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
// if (this.form.get('data')) {
|
// if (this.form.get('data')) {
|
||||||
// this.form.removeControl('data');
|
// this.form.removeControl('data');
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// this.form.removeControl('defaultValue');
|
// this.form.removeControl('defaultValue');
|
||||||
// const defaultValueModel = new DefaultValueEditorModel();
|
// const defaultValueModel = new DefaultValueEditorModel();
|
||||||
// this.form.addControl('defaultValue',defaultValueModel.buildForm());
|
// this.form.addControl('defaultValue',defaultValueModel.buildForm());
|
||||||
|
@ -433,7 +432,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
switch (x) {
|
switch (x) {
|
||||||
case this.viewTypeEnum.BooleanDecision:{
|
case this.viewTypeEnum.BooleanDecision:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.BooleanDecision)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.BooleanDecision)
|
||||||
// this.form.addControl('data', new BooleanDecisionFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new BooleanDecisionFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -441,14 +440,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
label:""
|
label:""
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.BooleanDecision;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.BooleanDecision;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.CheckBox:{
|
case this.viewTypeEnum.CheckBox:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.CheckBox)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.CheckBox)
|
||||||
// this.form.addControl('data', new CheckBoxFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new CheckBoxFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -456,21 +455,21 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
label:''
|
label:''
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.CheckBox;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.CheckBox;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Select:{
|
case this.viewTypeEnum.Select:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox)
|
||||||
// this.form.addControl('data', new WordListFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new WordListFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
// this.form.get('data').setValidators(EditorCustomValidators.atLeastOneElementListValidator('options'));
|
// this.form.get('data').setValidators(EditorCustomValidators.atLeastOneElementListValidator('options'));
|
||||||
// this.form.get('data').updateValueAndValidity();
|
// this.form.get('data').updateValueAndValidity();
|
||||||
const option1 = {label:'', value:''} as FieldDataOption;
|
const option1 = {label:'', value:''} as FieldDataOption;
|
||||||
|
|
||||||
const data:WordListFieldData = {
|
const data:WordListFieldData = {
|
||||||
label:'',
|
label:'',
|
||||||
multiList:false,
|
multiList:false,
|
||||||
|
@ -479,14 +478,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.ComboBox;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.ComboBox;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Other:{
|
case this.viewTypeEnum.Other:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox)
|
||||||
// this.form.addControl('data', new AutoCompleteFieldDataEditorModel().buildForm()); //TODO SEE
|
// this.form.addControl('data', new AutoCompleteFieldDataEditorModel().buildForm()); //TODO SEE
|
||||||
|
|
||||||
|
@ -500,14 +499,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
type: DatasetProfileComboBoxType.Autocomplete
|
type: DatasetProfileComboBoxType.Autocomplete
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.ComboBox;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.ComboBox;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.InternalDmpEntities:{
|
case this.viewTypeEnum.InternalDmpEntities:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.InternalDmpEntities)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.InternalDmpEntities)
|
||||||
// this.form.addControl('data', new ResearchersAutoCompleteFieldDataEditorModel().buildForm());//TODO TO SEE
|
// this.form.addControl('data', new ResearchersAutoCompleteFieldDataEditorModel().buildForm());//TODO TO SEE
|
||||||
|
|
||||||
|
@ -517,14 +516,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
type: DatasetProfileInternalDmpEntitiesType.Dmps
|
type: DatasetProfileInternalDmpEntitiesType.Dmps
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.InternalDmpEntities;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.InternalDmpEntities;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.FreeText:{
|
case this.viewTypeEnum.FreeText:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.FreeText)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.FreeText)
|
||||||
// this.form.addControl('data', new FreeTextFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new FreeTextFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -532,14 +531,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
label:''
|
label:''
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.FreeText;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.FreeText;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.RadioBox:{
|
case this.viewTypeEnum.RadioBox:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.RadioBox)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.RadioBox)
|
||||||
// this.form.addControl('data', new RadioBoxFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new RadioBoxFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -552,14 +551,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.RadioBox;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.RadioBox;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.TextArea:{
|
case this.viewTypeEnum.TextArea:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.TextArea)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.TextArea)
|
||||||
// this.form.addControl('data', new TextAreaFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new TextAreaFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -568,21 +567,21 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.TextArea;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.TextArea;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.DatePicker:{
|
case this.viewTypeEnum.DatePicker:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DatePicker)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DatePicker)
|
||||||
// this.form.addControl('data', new DatePickerDataEditorModel().buildForm());
|
// this.form.addControl('data', new DatePickerDataEditorModel().buildForm());
|
||||||
|
|
||||||
const data: DatePickerFieldData = {
|
const data: DatePickerFieldData = {
|
||||||
label:''
|
label:''
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.DatePicker;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.DatePicker;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -597,14 +596,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.ExternalDatasets;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.ExternalDatasets;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.DataRepositories:{
|
case this.viewTypeEnum.DataRepositories:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DataRepositories)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DataRepositories)
|
||||||
// this.form.addControl('data', new DataRepositoriesDataEditorModel().buildForm());
|
// this.form.addControl('data', new DataRepositoriesDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -613,14 +612,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
multiAutoComplete: false
|
multiAutoComplete: false
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.DataRepositories;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.DataRepositories;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Registries:{
|
case this.viewTypeEnum.Registries:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Registries)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Registries)
|
||||||
// this.form.addControl('data', new RegistriesDataEditorModel().buildForm());
|
// this.form.addControl('data', new RegistriesDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -629,14 +628,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
multiAutoComplete: false
|
multiAutoComplete: false
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Registries;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Registries;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Services:{
|
case this.viewTypeEnum.Services:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Services)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Services)
|
||||||
// this.form.addControl('data', new ServicesDataEditorModel().buildForm());
|
// this.form.addControl('data', new ServicesDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -645,7 +644,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
multiAutoComplete: false
|
multiAutoComplete: false
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Services;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Services;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -658,20 +657,20 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
label:''
|
label:''
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Tags;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Tags;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Researchers:{
|
case this.viewTypeEnum.Researchers:{
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Researchers)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Researchers)
|
||||||
// // this.form.addControl('data', new ResearchersDataEditorModel().buildForm()); //TODO TO ASK
|
// // this.form.addControl('data', new ResearchersDataEditorModel().buildForm()); //TODO TO ASK
|
||||||
// this.form.addControl('data', new ResearchersAutoCompleteFieldDataEditorModel().buildForm());
|
// this.form.addControl('data', new ResearchersAutoCompleteFieldDataEditorModel().buildForm());
|
||||||
|
|
||||||
// field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Researchers;
|
// field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Researchers;
|
||||||
|
|
||||||
const data : ResearchersAutoCompleteFieldData = {
|
const data : ResearchersAutoCompleteFieldData = {
|
||||||
label:'',
|
label:'',
|
||||||
multiAutoComplete: false,
|
multiAutoComplete: false,
|
||||||
|
@ -687,7 +686,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Organizations:{
|
case this.viewTypeEnum.Organizations:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Organizations)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Organizations)
|
||||||
// this.form.addControl('data', new OrganizationsDataEditorModel().buildForm());
|
// this.form.addControl('data', new OrganizationsDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -695,17 +694,17 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
autoCompleteSingleDataList:[],
|
autoCompleteSingleDataList:[],
|
||||||
label:'',
|
label:'',
|
||||||
multiAutoComplete: false,
|
multiAutoComplete: false,
|
||||||
|
|
||||||
} as OrganizationsFieldData; //TODO
|
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Organizations;
|
} as OrganizationsFieldData; //TODO
|
||||||
|
|
||||||
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Organizations;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.DatasetIdentifier:{
|
case this.viewTypeEnum.DatasetIdentifier:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DatasetIdentifier)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DatasetIdentifier)
|
||||||
// this.form.addControl('data', new DatasetIdentifierDataEditorModel().buildForm());
|
// this.form.addControl('data', new DatasetIdentifierDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -713,14 +712,14 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
label:''
|
label:''
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.DatasetIdentifier;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.DatasetIdentifier;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Currency:{
|
case this.viewTypeEnum.Currency:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Currency)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Currency)
|
||||||
// this.form.addControl('data', new CurrencyDataEditorModel().buildForm());
|
// this.form.addControl('data', new CurrencyDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -728,13 +727,13 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
label:''
|
label:''
|
||||||
}
|
}
|
||||||
|
|
||||||
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Currency;
|
field.viewStyle.renderStyle = DatasetProfileFieldViewStyle.Currency;
|
||||||
field.data = data;
|
field.data = data;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case this.viewTypeEnum.Validation:{
|
case this.viewTypeEnum.Validation:{
|
||||||
|
|
||||||
|
|
||||||
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Validation)
|
// this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Validation)
|
||||||
// this.form.addControl('data', new ValidationDataEditorModel().buildForm());
|
// this.form.addControl('data', new ValidationDataEditorModel().buildForm());
|
||||||
|
|
||||||
|
@ -753,7 +752,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
// this.form.get('viewStyle').get('renderStyle').updateValueAndValidity();
|
// this.form.get('viewStyle').get('renderStyle').updateValueAndValidity();
|
||||||
// this.form.updateValueAndValidity();
|
// this.form.updateValueAndValidity();
|
||||||
|
|
||||||
|
|
||||||
const form = (new FieldEditorModel).fromModel(field).buildForm();
|
const form = (new FieldEditorModel).fromModel(field).buildForm();
|
||||||
|
|
||||||
|
|
||||||
|
@ -770,7 +769,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
fields.insert(index, form);
|
fields.insert(index, form);
|
||||||
this.form = form;
|
this.form = form;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// setTimeout(() => { //TODO
|
// setTimeout(() => { //TODO
|
||||||
|
@ -780,7 +779,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
|
|
||||||
|
|
||||||
toggleRequired(event:MatSlideToggleChange){
|
toggleRequired(event:MatSlideToggleChange){
|
||||||
|
|
||||||
let validationsControl = this.form.get('validations') as FormControl;
|
let validationsControl = this.form.get('validations') as FormControl;
|
||||||
let validations: Array<ValidationType> = validationsControl.value;
|
let validations: Array<ValidationType> = validationsControl.value;
|
||||||
|
|
||||||
|
@ -802,16 +801,16 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
get isRequired(){
|
get isRequired(){
|
||||||
let validationsControl = this.form.get('validations') as FormControl;
|
let validationsControl = this.form.get('validations') as FormControl;
|
||||||
let validations: Array<ValidationType> = validationsControl.value;
|
let validations: Array<ValidationType> = validationsControl.value;
|
||||||
|
|
||||||
if(validations.includes(ValidationType.Required)){
|
if(validations.includes(ValidationType.Required)){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
onDelete(){
|
onDelete(){
|
||||||
this.delete.emit();
|
this.delete.emit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue