Bug-Fix S52618186

frontend/angular/src/app/components/admin-portal/edit-message-template/edit-message-template.component.ts

@@ -424,8 +424,11 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
                 .subscribe(
                     data => {
                         this.utilsService.handleSuccess();
-
-                        if (this.templateCreationFromWorkflow()) {
+                        if (saveCopy && this.templateUpdateFromWorkflow()) {
+                            if (data.created.CLONED) {
+                                this.closeModal.emit(data.created.CLONED);
+                            }
+                        } else if (this.templateCreationFromWorkflow()) {
                             let id = this.messageTemplate.ObjectID;
 
                             if (data.created[id]) {
@@ -438,7 +441,6 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
                         } else {
                             this.router.navigate(['/admin/list-message-templates']);
                         }
-
                     },
                     error => {
                         this.showLoader = false;

frontend/angular/src/app/components/admin-portal/edit-workflow-template/edit-workflow-template.component.ts

@@ -430,11 +430,13 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
                         }
                     });
                 }
+                this.selectedMessageTemplate = null;
+                this.selectedTemplateID = null;
                 this.showLoader = false;
             });
-        }
-        this.selectedMessageTemplate = null;
+        } else {
             this.selectedTemplateID = null;
+        }
         this.displayNewMessageTemplate = false;
     }