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): Update existing filter set #13545

Merged
merged 73 commits into from
Mar 10, 2021

Conversation

simcha90
Copy link
Contributor

@simcha90 simcha90 commented Mar 10, 2021

SUMMARY

This PR add option to edit existing filter set according this design: https://www.figma.com/proto/Z75uj6W6n0A6nfK3Mvawqi/Dashboard-Filters---P1?node-id=960%3A1284&scaling=min-zoom

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

Screen.Recording.2021-03-10.at.12.47.40.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 17 commits March 9, 2021 12:22
…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
…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
return (
<Wrapper>
<Title strong>{t('Editing filter set:')}</Title>
<Title>{filterSets[filterSetId].name}</Title>
Copy link
Member

Choose a reason for hiding this comment

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

While this isn't yet in the design, I think it would be a good idea to make the title editable when in edit mode

Copy link
Contributor Author

Choose a reason for hiding this comment

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

may be in next PR, here it will cause refactor some code and move to other files

@codecov
Copy link

codecov bot commented Mar 10, 2021

Codecov Report

Merging #13545 (e5d5d8e) into master (1d1a1cd) will decrease coverage by 3.75%.
The diff coverage is 28.23%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13545      +/-   ##
==========================================
- Coverage   77.31%   73.56%   -3.76%     
==========================================
  Files         903      603     -300     
  Lines       45926    21406   -24520     
  Branches     5624     5641      +17     
==========================================
- Hits        35508    15747   -19761     
+ Misses      10282     5525    -4757     
+ Partials      136      134       -2     
Flag Coverage Δ
cypress 57.20% <13.63%> (+0.74%) ⬆️
javascript 63.39% <28.23%> (-0.10%) ⬇️
mysql ?
postgres ?
presto ?
python ?
sqlite ?

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

Impacted Files Coverage Δ
superset-frontend/src/components/Button/index.tsx 100.00% <ø> (ø)
...et-frontend/src/dashboard/actions/nativeFilters.ts 64.10% <0.00%> (-3.47%) ⬇️
...tiveFilters/FilterBar/FilterSets/FilterSetUnit.tsx 40.90% <ø> (ø)
...tiveFilters/FilterBar/FilterSets/FiltersHeader.tsx 39.13% <0.00%> (-1.78%) ⬇️
.../nativeFilters/FilterBar/FilterSets/FilterSets.tsx 18.30% <8.33%> (+0.12%) ⬆️
...onents/nativeFilters/FilterBar/FilterSets/utils.ts 27.58% <21.42%> (-5.75%) ⬇️
...d/components/nativeFilters/FilterBar/FilterBar.tsx 91.37% <33.33%> (-2.32%) ⬇️
...nativeFilters/FilterBar/FilterSets/EditSection.tsx 35.55% <35.55%> (ø)
...ents/nativeFilters/FilterBar/FilterSets/Footer.tsx 56.25% <50.00%> (ø)
superset/views/log/__init__.py
... and 311 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 1d1a1cd...e558783. Read the comment docs.

@codecov
Copy link

codecov bot commented Mar 10, 2021

Codecov Report

Merging #13545 (94878c9) into master (1d1a1cd) will decrease coverage by 3.75%.
The diff coverage is 28.23%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13545      +/-   ##
==========================================
- Coverage   77.31%   73.56%   -3.76%     
==========================================
  Files         903      603     -300     
  Lines       45926    21406   -24520     
  Branches     5624     5641      +17     
==========================================
- Hits        35508    15747   -19761     
+ Misses      10282     5525    -4757     
+ Partials      136      134       -2     
Flag Coverage Δ
cypress 57.19% <13.63%> (+0.74%) ⬆️
javascript 63.39% <28.23%> (-0.10%) ⬇️
mysql ?
postgres ?
presto ?
python ?
sqlite ?

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

Impacted Files Coverage Δ
superset-frontend/src/components/Button/index.tsx 100.00% <ø> (ø)
...et-frontend/src/dashboard/actions/nativeFilters.ts 64.10% <0.00%> (-3.47%) ⬇️
...tiveFilters/FilterBar/FilterSets/FilterSetUnit.tsx 40.90% <ø> (ø)
...tiveFilters/FilterBar/FilterSets/FiltersHeader.tsx 39.13% <0.00%> (-1.78%) ⬇️
.../nativeFilters/FilterBar/FilterSets/FilterSets.tsx 18.30% <8.33%> (+0.12%) ⬆️
...onents/nativeFilters/FilterBar/FilterSets/utils.ts 27.58% <21.42%> (-5.75%) ⬇️
...d/components/nativeFilters/FilterBar/FilterBar.tsx 91.37% <33.33%> (-2.32%) ⬇️
...nativeFilters/FilterBar/FilterSets/EditSection.tsx 35.55% <35.55%> (ø)
...ents/nativeFilters/FilterBar/FilterSets/Footer.tsx 56.25% <50.00%> (ø)
superset/css_templates/commands/exceptions.py
... and 311 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 1d1a1cd...5b3803a. Read the comment docs.

simcha90 and others added 2 commits March 10, 2021 14:14
…rBar/FilterSets/EditSection.tsx

Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
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.

LGTM

@villebro villebro merged commit d509b15 into apache:master Mar 10, 2021
@junlincc junlincc added the dashboard:native-filters Related to the native filters of the Dashboard label Mar 12, 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

* 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

Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
@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
🏷️ 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.

4 participants