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

Merge pull request #55 in TEA/dafa-web-monorepo from feature/TV-366 to develop

Browse Source 
Squashed commit of the following:

commit 41f27ba3701d7b690e941f2038676218facaab84
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:40:44 2021 +0200

    TV-366 removed redundant import

commit f31d3d6545375e2c84254a60b9e072333fddaa80
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:38:41 2021 +0200

    TV-366 made a bunch of changes in accordance with the feedback from the current pull request.

commit 04c0775649390ce36cc3d2c03ae3cd756e8190b5
Merge: 721b58e e712f2f
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:10:28 2021 +0200

    Co-authored-by: af-aden <af-aden@users.noreply.github.com>

commit 721b58e1767c465673cb817414e1410b403f5e60
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 10:16:40 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/logout/logout.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.html
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.scss
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-routing.module.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts
    #	apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts

commit f3e6e590fe24f0b3aefb45d3b8bfae9a3ce7af82
Merge: fbda233 218e3d6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 09:41:54 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

commit fbda233782a0850edb5e23b50f0030486a15effe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:50:08 2021 +0200

    TV-366 removing stored selected organization when logging out.

commit ed51909892cd92f180f6785635f85c735ec3f129
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:05:14 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

    # Conflicts:
    #	apps/dafa-web/src/app/shared/services/api/user.service.ts

commit 6a77f2497aec71d174c719d27c6d5c644ba53fed
Merge: 17f643d 6d29baa
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:04:22 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

commit 17f643d18abcbdbfe12a91a63179278d559fdba5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 17:35:59 2021 +0200

    TV-366 First version od organization-picker
This commit is contained in:
Nicolas Fuentes Maturana
2021-08-19 08:17:59 +02:00
parent 639109ad10
commit d4874d6cd5
33 changed files with 409 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/mina-sidor-fa/src/app/pages/avrop/avrop-service.service.spec.ts
View File

@@ -1,3 +1,4 @@
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { TestBed } from '@angular/core/testing';
import { AvropService } from './avrop.service';
@@ -6,7 +7,7 @@ describe('AvropServiceService', () => {
let service: AvropService;
beforeEach(() => {
TestBed.configureTestingModule({});
TestBed.configureTestingModule({ imports: [HttpClientTestingModule] });
service = TestBed.inject(AvropService);
});

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

@@ -1,6 +1,12 @@
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 { LayoutComponent } from '@msfa-shared/components/layout/layout.component';
import { AvropComponent } from './avrop.component';
import { AvropFiltersComponent } from './components/avrop-filters/avrop-filters.component';
import { AvropTableComponent } from './components/avrop-table/avrop-table.component';
describe('CallOffComponent', () => {
let component: AvropComponent;
@@ -9,8 +15,9 @@ describe('CallOffComponent', () => {
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
declarations: [AvropComponent],
imports: [RouterTestingModule],
declarations: [AvropComponent, LayoutComponent, AvropFiltersComponent, AvropTableComponent],
imports: [RouterTestingModule, HttpClientTestingModule, DigiNgProgressProgressbarModule],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
})
);

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

@@ -6,6 +6,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { AvropService } from '../../avrop.service';
import { of } from 'rxjs';
import { By } from '@angular/platform-browser';
import { HttpClientTestingModule } from '@angular/common/http/testing';
describe('AvropFiltersComponent', () => {
let component: AvropFiltersComponent;
@@ -14,6 +15,7 @@ describe('AvropFiltersComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
imports: [HttpClientTestingModule],
declarations: [AvropFiltersComponent, TemporaryFilterComponent],
providers: [AvropService],
}).compileComponents();
@@ -31,7 +33,7 @@ describe('AvropFiltersComponent', () => {
it('should show 1 tag if selectedKommuner$ is an observable with one value', () => {
component.selectedKommuner$ = of([{ id: '1', label: 'Stockholm', count: 1 }]);
fixture.detectChanges();
const tags = fixture.debugElement.queryAll(By.css('.avrop-filters--tag'));
const tags = fixture.debugElement.queryAll(By.css('.avrop-filters__tag'));
expect(tags.length).toBe(1);
});

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

@@ -1,3 +1,4 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TemporaryFilterComponent } from './temporary-filter.component';
@@ -8,9 +9,9 @@ describe('TemporaryFilterComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ TemporaryFilterComponent ]
})
.compileComponents();
declarations: [TemporaryFilterComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
});
beforeEach(() => {

7
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-table/avrop-table-row/avrop-table-row.component.spec.ts
View File

@@ -1,3 +1,4 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AvropTableRowComponent } from './avrop-table-row.component';
@@ -8,9 +9,9 @@ describe('AvropTableRowComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ AvropTableRowComponent ]
})
.compileComponents();
declarations: [AvropTableRowComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
});
beforeEach(() => {