@ -25,7 +25,7 @@ import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
import { DomSanitizer , SafeResourceUrl } from "@angular/platform-browser" ;
import { Reorder , StakeholderService } from "../openaireLibrary/monitor/services/stakeholder.service" ;
import { EnvProperties } from "../openaireLibrary/utils/properties/env-properties" ;
import { } from "rxjs" ;
import { Observable, Subscriber, Subscription } from "rxjs" ;
import { LayoutService } from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service" ;
import { Router } from "@angular/router" ;
import { Role , Session , User } from "../openaireLibrary/login/utils/helper.class" ;
@ -35,6 +35,8 @@ import {Notification} from "../openaireLibrary/notifications/notifications";
import { NotificationUtils } from "../openaireLibrary/notifications/notification-utils" ;
import { NotifyFormComponent } from "../openaireLibrary/notifications/notify-form/notify-form.component" ;
import { NotificationService } from "../openaireLibrary/notifications/notification.service" ;
import { properties } from "../../environments/environment" ;
import { response } from "express" ;
declare var UIkit ;
@ -46,15 +48,17 @@ declare var UIkit;
export class IndicatorsComponent implements OnInit , OnDestroy , OnChanges , AfterViewInit {
filesToUpload : Array < File > ;
errorMessage = "" ;
@Input ( )
public properties : EnvProperties = null ;
public properties : EnvProperties = properties ;
@Input ( )
public topicIndex : number = 0 ;
@Input ( )
public categoryIndex : number = 0 ;
@Input ( )
public subcategoryIndex : number = 0 ;
@Input ( )
public stakeholder : Stakeholder = null ;
@Input ( )
public changed : Observable < void > ;
public user : User = null ;
public preview : string ;
public indicatorUtils : IndicatorUtils = new IndicatorUtils ( ) ;
@ -69,44 +73,33 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
public section : Section ;
public indicator : Indicator ;
public index : number = - 1 ;
/ * *
* Displayed chart and numbers base on Top filters
* /
public displayCharts : Section [ ] = [ ] ;
public displayNumbers : Section [ ] = [ ] ;
/ * *
* Top filters
* /
@Input ( )
public filters : FormGroup ;
public editing : boolean = false ;
/** Safe Urls */
/** Caches */
public safeUrls : Map < string , SafeResourceUrl > = new Map < string , SafeResourceUrl > ( [ ] ) ;
public numberResponses : Map < string , any > = new Map < string , any > ( ) ;
public numberResults : Map < string , number > = new Map < string , number > ( ) ;
/** Import / Export Indicators */
importLoading : boolean = false ;
exportLoading : boolean = false ;
private subscriptions : any [ ] = [ ] ;
private urlSubscriptions : any [ ] = [ ] ;
@ViewChild ( 'editChartModal' , { static : true } ) editChartModal : AlertModal ;
@ViewChild ( 'editNumberModal' , { static : true } ) editNumberModal : AlertModal ;
@ViewChild ( 'deleteModal' , { static : true } ) deleteModal : AlertModal ;
//@ViewChild('deleteAllModal') deleteAllModal: AlertModal;
//@ViewChild('deleteAndDisconnectModal') deleteAndDisconnectModal: AlertModal;
//@ViewChild('deleteChartSectionModal') deleteChartSectionModal: AlertModal;
//@ViewChild('deleteNumberSectionModal') deleteNumberSectionModal: AlertModal;
@ViewChild ( 'deleteSectionModal' , { static : true } ) deleteSectionModal : AlertModal ;
public sectionTypeToDelete : string ;
public sectionChildrenActionOnDelete : string ;
public indicatorChildrenActionOnDelete : string ;
private firstLoad : boolean = true ;
urlParameterizedMessage = null ;
showCheckForSchemaEnhancements : boolean = false ;
private notification : Notification ;
@ViewChild ( 'editNumberNotify' , { static : true } ) editNumberNotify : NotifyFormComponent ;
@ViewChild ( 'editChartNotify' , { static : true } ) editChartNotify : NotifyFormComponent ;
@ViewChild ( 'deleteNotify' , { static : true } ) deleteNotify : NotifyFormComponent ;
/ * *
* Subscriptions
* * /
private subscriptions : any [ ] = [ ] ;
private urlSubscriptions : any [ ] = [ ] ;
private numberSubscription : any [ ] = [ ] ;
constructor ( private layoutService : LayoutService ,
private stakeholderService : StakeholderService ,
@ -124,17 +117,15 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . subscriptions . push ( this . userManagementService . getUserInfo ( ) . subscribe ( user = > {
this . user = user ;
} ) ) ;
this . subscriptions . push ( this . stakeholderService . getStakeholderAsObservable ( ) . subscribe ( stakeholder = > {
this . stakeholder = stakeholder ;
if ( this . stakeholder && this . firstLoad ) {
this . buildFilters ( ) ;
this . buildSections ( ) ;
this . filterCharts ( ) ;
this . filterNumbers ( ) ;
this . setPreview ( ) ;
this . firstLoad = false ;
}
} ) ) ;
if ( this . stakeholder ) {
this . setCharts ( ) ;
this . setNumbers ( ) ;
}
this . changed . subscribe ( ( ) = > {
this . setCharts ( ) ;
this . setNumbers ( ) ;
this . initReorder ( ) ;
} )
}
ngOnDestroy ( ) : void {
@ -150,6 +141,11 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
value . unsubscribe ( ) ;
}
} ) ;
this . numberSubscription . forEach ( value = > {
if ( value instanceof Subscriber ) {
value . unsubscribe ( ) ;
}
} ) ;
}
ngAfterViewInit ( ) : void {
@ -159,63 +155,9 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
ngOnChanges ( changes : SimpleChanges ) : void {
if ( this . canEdit ) {
if ( changes . topicIndex || changes . categoryIndex || changes . subcategoryIndex ) {
this . buildSections ( ) ;
this . buildFilters ( ) ;
this . initReorder ( ) ;
}
this . filterCharts ( ) ;
this . filterNumbers ( ) ;
}
this . setPreview ( ) ;
}
setNumberIndicators() {
this . numberResults . clear ( ) ;
let urls : Map < string , [ number , number ] [ ] > = new Map < string , [ number , number ] [ ] > ( ) ;
this . numbers . forEach ( ( section , i ) = > {
section . indicators . forEach ( ( number , j ) = > {
let url = this . indicatorUtils . getFullUrlWithFilters ( this . stakeholder , number . indicatorPaths [ 0 ] ) ;
const pair = JSON . stringify ( [ number . indicatorPaths [ 0 ] . source , url ] ) ;
const indexes = urls . get ( pair ) ? urls . get ( pair ) : [ ] ;
indexes . push ( [ i , j ] ) ;
urls . set ( pair , indexes ) ;
} ) ;
} ) ;
urls . forEach ( ( indexes , pair ) = > {
pair = JSON . parse ( pair ) ;
this . subscriptions . push ( this . statisticsService . getNumbers ( this . statisticsService . getSourceType ( pair [ 0 ] ) , pair [ 1 ] ) . subscribe ( response = > {
indexes . forEach ( ( [ i , j ] ) = > {
let result = JSON . parse ( JSON . stringify ( response ) ) ;
this . numbers [ i ] . indicators [ j ] . indicatorPaths [ 0 ] . jsonPath . forEach ( jsonPath = > {
if ( result ) {
result = result [ jsonPath ] ;
}
} ) ;
if ( typeof result === 'string' || typeof result === 'number' ) {
result = Number ( result ) ;
if ( result === Number . NaN ) {
result = 0 ;
}
} else {
result = 0 ;
}
this . numberResults . set ( i + '-' + j , result ) ;
} ) ;
} ) ) ;
} ) ;
}
setPreview() {
if ( this . stakeholder ) {
this . preview = '/' + this . stakeholder . alias ;
if ( this . stakeholder . topics [ this . topicIndex ] ) {
this . preview = '/' + this . stakeholder . alias + '/' + this . stakeholder . topics [ this . topicIndex ] . alias ;
if ( this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] ) {
this . preview += '/' + this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . alias ;
if ( this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] ) {
this . preview += '/' + this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . alias ;
}
}
this . setCharts ( ) ;
this . setNumbers ( ) ;
}
}
}
@ -271,32 +213,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
UIkit . dropdown ( element ) . hide ( ) ;
}
private buildFilters() {
this . subscriptions . push ( this . filters . get ( 'chartType' ) . valueChanges . subscribe ( value = > {
this . onChartTypeChange ( value ) ;
} ) ) ;
this . subscriptions . push ( this . filters . get ( 'status' ) . valueChanges . subscribe ( value = > {
this . onStatusChange ( value ) ;
} ) ) ;
this . subscriptions . push ( this . filters . get ( 'keyword' ) . valueChanges . subscribe ( value = > {
this . onKeywordChange ( value ) ;
} ) ) ;
}
private buildSections() {
this . numberSections = this . fb . array ( [ ] ) ;
this . numbers . forEach ( section = > {
this . numberSections . push ( this . fb . group ( {
_id : this.fb.control ( section . _id ) ,
title : this.fb.control ( section . title ) ,
creationDate : this.fb.control ( section . creationDate ) ,
stakeholderAlias : this.fb.control ( section . stakeholderAlias ) ,
defaultId : this.fb.control ( section . defaultId ) ,
type : this . fb . control ( section . type ) ,
indicators : this.fb.control ( section . indicators )
} ) ) ;
} ) ;
setCharts() {
this . chartSections = this . fb . array ( [ ] ) ;
this . charts . forEach ( section = > {
this . chartSections . push ( this . fb . group ( {
@ -308,16 +225,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
type : this . fb . control ( section . type ) ,
indicators : this.fb.control ( section . indicators )
} ) ) ;
} ) ;
}
filterCharts() {
this . displayCharts = this . filterChartType (
this . filterStatus ( this . filterByKeyword ( HelperFunctions . copy ( this . charts ) , this . filters . value . keyword ) ,
this . filters . value . status ) ,
this . filters . value . chartType
) ;
this . displayCharts . forEach ( section = > {
section . indicators . forEach ( indicator = > {
indicator . indicatorPaths . forEach ( indicatorPath = > {
let url = this . indicatorUtils . getFullUrl ( this . stakeholder , indicatorPath ) ;
@ -328,60 +235,67 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} ) ;
} )
} ) ;
this . buildSections ( ) ;
}
filterNumbers() {
this . displayNumbers = this . filterStatus (
this . filterByKeyword ( HelperFunctions . copy ( this . numbers ) , this . filters . value . keyword ) ,
this . filters . value . status ) ;
this . buildSections ( ) ;
this . setNumberIndicators ( ) ;
}
onChartTypeChange ( value ) {
this . displayCharts = this . filterChartType ( HelperFunctions . copy ( this . charts ) , value ) ;
}
onStatusChange ( value ) {
this . displayCharts = this . filterStatus ( HelperFunctions . copy ( this . charts ) , value ) ;
this . displayNumbers = this . filterStatus ( HelperFunctions . copy ( this . numbers ) , value ) ;
}
onKeywordChange ( value ) {
this . displayCharts = this . filterByKeyword ( HelperFunctions . copy ( this . charts ) , value ) ;
this . displayNumbers = this . filterByKeyword ( HelperFunctions . copy ( this . numbers ) , value ) ;
}
private filterChartType ( sections : Section [ ] , value ) : Section [ ] {
if ( value !== 'all' ) {
sections . forEach ( section = >
section . indicators = section . indicators . filter ( indicator = >
indicator . indicatorPaths . filter ( indicatorPath = > indicatorPath . type === value ) . length > 0 ) ) ;
}
return sections ;
}
private filterStatus ( sections : Section [ ] , value ) : Section [ ] {
if ( value !== 'all' ) {
sections . forEach ( section = >
section . indicators = section . indicators . filter ( indicator = > indicator . visibility === value ) ) ;
}
return sections ;
setNumbers() {
this . numberSections = this . fb . array ( [ ] ) ;
this . numberResults . clear ( ) ;
let urls : Map < string , [ number , number ] [ ] > = new Map < string , [ number , number ] [ ] > ( ) ;
this . numbers . forEach ( ( section , i ) = > {
this . numberSections . push ( this . fb . group ( {
_id : this.fb.control ( section . _id ) ,
title : this.fb.control ( section . title ) ,
creationDate : this.fb.control ( section . creationDate ) ,
stakeholderAlias : this.fb.control ( section . stakeholderAlias ) ,
defaultId : this.fb.control ( section . defaultId ) ,
type : this . fb . control ( section . type ) ,
indicators : this.fb.control ( section . indicators )
} ) ) ;
section . indicators . forEach ( ( number , j ) = > {
let url = this . indicatorUtils . getFullUrlWithFilters ( this . stakeholder , number . indicatorPaths [ 0 ] ) ;
const pair = JSON . stringify ( [ number . indicatorPaths [ 0 ] . source , url ] ) ;
const indexes = urls . get ( pair ) ? urls . get ( pair ) : [ ] ;
indexes . push ( [ i , j ] ) ;
urls . set ( pair , indexes ) ;
} ) ;
} ) ;
this . numberSubscription . forEach ( value = > {
if ( value instanceof Subscriber ) {
value . unsubscribe ( ) ;
}
} ) ;
urls . forEach ( ( indexes , pair ) = > {
let parsed = JSON . parse ( pair ) ;
let response = this . numberResponses . get ( pair ) ;
if ( response ) {
this . calculateResults ( response , indexes ) ;
} else {
this . numberSubscription . push ( this . statisticsService . getNumbers ( this . statisticsService . getSourceType ( parsed [ 0 ] ) , parsed [ 1 ] ) . subscribe ( response = > {
this . calculateResults ( response , indexes ) ;
this . numberResponses . set ( pair , response ) ;
} ) ) ;
}
} ) ;
}
private filterByKeyword ( sections : Section [ ] , value ) : Section [ ] {
if ( value !== null && value !== '' ) {
sections . forEach ( section = >
section . indicators = section . indicators . filter ( indicator = > ( indicator . name && indicator . name . toLowerCase ( ) . includes ( value . toLowerCase ( ) ) )
|| ( indicator . description && indicator . description . toLowerCase ( ) . includes ( value . toLowerCase ( ) ) )
|| ( indicator . additionalDescription && indicator . additionalDescription . toLowerCase ( ) . includes ( value . toLowerCase ( ) ) )
|| indicator . indicatorPaths . filter ( indicatorPath = > ( indicatorPath . parameters && indicatorPath . parameters . title &&
indicatorPath . parameters . title . includes ( value . toLowerCase ( ) ) ) ) . length > 0 ) ) ;
}
return sections ;
private calculateResults ( response : any , indexes : [ number , number ] [ ] ) {
indexes . forEach ( ( [ i , j ] ) = > {
let result = JSON . parse ( JSON . stringify ( response ) ) ;
this . numbers [ i ] . indicators [ j ] . indicatorPaths [ 0 ] . jsonPath . forEach ( jsonPath = > {
if ( result ) {
result = result [ jsonPath ] ;
}
} ) ;
if ( typeof result === 'string' || typeof result === 'number' ) {
result = Number ( result ) ;
if ( result === Number . NaN ) {
result = 0 ;
}
} else {
result = 0 ;
}
this . numberResults . set ( i + '-' + j , result ) ;
} ) ;
}
get charts ( ) : Section [ ] {
@ -394,10 +308,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
}
}
set charts ( sections : Section [ ] ) {
this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . charts = sections ;
}
get numbers ( ) : Section [ ] {
if ( this . stakeholder . topics [ this . topicIndex ] &&
this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] &&
@ -416,11 +326,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
return this . layoutService . open ;
}
get canReorder ( ) : boolean {
return this . filters . value . chartType === 'all' &&
this . filters . value . status === 'all' && this . filters . value . keyword === '' && ! this . editing ;
}
get canEdit() {
return this . stakeholder &&
this . stakeholder . topics [ this . topicIndex ] &&
@ -862,11 +767,11 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
if ( this . stakeholder . defaultId ) {
this . notification . groups . push ( Role . manager ( this . stakeholder . type , this . stakeholder . alias ) ) ;
if ( this . indicator . type === "chart" ) {
this . filter Charts( ) ;
this . set Charts( ) ;
this . chartIndicatorFb = null ;
this . editChartNotify . sendNotification ( this . notification ) ;
} else {
this . filter Numbers( ) ;
this . set Numbers( ) ;
this . numberIndicatorFb = null ;
this . editNumberNotify . sendNotification ( this . notification ) ;
}
@ -876,11 +781,11 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . notification . groups . push ( Role . manager ( value . type , value . alias ) )
} ) ;
if ( this . indicator . type === "chart" ) {
this . filter Charts( ) ;
this . set Charts( ) ;
this . chartIndicatorFb = null ;
this . editChartNotify . sendNotification ( this . notification ) ;
} else {
this . filter Numbers( ) ;
this . set Numbers( ) ;
this . numberIndicatorFb = null ;
this . editNumberNotify . sendNotification ( this . notification ) ;
}
@ -914,9 +819,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . subscriptions . push ( this . stakeholderService . saveBulkElements ( this . properties . monitorServiceAPIURL , indicators , path ) . subscribe ( stakeholder = > {
this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . charts = stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . charts ;
this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . numbers = stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . numbers ;
this . buildSections ( ) ;
this . filterCharts ( ) ;
this . filterNumbers ( ) ;
this . setCharts ( ) ;
this . setNumbers ( ) ;
this . initReorder ( ) ;
this . notification = NotificationUtils . importIndicators ( this . user . fullname , this . stakeholder . alias ) ;
this . notification . entity = this . stakeholder . topics [ this . topicIndex ] . categories [ this . categoryIndex ] . subCategories [ this . subcategoryIndex ] . _id ;
@ -993,10 +897,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . subscriptions . push ( this . stakeholderService . reorderIndicators ( this . properties . monitorServiceAPIURL , path , reorder , type ) . subscribe ( indicators = > {
if ( type === 'chart' ) {
this . charts . find ( section = > section . _id === sectionId ) . indicators = indicators ;
this . filter Charts( ) ;
this . set Charts( ) ;
} else {
this . numbers . find ( section = > section . _id === sectionId ) . indicators = indicators ;
this . filter Numbers( ) ;
this . set Numbers( ) ;
}
this . editing = false ;
} ) ) ;
@ -1065,10 +969,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . subscriptions . push ( this . stakeholderService . deleteElement ( this . properties . monitorServiceAPIURL , path , this . indicatorChildrenActionOnDelete ) . subscribe ( ( ) = > {
if ( this . indicator . type === 'chart' ) {
this . charts . find ( section = > section . _id === this . section . _id ) . indicators . splice ( this . index , 1 ) ;
this . filter Charts( ) ;
this . set Charts( ) ;
} else {
this . numbers . find ( section = > section . _id === this . section . _id ) . indicators . splice ( this . index , 1 ) ;
this . filter Numbers( ) ;
this . set Numbers( ) ;
}
UIkit . notification ( 'Indicator has been <b>successfully deleted</b>' , {
status : 'success' ,
@ -1140,10 +1044,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . subscriptions . push ( this . stakeholderService . saveSection ( this . properties . monitorServiceAPIURL , section , path , index ) . subscribe ( section = > {
if ( type === 'chart' ) {
this . charts [ index ] = section ;
this . filter Charts( ) ;
this . set Charts( ) ;
} else {
this . numbers [ index ] = section ;
this . filter Numbers( ) ;
this . set Numbers( ) ;
}
this . initReorder ( ) ;
UIkit . notification ( 'Section has been <b>successfully saved</b>' , {
@ -1178,14 +1082,14 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} else {
this . charts . push ( section ) ;
}
this . filter Charts( ) ;
this . set Charts( ) ;
} else {
if ( index !== - 1 ) {
this . numbers . splice ( index , 0 , section ) ;
} else {
this . numbers . push ( section ) ;
}
this . filter Numbers( ) ;
this . set Numbers( ) ;
}
this . initReorder ( ) ;
UIkit . notification ( 'Section has been <b>successfully created</b>' , {
@ -1253,10 +1157,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . subscriptions . push ( this . stakeholderService . deleteElement ( this . properties . monitorServiceAPIURL , path , this . sectionChildrenActionOnDelete ) . subscribe ( ( ) = > {
if ( this . sectionTypeToDelete === "chart" ) {
this . charts . splice ( this . index , 1 ) ;
this . filter Charts( ) ;
this . set Charts( ) ;
} else {
this . numbers . splice ( this . index , 1 ) ;
this . filter Numbers( ) ;
this . set Numbers( ) ;
}
this . initReorder ( ) ;
UIkit . notification ( 'Section has been <b>successfully deleted</b>' , {
@ -1276,7 +1180,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
}
private checkForSchemaEnhancements ( url : string ) {
//new schema
this . showCheckForSchemaEnhancements = this . isAdministrator && url && ! this . properties . useOldStatisticsSchema && this . indicatorUtils . checkForSchemaEnhancements ( url ) ;
}
@ -1383,7 +1286,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this . exportLoading = true ;
let indicators = [ ] ;
let index : number = 0 ;
this . displayNumber s. forEach ( section = > {
this . chart s. forEach ( section = > {
section . indicators . forEach ( indicator = > {
indicator . indicatorPaths . forEach ( indicatorPath = > {
// console.debug("export number: ", this.statisticsService.getNumberUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath)));
@ -1398,7 +1301,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} ) ;
} ) ;
this . displayC harts. forEach ( section = > {
this . c harts. forEach ( section = > {
section . indicators . forEach ( indicator = > {
indicator . indicatorPaths . forEach ( indicatorPath = > {
// console.debug("export chart: " + this.getUrlByStakeHolder(indicatorPath));
