diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts index 24c9a1e9..cf9333b7 100644 --- a/dashboard/sharedComponents/sidebar/layout.service.ts +++ b/dashboard/sharedComponents/sidebar/layout.service.ts @@ -26,10 +26,6 @@ export class LayoutService { * Add hasAdminMenu: true on data of route config, if global sidebar should be used. */ private hasAdminMenuSubject: BehaviorSubject = new BehaviorSubject(false); - /** - * Add hasMiniMenu: true on data of route config, if sidebar should be closed to mini should be used. - */ - private hasMiniMenuSubject: BehaviorSubject = new BehaviorSubject(false); /** * Add isFrontPage: true on data of route config, if current route is for front page. */ @@ -78,12 +74,6 @@ export class LayoutService { } else { this.setHasAdminMenu(false); } - if (data['hasMiniMenu'] !== undefined && - data['hasMiniMenu'] === true) { - this.setHasMiniMenu(true); - } else { - this.setHasMiniMenu(false); - } if (data['isFrontPage'] !== undefined && data['isFrontPage'] === true) { this.setFrontPage(true); @@ -139,14 +129,6 @@ export class LayoutService { this.hasAdminMenuSubject.next(value); } - get hasMiniMenu(): Observable { - return this.hasMiniMenuSubject.asObservable(); - } - - setHasMiniMenu(value: boolean) { - this.hasMiniMenuSubject.next(value); - } - get isFrontPage(): Observable { return this.isFrontPageSubject.asObservable(); } diff --git a/monitor/services/stakeholder.service.ts b/monitor/services/stakeholder.service.ts index 35541e50..96149828 100644 --- a/monitor/services/stakeholder.service.ts +++ b/monitor/services/stakeholder.service.ts @@ -20,24 +20,27 @@ export interface Reorder { providedIn: "root" }) export class StakeholderService { - + private stakeholderSubject: BehaviorSubject = null; private promise: Promise; private sub; + constructor(private http: HttpClient, private route: ActivatedRoute) { this.stakeholderSubject = new BehaviorSubject(null); } + ngOnDestroy() { - this.clearSubscriptions(); + this.clearSubscriptions(); } - - clearSubscriptions(){ + + clearSubscriptions() { if (this.sub instanceof Subscriber) { this.sub.unsubscribe(); } } - getStakeholder(alias:string): Observable { - if(!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== alias) { + + getStakeholder(alias: string): Observable { + if (!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== alias) { this.promise = new Promise((resolve, reject) => { this.sub = this.http.get(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(alias), CustomOptions.registryOptions()).pipe(map(stakeholder => { return this.formalize(stakeholder); @@ -66,77 +69,73 @@ export class StakeholderService { } getStakeholders(url: string, type: string = null): Observable<(Stakeholder & StakeholderInfo)[]> { - return this.http.get(url + '/stakeholder' + ((type)?('?type=' + type):''), CustomOptions.registryOptions()).pipe(map(stakeholders => { + return this.http.get(url + '/stakeholder' + ((type) ? ('?type=' + type) : ''), CustomOptions.registryOptions()).pipe(map(stakeholders => { return this.formalize(stakeholders); })); } getMyStakeholders(url: string, type: string = null): Observable { - return this.http.get(url + '/my-stakeholder' + ((type)?('?type=' + type):''), CustomOptions.registryOptions()).pipe(map(stakeholders => { + return this.http.get(url + '/my-stakeholder' + ((type) ? ('?type=' + type) : ''), CustomOptions.registryOptions()).pipe(map(stakeholders => { return this.formalize(stakeholders); })); } - + getDefaultStakeholders(url: string, type: string = null): Observable { - return this.http.get(url + '/stakeholder/default' + ((type)?('?type=' + type):''), CustomOptions.registryOptions()).pipe(map(stakeholders => { + return this.http.get(url + '/stakeholder/default' + ((type) ? ('?type=' + type) : ''), CustomOptions.registryOptions()).pipe(map(stakeholders => { return this.formalize(stakeholders); })); } - + buildStakeholder(url: string, stakeholder: Stakeholder): Observable { return this.http.post(url + '/build-stakeholder', stakeholder, CustomOptions.registryOptions()).pipe(map(stakeholder => { return this.formalize(stakeholder); })); } - changeVisibility(url: string, path: string[], visibility:Visibility): Observable { - return this.http.post(url + '/' + path.join('/') + '/change-visibility'+'?visibility=' + visibility, null, CustomOptions.registryOptions()); + changeVisibility(url: string, path: string[], visibility: Visibility): Observable { + return this.http.post(url + '/' + path.join('/') + '/change-visibility' + '?visibility=' + visibility, null, CustomOptions.registryOptions()); } - + saveElement(url: string, element: any, path: string[] = []): Observable { path = HelperFunctions.encodeArray(path); - return this.http.post(url + ((path.length > 0)?'/':'') + path.join('/') + + return this.http.post(url + ((path.length > 0) ? '/' : '') + path.join('/') + '/save', element, CustomOptions.registryOptions()).pipe(map(element => { - return this.formalize(element); + return this.formalize(element); })); } saveSection(url: string, element: any, path: string[] = [], index: number = -1): Observable
{ path = HelperFunctions.encodeArray(path); - return this.http.post
(url + ((path.length > 0)?'/':'') + path.join('/') + + return this.http.post
(url + ((path.length > 0) ? '/' : '') + path.join('/') + '/save/' + index, element, CustomOptions.registryOptions()).pipe(map(element => { return this.formalize(element); })); } - + deleteElement(url: string, path: string[], childrenAction: string = null): Observable { path = HelperFunctions.encodeArray(path); let params: string = ""; - if(childrenAction) { - params = "?children="+childrenAction; + if (childrenAction) { + params = "?children=" + childrenAction; } - return this.http.delete(url + '/' + path.join('/') + '/delete'+params, CustomOptions.registryOptions()); + return this.http.delete(url + '/' + path.join('/') + '/delete' + params, CustomOptions.registryOptions()); } - + reorderIndicators(url: string, path: string[], reorder: Reorder, type: string = 'chart'): Observable { path = HelperFunctions.encodeArray(path); return this.http.post(url + '/' + path.join('/') + '/' + type + '/reorder', reorder, CustomOptions.registryOptions()).pipe(map(indicators => { return this.formalize(indicators); })); } - + getStakeholderAsObservable(): Observable { return this.stakeholderSubject.asObservable(); } - - get stakeholder(): Stakeholder { - return this.stakeholderSubject.getValue(); - } - + setStakeholder(stakeholder: Stakeholder) { this.stakeholderSubject.next(stakeholder); } - + private formalize(element: any) { return HelperFunctions.copy(element); }