MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

[Monitor Dashboard | Trunk]: Fix bug if stakeholder is empty. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59768 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2020-11-04 13:30:22 +00:00
parent 6302cce3e9
commit 8e491aca9d
8 changed files with 157 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
src/app/topic/indicators.component.html
View File

@ -49,7 +49,8 @@
[class.disable-sortable]="!canReorder" [class.disable-sortable]="!canReorder"
[class.uk-sortable-nodrag]="!canReorder"> [class.uk-sortable-nodrag]="!canReorder">
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder"> <div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder">
<ng-container *ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: number._id}"></ng-container> <ng-container
*ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: number._id}"></ng-container>
<div class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable"> <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
<i uk-icon="more-vertical" (click)="$event.stopPropagation();$event.preventDefault()"></i> <i uk-icon="more-vertical" (click)="$event.stopPropagation();$event.preventDefault()"></i>
<div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false"> <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
@ -89,7 +90,8 @@
</div> </div>
</ng-template> </ng-template>
<div *ngIf="isAdministrator" class="disable-sortable uk-sortable-nodrag uk-width-1-1"> <div *ngIf="isAdministrator" class="disable-sortable uk-sortable-nodrag uk-width-1-1">
<div class="uk-width-1-3@l uk-width-1-2@m uk-width-1-1 uk-card uk-card-default uk-card-body clickable" (click)="editNumberIndicatorOpen(number)"> <div class="uk-width-1-3@l uk-width-1-2@m uk-width-1-1 uk-card uk-card-default uk-card-body clickable"
(click)="editNumberIndicatorOpen(number)">
<div> <div>
<h5 class="uk-text-bold"> <h5 class="uk-text-bold">
Create a new number Indicator Create a new number Indicator
@ -156,7 +158,8 @@
[class.disable-sortable]="!canReorder" [class.disable-sortable]="!canReorder"
[class.uk-sortable-nodrag]="!canReorder"> [class.uk-sortable-nodrag]="!canReorder">
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder"> <div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder">
<ng-container *ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: chart._id}"></ng-container> <ng-container
*ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: chart._id}"></ng-container>
<div class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable"> <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
<i uk-icon="more-vertical" (click)="$event.stopPropagation();$event.preventDefault()"></i> <i uk-icon="more-vertical" (click)="$event.stopPropagation();$event.preventDefault()"></i>
<div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false"> <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
@ -204,19 +207,20 @@
</div> </div>
</ng-template> </ng-template>
<div class="disable-sortable uk-sortable-nodrag uk-width-1-1"> <div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
<div class="uk-width-1-3@l uk-width-1-2@m uk-width-1-1 uk-card uk-card-default uk-card-body clickable" (click)="editChartIndicatorOpen(chart)"> <div class="uk-width-1-3@l uk-width-1-2@m uk-width-1-1 uk-card uk-card-default uk-card-body clickable"
<div> (click)="editChartIndicatorOpen(chart)">
<h5 class="uk-text-bold"> <div>
Create a custom indicator <h5 class="uk-text-bold">
</h5> Create a custom indicator
<div class="uk-text-muted uk-text-small"> </h5>
Use our advance tool to create a custom Indicator that suit the needs of your funding <div class="uk-text-muted uk-text-small">
KPI's. Use our advance tool to create a custom Indicator that suit the needs of your funding
</div> KPI's.
<div class="uk-flex uk-flex-center uk-text-secondary uk-margin-large">
<icon name="add" ratio="5"></icon>
</div>
</div> </div>
<div class="uk-flex uk-flex-center uk-text-secondary uk-margin-large">
<icon name="add" ratio="5"></icon>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -231,65 +235,77 @@
[okDisabled]="numberIndicatorFb && (numberIndicatorFb.invalid || numberIndicatorFb.pristine)"> [okDisabled]="numberIndicatorFb && (numberIndicatorFb.invalid || numberIndicatorFb.pristine)">
<div *ngIf="numberIndicatorFb" class="uk-padding-small" [formGroup]="numberIndicatorFb"> <div *ngIf="numberIndicatorFb" class="uk-padding-small" [formGroup]="numberIndicatorFb">
<div class="uk-grid" uk-grid> <div class="uk-grid" uk-grid>
<div dashboard-input class="uk-form-row uk-width-1-1" [formInput]="numberIndicatorFb.get('name')" label="Title"></div> <div dashboard-input class="uk-width-1-1" [formInput]="numberIndicatorFb.get('name')" label="Title"></div>
<div *ngIf="isAdministrator" dashboard-input class="uk-form-row" [formInput]="numberIndicatorFb.get('description')" <div *ngIf="isAdministrator" dashboard-input class="uk-width-1-1"
label="Description" type="textarea"> [formInput]="numberIndicatorFb.get('description')"
</div> label="Description" type="textarea">
<div dashboard-input class="uk-form-row uk-width-1-1" [formInput]="numberIndicatorFb.get('additionalDescription')" </div>
label="Additional information" type="textarea"> <div dashboard-input class="uk-width-1-1" [formInput]="numberIndicatorFb.get('additionalDescription')"
</div> label="Additional information" type="textarea">
</div>
<div dashboard-input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('visibility')" <div dashboard-input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('visibility')"
label="Visibility" [options]="stakeholderUtils.visibility" type="select"> label="Visibility" [options]="stakeholderUtils.visibility" type="select">
</div> </div>
<div dashboard-input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('width')" <div dashboard-input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('width')"
type="select" [options]="indicatorUtils.indicatorSizes" type="select" [options]="indicatorUtils.indicatorSizes"
label="Number Size"> label="Number Size">
</div> </div>
<h5 class="uk-text-bold uk-margin-top uk-margin-bottom uk-width-1-1"> <div *ngIf="numberIndicatorPaths" formArrayName="indicatorPaths">
Number Settings <div *ngFor="let indicatorPath of numberIndicatorPaths.controls; let i=index"
</h5> [formGroup]="indicatorPath">
<div *ngIf="numberIndicatorPaths" formArrayName="indicatorPaths"> <div class="uk-grid" uk-grid>
<div *ngFor="let indicatorPath of numberIndicatorPaths.controls; let i=index" <div class="uk-width-1-1">
[formGroup]="indicatorPath"> <div class="uk-grid" uk-grid>
<div class="uk-grid-medium uk-form-row uk-flex uk-flex-middle" uk-grid> <div class="uk-width-1-1">
<div class="uk-width-2-3@s"> <div dashboard-input [formInput]="indicatorPath.get('url')" label="Number URL"></div>
<div dashboard-input [formInput]="indicatorPath.get('url')" type="textarea" rows="3" </div>
label="Number path url"></div> <div *ngIf="urlParameterizedMessage.length > 0" class="uk-alert-warning uk-alert uk-width-1-1">
</div> {{urlParameterizedMessage}}
<div *ngIf="urlParameterizedMessage.length > 0" class="uk-alert-warning uk-alert"> </div>
{{urlParameterizedMessage}} <div class="uk-width-1-1">
</div> <div dashboard-input [formInput]="indicatorPath.get('source')" label="Source"
<div class="uk-width-1-3@s"> type="select" [options]="indicatorUtils.sourceTypes">
<div dashboard-input [formInput]="indicatorPath.get('source')" label="Source" </div>
type="select" [options]="indicatorUtils.sourceTypes"> </div>
</div>
</div>
</div>
<div formArrayName="jsonPath">
<div class="uk-margin-top uk-margin-bottom uk-text-large">
JSON Path
</div>
<div class="uk-grid uk-grid-medium" uk-grid>
<div *ngFor="let jsonPath of getJsonPath(i).controls; let j=index" class="uk-flex uk-flex-middle">
<div dashboard-input class="uk-width-small"
[formInput]="jsonPath"
[label]="'Level ' + +(j + 1)"></div>
<i *ngIf="getJsonPath(i).length !== 1"
class=" uk-margin-small-left uk-text-danger clickable" uk-icon="close"
(click)="removeJsonPath(i, j)"></i>
<div *ngIf="j < (getJsonPath(i).length - 1)" class="uk-text-center uk-margin-left">
<i class="material-icons" uk-icon="icon:arrow-right; ratio:1.3"></i>
</div> </div>
<div *ngIf="j === (getJsonPath(i).length - 1)" class="uk-margin-left"> </div>
<button class="uk-button uk-button-primary" (click)="addJsonPath(i)">Add level</button> <div formArrayName="jsonPath" class="uk-width-1-1">
<h6 class="uk-text-bold">
JSON Path
</h6>
<div class="uk-grid uk-child-width-1-3@m uk-child-width-1-1" uk-grid>
<div *ngFor="let jsonPath of getJsonPath(i).controls; let j=index" class="uk-flex uk-flex-middle">
<div dashboard-input class="uk-width-1-1"
[extraLeft]="false"
[formInput]="jsonPath"
[label]="'Level ' + +(j + 1)">
<div class="uk-flex uk-flex-middle">
<span *ngIf="getJsonPath(i).length !== 1"
class=" uk-margin-small-left uk-text-danger clickable"
(click)="removeJsonPath(i, j)">
<icon name="close"></icon>
</span>
<span class="uk-text-center uk-margin-left">
<icon name="arrow_right"></icon>
</span>
</div>
</div>
</div>
<div>
<button
class="uk-button uk-button-secondary uk-button-small uk-flex uk-flex-middle uk-margin-medium-top"
(click)="addJsonPath(i)">
<icon name="add" [flex]="true"></icon>
<span class="space">Add level</span>
</button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</modal-alert> </modal-alert>
<modal-alert #editChartModal <modal-alert #editChartModal
@ -315,59 +331,61 @@
</div> </div>
<div *ngIf="chartIndicatorPaths" formArrayName="indicatorPaths" class="uk-width-1-1"> <div *ngIf="chartIndicatorPaths" formArrayName="indicatorPaths" class="uk-width-1-1">
<div *ngFor="let indicatorPath of chartIndicatorPaths.controls; let i=index;" <div *ngFor="let indicatorPath of chartIndicatorPaths.controls; let i=index;"
[formGroup]="indicatorPath" class="uk-grid" uk-grid> [formGroup]="indicatorPath" class="uk-grid" uk-grid>
<div dashboard-input class="uk-width-1-1" <div dashboard-input class="uk-width-1-1"
[title]="indicatorPath.get('url').disabled?'Default chart URLs cannot change':''" [title]="indicatorPath.get('url').disabled?'Default chart URLs cannot change':''"
[formInput]="indicatorPath.get('url')" [formInput]="indicatorPath.get('url')"
label="Chart Url"></div> label="Chart URL"></div>
<div *ngIf="urlParameterizedMessage.length > 0" class="uk-alert-warning uk-alert uk-width-1-1"> <div *ngIf="urlParameterizedMessage.length > 0" class="uk-alert-warning uk-alert uk-width-1-1">
{{urlParameterizedMessage}} {{urlParameterizedMessage}}
</div> </div>
<div formArrayName="parameters" class="uk-grid uk-width-1-1" uk-grid> <div class="uk-width-1-1" formArrayName="parameters">
<div *ngIf="getParameter(i, 'title')" class="uk-width-1-1"> <div class="uk-grid" uk-grid>
<div dashboard-input <div *ngIf="getParameter(i, 'title')" class="uk-width-1-1">
[formInput]="getParameter(i, 'title').get('value')" <div dashboard-input
label="Chart Title"></div> [formInput]="getParameter(i, 'title').get('value')"
</div> label="Chart Title"></div>
<div *ngIf="getParameter(i, 'subtitle')" class="uk-width-1-1"> </div>
<div dashboard-input <div *ngIf="getParameter(i, 'subtitle')" class="uk-width-1-1">
[formInput]="getParameter(i, 'subtitle').get('value')" <div dashboard-input
label="Chart Subtitle"></div> [formInput]="getParameter(i, 'subtitle').get('value')"
</div> label="Chart Subtitle"></div>
<div *ngIf="!getParameter(i, 'type')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="indicatorPath.get('type')" <div *ngIf="!getParameter(i, 'type')" class="uk-width-1-3@s">
type="select" <div dashboard-input [formInput]="indicatorPath.get('type')"
[options]="(indicatorPath.get('type').value == 'table' && getParameter(i, 'data_title_0'))?indicatorUtils.getChartTypes(indicatorPath.get('type').value):indicatorUtils.allChartTypes" type="select"
label="Chart Type"></div> [options]="(indicatorPath.get('type').value == 'table' && getParameter(i, 'data_title_0'))?indicatorUtils.getChartTypes(indicatorPath.get('type').value):indicatorUtils.allChartTypes"
</div> label="Chart Type"></div>
<div *ngIf="getParameter(i, 'type')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'type').get('value')" <div *ngIf="getParameter(i, 'type')" class="uk-width-1-3@s">
type="select" [options]="indicatorUtils.getChartTypes(getParameter(i, 'type').get('value').value)" <div dashboard-input [formInput]="getParameter(i, 'type').get('value')"
label="Chart Type"></div> type="select" [options]="indicatorUtils.getChartTypes(getParameter(i, 'type').get('value').value)"
</div> label="Chart Type"></div>
<div *ngIf="getParameter(i, 'xAxisTitle')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'xAxisTitle').get('value')" <div *ngIf="getParameter(i, 'xAxisTitle')" class="uk-width-1-3@s">
label="X-Axis Title"></div> <div dashboard-input [formInput]="getParameter(i, 'xAxisTitle').get('value')"
</div> label="X-Axis Title"></div>
<div *ngIf="getParameter(i, 'yAxisTitle')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'yAxisTitle').get('value')" <div *ngIf="getParameter(i, 'yAxisTitle')" class="uk-width-1-3@s">
label="Y-Axis Title"></div> <div dashboard-input [formInput]="getParameter(i, 'yAxisTitle').get('value')"
</div> label="Y-Axis Title"></div>
<div *ngIf="getParameter(i, 'data_title_0')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'data_title_0').get('value')" <div *ngIf="getParameter(i, 'data_title_0')" class="uk-width-1-3@s">
label="Data title"></div> <div dashboard-input [formInput]="getParameter(i, 'data_title_0').get('value')"
</div> label="Data title"></div>
<div *ngIf="getParameter(i, 'data_title_1')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'data_title_1').get('value')" <div *ngIf="getParameter(i, 'data_title_1')" class="uk-width-1-3@s">
label="Data title"></div> <div dashboard-input [formInput]="getParameter(i, 'data_title_1').get('value')"
</div> label="Data title"></div>
<div *ngIf="getParameter(i, 'start_year')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'start_year').get('value')" <div *ngIf="getParameter(i, 'start_year')" class="uk-width-1-3@s">
label="Year (From)"></div> <div dashboard-input [formInput]="getParameter(i, 'start_year').get('value')"
</div> label="Year (From)"></div>
<div *ngIf="getParameter(i, 'end_year')" class="uk-width-1-3@s"> </div>
<div dashboard-input [formInput]="getParameter(i, 'end_year').get('value')" <div *ngIf="getParameter(i, 'end_year')" class="uk-width-1-3@s">
label="Year (To)"></div> <div dashboard-input [formInput]="getParameter(i, 'end_year').get('value')"
label="Year (To)"></div>
</div>
</div> </div>
</div> </div>
<div *ngIf="indicator && indicator.indicatorPaths[i] && indicator.indicatorPaths[i].safeResourceUrl" <div *ngIf="indicator && indicator.indicatorPaths[i] && indicator.indicatorPaths[i].safeResourceUrl"

