made group offer display when show offer to group is true

src/components/JobGroups/JobGroups.jsx

@@ -20,7 +20,7 @@ export default function JobGroups() {
         members: []
     })
 
-    const [selectedGroup, setSelectedGroup] = useState({id:'', data: []})
+    const [selectedGroup, setSelectedGroup] = useState({id:'', name:'', data: []})
 
     const changeSelectedGroup = (e) => {
         let groupID = e.target.value
@@ -42,10 +42,15 @@ export default function JobGroups() {
                 return
             }
             setGroupList({loading: false, groups: data.result_list, members: data.result_list_member})
-            let activeGroupId = data.result_list[0].group_id
-            let activeGroup = data.result_list[0].group_name
-            let activeMembers = data.result_list_member?.filter(item => item.group_id == activeGroupId)
-            setSelectedGroup({id: activeGroupId, name:activeGroup, data:activeMembers})
+            if(selectedGroup.id == ''){
+                let activeGroupId = data.result_list[0].group_id
+                let activeGroup = data.result_list[0].group_name
+                let activeMembers = data.result_list_member?.filter(item => item.group_id == activeGroupId)
+                setSelectedGroup({id: activeGroupId, name:activeGroup, data:activeMembers})
+            }else{
+                let activeMembers = data.result_list_member?.filter(item => item.group_id == selectedGroup?.id)
+                setSelectedGroup({id: selectedGroup?.id, name:selectedGroup?.name, data:activeMembers})
+            }
         }).catch(error => {
             setGroupList({loading: false, groups: [], members: []})
             console.log(error)

src/components/jobPopout/JobListPopout.jsx

@@ -25,6 +25,8 @@ const validationSchema = Yup.object().shape({
 function JobListPopout({ details, onClose, situation }) {
 const dispatch = useDispatch()
 
+const [requestStatus, setRequestStatus] = useState({message:'', status:false})
+
   const [familyList, setFamilyList] = useState([]);
   let [loader, setLoader] = useState({
     member: false,
@@ -96,7 +98,7 @@ const dispatch = useDispatch()
       else if (name === "individual")
         setErrMsg({ jobFields: { individual: "please enter email" } });
       else if (name === "group")
-        setErrMsg({ jobFields: { group: "please select a family member" } });
+        setErrMsg({ jobFields: { group: "please select a group" } });
     } finally {
       setTimeout(() => {
         setErrMsg({ jobFields: "" });
@@ -150,9 +152,12 @@ const dispatch = useDispatch()
       // for group input
       reqData = {
         ...jobReq,
-        email: values?.individual,
+        email: '',
+        group_id: values?.group,
         action: 13025,
-        assign_mode: 110033,
+        assign_mode: 110044,
+        duration: details?.timeline_days,
+        // duration: 0,
       };
       setLoader({ jobFields: { group: true } });
     } else {
@@ -161,17 +166,51 @@ const dispatch = useDispatch()
 
     try {
       const res = await apiCall.assignJobTask(reqData);
-      let { data } = await res;
-      setLoader({ jobFields: false });
+      let { status, data } = await res;
+      if(status != 200 || data.internal_return < 0){
+        setRequestStatus({message:'Unable to complete', status:false})
+        return setTimeout(()=>{
+          setRequestStatus({message:'', status:false})
+        },3000)
+      }
       dispatch(tableReload({ type: "JOBTABLE" }));
-      onClose();
-      throw new Response(data);
+      setRequestStatus({message:'Successful', status:true})
+      setTimeout(()=>{
+        setLoader({ jobFields: false });
+        onClose();
+        throw new Response(data);
+      },3000)
     } catch (error) {
-      setLoader({ jobFields: false });
-      throw new Error(error);
+      setRequestStatus({message:'Unable to complete', status:false})
+      setTimeout(()=>{
+        setRequestStatus({message:'', status:false})
+        setLoader({ jobFields: false });
+        throw new Error(error);
+      },3000)
     }
   };
 
+  const [groupList, setGroupList] = useState({loading: true, groups: [], members: []})
+
+  // FUNCTION TO POPULATE USER GROUP LIST
+  useEffect(()=>{
+    // setGroupList({loading: true, groups: [], members: []})
+    apiCall.jobGroupList({}).then(res => {
+        const {status, data} = res
+        if(status != 200 || data?.internal_return < 0){
+            setGroupList({loading: false, groups: [], members: []})
+            return
+        }
+        if(data.result_list.length < 0){
+            setGroupList({loading: false, groups: [], members: []})
+            return
+        }
+        setGroupList({loading: false, groups: data.result_list, members: data.result_list_member})
+    }).catch(error => {
+        setGroupList({loading: false, groups: [], members: []})
+    })
+},[])
+
   // console.log("Job List P >> ", details)
   return (
     <ModalCom action={onClose} situation={situation} className="job-popup">
@@ -246,6 +285,10 @@ const dispatch = useDispatch()
               />
               <p>{errMsg.deliveryDetail}</p>
             </div>
+
+            {requestStatus.message &&
+              <p className={`w-full text-lg ${requestStatus.status ? 'text-emerald-600' : 'text-red-600'}`}>{requestStatus.message}</p>
+            }
           </div>
 
           {/* ACTION SECTION */}
@@ -267,13 +310,13 @@ const dispatch = useDispatch()
                       data={familyList}
                       btnText="Assign to family"
                       optionText="Select Family"
-                      loader={loader?.jobFields.family}
+                      loader={loader?.jobFields?.family}
                       errorHandler={errorHandler}
                     />
                     <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
                       {" "}
-                      {props?.values.family === "" && (
-                        <span>{errMsg.jobFields.family}</span>
+                      {props?.values?.family === "" && (
+                        <span>{errMsg?.jobFields?.family}</span>
                       )}
                     </p>{" "}
                   </Form>
@@ -298,13 +341,13 @@ const dispatch = useDispatch()
                       data={publicArray}
                       btnText="Show Task to Public"
                       optionText="Select Duration"
-                      loader={loader?.jobFields.public}
+                      loader={loader?.jobFields?.public}
                       errorHandler={errorHandler}
                     />
                     <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
                       {" "}
                       {props?.values.public === "" && (
-                        <span>{errMsg.jobFields.public}</span>
+                        <span>{errMsg?.jobFields?.public}</span>
                       )}
                     </p>{" "}
                   </Form>
@@ -329,13 +372,13 @@ const dispatch = useDispatch()
                       placeholder="Enter email of individual"
                       inputHandler={props?.handleChange}
                       btnText="Send Offer to Individual"
-                      loader={loader?.jobFields.individual}
+                      loader={loader?.jobFields?.individual}
                       errorHandler={errorHandler}
                     />
                     <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
                       {" "}
                       {props?.values.individual === "" && (
-                        <span>{errMsg.jobFields.individual}</span>
+                        <span>{errMsg?.jobFields?.individual}</span>
                       )}
                     </p>{" "}
                   </Form>
@@ -359,14 +402,15 @@ const dispatch = useDispatch()
                       inputName="group"
                       value={props?.values.group}
                       btnText="Send Order to Group"
-                      optionText="Group"
-                      loader={loader?.jobFields.group}
+                      optionText="Select Group"
+                      loader={loader?.jobFields?.group}
                       errorHandler={errorHandler}
+                      data={groupList}
                     />
                     <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
                       {" "}
                       {props?.values.group === "" && (
-                        <span>{errMsg.jobFields.group}</span>
+                        <span>{errMsg?.jobFields?.group}</span>
                       )}
                     </p>
                   </Form>
@@ -427,27 +471,52 @@ const JobFieldInput = ({
                 className={`input-field placeholder:text-base text-dark-gray w-full h-full bg-white outline-none px-2`}
                 value={value}
               >
-                <option value="">{optionText}</option>
-                {Array.isArray(data) &&
-                  data?.map((item, idx) => (
-                    <React.Fragment key={idx}>
-                      {inputName === "family" && item?.last_login !== "" && (
-                        <option value={item?.family_uid} key={idx}>
-                          {`${item?.firstname} ${item?.lastname}`}
+                {/* <option value="">{optionText}</option> */}
+                {(inputName == 'family' || inputName == 'public') &&
+                  Array.isArray(data) &&
+                  <>
+                  <option value="">{optionText}</option>
+                   { data?.map((item, idx) => (
+                      <React.Fragment key={idx}>
+                        {inputName === "family" && item?.last_login !== "" && (
+                          <option value={item?.family_uid} key={idx}>
+                            {`${item?.firstname} ${item?.lastname}`}
+                          </option>
+                        )}
+                        {inputName === "public" && (
+                          <option value={item?.duration} key={idx}>
+                            {item?.name}
+                          </option>
+                        )}
+                        {/* {inputName === "group" && (
+                          <option value={item?.group_id} key={idx}>
+                            {item?.group_name}
+                          </option>
+                        )} */}
+                      </React.Fragment>
+                    ))}
+                  </>
+                }
+                {(inputName == 'group') && 
+                <>
+                  {data.loading ?
+                    <option value={''}>
+                      Loading...
+                    </option>
+                    : data?.groups?.length > 0 ?
+                    <>
+                      <option value="">{optionText}</option>
+                     { data?.groups?.map((item, index)=>(
+                        <option value={item?.group_id} key={index}>
+                          {item?.group_name}
                         </option>
-                      )}
-                      {inputName === "public" && (
-                        <option value={item?.duration} key={idx}>
-                          {item?.name}
-                        </option>
-                      )}
-                      {inputName === "group" && (
-                        <option value={item?.family_uid} key={idx}>
-                          {item?.firstname}
-                        </option>
-                      )}
-                    </React.Fragment>
-                  ))}
+                      ))}
+                    </>
+                    :
+                    <option value="">No Group Found</option>
+                  }
+                </>
+                }
               </Field>
             </div>
           </div>