admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 +28 -43
1 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa5998bc11 - Show all commits

41
src/components/Project/AboutProject.jsx
View File

@ -1,17 +1,17 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import moment from "moment"; import moment from "moment";
import { getProjectStatusName } from "../../utils/projectStatus"; import { getProjectStatusName } from "../../utils/projectStatus";
import {useProjectDetails, useUpdateProject} from "../../hooks/useProjects"; import { useProjectDetails, useUpdateProject } from "../../hooks/useProjects";
import { useSelector } from "react-redux"; // Import useSelector import { useSelector } from "react-redux"; // Import useSelector
import {useHasUserPermission} from "../../hooks/useHasUserPermission"; import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import {MANAGE_PROJECT} from "../../utils/constants"; import { MANAGE_PROJECT } from "../../utils/constants";
import GlobalModel from "../common/GlobalModel"; import GlobalModel from "../common/GlobalModel";
import ManageProjectInfo from "./ManageProjectInfo"; import ManageProjectInfo from "./ManageProjectInfo";
import {useQueryClient} from "@tanstack/react-query"; import { useQueryClient } from "@tanstack/react-query";
const AboutProject = () => { const AboutProject = () => {
const [IsOpenModal, setIsOpenModal] = useState(false); const [IsOpenModal, setIsOpenModal] = useState(false);
const {mutate: UpdateProjectDetails, isPending} = useUpdateProject({ const { mutate: UpdateProjectDetails, isPending } = useUpdateProject({
onSuccessCallback: () => { onSuccessCallback: () => {
setIsOpenModal(false); setIsOpenModal(false);
} }
@ -22,11 +22,11 @@ const AboutProject = () => {
const projectId = useSelector((store) => store.localVariables.projectId); const projectId = useSelector((store) => store.localVariables.projectId);
const manageProject = useHasUserPermission(MANAGE_PROJECT); const manageProject = useHasUserPermission(MANAGE_PROJECT);
const {projects_Details, isLoading, error,refetch} = useProjectDetails( projectId ); // Pass projectId from useSelector const { projects_Details, isLoading, error, refetch } = useProjectDetails(projectId); // Pass projectId from useSelector
const handleFormSubmit = ( updatedProject ) => { const handleFormSubmit = (updatedProject) => {
if ( projects_Details?.id ) { if (projects_Details?.id) {
UpdateProjectDetails({ projectId: projects_Details?.id,updatedData: updatedProject }); UpdateProjectDetails({ projectId: projects_Details?.id, updatedData: updatedProject });
// The refetch here might be redundant or could be handled by react-query's invalidateQueries // The refetch here might be redundant or could be handled by react-query's invalidateQueries
// if UpdateProjectDetails properly invalidates the 'projectDetails' query key. // if UpdateProjectDetails properly invalidates the 'projectDetails' query key.
// If refetch is still needed, consider adding a delay or using onSuccess of UpdateProjectDetails. // If refetch is still needed, consider adding a delay or using onSuccess of UpdateProjectDetails.
@ -38,11 +38,11 @@ const AboutProject = () => {
return ( return (
<> <>
{IsOpenModal && ( {IsOpenModal && (
<GlobalModel isOpen={IsOpenModal} closeModal={()=>setIsOpenModal(false)}> <GlobalModel isOpen={IsOpenModal} closeModal={() => setIsOpenModal(false)}>
<ManageProjectInfo <ManageProjectInfo
project={projects_Details} project={projects_Details}
handleSubmitForm={handleFormSubmit} handleSubmitForm={handleFormSubmit}
onClose={() => setIsOpenModal( false )} onClose={() => setIsOpenModal(false)}
isPending={isPending} isPending={isPending}
/> />
</GlobalModel> </GlobalModel>
@ -140,24 +140,9 @@ const AboutProject = () => {
</li> </li>
</ul> </ul>
</div>
</div>
<li className="d-flex justify-content-center mt-4"> {/* Added mt-4 for some top margin */}
{manageProject && (
<button
type="button"
className={`btn btn-sm btn-primary ${!manageProject && "d-none"
}`}
data-bs-toggle="modal"
data-bs-target="#edit-project-modal"
onClick={() => setIsOpenModal(true)}
>
Modify Details
</button>
)}
</li>
</ul>
</div>
</div>
</> </>
)} )}