feat(filters): Add new tag filtering modes `AND`, `EXACT` & `NOT` (@TristanMarion) #6388

TristanMarion · 2025-03-21T14:13:50Z

Description

This PR implements issue #4239, which adds a new toggle feature to switch between OR, AND and EXACT logic modes for tag filtering in the account page :

OR: any selected tag must match
AND: all selected tags must match
EXACT: exactly the selected tags must match

Expected behaviors :

AND mode
- none - Results without tags
- tags - Results tags should include the selected tag/tags
- none and tag - Nothing
- all (or no tag) - Nothing
OR mode
- none - Results without tags
- tags - Result tags should include any of the selected tags
- none and tag - Result without tags plus result tags should include any of the selected tags
- all (or no tag) - Everything
EXACT mode
- none - Results without tags
- tags - Results tags should exactly match the selected tags
- none and tag - Nothing
- all (or no tag) - Nothing

Checks

Check if any open issues are related to this PR; if so, be sure to tag them below.
Make sure the PR title follows the Conventional Commits standard. (https://www.conventionalcommits.org for more info)
Make sure to include your GitHub username prefixed with @ inside parentheses at the end of the PR title.

Closes #4239

Several checks in video :

Dataset used

We will mainly have tag 1, 2 and 3 for our tests, the list of test tags is : 1, 2, 3, 1,2, 1,3, 2,3, 1,2,3

Screen.Recording.2025-03-23.at.14.52.55.mov

OR mode with tag 1 : we only have 1, 1,2, 1,3 & 1,2,3

Screen.Recording.2025-03-23.at.14.53.59.mov

OR mode with tags 1 & 2 : we only have 1, 2, 1,2, 2,3, 1,3 & 1,2,3

Screen.Recording.2025-03-23.at.14.54.15.mov

AND mode with tags 1 & 2 : we only have 1,2 & 1,2,3

Screen.Recording.2025-03-23.at.14.54.29.mov

EXACT mode with tags 1 & 2 : we only have 1,2

Screen.Recording.2025-03-23.at.14.54.43.mov

EXACT mode with tag 1 : we only have 1

Screen.Recording.2025-03-23.at.14.54.53.mov

AND mode with tag 1 (same behavior as OR with tag 1) : we only have 1, 1,2, 1,3 & 1,2,3

Screen.Recording.2025-03-23.at.14.55.03.mov

github-actions · 2025-03-21T14:16:07Z

Continuous integration check(s) failed. Please review the failing check's logs and make the necessary changes.

Miodec · 2025-03-21T16:04:35Z

Nice! How about we also add an 'exact' mode, where result tags have to exactly match your selection?

nadalaba · 2025-03-21T20:13:04Z

frontend/src/ts/pages/account.ts

+          if (enabledTagIds.length === 0) {
+            // No tag filters enabled, show everything
+            tagHide = false;


Since "none" does not get pushed to enabledTagIds, does this mean when only "none" is enabled, all results (with & without tags) will be shown?

Indeed, TBH I did not know how to handle this edge case, do you think we should display only the tests with no tags at all ?

Yeah, behavior-wise, only results with no tags should be shown imo.
Implementation-wise, I don't think these 3 lines are needed here (I did not test this however)

Actually this is already done in the existing code and this block won't be reachable if the result has no tag so I will remove this part and ensure we have the correct behavior anyway

frontend/src/ts/pages/account.ts

+            const resultHasAllTags = enabledTagIds.every((tagId) =>
+              result.tags?.includes(tagId)
+            );


TristanMarion · 2025-03-21T22:25:06Z

Thanks for the feedbacks 😊 indeed this was intended to have a non exclusive AND (to match at least the tags selected but not all the tags) but if you think that it should be an exact match I can perform the change 👍
Let me know what you prefer and I’ll update it 👌

nadalaba · 2025-03-22T09:03:40Z

Thanks for the feedbacks 😊 indeed this was intended to have a non exclusive AND (to match at least the tags selected but not all the tags)

My bad, I see the use case now. However, I think an "exact" mode would be equally useful.
This is just my free opinion as a user, it is up to miodec if he prefers 3 modes or 2.

Miodec · 2025-03-22T10:06:03Z

Lets have 3 modes, or, non exclusive and and exclusive and (exact mode). Click the button to cycle through them.

TristanMarion · 2025-03-22T13:42:12Z

Pretty clear, I’ll handle the changes to match the expected behaviour. Makes sense to have the three modes 👌

TristanMarion · 2025-03-23T17:09:15Z

I've reorder the imports to reduce the number of line changed 👍 (and to keep the same import order as before too 😅 )

nadalaba · 2025-03-24T16:06:22Z

frontend/src/ts/pages/account.ts

+            } else if (
+              ResultFilters.getFilter("tags", "none") &&
+              result.tags.length === 0
+            ) {
+              // Special case: "none" tag is enabled and result has no tags
+              tagHide = false;
+            }


this block will never be reached (it is in an else block that gets executed when result.tags.length > 0), I wonder why the linter didn't complain

Sorry I will remove it, I'll test what happens with the none tag

Handled in 70c1f31 👍
Indeed the code is already handling this case earlier 😅

nadalaba · 2025-03-24T16:06:59Z

frontend/src/ts/pages/account.ts

+            } else if (
+              ResultFilters.getFilter("tags", "none") &&
+              result.tags.length === 0
+            ) {
+              // Special case: "none" tag is enabled and result has no tags
+              tagHide = false;
+            }


