MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

Connect-Admin release 19th June 2023 #2

Merged
k.triantafyllou merged 2 commits from develop into master 2023-06-20 08:37:42 +02:00
Conversation 0 Commits 2 Files Changed 4 +7 -4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b0b277278e - Show all commits

11
src/app/pages/content-providers/criteria/criteria.component.ts
View File

@ -49,7 +49,6 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
} }
ngOnInit() { ngOnInit() {
this.reset();
this.loading = false; this.loading = false;
this.subscriptions.push(this.vocabulariesService.getVocabularyByType('fos', null, properties).subscribe((fos: any[]) => { this.subscriptions.push(this.vocabulariesService.getVocabularyByType('fos', null, properties).subscribe((fos: any[]) => {
this.fos = fos.map(element => element.id); this.fos = fos.map(element => element.id);
@ -60,6 +59,9 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
} }
ngOnChanges(changes: SimpleChanges) { ngOnChanges(changes: SimpleChanges) {
if(changes.selectionCriteria){
this.reset();
}
this.calculateMaxHeight(); this.calculateMaxHeight();
} }
@ -86,10 +88,11 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
} }
reset() { reset() {
this.selectionCriteriaForm = this.fb.group({
criteria: this.fb.array([])
});
if (this.selectionCriteria?.criteria) { if (this.selectionCriteria?.criteria) {
this.selectionCriteriaForm = this.fb.group({
criteria: this.fb.array([])
});
this.selectionCriteria.criteria.forEach(criterion => { this.selectionCriteria.criteria.forEach(criterion => {
let constraintArray: UntypedFormArray = this.fb.array([]); let constraintArray: UntypedFormArray = this.fb.array([]);
criterion.constraint.forEach(constraint => { criterion.constraint.forEach(constraint => {