-
+
-
0" class="uk-align-center uk-margin-remove-bottom">
-
+
0" class="uk-align-center uk-margin-remove-bottom">
+
- {{communitySearchUtils.totalResults | number}} content providers, page {{communitySearchUtils.page | number}} of {{(totalPages()) | number}}
+ {{communitySearchUtils.totalResults | number}} content providers, page {{communitySearchUtils.page | number}}
+ of {{(totalPages()) | number}}
-
-
+
+
-
+
-
+
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 6a1dff2..957f670 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
@@ -306,4 +306,14 @@ export class RemoveContentProvidersComponent implements OnInit {
);
}
}
+
+ goToCriteria(openaireId: string) {
+ this._router.navigate(['criteria'], {
+ queryParams: {
+ communityId: this.community,
+ openaireId: openaireId
+ },
+ relativeTo: this.route
+ })
+ }
}
diff --git a/src/app/pages/curator/curator.component.ts b/src/app/pages/curator/curator.component.ts
index c0fd342..0b82154 100644
--- a/src/app/pages/curator/curator.component.ts
+++ b/src/app/pages/curator/curator.component.ts
@@ -158,7 +158,6 @@ export class CuratorComponent implements OnInit {
for (let page of community.pages) {
if (page['route'] === '/curators') {
this.curatorsEnabled = page['isEnabled'];
- console.log(this.curatorsEnabled);
return;
}
}
diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts
index adc95ed..8fe69b0 100644
--- a/src/app/services/manageContentProviders.service.ts
+++ b/src/app/services/manageContentProviders.service.ts
@@ -1,45 +1,34 @@
import {Injectable} from '@angular/core';
import {HttpClient, HttpHeaders} from '@angular/common/http';
-import{EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+import {ContentProvider} from '../openaireLibrary/utils/entities/contentProvider';
+import {Observable} from 'rxjs/Observable';
@Injectable()
export class ManageCommunityContentProvidersService {
- constructor(private http: HttpClient ) {}
-
- removeContentProvider (properties:EnvProperties, communityId: string, id: string):any {
- //let headers = new Headers({'Content-Type': 'application/json', 'accept': 'application/json'});
- //let options = new RequestOptions({headers: headers, body: id});
-
- let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
-
- let url = properties.communityAPI+communityId+"/contentproviders";
- //return this.http.delete(url, options)
- return this.http.request('delete', url, { body: id, headers: headers})
+ constructor(private http: HttpClient) {
}
- addContentProvider(properties:EnvProperties, communityId: string, contentProvider: any) {
- //let headers = new Headers({'Content-Type': 'application/json'});
- //let options = new RequestOptions({headers: headers});
+ removeContentProvider(properties: EnvProperties, communityId: string, id: string): any {
+ let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
+ let url = properties.communityAPI + communityId + '/contentproviders';
+ return this.http.request('delete', url, {body: id, headers: headers});
+ }
- let headers = new HttpHeaders({'Content-Type': 'application/json'});
+ addContentProvider(properties: EnvProperties, communityId: string, contentProvider: any): Observable
{
+ let url = properties.communityAPI + communityId + '/contentproviders';
+ let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, communityId);
+ return this.http.post(url, communityContentProvider);
+ }
- let url = properties.communityAPI+communityId+"/contentproviders";
-
- let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, communityId);
-
- return this.http.post(url, JSON.stringify(communityContentProvider), {headers: headers});
- //return this.http.post(url, JSON.stringify(communityContentProvider), options)
- //.map(res => res.json())
- }
-
- convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string) : any {
- let communityContentProvider = {
- "communityId": community,
- "officialname": "",
- "name": "",
- "openaireId": ""
- }
+ saveContentProvider(properties: EnvProperties, contentProvider: ContentProvider): Observable {
+ let url = properties.communityAPI + contentProvider.communityId + '/contentproviders';
+ return this.http.post(url, contentProvider);
+ }
+ convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string): ContentProvider {
+ let communityContentProvider: ContentProvider = new ContentProvider();
+ communityContentProvider.communityId = community;
communityContentProvider.officialname = contentProvider.title.name;
communityContentProvider.name = contentProvider.englishname;
communityContentProvider.openaireId = contentProvider.id;
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 5229564..af4d224 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -1,5 +1,5 @@
{
- "environment":"production",
+ "environment":"development",
"enablePiwikTrack" : false,
"useCache" : false,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
@@ -32,9 +32,9 @@
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
"piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
- "loginUrl" :"http://rudie.di.uoa.gr:8280/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
+ "loginUrl" :"http://rudie.di.uoa.gr:8080/dnet-login/openid_connect_login",
- "userInfoUrl" : "http://rudie.di.uoa.gr:8280/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=",