1
src/app/topic/indicators.component.ts
View File

@ -389,6 +389,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
public removeJsonPath(i: number, j:number) { public removeJsonPath(i: number, j:number) {
this.getJsonPath(i).removeAt(j); this.getJsonPath(i).removeAt(j);
this.getJsonPath(i).markAsDirty();
} }
public getJsonPath(index: number): FormArray { public getJsonPath(index: number): FormArray {

8
src/app/topic/topic.component.html
View File

@ -1,6 +1,6 @@
<aside id="sidebar_main"> <aside id="sidebar_main">
<div id="sidebar_content"> <div id="sidebar_content">
<div *ngIf="stakeholder && stakeholder.topics[topicIndex]" class="menu_section uk-margin-top"> <div class="menu_section uk-margin-top">
<div class="uk-text-center"> <div class="uk-text-center">
<a [routerLink]="'/admin/' + stakeholder.alias" <a [routerLink]="'/admin/' + stakeholder.alias"
class="uk-link-heading uk-text-uppercase uk-flex uk-flex-middle uk-flex-center"> class="uk-link-heading uk-text-uppercase uk-flex uk-flex-middle uk-flex-center">
@ -66,7 +66,7 @@
<!--<a class="portal-icon-button uk-icon-button icon-button-small uk-margin-right" uk-tooltip="Help"> <!--<a class="portal-icon-button uk-icon-button icon-button-small uk-margin-right" uk-tooltip="Help">
<i uk-icon="icon:question;ratio:0.7" class="uk-icon"></i> <i uk-icon="icon:question;ratio:0.7" class="uk-icon"></i>
</a>--> </a>-->
<a class="portal-icon-button uk-icon-button icon-button-small" uk-tooltip="Preview"> <a class="portal-icon-button uk-icon-button small" uk-tooltip="Preview">
<icon name="preview" [ratio]="0.7"></icon> <icon name="preview" [ratio]="0.7"></icon>
</a> </a>
<div #element uk-dropdown="mode: click; pos: top-left; offset: 5; delay-hide: 0; flip: false" <div #element uk-dropdown="mode: click; pos: top-left; offset: 5; delay-hide: 0; flip: false"
@ -100,7 +100,7 @@
<div *ngIf="stakeholder && filters" page-content> <div *ngIf="stakeholder && filters" page-content>
<div header> <div header>
<nav> <nav>
<div *ngIf="stakeholder && stakeholder.topics[topicIndex]"> <div *ngIf="stakeholder.topics.length > 0 && stakeholder.topics[topicIndex]">
<ul *ngIf="stakeholder.topics[topicIndex]" <ul *ngIf="stakeholder.topics[topicIndex]"
class="customTabs uk-tab ignore admin uk-flex uk-flex-middle" visibility="true"> class="customTabs uk-tab ignore admin uk-flex uk-flex-middle" visibility="true">
<ng-template ngFor [ngForOf]="stakeholder.topics[topicIndex].categories" let-category let-i="index"> <ng-template ngFor [ngForOf]="stakeholder.topics[topicIndex].categories" let-category let-i="index">
@ -144,7 +144,7 @@
</ul> </ul>
</div> </div>
</nav> </nav>
<ul *ngIf=" stakeholder.topics[topicIndex].categories[categoryIndex]" <ul *ngIf="stakeholder.topics.length > 0 && stakeholder.topics[topicIndex].categories.length > 0 && stakeholder.topics[topicIndex].categories[categoryIndex]"
visibility="true" class="uk-subnav uk-subnav-pill subCategoriesTabs ignore admin uk-flex uk-flex-middle"> visibility="true" class="uk-subnav uk-subnav-pill subCategoriesTabs ignore admin uk-flex uk-flex-middle">
<ng-template ngFor [ngForOf]="stakeholder.topics[topicIndex].categories[categoryIndex].subCategories" <ng-template ngFor [ngForOf]="stakeholder.topics[topicIndex].categories[categoryIndex].subCategories"
let-subCategory let-i="index"> let-subCategory let-i="index">

2
src/app/topic/topic.component.ts
View File

@ -104,7 +104,7 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent {
if (this.topicIndex === -1) { if (this.topicIndex === -1) {
this.navigateToError(); this.navigateToError();
} else { } else {
this.title.setTitle(stakeholder.name + ' | ' + this.stakeholder.topics[this.topicIndex].name); this.title.setTitle(stakeholder.name);
this.toggle = true; this.toggle = true;
} }
} }

14
src/app/topic/topic.module.ts
View File

@ -15,7 +15,17 @@ import {InputModule} from "../openaireLibrary/dashboard/sharedComponents/input/i
import {ClickModule} from "../openaireLibrary/utils/click/click.module"; import {ClickModule} from "../openaireLibrary/utils/click/click.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard"; import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
import {preview, bullet, add, earth, lock, group, refresh, close} from "../openaireLibrary/utils/icons/icons"; import {
preview,
bullet,
add,
earth,
lock,
group,
refresh,
close,
arrow_right
} from "../openaireLibrary/utils/icons/icons";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
@ -37,6 +47,6 @@ import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/p
}) })
export class TopicModule { export class TopicModule {
constructor(private iconsService: IconsService) { constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([preview, bullet, add, earth, lock, group, refresh, close]); this.iconsService.registerIcons([preview, bullet, add, earth, lock, group, refresh, close, arrow_right]);
} }
} }

