Merge pull request #1206 from rocket-admin/backend_action_email_template_fix

fix: update email content generation for action notifications

Author: Artuomka

backend/public/email-templates/action-email-activation.njk

@@ -98,7 +98,7 @@ table[class=body] .article {
                     </tr>
                     <tr>
                       <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">
-                        <p style="font-size: 18px; font-weight: normal; margin: 0; margin-bottom: 15px;">{{ textContent }}</p>
+                        <p style="font-size: 18px; font-weight: normal; margin: 0; margin-bottom: 15px;">{{ textContent | replace(' Primary Keys: ' ~ primaryKeysValuesStr, '') | trim }}</p>
                         <p style="font-size: 18px; font-weight: normal; margin: 0; margin-bottom: 15px;">Primary Keys: {{ primaryKeysValuesStr }}</p>
                       </td>
                     </tr>

backend/src/entities/email/email/email.service.ts

@@ -56,12 +56,7 @@ export class EmailService {
           : triggerOperation === TableActionEventEnum.DELETE_ROW
             ? 'deleted a row'
             : 'performed an action';
-    const textContent = EMAIL_TEXT.ACTION_EMAIL.EMAIL_TEXT(
-      userInfo,
-      triggerOperation,
-      tableName,
-      primaryKeyValuesArray,
-    );
+    const textContent = EMAIL_TEXT.ACTION_EMAIL.EMAIL_TEXT(userInfo, action, tableName, primaryKeyValuesArray);
 
     const primaryKeysValuesStr = JSON.stringify(primaryKeyValuesArray);
     const letterContent: IMessage = {
@@ -76,6 +71,8 @@ export class EmailService {
         action,
         primaryKeysValuesStr,
         currentYear,
+        textContent,
+        primaryKeyValuesArray,
       }),
     };
     return await this.sendEmailToUser(letterContent);