From 3d9e0f25e13c57330de0e04d24d3643acf629036 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 8 Oct 2024 13:15:46 +0300 Subject: [PATCH 1/7] [develop]: Fix a bug with subcateogory link in case of umbrella dashboards with children. --- .../monitor-indicator-stakeholder-base.component.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/monitor/monitor-indicator-stakeholder-base.component.ts b/monitor/monitor-indicator-stakeholder-base.component.ts index 1ce52d99..fd5c756c 100644 --- a/monitor/monitor-indicator-stakeholder-base.component.ts +++ b/monitor/monitor-indicator-stakeholder-base.component.ts @@ -201,6 +201,18 @@ export abstract class MonitorIndicatorStakeholderBaseComponent extends Indicator } } + protected get isChild(): boolean { + return !!this.stakeholder?.parent; + } + + protected get aliasPrefix(): string { + if(this.isChild) { + return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/'; + } else { + return '/'; + } + } + protected getFullUrl(indicatorPath: IndicatorPath) { let fosValues = this.getSelectedFilterValues("fos"); return this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, indicatorPath,null, this.periodFilter.selectedFromValue, this.periodFilter.selectedToValue, false, fosValues?fosValues.lvl1:[],fosValues?fosValues.lvl2:[], this.getSelectedFilterValues("publiclyfunded")); From 14f3766cd1911c5176fa19ff8d93bbef6585b437 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 8 Oct 2024 15:50:55 +0300 Subject: [PATCH 2/7] [develop | DONE | FIXED]: searchResultsInDeposit.component & newSearchPage.component.html: Added options for compactView in Deposit. --- deposit/searchResultsInDeposit.component.html | 2 +- deposit/searchResultsInDeposit.component.ts | 2 +- searchPages/searchUtils/newSearchPage.component.html | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deposit/searchResultsInDeposit.component.html b/deposit/searchResultsInDeposit.component.html index 6a01fbdb..16aa60d0 100644 --- a/deposit/searchResultsInDeposit.component.html +++ b/deposit/searchResultsInDeposit.component.html @@ -19,7 +19,7 @@
  • + [isCard]="true" deposit="true" [isMobile]="isMobile" [compactView]="compactView">
    • diff --git a/deposit/searchResultsInDeposit.component.ts b/deposit/searchResultsInDeposit.component.ts index 846fc09c..3ea9f712 100644 --- a/deposit/searchResultsInDeposit.component.ts +++ b/deposit/searchResultsInDeposit.component.ts @@ -20,7 +20,7 @@ export class SearchResultsInDepositComponent { @Input() type: string; @Input() properties:EnvProperties = properties; @Input() isMobile: boolean = false; - + @Input() compactView: boolean = false; public urlParam: string; public linkToAdvancedSearchPage: string; diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index f2c3df98..55677100 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -418,7 +418,8 @@ [type]="entityType" [zenodoInformation]="zenodoInformation" [properties]=properties - [isMobile]="mobile"> + [isMobile]="mobile" + [compactView]="compactView"> Date: Fri, 11 Oct 2024 17:12:09 +0300 Subject: [PATCH 3/7] [develop | DONE | FIXED]: dataProvider.component.ts: Get type (dataprovider or service) from route.snapshot.data | app-routing.module.ts: Updated routes to load library files for landing pages instead of the intermediate ones (BUG FIX in datasets, software, other). --- landingPages/dataProvider/dataProvider.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 92c5b553..45473c1b 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -191,7 +191,9 @@ export class DataProviderComponent { this.fetchOrps = new FetchResearchResults(this._searchResearchResultsService); this.fetchProjects = new FetchProjects(this._searchProjectsService); this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); - + if(route.snapshot.data && route.snapshot.data['type']) { + this.type = route.snapshot.data['type']; + } } ngOnInit() { From 1301b89ef02a23f04ec62a25667aa7e0776bbaaf Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 14 Oct 2024 12:16:21 +0300 Subject: [PATCH 4/7] [develop]: Update user management property in developement to dl170. --- utils/properties/environments/environment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index 6f484846..c8584dd0 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -129,7 +129,7 @@ export let commonDev: EnvProperties = { adminPortalURL: "https://beta.admin.connect.openaire.eu", //connect communitiesAPI: 'https://dev-openaire.d4science.org/openaire/community/communities', - registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', + registryUrl: 'http://dl170.madgik.di.uoa.gr:19180/uoa-user-management/api/registry/', reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu", //admin miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining', From 42d5e1e4b001b59c0f957643233b05af7deb70b0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 14 Oct 2024 13:10:50 +0300 Subject: [PATCH 5/7] [develop]: Fix URL for get invited users for a portal. --- services/user-registry.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/user-registry.service.ts b/services/user-registry.service.ts index 1f06cae7..614ef281 100644 --- a/services/user-registry.service.ts +++ b/services/user-registry.service.ts @@ -71,7 +71,7 @@ export class UserRegistryService { } public getPending(type: string, id: string, role: "member" | "manager" = "manager", admin = false): Observable { - let url = properties.registryUrl + 'invite/' + Role.GROUP + type + '/' +id + "/" + role + 's/'; + let url = properties.registryUrl + 'invite/' + Role.GROUP + type + '/' +id + "/" + role + 's'; return this.http.get((properties.useCache && !admin) ? (properties.cacheUrl + encodeURIComponent(url)) : url, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } From 4716913427b3621c6e86504b4947f944cb206da9 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 14 Oct 2024 13:42:45 +0300 Subject: [PATCH 6/7] [develop]: Make verificationType to lowercase in conditions. --- role-verification/role-verification.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 89a6415c..a4589839 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -131,9 +131,9 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, this.subscriptions.push(this.userRegistryService.getInvitation(params['verify']).subscribe(verification => { this.verification = verification; if (this.user.email === this.verification.email.toLowerCase() && this.id === this.verification.entity && this._type === this.verification.type) { - if (this.verification.verificationType === 'manager') { + if (this.verification.verificationType.toLowerCase() === 'manager') { this.openManagerModal(); - } else if (this.verification.verificationType === 'member') { + } else if (this.verification.verificationType.toLowerCase() === 'member') { this.openMemberModal(); } else { this.openErrorModal(); From 19b5225396a51be7883b61a250b868bae6c2b1b5 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 15 Oct 2024 14:17:26 +0300 Subject: [PATCH 7/7] [develop | CHANGED | DONE] update dev properties to dl170 instances --- utils/properties/environments/environment.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index c8584dd0..7496ef0a 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -107,17 +107,17 @@ export let commonDev: EnvProperties = { 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/", + orcidAPIURL: "http://dl170.madgik.di.uoa.gr:19480/uoa-orcid-service/", orcidTokenURL: "https://sandbox.orcid.org/oauth/authorize?", orcidClientId: "APP-A5M3KTX6NCN67L91", - utilsService: "http://scoobydoo.di.uoa.gr:8000", + utilsService: "http://dl170.madgik.di.uoa.gr:8000", vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", loginServiceURL: "http://dl170.madgik.di.uoa.gr:19080/login-service/", cookieDomain: ".di.uoa.gr", feedbackmail: "kostis30fylloy@gmail.com", cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=", monitorServiceAPIURL: "http://mpagasas.di.uoa.gr:19380/uoa-monitor-service/", - adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/", + adminToolsAPIURL: "http://dl170.madgik.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/",