Duplicate "X" (Remove) Icon Appearing in Assign Task Popup
This commit is contained in:
parent
74f532799a
commit
88030dcf5a
@ -414,47 +414,46 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className="col-12 h-25 overflow-auto"
|
className="col-12 h-25 overflow-auto"
|
||||||
style={{ maxHeight: "200px" }}
|
style={{ maxHeight: "200px" }}
|
||||||
>
|
>
|
||||||
{watch("selectedEmployees")?.length > 0 && (
|
{watch("selectedEmployees")?.length > 0 && (
|
||||||
<div className="mt-1">
|
<div className="mt-1">
|
||||||
<div className="text-start px-2">
|
<div className="text-start px-2">
|
||||||
{watch("selectedEmployees")?.map((empId) => {
|
{watch("selectedEmployees")?.map((empId) => {
|
||||||
const emp = employees.find((emp) => emp.id === empId);
|
const emp = employees.find((emp) => emp.id === empId);
|
||||||
return (
|
return (
|
||||||
emp && (
|
emp && (
|
||||||
<span
|
<span
|
||||||
key={empId}
|
key={empId}
|
||||||
className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
|
className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
|
||||||
>
|
>
|
||||||
{emp.firstName} {emp.lastName}
|
{emp.firstName} {emp.lastName}
|
||||||
{/* Changed p tag to button for semantic correctness and accessibility */}
|
<p
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
className=" btn-close-white p-0 m-0"
|
||||||
className="btn-close btn-close-white ms-1" // Added ms-1 for spacing, removed p-0 m-0
|
aria-label="Close"
|
||||||
aria-label="Remove employee" // More descriptive aria-label
|
onClick={() => {
|
||||||
onClick={() => {
|
const updatedSelected = watch(
|
||||||
const updatedSelected = watch(
|
"selectedEmployees"
|
||||||
"selectedEmployees"
|
).filter((id) => id !== empId);
|
||||||
).filter((id) => id !== empId);
|
setValue(
|
||||||
setValue(
|
"selectedEmployees",
|
||||||
"selectedEmployees",
|
updatedSelected
|
||||||
updatedSelected
|
);
|
||||||
);
|
trigger("selectedEmployees");
|
||||||
trigger("selectedEmployees");
|
}}
|
||||||
}}
|
>
|
||||||
>
|
<i className="icon-base bx bx-x icon-md "></i>
|
||||||
<i className="icon-base bx bx-x icon-md"></i>
|
</p>
|
||||||
</button>
|
</span>
|
||||||
</span>
|
)
|
||||||
)
|
);
|
||||||
);
|
})}
|
||||||
})}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{!loading && errors.selectedEmployees && (
|
{!loading && errors.selectedEmployees && (
|
||||||
<div className="danger-text mt-1">
|
<div className="danger-text mt-1">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user