4
src/environments/environment.beta.ts
View File

@ -49,8 +49,8 @@ export let properties: EnvProperties = {
loginUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login", loginUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login",
registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/', registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
logoutUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_logout", /*logoutUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_logout",*/
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".openaire.eu", cookieDomain: ".openaire.eu",
feedbackmail: "feedback@openaire.eu", feedbackmail: "feedback@openaire.eu",

4
src/environments/environment.prod.ts
View File

@ -49,8 +49,8 @@ export let properties: EnvProperties = {
loginUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_login", loginUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_login",
registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
logoutUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_logout", /*logoutUrl: "https://services.openaire.eu/monitor-dashboard-login/openid_connect_logout",*/
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".openaire.eu", cookieDomain: ".openaire.eu",
feedbackmail: "feedback@openaire.eu", feedbackmail: "feedback@openaire.eu",

10
src/environments/environment.ts
View File

@ -50,13 +50,11 @@ export let properties: EnvProperties = {
vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/", vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "80", piwikSiteId: "80",
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', registryUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/",
loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login", loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
/*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/ /*logoutUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout",*/
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".di.uoa.gr", cookieDomain: ".di.uoa.gr",
feedbackmail: "openaire.test@gmail.com", feedbackmail: "openaire.test@gmail.com",
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=", cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",