feat(filter-set): Filter set edge cases #13576

simcha90 · 2021-03-11T14:50:54Z

SUMMARY

This PR process edge cases for filter sets:

When some filter was removed from dashboard we mark it as removed and not apply when user clicks on filter set
When for some filter was changed metadata we mark it as highlighted and not apply when user clicks on filter set
Added option invalidate filter set - removed invalid filters from filter set
Saving in dashboard metadata also filters metadata for each filter set
Added option edit name for filter set
Added option select filter set with invalid filters in this case only valid filters will be applied and this superset will be selected

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

Screen.Recording.2021-03-11.at.16.37.31.mov

TEST PLAN

ADDITIONAL INFORMATION

…_to_data_mask

…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

…incubator-superset into filter_bar_actions

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

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

…pdate � Conflicts: � superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx � superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx � superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSets.tsx � superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx

…rBar/FilterSets/EditSection.tsx Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>

…issed

junlincc · 2021-03-15T02:46:09Z

/testenv up

github-actions · 2021-03-15T02:48:11Z

@junlincc Ephemeral environment spinning up at http://54.244.111.44:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

villebro

A few comments

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.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/FilterSetUnit.tsx

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSets.tsx

codecov · 2021-03-15T11:42:26Z

Codecov Report

Merging #13576 (19005f6) into master (5fca19d) will decrease coverage by 4.52%.
The diff coverage is 32.52%.

@@            Coverage Diff             @@
##           master   #13576      +/-   ##
==========================================
- Coverage   77.53%   73.01%   -4.53%     
==========================================
  Files         904      608     -296     
  Lines       45986    21637   -24349     
  Branches     5552     5725     +173     
==========================================
- Hits        35657    15799   -19858     
+ Misses      10195     5702    -4493     
- Partials      134      136       +2

Flag	Coverage Δ
cypress	`56.56% <20.65%> (-0.64%)`	⬇️
hive	`?`
javascript	`63.04% <30.18%> (-0.34%)`	⬇️
mysql	`?`
postgres	`?`
presto	`?`
python	`?`
sqlite	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...nd/src/common/components/CronPicker/CronPicker.tsx	`100.00% <ø> (ø)`
...onents/nativeFilters/FilterBar/FilterSets/utils.ts	`28.57% <0.00%> (+0.98%)`	⬆️
superset-frontend/src/dashboard/reducers/types.ts	`0.00% <ø> (ø)`
...frontend/src/explore/components/OptionControls.tsx	`67.02% <0.00%> (ø)`
...ontrols/DndColumnSelectControl/DndColumnSelect.tsx	`22.58% <ø> (ø)`
...ents/controls/FilterControl/AdhocFilterControl.jsx	`60.00% <ø> (ø)`
.../controls/FilterControl/AdhocFilterEditPopover.jsx	`58.00% <ø> (ø)`
...Control/AdhocFilterEditPopoverSimpleTabContent.jsx	`74.83% <ø> (ø)`
...terControl/AdhocFilterEditPopoverSqlTabContent.jsx	`63.33% <ø> (ø)`
...nents/controls/FilterControl/AdhocFilterOption.jsx	`100.00% <ø> (ø)`
... and 339 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5fca19d...6c72bbb. Read the comment docs.

villebro

LGTM

github-actions · 2021-03-15T12:29:46Z

Ephemeral environment shutdown and build artifacts deleted.

* 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 * refactor: filter sets * refactor: filter sets * refactor: filter sets * refactor: update sets * feat: edit filter set * refactor: add warning icon * fix: fix CR notes * Update superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com> * fix: fix CR notes * feat: filter set edge cases * lint: fix lint * lint: fix TS * refactor: fix CR notes * fix: fix CR notes * fix: fix CR notes Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>

simcha90 added 30 commits March 3, 2021 14:24

refactor(native-filters): move data mask to root reducer

2731518

Merge branch 'master' of github.com:apache/superset into filtersState…

de6a332

…_to_data_mask

refactor: update rest stuff for dataMask

6652d19

refactor: add ownCrrentState to explore

