diff --git a/src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx b/src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx index 21b6d0967..29c1e3b2f 100644 --- a/src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx +++ b/src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx @@ -39,7 +39,7 @@ const SubmissionsTable = ({ toggleView }) => { task_id: searchParams.get('task_id') ? searchParams?.get('task_id') || null : null, submitted_by: searchParams.get('submitted_by'), review_state: searchParams.get('review_state'), - submitted_date: searchParams.get('submitted_date'), + submitted_date_range: searchParams.get('submitted_date_range'), }; const [filter, setFilter] = useState(initialFilterState); @@ -73,6 +73,16 @@ const SubmissionsTable = ({ toggleView }) => { const [numberOfFilters, setNumberOfFilters] = useState(0); const [paginationPage, setPaginationPage] = useState(1); const [submittedBy, setSubmittedBy] = useState(null); + const [dateRange, setDateRange] = useState<{ start: Date | null; end: Date | null }>({ start: null, end: null }); + + useEffect(() => { + if (!dateRange.start || !dateRange.end) return; + + setFilter((prev) => ({ + ...prev, + submitted_date_range: `${format(new Date(dateRange.start as Date), 'yyyy-MM-dd')},${format(new Date(dateRange.end as Date), 'yyyy-MM-dd')}`, + })); + }, [dateRange]); useEffect(() => { let count = 0; @@ -163,7 +173,7 @@ const SubmissionsTable = ({ toggleView }) => { const clearFilters = () => { setSearchParams({ tab: 'table' }); - setFilter({ task_id: null, submitted_by: null, review_state: null, submitted_date: null }); + setFilter({ task_id: null, submitted_by: null, review_state: null, submitted_date_range: null }); }; function getValueByPath(obj: any, path: string) { @@ -307,13 +317,13 @@ const SubmissionsTable = ({ toggleView }) => { className="fmtm-text-grey-700 fmtm-text-sm !fmtm-mb-0 fmtm-bg-white" /> -
+
- setFilter((prev) => ({ ...prev, submitted_date: format(new Date(date), 'yyyy-MM-dd') })) - } + startDate={dateRange?.start} + endDate={dateRange?.end} + setStartDate={(date) => setDateRange((prev) => ({ ...prev, start: date }))} + setEndDate={(date) => setDateRange((prev) => ({ ...prev, end: date }))} className="fmtm-text-grey-700 fmtm-text-sm !fmtm-mb-0 fmtm-w-full" />