Merge branch 'develop' of code-repo.d4science.org:MaDgIK/monitor-dashboard into develop
This commit is contained in:
commit
72fb9526cf
|
@ -48,6 +48,7 @@
|
||||||
"src/assets/common-assets/library-css/material.scss"
|
"src/assets/common-assets/library-css/material.scss"
|
||||||
],
|
],
|
||||||
"scripts": [
|
"scripts": [
|
||||||
|
"src/assets/common-assets/js/copy.js",
|
||||||
"node_modules/uikit/dist/js/uikit.min.js",
|
"node_modules/uikit/dist/js/uikit.min.js",
|
||||||
"node_modules/uikit/dist/js/uikit-icons.min.js",
|
"node_modules/uikit/dist/js/uikit-icons.min.js",
|
||||||
"node_modules/jquery/dist/jquery.js"
|
"node_modules/jquery/dist/jquery.js"
|
||||||
|
|
|
@ -23,7 +23,7 @@ const routes: Routes = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'admin',
|
path: 'admin',
|
||||||
loadChildren: () => import('./manageStakeholders/manageStakeholders.module').then(m => m.ManageStakeholdersModule),
|
loadChildren: () => import('./openaireLibrary/monitor-admin/manageStakeholders/manageStakeholders.module').then(m => m.ManageStakeholdersModule),
|
||||||
canActivateChild: [LoginGuard],
|
canActivateChild: [LoginGuard],
|
||||||
data: {hasAdminMenu: true, hasSidebar: false}
|
data: {hasAdminMenu: true, hasSidebar: false}
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,27 +3,27 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="!loading" [class.monitor]="isFrontPage">
|
<div *ngIf="!loading" [class.monitor]="isFrontPage">
|
||||||
<div id="modal-container"></div>
|
<div id="modal-container"></div>
|
||||||
<navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"
|
<ng-container *ngIf="!isHidden">
|
||||||
[notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>
|
<navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"
|
||||||
<div>
|
[notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>
|
||||||
<ng-container *ngIf="!isHidden">
|
<div>
|
||||||
<div class="sidebar_main_swipe uk-flex uk-background-default" [class.sidebar_main_active]="open && (hasSidebar || hasAdminMenu || hasInternalSidebar)"
|
<div class="sidebar_main_swipe uk-flex uk-background-default" [class.sidebar_main_active]="open && (hasSidebar || hasAdminMenu || hasInternalSidebar)"
|
||||||
[class.sidebar_mini]="!open && (hasSidebar || hasAdminMenu || hasInternalSidebar)" [class.sidebar_hover]="hover">
|
[class.sidebar_mini]="!open && (hasSidebar || hasAdminMenu || hasInternalSidebar)" [class.sidebar_hover]="hover">
|
||||||
<dashboard-sidebar *ngIf="stakeholder && isFrontPage && hasSidebar && !hasInternalSidebar" queryParamsHandling="merge" [items]="sideBarItems"
|
<dashboard-sidebar *ngIf="stakeholder && isFrontPage && hasSidebar && !hasInternalSidebar" queryParamsHandling="merge" [items]="sideBarItems"
|
||||||
[activeItem]="activeTopic?activeTopic.alias:null" [activeSubItem]="activeCategory?activeCategory.alias:null"></dashboard-sidebar>
|
[activeItem]="activeTopic?activeTopic.alias:null" [activeSubItem]="activeCategory?activeCategory.alias:null"></dashboard-sidebar>
|
||||||
<dashboard-sidebar *ngIf="hasAdminMenu && !hasInternalSidebar" [items]="adminMenuItems" [backItem]="backItem"></dashboard-sidebar>
|
<dashboard-sidebar *ngIf="hasAdminMenu && !hasInternalSidebar" [items]="adminMenuItems" [backItem]="backItem"></dashboard-sidebar>
|
||||||
<main class="uk-width-1-1">
|
<main class="uk-width-1-1">
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
<bottom id="bottom" *ngIf="isFrontPage" [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
|
<bottom id="bottom" *ngIf="isFrontPage" [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
|
||||||
<notification-sidebar *ngIf="!isMobile && user && notificationGroupsInitialized" [configuration]="notificationConfiguration" [user]="user"></notification-sidebar>
|
<notification-sidebar *ngIf="!isMobile && user && notificationGroupsInitialized" [configuration]="notificationConfiguration" [user]="user"></notification-sidebar>
|
||||||
<cache-indicators *ngIf="stakeholder && !isFrontPage && isCurator()" [alias]="stakeholder.alias"></cache-indicators>
|
<cache-indicators *ngIf="stakeholder && !isFrontPage && isCurator()" [alias]="stakeholder.alias"></cache-indicators>
|
||||||
<div *ngIf="view" class="preview uk-text-small uk-flex uk-flex-middle">
|
<div *ngIf="view" class="preview uk-text-small uk-flex uk-flex-middle">
|
||||||
<span>You are currently in a <span class="uk-text-bold">"Preview"</span> mode. <span class="uk-visible@m"><a (click)="removeView()">The current view</a> of this dashboard may differ.</span></span>
|
<span>You are currently in a <span class="uk-text-bold">"Preview"</span> mode. <span class="uk-visible@m"><a (click)="removeView()">The current view</a> of this dashboard may differ.</span></span>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</div>
|
||||||
</div>
|
</ng-container>
|
||||||
<div *ngIf="projectUpdate && !isFrontPage" class="project-update">
|
<div *ngIf="projectUpdate && !isFrontPage" class="project-update">
|
||||||
<div *ngIf="projectUpdate === 'danger'" class="uk-alert uk-alert-danger" uk-alert>
|
<div *ngIf="projectUpdate === 'danger'" class="uk-alert uk-alert-danger" uk-alert>
|
||||||
<a class="uk-alert-close" uk-close></a>
|
<a class="uk-alert-close" uk-close></a>
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {RouterModule} from '@angular/router';
|
|
||||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {ManageStakeholdersComponent} from "./manageStakeholders.component";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
component: ManageStakeholdersComponent,
|
|
||||||
canDeactivate: [PreviousRouteRecorder]
|
|
||||||
}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class ManageStakeholdersRoutingModule {
|
|
||||||
}
|
|
|
@ -1,138 +0,0 @@
|
||||||
<div page-content>
|
|
||||||
<div header>
|
|
||||||
<sidebar-mobile-toggle class="uk-margin-top uk-hidden@m uk-display-block"></sidebar-mobile-toggle>
|
|
||||||
<div *ngIf="isCurator()" class="uk-margin-remove-bottom uk-margin-medium-top">
|
|
||||||
<slider-tabs [type]="'dynamic'" (activeEmitter)="tab = $event">
|
|
||||||
<slider-tab tabTitle="All" [tabId]="'all'" [active]="tab === 'all'"></slider-tab>
|
|
||||||
<slider-tab tabTitle="Profile templates" [tabId]="'templates'" [active]="tab === 'templates'"></slider-tab>
|
|
||||||
<slider-tab tabTitle="Profiles" [tabId]="'profiles'" [active]="tab === 'profiles'"></slider-tab>
|
|
||||||
</slider-tabs>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div actions>
|
|
||||||
<div class="uk-section-xsmall">
|
|
||||||
<div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle">
|
|
||||||
<div search-input [searchControl]="filters.get('keyword')" [expandable]="true" placeholder="Search Profiles" searchInputClass="outer"
|
|
||||||
class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-right"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div inner>
|
|
||||||
<div *ngIf="loading" class="uk-margin-medium-top uk-padding-large">
|
|
||||||
<loading></loading>
|
|
||||||
</div>
|
|
||||||
<div *ngIf="!loading" uk-height-match="target: .titleContainer; row: false">
|
|
||||||
<div uk-height-match="target: .logoContainer; row: false">
|
|
||||||
<div *ngIf="tab != 'profiles' && isCurator()" class="uk-section">
|
|
||||||
<h4>Profile Templates</h4>
|
|
||||||
<div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match" uk-grid>
|
|
||||||
<ng-template ngFor [ngForOf]="displayDefaultStakeholders" let-stakeholder>
|
|
||||||
<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
|
|
||||||
</ng-template>
|
|
||||||
<div *ngIf="!loading && isCurator()">
|
|
||||||
<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new default profile.', isDefault:true}"></ng-container>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div *ngIf="!isManager()" class="message">
|
|
||||||
<h4 class="uk-text-center">
|
|
||||||
No profiles to manage yet
|
|
||||||
</h4>
|
|
||||||
</div>
|
|
||||||
<div *ngIf="tab != 'templates' && isManager()" class="uk-section">
|
|
||||||
<h4>Profiles</h4>
|
|
||||||
<div class="uk-grid uk-grid-match uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1" uk-grid>
|
|
||||||
<ng-template ngFor [ngForOf]="displayStakeholders" let-stakeholder>
|
|
||||||
<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
|
|
||||||
</ng-template>
|
|
||||||
<div *ngIf="!loading && isCurator()">
|
|
||||||
<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type ('+stakeholderEntities.FUNDER+', '+stakeholderEntities.ORGANIZATION+', '+stakeholderEntities.RI+' or '+stakeholderEntities.PROJECT+') and ' +
|
|
||||||
'select indicators based on a default or a blank profile.', isDefault:false}"></ng-container>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ng-template #stakeholderBox let-stakeholder="stakeholder">
|
|
||||||
<div *ngIf="stakeholder">
|
|
||||||
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
|
|
||||||
<div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
|
|
||||||
<a class="uk-link-reset uk-flex uk-flex-middle">
|
|
||||||
<icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(stakeholder.visibility)" ratio="0.6"></icon>
|
|
||||||
<icon [flex]="true" name="more_vert"></icon>
|
|
||||||
</a>
|
|
||||||
<div #element class="uk-dropdown" uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
|
|
||||||
<ul class="uk-nav uk-dropdown-nav">
|
|
||||||
<li>
|
|
||||||
<a (click)="editStakeholder(stakeholder, !stakeholder.defaultId); hide(element)">Edit</a>
|
|
||||||
</li>
|
|
||||||
<li *ngIf="isCurator">
|
|
||||||
<a (click)="createReport(stakeholder);hide(element)">Cache Indicators</a>
|
|
||||||
</li>
|
|
||||||
<li class="uk-nav-divider"></li>
|
|
||||||
<ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
|
|
||||||
<li [class.uk-active]="stakeholder.visibility === v.value">
|
|
||||||
<a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
|
|
||||||
<div class="uk-flex uk-flex-middle">
|
|
||||||
<icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
|
|
||||||
<span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
|
|
||||||
<icon *ngIf="stakeholder.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ng-template>
|
|
||||||
<hr *ngIf="isProfileManager(stakeholder)" class="uk-nav-divider">
|
|
||||||
<li *ngIf="isProfileManager(stakeholder)"><a
|
|
||||||
(click)="deleteStakeholderOpen(stakeholder);hide(element)">Delete</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<a class="uk-display-block uk-text-center uk-link-reset" [routerLink]="'/admin/' + stakeholder.alias">
|
|
||||||
<div class="titleContainer uk-h6 uk-margin-remove-bottom uk-margin-top multi-line-ellipsis lines-2">
|
|
||||||
<p *ngIf="stakeholder.name" class="uk-margin-remove">
|
|
||||||
{{stakeholder.name}}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="logoContainer uk-margin-top uk-flex uk-flex-column uk-flex-center uk-flex-middle">
|
|
||||||
<img [src]="stakeholder | logoUrl" class="uk-blend-multiply" style="max-height: 80px;">
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</ng-template>
|
|
||||||
<ng-template #newBox let-text="text" let-isDefault="isDefault">
|
|
||||||
<ng-container *ngIf="!loading">
|
|
||||||
<div class="uk-card uk-card-default uk-text-center uk-card-body clickable" (click)="editStakeholder(null, isDefault)">
|
|
||||||
<div class="uk-text-small uk-text-muted">
|
|
||||||
{{text}}
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin-medium-top uk-margin-small-bottom">
|
|
||||||
<span class="uk-text-secondary">
|
|
||||||
<icon name="add" [ratio]="3"></icon>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</ng-container>
|
|
||||||
</ng-template>
|
|
||||||
<modal-alert #editStakeholderModal [large]="true" classTitle="uk-background-primary uk-light"
|
|
||||||
(alertOutput)="editStakeholderComponent.save(callback)" (cancelOutput)="editStakeholderComponent.removePhoto()"
|
|
||||||
[okDisabled]="editStakeholderComponent.disabled">
|
|
||||||
<div class="uk-height-large uk-position-relative" *ngIf="editStakeholderComponent.loading">
|
|
||||||
<loading class="uk-position-center"></loading>
|
|
||||||
</div>
|
|
||||||
<div class="uk-padding" [class.uk-hidden]="editStakeholderComponent.loading">
|
|
||||||
<edit-stakeholder #editStakeholderComponent></edit-stakeholder>
|
|
||||||
</div>
|
|
||||||
</modal-alert>
|
|
||||||
<modal-alert #deleteStakeholderModal [overflowBody]="false" (alertOutput)="deleteStakeholder()">
|
|
||||||
<div class="uk-height-medium uk-position-relative" *ngIf="deleteLoading">
|
|
||||||
<loading class="uk-position-center"></loading>
|
|
||||||
</div>
|
|
||||||
<div *ngIf="!deleteLoading">
|
|
||||||
This stakeholder will permanently be deleted. Are you sure you want to proceed?
|
|
||||||
</div>
|
|
||||||
</modal-alert>
|
|
|
@ -1,23 +0,0 @@
|
||||||
@import (reference) "~src/assets/openaire-theme/less/color.less";
|
|
||||||
|
|
||||||
.setType(@color) {
|
|
||||||
border-bottom: 4px solid fade(@color, 30%);
|
|
||||||
|
|
||||||
& .type {
|
|
||||||
color: @color;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.uk-card {
|
|
||||||
&.funder {
|
|
||||||
.setType(@funder-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.ri {
|
|
||||||
.setType(@ri-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.organization {
|
|
||||||
.setType(@organization-color);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,307 +0,0 @@
|
||||||
import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core";
|
|
||||||
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
|
|
||||||
import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
|
|
||||||
import {Stakeholder, StakeholderEntities, Visibility} from "../openaireLibrary/monitor/entities/stakeholder";
|
|
||||||
import {Subscriber, zip} from "rxjs";
|
|
||||||
import {StakeholderUtils} from "../openaireLibrary/monitor-admin/utils/indicator-utils";
|
|
||||||
import {UntypedFormBuilder, UntypedFormGroup} from "@angular/forms";
|
|
||||||
import {AlertModal} from "../openaireLibrary/utils/modal/alert";
|
|
||||||
import {Option} from "../openaireLibrary/sharedComponents/input/input.component";
|
|
||||||
import {Title} from "@angular/platform-browser";
|
|
||||||
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
|
|
||||||
import {Session} from "../openaireLibrary/login/utils/helper.class";
|
|
||||||
import {EditStakeholderComponent} from "../openaireLibrary/monitor-admin/general/edit-stakeholder/edit-stakeholder.component";
|
|
||||||
import {properties} from "../../environments/environment";
|
|
||||||
import {ActivatedRoute} from "@angular/router";
|
|
||||||
import {CacheIndicatorsService} from "../openaireLibrary/monitor-admin/utils/cache-indicators/cache-indicators.service";
|
|
||||||
import {NotificationHandler} from "../openaireLibrary/utils/notification-handler";
|
|
||||||
|
|
||||||
type Tab = 'all' | 'templates'| 'profiles';
|
|
||||||
|
|
||||||
declare var UIkit;
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'home',
|
|
||||||
templateUrl: "./manageStakeholders.component.html",
|
|
||||||
styleUrls: ["./manageStakeholders.component.less"]
|
|
||||||
})
|
|
||||||
export class ManageStakeholdersComponent implements OnInit, OnDestroy {
|
|
||||||
|
|
||||||
public properties: EnvProperties;
|
|
||||||
public loading: boolean = true;
|
|
||||||
public deleteLoading: boolean = false;
|
|
||||||
public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
|
|
||||||
public defaultStakeholders: Stakeholder[];
|
|
||||||
public stakeholders: Stakeholder[];
|
|
||||||
public alias: string[];
|
|
||||||
public stakeholder: Stakeholder;
|
|
||||||
public index: number;
|
|
||||||
public user = null;
|
|
||||||
public tab: Tab = 'all';
|
|
||||||
public stakeholderEntities = StakeholderEntities;
|
|
||||||
/**
|
|
||||||
* Filtered Stakeholders
|
|
||||||
*/
|
|
||||||
public displayDefaultStakeholders: Stakeholder[];
|
|
||||||
public displayStakeholders: Stakeholder[];
|
|
||||||
/**
|
|
||||||
* Top filters
|
|
||||||
*/
|
|
||||||
public filters: UntypedFormGroup;
|
|
||||||
public all: Option = {
|
|
||||||
value: 'all',
|
|
||||||
label: 'All'
|
|
||||||
};
|
|
||||||
|
|
||||||
public callback: Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Grid or List View
|
|
||||||
*/
|
|
||||||
private subscriptions: any[] = [];
|
|
||||||
@ViewChild('editStakeholderModal', { static: true }) editStakeholderModal: AlertModal;
|
|
||||||
@ViewChild('deleteStakeholderModal', { static: true }) deleteStakeholderModal: AlertModal;
|
|
||||||
@ViewChild('editStakeholderComponent', { static: true }) editStakeholderComponent: EditStakeholderComponent;
|
|
||||||
|
|
||||||
constructor(private stakeholderService: StakeholderService,
|
|
||||||
private cacheIndicatorsService: CacheIndicatorsService,
|
|
||||||
private userManagementService: UserManagementService,
|
|
||||||
private route: ActivatedRoute,
|
|
||||||
private title: Title,
|
|
||||||
private fb: UntypedFormBuilder) {
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
this.buildFilters();
|
|
||||||
this.properties = properties;
|
|
||||||
this.title.setTitle('Manage profiles');
|
|
||||||
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
|
||||||
this.user = user;
|
|
||||||
}));
|
|
||||||
let data = zip(
|
|
||||||
this.stakeholderService.getDefaultStakeholders(this.properties.monitorServiceAPIURL),
|
|
||||||
this.stakeholderService.getMyStakeholders(this.properties.monitorServiceAPIURL),
|
|
||||||
this.stakeholderService.getAlias(this.properties.monitorServiceAPIURL)
|
|
||||||
);
|
|
||||||
this.subscriptions.push(data.subscribe(res => {
|
|
||||||
this.defaultStakeholders = res[0];
|
|
||||||
this.stakeholders = res[1];
|
|
||||||
this.displayDefaultStakeholders = res[0];
|
|
||||||
this.displayStakeholders = res[1];
|
|
||||||
this.alias = res[2];
|
|
||||||
this.loading = false;
|
|
||||||
}, error => {
|
|
||||||
this.loading = false;
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
|
||||||
this.subscriptions.forEach(value => {
|
|
||||||
if (value instanceof Subscriber) {
|
|
||||||
value.unsubscribe();
|
|
||||||
} else if (value instanceof Function) {
|
|
||||||
value();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
hide(element: any) {
|
|
||||||
UIkit.dropdown(element).hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private buildFilters() {
|
|
||||||
this.filters = this.fb.group({
|
|
||||||
status: this.fb.control('all'),
|
|
||||||
keyword: this.fb.control('')
|
|
||||||
});
|
|
||||||
this.subscriptions.push(this.filters.get('status').valueChanges.subscribe(value => {
|
|
||||||
this.onStatusChange(value);
|
|
||||||
}));
|
|
||||||
this.subscriptions.push(this.filters.get('keyword').valueChanges.subscribe(value => {
|
|
||||||
this.onKeywordChange(value);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
onStatusChange(value) {
|
|
||||||
this.displayDefaultStakeholders = this.filterStatus(this.defaultStakeholders, value);
|
|
||||||
this.displayStakeholders = this.filterStatus(this.stakeholders, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
onKeywordChange(value) {
|
|
||||||
this.displayDefaultStakeholders = this.filterByKeyword(this.defaultStakeholders, value);
|
|
||||||
this.displayStakeholders = this.filterByKeyword(this.stakeholders, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private filterStatus(stakeholders: Stakeholder[], value): Stakeholder[] {
|
|
||||||
if (value === 'all') {
|
|
||||||
return stakeholders;
|
|
||||||
} else {
|
|
||||||
return stakeholders.filter(stakeholder => stakeholder.visibility == value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private filterByKeyword(stakeholders: Stakeholder[], value): Stakeholder[] {
|
|
||||||
if (!value) {
|
|
||||||
return stakeholders;
|
|
||||||
} else {
|
|
||||||
return stakeholders.filter(stakeholder =>
|
|
||||||
stakeholder.name && stakeholder.name.toLowerCase().includes(value.toLowerCase()) ||
|
|
||||||
stakeholder.type && stakeholder.type.toLowerCase().includes(value.toLowerCase()) ||
|
|
||||||
stakeholder.index_id && stakeholder.index_id.toLowerCase().includes(value.toLowerCase()) ||
|
|
||||||
stakeholder.index_shortName && stakeholder.index_shortName.toLowerCase().includes(value.toLowerCase()) ||
|
|
||||||
stakeholder.index_name && stakeholder.index_name.toLowerCase().includes(value.toLowerCase())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public editStakeholder(stakeholder: Stakeholder = null, isDefault: boolean = false) {
|
|
||||||
if (isDefault) {
|
|
||||||
this.index = (stakeholder) ? this.defaultStakeholders.findIndex(value => value._id === stakeholder._id) : -1;
|
|
||||||
} else {
|
|
||||||
this.index = (stakeholder) ? this.stakeholders.findIndex(value => value._id === stakeholder._id) : -1;
|
|
||||||
}
|
|
||||||
if (!stakeholder) {
|
|
||||||
this.stakeholder = new Stakeholder(null, null, null,
|
|
||||||
null, null, null, null, null);
|
|
||||||
} else {
|
|
||||||
this.stakeholder = stakeholder;
|
|
||||||
}
|
|
||||||
this.editStakeholderComponent.init(this.stakeholder, this.alias, this.defaultStakeholders, isDefault, this.index === -1);
|
|
||||||
if (this.index !== -1) {
|
|
||||||
this.callback = (stakeholder: Stakeholder) => {
|
|
||||||
let index: number;
|
|
||||||
if (stakeholder.defaultId == null) {
|
|
||||||
index = this.alias.findIndex(value => value == this.defaultStakeholders[this.index].alias);
|
|
||||||
this.defaultStakeholders[this.index] = stakeholder;
|
|
||||||
} else {
|
|
||||||
index = this.alias.findIndex(value => value == this.stakeholders[this.index].alias);
|
|
||||||
this.stakeholders[this.index] = stakeholder;
|
|
||||||
}
|
|
||||||
if(index != -1) {
|
|
||||||
this.alias[index] = stakeholder.alias;
|
|
||||||
}
|
|
||||||
this.editStakeholderModal.cancel();
|
|
||||||
};
|
|
||||||
this.editStakeholderModal.alertTitle = 'Edit ' + this.stakeholder.name;
|
|
||||||
this.editStakeholderModal.okButtonText = 'Save Changes';
|
|
||||||
} else {
|
|
||||||
this.callback = (stakeholder: Stakeholder) => {
|
|
||||||
if (stakeholder.defaultId === null) {
|
|
||||||
this.defaultStakeholders.push(stakeholder);
|
|
||||||
} else {
|
|
||||||
this.stakeholders.push(stakeholder);
|
|
||||||
}
|
|
||||||
this.alias.push(stakeholder.alias);
|
|
||||||
this.editStakeholderModal.cancel();
|
|
||||||
};
|
|
||||||
this.editStakeholderModal.alertTitle = 'Create a new ' + (isDefault?'Default ':'') + 'Profile';
|
|
||||||
this.editStakeholderModal.okButtonText = 'Create';
|
|
||||||
}
|
|
||||||
this.editStakeholderModal.cancelButtonText = 'Cancel';
|
|
||||||
this.editStakeholderModal.okButtonLeft = false;
|
|
||||||
this.editStakeholderModal.alertMessage = false;
|
|
||||||
this.editStakeholderModal.stayOpen = true;
|
|
||||||
this.editStakeholderModal.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
public createReport(stakeholder: Stakeholder) {
|
|
||||||
this.cacheIndicatorsService.createReport(stakeholder.alias).subscribe(report => {
|
|
||||||
NotificationHandler.rise('A caching process for ' + stakeholder.name + ' has been started.' )
|
|
||||||
}, error => {
|
|
||||||
console.log(error);
|
|
||||||
NotificationHandler.rise(error.message(), 'danger');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public deleteStakeholderOpen(stakeholder: Stakeholder) {
|
|
||||||
this.stakeholder = stakeholder;
|
|
||||||
this.deleteStakeholderModal.alertTitle = 'Delete ' + this.stakeholder.index_name;
|
|
||||||
this.deleteStakeholderModal.cancelButtonText = 'No';
|
|
||||||
this.deleteStakeholderModal.okButtonText = 'Yes';
|
|
||||||
this.deleteStakeholderModal.alertMessage = false;
|
|
||||||
this.deleteStakeholderModal.stayOpen = true;
|
|
||||||
this.deleteStakeholderModal.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
public deleteStakeholder() {
|
|
||||||
this.deleteLoading = true;
|
|
||||||
if (!this.stakeholder.defaultId) {
|
|
||||||
this.index = (this.stakeholder) ? this.defaultStakeholders.findIndex(value => value._id === this.stakeholder._id) : -1;
|
|
||||||
} else {
|
|
||||||
this.index = (this.stakeholder) ? this.stakeholders.findIndex(value => value._id === this.stakeholder._id) : -1;
|
|
||||||
}
|
|
||||||
this.subscriptions.push(this.stakeholderService.deleteElement(this.properties.monitorServiceAPIURL, [this.stakeholder._id]).subscribe(() => {
|
|
||||||
UIkit.notification(this.stakeholder.name+ ' has been <b>successfully deleted</b>', {
|
|
||||||
status: 'success',
|
|
||||||
timeout: 6000,
|
|
||||||
pos: 'bottom-right'
|
|
||||||
});
|
|
||||||
if (!this.stakeholder.defaultId) {
|
|
||||||
this.defaultStakeholders.splice(this.index, 1);
|
|
||||||
} else {
|
|
||||||
this.stakeholders.splice(this.index, 1);
|
|
||||||
}
|
|
||||||
this.alias = this.alias.filter(item => item !== this.stakeholder.alias);
|
|
||||||
this.deleteLoading = false;
|
|
||||||
this.deleteStakeholderModal.cancel();
|
|
||||||
}, error => {
|
|
||||||
UIkit.notification('An error has occurred. Please try again later', {
|
|
||||||
status: 'danger',
|
|
||||||
timeout: 6000,
|
|
||||||
pos: 'bottom-right'
|
|
||||||
});
|
|
||||||
this.deleteLoading = false;
|
|
||||||
this.deleteStakeholderModal.cancel();
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
changeStakeholderStatus(stakeholder: Stakeholder, visibility: Visibility) {
|
|
||||||
let path = [
|
|
||||||
stakeholder._id
|
|
||||||
];
|
|
||||||
this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => {
|
|
||||||
stakeholder.visibility = returnedElement.visibility;
|
|
||||||
UIkit.notification(stakeholder.name+ '\'s status has been <b>successfully changed</b> to ' + stakeholder.visibility.toLowerCase(), {
|
|
||||||
status: 'success',
|
|
||||||
timeout: 6000,
|
|
||||||
pos: 'bottom-right'
|
|
||||||
});
|
|
||||||
}, error => {
|
|
||||||
UIkit.notification('An error has occurred. Please try again later', {
|
|
||||||
status: 'danger',
|
|
||||||
timeout: 6000,
|
|
||||||
pos: 'bottom-right'
|
|
||||||
});
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
public isManager(): boolean {
|
|
||||||
return this.isCurator() || (Session.isKindOfMonitorManager(this.user));
|
|
||||||
}
|
|
||||||
|
|
||||||
public isProfileManager(stakeholder: Stakeholder): boolean {
|
|
||||||
return this.isCurator() || (Session.isManager(stakeholder.type, stakeholder.alias, this.user));
|
|
||||||
}
|
|
||||||
|
|
||||||
public isCurator(): boolean {
|
|
||||||
return this.isAdmin() || Session.isMonitorCurator(this.user);
|
|
||||||
}
|
|
||||||
|
|
||||||
public isAdmin(): boolean {
|
|
||||||
return Session.isPortalAdministrator(this.user);
|
|
||||||
}
|
|
||||||
|
|
||||||
private isTab(tab: Tab): boolean {
|
|
||||||
switch (tab) {
|
|
||||||
case "all":
|
|
||||||
return true;
|
|
||||||
case "profiles":
|
|
||||||
return true;
|
|
||||||
case "templates":
|
|
||||||
return true;
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,50 +0,0 @@
|
||||||
import {NgModule} from "@angular/core";
|
|
||||||
import {ManageStakeholdersComponent} from "./manageStakeholders.component";
|
|
||||||
import {ManageStakeholdersRoutingModule} from "./manageStakeholders-routing.module";
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {CommonModule} from "@angular/common";
|
|
||||||
import {RouterModule} from "@angular/router";
|
|
||||||
import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
|
|
||||||
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
|
|
||||||
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
|
||||||
import {ReactiveFormsModule} from "@angular/forms";
|
|
||||||
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
|
|
||||||
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
|
|
||||||
import {earth, incognito, restricted} from "../openaireLibrary/utils/icons/icons";
|
|
||||||
import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
|
|
||||||
import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
|
|
||||||
import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
|
|
||||||
import {
|
|
||||||
SidebarMobileToggleModule
|
|
||||||
} from "../openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module";
|
|
||||||
import {SliderTabsModule} from "../openaireLibrary/sharedComponents/tabs/slider-tabs.module";
|
|
||||||
import {EditStakeholderModule} from "../openaireLibrary/monitor-admin/general/edit-stakeholder/edit-stakeholder.module";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
declarations: [ManageStakeholdersComponent],
|
|
||||||
imports: [
|
|
||||||
ManageStakeholdersRoutingModule,
|
|
||||||
CommonModule,
|
|
||||||
RouterModule,
|
|
||||||
InputModule,
|
|
||||||
LoadingModule,
|
|
||||||
AlertModalModule,
|
|
||||||
ReactiveFormsModule,
|
|
||||||
EditStakeholderModule,
|
|
||||||
IconsModule,
|
|
||||||
PageContentModule,
|
|
||||||
LogoUrlPipeModule,
|
|
||||||
SearchInputModule,
|
|
||||||
SidebarMobileToggleModule,
|
|
||||||
SliderTabsModule
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
PreviousRouteRecorder,
|
|
||||||
],
|
|
||||||
exports: [ManageStakeholdersComponent]
|
|
||||||
})
|
|
||||||
export class ManageStakeholdersModule {
|
|
||||||
constructor(private iconsService: IconsService) {
|
|
||||||
this.iconsService.registerIcons([earth, incognito, restricted]);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -223,7 +223,7 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="indicator.descriptionOverlay && (indicator.description || indicator.additionalDescription)"
|
<div *ngIf="indicator.descriptionOverlay && (indicator.description || indicator.additionalDescription)"
|
||||||
class="indicator-description uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
|
class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
|
||||||
<div class="inner" click-outside-or-esc
|
<div class="inner" click-outside-or-esc
|
||||||
(clickOutside)="closeDescriptionOverlay($event, indicator)">
|
(clickOutside)="closeDescriptionOverlay($event, indicator)">
|
||||||
<div class="uk-padding-small">
|
<div class="uk-padding-small">
|
||||||
|
|
|
@ -5,20 +5,3 @@
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.indicator-description {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
background: @global-overlay-background;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
|
|
||||||
.inner {
|
|
||||||
background: @global-background;
|
|
||||||
border-radius: @global-border-radius;
|
|
||||||
width: 75%;
|
|
||||||
max-height: 75%;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5af67f738570647ee61fb4d9ccb211bfae2890ae
|
Subproject commit 41adaa308d96de18d14a7113ab7dd706c110044a
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426
|
Subproject commit 1979f5ec89ca960bf7c927a933a160854ae680b3
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79
|
Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6
|
|
@ -8,7 +8,6 @@ export let properties: EnvProperties = {
|
||||||
useCache: false,
|
useCache: false,
|
||||||
useLongCache: true,
|
useLongCache: true,
|
||||||
showContent: true,
|
showContent: true,
|
||||||
framesAPIURL: "https://beta.openaire.eu/stats3/",
|
|
||||||
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
||||||
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
||||||
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
|
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
|
||||||
|
@ -38,11 +37,6 @@ export let properties: EnvProperties = {
|
||||||
sherpaURLSuffix: '/',
|
sherpaURLSuffix: '/',
|
||||||
zenodo: "https://zenodo.org/",
|
zenodo: "https://zenodo.org/",
|
||||||
zenodoCommunities: "https://zenodo.org/api/communities/",
|
zenodoCommunities: "https://zenodo.org/api/communities/",
|
||||||
openAccess: "https://www.openaire.eu/support/faq#article-id-234",
|
|
||||||
openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
|
|
||||||
fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
|
|
||||||
h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
|
|
||||||
ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
|
|
||||||
helpdesk: 'https://www.openaire.eu/support/helpdesk',
|
helpdesk: 'https://www.openaire.eu/support/helpdesk',
|
||||||
helpdeskEmail: 'helpdesk@openaire.eu',
|
helpdeskEmail: 'helpdesk@openaire.eu',
|
||||||
utilsService: "https://demo.openaire.eu/utils-service",
|
utilsService: "https://demo.openaire.eu/utils-service",
|
||||||
|
|
|
@ -8,7 +8,6 @@ export let properties: EnvProperties = {
|
||||||
useCache: false,
|
useCache: false,
|
||||||
useLongCache: true,
|
useLongCache: true,
|
||||||
showContent: true,
|
showContent: true,
|
||||||
framesAPIURL: "https://www.openaire.eu/stats3/",
|
|
||||||
statisticsAPIURL: "https://services.openaire.eu/stats-api/",
|
statisticsAPIURL: "https://services.openaire.eu/stats-api/",
|
||||||
statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
|
statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
|
||||||
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
|
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
|
||||||
|
@ -38,11 +37,6 @@ export let properties: EnvProperties = {
|
||||||
sherpaURLSuffix: '/',
|
sherpaURLSuffix: '/',
|
||||||
zenodo: "https://zenodo.org/",
|
zenodo: "https://zenodo.org/",
|
||||||
zenodoCommunities: "https://zenodo.org/api/communities/",
|
zenodoCommunities: "https://zenodo.org/api/communities/",
|
||||||
openAccess: "https://www.openaire.eu/support/faq#article-id-234",
|
|
||||||
openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
|
|
||||||
fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
|
|
||||||
h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
|
|
||||||
ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
|
|
||||||
helpdesk: 'https://www.openaire.eu/support/helpdesk',
|
helpdesk: 'https://www.openaire.eu/support/helpdesk',
|
||||||
helpdeskEmail: 'helpdesk@openaire.eu',
|
helpdeskEmail: 'helpdesk@openaire.eu',
|
||||||
utilsService: "https://explore.openaire.eu/utils-service",
|
utilsService: "https://explore.openaire.eu/utils-service",
|
||||||
|
|
|
@ -14,7 +14,6 @@ export let properties: EnvProperties = {
|
||||||
useCache: false,
|
useCache: false,
|
||||||
useLongCache: false,
|
useLongCache: false,
|
||||||
showContent: true,
|
showContent: true,
|
||||||
framesAPIURL: "https://beta.openaire.eu/stats3/",
|
|
||||||
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
||||||
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
||||||
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
|
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
|
||||||
|
@ -45,11 +44,6 @@ export let properties: EnvProperties = {
|
||||||
sherpaURLSuffix: '/',
|
sherpaURLSuffix: '/',
|
||||||
zenodo: "https://zenodo.org/",
|
zenodo: "https://zenodo.org/",
|
||||||
zenodoCommunities: "https://zenodo.org/api/communities/",
|
zenodoCommunities: "https://zenodo.org/api/communities/",
|
||||||
openAccess: "https://www.openaire.eu/support/faq#article-id-234",
|
|
||||||
openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
|
|
||||||
fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
|
|
||||||
h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
|
|
||||||
ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
|
|
||||||
helpdesk: 'https://www.openaire.eu/support/helpdesk',
|
helpdesk: 'https://www.openaire.eu/support/helpdesk',
|
||||||
helpdeskEmail: 'helpdesk@openaire.eu',
|
helpdeskEmail: 'helpdesk@openaire.eu',
|
||||||
utilsService: "http://mpagasas.di.uoa.gr:8000",
|
utilsService: "http://mpagasas.di.uoa.gr:8000",
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
@import "~src/assets/common-assets/less/general";
|
@import "~src/assets/common-assets/less/general";
|
||||||
@import "~src/assets/common-assets/less/user";
|
@import "~src/assets/common-assets/less/user";
|
||||||
@import "~src/assets/common-assets/less/dashboard";
|
@import "~src/assets/common-assets/less/dashboard";
|
||||||
|
@import "~src/assets/common-assets/less/indicators";
|
||||||
@import "~src/assets/common-assets/less/ckeditor";
|
@import "~src/assets/common-assets/less/ckeditor";
|
||||||
@import "~src/assets/monitor-dashboard-custom";
|
@import "~src/assets/monitor-dashboard-custom";
|
||||||
@import "assets/print.css";
|
@import "assets/print.css";
|
||||||
|
|
Loading…
Reference in New Issue