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

Merge pull request '"Directory filter popup closes on 'Clear' button click – it should remain open"' (#219) from Kartik_Bug#613 into Issues_Jun_3W

Browse Source 
Reviewed-on: #219
This commit is contained in:
Vikas Nale 2025-06-30 06:38:51 +00:00
commit a1b45c341a
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pages/Directory/DirectoryPageHeader.jsx
View File

@ -289,14 +289,13 @@ const DirectoryPageHeader = ({
{/* Filter by funnel icon for Notes view */} {/* Filter by funnel icon for Notes view */}
{viewType === "notes" && ( {viewType === "notes" && (
<div className="dropdown" style={{ width: "fit-content", minWidth: "400px" }}> {/* Added minWidth here */} <div className="dropdown" style={{ width: "fit-content", minWidth: "400px" }}>
<a <a
className="dropdown-toggle hide-arrow cursor-pointer d-flex align-items-center position-relative" className="dropdown-toggle hide-arrow cursor-pointer d-flex align-items-center position-relative"
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" aria-expanded="false"
> >
<i className={`fa-solid fa-filter ms-1 fs-5 ${selectedCreators.length > 0 || selectedOrgs.length > 0 ? "text-primary" : "text-muted"}`}></i> <i className={`fa-solid fa-filter ms-1 fs-5 ${selectedCreators.length > 0 || selectedOrgs.length > 0 ? "text-primary" : "text-muted"}`}></i>
{/* Removed the numerical badge for notes filter */}
</a> </a>
<div <div
@ -329,9 +328,6 @@ const DirectoryPageHeader = ({
))} ))}
</div> </div>
{/* Divider */}
{/* <div style={{ width: "1px", backgroundColor: "#dee2e6", margin: "0 12px" }}></div> */}
{/* Organization */} {/* Organization */}
<div className="ps-3" style={{ flex: 1 }}> <div className="ps-3" style={{ flex: 1 }}>
<p className="text-muted mb-1">Organization</p> <p className="text-muted mb-1">Organization</p>
@ -353,10 +349,11 @@ const DirectoryPageHeader = ({
</div> </div>
{/* Buttons */} {/* Buttons */}
<div className="d-flex justify-content-between mt-3"> <div className="d-flex justify-content-end gap-2 mt-1">
<button <button
className="btn btn-sm btn-outline-danger" className="btn btn-xs btn-secondary"
onClick={() => { onClick={(e) => {
// e.stopPropagation();
setSelectedCreators([]); setSelectedCreators([]);
setSelectedOrgs([]); setSelectedOrgs([]);
setFilteredOrganizations(allOrganizations); setFilteredOrganizations(allOrganizations);
@ -365,7 +362,12 @@ const DirectoryPageHeader = ({
> >
Clear Clear
</button> </button>
<button className="btn btn-sm btn-primary" onClick={applyCombinedFilter}> <button
className="btn btn-xs btn-primary"
onClick={(e) => {
applyCombinedFilter();
}}
>
Apply Filter Apply Filter
</button> </button>
</div> </div>
@ -457,13 +459,27 @@ const DirectoryPageHeader = ({
</div> </div>
<div className="d-flex justify-content-end gap-2 mt-1"> <div className="d-flex justify-content-end gap-2 mt-1">
<button className="btn btn-xs btn-secondary" onClick={clearFilter}>Clear</button> <button
<button className="btn btn-xs btn-primary" onClick={applyFilter}>Apply Filter</button> className="btn btn-xs btn-secondary"
onClick={(e) => {
// e.stopPropagation();
clearFilter();
}}
>
Clear
</button>
<button
className="btn btn-xs btn-primary"
onClick={(e) => {
applyFilter();
}}
>
Apply Filter
</button>
</div> </div>
</ul> </ul>
</div> </div>
)} )}
</div> </div>
<div className="col-12 col-md-6 mb-2 px-5 d-flex justify-content-end align-items-center gap-2"> <div className="col-12 col-md-6 mb-2 px-5 d-flex justify-content-end align-items-center gap-2">