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

[Monitor dashboard | Trunk] 

Admin tools:
	- move amdin tool components underadmin-tool folder
	- create admin tool routing module
	- remove guard from each module and put it in admin tool routing module

Piwik:
	- add piwik from configuration service and pass it in search, landing, monitor

App component:
	- when stakeholder changes: update or reset properties adminToolsCommunity, adminToolsPortalType and init community information


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60171 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Argiro Kokogiannaki 2020-12-18 15:31:21 +00:00
parent 71d4a51cc6
commit 20ef481a4a
48 changed files with 537 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
src/app/admin-tool/admin-tool-routing.module.ts Normal file
View File

@ -0,0 +1,181 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{path: '', redirectTo: '/admin', pathMatch: 'full'},
{
path: 'portals',
loadChildren: './portals/portals.module#PortalsModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'entities',
loadChildren: './entities/entities.module#MonitorEntitiesModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classContents',
loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classContents/new',
loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classContents/edit',
loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'helptexts',
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'helptexts/new',
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'helptexts/edit',
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pages',
loadChildren: './pages/pages.module#MonitorPagesModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pageContents',
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pageContents/new',
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pageContents/edit',
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
canActivate:[AdminLoginGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
// stakeholder:
{
path: ':stakeholder/entities',
loadChildren: './entities/entities.module#MonitorEntitiesModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/classContents',
loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/classContents/new',
loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/classContents/edit',
loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/helptexts',
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/helptexts/new',
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/helptexts/edit',
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/pages',
loadChildren: './pages/pages.module#MonitorPagesModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/pageContents',
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/pageContents/new',
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: ':stakeholder/pageContents/edit',
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
canActivate:[AdminDashboardGuard],
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
}
])
]
})
export class AdminToolRoutingModule {
}

