MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library|Trunk] 

communities:
	add const prodReadyCommunities 
	communities search results: in production show link to beta or prod based on the list of prodReadyCommunities


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59028 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-06-30 15:56:56 +00:00
parent 1a2d78e3ee
commit 2979275c17
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connect/community/communityInfo.ts
View File

@ -14,3 +14,4 @@ export class CommunityInfo {
isSubscribed: boolean; isSubscribed: boolean;
isManager: boolean; isManager: boolean;
} }
export const prodReadyCommunities = ["dh-ch", "ee", "fam", "mes", "ni", "covid-19", "dariah", "epos", "egi"];

9
searchPages/searchUtils/portal-search-result.component.ts
View File

@ -2,7 +2,7 @@ import {Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@an
import {ErrorCodes} from '../../utils/properties/errorCodes'; import {ErrorCodes} from '../../utils/properties/errorCodes';
import {RouterHelper} from '../../utils/routerHelper.class'; import {RouterHelper} from '../../utils/routerHelper.class';
import {EnvProperties} from '../../utils/properties/env-properties'; import {EnvProperties} from '../../utils/properties/env-properties';
import {CommunityInfo} from "../../connect/community/communityInfo"; import {CommunityInfo, prodReadyCommunities} from "../../connect/community/communityInfo";
import {Router} from "@angular/router"; import {Router} from "@angular/router";
import {LocalStorageService} from "../../services/localStorage.service"; import {LocalStorageService} from "../../services/localStorage.service";
import {Stakeholder, StakeholderInfo} from "../../monitor/entities/stakeholder"; import {Stakeholder, StakeholderInfo} from "../../monitor/entities/stakeholder";
@ -46,9 +46,8 @@ export class PortalSearchResultComponent implements OnInit, OnChanges{
console.log(changes); console.log(changes);
} }
getProductionPrefix(): string { getProductionPrefix(id:string): string {
// return (this.properties.environment == "beta") ? "beta." : ""; return (this.properties.environment == "production" && prodReadyCommunities.indexOf(id)!=-1) ? "" : "beta.";
return "beta.";
} }
isProduction(): boolean { isProduction(): boolean {
@ -80,7 +79,7 @@ export class PortalSearchResultComponent implements OnInit, OnChanges{
public getCommunityPageUrl(communityInfo: CommunityInfo): string { public getCommunityPageUrl(communityInfo: CommunityInfo): string {
let url = ''; let url = '';
if (this.isProduction()) { if (this.isProduction()) {
url = 'https://' + this.getProductionPrefix() + communityInfo.communityId + '.openaire.eu'; url = 'https://' + this.getProductionPrefix(communityInfo.communityId ) + communityInfo.communityId + '.openaire.eu';
} else { } else {
url = this.router.createUrlTree(['/'], { url = this.router.createUrlTree(['/'], {
queryParams: {'communityId': communityInfo.communityId} queryParams: {'communityId': communityInfo.communityId}