Merge pull request 'In filter DatePicker should not display dates in Image Gallery.' (#238) from Kartik_Bug#679 into Issues_July_2W
Reviewed-on: #238 Merged
This commit is contained in:
commit
9a9ff4460f
@ -6,10 +6,10 @@ import { useSelector } from "react-redux";
|
|||||||
import { useModal } from "./ModalContext";
|
import { useModal } from "./ModalContext";
|
||||||
import ImagePop from "./ImagePop";
|
import ImagePop from "./ImagePop";
|
||||||
import Avatar from "../../components/common/Avatar";
|
import Avatar from "../../components/common/Avatar";
|
||||||
import DateRangePicker from "../../components/common/DateRangePicker";
|
|
||||||
import eventBus from "../../services/eventBus";
|
import eventBus from "../../services/eventBus";
|
||||||
import Breadcrumb from "../../components/common/Breadcrumb";
|
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 PAGE_SIZE = 10;
|
||||||
const SCROLL_THRESHOLD = 5;
|
const SCROLL_THRESHOLD = 5;
|
||||||
@ -406,8 +406,7 @@ const ImageGallery = () => {
|
|||||||
<div className="date-range-inputs">
|
<div className="date-range-inputs">
|
||||||
<DateRangePicker
|
<DateRangePicker
|
||||||
onRangeChange={setDateRange}
|
onRangeChange={setDateRange}
|
||||||
defaultStartDate={selectedFilters.startDate || yesterday}
|
endDateMode="today"
|
||||||
defaultEndDate={selectedFilters.endDate || moment().format('YYYY-MM-DD')}
|
|
||||||
startDate={selectedFilters.startDate}
|
startDate={selectedFilters.startDate}
|
||||||
endDate={selectedFilters.endDate}
|
endDate={selectedFilters.endDate}
|
||||||
/>
|
/>
|
||||||
@ -438,7 +437,7 @@ const ImageGallery = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`gallery-container container-fluid ${ isFilterPanelOpen ? "filter-panel-open-end" : "" }`}>
|
<div className={`gallery-container container-fluid ${isFilterPanelOpen ? "filter-panel-open-end" : ""}`}>
|
||||||
<Breadcrumb
|
<Breadcrumb
|
||||||
data={[
|
data={[
|
||||||
{ label: "Home", link: "/" },
|
{ label: "Home", link: "/" },
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user