From deaf1646c43c2b553935d26b94e2c1423be7fd8b Mon Sep 17 00:00:00 2001 From: Randy Woods Date: Thu, 19 Sep 2024 10:07:16 -0600 Subject: [PATCH] Removed ngbAccordion package from app The only place it was "being used" is an ACET component with a commented-out footer. All the rest of the footers for the other skins has since been switched to use the Bootstrap 5 accordion. So if the ACET footer ever needs to come back, it will be rewritten anyway. --- CSETWebNg/src/app/app.component.ts | 3 +-- .../src/app/initial/login-tsa/login-tsa.component.ts | 3 +-- .../acet-layout-main/acet-layout-main.component.ts | 9 --------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/CSETWebNg/src/app/app.component.ts b/CSETWebNg/src/app/app.component.ts index 37c04185b9..f5d11eadeb 100644 --- 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; 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 index af1b3b8c46..8ff4b661e3 100644 --- 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 index ae66d2f73d..8821e32771 100644 --- 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; - } }