feat: Native filters fast-follow #12138
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ator-superset into dashboard-native-filters
…ator-superset into scopes
Codecov Report
@@ Coverage Diff @@
## master #12138 +/- ##
==========================================
- Coverage 65.82% 63.26% -2.56%
==========================================
Files 988 990 +2
Lines 48702 48902 +200
Branches 4907 4963 +56
==========================================
- Hits 32056 30937 -1119
- Misses 16501 17768 +1267
- Partials 145 197 +52
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
suddjian
reviewed
Dec 19, 2020
| */ | ||
| import { cacheWrapper } from 'src/utils/cacheWrapper'; | ||
|
|
||
| describe('cacheWrapper', () => { |
suddjian
reviewed
Dec 19, 2020
| const currentValue = filter.currentValue || []; | ||
|
|
||
| const activeChildren = children.flatMap( | ||
| childFilter => getActiveChildren(childFilter) || [], |
suddjian
reviewed
Dec 19, 2020
| </> | ||
| ); | ||
|
|
||
| const activeFilters = getActiveChildren(filter) || [filter]; |
There was a problem hiding this comment.
Why are we calling these "active" filters? What exactly does that mean here?
suddjian
reviewed
Dec 19, 2020
| @@ -149,9 +276,68 @@ export function FilterConfigModal({ | |||
| ); | |||
| } | |||
|
|
|||
| function getParentFilters(id: string) { | |||
| return filterIds | |||
| .filter(filterId => filterId !== id && !removedFilters[filterId]) | |||
There was a problem hiding this comment.
Good catch keeping removed filters out
suddjian
approved these changes
Dec 19, 2020
|
if the code looks good, let's merge first? we should test it we all other recent merged PRs |
rusackas
commented
Dec 19, 2020
superset-frontend/src/dashboard/components/nativeFilters/CascadePopover.tsx
Outdated
Show resolved
Hide resolved
|
Reviewed the code and it LGTM! |
rusackas
commented
Dec 19, 2020
…t-io/incubator-superset into native-filters-fast-follow
villebro
added a commit
to preset-io/superset
that referenced
this pull request
Jan 7, 2021
* wip: filter create modal * add a feature flag * automatic changes to package lock * wip * filter sidebar and basic state management * move create button to the sidebar * first step for edit filterconfig * partially fix tests... * edits to types and comments * respect feature flag on the filter sidebar * add filterconfig form * get input state working * feat: tree filter scopes UI * fix: turn on flag * sticky filter bar * stop preferring default export * feat: finish filter scoping * fix: under toggle * fix: title * fix: add licence * refactor: update TS * fix: fix on reopen modal + validation * new filter bar menu * adding, but commenting out, bulk scoping action * adding some placeholder buttons and styles therefor * feat: add filter chart * add relative path to package.json * update modal * a little input styling... just getting warmed up * Revert "feat: add filter chart" This reverts commit b1302d3. * Revert "add relative path to package.json" This reverts commit 26a7b40. * https package lock idk * feat: add filter chart * add relative path to package.json * flexboxes all the way down * dynamically generate groupby and datasource in select control * big wip * fix target column name * no importing nonexistent things * styles and name editing * Add hook for retrieval of all filter states * start with a new filter when clicking add filter * handle removed filters gracefully * fix incorrect default filter configuration * add fields to useAllFilterState * add redux for filterconfigs * add support for native_filters * remove consoles * improve filter removal * unbreak infinite loop * basic sidebar toggling working! * collapsing and menu working more smoothly * linting * make dataset and column inputs work * save filter values properly * add dashboard event for filter updates * guarded * apply filters properly * fix schema * making New Filter button a link * gridunits ftw * centering modal * tis not a button anymore! nixing type. * plus and collapse buttons instead of "more" menu * updating full size filter icons * adding icons to filter collapsing/expanding * turning off animation, but leaving class-based animation css * fix linting error * fix native filters for legacy charts * updates test * no individual apply buttons * fix bugs with filter config modal * remove redundant code * switch to the filter with validation errors on submit * separate form validation * switch config button from add to edit * switch to the filter with validation errors on submit * separate form validation * switch config button from add to edit * update tests * oops forgot to add the fancy new useChangeEffect hook * comments and code reorganization * rename native_filters to extr_form_data and move hook * disable native filters in viz selector * add cascading * implement new extra form data api * cleanup * updates tests * bump npm packages * fix bad merge on package.json + lock * lint * replace in and not in with uppercase * lint * lint * lint * lint * bulk test fix * Sort select input alphabetically * Change type for sorting elements * sleeker filter removal UX * fix rest of unit tests * make filter operators all uppercase * Hide Filter bar when there are no filters * Show edit button for dashboard owners only * Add visible argument to filters toggle function to avoid future regression * Improve Toggle filters bar function * lint * fix js lint + set createNewOnOpen * Handle setting extra form data in Filter Bar instead of Filter Control * Add Handle apply filter function to Apply button * Allow applying changes instantly * Fix types * remove console logs * fix package * Add Error Boundary component to Filter bar and Filter Config Modal * fix jest tests * update native filters tests to pass * reset cypress baseUrl * remove unnecessary field * Add Parent Filter input field to Config Modal * Create Cascade Filter & display children filters * Add Cascade Popover * Display Filter value both in Filter Bar and in Cascade Popover * Display the youngest filter value label in the Filter bar * Add styles to Cascade Popover and filters * Force to apply changes instantly for parent filters and refactor styles * Show error for no cyclical hierarchy and refactor * Add validation for parent filter to be applied instantly * Add Error Boundary to Filter Config Modal * cleanup: remove unused state fields * move unrelated types to an appropriate location * remove misplaced resource fetch error logic * fix cascadeParentIds error * fix cypress password * initial attempt at fixing scope issue * fix bad merge * fix lint * trying out makeApi for saving filters * remove unused import * fix test * silence bad test * Improve styling of Filter Config Modal * Improve styles for whole native filters feature * Add styles for active filter tab * Fix text for scoping * Clean up Filter Bar and Config Modal styles * Remove fractional gridUnits. Change name for CheckboxFormItem. Add placeholder to Parent Filter select. * Remove unnecessary button size for Config Modal * add native-filter feat flag config * oops fix here * remove space * Update superset-frontend/src/common/components/index.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts Co-authored-by: Evan Rusackas <evan@preset.io> * Add Cache Wrapper helper to avoid datasets requests deduplication * Add license to new Cache Wrapper helper * Add Cache Wrapper tests * Fix expanding Filter Bar * use styledMount in tests * comment Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterConfigurationLink.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * address PR feedback * fix package lock * null guards * Fix charts resizing * removing emotion/react and going old school on css animation * fxing css glitch on scoping disclaimer * src paths. * using gridUnits * nixing unnecessary diamonds * linting * fix type errors * Inverting collapsed icons... closer to data src selector design * restoring feature flag to proper default setting * missing condition * fix tests * patching test * just a button * flaky tests Co-authored-by: David Aaron Suddjian <aasuddjian@gmail.com> Co-authored-by: Phillip Kelley-Dotson <pkelleydotson@yahoo.com> Co-authored-by: Simcha Shats <simcha.shats@nielsen.com> Co-authored-by: amitNielsen <amit.miran@nielsen.com> Co-authored-by: Ville Brofeldt <ville.v.brofeldt@gmail.com> Co-authored-by: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com> Co-authored-by: Agata Stawarz-Pastewska <agata.stawarz-pastewska@polidea.com> Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
villebro
added a commit
to preset-io/superset
that referenced
this pull request
Jan 7, 2021
* wip: filter create modal * add a feature flag * automatic changes to package lock * wip * filter sidebar and basic state management * move create button to the sidebar * first step for edit filterconfig * partially fix tests... * edits to types and comments * respect feature flag on the filter sidebar * add filterconfig form * get input state working * feat: tree filter scopes UI * fix: turn on flag * sticky filter bar * stop preferring default export * feat: finish filter scoping * fix: under toggle * fix: title * fix: add licence * refactor: update TS * fix: fix on reopen modal + validation * new filter bar menu * adding, but commenting out, bulk scoping action * adding some placeholder buttons and styles therefor * feat: add filter chart * add relative path to package.json * update modal * a little input styling... just getting warmed up * Revert "feat: add filter chart" This reverts commit b1302d3. * Revert "add relative path to package.json" This reverts commit 26a7b40. * https package lock idk * feat: add filter chart * add relative path to package.json * flexboxes all the way down * dynamically generate groupby and datasource in select control * big wip * fix target column name * no importing nonexistent things * styles and name editing * Add hook for retrieval of all filter states * start with a new filter when clicking add filter * handle removed filters gracefully * fix incorrect default filter configuration * add fields to useAllFilterState * add redux for filterconfigs * add support for native_filters * remove consoles * improve filter removal * unbreak infinite loop * basic sidebar toggling working! * collapsing and menu working more smoothly * linting * make dataset and column inputs work * save filter values properly * add dashboard event for filter updates * guarded * apply filters properly * fix schema * making New Filter button a link * gridunits ftw * centering modal * tis not a button anymore! nixing type. * plus and collapse buttons instead of "more" menu * updating full size filter icons * adding icons to filter collapsing/expanding * turning off animation, but leaving class-based animation css * fix linting error * fix native filters for legacy charts * updates test * no individual apply buttons * fix bugs with filter config modal * remove redundant code * switch to the filter with validation errors on submit * separate form validation * switch config button from add to edit * switch to the filter with validation errors on submit * separate form validation * switch config button from add to edit * update tests * oops forgot to add the fancy new useChangeEffect hook * comments and code reorganization * rename native_filters to extr_form_data and move hook * disable native filters in viz selector * add cascading * implement new extra form data api * cleanup * updates tests * bump npm packages * fix bad merge on package.json + lock * lint * replace in and not in with uppercase * lint * lint * lint * lint * bulk test fix * Sort select input alphabetically * Change type for sorting elements * sleeker filter removal UX * fix rest of unit tests * make filter operators all uppercase * Hide Filter bar when there are no filters * Show edit button for dashboard owners only * Add visible argument to filters toggle function to avoid future regression * Improve Toggle filters bar function * lint * fix js lint + set createNewOnOpen * Handle setting extra form data in Filter Bar instead of Filter Control * Add Handle apply filter function to Apply button * Allow applying changes instantly * Fix types * remove console logs * fix package * Add Error Boundary component to Filter bar and Filter Config Modal * fix jest tests * update native filters tests to pass * reset cypress baseUrl * remove unnecessary field * Add Parent Filter input field to Config Modal * Create Cascade Filter & display children filters * Add Cascade Popover * Display Filter value both in Filter Bar and in Cascade Popover * Display the youngest filter value label in the Filter bar * Add styles to Cascade Popover and filters * Force to apply changes instantly for parent filters and refactor styles * Show error for no cyclical hierarchy and refactor * Add validation for parent filter to be applied instantly * Add Error Boundary to Filter Config Modal * cleanup: remove unused state fields * move unrelated types to an appropriate location * remove misplaced resource fetch error logic * fix cascadeParentIds error * fix cypress password * initial attempt at fixing scope issue * fix bad merge * fix lint * trying out makeApi for saving filters * remove unused import * fix test * silence bad test * Improve styling of Filter Config Modal * Improve styles for whole native filters feature * Add styles for active filter tab * Fix text for scoping * Clean up Filter Bar and Config Modal styles * Remove fractional gridUnits. Change name for CheckboxFormItem. Add placeholder to Parent Filter select. * Remove unnecessary button size for Config Modal * add native-filter feat flag config * oops fix here * remove space * Update superset-frontend/src/common/components/index.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts Co-authored-by: Evan Rusackas <evan@preset.io> * Add Cache Wrapper helper to avoid datasets requests deduplication * Add license to new Cache Wrapper helper * Add Cache Wrapper tests * Fix expanding Filter Bar * use styledMount in tests * comment Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * Update superset-frontend/src/dashboard/components/nativeFilters/FilterConfigurationLink.tsx Co-authored-by: Evan Rusackas <evan@preset.io> * address PR feedback * fix package lock * null guards * Fix charts resizing * removing emotion/react and going old school on css animation * fxing css glitch on scoping disclaimer * src paths. * using gridUnits * nixing unnecessary diamonds * linting * fix type errors * Inverting collapsed icons... closer to data src selector design * restoring feature flag to proper default setting * missing condition * fix tests * patching test * just a button * flaky tests Co-authored-by: David Aaron Suddjian <aasuddjian@gmail.com> Co-authored-by: Phillip Kelley-Dotson <pkelleydotson@yahoo.com> Co-authored-by: Simcha Shats <simcha.shats@nielsen.com> Co-authored-by: amitNielsen <amit.miran@nielsen.com> Co-authored-by: Ville Brofeldt <ville.v.brofeldt@gmail.com> Co-authored-by: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com> Co-authored-by: Agata Stawarz-Pastewska <agata.stawarz-pastewska@polidea.com> Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
mistercrunch
added
🏷️ bot
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Adds onto #11814
This branch isn't my own work so much as a party! This is a feature branch containing the excellent work of:
@suddjian
@villebro
@pkdotson
@agatapst
@simchanielsen
@ amitmiran137
NEW STUFF! 🎉
• adjust styling to match design spec
• better filter delete UX
• cascading filters
• error boundaries
• non-instant filtering
• default values
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
TEST PLAN
ADDITIONAL INFORMATION