Skip to content

replace DateRange with two DatePickers #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-zilla merged 1 commit into from
Aug 1, 2023
Merged

replace DateRange with two DatePickers #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 37 additions & 17 deletions frontend/src/components/search/Search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import {
DataSearch,
DateRange,
DatePicker,
MultiDropdownList,
ReactiveComponent,
ReactiveList,
Expand Down Expand Up @@ -61,7 +61,8 @@ export function Search() {
and: [
"creatorfilter",
"downloadfilter",
"modifyfilter",
"fromfilter",
"tofilter",
"authFilter",
],
}}
Expand Down Expand Up @@ -133,21 +134,39 @@ export function Search() {
defaultValue={"Download Times: All"}
/>
</Grid>
<Grid item xs={12} sm={4} md={4} lg={4}>
<DateRange
componentId="modifyfilter"
<Grid item xs={6} sm={2} md={2} lg={2}>
<DatePicker
dataField="created"
focused={false}
autoFocusEnd={true}
numberOfMonths={1}
queryFormat="date_time_no_millis"
showClear={true}
showFilter={true}
filterLabel="Date"
URLParams={false}
placeholder={{
start: "From Date",
end: "To Date",
componentId="fromfilter"
placeholder="Start Date"
customQuery={function (value, props) {
return {
query: {
range: {
created: {
gte: value,
},
},
},
};
}}
/>
</Grid>
<Grid item xs={6} sm={2} md={2} lg={2}>
<DatePicker
dataField="created"
componentId="tofilter"
placeholder="End Date"
customQuery={function (value, props) {
return {
query: {
range: {
created: {
lte: value,
},
},
},
};
}}
/>
</Grid>
Expand Down Expand Up @@ -177,7 +196,8 @@ export function Search() {
"searchbox",
"creatorfilter",
"downloadfilter",
"modifyfilter",
"fromfilter",
"tofilter",
"authFilter",
],
}}
Expand Down