From 448a67b9fba6cff51f8ca2b3417853776e3ec0b7 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 16 Dec 2022 09:59:48 +0200 Subject: [PATCH 1/5] [Library | angular-14 & Explore | master]: Updated request to Crossref for bulk uploaded DOIs in linking | Added link for more information to joomla article (Canada's request). 1. sdg.component.html: Added link for more information to joomla article (Canada's request). 2. timeout-interceptor.service.ts: Excluded from timeout interceptor properties.searchCrossrefAPIURL and properties.searchDataciteAPIURL. 3. searchDatacite.service.ts: In method "getDataciteResultByDOI()", for requests coming from file uploaded in linking added timeout to 20 sec, and for other requests timeout similar to the interceptor (6 sec for production, 12 otherwise). 4. searchCrossref.service.ts: In method "searchCrossrefByDOIs()", added timeout similar to the interceptor (6 sec for production, 12 otherwise) | Added method "searchCrossrefByDOI()", called for requests coming from file uploaded in linking. 5. bulkClaim.component.ts: Call new API method for Crossref requests for DOIs | Fixed tooltip to appear. --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 06f2f586..ce4b9273 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 06f2f586a88a1766f183356b6497c0fc66436f36 +Subproject commit ce4b9273e0f7ccb55f67dfc0d209caa779b4aa7c From d715e0a2811f92b834223417edf67b01083ed682 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 16 Dec 2022 17:21:37 +0200 Subject: [PATCH 2/5] [Library | angular-14]: loading.component.ts: [Bug fix] In ngOnDestory changed to document.getElementById("modal-container"). --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index ce4b9273..f91c3ba0 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ce4b9273e0f7ccb55f67dfc0d209caa779b4aa7c +Subproject commit f91c3ba0fb4c6c70b76ef54203258d454bf7fc18 From 03778107172966265b332eb1e6b7eba09ab0a440 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 10 Jan 2023 02:25:03 +0200 Subject: [PATCH 3/5] [Explore | master & Library | angular-14]: composer.ts: [Bug fix] Add parenthesis around ternary operator in method composeEmailForExplore() - empty or wrong body | contact-us.component.html: Added #captchaElem in | contact-us.component.ts: Added ViewChild for captchaElem and added method "resetRecaptcha()" | contact.component.html: Added #contactUs in | contact.component.ts: Added ViewChild for contactUs and call contactUsComponent.resetRecaptcha() on reset method. --- explore/src/app/contact/contact.component.html | 2 +- explore/src/app/contact/contact.component.ts | 7 ++++++- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/explore/src/app/contact/contact.component.html b/explore/src/app/contact/contact.component.html index 4daf7db9..0eba329c 100644 --- a/explore/src/app/contact/contact.component.html +++ b/explore/src/app/contact/contact.component.html @@ -7,7 +7,7 @@
-

Contact us to
learn more. diff --git a/explore/src/app/contact/contact.component.ts b/explore/src/app/contact/contact.component.ts index 024e9f01..0549f948 100644 --- a/explore/src/app/contact/contact.component.ts +++ b/explore/src/app/contact/contact.component.ts @@ -14,6 +14,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo import {Subscriber} from "rxjs"; import {properties} from "../../environments/environment"; import {NotificationHandler} from "../openaireLibrary/utils/notification-handler"; +import {ContactUsComponent} from "../openaireLibrary/contact-us/contact-us.component"; @Component({ selector: 'contact', @@ -33,7 +34,8 @@ export class ContactComponent implements OnInit { public contactForm: FormGroup; @ViewChild('modal') modal; private subscriptions = []; - + @ViewChild('contactUs') contactUsComponent : ContactUsComponent; + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscriber) { @@ -94,6 +96,9 @@ export class ContactComponent implements OnInit { message: this.fb.control('', Validators.required), recaptcha: this.fb.control('', Validators.required), }); + if(this.contactUsComponent) { + this.contactUsComponent.resetRecaptcha(); + } } private sendMail(admins: any) { diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index f91c3ba0..062f1a23 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f91c3ba0fb4c6c70b76ef54203258d454bf7fc18 +Subproject commit 062f1a23c4f55a1d98c185f53f490795c4c89145 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index d772dbd4..0c6b2ac1 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d772dbd4b2f2d8af9e26d98eed7417f2fbf15c3a +Subproject commit 0c6b2ac12b4796e41bf4cc8de93c157efa866543 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 2882ccde..996b4857 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2882ccde4eb93bd01b4cdb480790cc04b394794d +Subproject commit 996b48573c7cc42a8c50ac447f1fd84c7f0836c4 From a1f9e478744cdb7fc93a7824d4bc124620b3db8f Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 18 Jan 2023 23:15:17 +0200 Subject: [PATCH 4/5] [Explore] Updating libraries... --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 062f1a23..da144c1c 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 062f1a23c4f55a1d98c185f53f490795c4c89145 +Subproject commit da144c1c77012fa4489dd84f013d499f9df8f72a diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 0c6b2ac1..cd44ace5 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 0c6b2ac12b4796e41bf4cc8de93c157efa866543 +Subproject commit cd44ace5d067999ed6d852f20204d5a05385580b diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 996b4857..99ecab0b 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 996b48573c7cc42a8c50ac447f1fd84c7f0836c4 +Subproject commit 99ecab0b4e9ceed21424c8fa26ef270b4695b11e From 36f4bd1c600299c4bc2e941d5864ade5b8289d20 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 23 Mar 2023 10:41:37 +0200 Subject: [PATCH 5/5] Utils Service: Change user info property. --- services/utils-service/properties.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/utils-service/properties.file b/services/utils-service/properties.file index ed2c1d79..4f43d8fc 100644 --- a/services/utils-service/properties.file +++ b/services/utils-service/properties.file @@ -1,4 +1,4 @@ -userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo +userInfoUrl = http://mpagasas.di.uoa.gr:19080/login-service/userInfo ssl = false localPath = true # photo size in KB