From 0ba78c0c111b9371e02814b0bd60c84d276fee53 Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 1 Dec 2020 11:17:53 +0000
Subject: [PATCH] [Connect|Trunk] - use route instead of url for the community
 header - update beta properties

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@60000 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.component.ts                | 5 +++--
 src/app/htmlPages/htmlPage.component.ts | 2 +-
 src/environments/environment.beta.ts    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ec9538e..68d4839 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -27,7 +27,7 @@ import {CommunityService} from "./openaireLibrary/connect/community/community.se
       <navbar *ngIf="properties && showMenu && !community && header" [portal]="properties.dashboard" [onlyTop]=false
               [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user" [header]="header"
               [showMenu]=showMenu [properties]="properties" [showHomeMenuItem]="false" communityId="connect"></navbar>
-      <navbar *ngIf="properties && showMenu  && community && header" [portal]="properties.dashboard" [onlyTop]=false
+      <navbar *ngIf="properties && showMenu  && community && header" [portal]="community.id" [onlyTop]=false
               [communityId]="community.id" [header]="header"
               [userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
               [showMenu]=showMenu [properties]="properties" [enableSearch]="false"
@@ -198,7 +198,8 @@ export class AppComponent {
               description:community.description
             };
             this.header = {
-              url: 'https://' + (this.properties.environment == 'beta' ? 'beta.' : '') + this.community.id + '.openaire.eu',
+              // url: 'https://' + (this.properties.environment == 'beta' ? 'beta.' : '') + this.community.id + '.openaire.eu',
+              route: "/",
               title: this.community.name,
               logoUrl: this.community.logoUrl,
               logoSmallUrl: this.community.logoUrl,
diff --git a/src/app/htmlPages/htmlPage.component.ts b/src/app/htmlPages/htmlPage.component.ts
index 635f6d4..c314922 100644
--- a/src/app/htmlPages/htmlPage.component.ts
+++ b/src/app/htmlPages/htmlPage.component.ts
@@ -8,7 +8,7 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
 import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
 import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
 import {Subscriber} from "rxjs";
-import {properties} from 'environments/environment';
+import {properties} from "../../environments/environment";
 
 @Component({
   selector: 'html-page',
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index 923a6ce..46d4f12 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -2,6 +2,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert
 
 export let properties: EnvProperties = {
   environment: "beta",
+  adminToolsPortalType: "connect",
   dashboard: "connect",
   enablePiwikTrack: true,
   useCache: false,
@@ -12,7 +13,7 @@ export let properties: EnvProperties = {
   framesAPIURL: "https://beta.openaire.eu/stats3/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
+  statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
   useNewStatistisTool: true,
   impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
   claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",