Match all / all conditions toggle

[elie222]

Summary by CodeRabbit

• New Features

  • Added a dropdown menu to select conditional operators (AND/OR) for rule conditions
  • Introduced more flexible logic for managing rule conditions

• Improvements

  • Enhanced rule creation and update workflows with logical operator selection
  • Improved form usability by allowing dynamic condition management

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated (UTC)
inbox-zero	🔄 Building (Inspect)	Visit Preview	Jan 9, 2025 10:56pm

[coderabbitai]

Walkthrough

The pull request introduces a new feature for managing logical operators in rule creation and editing. By adding support for LogicalOperator (AND/OR), the changes enable users to specify how multiple conditions should be evaluated when creating or updating automation rules. This modification spans across multiple files, including the rule form UI, validation schema, and server-side actions, ensuring consistent implementation of the new conditional logic.

Changes

File	Change Summary
apps/web/app/(app)/automation/RuleForm.tsx	Added dropdown for selecting logical operator (AND/OR), imported FilterIcon and LogicalOperator
apps/web/utils/actions/rule.ts	Added conditionalOperator to create and update rule actions with default LogicalOperator.AND
apps/web/utils/actions/validation.ts	Imported LogicalOperator and added conditionalOperator to createRuleBody schema with AND/OR enum

Sequence Diagram

sequenceDiagram
    participant User
    participant RuleForm
    participant ValidationSchema
    participant RuleAction

    User->>RuleForm: Select Logical Operator
    RuleForm->>ValidationSchema: Validate Operator
    ValidationSchema-->>RuleForm: Validation Result
    RuleForm->>RuleAction: Submit Rule with Operator
    RuleAction->>RuleAction: Process Rule Conditions

Loading

Possibly related PRs

• Refactor components to process tab (instead of test tab) #290: Modifications to ProcessRules.tsx related to rule processing functionality
• Allow AI to use Smart Categories and Webhook when creating rules #295: Introduction of hasSmartCategories parameter in aiPromptToRules function

Poem

🐰 Logical rabbits hop and play,
AND or OR, we'll find a way!
Conditions dance with newfound grace,
Our rules now have a smarter pace.
Hop along, automation's delight! 🚀

Finishing Touches

• 📝 Generate Docstrings (Beta)

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 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. (Beta)
• @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.

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (1)

apps/web/app/(app)/automation/RuleForm.tsx (1)

204-233: LGTM! Clean UI implementation with a minor suggestion.

The dropdown implementation for conditional operators is well-structured and properly integrated with form management.

Consider making the button text more explicit to better convey the current state:

-              Match{" "}
-              {watch("conditionalOperator") === LogicalOperator.AND
-                ? "all"
-                : "any"}
+              {watch("conditionalOperator") === LogicalOperator.AND
+                ? "Match all conditions"
+                : "Match any condition"}

This would make the button's purpose immediately clear without requiring users to open the dropdown.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between b2f991a and 4367d34.

📒 Files selected for processing (3)

• apps/web/app/(app)/automation/RuleForm.tsx (4 hunks)
• apps/web/utils/actions/rule.ts (3 hunks)
• apps/web/utils/actions/validation.ts (2 hunks)

🔇 Additional comments (3)

apps/web/utils/actions/validation.ts (1)

141-143: LGTM! Well-structured schema modification.

The addition of conditionalOperator to the schema is implemented correctly with proper typing and a safe default value.

apps/web/utils/actions/rule.ts (2)

62-62: LGTM! Consistent with schema.

The conditionalOperator is correctly implemented in the create action.

---

129-130: LGTM! Consistent with schema.

The conditionalOperator is correctly implemented in the update action.