fix: notification array

frontend-park-mail-ru · Dec 21, 2024 · a30a06f · a30a06f
1 parent 948344a
commit a30a06f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/src/application/components/notification_list/notification_list.tsx b/src/application/components/notification_list/notification_list.tsx
@@ -14,28 +14,30 @@ export class NotificationList extends Component {
     const unreadNotifications = (this.props.notifications as Notification[]).filter(
       (notification) => !notification.isRead,
     );
+    const renderedNotifications = unreadNotifications.map((notification) => {
+      return (
+        <div
+          className="notification-list__notification"
+          onHover={() => {
+            const notificationManager = userStore.getData().notificationManager;
+            if (notificationManager) {
+              notificationManager.setNotificationRead(notification.id);
+            }
+          }}
+        >
+          <div className="notification-list__notification-text">
+            {notification.notificationText}
+          </div>
+          <div className="notification-list__createdAt">
+            {new Date(notification.createdAt).toLocaleDateString('ru-RU')}
+          </div>
+        </div>
+      );
+    });
     return (
       <div className={`${this.props.elementClass} notification-list`}>
-        {unreadNotifications.map((notification) => {
-          return (
-            <div
-              className="notification-list__notification"
-              onHover={() => {
-                const notificationManager = userStore.getData().notificationManager;
-                if (notificationManager) {
-                  notificationManager.setNotificationRead(notification.id);
-                }
-              }}
-            >
-              <div className="notification-list__notification-text">
-                {notification.notificationText}
-              </div>
-              <div className="notification-list__createdAt">
-                {new Date(notification.createdAt).toLocaleDateString('ru-RU')}
-              </div>
-            </div>
-          );
-        }) && (
+        {...renderedNotifications}
+        {renderedNotifications.length === 0 && (
           <div key="empty" className="notification-list__empty">
             Новых уведомлений нет
           </div>

diff --git a/src/application/stores/user_store/user_store.ts b/src/application/stores/user_store/user_store.ts
@@ -84,7 +84,7 @@ function userStoreReducer(state: UserData, action: Action) {
       const payload = action.payload as LoginActionPayload;
       let manager: NotificationManager;
       if (payload.userType === UserType.Employer) {
-        const manager = new NotificationManager(backendStore.getData().notificationsUrl.toString());
+        manager = new NotificationManager(backendStore.getData().notificationsUrl.toString());
         manager.establishConnection();
       }
       return {