Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions modules/ui/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ const routes: Routes = [
{
path: 'devices',
loadChildren: () =>
import('./pages/devices/device-repository.module').then(
m => m.DeviceRepositoryModule
),
import('./pages/devices/devices.module').then(m => m.DevicesModule),
title: 'Testrun - Devices',
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Device, DeviceView } from '../../model/device';

import { DeviceItemComponent } from './device-item.component';
import { DeviceRepositoryModule } from '../../pages/devices/device-repository.module';
import { DevicesModule } from '../../pages/devices/devices.module';
import { MatIconTestingModule } from '@angular/material/icon/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

Expand All @@ -29,7 +29,7 @@ describe('DeviceItemComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
DeviceRepositoryModule,
DevicesModule,
DeviceItemComponent,
MatIconTestingModule,
BrowserAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { DeviceRepositoryComponent } from './device-repository.component';
import { DevicesComponent } from './devices.component';

const routes: Routes = [{ path: '', component: DeviceRepositoryComponent }];
const routes: Routes = [{ path: '', component: DevicesComponent }];

@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class DeviceRepositoryRoutingModule {}
export class DevicesRoutingModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import {
import { of } from 'rxjs';
import { Device } from '../../model/device';

import { DeviceRepositoryComponent } from './device-repository.component';
import { DeviceRepositoryModule } from './device-repository.module';
import { DevicesComponent } from './devices.component';
import { DevicesModule } from './devices.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {
DeviceFormComponent,
Expand All @@ -42,9 +42,9 @@ import { Router } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { Component } from '@angular/core';

describe('DeviceRepositoryComponent', () => {
let component: DeviceRepositoryComponent;
let fixture: ComponentFixture<DeviceRepositoryComponent>;
describe('DevicesComponent', () => {
let component: DevicesComponent;
let fixture: ComponentFixture<DevicesComponent>;
let compiled: HTMLElement;
let mockDevicesStore: SpyObj<DevicesStore>;
let router: Router;
Expand All @@ -68,20 +68,20 @@ describe('DeviceRepositoryComponent', () => {
RouterTestingModule.withRoutes([
{ path: 'testing', component: FakeProgressComponent },
]),
DeviceRepositoryModule,
DevicesModule,
BrowserAnimationsModule,
MatIconTestingModule,
],
providers: [
{ provide: DevicesStore, useValue: mockDevicesStore },
{ provide: FocusManagerService, useValue: stateServiceMock },
],
declarations: [DeviceRepositoryComponent, FakeProgressComponent],
declarations: [DevicesComponent, FakeProgressComponent],
}).compileComponents();

TestBed.overrideProvider(DevicesStore, { useValue: mockDevicesStore });

fixture = TestBed.createComponent(DeviceRepositoryComponent);
fixture = TestBed.createComponent(DevicesComponent);
component = fixture.componentInstance;
router = TestBed.get(Router);
compiled = fixture.nativeElement as HTMLElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ import { DevicesStore } from './devices.store';

@Component({
selector: 'app-device-repository',
templateUrl: './device-repository.component.html',
styleUrls: ['./device-repository.component.scss'],
templateUrl: './devices.component.html',
styleUrls: ['./devices.component.scss'],
providers: [DevicesStore],
})
export class DeviceRepositoryComponent implements OnInit, OnDestroy {
export class DevicesComponent implements OnInit, OnDestroy {
readonly DeviceView = DeviceView;
private destroy$: Subject<boolean> = new Subject<boolean>();
viewModel$ = this.devicesStore.viewModel$;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ import { MatInputModule } from '@angular/material/input';
import { MatToolbarModule } from '@angular/material/toolbar';
import { DeviceFormComponent } from './components/device-form/device-form.component';

import { DeviceRepositoryRoutingModule } from './device-repository-routing.module';
import { DeviceRepositoryComponent } from './device-repository.component';
import { DevicesRoutingModule } from './devices-routing.module';
import { DevicesComponent } from './devices.component';
import { DeviceItemComponent } from '../../components/device-item/device-item.component';
import { DeviceTestsComponent } from '../../components/device-tests/device-tests.component';
import { SpinnerComponent } from '../../components/spinner/spinner.component';
import { DeleteFormComponent } from '../../components/delete-form/delete-form.component';
import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask';

@NgModule({
declarations: [DeviceRepositoryComponent, DeviceFormComponent],
declarations: [DevicesComponent, DeviceFormComponent],
imports: [
CommonModule,
DeviceRepositoryRoutingModule,
DevicesRoutingModule,
MatToolbarModule,
MatButtonModule,
MatIconModule,
Expand All @@ -57,4 +57,4 @@ import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask';
],
providers: [provideNgxMask()],
})
export class DeviceRepositoryModule {}
export class DevicesModule {}