4
src/app/classHelpTexts/div-help-contents-routing.module.ts → src/app/admin-tool/classHelpTexts/div-help-contents-routing.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {DivHelpContentsComponent} from "../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {DivHelpContentsComponent} from "../../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component";
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
@NgModule({
imports: [

5
src/app/classHelpTexts/div-help-contents.module.ts → src/app/admin-tool/classHelpTexts/div-help-contents.module.ts
View File

@ -1,14 +1,13 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {DivHelpContentsRoutingModule} from './div-help-contents-routing.module';
import {DivHelpContentsModule} from "../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {DivHelpContentsModule} from "../../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module";
@NgModule({
imports: [
CommonModule, DivHelpContentsRoutingModule, DivHelpContentsModule
],
providers: [AdminDashboardGuard],
providers: [],
})
export class MonitorDivHelpContentsModule { }

4
src/app/classHelpTexts/edit-div-help-content-routing.module.ts → src/app/admin-tool/classHelpTexts/edit-div-help-content-routing.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {EditDivHelpContentComponent} from "../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {EditDivHelpContentComponent} from "../../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.component";
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
@NgModule({

4
src/app/classHelpTexts/edit-div-help-content.module.ts → src/app/admin-tool/classHelpTexts/edit-div-help-content.module.ts
View File

@ -2,8 +2,8 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module';
import {EditDivHelpContentModule} from "../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {EditDivHelpContentModule} from "../../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module";
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
@NgModule({
imports: [

4
src/app/classHelpTexts/new-div-help-content-routing.module.ts → src/app/admin-tool/classHelpTexts/new-div-help-content-routing.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {NewDivHelpContentComponent} from "../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {NewDivHelpContentComponent} from "../../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.component";
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
@NgModule({
imports: [

4
src/app/classHelpTexts/new-div-help-content.module.ts → src/app/admin-tool/classHelpTexts/new-div-help-content.module.ts
View File

@ -1,8 +1,8 @@
import { NgModule } from '@angular/core';
import {CommonModule} from '@angular/common';
import {NewDivHelpContentRoutingModule} from "./new-div-help-content-routing.module";
import {NewDivHelpContentModule} from "../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {NewDivHelpContentModule} from "../../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module";
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
@NgModule({

4
src/app/classes/classes-routing.module.ts → src/app/admin-tool/classes/classes-routing.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {DivIdsComponent} from "../openaireLibrary/dashboard/divId/divIds.component";
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
import {DivIdsComponent} from "../../openaireLibrary/dashboard/divId/divIds.component";
@NgModule({

4
src/app/classes/classes.module.ts → src/app/admin-tool/classes/classes.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import {ClassesRoutingModule} from "./classes-routing.module";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {DivIdsModule} from "../openaireLibrary/dashboard/divId/divIds.module";
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
import {DivIdsModule} from "../../openaireLibrary/dashboard/divId/divIds.module";
import {CommonModule} from "@angular/common";

4
src/app/entities/entities-routing.module.ts → src/app/admin-tool/entities/entities-routing.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {EntitiesComponent} from "../openaireLibrary/dashboard/entity/entities.component";
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
import {EntitiesComponent} from "../../openaireLibrary/dashboard/entity/entities.component";
@NgModule({
imports: [

4
src/app/entities/entities.module.ts → src/app/admin-tool/entities/entities.module.ts
View File

@ -1,8 +1,8 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {EntitiesRoutingModule} from "./entities-routing.module";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {EntitiesModule} from "../openaireLibrary/dashboard/entity/entities.module";
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
import {EntitiesModule} from "../../openaireLibrary/dashboard/entity/entities.module";
@NgModule({
imports: [

13
src/app/admin-tool/helpTexts/edit-page-help-content-routing.module.ts Normal file
View File

@ -0,0 +1,13 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {EditPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: EditPageHelpContentComponent}
])
]
})
export class EditPageHelpContentRoutingModule { }

5
src/app/helpTexts/edit-page-help-content.module.ts → src/app/admin-tool/helpTexts/edit-page-help-content.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module";
import {EditPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {EditPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module";
@NgModule({
imports: [
CommonModule, RouterModule,
EditPageHelpContentRoutingModule, EditPageHelpContentModule
],
providers: [AdminDashboardGuard]
providers: []
})
export class MonitorEditPageHelpContentModule { }

13
src/app/admin-tool/helpTexts/new-page-help-content-routing.module.ts Normal file
View File

@ -0,0 +1,13 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {NewPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.component";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: NewPageHelpContentComponent}
])
]
})
export class NewPageHelpContentRoutingModule { }

5
src/app/helpTexts/new-page-help-content.module.ts → src/app/admin-tool/helpTexts/new-page-help-content.module.ts
View File

@ -2,8 +2,7 @@ import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module";
import {NewPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/new-page-help-content.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {NewPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.module";
@NgModule({
@ -11,6 +10,6 @@ import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
CommonModule, RouterModule,
NewPageHelpContentRoutingModule, NewPageHelpContentModule
],
providers: [AdminDashboardGuard],
providers: [],
})
export class MonitorNewPageHelpContentModule { }

12
src/app/admin-tool/helpTexts/page-help-contents-routing.module.ts Normal file
View File

@ -0,0 +1,12 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PageHelpContentsComponent} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.component";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: PageHelpContentsComponent}
])
]
})
export class PageHelpContentsRoutingModule { }

5
src/app/helpTexts/page-help-contents.module.ts → src/app/admin-tool/helpTexts/page-help-contents.module.ts
View File

@ -1,13 +1,12 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
import {PageHelpContentsModule} from "../openaireLibrary/dashboard/helpTexts/page-help-contents.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {PageHelpContentsModule} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.module";
@NgModule({
imports: [
CommonModule, PageHelpContentsRoutingModule, PageHelpContentsModule
],
providers: [AdminDashboardGuard],
providers: [],
})
export class MonitorPageHelpContentsModule { }

14
src/app/admin-tool/pages/pages-routing.module.ts Normal file
View File

@ -0,0 +1,14 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PagesComponent} from "../../openaireLibrary/dashboard/page/pages.component";
import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [LoginGuard,IsCommunityOrAdmin], component: PagesComponent}
])
]
})
export class PagesRoutingModule { }

15
src/app/admin-tool/pages/pages.module.ts Normal file
View File

@ -0,0 +1,15 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {PagesRoutingModule} from './pages-routing.module';
import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
import {PagesModule} from "../../openaireLibrary/dashboard/page/pages.module";
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
@NgModule({
imports: [
CommonModule, PagesRoutingModule, PagesModule
],
providers: [LoginGuard,IsCommunityOrAdmin],
})
export class MonitorPagesModule { }

13
src/app/admin-tool/portals/portals-routing.module.ts Normal file
View File

@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PortalsComponent} from "../../openaireLibrary/dashboard/portal/portals.component";
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: PortalsComponent}
])
]
})
export class PortalsRoutingModule { }

