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

pramod_Bug#361 : conditionally render Actions column based on permissions and project status #167

Merged
vikas.nale merged 1 commits from pramod_Bug-#361 into Issue_Jun_1W 2025-05-31 12:28:19 +00:00
Conversation 0 Commits 1 Files Changed 2 +113 -92
2 changed files with 113 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/Project/Infrastructure/WorkArea.jsx
View File

@ -6,11 +6,20 @@ import { useDispatch } from "react-redux";
import { refreshData } from "../../../slices/localVariablesSlice";
import ProjectRepository from "../../../repositories/ProjectRepository";
import showToast from "../../../services/toastService";
import {useHasUserPermission} from "../../../hooks/useHasUserPermission";
import {ASSIGN_REPORT_TASK, MANAGE_PROJECT_INFRA, MANAGE_TASK} from "../../../utils/constants";
import {useParams} from "react-router-dom";
const WorkArea = ({ workArea, floor, forBuilding }) => {
const [workItems, setWorkItems] = useState([]);
const dispatch = useDispatch();
const [ Project, setProject ] = useState();
const {projectId} = useParams();
const ManageTasks = useHasUserPermission(MANAGE_TASK);
const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
const ManageAndAssignTak = useHasUserPermission( ASSIGN_REPORT_TASK );
useEffect(() => {
const project = getCachedData("projectInfo");
@ -170,7 +179,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
className="accordion-collapse collapse"
aria-labelledby={`heading-${workArea.id}`}
>
<div className="accordion-body p-0">
<div className="accordion-body px-1">
<table className="table table-sm mx-1">
<thead>
<tr>
@ -189,9 +198,11 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
<th className="infra-activity-table-header">
Progress
</th>
{( ManageInfra || ( !projectId && ManageAndAssignTak ) ) && (
<th className="infra-activity-table-header text-end">
<span className="px-2">Actions</span>
</th>
)}
</tr>
</thead>
<tbody className="table-border-bottom-0">

30
src/components/Project/Infrastructure/WorkItem.jsx
View File

@ -178,15 +178,17 @@ const WorkItem = ({
</td>
<td className="text-center d-none d-md-table-cell">
{hasWorkItem ? (
`${NewWorkItem?.workItem?.completedWork ??
{hasWorkItem
? `${
NewWorkItem?.workItem?.completedWork ??
workItem?.completedWork ??
"0"}/${NewWorkItem?.workItem?.plannedWork ??
"0"
}/${
NewWorkItem?.workItem?.plannedWork ??
workItem?.plannedWork ??
"0"}`
) : (
"NA"
)}
"0"
}`
: "NA"}
</td>
{/* Progress Bar - always visible */}
@ -217,7 +219,11 @@ const WorkItem = ({
</td>
{/* Actions - always visible */}
<td className="text-end align-items-middle ">
{(ManageInfra ||
(!projectId &&
ManageAndAssignTak &&
PlannedWork !== CompletedWork)) && (
<td className="text-end align-items-middle border-top">
{/* Desktop (md and up): inline icons */}
<div className="d-none d-md-flex justify-content-end gap-1 px-2">
{!projectId &&
@ -260,13 +266,16 @@ const WorkItem = ({
></i>
<ul className="dropdown-menu dropdown-menu-start">
{!projectId && ManageAndAssignTak && PlannedWork !== CompletedWork && (
{!projectId &&
ManageAndAssignTak &&
PlannedWork !== CompletedWork && (
<li>
<a
className="dropdown-item d-flex align-items-center"
onClick={openModal}
>
<i className="bx bx-user-plus text-primary me-2"></i> Assign
<i className="bx bx-user-plus text-primary me-2"></i>{" "}
Assign
</a>
</li>
)}
@ -293,6 +302,7 @@ const WorkItem = ({
</ul>
</div>
</td>
)}
</tr>
</>
);