Skip to content

Add fuzzy matching to the tasks filter #1960

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

Merged
merged 4 commits into from
Apr 22, 2025

Conversation

myftija
Copy link
Collaborator

@myftija myftija commented Apr 21, 2025

Changes in this PR:

  • Added a react hook that provides fuzzy filtering functionality for any list of objects. It uses match-sorter to perform the filtering across multiple object properties and consistently order the results by score.
  • Updated the task list view in the Tasks and Test page to enable fuzzy filtering.

✅ Checklist

  • I have followed every step in the contributing guide
  • The PR title follows the convention.
  • I ran and tested the code works

Screenshots

image

Summary by CodeRabbit

  • New Features

    • Introduced fuzzy search functionality for filtering tasks, allowing more flexible and intuitive search results across multiple fields.
  • Refactor

    • Replaced previous text-based task filtering with a new fuzzy filtering system in task lists and selectors for improved usability and accuracy.

Copy link

changeset-bot bot commented Apr 21, 2025

⚠️ No Changeset found

Latest commit: 5530f69

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Apr 21, 2025

Walkthrough

This set of changes replaces the previous custom task filtering logic with a new, generalized fuzzy filtering hook. The old useFilterTasks hook is deleted, and a new useFuzzyFilter hook is introduced, leveraging the matchSorter library for fuzzy matching. Components that previously used useFilterTasks are updated to use useFuzzyFilter, specifying the relevant object keys for filtering. The filtering logic is now more flexible and concise, with the ability to perform fuzzy searches across multiple fields.

Changes

File(s) Change Summary
apps/webapp/app/hooks/useFilterTasks.ts Deleted the useFilterTasks custom hook, which previously filtered tasks based on text input.
apps/webapp/app/hooks/useFuzzyFilter.ts Added a new useFuzzyFilter hook that provides fuzzy filtering using matchSorter and accepts configurable keys.
apps/webapp/app/routes/_app.orgs...env.$envParam._index/route.tsx Replaced use of custom text filtering with the new useFuzzyFilter for filtering tasks by specified keys.
apps/webapp/app/routes/_app.orgs...env.$envParam.test/route.tsx Updated to use useFuzzyFilter instead of useFilterTasks in the TaskSelector component, specifying filter keys.

Sequence Diagram(s)

sequenceDiagram
    participant Component
    participant useFuzzyFilter
    participant matchSorter

    Component->>useFuzzyFilter: Pass items and keys
    useFuzzyFilter->>useFuzzyFilter: Maintain filterText state
    Component->>useFuzzyFilter: setFilterText(newText)
    useFuzzyFilter->>matchSorter: Filter items using filterText and keys
    matchSorter-->>useFuzzyFilter: Return filteredItems
    useFuzzyFilter-->>Component: Provide filteredItems, filterText, setFilterText
Loading

Poem

In the warren, code hops anew,
Fuzzy filters now sift tasks through.
Old ways departed, new hooks appear,
Searching by keys—results crystal clear!
With matchSorter’s help, we quickly find,
The tasks we seek, of every kind.
🐇✨

Tip

⚡💬 Agentic Chat (Pro Plan, General Availability)
  • We're introducing multi-step agentic chat in review comments and issue comments, within and outside of PR's. This feature enhances review and issue discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments and add commits to existing pull requests.
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (2)
apps/webapp/app/hooks/useFuzzyFilter.ts (2)

26-26: Avoid using Object as a type

The static analysis tool correctly flags the use of Object as a type. This is a broad type that means "any non-nullable value", which could lead to unexpected behavior.

-export function useFuzzyFilter<T extends Object>({
+export function useFuzzyFilter<T extends Record<string, any>>({
🧰 Tools
🪛 Biome (1.9.4)

[error] 26-26: Don't use 'Object' as a type.

Prefer explicitly define the object shape. This type means "any non-nullable value", which is slightly better than 'unknown', but it's still a broad type.

(lint/complexity/noBannedTypes)


46-54: Consider adding a comment explaining the reduceRight operation

While the existing comment mentions sorting by score of the first term, it might be helpful to explain why reduceRight is used (applying filters from right to left) and how this affects the final sorted results.

-    // sort by the score of the first term
+    // Apply filters from right to left (last term first) to progressively narrow down results
+    // This ensures the first term has the strongest influence on the final sorting
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2c19693 and 5530f69.

📒 Files selected for processing (4)
  • apps/webapp/app/hooks/useFilterTasks.ts (0 hunks)
  • apps/webapp/app/hooks/useFuzzyFilter.ts (1 hunks)
  • apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx (2 hunks)
  • apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test/route.tsx (2 hunks)
💤 Files with no reviewable changes (1)
  • apps/webapp/app/hooks/useFilterTasks.ts
🧰 Additional context used
🧬 Code Graph Analysis (1)
apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test/route.tsx (2)
apps/webapp/app/hooks/useFuzzyFilter.ts (1)
  • useFuzzyFilter (26-61)
apps/webapp/app/presenters/v3/TaskListPresenter.server.ts (1)
  • TaskListItem (14-19)
🪛 Biome (1.9.4)
apps/webapp/app/hooks/useFuzzyFilter.ts

[error] 26-26: Don't use 'Object' as a type.

Prefer explicitly define the object shape. This type means "any non-nullable value", which is slightly better than 'unknown', but it's still a broad type.

(lint/complexity/noBannedTypes)

⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - npm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)
  • GitHub Check: typecheck / typecheck
🔇 Additional comments (3)
apps/webapp/app/hooks/useFuzzyFilter.ts (1)

1-61: Well-implemented fuzzy filtering hook with excellent documentation

The new useFuzzyFilter hook is well-designed, with thorough JSDoc documentation, good example usage, and a clean implementation using the matchSorter library. The approach of splitting filter text into terms and applying them progressively is particularly elegant.

🧰 Tools
🪛 Biome (1.9.4)

[error] 26-26: Don't use 'Object' as a type.

Prefer explicitly define the object shape. This type means "any non-nullable value", which is slightly better than 'unknown', but it's still a broad type.

(lint/complexity/noBannedTypes)

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test/route.tsx (1)

29-29: Updated filtering logic with appropriate search keys

The switch to using useFuzzyFilter with specific task properties is a good improvement. The selected keys for filtering (taskIdentifier, friendlyId, id, filePath, and triggerSource) provide comprehensive search capabilities across the most relevant task properties.

Also applies to: 123-126

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx (1)

70-70: Well-configured fuzzy filter for task list view

The implementation correctly uses the new useFuzzyFilter hook with appropriate keys for the tasks list. The choice of filtering by slug, filePath, and triggerSource aligns with the visible columns in the table, providing intuitive search behavior.

Also applies to: 172-175

@matt-aitken matt-aitken merged commit 26aad58 into triggerdotdev:main Apr 22, 2025
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants