2300fba4-043d-4bba-85ac-d1cf1a7d3c9f

Committed 10 Jul 2024 08:46AM UTC coverage: 92.965% (-0.06%) from 93.026%

Build # 2300fba4-043d-4bba-85ac-d1cf1a7d3c9f

Build Type

Pull #42

circleci

Committed by

Yvan-David

Commit Message

feat(notifications): Implement mark all Notifications as Read

- On click the button the notification pane should be empty
- The notifications pane should open up when a user clicks on the icon
- User can only see unread notifications

[Delivers #187364710]

Pull Request Pull Request #42: [#187364710] Marking all notifications as read

Run Details

405 of 481 branches covered (84.2%)

Branch coverage included in aggregate %.

13 of 13 new or added lines in 2 files covered. (100.0%)

1 existing line in 1 file now uncovered.

1141 of 1182 relevant lines covered (96.53%)

10.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

92.19

/src/views/NotificationPane.tsx

import { useEffect, useState } from "react";
import axiosClient from "../hooks/AxiosInstance";
import { toast } from "react-toastify";
import Modal from "react-modal";
import { FaTimes } from "react-icons/fa";
import noNotification from "../assets/images/no-notification.jpg";

//Modal.setAppElement('#root');
interface Notification {
  id: number;
  productId: string;
  userId: string;
  message: string;
  isRead: boolean;
  createdAt: string
}

interface ModalProps {
  open: boolean
  onClose: () => void;
}



const NotificationPane: React.FC<ModalProps> = ({ open, onClose }) => {
  const [notifications, setNotifications] = useState<Notification[]>([]);
  const [page, setPage] = useState(1);
  const [totalPages, setTotalPages] = useState(1);
  const [isLoading, setIsLoading] = useState<boolean>(false);
  const [isModalOpen, setIsModalOpen] = useState(false);
  const [allRead, setAllRead] = useState(false);
  const client = axiosClient();
  const notify = (message: string) => toast(message);

  const fetchNotifications = async (pageNumber: number) => {
    setIsLoading(true);
    try {
      const response = await client.get(`/notifications?page=${pageNumber}`);
      setNotifications(response.data.notifications);
      setTotalPages(response.data.pagination.totalPages);
      setAllRead(notifications.every((n: Notification) => n.isRead));
    } catch (err: any) {

    } finally {
      setIsLoading(false);
    }
  };
  const markAllAsRead = async () => {
    try {
      const response = await client.put("/notifications/all");
      if(response.status === 200){
        notify("All notifications marked as read");
        setAllRead(true)
      }
    } catch (err: any) {

    }
  };

  useEffect(() => {
    fetchNotifications(page);
  }, [page]);
  useEffect(() => {
    if (open) {
      setIsModalOpen(true);
    }
  }, [open]);

  const handleNextPage = () => {
    if (page < totalPages) {
      setPage(page + 1);
    }
  };

  const handlePrevPage = () => {
    if (page > 1) {
      setPage(page - 1);
    }
  };

  const closeModal = () => {
    setIsModalOpen(false);
    onClose()
  };
  return (
    <div className="relative p-4">
      <Modal
        isOpen={isModalOpen}
        onRequestClose={closeModal}
        contentLabel="Notifications"
        className="absolute top-0 left-0 right-0 bottom-0 m-auto bg-white p-8 rounded shadow-lg w-3/4 h-3/4 max-h-full overflow-auto"
        overlayClassName="fixed inset-0 bg-black bg-opacity-50"
      >
        <div className="flex flex-col h-full p-4 bg-chat_back">
          <h2 className="text-xl font-semibold mb-4">Notifications</h2>
          <div className="flex-1 overflow-y-auto rounded p-4">
            <ul className="space-y-4">
              {isLoading ? (
                <li className="text-center py-4">Loading...</li>
              ) : allRead ? (
                <li className="flex justify-center items-center py-4"><img src={noNotification} alt="No new notification" className="mx-auto" /></li>
              ): (
                notifications.map((notification, index) => (
                  <li
                    key={notification.id}
                    className={`p-3 rounded-lg flex items-start space-x-2 ${index % 2 === 0 ? 'bg-grayboro' : 'bg-gray-500'}`}
                  >
                    <div className="flex-1">
                      <div className="flex justify-between mb-1">
                        <span className="text-custom-size text-gray-500 self-end">
                          {new Date(notification.createdAt).toLocaleDateString()}{" "}
                          {new Date(notification.createdAt).toLocaleTimeString()}
                        </span>
                      </div>
                      <p className={`text-sm ${notification.isRead ? 'font-normal' : 'font-bold'}`}>
                        {notification.message}
                      </p>
                    </div>
                  </li>
                ))
              )}
            </ul>
          </div>
          <div className="flex justify-between mt-4">
            <button
              onClick={handlePrevPage}
              className={`bg-back_next text-white px-4 py-2 rounded ${page === 1 && "opacity-50 cursor-not-allowed"}`}
              disabled={page === 1}
              name='Back'
            >
              Back
            </button>
            <h4>Page {page}</h4>
            <button
              onClick={handleNextPage}
              className={`bg-back_next text-white px-4 py-2 rounded ${page === totalPages && "opacity-50 cursor-not-allowed"}`}
              disabled={page === totalPages}
               name='Next'
            >
              Next
            </button>
          </div>

          {!allRead && (
            <div className="flex justify-end mt-4">
              <button
                onClick={markAllAsRead}
                className="bg-green-800 text-white px-4 py-2 rounded"
                 name='Mark All as Read'
              >
                Mark All as Read
              </button>
            </div>
          )}
          <div className="absolute top-2 right-2 px-4 py-2 rounded">
            <FaTimes size={22} onClick={closeModal}  name='Close' data-testid="close-icon"/> 
          </div >
         
        </div>
      </Modal>
    </div>
  );
};

export default NotificationPane;

1	import { useEffect, useState } from "react";	5✔
2	import axiosClient from "../hooks/AxiosInstance";	5✔
3	import { toast } from "react-toastify";	5✔
4	import Modal from "react-modal";	5✔
5	import { FaTimes } from "react-icons/fa";	5✔
6	import noNotification from "../assets/images/no-notification.jpg";	5✔
7
8	//Modal.setAppElement('#root');
9	interface Notification {
10	id: number;
11	productId: string;
12	userId: string;
13	message: string;
14	isRead: boolean;
15	createdAt: string
16	}
17
18	interface ModalProps {
19	open: boolean
20	onClose: () => void;
21	}
22
23
24
25	const NotificationPane: React.FC<ModalProps> = ({ open, onClose }) => {	5✔
26	const [notifications, setNotifications] = useState<Notification[]>([]);	114✔
27	const [page, setPage] = useState(1);	114✔
28	const [totalPages, setTotalPages] = useState(1);	114✔
29	const [isLoading, setIsLoading] = useState<boolean>(false);	114✔
30	const [isModalOpen, setIsModalOpen] = useState(false);	114✔
31	const [allRead, setAllRead] = useState(false);	114✔
32	const client = axiosClient();	114✔
33	const notify = (message: string) => toast(message);	114✔
34
35	const fetchNotifications = async (pageNumber: number) => {	114✔
36	setIsLoading(true);	45✔
37	try {	45✔
38	const response = await client.get(`/notifications?page=${pageNumber}`);	45✔
39	setNotifications(response.data.notifications);	16✔
40	setTotalPages(response.data.pagination.totalPages);	14✔
41	setAllRead(notifications.every((n: Notification) => n.isRead));	14✔
42	} catch (err: any) {
43
44	} finally {
45	setIsLoading(false);	45✔
46	}
47	};
48	const markAllAsRead = async () => {	114✔
49	try {	2✔
50	const response = await client.put("/notifications/all");	2✔
51	if(response.status === 200){	2✔
52	notify("All notifications marked as read");	2✔
53	setAllRead(true)	2✔
54	}
55	} catch (err: any) {
56
57	}
58	};
59
60	useEffect(() => {	114✔
61	fetchNotifications(page);	45✔
62	}, [page]);
63	useEffect(() => {	114✔
64	if (open) {	44✔
65	setIsModalOpen(true);	16✔
66	}
67	}, [open]);
68
69	const handleNextPage = () => {	114✔
70	if (page < totalPages) {	2✔
71	setPage(page + 1);	2✔
72	}
73	};
74
75	const handlePrevPage = () => {	114✔
76	if (page > 1) {	1✔
77	setPage(page - 1);	1✔
78	}
79	};
80
81	const closeModal = () => {	114✔
82	setIsModalOpen(false);	1✔
83	onClose()	1✔
84	};
85	return (	114✔
86	<div className="relative p-4">
87	<Modal
88	isOpen={isModalOpen}
89	onRequestClose={closeModal}
90	contentLabel="Notifications"
91	className="absolute top-0 left-0 right-0 bottom-0 m-auto bg-white p-8 rounded shadow-lg w-3/4 h-3/4 max-h-full overflow-auto"
92	overlayClassName="fixed inset-0 bg-black bg-opacity-50"
93	>
94	<div className="flex flex-col h-full p-4 bg-chat_back">
95	<h2 className="text-xl font-semibold mb-4">Notifications</h2>
96	<div className="flex-1 overflow-y-auto rounded p-4">
97	<ul className="space-y-4">
98	{isLoading ? (	114✔
99	<li className="text-center py-4">Loading...</li>
100	) : allRead ? (	80✔
101	<li className="flex justify-center items-center py-4"><img src={noNotification} alt="No new notification" className="mx-auto" /></li>
102	): (
103	notifications.map((notification, index) => (
UNCOV 104	<li	×
105	key={notification.id}
106	className={`p-3 rounded-lg flex items-start space-x-2 ${index % 2 === 0 ? 'bg-grayboro' : 'bg-gray-500'}`}	×
107	>
108	<div className="flex-1">
109	<div className="flex justify-between mb-1">
110	<span className="text-custom-size text-gray-500 self-end">
111	{new Date(notification.createdAt).toLocaleDateString()}{" "}
112	{new Date(notification.createdAt).toLocaleTimeString()}
113	</span>
114	</div>
115	<p className={`text-sm ${notification.isRead ? 'font-normal' : 'font-bold'}`}>	×
116	{notification.message}
117	</p>
118	</div>
119	</li>
120	))
121	)}
122	</ul>
123	</div>
124	<div className="flex justify-between mt-4">
125	<button
126	onClick={handlePrevPage}
127	className={`bg-back_next text-white px-4 py-2 rounded ${page === 1 && "opacity-50 cursor-not-allowed"}`}	222✔
128	disabled={page === 1}
129	name='Back'
130	>
131	Back
132	</button>
133	<h4>Page {page}</h4>
134	<button
135	onClick={handleNextPage}
136	className={`bg-back_next text-white px-4 py-2 rounded ${page === totalPages && "opacity-50 cursor-not-allowed"}`}	221✔
137	disabled={page === totalPages}
138	name='Next'
139	>
140	Next
141	</button>
142	</div>
143
144	{!allRead && (	215✔
145	<div className="flex justify-end mt-4">
146	<button
147	onClick={markAllAsRead}
148	className="bg-green-800 text-white px-4 py-2 rounded"
149	name='Mark All as Read'
150	>
151	Mark All as Read
152	</button>
153	</div>
154	)}
155	<div className="absolute top-2 right-2 px-4 py-2 rounded">
156	<FaTimes size={22} onClick={closeModal} name='Close' data-testid="close-icon"/>
157	</div >
158
159	</div>
160	</Modal>
161	</div>
162	);
163	};
164
165	export default NotificationPane;	5✔

atlp-rwanda / e-commerce-bitcrafters-fn / 2300fba4-043d-4bba-85ac-d1cf1a7d3c9f

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous