Merge pull request #4104 from cisagov/remove-ng-accordion

Removed ngbAccordion package from app
cisagov · Sep 19, 2024 · 57de9ca · 57de9ca
2 parents 4fb97b9 + deaf164
commit 57de9ca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/CSETWebNg/src/app/app.component.ts b/CSETWebNg/src/app/app.component.ts
@@ -39,7 +39,6 @@ import { CreateUser } from './models/user.model';
 import { AssessmentService } from './services/assessment.service';
 import { AuthenticationService } from './services/authentication.service';
 import { ConfigService } from './services/config.service';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { ExcelExportComponent } from './dialogs/excel-export/excel-export.component';
 import { AggregationService } from './services/aggregation.service';
 import { LocalStoreManager } from './services/storage.service';
@@ -62,7 +61,7 @@ export class AppComponent implements OnInit, AfterViewInit {
   dialogRef: MatDialogRef<any>;
   isFooterVisible: boolean = false;
 
-  @ViewChild('acc') accordion: NgbAccordion;
+  @ViewChild('acc') accordion: any;
 
   constructor(
     public auth: AuthenticationService,

diff --git a/CSETWebNg/src/app/initial/login-tsa/login-tsa.component.ts b/CSETWebNg/src/app/initial/login-tsa/login-tsa.component.ts
@@ -24,7 +24,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { AlertComponent } from '../../dialogs/alert/alert.component';
 import { EjectionComponent } from '../../dialogs/ejection/ejection.component';
 import { AssessmentService } from '../../services/assessment.service';
@@ -58,7 +57,7 @@ export class LoginTsaComponent implements OnInit {
   browserIsIE: boolean = false;
   showLoginBox: boolean = true;
 
-  @ViewChild('acc') accordion: NgbAccordion;
+  @ViewChild('acc') accordion: any;
 
   /**
    * Constructor

diff --git a/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.ts b/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.ts
@@ -24,7 +24,6 @@
 import { Component, ViewChild, ViewEncapsulation, isDevMode } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { AggregationService } from '../../services/aggregation.service';
 import { AssessmentService } from '../../services/assessment.service';
 import { AuthenticationService } from '../../services/authentication.service';
@@ -47,7 +46,6 @@ export class AcetLayoutMainComponent {
   isFooterVisible: boolean = false;
   devMode: boolean = isDevMode();
 
-  @ViewChild('acc') accordion: NgbAccordion;
 
   constructor(
     public auth: AuthenticationService,
@@ -76,11 +74,4 @@ export class AcetLayoutMainComponent {
     this.assessSvc.dropAssessment();
     this.router.navigate(['/home']);
   }
-
-  isFooterOpen() {
-    if (!!this.accordion) {
-      return this.accordion.isExpanded('footerPanel');
-    }
-    return false;
-  }
 }