diff --git a/portal-4cli-lib/explore-production-properties.json b/portal-4cli-lib/explore-production-properties.json index 331de6d9..c6962cb6 100644 --- a/portal-4cli-lib/explore-production-properties.json +++ b/portal-4cli-lib/explore-production-properties.json @@ -44,6 +44,8 @@ "helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route", "cacheUrl" :"https://demo.openaire.eu/cache/get?url=", + + "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/", "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/", diff --git a/portal-4cli-lib/src/app/home/home.component.html b/portal-4cli-lib/src/app/home/home.component.html index dfc59132..a9b2adc8 100644 --- a/portal-4cli-lib/src/app/home/home.component.html +++ b/portal-4cli-lib/src/app/home/home.component.html @@ -26,8 +26,7 @@ {{fundersSize.number}} {{fundersSize.size}} funders 6900 data sources - 15 funders -

+

... linked together

@@ -125,6 +124,66 @@ New content providers
+
diff --git a/portal-4cli-lib/src/app/home/home.component.ts b/portal-4cli-lib/src/app/home/home.component.ts index 403ebca4..a4802c4d 100644 --- a/portal-4cli-lib/src/app/home/home.component.ts +++ b/portal-4cli-lib/src/app/home/home.component.ts @@ -6,6 +6,7 @@ import "rxjs/add/observable/zip"; import {Title, Meta} from '@angular/platform-browser'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import { SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service'; +import { FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class'; import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; import { SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service'; @@ -40,6 +41,9 @@ export class HomeComponent { public projectsSize:any = null; public datasourcesSize:any = null; + private numResults: number = 2; + public fetchDataproviders : FetchDataproviders; + showPublications:boolean= false; showDatasets:boolean= false; showProjects:boolean= false; @@ -69,6 +73,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr; this._meta.updateTag({content:description},"property='og:description'"); this._meta.updateTag({content:title},"property='og:title'"); + //this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); } public ngOnInit() { @@ -93,6 +98,9 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr; this.showProjects = showEntity["project"]; this.showDataProviders = showEntity["datasource"]; this.getNumbers(); + // if(this.showDataProviders) { + // this.fetchDataproviders.getResultsForHome(this.numResults, this.properties); + // } }); } }); diff --git a/portal-4cli-lib/src/app/home/home.module.ts b/portal-4cli-lib/src/app/home/home.module.ts index 2f304c90..8328760e 100644 --- a/portal-4cli-lib/src/app/home/home.module.ts +++ b/portal-4cli-lib/src/app/home/home.module.ts @@ -20,6 +20,9 @@ import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refin import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + +import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module'; + @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, @@ -30,8 +33,8 @@ import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRout SearchFormModule, PiwikServiceModule, HomeRoutingModule, - HelperModule - + HelperModule, + ErrorMessagesModule ], declarations: [ HomeComponent diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index f7462849..9b621e5c 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -50,6 +50,8 @@ "adminToolsCommunity" :"openaire", + "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/", + "communityAPI": "https://dev-openaire.d4science.org/openaire/community/", "csvLimit": 2000,