diff --git a/modules/ui/src/app/app-routing.module.ts b/modules/ui/src/app/app-routing.module.ts index 454782cc9..f2cebc14a 100644 --- a/modules/ui/src/app/app-routing.module.ts +++ b/modules/ui/src/app/app-routing.module.ts @@ -34,7 +34,7 @@ const routes: Routes = [ { path: 'reports', loadChildren: () => - import('./pages/reports/history.module').then(m => m.HistoryModule), + import('./pages/reports/reports.module').then(m => m.ReportsModule), title: 'Testrun - Reports', }, { diff --git a/modules/ui/src/app/pages/reports/history-routing.module.ts b/modules/ui/src/app/pages/reports/reports-routing.module.ts similarity index 83% rename from modules/ui/src/app/pages/reports/history-routing.module.ts rename to modules/ui/src/app/pages/reports/reports-routing.module.ts index da66ba3bf..d5542172f 100644 --- a/modules/ui/src/app/pages/reports/history-routing.module.ts +++ b/modules/ui/src/app/pages/reports/reports-routing.module.ts @@ -15,12 +15,12 @@ */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { HistoryComponent } from './history.component'; +import { ReportsComponent } from './reportscomponent'; -const routes: Routes = [{ path: '', component: HistoryComponent }]; +const routes: Routes = [{ path: '', component: ReportsComponent }]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class HistoryRoutingModule {} +export class ReportsRoutingModule {} diff --git a/modules/ui/src/app/pages/reports/history.component.html b/modules/ui/src/app/pages/reports/reports.component.html similarity index 100% rename from modules/ui/src/app/pages/reports/history.component.html rename to modules/ui/src/app/pages/reports/reports.component.html diff --git a/modules/ui/src/app/pages/reports/history.component.scss b/modules/ui/src/app/pages/reports/reports.component.scss similarity index 100% rename from modules/ui/src/app/pages/reports/history.component.scss rename to modules/ui/src/app/pages/reports/reports.component.scss diff --git a/modules/ui/src/app/pages/reports/history.component.spec.ts b/modules/ui/src/app/pages/reports/reports.component.spec.ts similarity index 96% rename from modules/ui/src/app/pages/reports/history.component.spec.ts rename to modules/ui/src/app/pages/reports/reports.component.spec.ts index d242da63e..4734ee766 100644 --- a/modules/ui/src/app/pages/reports/history.component.spec.ts +++ b/modules/ui/src/app/pages/reports/reports.component.spec.ts @@ -15,10 +15,10 @@ */ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; -import { HistoryComponent } from './history.component'; +import { ReportsComponent } from './reportscomponent'; import { TestRunService } from '../../services/test-run.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { HistoryModule } from './history.module'; +import { ReportsModule } from './reports.module'; import { of } from 'rxjs'; import { LiveAnnouncer } from '@angular/cdk/a11y'; import { MatDialogRef } from '@angular/material/dialog'; @@ -36,9 +36,9 @@ import { import { MatTableDataSource } from '@angular/material/table'; import { HistoryTestrun } from '../../model/testrun-status'; -describe('HistoryComponent', () => { - let component: HistoryComponent; - let fixture: ComponentFixture; +describe('ReportsComponent', () => { + let component: ReportsComponent; + let fixture: ComponentFixture; let compiled: HTMLElement; let mockService: SpyObj; let mockLiveAnnouncer: SpyObj; @@ -90,16 +90,16 @@ describe('HistoryComponent', () => { mockLiveAnnouncer = jasmine.createSpyObj(['announce']); TestBed.configureTestingModule({ - imports: [HistoryModule, BrowserAnimationsModule], + imports: [ReportsModule, BrowserAnimationsModule], providers: [ { provide: TestRunService, useValue: mockService }, { provide: ReportsStore, useValue: mockReportsStore }, { provide: LiveAnnouncer, useValue: mockLiveAnnouncer }, ], - declarations: [HistoryComponent], + declarations: [ReportsComponent], }); TestBed.overrideProvider(ReportsStore, { useValue: mockReportsStore }); - fixture = TestBed.createComponent(HistoryComponent); + fixture = TestBed.createComponent(ReportsComponent); component = fixture.componentInstance; component.viewModel$ = getViewModel(DATA_SOURCE_INITIAL_VALUE, false); compiled = fixture.nativeElement as HTMLElement; diff --git a/modules/ui/src/app/pages/reports/history.module.ts b/modules/ui/src/app/pages/reports/reports.module.ts similarity index 89% rename from modules/ui/src/app/pages/reports/history.module.ts rename to modules/ui/src/app/pages/reports/reports.module.ts index a73c14cbb..f218780c5 100644 --- a/modules/ui/src/app/pages/reports/history.module.ts +++ b/modules/ui/src/app/pages/reports/reports.module.ts @@ -15,8 +15,8 @@ */ import { NgModule } from '@angular/core'; import { CommonModule, DatePipe } from '@angular/common'; -import { HistoryComponent } from './history.component'; -import { HistoryRoutingModule } from './history-routing.module'; +import { ReportsComponent } from './reportscomponent'; +import { ReportsRoutingModule } from './reports-routing.module'; import { MatTableModule } from '@angular/material/table'; import { MatIconModule } from '@angular/material/icon'; import { MatToolbarModule } from '@angular/material/toolbar'; @@ -29,10 +29,10 @@ import { DownloadReportZipComponent } from '../../components/download-report-zip import { DownloadReportPdfComponent } from '../../components/download-report-pdf/download-report-pdf.component'; @NgModule({ - declarations: [HistoryComponent], + declarations: [ReportsComponent], imports: [ CommonModule, - HistoryRoutingModule, + ReportsRoutingModule, MatTableModule, MatIconModule, MatToolbarModule, @@ -46,4 +46,4 @@ import { DownloadReportPdfComponent } from '../../components/download-report-pdf ], providers: [DatePipe], }) -export class HistoryModule {} +export class ReportsModule {} diff --git a/modules/ui/src/app/pages/reports/history.component.ts b/modules/ui/src/app/pages/reports/reportscomponent.ts similarity index 97% rename from modules/ui/src/app/pages/reports/history.component.ts rename to modules/ui/src/app/pages/reports/reportscomponent.ts index 7f5dc01f1..e390f0e06 100644 --- a/modules/ui/src/app/pages/reports/history.component.ts +++ b/modules/ui/src/app/pages/reports/reportscomponent.ts @@ -38,11 +38,11 @@ import { ReportsStore } from './reports.store'; @Component({ selector: 'app-history', - templateUrl: './history.component.html', - styleUrls: ['./history.component.scss'], + templateUrl: './reports.component.html', + styleUrls: ['./reports.component.scss'], providers: [ReportsStore], }) -export class HistoryComponent implements OnInit, OnDestroy { +export class ReportsComponent implements OnInit, OnDestroy { public readonly FilterName = FilterName; private destroy$: Subject = new Subject(); @ViewChild(MatSort, { static: false }) sort!: MatSort;