diff --git a/src/components/ImageGallery/ImageGalleryFilters.jsx b/src/components/ImageGallery/ImageGalleryFilters.jsx index f6147eb3..3e541012 100644 --- a/src/components/ImageGallery/ImageGalleryFilters.jsx +++ b/src/components/ImageGallery/ImageGalleryFilters.jsx @@ -1,8 +1,9 @@ import React, { useState, useCallback, useEffect } from "react"; import { FormProvider, useForm } from "react-hook-form"; import moment from "moment"; -import DateRangePicker from "../../components/common/DateRangePicker"; +import DateRangePicker, { DateRangePicker1 } from "../../components/common/DateRangePicker"; import SelectMultiple from "../../components/common/SelectMultiple"; +import { localToUtc } from "../../utils/appUtils"; const defaultGalleryFilterValues = { buildingIds: [], @@ -58,27 +59,21 @@ const ImageGalleryFilters = ({ [setValue] ); - // Submit → Apply filters - const onSubmit = useCallback( - (formData) => { - const payload = { + const onSubmit =(formData)=>{ + const inputStartDate = localToUtc(formData.startDate) + const inputEndDate = localToUtc(formData.endDate) + const payload = { ...formData, - startDate: formData.startDate - ? moment(formData.startDate).utc().toISOString() - : null, - endDate: formData.endDate - ? moment(formData.endDate).utc().toISOString() - : null, + startDate: inputStartDate, + endDate: inputEndDate, }; - onApplyFilters(payload); - }, - [onApplyFilters] - ); + onApplyFilters(payload); + } // Clear all filters const onClear = useCallback(() => { reset(defaultGalleryFilterValues); - setResetKey((prev) => prev + 1); // reset DateRangePicker + setResetKey((prev) => prev + 1); onApplyFilters(defaultGalleryFilterValues); }, [onApplyFilters, reset]); @@ -86,13 +81,12 @@ const ImageGalleryFilters = ({