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

Add communitiesAPI link in env-properties, Use communityAPI and communitiesAPI instead of links for community and communities component 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51238 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
sofia.baltzi 2018-03-14 14:38:57 +00:00
parent f39df4d185
commit 368969bc22
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/communities/communities.component.ts
View File

@ -56,12 +56,13 @@ export class CommunitiesComponent {
if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe(); this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
} }
this._communitiesService.getCommunities(this.properties.communitiesAPI).subscribe(
communitiesResults => {
this.communitiesResults = communitiesResults;
//console.log(communitiesResults);
});
}); });
this._communitiesService.getCommunities('https://dev-openaire.d4science.org/openaire/community/communities').subscribe(
communitiesResults => {
this.communitiesResults = communitiesResults;
//console.log(communitiesResults);
});
} }
public ngOnDestroy() { public ngOnDestroy() {

15
src/app/community/community.component.ts
View File

@ -75,13 +75,20 @@ export class CommunityComponent {
this.communityId = communityId['communityId']; this.communityId = communityId['communityId'];
}); });
this._communityService.getCommunity('https://dev-openaire.d4science.org/openaire/community/'+this.communityId).subscribe ( this._communityService.getCommunity(this.properties.communityAPI+this.communityId).subscribe (
community => { community => {
this.community = community; this.community = community;
this.params = {community: encodeURIComponent('"'+community.queryId+'"')}; this.params = {community: encodeURIComponent('"'+community.queryId+'"')};
//console.log(community); //console.log(community);
}); });
// this._communityService.getCommunity('https://dev-openaire.d4science.org/openaire/community/'+this.communityId).subscribe (
// community => {
// this.community = community;
// this.params = {community: encodeURIComponent('"'+community.queryId+'"')};
// //console.log(community);
// });
this._searchEntriesService.getTotal('http://beta.services.openaire.eu:8480/search/rest/v2/api/publications/count?format=json&fq=communityid='+this.communityId).subscribe( this._searchEntriesService.getTotal('http://beta.services.openaire.eu:8480/search/rest/v2/api/publications/count?format=json&fq=communityid='+this.communityId).subscribe(
publicationTotal => { publicationTotal => {
this.publicationTotal = publicationTotal; this.publicationTotal = publicationTotal;
@ -97,19 +104,19 @@ export class CommunityComponent {
this.softwareTotal = softwareTotal; this.softwareTotal = softwareTotal;
}); });
this._searchEntriesService.countTotal('https://dev-openaire.d4science.org/openaire/community/'+this.communityId+'/projects').subscribe( this._searchEntriesService.countTotal(this.properties.communityAPI+this.communityId+'/projects').subscribe(
projectTotal => { projectTotal => {
this.projectTotal = projectTotal; this.projectTotal = projectTotal;
//console.log(projectTotal); //console.log(projectTotal);
}); });
this._searchEntriesService.countTotal('https://dev-openaire.d4science.org/openaire/community/'+this.communityId+'/contentproviders').subscribe( this._searchEntriesService.countTotal(this.properties.communityAPI+this.communityId+'/contentproviders').subscribe(
contentProviderTotal => { contentProviderTotal => {
this.contentProviderTotal = contentProviderTotal; this.contentProviderTotal = contentProviderTotal;
//console.log(contentProviderTotal); //console.log(contentProviderTotal);
}); });
// this._searchEntriesService.countTotal('https://dev-openaire.d4science.org/openaire/community/'+this.communityId+'/organizations').subscribe( // this._searchEntriesService.countTotal(this.properties.communityAPI+this.communityId+'/organizations').subscribe(
// organizationTotal => { // organizationTotal => {
// this.organizationTotal = organizationTotal; // this.organizationTotal = organizationTotal;
// console.log(organizationTotal); // console.log(organizationTotal);

3
src/assets/env-properties.json
View File

@ -60,7 +60,8 @@
"adminToolsCommunity" :"openaire", "adminToolsCommunity" :"openaire",
"communityAPI": "https://dev-openaire.d4science.org/openaire/community/", "communityAPI": "https://dev-openaire.d4science.org/openaire/community/",
"communitiesAPI": "https://dev-openaire.d4science.org/openaire/community/communities",
"csvLimit": 2000, "csvLimit": 2000,
"pagingLimit": 20, "pagingLimit": 20,