arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110 in TEA/mina-sidor-fa-web from fix-Fixed-some-failing-tests to develop

Browse Source 
Squashed commit of the following:

commit ff92c6bd63560c8e0dab6c711c09150fbaf7ce37
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:46:33 2021 +0200

    fix comments and type

commit 3d246398a3a4d5b0397cdfda7aa8b7e2f285303e
Merge: d4d00f4 91eeb1d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:43:11 2021 +0200

    Merge branch 'develop' into fix-Fixed-some-failing-tests

commit d4d00f447b8641167c5c6a19c64cb9303d5bd5e9
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 14:11:24 2021 +0200

    Fix lint errors

commit 3b203efbc92380a9fadba1521c83c22debb49420
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 14:05:42 2021 +0200

    Fix failing tests & type fails

commit b26ab4e13aa646b90431608c697c9d40ca41e67d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 13:50:26 2021 +0200

    Fix: Fixed failing tests
This commit is contained in:
Daniel Appelgren
2021-09-21 10:46:49 +02:00
parent 91eeb1d8dc
commit 2dd9d3d39b
10 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.spec.ts
View File

@@ -1,12 +1,8 @@
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { AvropComponent } from './avrop.component';
import { AvropFiltersModule } from './components/avrop-filters/avrop-filters.module';
import { AvropListModule } from './components/avrop-list/avrop-list.module';
describe('AvropComponent', () => {
let component: AvropComponent;
@@ -16,14 +12,7 @@ describe('AvropComponent', () => {
waitForAsync(() => {
void TestBed.configureTestingModule({
declarations: [AvropComponent],
imports: [
RouterTestingModule,
HttpClientTestingModule,
DigiNgProgressProgressbarModule,
LayoutModule,
AvropFiltersModule,
AvropListModule,
],
imports: [RouterTestingModule, HttpClientTestingModule],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
})

9
apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
View File

@@ -1,8 +1,7 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { Avrop, AvropCompactData } from '@msfa-models/avrop.model';
import { Avrop, AvropCompact, AvropCompactData } from '@msfa-models/avrop.model';
import { Handledare } from '@msfa-models/handledare.model';
import { AvropService } from '@msfa-services/avrop.service';
import { MultiselectFilterOption } from '@msfa-shared/components/multiselect/multiselect-filter-option';
import { Observable } from 'rxjs';
@Component({
@@ -16,10 +15,8 @@ export class AvropComponent {
currentStep$: Observable<number> = this.avropService.currentStep$;
error$: Observable<string> = this.avropService.error$;
filteredUtforandeVerksamheter$: Observable<MultiselectFilterOption[]> = this.avropService
.filteredUtforandeVerksamheter$;
avropData$: Observable<AvropCompactData> = this.avropService.avropData$;
selectedAvrop$: Observable<Avrop[]> = this.avropService.selectedAvrop$;
selectedAvrop$: Observable<AvropCompact[]> = this.avropService.selectedAvrop$;
availableHandledare$: Observable<Handledare[]> = this.avropService.availableHandledare$;
selectedHandledare$: Observable<Handledare> = this.avropService.selectedHandledare$;
avropIsLocked$: Observable<boolean> = this.avropService.avropIsLocked$;
@@ -29,7 +26,7 @@ export class AvropComponent {
constructor(private avropService: AvropService) {}
updateSelectedAvrop(deltagareList: Avrop[], currentStep: number): void {
updateSelectedAvrop(deltagareList: AvropCompact[], currentStep: number): void {
if (currentStep !== 1 && !deltagareList.length) {
this.avropService.goToStep1();
} else {

2
apps/mina-sidor-fa/src/app/pages/avrop/avrop.module.ts
View File

@@ -4,10 +4,10 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { AvropComponent } from './avrop.component';
import { AvropFiltersModule } from './components/avrop-filters/avrop-filters.module';
import { AvropListModule } from './components/avrop-list/avrop-list.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],

6
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-filters/avrop-filters.component.spec.ts
View File

@@ -47,9 +47,9 @@ describe('AvropFiltersComponent', () => {
discardPeriodicTasks();
}));
it('should show loading spinners when filters are loading', () => {
it('should show loading spinner when filters are loading', () => {
fixture.detectChanges();
const tags = fixture.debugElement.queryAll(By.css('digi-icon-spinner'));
expect(tags.length).toBe(3);
const tags = fixture.debugElement.queryAll(By.css('msfa-loader'));
expect(tags.length).toBe(1);
});
});

4
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.ts
View File

@@ -69,10 +69,10 @@ export class DeltagareCardComponent {
switch (reportType) {
case 'planering':
this.reportsFormControl.valid ? this.router.navigate(['/deltagare/planering', deltagareId]) : null;
this.reportsFormControl.valid ? void this.router.navigate(['/deltagare/planering', deltagareId]) : null;
break;
case 'avvikelse':
this.reportsFormControl.valid ? this.router.navigate(['/deltagare/rapportera', deltagareId]) : null;
this.reportsFormControl.valid ? void this.router.navigate(['/deltagare/rapportera', deltagareId]) : null;
break;
default:
return;