From 6d51fdfc19d89a281bca838888c17607211305b8 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Sat, 17 Jun 2023 06:33:08 +0100
Subject: [PATCH] popup closes

---
 src/components/AddJob/AddJob.jsx | 27 ++++++---------------------
 src/views/AddJobPage.jsx         |  2 +-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/components/AddJob/AddJob.jsx b/src/components/AddJob/AddJob.jsx
index 1a64d38..2930858 100644
--- a/src/components/AddJob/AddJob.jsx
+++ b/src/components/AddJob/AddJob.jsx
@@ -1,12 +1,12 @@
 import React, { useState, useEffect } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import usersService from "../../services/UsersService";
 
 import { useSelector, useDispatch } from "react-redux";
 
-import { tableReload } from '../../store/TableReloads'
+import { tableReload } from "../../store/TableReloads";
 
 import { Field, Form, Formik } from "formik";
 import * as Yup from "yup";
@@ -38,16 +38,12 @@ const validationSchema = Yup.object().shape({
     .required("Timeline is required"),
 });
 
-function AddJob({popUpHandler}) {
+function AddJob({ popUpHandler }) {
   const ApiCall = new usersService();
-  const navigate = useNavigate();
-
-  let dispatch = useDispatch()
+  let dispatch = useDispatch();
 
   let { userDetails } = useSelector((state) => state.userDetails);
 
-  // let [pageLoading, setPageLoading] = useState(true); // State used for knowing when the page is mounting
-
   let [country, setCountry] = useState({
     loading: true,
     status: false,
@@ -109,8 +105,8 @@ function AddJob({popUpHandler}) {
           message: "Job Added Successfully",
         });
         setTimeout(() => {
-          dispatch(tableReload({type:'JOBTABLE'}))
-          navigate("/myjobs", { replace: true });
+          dispatch(tableReload({ type: "JOBTABLE" }));
+          popUpHandler()
         }, 1000);
       })
       .catch((err) => {
@@ -141,9 +137,6 @@ function AddJob({popUpHandler}) {
         {(props) => {
           return (
             <Form>
-              {/* <h1 className="py-2 my-4 text-lg md:text-xl font-bold tracking-wide">
-                Create New Job
-              </h1> */}
               <div className="flex flex-col-reverse sm:flex-row">
                 <div className="fields w-full">
                   {/* inputs starts here */}
@@ -400,11 +393,3 @@ const publicArray = [
   { duration: 21, name: "3 weeks" },
   { duration: 28, name: "4 weeks" },
 ];
-
-// pageLoading.loading ? (
-//   <div className="personal-info-tab w-full flex flex-col justify-between">
-//     <div className="p-3">
-//       <LoadingSpinner size="32" color="sky-blue" />
-//     </div>
-//   </div>
-// ) : 
diff --git a/src/views/AddJobPage.jsx b/src/views/AddJobPage.jsx
index 6031cbb..64660a5 100644
--- a/src/views/AddJobPage.jsx
+++ b/src/views/AddJobPage.jsx
@@ -31,7 +31,7 @@ function AddJobPage({ action, situation }) {
             </svg>
           </button>
         </div>
-        <AddJob popUpHandler={situation} />
+        <AddJob popUpHandler={action} />
       </div>
     </ModalCom>
   );