+ [class.uk-form-danger]="constraint.get('value').status === 'INVALID'">
j + 1">AND
diff --git a/src/app/pages/community/content-providers/criteria/criteria.component.ts b/src/app/pages/community/content-providers/criteria/criteria.component.ts
index 34ee758..4824307 100644
--- a/src/app/pages/community/content-providers/criteria/criteria.component.ts
+++ b/src/app/pages/community/content-providers/criteria/criteria.component.ts
@@ -62,11 +62,11 @@ export class CriteriaComponent implements OnInit {
this.selectioncriteria = this.fb.group({
criteria: this.fb.array([])
});
- let selectionCriteria = CriteriaComponent.CDataToJSON(this.dataProvider.selectioncriteria);
+ let selectionCriteria = this.dataProvider.selectioncriteria;
if (selectionCriteria) {
selectionCriteria.criteria.forEach(criterion => {
let constraintArray: FormArray = this.fb.array([]);
- criterion.sc.forEach(constraint => {
+ criterion.constraint.forEach(constraint => {
constraintArray.push(this.fb.group({
field: this.fb.control(constraint.field, Validators.required),
verb: this.fb.control(constraint.verb, Validators.required),
@@ -74,7 +74,7 @@ export class CriteriaComponent implements OnInit {
}));
});
this.criteria.push(this.fb.group({
- sc: constraintArray
+ constraint: constraintArray
}));
});
}
@@ -85,7 +85,7 @@ export class CriteriaComponent implements OnInit {
}
public getConstraint(i: number): FormArray {
- return this.criteria.at(i).get('sc') as FormArray;
+ return this.criteria.at(i).get('constraint') as FormArray;
}
public addCriteria() {
@@ -97,12 +97,12 @@ export class CriteriaComponent implements OnInit {
})
]);
this.criteria.push(this.fb.group({
- sc: constraintArray
+ constraint: constraintArray
}));
}
public addConstraint(i: number) {
- let constraintArray: FormArray = this.criteria.at(i).get('sc') as FormArray;
+ let constraintArray: FormArray = this.criteria.at(i).get('constraint') as FormArray;
constraintArray.push(this.fb.group({
field: this.fb.control('', Validators.required),
verb: this.fb.control('contains', Validators.required),
@@ -111,34 +111,17 @@ export class CriteriaComponent implements OnInit {
}
public removeConstraint(i: number, j: number) {
- let constraintArray: FormArray = this.criteria.at(i).get('sc') as FormArray;
+ let constraintArray: FormArray = this.criteria.at(i).get('constraint') as FormArray;
constraintArray.removeAt(j);
if (constraintArray.length === 0) {
this.criteria.removeAt(i);
}
}
- public static CDataToJSON(cdata: string): SelectionCriteria {
- if(cdata && cdata.length > 0) {
- return JSON.parse(cdata.replace('', ''));
- } else {
- return null;
- }
- }
-
- public static JSONToCData(selectioncriteria: SelectionCriteria): string {
- if(selectioncriteria && selectioncriteria.criteria.length > 0) {
- return '';
- } else {
- return '';
- }
- }
-
save() {
this.errorMessage = null;
if (this.selectioncriteria.status === 'VALID') {
- this.dataProvider.selectioncriteria = CriteriaComponent.JSONToCData(this.selectioncriteria.value);
+ this.dataProvider.selectioncriteria = this.selectioncriteria.value;
this.manageCommunityContentProvidersService.
saveContentProvider(this.properties, this.dataProvider).subscribe( () => {
this._router.navigate(['manage-content-providers'], {
diff --git a/src/app/pages/community/content-providers/remove-content-providers.component.ts b/src/app/pages/community/content-providers/remove-content-providers.component.ts
index 6f1164f..15527bf 100644
--- a/src/app/pages/community/content-providers/remove-content-providers.component.ts
+++ b/src/app/pages/community/content-providers/remove-content-providers.component.ts
@@ -133,8 +133,7 @@ export class RemoveContentProvidersComponent implements OnInit {
//console.info("ngAfterViewInit");
}
- public getCriteriaLabel(cdata: string): string {
- let selectionCriteria: SelectionCriteria = CriteriaComponent.CDataToJSON(cdata);
+ public getCriteriaLabel(selectionCriteria: SelectionCriteria): string {
if(selectionCriteria && selectionCriteria.criteria.length > 0) {
return (selectionCriteria.criteria.length === 1)?'1 criterion':(selectionCriteria.criteria.length + ' criteria')
} else {
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index e91fa84..af4d224 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -34,7 +34,7 @@
"piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
"loginUrl" :"http://rudie.di.uoa.gr:8080/dnet-login/openid_connect_login",
- "userInfoUrl" : "http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
+ "userInfoUrl" : "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",