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

[DataGridPro] Fix filtering with inactive items #5993

Merged
merged 4 commits into from
Sep 2, 2022

Conversation

alexfauquette
Copy link
Member

Fix #5989

@alexfauquette alexfauquette added the regression A bug, but worse label Sep 1, 2022
@mui-bot
Copy link

mui-bot commented Sep 1, 2022

These are the results for the performance tests:

Test case Unit Min Max Median Mean σ
Filter 100k rows ms 462.9 862.3 645.2 629.9 148.24
Sort 100k rows ms 493.4 923.6 835.3 773.84 157.325
Select 100k rows ms 205.8 301.9 210.2 232.62 36.18
Deselect 100k rows ms 175.9 225.3 210.1 200.32 19.962

Generated by 🚫 dangerJS against b0f60a9

@@ -75,6 +75,53 @@ describe('<DataGridPro /> - Filter', () => {
expect(getColumnValues(0)).to.deep.equal(['Adidas', 'Puma']);
});

it('should not apply items that are incomplet with AND operator', () => {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
it('should not apply items that are incomplet with AND operator', () => {
it('should not apply items that are incomplete with AND operator', () => {

expect(getColumnValues(0)).to.deep.equal(['Adidas', 'Puma']);
});

it('should not apply items that are incomplet with OR operator', () => {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
it('should not apply items that are incomplet with OR operator', () => {
it('should not apply items that are incomplete with OR operator', () => {

render(
<TestCase
filterModel={{
items: [
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
items: [
linkOperator: GridLinkOperator.And,
items: [

To not rely on default link operator

@alexfauquette alexfauquette merged commit 7aa156e into mui:master Sep 2, 2022
@alexfauquette alexfauquette deleted the fix-filtering2 branch September 2, 2022 08:22
@alexfauquette alexfauquette mentioned this pull request Sep 2, 2022
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
regression A bug, but worse
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[DataGridPremium] Multi filtering on premium data grid
3 participants