manage family active task forward and back btn fixed
This commit was merged in pull request #229.
This commit is contained in:
@@ -11,6 +11,7 @@ export default function FamilyManage() {
|
|||||||
let location = useLocation();
|
let location = useLocation();
|
||||||
let navigate = useNavigate();
|
let navigate = useNavigate();
|
||||||
let accountDetails = location?.state;
|
let accountDetails = location?.state;
|
||||||
|
|
||||||
// tab handler
|
// tab handler
|
||||||
const filterHandler = (value) => {
|
const filterHandler = (value) => {
|
||||||
setValue(value);
|
setValue(value);
|
||||||
|
|||||||
@@ -172,6 +172,7 @@ export default function FamilyManageTabs({
|
|||||||
loader={details.familyTasks.loading}
|
loader={details.familyTasks.loading}
|
||||||
familyData={details.familyTasks.data}
|
familyData={details.familyTasks.data}
|
||||||
familyDetails={details.familyDetails.data}
|
familyDetails={details.familyDetails.data}
|
||||||
|
accountDetails={accountDetails}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{name === "Account" && (
|
{name === "Account" && (
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ModalCom from "../../Helpers/ModalCom";
|
|||||||
import Detail from "../../jobPopout/popoutcomponent/Detail";
|
import Detail from "../../jobPopout/popoutcomponent/Detail";
|
||||||
import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
|
import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
|
||||||
|
|
||||||
export default function FamilyTasks({ familyData, familyDetails, className, loader }) {
|
export default function FamilyTasks({ familyData, familyDetails, className, loader, accountDetails }) {
|
||||||
let navigate = useNavigate();
|
let navigate = useNavigate();
|
||||||
let { pathname } = useLocation();
|
let { pathname } = useLocation();
|
||||||
|
|
||||||
@@ -122,9 +122,8 @@ export default function FamilyTasks({ familyData, familyDetails, className, load
|
|||||||
state: {
|
state: {
|
||||||
...value,
|
...value,
|
||||||
pathname,
|
pathname,
|
||||||
dueDate,
|
accountDetails
|
||||||
thePrice,
|
}
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
|
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
|
||||||
|
|||||||
@@ -259,8 +259,13 @@ function ActiveJobs(props) {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
|
className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
|
||||||
onClick={() =>
|
onClick={() =>{
|
||||||
navigate(props.details.pathname, { replace: true })
|
if(props.details.pathname == '/manage-family'){
|
||||||
|
navigate(props.details.pathname, {state: { ...props.details.accountDetails }}, { replace: true })
|
||||||
|
}else{
|
||||||
|
navigate(props.details.pathname, { replace: true })
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<svg
|
<svg
|
||||||
|
|||||||
Reference in New Issue
Block a user