From 7399cd9ea6c0f8ef17d6e55795d1deb2489ebe22 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 1 Nov 2023 14:26:09 +0200 Subject: [PATCH 01/13] [develop | WIP] add common properties in library file, delete unused properties --- utils/properties/env-properties.ts | 44 +++- utils/properties/environments/environment.ts | 210 ++++++++++++++++--- 2 files changed, 214 insertions(+), 40 deletions(-) diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 65931eaa..c3a4a613 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -1,3 +1,5 @@ +import {watch} from "fs/promises"; + export type Environment = "development" | "test" | "beta" | "production"; export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc"; export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc"; @@ -14,16 +16,15 @@ export interface EnvProperties { showAddThis?: boolean; showContent?: boolean; enableEoscDataTransfer?:boolean; - framesAPIURL?: string; - statisticsFrameAPIURL?: string; + statisticsFrameAPIURL?: string; //delete? statisticsFrameNewAPIURL?: string; bipFrameAPIURL?: string; - useNewStatistisTool?: boolean; + useNewStatistisTool?: boolean; //delete? useOldStatisticsSchema?: boolean; monitorStatsFrameUrl?:string; disableFrameLoad?:boolean statisticsAPIURL?: string; - impactFactorsAPIURL?: string; + impactFactorsAPIURL?: string; //??? enermapsURL?: string; claimsAPIURL?: string; searchAPIURLLAst?: string; @@ -51,11 +52,6 @@ export interface EnvProperties { sherpaURLSuffix?: string; zenodo?: string; zenodoCommunities?: string; - openAccess?: string; - openAccessRepo?: string; - fp7Guidlines?: string; - h2020Guidlines?: string; - ercGuidlines?: string; helpdesk?: string; helpdeskEmail?: string; utilsService?: string; @@ -135,10 +131,10 @@ export interface EnvProperties { reCaptchaSiteKey?: string; // contact us recipients admins?: string[]; - lastIndexUpdate?: string; + lastIndexUpdate?: string; //delete? indexInfoAPI?: string; altMetricsAPIURL?: string; - b2noteAPIURL?: string; + b2noteAPIURL?: string; //delete? adminPortalURL?: string; sushiliteURL?: string; notificationsAPIURL?: string; @@ -151,3 +147,29 @@ export interface EnvProperties { eoscDataTransferDestinations?; hasMachineCache?: boolean; } + +export function checkPropertyValues(properties:EnvProperties){ + let keys = Object.keys(properties); + let Warn = 0; + // console.debug( "Environment: " +properties.environment ) + for(let attribute of keys){ + + // console.debug(attribute + ": " +properties[attribute] + " " ) + if (properties.environment == "production" && typeof properties[attribute] == 'string' && (properties[attribute].indexOf("beta.") != -1 || properties[attribute].indexOf("uoa.di.gr") != -1)) { + console.warn("shouldn't be prod? " + attribute + ": " + properties[attribute]); + Warn++; + } + if (properties.environment != "production" && typeof properties[attribute] == 'string' && properties[attribute].indexOf("https://services.") != -1) { + console.warn("should be prod? " + attribute + ": " + properties[attribute]); + Warn++; + } + if (properties.environment != "development" && typeof properties[attribute] == 'string' && properties[attribute].indexOf("uoa.di.gr") != -1) { + console.warn("should be in dev? " + attribute + ": " + properties[attribute]); + Warn++; + } + + } + /*if(Warn > 0){ + alert("check properties: " + Warn) + }*/ +} diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index 6faf2d7f..133629cd 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -1,45 +1,197 @@ import {EnvProperties} from "../env-properties"; export let common: EnvProperties = { + + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", + useNewStatistisTool: true, + openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", + searchCrossrefAPIURL: "https://api.crossref.org/works", + searchDataciteAPIURL: "https://api.datacite.org/works", + searchOrcidURL: "https://pub.orcid.org/v2.1/", + orcidURL: "https://orcid.org/", + orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", + orcidTokenURL : "https://orcid.org/oauth/authorize?", + orcidClientId: "APP-IN0O56SBVVTB7NN4", + doiURL: "https://doi.org/", + pmcURL: "http://europepmc.org/articles/", + pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", + handleURL: "http://hdl.handle.net/", + cordisURL: "http://cordis.europa.eu/projects/", + openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", + r3DataURL: "http://service.re3data.org/repository/", swhURL: "https://archive.softwareheritage.org/", - // searchCrossrefAPIURL: "https://api.crossref.org/works", - // searchDataciteAPIURL: "https://api.datacite.org/works", - // searchOrcidURL: "https://pub.orcid.org/v2.1/", - // orcidURL: "https://orcid.org/", - // doiURL: "https://doi.org/", - // pmcURL: "http://europepmc.org/articles/", - // pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", - // handleURL: "http://hdl.handle.net/", - // cordisURL: "http://cordis.europa.eu/projects/", - // openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", - // r3DataURL: "http://service.re3data.org/repository/", - // fairSharingURL: "https://fairsharing.org/", - // sherpaURL: "http://sherpa.ac.uk/romeo/issn/", - // sherpaURLSuffix: "/", - // zenodo: "https://zenodo.org/", - // openAccess: "https://www.openaire.eu/support/faq#article-id-234", - // openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - // fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - // h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - // ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", + fairSharingURL: "https://fairsharing.org/", + eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", + sherpaURL: "http://sherpa.ac.uk/romeo/issn/", + sherpaURLSuffix: "/", + zenodo: "https://zenodo.org/", + helpdesk: "https://www.openaire.eu/support/helpdesk", + helpdeskEmail: "helpdesk@openaire.eu", + piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", + cookieDomain: ".openaire.eu", + feedbackmail: "feedback@openaire.eu", + csvLimit: 2000, + pagingLimit: 20, + resultsPerPage: 10, + baseLink : "", + searchLinkToResult: "/search/result?id=", + searchLinkToPublication: "/search/publication?articleId=", + searchLinkToProject: "/search/project?projectId=", + searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToDataset: "/search/dataset?datasetId=", + searchLinkToSoftwareLanding: "/search/software?softwareId=", + searchLinkToOrp: "/search/other?orpId=", + searchLinkToOrganization: "/search/organization?organizationId=", + searchLinkToAll: "/search/find/", + searchLinkToPublications: "/search/find/publications", + searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToProjects: "/search/find/projects", + searchLinkToDatasets: "/search/find/datasets", + searchLinkToSoftware: "/search/find/software", + searchLinkToOrps: "/search/find/other", + searchLinkToOrganizations: "/search/find/organizations", + searchLinkToCompatibleDataProviders: "/search/content-providers", + searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", + searchLinkToJournals: "/search/journals", + searchLinkToResults: "/search/find/research-outcomes", + searchLinkToAdvancedPublications: "/search/advanced/publications", + searchLinkToAdvancedProjects: "/search/advanced/projects", + searchLinkToAdvancedDatasets: "/search/advanced/datasets", + searchLinkToAdvancedSoftware: "/search/advanced/software", + searchLinkToAdvancedOrps: "/search/advanced/other", + searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedOrganizations: "/search/advanced/organizations", + searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: '/error', + showLastIndexInformationLink: true, + lastIndexUpdate: "2020-06-15", + depositLearnHowPage: "/participate/deposit/learn-how", + depositSearchPage: "/participate/deposit/search", + altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", + reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", + admins: ['feedback@openaire.eu'], + b2noteAPIURL: 'https://b2note.eudat.eu/', + myOrcidLinksPage: "/my-orcid-links", + footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" } export let commonDev: EnvProperties = { - // searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", - // searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + environment: "development", + statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/", + statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", + statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", + claimsAPIURL: "http://rudie.di.uoa.gr:8980/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", + searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", + searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + + openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", + csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", + orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", + orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?", + orcidClientId: "APP-A5M3KTX6NCN67L91", + utilsService: "http://dl170.madgik.di.uoa.gr:8000", + vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/", + loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", + userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", + logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", + cookieDomain: ".di.uoa.gr", + feedbackmail: "kostis30fylloy@gmail.com", + cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=", + monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service", + adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/", + datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/", + contextsAPI: "https://dev-openaire.d4science.org/openaire/context", + communityAPI: "https://dev-openaire.d4science.org/openaire/community/", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", + widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + claimsInformationLink: "https://www.openaire.eu/linking-beta", + indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", + admins: ['kostis30fylloy@gmail.com', 'alexandros.martzios@athenarc.gr', 'kgalouni@di.uoa.gr'], + adminPortalURL: "https://beta.admin.connect.openaire.eu", + + } export let commonTest: EnvProperties = { - // searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/", - // searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources", + environment: "test", + statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", + statisticsFrameAPIURL: "https://www.openaire.eu/stats/", + statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", + claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", + searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/", + searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources", + csvAPIURL: "https://services.openaire.eu/search/v2/api/reports", + utilsService: "https://explore.openaire.eu/utils-service", + vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", + loginUrl: " https://services.openaire.eu/login-service/openid_connect_login", + userInfoUrl: " https://services.openaire.eu/login-service/userInfo", + logoutUrl: "https://services.openaire.eu/login-service/openid_logout", + cacheUrl: "https://explore.openaire.eu/cache/get?url=", + datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/", + monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service", + adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", + contextsAPI: "https://services.openaire.eu/openaire/context", + communityAPI: "https://services.openaire.eu/openaire/community/", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", + widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + claimsInformationLink: "https://www.openaire.eu/linking", + indexInfoAPI: "https://services.openaire.eu/openaire/info/", + + adminPortalURL: "https://admin.explore.openaire.eu", + } export let commonBeta: EnvProperties = { - // searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", - // searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + environment: "beta", + statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", + statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", + statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", + claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", + searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", + searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", + utilsService: "https://demo.openaire.eu/utils-service", + vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", + loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", + userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", + logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", + cacheUrl: "https://demo.openaire.eu/cache/get?url=", + datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/", + monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service", + adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", + contextsAPI: "https://beta.services.openaire.eu/openaire/context", + communityAPI: "https://beta.services.openaire.eu/openaire/community/", + lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", + widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + claimsInformationLink: "https://beta.openaire.eu/linking", + indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", + adminPortalURL: "https://beta.admin.connect.openaire.eu" } export let commonProd: EnvProperties = { - // searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", - // searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", -} \ No newline at end of file + environment: "production", + statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", + statisticsFrameAPIURL: "https://www.openaire.eu/stats/", + statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", + claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", + searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", + searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", + csvAPIURL: "https://services.openaire.eu/search/v2/api/reports", + utilsService: "https://explore.openaire.eu/utils-service", + vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", + loginUrl: " https://services.openaire.eu/login-service/openid_connect_login", + userInfoUrl: " https://services.openaire.eu/login-service/userInfo", + logoutUrl: "https://services.openaire.eu/login-service/openid_logout", + cacheUrl: "https://explore.openaire.eu/cache/get?url=", + datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/", + monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service", + adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", + contextsAPI: "https://services.openaire.eu/openaire/context", + communityAPI: "https://services.openaire.eu/openaire/community/", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", + widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + claimsInformationLink: "https://www.openaire.eu/linking", + indexInfoAPI: "https://services.openaire.eu/openaire/info/", + adminPortalURL: "https://admin.explore.openaire.eu", + +} From 7f9117eccb43f1e29a84b6e7e6d4494da6a34384 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 10 Nov 2023 19:44:15 +0200 Subject: [PATCH 02/13] [develop | DONE | CHANGED]: data sources landing: Get and parse number of collected fulltexts from a new stats api. 1. env-properties.ts: Added property pdfStatisticsAPIURL?: string; 2. environment.ts: Added pdfStatisticsAPIURL property in all environments. 3. dataProvider.service.ts: Uncomment method "getCollectedFulltexts()". 4. dataProvider.component.ts: Call method "getCollectedFulltexts()" instead of "getDataProviderAggregationStatus()". --- .../dataProvider/dataProvider.component.ts | 42 +++++++++---------- .../dataProvider/dataProvider.service.ts | 8 ++-- utils/properties/env-properties.ts | 1 + utils/properties/environments/environment.ts | 4 ++ 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 6c4b8be0..baebcd09 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -394,8 +394,8 @@ export class DataProviderComponent { this.updateUrl(this.canonicalUrl); this.seoService.createLinkForCanonicalURL(this.properties.domain +this.properties.baseLink + this._router.url); if (typeof document !== 'undefined') { - this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId); - // this.getCollectedFulltexts(); + // this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId); + this.getCollectedFulltexts(); this.countResultsWithFundingInfo(); } else { this.aggregationStatusIsInitialized = true; @@ -454,34 +454,34 @@ export class DataProviderComponent { } } - private getDataProviderAggregationStatus(originalId: string) { - this.subscriptions.push(this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe( - data => { - this.dataProviderInfo.aggregationStatus = data; - this.aggregationStatusIsInitialized = true; - }, - err => { - //console.log(err); - this.aggregationStatusIsInitialized = true; - this.handleError("Error getting "+this.getTypeName()+" aggregation status for id: " + this.datasourceId, err); - } - )); - } - - // private getCollectedFulltexts() { - // this.subscriptions.push(this._dataproviderService.getCollectedFulltexts(this.datasourceId).subscribe( - // (data: string) => { - // this.dataProviderInfo.aggregationStatus = {"fulltexts": data}; + // private getDataProviderAggregationStatus(originalId: string) { + // this.subscriptions.push(this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe( + // data => { + // this.dataProviderInfo.aggregationStatus = data; // this.aggregationStatusIsInitialized = true; // }, // err => { // //console.log(err); // this.aggregationStatusIsInitialized = true; - // this.handleError("Error getting "+this.getTypeName()+" collected fulltexts for id: " + this.datasourceId, err); + // this.handleError("Error getting "+this.getTypeName()+" aggregation status for id: " + this.datasourceId, err); // } // )); // } + private getCollectedFulltexts() { + this.subscriptions.push(this._dataproviderService.getCollectedFulltexts(this.datasourceId).subscribe( + (data: string) => { + this.dataProviderInfo.aggregationStatus = {"fulltexts": data}; + this.aggregationStatusIsInitialized = true; + }, + err => { + //console.log(err); + this.aggregationStatusIsInitialized = true; + this.handleError("Error getting "+this.getTypeName()+" collected fulltexts for id: " + this.datasourceId, err); + } + )); + } + private countResultsWithFundingInfo() { this.subscriptions.push(this._searchResearchResultsService.countCollectedResultsWithFundingInfo(this.datasourceId).subscribe( fundedContent => { diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts index a80645e8..e62dd935 100644 --- a/landingPages/dataProvider/dataProvider.service.ts +++ b/landingPages/dataProvider/dataProvider.service.ts @@ -83,10 +83,10 @@ export class DataProviderService { .pipe(map(res => this.parseDataproviderAggregationStatus(res))); } - // getCollectedFulltexts(datasourceId: string) { - // return this.http.get(properties.pdfStatisticsAPIURL+"/api/stats/getNumberOfPayloadsForDatasource?datasourceId="+datasourceId) - // .pipe(map(res => res)) - // } + getCollectedFulltexts(datasourceId: string) { + return this.http.get(properties.pdfStatisticsAPIURL+"/stats/getNumberOfPayloadsForDatasource?datasourceId="+datasourceId) + .pipe(map(res => res)) + } private handleError (error: HttpErrorResponse) { // in a real world app, we may send the error to some remote logging infrastructure diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 9f6b6db8..f31bab44 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -15,6 +15,7 @@ export interface EnvProperties { showAddThis?: boolean; showContent?: boolean; enableEoscDataTransfer?:boolean; + pdfStatisticsAPIURL?: string; statisticsFrameAPIURL?: string; //delete? statisticsFrameNewAPIURL?: string; bipFrameAPIURL?: string; diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index 60dc03e4..c501777d 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -90,6 +90,7 @@ export let common: EnvProperties = { export let commonDev: EnvProperties = { environment: "development", + pdfStatisticsAPIURL: "https://beta.services.openaire.eu/pdf-stats", statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", @@ -133,6 +134,7 @@ export let commonDev: EnvProperties = { export let commonTest: EnvProperties = { environment: "test", + pdfStatisticsAPIURL: "https://services.openaire.eu/pdf-stats", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", @@ -164,6 +166,7 @@ export let commonTest: EnvProperties = { export let commonBeta: EnvProperties = { environment: "beta", + pdfStatisticsAPIURL: "https://beta.services.openaire.eu/pdf-stats", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", @@ -203,6 +206,7 @@ export let commonBeta: EnvProperties = { export let commonProd: EnvProperties = { environment: "production", + pdfStatisticsAPIURL: "https://services.openaire.eu/pdf-stats", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", From 51bd7efcbe10543c56145c71c7af970fb730e63e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 13 Nov 2023 20:22:01 +0200 Subject: [PATCH 03/13] [develop | DONE | FIXED] entitiesSelection.component.ts: Added faircore4eosc in adminToolsPortalType check to include entities according to the configuration. --- searchPages/searchUtils/entitiesSelection.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts index 9241f78e..d4df8e7b 100644 --- a/searchPages/searchUtils/entitiesSelection.component.ts +++ b/searchPages/searchUtils/entitiesSelection.component.ts @@ -40,7 +40,7 @@ export class EntitiesSelectionComponent { /** TODO change conditions base on PortalType instead of customFilter */ ngOnInit() { - if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc'].includes(this.properties.adminToolsPortalType))) { + if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'faircore4eosc'].includes(this.properties.adminToolsPortalType))) { this.subscriptions.push(this.config.portalAsObservable.subscribe(data => { if (data) { let showEntity = {}; From f0c37512c31236868f482798f80ff5977a1edbad Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 15 Nov 2023 17:34:15 +0200 Subject: [PATCH 04/13] [develop | DONE | FIXED] : show again enermaps tab in result landing --- landingPages/result/resultLanding.component.html | 12 ++++++------ landingPages/result/resultLanding.component.ts | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index ca097000..dd683993 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -297,13 +297,13 @@ + + - - @@ -328,14 +328,14 @@ + + +
- - -
1) { for (let relClass of this.resultLandingInfo.relatedClassFilters) { @@ -591,6 +587,9 @@ export class ResultLandingComponent { this.cdr.detectChanges(); if (contexts) { + if (this.communityId && this.communityId == "enermaps" && properties.enermapsURL) { + this.enermapsId = ParsingFunctions.getEnermapsConceptId(contexts); + } await this.promise; if(this.publicCommunities && this.publicCommunities.length > 0) { this.resultLandingInfo.contexts = contexts.filter(context => { From 5b0c207150b9e37a4a6d689379f1321c9fccfe85 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 15 Nov 2023 17:39:03 +0200 Subject: [PATCH 05/13] [develop | DONE | FIXED] : re-add properties for services --- utils/properties/environments/environment.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index 67b8ea44..eee75682 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -38,6 +38,7 @@ export let common: EnvProperties = { searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToService: "/search/service?serviceId=", searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", @@ -45,6 +46,7 @@ export let common: EnvProperties = { searchLinkToAll: "/search/find/", searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToServices: "/search/find/services", searchLinkToProjects: "/search/find/projects", searchLinkToDatasets: "/search/find/datasets", searchLinkToSoftware: "/search/find/software", @@ -60,6 +62,7 @@ export let common: EnvProperties = { searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedServices: "/search/advanced/services", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", errorLink: '/error', From 58274c537b9a6cd89068a15ac54ed57e1d1f3d00 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 16 Nov 2023 11:36:41 +0200 Subject: [PATCH 06/13] [develop | DONE]: Move indicators.less into common assets --- monitor-admin/topic/indicators.component.less | 53 ------------------- monitor-admin/topic/indicators.component.ts | 3 +- 2 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 monitor-admin/topic/indicators.component.less diff --git a/monitor-admin/topic/indicators.component.less b/monitor-admin/topic/indicators.component.less deleted file mode 100644 index 627ab18a..00000000 --- a/monitor-admin/topic/indicators.component.less +++ /dev/null @@ -1,53 +0,0 @@ -@import (reference) "~src/assets/openaire-theme/less/_import-variables"; - -.number-preview { - border: @global-border-width solid @global-border; - background: transparent; - border-radius: @global-border-radius; - min-width: 100px; - min-height: 70px; -} - -.refresh-indicator { - background-color: @global-overlay-background; - border-radius: @global-border-radius; - position: absolute; - color: @global-inverse-color; - z-index: 1; -} - -.section { - padding: 60px 45px; - border-radius: @global-border-radius; - border: @global-border-width solid @global-border; - position: relative; - background: @global-inverse-color; - border-left: 5px @global-primary-background solid; - - .tools { - position: absolute; - top: 0; - left: 50%; - transform: translate(-50%, -100%); - max-width: 50px; - padding: 5px 10px; - background-image: @global-primary-gradient; - color: @global-inverse-color; - -webkit-clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%); - clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%); - display: none; - } - - &:hover { - .tools { - display: block; - - a { - color: currentColor; - &:hover { - text-decoration: none; - } - } - } - } -} diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts index d97f5f82..18d937de 100644 --- a/monitor-admin/topic/indicators.component.ts +++ b/monitor-admin/topic/indicators.component.ts @@ -51,8 +51,7 @@ declare var UIkit; @Component({ selector: 'indicators', - templateUrl: './indicators.component.html', - styleUrls: ['indicators.component.less'] + templateUrl: './indicators.component.html' }) export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit { filesToUpload: Array; From 4155027e8743ec1f0bb88ab75ca4d808fc763c70 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 21 Nov 2023 12:59:17 +0200 Subject: [PATCH 07/13] [develop | DONE | FIXED]: alert.ts: Fixed margins and paddings in buttons of uk-modal-footer. --- utils/modal/alert.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index b6458d79..f79f0e18 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -31,15 +31,15 @@ declare var UIkit: any;
-
+
-
-
-
-
From 1f872d2beb9fc2be942141160d02d04fcfd5ecc4 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 23 Nov 2023 09:42:38 +0200 Subject: [PATCH 08/13] [develop | DONE | ADDED]: searchSorting.component.ts: Added sorting options by impact-based indicatos in PRODUCTION as well. --- searchPages/searchUtils/searchSorting.component.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts index e75e3930..88afac19 100644 --- a/searchPages/searchUtils/searchSorting.component.ts +++ b/searchPages/searchUtils/searchSorting.component.ts @@ -20,8 +20,7 @@ export class SearchSortingComponent { @Input() entityType: string = ''; @Output() sortByChange = new EventEmitter(); public options: Option[]; - private generalOptions = properties.environment != "production" ? - [ + private generalOptions = [ {value: '', label: 'Relevance'}, {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'}, {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'}, @@ -29,11 +28,6 @@ export class SearchSortingComponent { {value: 'popularity,descending', label: 'Popularity'}, {value: 'influence,descending', label: 'Influence'}, {value: 'impulse,descending', label: 'Impulse'} - ] : - [ - {value: '', label: 'Relevance'}, - {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'}, - {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'} ]; private communityOptions = [ {value: '', label: 'Title'}, From ff34511a9c4ce83a160e71ec58cde398aee12352 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 24 Nov 2023 11:44:23 +0200 Subject: [PATCH 09/13] [develop | DONE | CHANGED]: refineFieldResults.service.ts: Added method "getAllRefineFieldResultsByFieldName()" to get all values of a specific refine field (not just first 100) | In method "getRefineFieldResultsByFieldName()" changed key:string to keys:string[] to be able to define multiple fields to query for all their values - creted helper method "fieldIncludesAnyOfTheKeywords()". --- services/refineFieldResults.service.ts | 29 ++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/services/refineFieldResults.service.ts b/services/refineFieldResults.service.ts index d40819ab..157556c5 100644 --- a/services/refineFieldResults.service.ts +++ b/services/refineFieldResults.service.ts @@ -26,11 +26,32 @@ export class RefineFieldResultsService { .pipe(map(res => [res['meta'].total, RefineResultsUtils.parse(res['refineResults'],fields, entityName)])); } - getRefineFieldResultsByFieldName(fieldName:string, entityName:string, properties:EnvProperties):any{ - let key:string="fundinglevel"; - let link = properties.searchAPIURLLAst +this.getSearchAPIURLForEntity(entityName)+"?fields="+fieldName +(fieldName.toString().indexOf(key)!=-1?('&sf='+fieldName):'')+ "&format=json"; - return this.getField(link,fieldName, properties); + getAllRefineFieldResultsByFieldName(fieldName:string, entityName:string, properties:EnvProperties, refineQuery:string=null):any{ + // let keys:string[]=["funder", "relfunder", "fundinglevel"]; + let url = properties.searchAPIURLLAst +this.getSearchAPIURLForEntity(entityName)+"?fields="+fieldName +('&sf='+fieldName)+ "&format=json"; + if(refineQuery!= null && refineQuery != '' ) { + url += refineQuery; + } + return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) + //.map(res => res.json()) + + .pipe(map(res => [res['meta'].total, RefineResultsUtils.parse(res['refineResults'],[fieldName], entityName)])); + } + + getRefineFieldResultsByFieldName(fieldName:string, entityName:string, properties:EnvProperties):any{ + let keys:string[]=["fundinglevel"]; + let link = properties.searchAPIURLLAst +this.getSearchAPIURLForEntity(entityName)+"?fields="+fieldName +(this.fieldIncludesAnyOfTheKeywords(fieldName, keys)?('&sf='+fieldName):'')+ "&format=json"; + return this.getField(link,fieldName, properties); + } + + fieldIncludesAnyOfTheKeywords(field: string, keywords: string[]) { + for(let keyword of keywords) { + if(field.toString().indexOf(keyword)!=-1) { + return true; + } + } + return false; } getField (link:string,fieldName:string, properties:EnvProperties):any{ From 54e01815609b3978f430cb036edd3461971c5d90 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 24 Nov 2023 13:18:22 +0200 Subject: [PATCH 10/13] [develop | DONE | FIXED] numbers.component.ts: Updated method called in refine query to get funders of projects from "getRefineFieldsResultsByEntityName()" to "getAllRefineFieldResultsByFieldName()" to be able to get more than 100 funders each time. --- sharedComponents/numbers/numbers.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sharedComponents/numbers/numbers.component.ts b/sharedComponents/numbers/numbers.component.ts index cb163c7d..0429a466 100644 --- a/sharedComponents/numbers/numbers.component.ts +++ b/sharedComponents/numbers/numbers.component.ts @@ -96,7 +96,7 @@ export class NumbersComponent implements OnInit, OnDestroy { (getSoftware) ? this.searchResearchResultsService.numOfSearchResults('software', '', this.properties, refineParams) : this.empty, (getSoftwareLinked) ? this.searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties) : this.empty, (getOther) ? this.searchResearchResultsService.numOfSearchResults('other', '', this.properties, refineParams) : this.empty, - (getProjects) ? this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties, refineParams) : this.empty, + (getProjects) ? this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties, refineParams) : this.empty, (getDataProviders) ? this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, refineParams) : this.empty, (getOrganizations) ? this._searchOrganizationsService.numOfSearchOrganizations2('', this.properties, refineParams) : this.empty ).subscribe((data: any[]) => { From 7cd951649314c18be820f731d1eed08bcfa3877f Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 24 Nov 2023 16:57:35 +0200 Subject: [PATCH 11/13] [develop | DONE | CHANGED]: refineFieldResults.service.ts: In method "getRefineFieldResultsByFieldName()" added in keys "funder", to get (refine query) all funders for research products and projects in autocomplete (advanced) search. --- services/refineFieldResults.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/refineFieldResults.service.ts b/services/refineFieldResults.service.ts index 157556c5..f43771dd 100644 --- a/services/refineFieldResults.service.ts +++ b/services/refineFieldResults.service.ts @@ -40,7 +40,7 @@ export class RefineFieldResultsService { } getRefineFieldResultsByFieldName(fieldName:string, entityName:string, properties:EnvProperties):any{ - let keys:string[]=["fundinglevel"]; + let keys:string[]=["funder", "fundinglevel"]; // this covers funder, relfunder, funding stream fields and funding level fields let link = properties.searchAPIURLLAst +this.getSearchAPIURLForEntity(entityName)+"?fields="+fieldName +(this.fieldIncludesAnyOfTheKeywords(fieldName, keys)?('&sf='+fieldName):'')+ "&format=json"; return this.getField(link,fieldName, properties); } From fa61b8bef431b03eca1092fe05ab16611e3233ae Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 24 Nov 2023 16:59:55 +0200 Subject: [PATCH 12/13] [develop | DONE | CHANGED]: numbers.component.ts: Added in Numbers field "mergedFundersSize", and on init method call refine query for research products (results), to merge refine queries of research products and projects and set the mergedFundersSize (all funders that have research products, or have >1 project). --- sharedComponents/numbers/numbers.component.ts | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sharedComponents/numbers/numbers.component.ts b/sharedComponents/numbers/numbers.component.ts index 0429a466..bd83f769 100644 --- a/sharedComponents/numbers/numbers.component.ts +++ b/sharedComponents/numbers/numbers.component.ts @@ -18,6 +18,7 @@ export interface Numbers { softwareSize?: NumberSize; otherSize?: NumberSize; fundersSize?: NumberSize; + mergedFundersSize?: NumberSize; projectsSize?: NumberSize; datasourcesSize?: NumberSize; organizationsSize?: NumberSize; @@ -89,6 +90,9 @@ export class NumbersComponent implements OnInit, OnDestroy { this.refineValue = refineValue; } let refineParams = (this.refineValue) ? ('&fq=' + this.refineValue) : null; + + let mergedFundersSet = new Set(); + this.subs.push(zip( (getPublications) ? this.searchResearchResultsService.numOfSearchResults('publication', '', this.properties, refineParams) : this.empty, (getDatasets) ? this.searchResearchResultsService.numOfSearchResults('dataset', '', this.properties, refineParams) : this.empty, @@ -98,7 +102,8 @@ export class NumbersComponent implements OnInit, OnDestroy { (getOther) ? this.searchResearchResultsService.numOfSearchResults('other', '', this.properties, refineParams) : this.empty, (getProjects) ? this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties, refineParams) : this.empty, (getDataProviders) ? this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, refineParams) : this.empty, - (getOrganizations) ? this._searchOrganizationsService.numOfSearchOrganizations2('', this.properties, refineParams) : this.empty + (getOrganizations) ? this._searchOrganizationsService.numOfSearchOrganizations2('', this.properties, refineParams) : this.empty, + (getPublications && getDatasets && getSoftware && getOther) ? this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties, refineParams) : this.empty, ).subscribe((data: any[]) => { if (data[0] && data[0] > 0) { this.numbers.publicationsSize = NumberUtils.roundNumber(data[0]); @@ -123,6 +128,15 @@ export class NumbersComponent implements OnInit, OnDestroy { } if (data[6][1] && data[6][1].length > 0 && data[6][1][0].filterId == 'funder' && data[6][1][0].values) { this.numbers.fundersSize = NumberUtils.roundNumber(data[6][1][0].values.length); + + let queriedFunders = data[6][1][0].values; + queriedFunders.forEach(queriedFunder => { + if(+queriedFunder.number > 1) { + if (!mergedFundersSet.has(queriedFunder.id)) { + mergedFundersSet.add(queriedFunder.id); + } + } + }); } if (data[7] && data[7] > 0) { this.numbers.datasourcesSize = NumberUtils.roundNumber(data[7]); @@ -130,7 +144,17 @@ export class NumbersComponent implements OnInit, OnDestroy { if (data[8] && data[8] > 0) { this.numbers.organizationsSize = NumberUtils.roundNumber(data[8]); } - this.results.emit(this.numbers); + if (data[9][1] && data[9][1].length > 0 && data[9][1][0].filterId == 'relfunder' && data[9][1][0].values) { + let queriedFunders = data[9][1][0].values; + queriedFunders.forEach(queriedFunder => { + if (!mergedFundersSet.has(queriedFunder.id)) { + mergedFundersSet.add(queriedFunder.id); + } + }); + } + + this.numbers.mergedFundersSize = NumberUtils.roundNumber(mergedFundersSet.size); + this.results.emit(this.numbers); }, err => { this.handleError('Error getting numbers', err); })); From c7c1aec26ea7ff3decda4675a7bdb0e6ea83a4ae Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 27 Nov 2023 18:10:37 +0200 Subject: [PATCH 13/13] [develop | DONE | CHANGED]: Updated parsing and display for usage counts per data source to show datasource names. 1. resultLandingInfo.ts: Added field datasourceName: string in interface MetricPerDatasource. 2. parsingFunctions.class.ts: In method "parseMeasures()", updated parsing for usage counts per data source (countsPerDatasource) to parse datasourceId and datasourceName from datasource field of response (split by ||). 3. resultLanding.component.html: On display of countsPerDatasource in table, show datasource names. --- landingPages/landing-utils/parsingFunctions.class.ts | 4 ++-- landingPages/result/resultLanding.component.html | 2 +- utils/entities/resultLandingInfo.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index a34ba066..846de4a9 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -894,7 +894,7 @@ export class ParsingFunctions { countsPerDatasource[datasourcePosition.get(element.datasource)].views = element.count; } else { datasourcePosition.set(element.datasource, countsPerDatasource.length); - countsPerDatasource.push({"datasourceId": element.datasource, "views": element.count, "downloads": 0}) + countsPerDatasource.push({"datasourceId": element.datasource.split("||")[0], "datasourceName": element.datasource.split("||")[1], "views": element.count, "downloads": 0}) } } // measure.views = element.count; @@ -907,7 +907,7 @@ export class ParsingFunctions { countsPerDatasource[datasourcePosition.get(element.datasource)].downloads = element.count; } else { datasourcePosition.set(element.datasource, countsPerDatasource.length); - countsPerDatasource.push({"datasourceId": element.datasource, "views": 0, "downloads": element.count}) + countsPerDatasource.push({"datasourceId": element.datasource.split("||")[0], "datasourceName": element.datasource.split("||")[1], "views": 0, "downloads": element.count}) } } // measure.downloads = element.count; diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index dd683993..7d6a9ccd 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -1251,7 +1251,7 @@ - {{datasource.datasourceId}} + {{datasource.datasourceName}} {{datasource.views}} {{datasource.downloads}} diff --git a/utils/entities/resultLandingInfo.ts b/utils/entities/resultLandingInfo.ts index 8a45393b..1e2f7740 100644 --- a/utils/entities/resultLandingInfo.ts +++ b/utils/entities/resultLandingInfo.ts @@ -49,7 +49,7 @@ export interface Measure { export interface MetricPerDatasource { datasourceId: string, - // datasourceName: string, + datasourceName: string, views: number, downloads: number }