Merge remote-tracking branch 'origin/develop' into new-search-json

Updating openaireLibrary & common-assets
2024-10-29 16:26:06 +02:00 · 2024-10-29 16:25:58 +02:00 · 2024-10-29 16:20:40 +02:00 · 2024-10-29 15:18:48 +02:00 · 2024-10-17 15:02:48 +03:00 · 2024-10-17 14:59:38 +03:00
8 changed files with 28 additions and 8 deletions
--- a/explore/src/app/openaireLibrary
+++ b/explore/src/app/openaireLibrary
@ -1 +1 @@
-Subproject commit f1fd1ef60c5a964e283ced7840876dc5896af9be
+Subproject commit c697f4b27d6e24d984e181d1330d20868b61fdeb
--- a/explore/src/assets/common-assets
+++ b/explore/src/assets/common-assets
@ -1 +1 @@
-Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b
+Subproject commit 038684a0dca02700164e467abd390bbd865df3d9
--- a/explore/src/assets/openaire-theme
+++ b/explore/src/assets/openaire-theme
@ -1 +1 @@
-Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298
+Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13
--- a/services/cache/mecache/dl170-properties.file
+++ b/services/cache/mecache/dl170-properties.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
--- a/services/cache/mecache/package.json
+++ b/services/cache/mecache/package.json
@ -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",
--- a/services/utils-service/dl170-properties.file
+++ b/services/utils-service/dl170-properties.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
+
+
--- a/services/utils-service/package.json
+++ b/services/utils-service/package.json
@ -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": "",
--- a/services/utils-service/properties.file
+++ b/services/utils-service/properties.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
Author	SHA1	Message	Date
Konstantina Galouni	388655afd1	Merge remote-tracking branch 'origin/develop' into new-search-json	2024-10-29 16:26:06 +02:00
Konstantina Galouni	6504475da7	Updating openaireLibrary & common-assets	2024-10-29 16:25:58 +02:00
Konstantina Galouni	b08e993d02	Updating openaireLibrary & common-assets	2024-10-29 16:20:40 +02:00
Konstantina Galouni	19dc6f9413	[new-search-json \| WIP \| CHANGED]: Updated parsing according to new json schema - parsingFunctions.class.ts & deletedByInference.component.ts: Parse header.recordType field instead of result.resulttype.	2024-10-29 15:18:48 +02:00
Konstantina Galouni	3656a825bd	Merge remote-tracking branch 'origin/develop' into new-search-json	2024-10-17 15:02:48 +03:00
Konstantina Galouni	5bdc50c151	Updating openaireLibrary	2024-10-17 14:59:38 +03:00
Konstantina Galouni	da1d260431	Updating openaireLibrary	2024-10-17 14:57:55 +03:00
argirok	e9f53ad505	[develop \| ADDED\| DONE ] add properties for dl170	2024-10-15 14:21:56 +03:00
Konstantina Galouni	fb5efdd37f	[new-search-json \| WIP \| CHANGED]: Updating openaireLibrary.	2024-10-07 16:20:56 +03:00
Alex Martzios	aed67b0833	[develop] update submodules	2024-09-24 10:53:05 +03:00