Merge pull request #296 from mitre-attack/feature/#181-layer-upgrade-…

…ui-update Feature/#181 layer upgrade UI update
mitre-attack · May 17, 2021 · f945629 · f945629
2 parents ba49817 + 88d543b
commit f945629
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/nav-app/src/app/data.service.ts b/nav-app/src/app/data.service.ts
@@ -28,9 +28,12 @@ export class DataService {
     public versions: any[] = [];
 
     public subtechniquesEnabled: boolean = true;
-    public sidebarOpened: boolean = false;
     public versionChangelog?: VersionChangelog<Technique>;
 
+    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
      * @param {*} callback callback function to call when data is done loading

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)="currentDropdown = currentDropdown !== 'search' ? 'search' : null;"
+                     (click)="currentDropdown = currentDropdown !== 'search' ? 'search' : null;"
                     matTooltipPosition="below"
                     matTooltip="search">
                     <img src="assets/icons/ic_search_black_24px.svg"/>
@@ -548,7 +548,7 @@
                 </div>
             </div>
         </mat-drawer-content>
-        <mat-drawer mode="side" position="end" #sidebar [opened]="sidebarOpened">
+        <mat-drawer mode="side" position="end" #sidebar [opened]="dataService.sidebarOpened">
             <sidebar></sidebar>
         </mat-drawer>
     </mat-drawer-container>

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
 
-    public get sidebarOpened() { return 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) {