From dafb0458f0f108ef5f226b9b84285681e66919a8 Mon Sep 17 00:00:00 2001
From: SolMon9099 <pmomo9099@gmail.com>
Date: Mon, 23 Dec 2024 21:50:02 +0800
Subject: [PATCH] Fix bug

---
 backend/api/views/announcement.py             |  6 +++-
 .../src/components/UpdateAnnouncementModal.js |  3 +-
 .../src/components/pages/AdminAnnouncement.js | 20 +++++++------
 .../src/components/pages/Announcements.js     | 28 ++++++++-----------
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/backend/api/views/announcement.py b/backend/api/views/announcement.py
index 2934e682b..5f781395f 100644
--- a/backend/api/views/announcement.py
+++ b/backend/api/views/announcement.py
@@ -199,7 +199,11 @@ def new_announce(role):
             for recipient in recipients:
                 res, res_msg = send_email(
                     recipient=recipient.email,
-                    data={"link": target_url, "title": announce.name},
+                    data={
+                        "link": target_url,
+                        "title": announce.name,
+                        "subject": "New Announcement",
+                    },
                     template_id=NEW_ANNOUNCE_TEMPLATE,
                 )
                 if not res:
diff --git a/frontend/src/components/UpdateAnnouncementModal.js b/frontend/src/components/UpdateAnnouncementModal.js
index c2e74ecc1..cde88d0b7 100644
--- a/frontend/src/components/UpdateAnnouncementModal.js
+++ b/frontend/src/components/UpdateAnnouncementModal.js
@@ -78,6 +78,7 @@ function UpdateAnnouncementModal({
       );
     } else {
       setImage(null);
+      form.setFieldValue("send_notification", true);
     }
   }, [open, currentAnnounce]);
 
@@ -136,7 +137,7 @@ function UpdateAnnouncementModal({
             name="send_notification"
             valuePropName="checked"
           >
-            <Checkbox>Send Notification</Checkbox>
+            <Checkbox defaultChecked>Send Notification</Checkbox>
           </Form.Item>
         )}
         <Form.Item
diff --git a/frontend/src/components/pages/AdminAnnouncement.js b/frontend/src/components/pages/AdminAnnouncement.js
index a212b4964..a936afd89 100644
--- a/frontend/src/components/pages/AdminAnnouncement.js
+++ b/frontend/src/components/pages/AdminAnnouncement.js
@@ -231,13 +231,15 @@ const AdminAnnouncement = () => {
       dataIndex: "file_name",
       key: "file_name",
       render: (file_name, record) => {
-        return (
-          <AdminDownloadDropdown
-            options={getAvailableLangs(record)}
-            title={file_name}
-            onClick={(lang) => handleAnnounceDownload(record, lang)}
-          />
-        );
+        if (file_name && file_name !== "") {
+          return (
+            <AdminDownloadDropdown
+              options={getAvailableLangs(record)}
+              title={file_name}
+              onClick={(lang) => handleAnnounceDownload(record, lang)}
+            />
+          );
+        }
       },
     },
     {
@@ -245,7 +247,9 @@ const AdminAnnouncement = () => {
       dataIndex: "image",
       key: "image",
       render: (image) => {
-        return <img style={{ maxHeight: "50px" }} src={image.url} alt="" />;
+        if (image) {
+          return <img style={{ maxHeight: "50px" }} src={image.url} alt="" />;
+        }
       },
     },
     {
diff --git a/frontend/src/components/pages/Announcements.js b/frontend/src/components/pages/Announcements.js
index 159f8398b..cdac4d53c 100644
--- a/frontend/src/components/pages/Announcements.js
+++ b/frontend/src/components/pages/Announcements.js
@@ -76,14 +76,6 @@ function Announcements() {
     });
   };
 
-  function truncate(str, maxLength) {
-    return str.length > maxLength ? (
-      <Tooltip title={str}> {str.substring(0, maxLength - 3) + "..."} </Tooltip>
-    ) : (
-      str
-    );
-  }
-
   const getFilterForm = () => (
     <>
       <Title
@@ -146,13 +138,15 @@ function Announcements() {
       dataIndex: "file_name",
       key: "file_name",
       render: (file_name, record) => {
-        return (
-          <AdminDownloadDropdown
-            options={getAvailableLangs(record)}
-            title={file_name}
-            onClick={(lang) => handleAnnounceDownload(record, lang)}
-          />
-        );
+        if (file_name && file_name !== "") {
+          return (
+            <AdminDownloadDropdown
+              options={getAvailableLangs(record)}
+              title={file_name}
+              onClick={(lang) => handleAnnounceDownload(record, lang)}
+            />
+          );
+        }
       },
     },
     {
@@ -160,7 +154,9 @@ function Announcements() {
       dataIndex: "image",
       key: "image",
       render: (image) => {
-        return <img style={{ maxHeight: "50px" }} src={image.url} alt="" />;
+        if (image) {
+          return <img style={{ maxHeight: "50px" }} src={image.url} alt="" />;
+        }
       },
     },
     {