Merge pull request #145 in TEA/mina-sidor-fa-web from bugfix/TV-701 to next

Squashed commit of the following: commit b5121285e8796f3ef3a2ff51bcb06699967386d5 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Sep 28 11:22:37 2021 +0200 Fixed lint issues commit aa970ebbb6bd9bb4c6dbbfbe16a532cc0d59c6b6 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Sep 28 10:43:29 2021 +0200 Updated changelog commit 81669a5f26ffd1b76eb9c023d3ee03c5c5feccaa Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Sep 28 10:41:19 2021 +0200 Now resetting state when navigating away from avrop commit a161a3ce48f778f778f46b665711428e5b01350e Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Sep 28 10:35:42 2021 +0200 Removed selectAll checkbox and fixed pagination issue
2021-09-28 11:52:09 +02:00
parent c8c67b2a11
commit 4d69676a74
7 changed files with 12 additions and 29 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - **authorization:** Whenever the API throws a "403 Forbidden" error we now show an unauthorized message. [TV-695](https://jira.arbetsformedlingen.se/browse/TV-695)
 - **avrop:** Now showing spårnamn instead of spårkod inside avrop. [TV-691](https://jira.arbetsformedlingen.se/browse/TV-691)
 - **avrop:** Fixed error-state on handledare select. [TV-699](https://jira.arbetsformedlingen.se/browse/TV-699)
+- **avrop:** Several bugfixes related to avrop. [TV-701](https://jira.arbetsformedlingen.se/browse/TV-701)

 ## [2.0.0](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/mina-sidor-fa-web/compare/diff?targetBranch=refs%2Ftags%2Fv1.5.0&sourceBranch=refs%2Ftags%2Fv2.0.0) (2021-09-24)

--- a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core';
 import { AvropCompact, AvropCompactData } from '@msfa-models/avrop.model';
 import { Handledare } from '@msfa-models/handledare.model';
 import { AvropService } from '@msfa-services/avrop.service';
@@ -10,7 +10,7 @@ import { Observable } from 'rxjs';
  styleUrls: ['./avrop.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AvropComponent {
+export class AvropComponent implements OnDestroy {
  readonly totalAmountOfSteps = 3;
  currentStep$: Observable<number> = this.avropService.currentStep$;
  error$: Observable<string> = this.avropService.error$;
@@ -26,6 +26,10 @@ export class AvropComponent {

  constructor(private avropService: AvropService) {}

+  ngOnDestroy(): void {
+    this.returnToStep1();
+  }
+
  updateSelectedAvrop(deltagareList: AvropCompact[], currentStep: number): void {
    if (currentStep !== 1 && !deltagareList.length) {
      this.avropService.goToStep1();
--- a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.html
@@ -1,13 +1,5 @@
 <digi-ng-skeleton-base *ngIf="avropLoading" [afCount]="3" afText="Laddar nya deltagare"></digi-ng-skeleton-base>
 <div *ngIf="availableAvrop?.length" class="avrop-list">
-  <div class="avrop-list__select-all">
-    <digi-form-checkbox
-      *ngIf="!isLocked"
-      af-label="Välj alla deltagare"
-      [afChecked]="isAllSelected"
-      (change)="toggleAllAvrop($event.target.checked)"
-    ></digi-form-checkbox>
-  </div>
  <ul class="avrop-list__list">
    <li *ngFor="let avrop of avropRows">
      <msfa-avrop-row
@@ -27,6 +19,7 @@
    *ngIf="totalPage > 1 && !isLocked"
    class="avrop-list__pagination"
    [afTotalPages]="totalPage"
+    [afInitActivePage]="currentPage"
    [afCurrentResultStart]="currentResultStart"
    [afCurrentResultEnd]="currentResultEnd"
    [afTotalResults]="count"
--- a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.scss
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.scss
@@ -1,10 +1,6 @@
@import 'mixins/list';

 .avrop-list {
-  &__select-all {
-    padding: var(--digi--layout--gutter);
-  }
-
  &__list {
    @include msfa__reset-list;
    display: flex;
--- a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.ts
@@ -24,10 +24,6 @@ export class AvropListComponent {
  get avropRows(): AvropCompact[] {
    return this.isLocked ? this.selectedAvrop : this.availableAvrop;
  }
-  get isAllSelected(): boolean {
-    return this.selectedAvrop?.length === this.availableAvrop?.length;
-  }
-
  get currentPage(): number {
    return this.paginationMeta.page;
  }
@@ -53,14 +49,6 @@ export class AvropListComponent {
    return !!this.selectedAvrop?.find(selectedAvrop => selectedAvrop.id === avrop.id);
  }

-  toggleAllAvrop(selected: boolean): void {
-    if (selected && this.selectedAvrop?.length !== this.availableAvrop?.length) {
-      this.selectionChanged.emit(this.availableAvrop);
-    } else if (!selected && this.selectedAvrop.length) {
-      this.selectionChanged.emit([]);
-    }
-  }
-
  toggleSelectedAvrop(avrop: Avrop, selected: boolean): void {
    const avropIsSelected = !!this.selectedAvrop?.find(selectedAvrop => selectedAvrop.id === avrop.id);

--- a/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
@@ -13,7 +13,7 @@ export interface AvropCompact {
  sprakstod: string; // sprakstod
  utforandeAdress: string; // adress
  trackCode: string; // sparkod
-  trackName: string; // sparNamn
+  trackName: TrackName; // sparNamn
 }

 export interface Avrop extends AvropCompact {
@@ -60,11 +60,11 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
    sprakstod: sprakstod,
    utforandeAdress: adress,
    trackCode: sparkod,
-    trackName: TrackName[sparkod] || TrackName.UNKNOWN,
+    trackName: (TrackName[sparkod] || TrackName.UNKNOWN) as TrackName,
    genomforandeReferens,
    participationFrequency: deltagandeGrad,
    utforandeVerksamhet: utforandeverksamhet,
-    handledareCiamUserId,
+    handledareCiamUserId: handledareCiamUserId,
    handledare,
  };
 }
--- a/apps/mina-sidor-fa/src/assets/CHANGELOG.md
+++ b/apps/mina-sidor-fa/src/assets/CHANGELOG.md
@@ -6,6 +6,7 @@
 - **authorization:** Whenever the API throws a "403 Forbidden" error we now show an unauthorized message. [TV-695](https://jira.arbetsformedlingen.se/browse/TV-695)
 - **avrop:** Now showing spårnamn instead of spårkod inside avrop. [TV-691](https://jira.arbetsformedlingen.se/browse/TV-691)
 - **avrop:** Fixed error-state on handledare select. [TV-699](https://jira.arbetsformedlingen.se/browse/TV-699)
+- **avrop:** Several bugfixes related to avrop. [TV-701](https://jira.arbetsformedlingen.se/browse/TV-701)

 ## [2.0.0](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/mina-sidor-fa-web/compare/diff?targetBranch=refs%2Ftags%2Fv1.5.0&sourceBranch=refs%2Ftags%2Fv2.0.0) (2021-09-24)