1b3aeb03-0e16-4393-ac35-1c9dafa4614c

Committed 10 Jul 2024 09:02AM UTC coverage: 92.977% (-0.05%) from 93.026%

Build # 1b3aeb03-0e16-4393-ac35-1c9dafa4614c

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 %.

17 of 18 new or added lines in 2 files covered. (94.44%)

1 existing line in 1 file now uncovered.

1144 of 1185 relevant lines covered (96.54%)

10.32 hits per line

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

92.54

/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 ===true)));
      console.log(response)
    } catch (err: any) {
      notify("failed to fetch notifications");
    } 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()
  };
  console.log(allRead)
  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 ===true)));	14✔
42	console.log(response)	14✔
43	} catch (err: any) {
44	notify("failed to fetch notifications");	31✔
45	} finally {
46	setIsLoading(false);	45✔
47	}
48	};
49	const markAllAsRead = async () => {	114✔
50	try {	2✔
51	const response = await client.put("/notifications/all");	2✔
52	if(response.status === 200){	2✔
53	notify("All notifications marked as read");	2✔
54	setAllRead(true)	2✔
55	}
56	} catch (err: any) {
57
58	}
59	};
60
61	useEffect(() => {	114✔
62	fetchNotifications(page);	45✔
63	}, [page]);
64	useEffect(() => {	114✔
65	if (open) {	44✔
66	setIsModalOpen(true);	16✔
67	}
68	}, [open]);
69
70	const handleNextPage = () => {	114✔
71	if (page < totalPages) {	2✔
72	setPage(page + 1);	2✔
73	}
74	};
75
76	const handlePrevPage = () => {	114✔
77	if (page > 1) {	1✔
78	setPage(page - 1);	1✔
79	}
80	};
81
82	const closeModal = () => {	114✔
83	setIsModalOpen(false);	1✔
84	onClose()	1✔
85	};
86	console.log(allRead)	114✔
87	return (	114✔
88	<div className="relative p-4">
89	<Modal
90	isOpen={isModalOpen}
91	onRequestClose={closeModal}
92	contentLabel="Notifications"
93	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"
94	overlayClassName="fixed inset-0 bg-black bg-opacity-50"
95	>
96	<div className="flex flex-col h-full p-4 bg-chat_back">
97	<h2 className="text-xl font-semibold mb-4">Notifications</h2>
98	<div className="flex-1 overflow-y-auto rounded p-4">
99	<ul className="space-y-4">
100	{isLoading ? (	114✔
101	<li className="text-center py-4">Loading...</li>
102	) : allRead ? (	80✔
103	<li className="flex justify-center items-center py-4"><img src={noNotification} alt="No new notification" className="mx-auto" /></li>
104	): (
105	notifications.map((notification, index) => (
NEW UNCOV 106	<li	×
107	key={notification.id}
108	className={`p-3 rounded-lg flex items-start space-x-2 ${index % 2 === 0 ? 'bg-grayboro' : 'bg-gray-500'}`}	×
109	>
110	<div className="flex-1">
111	<div className="flex justify-between mb-1">
112	<span className="text-custom-size text-gray-500 self-end">
113	{new Date(notification.createdAt).toLocaleDateString()}{" "}
114	{new Date(notification.createdAt).toLocaleTimeString()}
115	</span>
116	</div>
117	<p className={`text-sm ${notification.isRead ? 'font-normal' : 'font-bold'}`}>	×
118	{notification.message}
119	</p>
120	</div>
121	</li>
122	))
123	)}
124	</ul>
125	</div>
126	<div className="flex justify-between mt-4">
127	<button
128	onClick={handlePrevPage}
129	className={`bg-back_next text-white px-4 py-2 rounded ${page === 1 && "opacity-50 cursor-not-allowed"}`}	222✔
130	disabled={page === 1}
131	name='Back'
132	>
133	Back
134	</button>
135	<h4>Page {page}</h4>
136	<button
137	onClick={handleNextPage}
138	className={`bg-back_next text-white px-4 py-2 rounded ${page === totalPages && "opacity-50 cursor-not-allowed"}`}	221✔
139	disabled={page === totalPages}
140	name='Next'
141	>
142	Next
143	</button>
144	</div>
145
146	{!allRead && (	215✔
147	<div className="flex justify-end mt-4">
148	<button
149	onClick={markAllAsRead}
150	className="bg-green-800 text-white px-4 py-2 rounded"
151	name='Mark All as Read'
152	>
153	Mark All as Read
154	</button>
155	</div>
156	)}
157	<div className="absolute top-2 right-2 px-4 py-2 rounded">
158	<FaTimes size={22} onClick={closeModal} name='Close' data-testid="close-icon"/>
159	</div >
160
161	</div>
162	</Modal>
163	</div>
164	);
165	};
166
167	export default NotificationPane;	5✔

atlp-rwanda / e-commerce-bitcrafters-fn / 1b3aeb03-0e16-4393-ac35-1c9dafa4614c

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