Email preview with default body when not customized

Firestitch · Aug 25, 2023 · b846970 · b846970
1 parent 0325f8e
commit b846970
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@firestitch/app-message",
   "title": "Admin",
   "description": "@firestitch/admin",
-  "version": "12.7.4",
+  "version": "12.7.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/Firestitch/ngx-admin"

diff --git a/src/app/modules/messages/components/message/message.component.html b/src/app/modules/messages/components/message/message.component.html
@@ -99,13 +99,13 @@
               <div fxLayout="row" fxLayoutGap="10px">
                 <mat-form-field>
                   <mat-select
-                    required
-                    placeholder="Customize Message"
-                    [(ngModel)]="message.emailMessage.customize"
-                    name="customizeEmail">
-                      <mat-option [value]="true">Yes</mat-option>
-                      <mat-option [value]="false">No</mat-option>
-                    </mat-select>
+                      required
+                      placeholder="Customize Message"
+                      [(ngModel)]="message.emailMessage.customize"
+                      name="customizeEmail">
+                    <mat-option [value]="true">Yes</mat-option>
+                    <mat-option [value]="false">No</mat-option>
+                  </mat-select>
                 </mat-form-field>
                 <mat-form-field>
                   <mat-select

diff --git a/src/app/modules/messages/components/message/message.component.ts b/src/app/modules/messages/components/message/message.component.ts
@@ -76,13 +76,14 @@ export class MessageComponent implements OnInit {
   }
 
   public openPreview(): void {
-    let html = this.message.emailMessage.body;
-    let styles = this.message.emailMessage.styles;
+    const emailMessage = this.message.emailMessage;
+    let html = emailMessage.customize ? emailMessage.body : this.message.defaultEmailBody;
+    let styles = emailMessage.styles;
 
-    if (this.message.emailMessage.messageTemplateId) {
+    if (emailMessage.messageTemplateId) {
       const messageTemplate = this.messageTemplates
         .find((item) => {
-          return this.message.emailMessage.messageTemplateId === item.id;
+          return emailMessage.messageTemplateId === item.id;
         });
 
       if (messageTemplate) {