266a0a3

fix: fix immer reducer

5344dd4

Merge branch 'master' of github.com:apache/superset into filtersState…

2b4bd8f

…_to_data_mask

fix: merge with master

dabfd24

refactor: support explore dataMask

802823c

refactor: support explore dataMask

8aed240

docs: add comment

a0fa114

refactor: remove json stringify

eaec7ef

fix: fix failed cases

cba3467

feat: filter bat buttons start

04d6398

fix: fix CR notes

af9e35a

fix: fix cascade filters

64fb87d

fix: fix CR notes

57c954f

Merge branch 'filtersState_to_data_mask' of github.com:simchaNielsen/…

bd9b767

…incubator-superset into filter_bar_actions � Conflicts: � superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx

refactor: add clear all

bff44d1

fix: fix CR notes

09b594a

Merge branch 'master' of github.com:apache/superset into filtersState…

c522391

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

Merge branch 'filtersState_to_data_mask' of github.com:simchaNielsen/…

1bf1552

…incubator-superset into filter_bar_actions

fix: fix CR notes

0527067

Merge branch 'filtersState_to_data_mask' of github.com:simchaNielsen/…

9abe26e

…incubator-superset into filter_bar_actions

fix: fix CR notes

2d12c37

Merge branch 'filtersState_to_data_mask' of github.com:simchaNielsen/…

84d8cbd

…incubator-superset into filter_bar_actions

feat: buttons in filter bar

a9202b1

Merge branch 'master' of github.com:apache/superset into filter_bar_a…

9ae46b9

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

lint: update imports

cdcae95

feat: add tabs for filter sets

6c91054

Merge branch 'master' of github.com:apache/superset into filter-set_tabs

844adaa

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

simcha90 and others added 11 commits March 10, 2021 09:22

refactor: filter sets

34b26b6

refactor: update sets

a21a394

feat: edit filter set

24dcd16

refactor: add warning icon

d8e1bd9

fix: fix CR notes

e558783

Update superset-frontend/src/dashboard/components/nativeFilters/Filte…

accd1f2

…rBar/FilterSets/EditSection.tsx Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>

fix: fix CR notes

5b3803a

Merge branch 'master' of github.com:apache/superset into filter_set_m…

e882100

…issed

feat: filter set edge cases

2ada369

Merge branch 'master' of github.com:apache/superset into filter_set_m…

6a1cfb7

…issed

pull-request-size bot added the size/L label Mar 11, 2021

lint: fix lint

d66e3ff

junlincc requested a review from suddjian March 11, 2021 22:02

junlincc added the dashboard:native-filters Related to the native filters of the Dashboard label Mar 11, 2021

lint: fix TS

51c5395

villebro reviewed Mar 15, 2021

View reviewed changes

refactor: fix CR notes

3030e8d

villebro reviewed Mar 15, 2021

View reviewed changes

simcha90 added 2 commits March 15, 2021 13:38

fix: fix CR notes

d4c3fb0

fix: fix CR notes

6c72bbb

villebro approved these changes Mar 15, 2021

View reviewed changes

villebro merged commit a35825d into apache:master Mar 15, 2021

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(filter-set): Filter set edge cases #13576

feat(filter-set): Filter set edge cases #13576

simcha90 commented Mar 11, 2021

junlincc commented Mar 15, 2021

github-actions bot commented Mar 15, 2021

villebro left a comment

codecov bot commented Mar 15, 2021 •

edited

Loading

villebro left a comment

github-actions bot commented Mar 15, 2021

feat(filter-set): Filter set edge cases #13576

feat(filter-set): Filter set edge cases #13576

Conversation

simcha90 commented Mar 11, 2021

SUMMARY

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TEST PLAN

ADDITIONAL INFORMATION

junlincc commented Mar 15, 2021

github-actions bot commented Mar 15, 2021

villebro left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 15, 2021 • edited Loading

Codecov Report

villebro left a comment

Choose a reason for hiding this comment

github-actions bot commented Mar 15, 2021

codecov bot commented Mar 15, 2021 •

edited

Loading