Added assign popup dropdown, fixed the right api for my task page

This commit was merged in pull request #636.
This commit is contained in:
2024-03-11 18:15:31 +01:00
parent 00c7f65092
commit 4f675b30ef
6 changed files with 89 additions and 41 deletions
+10 -2
View File
@@ -3,6 +3,7 @@ import { apiConst } from "../../lib/apiConst";
import usersService from "../../services/UsersService";
import LoadingSpinner from "../Spinners/LoadingSpinner";
import AssignTaskPopout from "./FamilyPopout/AssignTaskPopout";
import { useLocation } from "react-router-dom";
// Lazy Imports for components
const FamilyWaitlist = lazy(() => import("./Tabs/FamilyNewWaitlist"));
@@ -10,12 +11,17 @@ const FamilyTasks = lazy(() => import("./Tabs/FamilyNewTasks"));
const FamilyPending = lazy(() => import("./Tabs/FamilyNewPending"));
export default function FamilyTableNew() {
let { pathname } = useLocation();
// Initial state for family details
const initialDetailState = {
loading: false,
data: null,
link: "",
};
const [assignTaskChecker, setAssignTaskChecker] = useState(false);
// console.log('accountDetails',accountDetails)
// State for family details, tasks, waitlist, and pending
const [details, setDetails] = useState({
@@ -80,6 +86,7 @@ export default function FamilyTableNew() {
loader={details.familyTasks.loading}
familyData={details.familyTasks.data}
action={familyPopUpHandler}
setAssignTaskChecker={setAssignTaskChecker}
/>
),
Waiting: (
@@ -120,7 +127,7 @@ export default function FamilyTableNew() {
const [familyTasksData, familyWaitingRes, familyPendingRes] =
await Promise.all([
apiCall.getMyActiveTaskList(),
apiCall.getMyActiveJobList(),
apiCall.ManageFamilyNewWaitlist(),
apiCall.ManageFamilyPending(),
]);
@@ -269,8 +276,9 @@ export default function FamilyTableNew() {
setFamilyTask={setFamilyTask}
setActiveTask={setActiveTask}
activeTask={activeTask}
// familyDetailsData={details.familyDetails.data}
setUpdatePage={setUpdatePage}
pathname={pathname}
assignTaskChecker={assignTaskChecker}
/>
)}
</div>