From 982f7f3a42a053a4aac44c156db5d01c4559d663 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Tue, 19 May 2020 16:46:12 +0200
Subject: [PATCH] FIX #12091 TIME 2:30 show confirm modal before updating
 indexing model

---
 ...indexing-model-administration.component.ts | 28 +++++++++++--------
 src/frontend/lang/lang-en.ts                  |  1 +
 src/frontend/lang/lang-fr.ts                  |  1 +
 src/frontend/lang/lang-nl.ts                  |  3 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts b/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts
index 6aa1a16e70a..02e767f96c5 100644
--- a/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts
+++ b/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts
@@ -3,14 +3,15 @@ import { HttpClient } from '@angular/common/http';
 import { LANG } from '../../translate.component';
 import { NotificationService } from '../../notification.service';
 import { HeaderService } from '../../../service/header.service';
-import { MatDialog } from '@angular/material/dialog';
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import { MatSidenav } from '@angular/material/sidenav';
 import { AppService } from '../../../service/app.service';
-import { tap, catchError, finalize, exhaustMap } from 'rxjs/operators';
+import {tap, catchError, finalize, exhaustMap, filter} from 'rxjs/operators';
 import { SortPipe } from '../../../plugins/sorting.pipe';
 import { IndexingFormComponent } from '../../indexation/indexing-form/indexing-form.component';
 import { ActivatedRoute, Router } from '@angular/router';
 import { of } from 'rxjs/internal/observable/of';
+import {ConfirmComponent} from '../../../plugins/modal/confirm.component';
 
 @Component({
     templateUrl: 'indexing-model-administration.component.html',
@@ -48,6 +49,8 @@ export class IndexingModelAdministrationComponent implements OnInit {
 
     categoriesList: any[];
 
+    dialogRef: MatDialogRef<any>;
+
     constructor(
         public http: HttpClient,
         private route: ActivatedRoute,
@@ -115,14 +118,13 @@ export class IndexingModelAdministrationComponent implements OnInit {
 
     onSubmit() {
         const fields = this.indexingForm.getDatas();
-        fields.forEach((element, key) => {
-            delete fields[key].event;
-            delete fields[key].label;
-            delete fields[key].system;
-            delete fields[key].type;
-            delete fields[key].values;
-        });
-
+        // fields.forEach((element, key) => {
+        //     delete fields[key].event;
+        //     delete fields[key].label;
+        //     delete fields[key].system;
+        //     delete fields[key].type;
+        //     delete fields[key].values;
+        // });
         this.indexingModel.fields = fields;
 
         if (this.creationMode) {
@@ -140,7 +142,11 @@ export class IndexingModelAdministrationComponent implements OnInit {
                 })
             ).subscribe();
         } else {
-            this.http.put('../rest/indexingModels/' + this.indexingModel.id, this.indexingModel).pipe(
+            this.dialogRef = this.dialog.open(ConfirmComponent, { panelClass: 'maarch-modal', autoFocus: false, disableClose: true, data: { title: this.lang.indexingModelModification, msg: this.lang.updateIndexingFieldWarning } });
+
+            this.dialogRef.afterClosed().pipe(
+                filter((data: string) => data === 'ok'),
+                exhaustMap(() => this.http.put('../rest/indexingModels/' + this.indexingModel.id, this.indexingModel)),
                 tap((data: any) => {
                     this.indexingForm.setModification();
                     this.setModification();
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index af20f9e560d..1bc6fbdbc74 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1702,4 +1702,5 @@ export const LANG_EN = {
     "associatedElements": "associated elements",
     "selectedContact": "selected contact",
     "modificationsProcessed": "Modifications processed",
+    'updateIndexingFieldWarning': 'Warning:  if you remove a field from the model, this field will be reset for <b>ALL</b> resources linked to this model. Do you want to continue ?',
 };
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index cd7098f1b34..dcfee28b776 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1704,4 +1704,5 @@ export const LANG_FR = {
     "associatedElements": "élement(s) associé(s)",
     "selectedContact": "contact sélectionné",
     "modificationsProcessed": "Modifications effectuées",
+    'updateIndexingFieldWarning': 'Attention si vous supprimez un champ du modèle, ce champ sera réinitialisé pour <b>TOUS</b> les courriers associés au modèle. Voulez-vous continuer ?'
 };
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 8dc6adc6c63..777512d20b0 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1685,5 +1685,6 @@ export const LANG_NL = {
     "merge": "Merge", //_TO_TRANSLATE
     "associatedElements": "associated elements", //_TO_TRANSLATE
     "selectedContact": "selected contact", //_TO_TRANSLATE
-    "modificationsProcessed": "Modifications processed", //_TO_TRANSLATE
+    "modificationsProcessed": "Modifications processed", //_TO_TRANSLATE,
+    'updateIndexingFieldWarning': 'Warning:  if you remove a field from the model, this field will be reset for <b>ALL</b> resources linked to this model. Do you want to continue ?', //_TO_TRANSLATE
 };
-- 
GitLab