Skip to content
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

Make time filter more usable #4981

Merged
merged 31 commits into from
Jul 16, 2018
Merged

Make time filter more usable #4981

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2aaa349
Initial work
betodealmeida Apr 16, 2018
42e4f79
WIP
betodealmeida Apr 18, 2018
98dd135
WIP
betodealmeida Apr 24, 2018
25460c5
Working
betodealmeida Apr 30, 2018
b1e2dd5
Merge branch 'master' of github.com:apache/incubator-superset into DP…
betodealmeida May 1, 2018
06d9d1b
WIP
betodealmeida May 9, 2018
f8112ed
Still WIP
betodealmeida May 9, 2018
8b66907
Frontend done
betodealmeida May 9, 2018
e41e53d
Working version
betodealmeida May 9, 2018
edf0455
Migration working
betodealmeida May 10, 2018
29c0c6b
Migration working
betodealmeida May 10, 2018
0406a00
Fix freeform rerender
betodealmeida May 10, 2018
d9e99fa
Remove jquery
betodealmeida May 10, 2018
40c10ab
Fix filter
betodealmeida May 10, 2018
22689dd
Unit tests and lint
betodealmeida May 11, 2018
38175ef
Fix py.test
betodealmeida May 11, 2018
1f6a61c
Improve unit tests
betodealmeida May 11, 2018
a028251
Ensure freeform is computed at init
betodealmeida May 11, 2018
cb831c3
Rebase
betodealmeida May 11, 2018
dc50f6f
Fix lint
betodealmeida May 11, 2018
ab5015e
Trying to fix pyfreeze error
betodealmeida May 11, 2018
20e6e78
Remove freezegun
betodealmeida May 11, 2018
80e9c62
Address comments
betodealmeida May 21, 2018
e6c02e2
Use tabs instead of pills
betodealmeida May 23, 2018
cc039f2
Regroup options
betodealmeida May 23, 2018
128db9f
Merge
betodealmeida Jul 10, 2018
b593fa7
WIP
betodealmeida Jul 12, 2018
c917788
Change type when clicking calendar
betodealmeida Jul 13, 2018
ea99aa9
Fix CSS
betodealmeida Jul 13, 2018
60ead86
Rebase
betodealmeida Jul 13, 2018
03462cb
Fix JS lint
betodealmeida Jul 14, 2018
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
22,562 changes: 22,554 additions & 8 deletions superset/assets/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions superset/assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"react-addons-shallow-compare": "^15.4.2",
"react-alert": "^2.3.0",
"react-bootstrap": "^0.31.5",
"react-bootstrap-datetimepicker": "0.0.22",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just noticed this component is deprecated, should we switch to the non-deprecated package?

https://github.com/YouCanBookMe/react-datetime

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me take a look at how much effort is needed to use that one... I remember testing it when I was looking for calendar components, and it didn't work for some cases but TBH I don't remember the details.

"react-bootstrap-slider": "2.0.1",
"react-bootstrap-table": "^4.0.2",
"react-color": "^2.13.8",
Expand Down
2 changes: 1 addition & 1 deletion superset/assets/src/dashboard/reducers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export const dashboard = function (state = {}, action) {

let filters = state.filters;
const { sliceId, col, vals, merge, refresh } = action;
const filterKeys = ['__from', '__to', '__time_col',
const filterKeys = ['__time_range', '__time_col',
'__time_grain', '__time_origin', '__granularity'];
if (filterKeys.indexOf(col) >= 0 ||
selectedSlice.formData.groupby.indexOf(col) !== -1) {
Expand Down
Loading