Merge pull request #108 in TEA/mina-sidor-fa-web from feature/TV-623 to develop

Squashed commit of the following:

commit ca49a82df7d52c918ed3540bdca68d63c5c9a6bf
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 21 12:24:13 2021 +0200

    TV-623 Åtgärdat lintvarningar

commit f493987d3213089b7e7f2e455635b5cf13361039
Merge: cf1fa71 2dd9d3d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 21 11:05:43 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit cf1fa71006576dd448b0b42c688cb43ddfff8080
Merge: acab6a9 91eeb1d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 21 09:40:24 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit acab6a95ffa43d59e86e387658f97cbc2d1b01cb
Merge: b131d2f e120e50
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 17:39:07 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit b131d2fea3e1c7f3c5210d71c5258e8c14fec98d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 17:38:06 2021 +0200

    TV-623 ensuring that changes are propagated to the form if the treeNodesSelector is closed by clicking outside of the control. Otherwise I imagine it would be quite annoying if you closed it by mistake..

commit 29537edfdbdda3382b5af8ffef8f971cbc2550c8
Merge: dc6a4ad 8da6899
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 14:08:46 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit dc6a4ad0f6629db2e001a8ffa7895026d2e1a1c0
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 13:36:24 2021 +0200

    TV-623 adjusted switch

commit bdd108b6621ca7bdef61d41d25db9ee6d35e1355
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 12:56:38 2021 +0200

    TV-623 increased min-width of control

commit a2b3d1c42fb287b45f3323a3475d02e667783c9e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 12:18:17 2021 +0200

    TV-623 fixed linting issue in deltagare-card..

commit 9895eb7c8792977cf7f5c743041c95878003890e
Merge: 4ebafb5 ffc5a46
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 12:16:37 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit 4ebafb57ef2e4bbbdcb924a1f92f0412257e11f1
Merge: af58d40 bfffed4
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 11:25:13 2021 +0200

    Merge branch 'develop' into TV-623

commit af58d4009be592115dfcd3df20a1c3a1499d5eb4
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 11:24:23 2021 +0200

    TV-623

apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html

@@ -55,6 +55,7 @@
         </p>
         <ng-container *ngIf="!isLoadingUtforandeVerksamheter else loadingUtforandeVerksamheterTemplate">
           <digi-ng-form-checkbox
+            [afId]="selectAllUtforandeVerksamheterElementId"
             class="edit-employee-form__choose-all-utforande-verksamheter"
             [formControl]="selectAllUtforandeVerksamheterFormControl"
             [afLabel]="'Välj alla utförande verksamheter och alla utförande adresser'"

apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts

@@ -60,6 +60,7 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
   readonly formUuid = uuid();
   readonly emailElementId = `email-control-${this.formUuid}`;
   readonly tjansterElementId = `tjanster-control-${this.formUuid}`;
+  readonly selectAllUtforandeVerksamheterElementId = `select-all-utforande-verksamheter-control-${this.formUuid}`;
   readonly utforandeVerksamhetElementId = `utforande-verksamhet-control-${this.formUuid}`;
   readonly firstValidationErrorLinkId = `validation-error-link-${this.formUuid}`;
 
@@ -206,7 +207,7 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
 
     if (this.editEmployeeFormGroup.invalid) {
       setTimeout(() => {
-        this.focusLinkElement('.error-list__validation-error-link a');
+        this.focusElement('.error-list__validation-error-link a');
       });
 
       return;
@@ -274,7 +275,7 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
     return validationErrorLinks;
   }
 
-  focusLinkElement(selector: string): void {
+  focusElement(selector: string): void {
     let errorListElement: HTMLElement = null;
     let linkElement: HTMLLinkElement = null;
 
@@ -302,9 +303,21 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
       this.utforandeVerksamheterFormControl.value
     );
 
+    if (hasSelectedAllLeafNodes === this.selectAllUtforandeVerksamheterFormControl.value) {
+      return;
+    }
+
     this.editEmployeeFormGroup.patchValue(
       Object.fromEntries([[this.selectAllUtforandeVerksamheterFormControlName, hasSelectedAllLeafNodes]])
     );
+
+    if (!hasSelectedAllLeafNodes) {
+      return;
+    }
+
+    setTimeout(() => {
+      this.focusElement(`#${this.selectAllUtforandeVerksamheterElementId}`);
+    });
   }
 
   emitCloseError(): void {

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

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { Avrop, AvropCompact, AvropCompactData } from '@msfa-models/avrop.model';
+import { AvropCompact, AvropCompactData } from '@msfa-models/avrop.model';
 import { Handledare } from '@msfa-models/handledare.model';
 import { AvropService } from '@msfa-services/avrop.service';
 import { Observable } from 'rxjs';

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

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