From 89f8011e765bbd572256b8a6ae71c51c7878952a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 1 Dec 2023 17:02:10 +0200 Subject: [PATCH 1/8] [develop | DONE]: Fix search input placeholders in home page. --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index dbbd7ec..f537920 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit dbbd7ec541d96a5062a769dea2255ad9ccb36b13 +Subproject commit f537920702a51fe5590c20cfc307dade7e0eff55 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9e58421..b68f375 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2dadcf8..bdc2684 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 +Subproject commit bdc26845e4e61a031df51cf07440b10b13458897 From c51efd57134d797de02a75f32eb94096ac41d811 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 1 Dec 2023 18:06:41 +0200 Subject: [PATCH 2/8] [develop | DONE | FIXED] : in home and subjects page remove quoted from the advanced search link to make it work --- src/app/community/community.component.ts | 2 +- src/app/subjects/subjects.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index e692324..a4cc69c 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -478,7 +478,7 @@ export class CommunityComponent { } createParams(param) { - return StringUtils.quote(StringUtils.URIEncode(param)); + return StringUtils.URIEncode(param); } private setActiveTab(entityType: string) { diff --git a/src/app/subjects/subjects.component.ts b/src/app/subjects/subjects.component.ts index 558dc63..27f4615 100644 --- a/src/app/subjects/subjects.component.ts +++ b/src/app/subjects/subjects.component.ts @@ -382,7 +382,7 @@ export class SubjectsComponent { } createParams(param) { - return StringUtils.quote(StringUtils.URIEncode(param)); + return StringUtils.URIEncode(param); } ngOnDestroy() { From c390216c22c9eca01921875bb1506be1875ce574 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 1 Dec 2023 18:38:36 +0200 Subject: [PATCH 3/8] [develop | DONE | FIXED]: Fixed dropdown position in entities selection of home page search. --- src/app/community/community.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 46f3a18..109a9bd 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -181,7 +181,7 @@ [onChangeNavigate]="false">
-
+
From 6efcd9df60e44ee05ac2f5c82d462eb94586b609 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Thu, 11 Jan 2024 12:16:43 +0200 Subject: [PATCH 4/8] [develop | FIXED | DONE] add missing parameter (staticFields) in search dataproviders+projects for function prepareSearchPage() --- src/app/openaireLibrary | 2 +- src/app/searchPages/simple/searchDataproviders.component.ts | 4 ++-- src/app/searchPages/simple/searchProjects.component.ts | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f537920..6f13ab4 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f537920702a51fe5590c20cfc307dade7e0eff55 +Subproject commit 6f13ab475a71fcc53f4eb70307ae8b60b20375f8 diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 7f49746..135a201 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -94,7 +94,7 @@ export class OpenaireSearchDataprovidersComponent { this.searchUtils.validateSize(params['size']); this.keyword = decodeURIComponent(params['fv0']?params['fv0']:(params['keyword']?params['keyword']:'')); this.selectedFields = []; - this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, [], [], this.fieldIdsMap, this.customFilter, params, "dataprovider"); + this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, [], [], [], this.fieldIdsMap, this.customFilter, params, "dataprovider"); if (this.initialLoad) { this.initialLoad = false; this._getResults(); @@ -163,7 +163,7 @@ export class OpenaireSearchDataprovidersComponent { this.searchUtils.totalResults = results.length; this.results = results.slice((this.searchUtils.page - 1) * this.searchUtils.size, this.searchUtils.page *this.searchUtils.size ); this.searchUtils.status = this.results.length == 0 ? this.errorCodes.NONE: this.errorCodes.DONE; - this.searchPage.buildPageURLParameters(this.filters, [], false); + this.searchPage.buildPageURLParameters(this.filters, [], [], false); this.disableForms = false; this.enableSearchView = true; } diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index 483ab32..c8cde79 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -96,7 +96,7 @@ export class OpenaireSearchProjectsComponent { this.searchUtils.validateSize(params['size']); this.keyword = decodeURIComponent(params['fv0']?params['fv0']:(params['keyword']?params['keyword']:'')); this.selectedFields = []; - this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, this.customFilter, params, "project"); + this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap, this.customFilter, params, "project"); if(this.initialLoad) { this.initialLoad = false; this._getCommunityFunders(); diff --git a/src/assets/common-assets b/src/assets/common-assets index b68f375..ee22e97 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1 +Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index bdc2684..df6a052 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit bdc26845e4e61a031df51cf07440b10b13458897 +Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6 From c122ce01e1c0bc958ff0855e7d4b298935025cb5 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Thu, 11 Jan 2024 12:50:33 +0200 Subject: [PATCH 5/8] [develop | DONE] update submodule --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6f13ab4..c2312e2 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6f13ab475a71fcc53f4eb70307ae8b60b20375f8 +Subproject commit c2312e297e32df2925e60641d755494c900abdc5 From 7805be2e0b6298b022017964101355483dbf2edc Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 13 Feb 2024 12:16:04 +0200 Subject: [PATCH 6/8] [develop | REMOVED]: Remove userInfoUrl usage --- src/app/claims/myClaims/myClaims.component.ts | 6 ++---- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/claims/myClaims/myClaims.component.ts b/src/app/claims/myClaims/myClaims.component.ts index 79c1d80..f00c3a1 100644 --- a/src/app/claims/myClaims/myClaims.component.ts +++ b/src/app/claims/myClaims/myClaims.component.ts @@ -8,13 +8,12 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-my-claims', template: ` - + ` }) export class OpenaireMyClaimsComponent { claimsInfoURL:string; - userInfoURL: string; communityId:string; sub; @@ -27,8 +26,7 @@ import {properties} from "../../../environments/environment"; } public ngOnInit() { - this.claimsInfoURL = properties.claimsInformationLink; - this.userInfoURL = properties.userInfoUrl; + this.claimsInfoURL = properties.claimsInformationLink; this.sub = this.route.queryParams.subscribe( communityId => { this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c2312e2..5195306 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c2312e297e32df2925e60641d755494c900abdc5 +Subproject commit 5195306ee6dfd664b207c3536234f43adc39ad33 diff --git a/src/assets/common-assets b/src/assets/common-assets index ee22e97..6cef9eb 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a +Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index df6a052..419d7e2 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6 +Subproject commit 419d7e200b60639ebcb9660c0e77b06a02504caa From 194778e63912ea5bfb6c93af97abf81c7f31d333 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 14 Feb 2024 12:29:41 +0200 Subject: [PATCH 7/8] [develop | DONE | REMOVED] Remove my orcid links from user menu for beta --- src/app/app.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8e06f1b..9f01a3f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -443,11 +443,14 @@ export class AppComponent implements OnInit, OnDestroy { this.bottomMenuItems.push(new MenuItem("", "Sources and methodology", "", "/content", false, [], [], {})); } if (this.user) { - this.userMenuItems = [ /*new MenuItem("","My profile","","",false,[],[],{}),*/ - new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [], {}), + this.userMenuItems = [ new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {}), new MenuItem("", "Invite users", "", "/invite", false, [], [], {}), ]; + if(properties.environment != 'beta'){ + this.userMenuItems = [new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [], {})] + .concat(this.userMenuItems) + } if (this.isManager) { this.userMenuItems.push(new MenuItem("", "Support", "https://tools.openaire.eu/group/openaire_rcd", "", false, [], [], {})) } From 9ddc866ec99c4e332088f2d1662570da0313f79c Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 14 Feb 2024 13:05:09 +0200 Subject: [PATCH 8/8] [develop | DONE | FIXED] Search communities: add missing attribute in method signature --- src/app/searchPages/communities/searchCommunities.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/searchPages/communities/searchCommunities.component.ts b/src/app/searchPages/communities/searchCommunities.component.ts index 125f76e..447eacf 100644 --- a/src/app/searchPages/communities/searchCommunities.component.ts +++ b/src/app/searchPages/communities/searchCommunities.component.ts @@ -97,7 +97,7 @@ export class SearchCommunitiesComponent { this.searchPage.refineFields = this.refineFields; this.searchLink = this.properties.searchLinkToCommunities; this.selectedFields = []; - this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, null, params, "community", null); + this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [],[], this.fieldIdsMap, null, params, "community", null); let queryParams = params; if (typeof document !== 'undefined') {