Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Make time filter more usable (apache#4981)
Browse files Browse the repository at this point in the history
* Initial work

* WIP

* WIP

* Working

* WIP

* Still WIP

* Frontend done

* Working version

* Migration working

* Migration working

* Fix freeform rerender

* Remove jquery

* Fix filter

* Unit tests and lint

* Fix py.test

* Improve unit tests

* Ensure freeform is computed at init

* Fix lint

* Trying to fix pyfreeze error

* Remove freezegun

* Address comments

* Use tabs instead of pills

* Regroup options

* WIP

* Change type when clicking calendar

* Fix CSS

* Fix JS lint
  • Loading branch information
betodealmeida authored and timifasubaa committed Jul 25, 2018
1 parent ba623db commit 6f73e64
Show file tree
Hide file tree
Showing 15 changed files with 23,063 additions and 198 deletions.
22,562 changes: 22,554 additions & 8 deletions superset/assets/package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions superset/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
"react-addons-css-transition-group": "^15.6.0",
"react-addons-shallow-compare": "^15.4.2",
"react-bootstrap": "^0.31.5",
"react-bootstrap-datetimepicker": "0.0.22",
"react-bootstrap-slider": "2.1.5",
"react-bootstrap-table": "^4.3.1",
"react-color": "^2.13.8",
Expand Down
3 changes: 1 addition & 2 deletions superset/assets/src/dashboard/deprecated/v1/reducers.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ export const dashboard = function(state = {}, action) {
let filters = state.filters;
const { sliceId, col, vals, merge, refresh } = action;
const filterKeys = [
'__from',
'__to',
'__time_range',
'__time_col',
'__time_grain',
'__time_origin',
Expand Down
Loading

0 comments on commit 6f73e64

Please sign in to comment.