this block will never be reached

Handled in 70c1f31 👍

…ter mode

TristanMarion · 2025-03-25T15:14:28Z

frontend/src/ts/elements/account/result-filters.ts

        merged[groupKey] = id;
      } else if (groupKey === "name") {
        merged[groupKey] = filters[groupKey] ?? defaultResultFilters[groupKey];
+      } else if (groupKey === "tagsFilterMode") {


I can merge this condition with the previous one as they contain the same code, let me know what you prefer

monkeytypegeorge added frontend User interface or web stuff packages Changes in local packages labels Mar 21, 2025

github-actions bot added waiting for update Pull requests or issues that require changes/comments before continuing and removed waiting for update Pull requests or issues that require changes/comments before continuing labels Mar 21, 2025

monkeytypegeorge added the backend Server stuff label Mar 21, 2025

TristanMarion force-pushed the feature/tags-filtering-and-mode branch from b71dc32 to c5fea36 Compare March 21, 2025 14:26

nadalaba reviewed Mar 21, 2025

View reviewed changes

frontend/src/ts/pages/account.ts

Comment on lines +483 to +485

const resultHasAllTags = enabledTagIds.every((tagId) =>

result.tags?.includes(tagId)

);

This comment was marked as resolved.

Sign in to view

TristanMarion changed the title ~~feat(filters): Add new tag filtering mode AND (@TristanMarion)~~ feat(filters): Add new tag filtering modes AND & EXACT (@TristanMarion) Mar 23, 2025

TristanMarion force-pushed the feature/tags-filtering-and-mode branch 2 times, most recently from 81ab42a to 407c003 Compare March 23, 2025 17:00

nadalaba reviewed Mar 24, 2025

View reviewed changes

TristanMarion added 8 commits March 25, 2025 16:12

feat: add new property in ResultFiltersSchema to contain the tags fil…

13c26e6

…ter mode

feat: display filter mode next to tags title in filters

24ab797

feat: toggle filter mode on click

5ca9d9f

feat: implement AND mode for tags filtering

f5c5235

test: fix failing tests

851ddd1

feat: add exact tag match filter mode

9faac20

refactor: reorder imports

9d040c4

refactor: remove useless code

967d66d

TristanMarion force-pushed the feature/tags-filtering-and-mode branch from 70c1f31 to 967d66d Compare March 25, 2025 15:12

TristanMarion commented Mar 25, 2025

View reviewed changes

update string

52fdf83

TristanMarion marked this pull request as draft March 26, 2025 08:57

update string

16cbe34

TristanMarion changed the title ~~feat(filters): Add new tag filtering modes AND & EXACT (@TristanMarion)~~ feat(filters): Add new tag filtering modes AND, EXACT & NOT (@TristanMarion) Mar 29, 2025

Uh oh!

feat(filters): Add new tag filtering modes AND, EXACT & NOT (@TristanMarion) #6388

Are you sure you want to change the base?

feat(filters): Add new tag filtering modes AND, EXACT & NOT (@TristanMarion) #6388

Uh oh!

Conversation

TristanMarion commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checks

Dataset used

Uh oh!

github-actions bot commented Mar 21, 2025

Uh oh!

Miodec commented Mar 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

TristanMarion commented Mar 21, 2025

Uh oh!

nadalaba commented Mar 22, 2025

Uh oh!

Miodec commented Mar 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TristanMarion commented Mar 22, 2025

Uh oh!

TristanMarion commented Mar 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TristanMarion Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

feat(filters): Add new tag filtering modes `AND`, `EXACT` & `NOT` (@TristanMarion) #6388

feat(filters): Add new tag filtering modes `AND`, `EXACT` & `NOT` (@TristanMarion) #6388

TristanMarion commented Mar 21, 2025 •

edited

Loading

Miodec commented Mar 22, 2025 •

edited

Loading

TristanMarion Mar 25, 2025 •

edited

Loading