IKC-354 Sidebar

Consdata · Jun 21, 2024 · d32e46c · d32e46c
1 parent 49d3d66
commit d32e46c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/kouncil-frontend/apps/kouncil/src/app/main/main.component.ts b/kouncil-frontend/apps/kouncil/src/app/main/main.component.ts
@@ -1,7 +1,7 @@
 import {ChangeDetectionStrategy, Component} from '@angular/core';
 import {Backend} from '@app/common-model';
 import {environment} from '../../environments/environment';
-import {SidebarService} from "../side-bar/sidebar.service";
+import {SidebarService} from '../side-bar/sidebar.service';
 
 @Component({
   selector: 'app-main',
@@ -13,7 +13,7 @@ import {SidebarService} from "../side-bar/sidebar.service";
 
       <app-kafka-sidebar></app-kafka-sidebar>
 
-      <div [ngClass]="(sidebarService.isOpened | async) ? 'sidebarOpened' : 'sidebarClosed'">
+      <div [ngClass]="(sidebarService.isOpened$ | async) ? 'sidebarOpened' : 'sidebarClosed'">
         <div [ngClass]="backend === 'SERVER' ? 'kafka-desktop' : 'kafka-desktop-demo'">
           <app-progress-bar></app-progress-bar>
           <router-outlet></router-outlet>

diff --git a/kouncil-frontend/apps/kouncil/src/app/side-bar/sidebar.component.ts b/kouncil-frontend/apps/kouncil/src/app/side-bar/sidebar.component.ts
@@ -1,7 +1,7 @@
 import {ChangeDetectionStrategy, Component, HostBinding} from '@angular/core';
 import {Observable} from 'rxjs';
 import {AuthService, KouncilRole} from '@app/common-auth';
-import {SidebarService} from "./sidebar.service";
+import {SidebarService} from './sidebar.service';
 
 @Component({
   selector: 'app-kafka-sidebar',
@@ -68,18 +68,18 @@ export class SidebarComponent {
   KouncilRole: typeof KouncilRole = KouncilRole;
 
   isAuthenticated$: Observable<boolean> = this.authService.isAuthenticated$;
-  currentState$: Observable<boolean> = this.sidebarService.isOpened;
+  currentState$: Observable<boolean> = this.sidebarService.isOpened$;
   @HostBinding('class') hostClass: string = 'opened';
 
   constructor(public authService: AuthService,
               private sidebarService: SidebarService) {
-    this.sidebarService.isOpened.subscribe(isOpened=>{
+    this.sidebarService.isOpened$.subscribe(isOpened=>{
       if(isOpened){
           this.hostClass = 'opened';
       } else {
           this.hostClass = 'closed';
       }
-    })
+    });
   }
 
   changeState(): void {

diff --git a/kouncil-frontend/apps/kouncil/src/app/side-bar/sidebar.service.ts b/kouncil-frontend/apps/kouncil/src/app/side-bar/sidebar.service.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {BehaviorSubject, Observable} from "rxjs";
+import {BehaviorSubject, Observable} from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
@@ -8,22 +8,22 @@ export class SidebarService {
 
   currentState: string = 'opened';
 
-  private isOpened$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(this.checkIfOpened());
+  private opened$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(this.checkIfOpened());
 
   changeState(): void {
-    this.currentState === 'opened'
-      ? this.currentState = ' closed'
-      : this.currentState = 'opened';
-
-
-    this.isOpened$.next(this.checkIfOpened());
+    if (this.currentState === 'opened') {
+      this.currentState = ' closed';
+    } else {
+      this.currentState = 'opened';
+    }
+    this.opened$.next(this.checkIfOpened());
   }
 
-  get isOpened(): Observable<boolean> {
-    return this.isOpened$.asObservable();
+  get isOpened$(): Observable<boolean> {
+    return this.opened$.asObservable();
   }
 
-  checkIfOpened(){
+  checkIfOpened(): boolean {
     return this.currentState === 'opened';
   }
 }