5
src/app/portals/portals.module.ts → src/app/admin-tool/portals/portals.module.ts
View File

@ -1,7 +1,6 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {PortalModule} from "../openaireLibrary/dashboard/portal/portals.module";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {PortalModule} from "../../openaireLibrary/dashboard/portal/portals.module";
import {PortalsRoutingModule} from "./portals-routing.module";
@NgModule({
@ -9,7 +8,7 @@ import {PortalsRoutingModule} from "./portals-routing.module";
CommonModule, PortalModule, PortalsRoutingModule
],
declarations: [],
providers: [AdminLoginGuard],
providers: [],
exports: []
})
export class PortalsModule {

89
src/app/app-routing.module.ts
View File

@ -59,91 +59,14 @@ const routes: Routes = [
},
/* Library paths*/
{
path: 'portals',
loadChildren: './portals/portals.module#PortalsModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
path: 'admin-tools',
loadChildren: './admin-tool/admin-tool-routing.module#AdminToolRoutingModule',
resolve: {envSpecific: EnvironmentSpecificResolver},
data: {hasMiniMenu: true, isFrontPage: false}
},
{
path: 'entities',
loadChildren: './entities/entities.module#MonitorEntitiesModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classes',
loadChildren: './classes/classes.module#ClassesModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classContents',
loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classContents/new',
loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'classContents/edit',
loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'helptexts',
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'helptexts/new',
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'helptexts/edit',
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pages',
loadChildren: './pages/pages.module#MonitorPagesModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pageContents',
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pageContents/new',
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
{
path: 'pageContents/edit',
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
resolve: { envSpecific: EnvironmentSpecificResolver },
data: {hasAdminMenu: true}
},
//
// {
// path: 'htmlPageContent/edit',
// loadChildren: './pages/htmlpagecontent/edit-html-page-content.module#EditHtmlPageContentModule',
// resolve: { envSpecific: EnvironmentSpecificResolver },
// data: {hasAdminMenu: true}
// },
{ path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
{
path: '',

54
src/app/app.component.ts
View File

@ -13,6 +13,7 @@ import {LinksResolver} from "./search/links-resolver";
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
import {arrow_left} from "./openaireLibrary/utils/icons/icons";
import {properties} from "../environments/environment";
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
@Component({
@ -59,7 +60,7 @@ export class AppComponent implements OnInit, OnDestroy {
private userManagementService: UserManagementService,
private layoutService: LayoutService,
private stakeholderService: StakeholderService,
private cdr: ChangeDetectorRef) {
private cdr: ChangeDetectorRef, private configurationService: ConfigurationService) {
this.subscriptions.push(this.router.events.subscribe(event => {
if (event instanceof NavigationEnd) {
let r = this.route;
@ -128,6 +129,7 @@ export class AppComponent implements OnInit, OnDestroy {
if (stakeholder) {
this.stakeholder = stakeholder;
LinksResolver.setProperties(this.stakeholder.alias);
this.setProperties(this.stakeholder.type, this.stakeholder.alias);
if (isSearch) {
this.activeTopic = null;
} else if (params && params['topic'] && !this.activeTopic) {
@ -141,6 +143,7 @@ export class AppComponent implements OnInit, OnDestroy {
} else {
this.stakeholder = null;
LinksResolver.resetProperties();
this.resetProperties();
this.navigateToError();
this.buildMenu();
this.loading = false;
@ -148,7 +151,8 @@ export class AppComponent implements OnInit, OnDestroy {
}, error => {
this.stakeholder = null;
LinksResolver.resetProperties();
if (error.status === 404) {
this.resetProperties();
if (error && error.status && error.status === 404) {
this.navigateToError();
}
this.buildMenu();
@ -172,6 +176,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.stakeholder = null;
this.buildMenu();
this.loading = false;
this.resetProperties();
}
}
}));
@ -195,6 +200,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.userManagementService.clearSubscriptions();
this.layoutService.clearSubscriptions();
this.stakeholderService.clearSubscriptions();
this.configurationService.clearSubscriptions();
}
private navigateToError() {
@ -320,6 +326,14 @@ export class AppComponent implements OnInit, OnDestroy {
this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/" + this.stakeholder.alias, false, [], [], {}, "<i uk-icon=\"image\"></i>"));
this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, "<i uk-icon=\"users\"></i>"));
if(Session.isPortalAdministrator(this.user) ) {
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/" + this.stakeholder.alias + "/pages", false, [], [], {communityId:this.stakeholder.alias}));
monitorOptions.items.push(new MenuItem("entities", "Entities", "","/admin-tools/" + this.stakeholder.alias + "/entities", false, [], [], {communityId:this.stakeholder.alias}));
// monitorOptions.items.push(new MenuItem("classes", "Class help texts", "","/admin-tools/" + this.stakeholder.alias + "/classContents", false, [], [], {}));
monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "","/admin-tools/" + this.stakeholder.alias + "/helptexts", false, [], [], {communityId:this.stakeholder.alias}));
this.adminMenuItems.push(monitorOptions);
}
this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {});
this.specialSideBarMenuItem.icon = '<span class="uk-icon-button small uk-icon uk-button-secondary">' + arrow_left.data + '</span>'; // '<span class="uk-icon-button uk-icon portal-button " uk-icon="chevron-left"></span>';
this.specialSideBarMenuItem.customClass = 'uk-text-uppercase uk-text-bold uk-text-secondary';
@ -365,18 +379,20 @@ export class AppComponent implements OnInit, OnDestroy {
this.adminMenuItems = [];
this.specialSideBarMenuItem = null;
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "<i uk-icon=\"cog\"></i>"));
/*let adminOptions = new MenuItem("adminOptions", "Admin Options", "", null, false, [], [], {})
adminOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {}));
adminOptions.items.push(new MenuItem("portals", "Portals", "", "/portals", false, [], [], {}));
adminOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {}));
adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classes", false, [], [], {}));
this.adminMenuItems.push(adminOptions);
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", null, false, [], [], {})
monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classContents", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/helptexts", false, [], [], {communityId: 'monitor'}));
this.adminMenuItems.push(monitorOptions);*/
if(Session.isPortalAdministrator(this.user) ) {
let adminOptions = new MenuItem("adminOptions", "Admin Options", "", "", false, [], [], {})
adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {}));
adminOptions.items.push(new MenuItem("portals", "Portals", "", "/admin-tools/portals", false, [], [], {}));
adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {}));
// adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {}));
this.adminMenuItems.push(adminOptions);
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {communityId: 'monitor'}));
// monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));
this.adminMenuItems.push(monitorOptions);
}
}
}
@ -409,6 +425,16 @@ export class AppComponent implements OnInit, OnDestroy {
}
return true;
}
setProperties(type, communityId){
this.properties.adminToolsCommunity = communityId;
this.properties.adminToolsPortalType = type;
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
}
resetProperties(){
this.properties.adminToolsCommunity = "monitor";
this.properties.adminToolsPortalType = "monitor";
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
}
/* createSearchParameters() {
if (!this.stakeholder) {

4
src/app/app.module.ts
View File

@ -23,6 +23,8 @@ import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
@NgModule({
@ -44,7 +46,7 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
declarations: [AppComponent, OpenaireErrorPageComponent],
exports: [AppComponent],
providers: [
EnvironmentSpecificResolver,
EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard,
{
provide: HTTP_INTERCEPTORS,
useClass: HttpInterceptorService,

14
src/app/helpTexts/edit-page-help-content-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {EditPageHelpContentComponent} from "../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminDashboardGuard], component: EditPageHelpContentComponent}
])
]
})
export class EditPageHelpContentRoutingModule { }

14
src/app/helpTexts/new-page-help-content-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {NewPageHelpContentComponent} from "../openaireLibrary/dashboard/helpTexts/new-page-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminDashboardGuard], component: NewPageHelpContentComponent}
])
]
})
export class NewPageHelpContentRoutingModule { }

13
src/app/helpTexts/page-help-contents-routing.module.ts
View File

@ -1,13 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PageHelpContentsComponent} from "../openaireLibrary/dashboard/helpTexts/page-help-contents.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminDashboardGuard], component: PageHelpContentsComponent}
])
]
})
export class PageHelpContentsRoutingModule { }

2
src/app/monitor/monitor.component.html
View File

@ -90,7 +90,7 @@
<div class="uk-text-large "></div>
</div>
</div>
<div *ngIf="!privateStakeholder">
<div *ngIf="!privateStakeholder && stakeholder">
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 ||
(activeSubCategory.charts.length == 1 && countIndicatorsToShow(activeSubCategory.charts[0].indicators) == 0)))
&& ((activeSubCategory &&

48
src/app/monitor/monitor.component.ts
View File

@ -31,6 +31,7 @@ import {Location} from "@angular/common";
import {RouterHelper} from "../openaireLibrary/utils/routerHelper.class";
import {properties} from "../../environments/environment";
import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor',
@ -40,7 +41,9 @@ import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
export class MonitorComponent implements OnInit, OnDestroy {
public user: User;
public subscriptions: any[] = [];
public piwiksub: any;
piwikSiteId;
title;
description;
public pageContents = null;
public divContents = null;
public status: number;
@ -87,7 +90,8 @@ export class MonitorComponent implements OnInit, OnDestroy {
private seoService: SEOService,
private cdr: ChangeDetectorRef,
private indexInfoService: IndexInfoService,
private sanitizer: DomSanitizer, private _fb: FormBuilder, private router: Router) {
private sanitizer: DomSanitizer, private _fb: FormBuilder, private router: Router,
private configurationService: ConfigurationService) {
this.errorCodes = new ErrorCodes();
this.errorMessages = new ErrorMessagesComponent();
this.status = this.errorCodes.LOADING;
@ -164,14 +168,22 @@ export class MonitorComponent implements OnInit, OnDestroy {
this.initializeFilters();
this.seoService.createLinkForCanonicalURL(url, false);
this._meta.updateTag({content: url}, "property='og:url'");
var description = "Monitor Dashboard | " + this.stakeholder.name;
var title = "Monitor Dashboard | " + this.stakeholder.name;
this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content: description}, "property='og:description'");
this._meta.updateTag({content: title}, "property='og:title'");
this._title.setTitle(title);
this.description = "Monitor Dashboard | " + this.stakeholder.name;
this.title = "Monitor Dashboard | " + this.stakeholder.name;
this._meta.updateTag({content: this.description}, "name='description'");
this._meta.updateTag({content: this.description}, "property='og:description'");
this._meta.updateTag({content: this.title}, "property='og:title'");
this._title.setTitle(this.title);
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
this.subscriptions.push(this._piwikService.trackView(this.properties, title, this.properties.piwikSiteId).subscribe());
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal && portal.piwik) {
console.debug(portal)
this.piwikSiteId = portal.piwik;
console.debug(this.piwikSiteId)
this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
}
}));
}
if (this.isPublicOrIsMember(stakeholder.visibility)) {
//this.getDivContents();
@ -185,10 +197,21 @@ export class MonitorComponent implements OnInit, OnDestroy {
subscription.unsubscribe();
}
}
}else{
this.navigateToError();
if (subscription) {
subscription.unsubscribe();
}
}
});
this.subscriptions.push(subscription);
} else {
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
if (this.piwikSiteId) {
console.debug(this.piwikSiteId)
this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
}
}
this.initializeFilters();
this.setView(params);
}
@ -287,13 +310,13 @@ export class MonitorComponent implements OnInit, OnDestroy {
}
private getPageContents() {
this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.properties.adminToolsCommunity, this._router.url).subscribe(contents => {
this.pageContents = contents;
}));
}
private getDivContents() {
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, this.properties.adminToolsCommunity, this._router.url).subscribe(contents => {
this.divContents = contents;
}));
}
@ -486,9 +509,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
}
public ngOnDestroy() {
if (this.piwiksub) {
this.piwiksub.unsubscribe();
}
this.subscriptions.forEach(subscription => {
if (subscription instanceof Subscriber) {
subscription.unsubscribe();

15
src/app/pages/pages-routing.module.ts
View File

@ -1,15 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PagesComponent} from "../openaireLibrary/dashboard/page/pages.component";
import {IsCommunityOrAdmin} from "../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [LoginGuard,IsCommunityOrAdmin, AdminDashboardGuard], component: PagesComponent}
])
]
})
export class PagesRoutingModule { }

15
src/app/pages/pages.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {PagesRoutingModule} from './pages-routing.module';
import {IsCommunityOrAdmin} from "../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
import {PagesModule} from "../openaireLibrary/dashboard/page/pages.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, PagesRoutingModule, PagesModule
],
providers: [IsCommunityOrAdmin, AdminDashboardGuard],
})
export class MonitorPagesModule { }

13
src/app/portals/portals-routing.module.ts
View File

@ -1,13 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PortalsComponent} from "../openaireLibrary/dashboard/portal/portals.component";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminLoginGuard], component: PortalsComponent}
])
]
})
export class PortalsRoutingModule { }

14
src/app/search/landingPages/dataProvider/dataProvider.component.ts
View File

@ -2,20 +2,22 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-dataprovider',
template: `
<div id="page_content">
<dataprovider *ngIf="initialized"></dataprovider>
<dataprovider *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></dataprovider>
</div>`,
})
export class MonitorDataProviderComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -31,6 +33,12 @@ export class MonitorDataProviderComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

14
src/app/search/landingPages/dataset/dataset.component.ts
View File

@ -2,21 +2,23 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-dataset',
template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="dataset"></result-landing>
<result-landing *ngIf="initialized" type="dataset" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`,
})
export class MonitorDatasetComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -32,6 +34,12 @@ export class MonitorDatasetComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

14
src/app/search/landingPages/organization/organization.component.ts
View File

@ -2,20 +2,22 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-organization',
template: `
<div id="page_content">
<organization *ngIf="initialized"></organization>
<organization *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></organization>
</div>`,
})
export class MonitorOrganizationComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -31,6 +33,12 @@ export class MonitorOrganizationComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

14
src/app/search/landingPages/orp/orp.component.ts
View File

@ -2,22 +2,24 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-orp',
template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="orp"></result-landing>
<result-landing *ngIf="initialized" type="orp" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`,
})
export class MonitorOrpComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -33,6 +35,12 @@ export class MonitorOrpComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

14
src/app/search/landingPages/project/project.component.ts
View File

@ -2,20 +2,22 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-project',
template: `
<div id="page_content">
<project *ngIf="initialized"></project>
<project *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></project>
</div>`,
})
export class MonitorProjectComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -31,6 +33,12 @@ export class MonitorProjectComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

15
src/app/search/landingPages/publication/publication.component.ts
View File

@ -2,21 +2,23 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-publication',
template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="publication"></result-landing>
<result-landing *ngIf="initialized" type="publication" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`,
})
export class MonitorPublicationComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -32,6 +34,13 @@ export class MonitorPublicationComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
console.debug(portal)
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

14
src/app/search/landingPages/result/result.component.ts
View File

@ -2,20 +2,22 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-result',
template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="result"></result-landing>
<result-landing *ngIf="initialized" type="result" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>`,
})
export class MonitorResultComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -31,6 +33,12 @@ export class MonitorResultComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

14
src/app/search/landingPages/software/software.component.ts
View File

@ -2,21 +2,23 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-software',
template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="software"></result-landing>
<result-landing *ngIf="initialized" type="software" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`,
})
export class MonitorSoftwareComponent {
initialized: boolean = false;
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -32,6 +34,12 @@ export class MonitorSoftwareComponent {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.initialized = true;
this.communityId = stakeholder.alias;
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
}
}));
}

11
src/app/search/searchPages/advanced/searchDataproviders.component.ts
View File

@ -3,6 +3,7 @@ import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUti
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-advanced-search-dataproviders',
@ -10,7 +11,7 @@ import {Subscriber} from "rxjs";
<div id="page_content">
<search-dataproviders *ngIf="initialized" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId">
</search-dataproviders>
</div>
`
@ -19,9 +20,10 @@ export class MonitorAdvancedSearchDataprovidersComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
showSwitchSearchLink:boolean = false;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -48,6 +50,11 @@ export class MonitorAdvancedSearchDataprovidersComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name;
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));

13
src/app/search/searchPages/advanced/searchOrganizations.component.ts
View File

@ -3,12 +3,14 @@ import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-advanced-search-organizations',
template: `
<div id="page_content">
<search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter">
<search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter"
[piwikSiteId]="piwikSiteId">
</search-organizations>
</div>
`
@ -16,10 +18,10 @@ import {Subscriber} from "rxjs";
export class MonitorAdvancedSearchOrganizationsComponent {
initialized: boolean = false;
customFilter: SearchCustomFilter = null;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -48,6 +50,11 @@ export class MonitorAdvancedSearchOrganizationsComponent {
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
this.customFilter.isHiddenFilter = false;
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));

10
src/app/search/searchPages/advanced/searchProjects.component.ts
View File

@ -4,6 +4,7 @@ import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {properties} from "../../../../environments/environment";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-advanced-search-projects',
@ -13,6 +14,7 @@ import {properties} from "../../../../environments/environment";
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'"
[piwikSiteId]="piwikSiteId"
>
</search-projects>
</div>
@ -24,9 +26,10 @@ export class MonitorAdvancedSearchProjectsComponent {
initialized: boolean = false;
showSwitchSearchLink:boolean = false;
properties;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -55,6 +58,11 @@ export class MonitorAdvancedSearchProjectsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name;
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));

10
src/app/search/searchPages/advanced/searchResearchResults.component.ts
View File

@ -4,6 +4,7 @@ import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {properties} from "../../../../environments/environment";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-advanced-search-results',
@ -14,6 +15,7 @@ import {properties} from "../../../../environments/environment";
[includeOnlyResultsAndFilter]="false"
[showSwitchSearchLink]="true"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
[piwikSiteId]="piwikSiteId"
></search-research-results>
</div>
`
@ -22,9 +24,10 @@ export class MonitorAdvancedSearchResearchResultsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
properties;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -51,6 +54,11 @@ export class MonitorAdvancedSearchResearchResultsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name;
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));

11
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -3,6 +3,7 @@ import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUti
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-search-dataproviders',
@ -10,7 +11,7 @@ import {Subscriber} from "rxjs";
<div id="page_content">
<search-dataproviders *ngIf="initialized"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId">
</search-dataproviders>
</div>
`
@ -19,9 +20,10 @@ export class MonitorSearchDataprovidersComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
showSwitchSearchLink:boolean = false;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -45,6 +47,11 @@ export class MonitorSearchDataprovidersComponent {
} else if (stakeholder.type === "ri") {
this.navigateToError();
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));

12
src/app/search/searchPages/simple/searchOrganizations.component.ts
View File

@ -2,22 +2,23 @@ import {Component} from '@angular/core';
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-search-organizations',
template: `
<div id="page_content">
<search-organizations *ngIf="initialized">
<search-organizations *ngIf="initialized" [piwikSiteId]="piwikSiteId">
</search-organizations>
</div>
`
})
export class MonitorSearchOrganizationsComponent {
initialized: boolean = false;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -33,6 +34,11 @@ export class MonitorSearchOrganizationsComponent {
if (params['stakeholder']) {
this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));

14
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -4,6 +4,7 @@ import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {properties} from "../../../../environments/environment";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-search-projects',
@ -12,7 +13,8 @@ import {properties} from "../../../../environments/environment";
<search-projects *ngIf="initialized"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'">
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'"
[piwikSiteId]="piwikSiteId">
</search-projects>
</div>
`
@ -21,10 +23,11 @@ import {properties} from "../../../../environments/environment";
export class MonitorSearchProjectsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
properties
properties;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -50,6 +53,11 @@ export class MonitorSearchProjectsComponent {
} else if (stakeholder.type === "ri") {
this.navigateToError();
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}

10
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -4,6 +4,7 @@ import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {Subscriber} from "rxjs";
import {properties} from "../../../../environments/environment";
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
@Component({
selector: 'monitor-search-results',
@ -14,6 +15,7 @@ import {properties} from "../../../../environments/environment";
[includeOnlyResultsAndFilter]="false"
[showSwitchSearchLink]="true"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/research-outcomes'"
[piwikSiteId]="piwikSiteId"
></search-research-results>
</div>
`,
@ -22,9 +24,10 @@ export class MonitorSearchResearchResultsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
properties;
piwikSiteId;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
private stakeholderService: StakeholderService, private configurationService: ConfigurationService) {
}
subscriptions = [];
ngOnDestroy() {
@ -51,6 +54,11 @@ export class MonitorSearchResearchResultsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name;
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
}
this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
if (portal) {
this.piwikSiteId = portal.piwik;
}
}));
this.initialized = true;
}
}));