FIX #25218 TIME 0:25 display warning modal if edition needed

src/frontend/app/administration/template/template-administration.component.html

@@ -33,10 +33,6 @@
                 <mat-card *ngIf="!loading" class="card-app-content" style="display: contents;">
                     <form style="display: contents;" class="form-horizontal" (ngSubmit)="onSubmit()"
                         #templatesFormUp="ngForm">
-                        <app-maarch-message
-                            *ngIf="selectedModelFile && documentImported && mustEditFile"
-                            [mode]="'danger'" [content]="'lang.editDocFileDesc' | translate">
-                        </app-maarch-message>
                         <app-maarch-message
                             *ngIf="template.target === 'attachments' && !isVisibleAttachment(template.template_attachment_type) && template.template_attachment_type !== 'all'"
                             [mode]="'danger'" [content]="'lang.invisibleAttachmentType' | translate">
@@ -325,7 +321,7 @@
                         </div>
                         <div class="col-sm-12" style="background: white;position:sticky;bottom:0px; text-align:center;">
                             <button mat-raised-button color="primary" type="submit"
-                                [disabled]="!templatesFormUp.form.valid || lockFound || mustEditFile">{{'lang.save' | translate}}</button>
+                                [disabled]="!templatesFormUp.form.valid || lockFound">{{'lang.save' | translate}}</button>
                         </div>
                     </form>
                 </mat-card>

src/frontend/app/administration/template/template-administration.component.ts

@@ -320,7 +320,9 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy {
                 this.documentImported = true;
                 this.getViewTemplateFile();
             };
-
+            /**
+             * Check if the extension of the imported file is in the array of extensions whose files need editing
+             */
             this.mustEditFile = this.extensionsRequiringEditing.indexOf(this.template.file.format) > -1;
         }
     }
@@ -543,22 +545,24 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy {
         }*/
 
         if (this.isValidTemplate()) {
-            if (this.creationMode) {
-                this.http.post('../rest/templates', this.formatTemplate()).pipe(
-                    tap((data: any) => {
-                        if (data.checkEntities) {
-                            this.config = {
-                                panelClass: 'maarch-modal',
-                                data: {
-                                    entitiesList: data.checkEntities,
-                                    template_attachment_type: this.template.template_attachment_type
-                                }
-                            };
-                            this.dialog.open(TemplateAdministrationCheckEntitiesModalComponent, this.config);
-                        } else {
-                            this.router.navigate(['/administration/templates']);
-                            this.notify.success(this.translate.instant('lang.templateAdded'));
+            /**
+             * check if the file with the extension that requires editing has not been edited before validation
+             * if so, display a warning message
+             */
+            if (this.mustEditFile) {
+                const dialogRef = this.dialog.open(AlertComponent,
+                    {
+                        panelClass: 'maarch-modal',
+                        autoFocus: false,
+                        disableClose: true,
+                        data: {
+                            title: this.translate.instant('lang.warning'),
+                            msg: this.translate.instant('lang.editDocFileDesc')
                         }
+                    });
+                dialogRef.afterClosed().pipe(
+                    filter((data: string) => data === 'ok'),
+                    tap(() => {
                     }),
                     catchError((err: any) => {
                         this.notify.handleSoftErrors(err);
@@ -566,27 +570,51 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy {
                     })
                 ).subscribe();
             } else {
-                this.http.put('../rest/templates/' + this.template.id, this.formatTemplate()).pipe(
-                    tap((data: any) => {
-                        if (!this.functionsService.empty(data) && data.checkEntities) {
-                            this.config = {
-                                panelClass: 'maarch-modal',
-                                data: {
-                                    entitiesList: data.checkEntities,
-                                    template_attachment_type: this.template.template_attachment_type
-                                }
-                            };
-                            this.dialogRef = this.dialog.open(TemplateAdministrationCheckEntitiesModalComponent, this.config);
-                        } else {
-                            this.router.navigate(['/administration/templates']);
-                            this.notify.success(this.translate.instant('lang.templateUpdated'));
-                        }
-                    }),
-                    catchError((err: any) => {
-                        this.notify.handleSoftErrors(err);
-                        return of(false);
-                    })
-                ).subscribe();
+                if (this.creationMode) {
+                    this.http.post('../rest/templates', this.formatTemplate()).pipe(
+                        tap((data: any) => {
+                            if (data.checkEntities) {
+                                this.config = {
+                                    panelClass: 'maarch-modal',
+                                    data: {
+                                        entitiesList: data.checkEntities,
+                                        template_attachment_type: this.template.template_attachment_type
+                                    }
+                                };
+                                this.dialog.open(TemplateAdministrationCheckEntitiesModalComponent, this.config);
+                            } else {
+                                this.router.navigate(['/administration/templates']);
+                                this.notify.success(this.translate.instant('lang.templateAdded'));
+                            }
+                        }),
+                        catchError((err: any) => {
+                            this.notify.handleSoftErrors(err);
+                            return of(false);
+                        })
+                    ).subscribe();
+                } else {
+                    this.http.put('../rest/templates/' + this.template.id, this.formatTemplate()).pipe(
+                        tap((data: any) => {
+                            if (!this.functionsService.empty(data) && data.checkEntities) {
+                                this.config = {
+                                    panelClass: 'maarch-modal',
+                                    data: {
+                                        entitiesList: data.checkEntities,
+                                        template_attachment_type: this.template.template_attachment_type
+                                    }
+                                };
+                                this.dialogRef = this.dialog.open(TemplateAdministrationCheckEntitiesModalComponent, this.config);
+                            } else {
+                                this.router.navigate(['/administration/templates']);
+                                this.notify.success(this.translate.instant('lang.templateUpdated'));
+                            }
+                        }),
+                        catchError((err: any) => {
+                            this.notify.handleSoftErrors(err);
+                            return of(false);
+                        })
+                    ).subscribe();
+                }
             }
         }