From 1e45fb5da5613decca847e66eaff85a254e25b31 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Thu, 9 Sep 2021 05:41:48 +0200
Subject: [PATCH] Added pristineWarning if no changes has been made to edit
 employee form

---
 .../edit-employee-form.component.html                | 11 +++++++++++
 .../edit-employee-form.component.ts                  | 12 +++++++++---
 .../shared/models/api/employee-edit.request.model.ts |  1 -
 .../shared/utils/validators/tree-node.validator.ts   |  5 +++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
index c74d6e0..515a166 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
@@ -110,6 +110,17 @@
         <p>Personalkontot för {{employee.fullName}} kunde inte redigeras. Vänligen försök igen.</p>
         <p class="msfa__small-text" *ngIf="errorWhileUpdating.message">{{errorWhileUpdating.message}}</p>
       </digi-notification-alert>
+
+      <digi-notification-alert
+        *ngIf="displayPristineWarning"
+        af-variation="warning"
+        af-heading="Du har inte gjort några ändringar"
+        af-heading-level="h4"
+        [afCloseable]="true"
+        (afOnClose)="displayPristineWarning = false"
+      >
+        <p>Du har inte gjort några ändringar i formuläret. För att spara personalkontot behöver ändringar göras.</p>
+      </digi-notification-alert>
     </div>
 
     <footer class="edit-employee-form__footer">
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
index 15701de..18c1c2c 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
@@ -56,6 +56,7 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
 
   editEmployeeFormGroup: FormGroup | null = null;
   displayEditWithoutRolesDialog = false;
+  displayPristineWarning = false;
 
   displayRolesDialog = false;
 
@@ -151,7 +152,8 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
         [
           TreeNodeValidator.IsValidTreeNode(
             this.utforandeVerksamheterService.hasSelectedUtforandeVerksamhet,
-            'required'
+            'required',
+            this.toggleAllUtforandeVerksamhetFormControl
           ),
         ]
       ),
@@ -176,7 +178,12 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
 
     this.editEmployeeFormGroup.markAllAsTouched();
 
-    if (this.editEmployeeFormGroup.invalid || this.editEmployeeFormGroup.pristine) {
+    if (this.editEmployeeFormGroup.invalid) {
+      return;
+    }
+
+    if (this.editEmployeeFormGroup.pristine) {
+      this.displayPristineWarning = true;
       return;
     }
 
@@ -203,7 +210,6 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
             this.utforandeVerksamhetFormControl?.value
           ),
       allaUtforandeVerksamheter: !!this.toggleAllUtforandeVerksamhetFormControl.value,
-      utforandeVerksamhetIds: [],
     });
   }
 
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/employee-edit.request.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/employee-edit.request.model.ts
index 3815f95..2cf01d5 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/employee-edit.request.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/employee-edit.request.model.ts
@@ -5,6 +5,5 @@ export interface EmployeeEditRequest {
   roles: RoleEnum[];
   tjanstIds: number[];
   allaUtforandeVerksamheter: boolean;
-  utforandeVerksamhetIds?: number[];
   adressIds: number[];
 }
diff --git a/apps/mina-sidor-fa/src/app/shared/utils/validators/tree-node.validator.ts b/apps/mina-sidor-fa/src/app/shared/utils/validators/tree-node.validator.ts
index cf9c859..c495e21 100644
--- a/apps/mina-sidor-fa/src/app/shared/utils/validators/tree-node.validator.ts
+++ b/apps/mina-sidor-fa/src/app/shared/utils/validators/tree-node.validator.ts
@@ -4,14 +4,15 @@ import { TreeNode } from '@msfa-shared/components/tree-nodes-selector/services/t
 export class TreeNodeValidator {
   static IsValidTreeNode(
     validationFn: (treeNode: TreeNode | null | undefined) => boolean,
-    nameOfError: string
+    nameOfError: string,
+    allUtforandeVerksamheterFormControl: AbstractControl
   ): ValidatorFn {
     return (control: AbstractControl): { [key: string]: unknown } => {
       const isValid = validationFn(control.value);
 
       const validationObj = {};
 
-      if (isValid) {
+      if (isValid || allUtforandeVerksamheterFormControl?.value) {
         return null;
       }