[Monitor Dashboard|Trunk]
- package.json: clean up citation.js + wikidata - Admin tools: remove components- use directly library components - Properties: updates for helptexts git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60203 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
096103e996
commit
2071d524d2
|
@ -44,7 +44,6 @@
|
||||||
"@nguniversal/module-map-ngfactory-loader": "^6.0.0",
|
"@nguniversal/module-map-ngfactory-loader": "^6.0.0",
|
||||||
"@types/express": "^4.16.1",
|
"@types/express": "^4.16.1",
|
||||||
"angular-datatables": "^4.4.1",
|
"angular-datatables": "^4.4.1",
|
||||||
"citation-js": "^0.3.4",
|
|
||||||
"clipboard": "^1.5.16",
|
"clipboard": "^1.5.16",
|
||||||
"core-js": "^2.4.1",
|
"core-js": "^2.4.1",
|
||||||
"datatables.net": "^1.10.19",
|
"datatables.net": "^1.10.19",
|
||||||
|
@ -57,7 +56,6 @@
|
||||||
"prom-client": "^11.3.0",
|
"prom-client": "^11.3.0",
|
||||||
"ts-md5": "^1.2.0",
|
"ts-md5": "^1.2.0",
|
||||||
"tslib": "^1.9.0",
|
"tslib": "^1.9.0",
|
||||||
"wikidata-sdk": "^5.2.9",
|
|
||||||
"zone.js": "^0.8.26"
|
"zone.js": "^0.8.26"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -10,166 +10,171 @@ import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
|
||||||
{path: '', redirectTo: '/admin', pathMatch: 'full'},
|
{path: '', redirectTo: '/admin', pathMatch: 'full'},
|
||||||
{
|
{
|
||||||
path: 'portals',
|
path: 'portals',
|
||||||
loadChildren: './portals/portals.module#PortalsModule',
|
loadChildren: '../openaireLibrary/dashboard/portal/portals.module#PortalsModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'entities',
|
path: 'entities',
|
||||||
loadChildren: './entities/entities.module#MonitorEntitiesModule',
|
loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
|
||||||
|
canActivate:[AdminLoginGuard],
|
||||||
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
|
data: {hasAdminMenu: true}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'classes',
|
||||||
|
loadChildren: '../openaireLibrary/dashboard/divId/divIds.module#DivIdsModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
path: 'classContents',
|
path: 'classContents',
|
||||||
loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
|
loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'classContents/new',
|
path: 'classContents/new',
|
||||||
loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'classContents/edit',
|
path: 'classContents/edit',
|
||||||
loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'helptexts',
|
path: 'helptexts',
|
||||||
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'helptexts/new',
|
path: 'helptexts/new',
|
||||||
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'helptexts/edit',
|
path: 'helptexts/edit',
|
||||||
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'pages',
|
path: 'pages',
|
||||||
loadChildren: './pages/pages.module#MonitorPagesModule',
|
loadChildren: '../openaireLibrary/dashboard/page/pages.module#PagesModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'pageContents',
|
path: 'pageContents',
|
||||||
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'pageContents/new',
|
path: 'pageContents/new',
|
||||||
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'pageContents/edit',
|
path: 'pageContents/edit',
|
||||||
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
|
||||||
canActivate:[AdminLoginGuard],
|
canActivate:[AdminLoginGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
// stakeholder:
|
// stakeholder:
|
||||||
|
|
||||||
{
|
{
|
||||||
path: ':stakeholder/entities',
|
path: ':stakeholder/entities',
|
||||||
loadChildren: './entities/entities.module#MonitorEntitiesModule',
|
loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/classContents',
|
path: ':stakeholder/classContents',
|
||||||
loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
|
loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/classContents/new',
|
path: ':stakeholder/classContents/new',
|
||||||
loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/classContents/edit',
|
path: ':stakeholder/classContents/edit',
|
||||||
loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/helptexts',
|
path: ':stakeholder/helptexts',
|
||||||
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/helptexts/new',
|
path: ':stakeholder/helptexts/new',
|
||||||
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/helptexts/edit',
|
path: ':stakeholder/helptexts/edit',
|
||||||
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/pages',
|
path: ':stakeholder/pages',
|
||||||
loadChildren: './pages/pages.module#MonitorPagesModule',
|
loadChildren: '../openaireLibrary/dashboard/page/pages.module#PagesModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/pageContents',
|
path: ':stakeholder/pageContents',
|
||||||
loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/pageContents/new',
|
path: ':stakeholder/pageContents/new',
|
||||||
loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ':stakeholder/pageContents/edit',
|
path: ':stakeholder/pageContents/edit',
|
||||||
loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
|
loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
|
||||||
canActivate:[AdminDashboardGuard],
|
canActivate:[AdminDashboardGuard],
|
||||||
resolve: { envSpecific: EnvironmentSpecificResolver },
|
resolve: { envSpecific: EnvironmentSpecificResolver },
|
||||||
data: {hasAdminMenu: true}
|
data: {hasAdminMenu: true}
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', canActivate: [ AdminDashboardGuard], component: DivHelpContentsComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class DivHelpContentsRoutingModule { }
|
|
|
@ -1,13 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, DivHelpContentsRoutingModule, DivHelpContentsModule
|
|
||||||
],
|
|
||||||
|
|
||||||
providers: [],
|
|
||||||
})
|
|
||||||
export class MonitorDivHelpContentsModule { }
|
|
|
@ -1,14 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', canActivate: [AdminDashboardGuard], component: EditDivHelpContentComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class EditDivHelpContentRoutingModule { }
|
|
|
@ -1,14 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, EditDivHelpContentRoutingModule, EditDivHelpContentModule
|
|
||||||
],
|
|
||||||
providers: [AdminDashboardGuard],
|
|
||||||
})
|
|
||||||
export class MonitorEditDivHelpContentModule { }
|
|
|
@ -1,13 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', canActivate: [AdminDashboardGuard], component: NewDivHelpContentComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class NewDivHelpContentRoutingModule { }
|
|
|
@ -1,14 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule
|
|
||||||
],
|
|
||||||
providers: [AdminDashboardGuard],
|
|
||||||
})
|
|
||||||
export class MonitorNewDivHelpContentModule { }
|
|
|
@ -1,14 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', canActivate: [AdminLoginGuard], component: DivIdsComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class ClassesRoutingModule { }
|
|
|
@ -1,15 +0,0 @@
|
||||||
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 {CommonModule} from "@angular/common";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, ClassesRoutingModule, DivIdsModule
|
|
||||||
],
|
|
||||||
providers: [AdminLoginGuard],
|
|
||||||
})
|
|
||||||
export class ClassesModule { }
|
|
|
@ -1,13 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', canActivate: [AdminLoginGuard], component: EntitiesComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class EntitiesRoutingModule { }
|
|
|
@ -1,14 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, EntitiesModule, EntitiesRoutingModule
|
|
||||||
],
|
|
||||||
providers: [AdminLoginGuard],
|
|
||||||
})
|
|
||||||
export class MonitorEntitiesModule {
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
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 { }
|
|
|
@ -1,14 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, RouterModule,
|
|
||||||
EditPageHelpContentRoutingModule, EditPageHelpContentModule
|
|
||||||
],
|
|
||||||
providers: []
|
|
||||||
})
|
|
||||||
export class MonitorEditPageHelpContentModule { }
|
|
|
@ -1,13 +0,0 @@
|
||||||
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 { }
|
|
|
@ -1,15 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, RouterModule,
|
|
||||||
NewPageHelpContentRoutingModule, NewPageHelpContentModule
|
|
||||||
],
|
|
||||||
providers: [],
|
|
||||||
})
|
|
||||||
export class MonitorNewPageHelpContentModule { }
|
|
|
@ -1,12 +0,0 @@
|
||||||
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 { }
|
|
|
@ -1,12 +0,0 @@
|
||||||
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";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, PageHelpContentsRoutingModule, PageHelpContentsModule
|
|
||||||
],
|
|
||||||
providers: [],
|
|
||||||
})
|
|
||||||
export class MonitorPageHelpContentsModule { }
|
|
|
@ -1,14 +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 {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', canActivate: [LoginGuard,IsCommunityOrAdmin], component: PagesComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class PagesRoutingModule { }
|
|
|
@ -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 {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, PagesRoutingModule, PagesModule
|
|
||||||
],
|
|
||||||
providers: [LoginGuard,IsCommunityOrAdmin],
|
|
||||||
|
|
||||||
})
|
|
||||||
export class MonitorPagesModule { }
|
|
|
@ -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: '', component: PortalsComponent}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class PortalsRoutingModule { }
|
|
|
@ -1,15 +0,0 @@
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {CommonModule} from '@angular/common';
|
|
||||||
import {PortalModule} from "../../openaireLibrary/dashboard/portal/portals.module";
|
|
||||||
import {PortalsRoutingModule} from "./portals-routing.module";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, PortalModule, PortalsRoutingModule
|
|
||||||
],
|
|
||||||
declarations: [],
|
|
||||||
providers: [],
|
|
||||||
exports: []
|
|
||||||
})
|
|
||||||
export class PortalsModule {
|
|
||||||
}
|
|
|
@ -247,6 +247,11 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
this.userMenuItems.push(new MenuItem("", "Manage profiles",
|
this.userMenuItems.push(new MenuItem("", "Manage profiles",
|
||||||
"", "/admin", false, [], [], {}));
|
"", "/admin", false, [], [], {}));
|
||||||
}
|
}
|
||||||
|
if(Session.isPortalAdministrator(this.user) ) {
|
||||||
|
this.userMenuItems.push( new MenuItem("adminOptions", "Super Admin options","", "/admin-tools/portals", false, [], [], {}));
|
||||||
|
this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor portal options","", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
|
||||||
|
|
||||||
|
}
|
||||||
this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
|
this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
|
||||||
}
|
}
|
||||||
if (this.stakeholder) {
|
if (this.stakeholder) {
|
||||||
|
@ -327,12 +332,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', 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>"));
|
this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, "<i uk-icon=\"users\"></i>"));
|
||||||
if(Session.isPortalAdministrator(this.user) ) {
|
if(Session.isPortalAdministrator(this.user) ) {
|
||||||
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
|
this.adminMenuItems.push(new MenuItem("monitorOptions", "Pages & Entities", "", "/admin-tools/" + this.stakeholder.alias + "/pages", false, [], [], {communityId:this.stakeholder.alias}));
|
||||||
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 = 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.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>';
|
||||||
|
@ -379,20 +379,20 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
this.adminMenuItems = [];
|
this.adminMenuItems = [];
|
||||||
this.specialSideBarMenuItem = null;
|
this.specialSideBarMenuItem = null;
|
||||||
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "<i uk-icon=\"cog\"></i>"));
|
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "<i uk-icon=\"cog\"></i>"));
|
||||||
if(Session.isPortalAdministrator(this.user) ) {
|
// if(Session.isPortalAdministrator(this.user) ) {
|
||||||
let adminOptions = new MenuItem("adminOptions", "Admin Options", "", "", false, [], [], {})
|
// let adminOptions = new MenuItem("adminOptions", "Admin Options","", "/admin-tools/admin-pages", false, [], [], {});
|
||||||
adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", 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("portals", "Portals", "", "/admin-tools/portals", false, [], [], {}));
|
||||||
adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", 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, [], [], {}));
|
// // adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {}));*/
|
||||||
this.adminMenuItems.push(adminOptions);
|
// this.adminMenuItems.push(adminOptions);
|
||||||
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
|
// let monitorOptions = new MenuItem("monitorOptions", "Monitor Options","", "/admin-tools/admin-pages", false, [], [], {communityId: 'monitor'});
|
||||||
monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
|
// /* 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("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("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'}));
|
||||||
monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));
|
// monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));*/
|
||||||
this.adminMenuItems.push(monitorOptions);
|
// this.adminMenuItems.push(monitorOptions);
|
||||||
}
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -253,7 +253,7 @@
|
||||||
applied to a chart, that chart will appear grayed-out.</i></div>
|
applied to a chart, that chart will appear grayed-out.</i></div>
|
||||||
<ul class="uk-list uk-list-divider uk-margin-medium">
|
<ul class="uk-list uk-list-divider uk-margin-medium">
|
||||||
<li>
|
<li>
|
||||||
<range-filter [filter]="periodFilter" yearMin="2000" yearMax="2020" [mandatoryRange]="true"
|
<range-filter [filter]="periodFilter" yearMin="2000" [yearMax]="currentYear" [mandatoryRange]="true"
|
||||||
(onFilterChange)="filter()"></range-filter>
|
(onFilterChange)="filter()"></range-filter>
|
||||||
</li>
|
</li>
|
||||||
<ng-container *ngFor="let filter of filters ">
|
<ng-container *ngFor="let filter of filters ">
|
||||||
|
|
|
@ -64,6 +64,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
public routerHelper: RouterHelper = new RouterHelper();
|
public routerHelper: RouterHelper = new RouterHelper();
|
||||||
filters: Filter[] = [];
|
filters: Filter[] = [];
|
||||||
queryParams = {};
|
queryParams = {};
|
||||||
|
public currentYear = new Date().getFullYear();
|
||||||
periodFilter: RangeFilter = {
|
periodFilter: RangeFilter = {
|
||||||
title: "Time range",
|
title: "Time range",
|
||||||
filterId: "year",
|
filterId: "year",
|
||||||
|
|
|
@ -238,7 +238,12 @@
|
||||||
.uk-modal-container .uk-modal-dialog {
|
.uk-modal-container .uk-modal-dialog {
|
||||||
width: 900px;
|
width: 900px;
|
||||||
}
|
}
|
||||||
|
.stakeholderPage .uk-card.uk-disabled, .stakeholderPage .uk-card.semiFiltered{
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
.stakeholderPage .uk-card.semiFiltered > * > .highcharts-series-group{
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
.stakeholderPage .selectedFilterLabel {
|
.stakeholderPage .selectedFilterLabel {
|
||||||
background-color: #E6EEF2;
|
background-color: #E6EEF2;
|
||||||
border-color: #E6EEF2;
|
border-color: #E6EEF2;
|
||||||
|
@ -247,3 +252,23 @@
|
||||||
.landing .uk-dropdown, new-search-page .uk-dropdown, search-all .uk-dropdown {
|
.landing .uk-dropdown, new-search-page .uk-dropdown, search-all .uk-dropdown {
|
||||||
padding: 25px;
|
padding: 25px;
|
||||||
}
|
}
|
||||||
|
/*Admin tool pages*/
|
||||||
|
.form-header {
|
||||||
|
background-color: #F2F2F2;
|
||||||
|
box-shadow: 0 3px 6px #00000029;
|
||||||
|
padding: 10px 20px;
|
||||||
|
font-family: "Roboto", sans-serif;
|
||||||
|
z-index: 1;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.form-header th{
|
||||||
|
color: #7A7A7A;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.admin-pages .filters{
|
||||||
|
background-color: var(--background-color);
|
||||||
|
}
|
||||||
|
.admin-pages ul.pages .title{
|
||||||
|
color: rgb(var(--text-color-rgb), 0.5) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,6 +61,7 @@ export let properties: EnvProperties = {
|
||||||
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
|
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
|
||||||
|
|
||||||
adminToolsCommunity: "monitor",
|
adminToolsCommunity: "monitor",
|
||||||
|
useHelpTexts:false,
|
||||||
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
|
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
|
||||||
contextsAPI: "https://beta.services.openaire.eu/openaire/context",
|
contextsAPI: "https://beta.services.openaire.eu/openaire/context",
|
||||||
communityAPI: "https://beta.services.openaire.eu/openaire/community/",
|
communityAPI: "https://beta.services.openaire.eu/openaire/community/",
|
||||||
|
|
|
@ -60,9 +60,10 @@ export let properties: EnvProperties = {
|
||||||
|
|
||||||
monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
|
monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
|
||||||
|
|
||||||
adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
|
adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/",
|
||||||
|
|
||||||
adminToolsCommunity: "monitor",
|
adminToolsCommunity: "monitor",
|
||||||
|
useHelpTexts:false,
|
||||||
contextsAPI: "https://services.openaire.eu/openaire/context",
|
contextsAPI: "https://services.openaire.eu/openaire/context",
|
||||||
|
|
||||||
communityAPI: "https://services.openaire.eu/openaire/community/",
|
communityAPI: "https://services.openaire.eu/openaire/community/",
|
||||||
|
|
|
@ -64,6 +64,7 @@ export let properties: EnvProperties = {
|
||||||
adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/",
|
adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/",
|
||||||
|
|
||||||
adminToolsCommunity: "monitor",
|
adminToolsCommunity: "monitor",
|
||||||
|
useHelpTexts: false,
|
||||||
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
|
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
|
||||||
contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
|
contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
|
||||||
communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
|
communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
|
||||||
|
|
Loading…
Reference in New Issue