Updated usage of sidebarOpened from the data service--in the data tab…

…le component search button, and in the layer upgrade component sidebar done button
mitre-attack · May 17, 2021 · 222d9dc · 222d9dc
1 parent 9cbc6f0
commit 222d9dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/nav-app/src/app/data.service.ts b/nav-app/src/app/data.service.ts
@@ -30,9 +30,9 @@ export class DataService {
     public subtechniquesEnabled: boolean = true;
     public versionChangelog?: VersionChangelog<Technique>;
 
-    private _sidebarOpened = true;
-    public get sidebarOpened(): boolean { return this._sidebarOpened };
-    public set sidebarOpened(newVal: boolean) { this._sidebarOpened = newVal };
+    private _sidebarOpened: boolean;
+    public get sidebarOpened(): boolean { return this._sidebarOpened; };
+    public set sidebarOpened(newVal: boolean) { this._sidebarOpened = newVal; };
 
     /**
      * Callback functions passed to this function will be called after data is loaded

diff --git a/nav-app/src/app/datatable/data-table.component.html b/nav-app/src/app/datatable/data-table.component.html
@@ -41,7 +41,7 @@
             <div *ngIf="configService.getFeature('search')" class="control-row-item">
 
                 <div class="control-row-button dropdown noselect"
-                    (click)="sidebarOpened = !sidebarOpened"
+                    (click)="dataService.sidebarOpened = !dataService.sidebarOpened"
                     matTooltipPosition="below"
                     matTooltip="search">
                     <img src="assets/icons/ic_search_black_24px.svg"/>

diff --git a/nav-app/src/app/datatable/data-table.component.ts b/nav-app/src/app/datatable/data-table.component.ts
@@ -37,9 +37,6 @@ export class DataTableComponent implements AfterViewInit {
 
     currentDropdown: string = ""; //current dropdown menu
 
-    sidebarOpened = this.dataService.sidebarOpened;
-
-
     //////////////////////////////////////////////////////////
     // Stringifies the current view model into a json string//
     // stores the string as a blob                          //

diff --git a/nav-app/src/app/sidebar/layer-upgrade/layer-upgrade.component.ts b/nav-app/src/app/sidebar/layer-upgrade/layer-upgrade.component.ts
@@ -31,7 +31,7 @@ export class LayerUpgradeComponent implements OnInit {
 
     public upgradeLayer(): void {
         // close sidebar
-        this.dataService.sidebarOpened = false;
+        this.dataService.sidebarOpened = !this.dataService.sidebarOpened;
     }
 
     public getIDs(object: Technique) {