From 08d61e9a925114680a126063555bb35cdf11a7ef Mon Sep 17 00:00:00 2001
From: Artem Niehrieiev <r.tem@tuta.io>
Date: Tue, 10 Jun 2025 11:38:33 +0000
Subject: [PATCH] fix: update email content generation for action notifications

---
 .../public/email-templates/action-email-activation.njk   | 2 +-
 backend/src/entities/email/email/email.service.ts        | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/backend/public/email-templates/action-email-activation.njk b/backend/public/email-templates/action-email-activation.njk
index 3cff7f318..0ef8aa07f 100644
--- a/backend/public/email-templates/action-email-activation.njk
+++ b/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>
diff --git a/backend/src/entities/email/email/email.service.ts b/backend/src/entities/email/email/email.service.ts
index 007fc5545..27e53617f 100644
--- a/backend/src/entities/email/email/email.service.ts
+++ b/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);