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.

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

feat(filter-set): Filter set history #13529

Merged
merged 64 commits into from
Mar 10, 2021
Merged

Conversation

simcha90
Copy link
Contributor

@simcha90 simcha90 commented Mar 9, 2021

SUMMARY

This PR add history of saved filter sets according https://www.figma.com/proto/Z75uj6W6n0A6nfK3Mvawqi/Dashboard-Filters---P1?node-id=960%3A2246&scaling=min-zoom

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

Screen.Recording.2021-03-09.at.14.58.32.mov

TEST PLAN

ADDITIONAL INFORMATION

  • Has associated issue:
  • Changes UI
  • Requires DB Migration.
  • Confirm DB Migration upgrade and downgrade tested.
  • Introduces new feature or API
  • Removes existing feature or API

simcha90 added 30 commits March 3, 2021 14:24
…incubator-superset into filter_bar_actions

� Conflicts:
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx
…_to_data_mask

� Conflicts:
�	superset-frontend/package-lock.json
�	superset-frontend/package.json
…ctions

� Conflicts:
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx
� Conflicts:
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx
simcha90 added 7 commits March 9, 2021 09:17
…esign_2

� Conflicts:
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSets.tsx
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx
�	superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx
@amitmiran137 amitmiran137 added assigned:nielsen Assigned to the nielsen team v1.1 labels Mar 9, 2021
Copy link
Member

@villebro villebro left a comment

Choose a reason for hiding this comment

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

Left a few first pass comments. This PR really makes filter sets come to life, super stoked by this! 🎉

Copy link
Member

@villebro villebro left a comment

Choose a reason for hiding this comment

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

JUst a few nits regarding naming - The code looks great, but if you agree with the fine tuning of the variables I think we can make it slightly easier to approach by other developers.

docker/pythonpath_dev/superset_config.py Outdated Show resolved Hide resolved
@@ -66,27 +77,59 @@ type FilterSetsProps = {
const DEFAULT_FILTER_SET_NAME = t('New filter set');

const FilterSets: React.FC<FilterSetsProps> = ({
currentDataMask,
Copy link
Member

Choose a reason for hiding this comment

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

Would be nice to have these in the same style; below we have dataMaskApplied, maybe this could be dataMaskSelected?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not selected it's applied, because it's different
it can be selected but not applied

@junlincc junlincc removed the v1.1 label Mar 9, 2021
@junlincc
Copy link
Member

junlincc commented Mar 9, 2021

@simcha90 Thanks so much for the contribution!

@amitmiran137 i believe we have cut 1.1 release already. it should make it to the next minor.

@junlincc junlincc added the 1.2 label Mar 10, 2021
@simcha90
Copy link
Contributor Author

@simcha90 Thanks so much for the contribution!

@amitmiran137 i believe we have cut 1.1 release already. it should make it to the next minor.

it's still not finished

@villebro
Copy link
Member

@simcha90 Thanks so much for the contribution!
@amitmiran137 i believe we have cut 1.1 release already. it should make it to the next minor.

it's still not finished

1.1 is currently 97 commits/PRs behind master, so it could be quite challenging to cherry this in: https://github.com/apache/superset/tree/1.1

@villebro villebro merged commit 1d1a1cd into apache:master Mar 10, 2021
@junlincc junlincc added the dashboard:native-filters Related to the native filters of the Dashboard label Mar 11, 2021
allanco91 pushed a commit to allanco91/superset that referenced this pull request May 21, 2021
* refactor(native-filters): move data mask to root reducer

* refactor: update rest stuff for dataMask

* refactor: add ownCrrentState to explore

* fix: fix immer reducer

* fix: merge with master

* refactor: support explore dataMask

* refactor: support explore dataMask

* docs: add comment

* refactor: remove json stringify

* fix: fix failed cases

* feat: filter bat buttons start

* fix: fix CR notes

* fix: fix cascade filters

* fix: fix CR notes

* refactor: add clear all

* fix: fix CR notes

* fix: fix CR notes

* fix: fix CR notes

* feat: buttons in filter bar

* lint: update imports

* feat: add tabs for filter sets

* feat: add buttons to filter set

* feat: first phase add filter sets

* fix: undo FF

* refactor: continue filter sets

* fix: fix CR notes

* refactor: header

* fix: fix CR notes

* fix: fix CR notes

* refactor: continue filter sets

* lint: fix lint

* refactor: continue filter sets

* fix: fix filter bar opening

* refactor: continue filter sets

* refactor: continue filter sets

* refactor: continue filter sets

* feat: filters sets history

* feat: filters sets history

* fix: filter set name

* refactor: fix expand filters case

* fix: fix CR notes

* refactor: filter sets

* fix: fix CR notes

* refactor: filter sets
@mistercrunch mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 1.2.0 labels Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned:nielsen Assigned to the nielsen team 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels dashboard:native-filters Related to the native filters of the Dashboard size/L 🚢 1.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants