In filter DatePicker should not display dates in Image Gallery. #238

Merged
pramod.mahajan merged 3 commits from Kartik_Bug#679 into Issues_July_2W 2025-07-11 07:13:54 +00:00

View File

@ -6,10 +6,10 @@ import { useSelector } from "react-redux";
import { useModal } from "./ModalContext";
import ImagePop from "./ImagePop";
import Avatar from "../../components/common/Avatar";
import DateRangePicker from "../../components/common/DateRangePicker";
import eventBus from "../../services/eventBus";
import Breadcrumb from "../../components/common/Breadcrumb";
import {formatUTCToLocalTime} from "../../utils/dateUtils";
import { formatUTCToLocalTime } from "../../utils/dateUtils";
import DateRangePicker from "../../components/common/DateRangePicker";
const PAGE_SIZE = 10;
const SCROLL_THRESHOLD = 5;
@ -207,9 +207,9 @@ const ImageGallery = () => {
} else {
id = batch[idKey];
}
const name = batch[nameKey];
if (id && name && !map.has(id)) {
map.set(id, name);
}
@ -229,7 +229,7 @@ const ImageGallery = () => {
}
});
});
return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
}, [allImagesData]);
const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
@ -315,7 +315,7 @@ const ImageGallery = () => {
return false;
}
if ((oldVal === null && newVal === "") || (oldVal === "" && newVal === null)) {
return false;
return false;
}
return oldVal !== newVal;
});
@ -406,8 +406,7 @@ const ImageGallery = () => {
<div className="date-range-inputs">
<DateRangePicker
onRangeChange={setDateRange}
defaultStartDate={selectedFilters.startDate || yesterday}
defaultEndDate={selectedFilters.endDate || moment().format('YYYY-MM-DD')}
endDateMode="today"
startDate={selectedFilters.startDate}
endDate={selectedFilters.endDate}
/>
@ -438,12 +437,12 @@ const ImageGallery = () => {
);
return (
<div className={`gallery-container container-fluid ${ isFilterPanelOpen ? "filter-panel-open-end" : "" }`}>
<Breadcrumb
data={[
{ label: "Home", link: "/" },
{ label: "Gallary", link: null },
]}
<div className={`gallery-container container-fluid ${isFilterPanelOpen ? "filter-panel-open-end" : ""}`}>
<Breadcrumb
data={[
{ label: "Home", link: "/" },
{ label: "Gallary", link: null },
]}
></Breadcrumb>
<div className="main-content">
<button
@ -469,8 +468,8 @@ const ImageGallery = () => {
const userName = `${firstDoc?.uploadedBy?.firstName || ""} ${firstDoc?.uploadedBy?.lastName || ""
}`.trim();
const date = formatUTCToLocalTime(firstDoc?.uploadedAt)
const showScrollButtons = batch.documents.length > SCROLL_THRESHOLD;
@ -490,7 +489,7 @@ const ImageGallery = () => {
{userName}
</strong>
<span className="me-2">
{date}
{date}
</span>
</div>
</div>
@ -605,13 +604,13 @@ const ImageGallery = () => {
></button>
</div>
<div className="filter-actions mt-auto mx-2">
<button className="btn btn-secondary btn-xs" onClick={handleClearAllFilters}>
Clear All
</button>
<button className="btn btn-primary btn-xs" onClick={handleApplyFilters}>
Apply Filters
</button>
</div>
<button className="btn btn-secondary btn-xs" onClick={handleClearAllFilters}>
Clear All
</button>
<button className="btn btn-primary btn-xs" onClick={handleApplyFilters}>
Apply Filters
</button>
</div>
<div className="offcanvas-body d-flex flex-column">
{renderFilterCategory("Date Range", [], "dateRange")}
{renderFilterCategory("Building", buildings, "building")}
@ -621,7 +620,7 @@ const ImageGallery = () => {
{renderFilterCategory("Uploaded By (User)", uploadedByUsers, "uploadedBy")}
{renderFilterCategory("Work Category", workCategories, "workCategory")}
</div>
</div>
</div>