From 794d996eac6ff8d5cd174bd73b6731806fe362e8 Mon Sep 17 00:00:00 2001
From: rohan09-raj <rajrohan1914@gmail.com>
Date: Fri, 26 Aug 2022 09:13:22 +0530
Subject: message modal and api fix

---
 .../EnrollmentRequests/EnrollmentRequests.jsx      | 39 ++++++++++++++++++----
 admin/src/pages/UpdateRequests/UpdateRequests.jsx  |  6 ++--
 admin/src/services/apiservice.js                   |  4 +--
 3 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'admin')

diff --git a/admin/src/pages/EnrollmentRequests/EnrollmentRequests.jsx b/admin/src/pages/EnrollmentRequests/EnrollmentRequests.jsx
index 4ae5a85..bd2b17b 100644
--- a/admin/src/pages/EnrollmentRequests/EnrollmentRequests.jsx
+++ b/admin/src/pages/EnrollmentRequests/EnrollmentRequests.jsx
@@ -11,17 +11,18 @@ import {useQuery, useMutation} from 'react-query';
 import {useNavigate} from 'react-router-dom';
 import BackButton from '../../components/BackButton/BackButton';
 import {sendMessage} from '../../services/apiservice';
+import Spinner from '../../components/Spinner/Spinner';
 
 import styles from './EnrollmentRequests.module.css';
+import MessageModal from '../../components/Modal/MessageModal';
 
 const EnrollmentRequests = () => {
   const navigate = useNavigate();
-  const {data, refetch} = useQuery('unverified', getUnverifiedUsers);
-  const deleteUse = useMutation((id) => deleteUser(id), {
-    onSuccess: () => {
-      refetch();
-    },
-  });
+  const [open, setOpen] = React.useState(false);
+  const [message, setMessage] = React.useState('');
+  const {data, refetch, isLoading} = useQuery('unverified', getUnverifiedUsers);
+
+  const deleteUse = useMutation((payload) => deleteUser(payload));
 
   const updateUse = useMutation((id) => updateUser(id, {verified: true}), {
     onSuccess: () => {
@@ -33,6 +34,23 @@ const EnrollmentRequests = () => {
     sendMessage(payload);
   });
 
+  const handleModalClick = (item) => {
+    deleteUse.mutate(item._id, {
+      onSuccess: () => {
+        setConfirm.mutate({
+          mobile: `+91${item.mobile}`,
+          message: message,
+        });
+        setOpen(false);
+        refetch();
+      },
+    });
+  };
+
+  if (isLoading) {
+    return <Spinner heading='Admin' />;
+  }
+
   return (
     <div className={styles.unverified_users}>
       <Header subheading='Admin' />
@@ -52,9 +70,16 @@ const EnrollmentRequests = () => {
                 title='Reject'
                 color='red'
                 onClick={() => {
-                  deleteUse.mutate(item._id);
+                  setOpen(true);
                 }}
               />
+              <MessageModal
+                title='Reason for Reject'
+                open={open}
+                setOpen={setOpen}
+                onChange={(e) => setMessage(e.target.value)}
+                onClick={() => handleModalClick(item)}
+              />
             </div>
           ))
         ) : (
diff --git a/admin/src/pages/UpdateRequests/UpdateRequests.jsx b/admin/src/pages/UpdateRequests/UpdateRequests.jsx
index 91629bd..7888e7f 100644
--- a/admin/src/pages/UpdateRequests/UpdateRequests.jsx
+++ b/admin/src/pages/UpdateRequests/UpdateRequests.jsx
@@ -4,7 +4,7 @@ import Button from '../../components/Button/Button';
 import Header from '../../components/Header/Header';
 import {
   deleteUser,
-  getUnverifiedUsers,
+  getUpdatingUsers,
   updateUser,
 } from '../../services/apiservice';
 import {useQuery, useMutation} from 'react-query';
@@ -16,8 +16,8 @@ import Spinner from '../../components/Spinner/Spinner';
 const UpdateRequests = () => {
   const navigate = useNavigate();
   const {data, isLoading, isError, refetch} = useQuery(
-    'unverified',
-    getUnverifiedUsers
+    'updating',
+    getUpdatingUsers
   );
   const deleteUse = useMutation((id) => deleteUser(id), {
     onSuccess: () => {
diff --git a/admin/src/services/apiservice.js b/admin/src/services/apiservice.js
index 2075239..d72a5fb 100644
--- a/admin/src/services/apiservice.js
+++ b/admin/src/services/apiservice.js
@@ -24,12 +24,12 @@ export const deleteUser = async (id) => {
   return response;
 };
 
-export const updatingUsers = async () => {
+export const getUpdatingUsers = async () => {
   const response = await apiClient.get(`/users/updating`);
   return response;
 };
 
 export const sendMessage = async (payload) => {
-  const response = await apiClient.post('/message', payload);
+  const response = await apiClient.post('/messages', payload);
   return response;
 };
-- 
cgit