MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 23 Wiki Activity

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Konstantina Galouni 2024-12-03 13:07:30 +02:00
parent 3fb764b306 f323742e36
commit 4299b66503
6 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
explore/src/app/funders/funders.component.ts
View File

@ -118,12 +118,12 @@ export class FundersComponent implements OnInit {
{value: 'rfo', label: 'Funders with RFO dashboard'}
];
this.sortOptions = [
{value: 'alphAsc', label: 'Alphabetically asc. (A-Z)'},
{value: 'alphDsc', label: 'Alphabetically desc. (Z-A)'},
{value: 'oaDsc', label: 'Open Access % desc.'},
{value: 'countryAsc', label: 'Country desc. (A-Z)'},
{value: 'researcProductsDsc', label: this.openaireEntities.RESULTS+' desc.'},
{value: 'projectsDsc', label: this.openaireEntities.PROJECTS+' desc.'}
{value: 'alphAsc', label: 'Alphabetically (A-Z)'},
{value: 'alphDsc', label: 'Alphabetically (Z-A)'},
{value: 'oaDsc', label: 'Openness score'},
{value: 'countryAsc', label: 'Country name (A-Z)'},
{value: 'researcProductsDsc', label: 'Number of ' + this.openaireEntities.RESULTS},
{value: 'projectsDsc', label: 'Number of ' + this.openaireEntities.PROJECTS}
];
this.getFunders();
this.keywordControl = this.fb.control('');
@ -404,7 +404,7 @@ export class FundersComponent implements OnInit {
}
if(this.show == 'rfo') {
displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE')));
displayedFunders = displayedFunders.filter(funder => funder.irishDashboard && funder.irishDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE')));
}
this.displayedFunders = displayedFunders;

4
services/cache/mecache/dl170-properties.file vendored Normal file
View File

@ -0,0 +1,4 @@
port = 3000
utilsService= http://dl170.madgik.di.uoa.gr:8000
environment = development
preloadRequests =https://dev-openaire.d4science.org/openaire/info/,https://dev-openaire.d4science.org/openaire/contexts/,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:provenanceActions.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:subject_classification_typologies.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:publication_resource.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:dataCite_resource.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:languages.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:access_modes.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:datasource_typologies.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:datasourceCompatibilityLevel.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:countries.json

3
services/cache/mecache/package.json vendored
View File

@ -7,7 +7,8 @@
"start": "node cache.js",
"prepare-dist": "rm -rf dist; mkdir dist; cp package.json ./dist; cp cache.js ./dist; cp properties.file ./dist;",
"prepare-beta": " npm run prepare-dist; cp beta-properties.file ./dist/properties.file",
"prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file"
"prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file",
"prepare-dl170": " npm run prepare-dist; cp dl170-properties.file ./dist/properties.file"
},
"dependencies": {
"access-log": "^0.4.1",

14
services/utils-service/dl170-properties.file Normal file
View File

@ -0,0 +1,14 @@
userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo
searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/
monitorAPIUrl = http://dl170.madgik.di.uoa.gr:19380/uoa-monitor-service/
irishMonitorAPIUrl = http://dl170.madgik.di.uoa.gr:19680/irish-monitor-service/
fundersServiceAPIUrl = https://dev-openaire.d4science.org/openaire/funders/
ssl = false
localPath = true
# photo size in KB
max.size = 200
# file size in KB
big-max.size = 1000
port = 8000

3
services/utils-service/package.json
View File

@ -7,7 +7,8 @@
"start": "node uploadService.js",
"prepare-dist": "rm -rf dist; mkdir dist; cp package.json ./dist; cp uploadService.js ./dist; cp properties.file ./dist;",
"prepare-beta": " npm run prepare-dist; cp beta-properties.file ./dist/properties.file",
"prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file"
"prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file",
"prepare-dl170": " npm run prepare-dist; cp dl170-properties.file ./dist/properties.file"
},
"keywords": [],
"author": "",

6
services/utils-service/properties.file
View File

@ -1,7 +1,7 @@
userInfoUrl = http://mpagasas.di.uoa.gr:19080/login-service/userInfo
userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo
searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/
monitorAPIUrl = http://duffy.di.uoa.gr:19380/uoa-monitor-service/
irishMonitorAPIUrl = http://mpagasas.di.uoa.gr:19780/irish-monitor-service/
monitorAPIUrl = http://dl170.madgik.di.uoa.gr:19380/uoa-monitor-service/
irishMonitorAPIUrl = http://dl170.madgik.di.uoa.gr:19680/irish-monitor-service/
fundersServiceAPIUrl = https://dev-openaire.d4science.org/openaire/funders/
ssl = false
localPath = true