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/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts
index acac3ff8..1cb2f180 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() {
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"));
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();
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">
{
- 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));
}
diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts
index e81cd12b..ae1cccd5 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/",
@@ -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',