Skip to content

Comments

Change microsoft defaults#838

Merged
elie222 merged 1 commit intomainfrom
feat/microsoft-defaults
Oct 7, 2025
Merged

Change microsoft defaults#838
elie222 merged 1 commit intomainfrom
feat/microsoft-defaults

Conversation

@elie222
Copy link
Owner

@elie222 elie222 commented Oct 7, 2025

Summary by CodeRabbit

  • New Features

    • Category handling is now provider-aware. For Microsoft accounts, newsletters, receipts, and notifications are automatically moved to folders instead of being labeled.
  • Bug Fixes

    • Onboarding flow now waits for account/provider data to load before rendering, preventing partial or incorrect screens during initialization.
  • Chores

    • Bumped app version to v2.15.4.

@vercel
Copy link

vercel bot commented Oct 7, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Updated (UTC)
inbox-zero Building Building Preview Oct 7, 2025 10:00pm

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Oct 7, 2025

Walkthrough

Adds a loading guard in OnboardingContent using isLoading from useAccount; updates category-config to choose move_folder for Microsoft providers and label otherwise for specific categories; bumps version to v2.15.4.

Changes

Cohort / File(s) Summary
Onboarding loading guard
apps/web/app/(app)/.../[emailAccountId]/onboarding/OnboardingContent.tsx
Destructure isLoading from useAccount and return null while loading when provider is not available; no other onboarding step logic changes.
Provider-aware category actions
apps/web/utils/category-config.tsx
For Newsletter, Receipt, and Notification categories, set action to isMicrosoftProvider(provider) ? "move_folder" : "label"; no signature changes.
Version bump
version.txt
Increment version from v2.15.3 to v2.15.4.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  participant UI as OnboardingContent
  participant Hook as useAccount
  UI->>Hook: get { emailAccountId, provider, isLoading }
  alt isLoading || !provider
    UI-->>UI: return null (defer render)
  else ready
    UI-->>UI: render onboarding steps
  end
Loading
sequenceDiagram
  autonumber
  participant Config as categoryConfig(provider)
  participant Util as isMicrosoftProvider
  participant Client as Consumer
  Client->>Config: request categories
  Config->>Util: check provider
  alt Microsoft provider
    Config-->>Client: actions for Newsletter/Receipt/Notification = "move_folder"
  else Non-Microsoft
    Config-->>Client: actions for Newsletter/Receipt/Notification = "label"
  end
  Note over Client: Other categories unchanged
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Poem

A whisk of code, a pause to load,
I twitch my ears—provider’s mode.
Labels hop or folders move,
Version bumps with gentle groove.
In tidy fields of inbox rye,
I file my mail and softly sigh. 🐇✉️

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. You can run @coderabbitai generate docstrings to improve docstring coverage.
✅ Passed checks (2 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The title “Change microsoft defaults” directly describes the central update of adjusting default actions for the Microsoft provider in the category configuration, making it clear and focused on the main change without unnecessary detail.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch feat/microsoft-defaults

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

Comment @coderabbitai help to get the list of available commands and usage tips.

@elie222 elie222 merged commit 0534445 into main Oct 7, 2025
11 of 13 checks passed
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

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0ee64f6 and 501501f.

📒 Files selected for processing (3)
  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx (2 hunks)
  • apps/web/utils/category-config.tsx (2 hunks)
  • version.txt (1 hunks)
🧰 Additional context used
📓 Path-based instructions (15)
!{.cursor/rules/*.mdc}

📄 CodeRabbit inference engine (.cursor/rules/cursor-rules.mdc)

Never place rule files in the project root, in subdirectories outside .cursor/rules, or in any other location

Files:

  • version.txt
  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
!pages/_document.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/ultracite.mdc)

!pages/_document.{js,jsx,ts,tsx}: Don't import next/document outside of pages/_document.jsx in Next.js projects.
Don't import next/document outside of pages/_document.jsx in Next.js projects.

Files:

  • version.txt
  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
apps/web/**/*.{ts,tsx}

📄 CodeRabbit inference engine (apps/web/CLAUDE.md)

apps/web/**/*.{ts,tsx}: Use TypeScript with strict null checks
Path aliases: Use @/ for imports from project root
Use proper error handling with try/catch blocks
Format code with Prettier
Leverage TypeScript inference for better DX

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
apps/web/app/**

📄 CodeRabbit inference engine (apps/web/CLAUDE.md)

NextJS app router structure with (app) directory

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
apps/web/**/*.tsx

📄 CodeRabbit inference engine (apps/web/CLAUDE.md)

apps/web/**/*.tsx: Follow tailwindcss patterns with prettier-plugin-tailwindcss
Prefer functional components with hooks
Use shadcn/ui components when available
Ensure responsive design with mobile-first approach
Follow consistent naming conventions (PascalCase for components)
Use LoadingContent component for async data
Use result?.serverError with toastError and toastSuccess
Use LoadingContent component to handle loading and error states consistently
Pass loading, error, and children props to LoadingContent

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/form-handling.mdc)

**/*.tsx: Use React Hook Form with Zod for validation
Validate form inputs before submission
Show validation errors inline next to form fields

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/logging.mdc)

**/*.{ts,tsx}: Use createScopedLogger for logging in backend TypeScript files
Typically add the logger initialization at the top of the file when using createScopedLogger
Only use .with() on a logger instance within a specific function, not for a global logger

Import Prisma in the project using import prisma from "@/utils/prisma";

**/*.{ts,tsx}: Don't use TypeScript enums.
Don't use TypeScript const enum.
Don't use the TypeScript directive @ts-ignore.
Don't use primitive type aliases or misleading types.
Don't use empty type parameters in type aliases and interfaces.
Don't use any or unknown as type constraints.
Don't use implicit any type on variable declarations.
Don't let variables evolve into any type through reassignments.
Don't use non-null assertions with the ! postfix operator.
Don't misuse the non-null assertion operator (!) in TypeScript files.
Don't use user-defined types.
Use as const instead of literal types and type annotations.
Use export type for types.
Use import type for types.
Don't declare empty interfaces.
Don't merge interfaces and classes unsafely.
Don't use overload signatures that aren't next to each other.
Use the namespace keyword instead of the module keyword to declare TypeScript namespaces.
Don't use TypeScript namespaces.
Don't export imported variables.
Don't add type annotations to variables, parameters, and class properties that are initialized with literal expressions.
Don't use parameter properties in class constructors.
Use either T[] or Array consistently.
Initialize each enum member value explicitly.
Make sure all enum members are literal values.

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
apps/web/app/(app)/*/**

📄 CodeRabbit inference engine (.cursor/rules/page-structure.mdc)

Components for the page are either put in page.tsx, or in the apps/web/app/(app)/PAGE_NAME folder

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
apps/web/app/(app)/*/**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/page-structure.mdc)

If you need to use onClick in a component, that component is a client component and file must start with 'use client'

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
apps/web/app/(app)/*/**/**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/page-structure.mdc)

If we're in a deeply nested component we will use swr to fetch via API

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
apps/web/app/**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/project-structure.mdc)

Components with onClick must be client components with use client directive

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
**/*.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/ultracite.mdc)

**/*.{js,jsx,ts,tsx}: Don't use elements in Next.js projects.
Don't use elements in Next.js projects.
Don't use namespace imports.
Don't access namespace imports dynamically.
Don't use global eval().
Don't use console.
Don't use debugger.
Don't use var.
Don't use with statements in non-strict contexts.
Don't use the arguments object.
Don't use consecutive spaces in regular expression literals.
Don't use the comma operator.
Don't use unnecessary boolean casts.
Don't use unnecessary callbacks with flatMap.
Use for...of statements instead of Array.forEach.
Don't create classes that only have static members (like a static namespace).
Don't use this and super in static contexts.
Don't use unnecessary catch clauses.
Don't use unnecessary constructors.
Don't use unnecessary continue statements.
Don't export empty modules that don't change anything.
Don't use unnecessary escape sequences in regular expression literals.
Don't use unnecessary labels.
Don't use unnecessary nested block statements.
Don't rename imports, exports, and destructured assignments to the same name.
Don't use unnecessary string or template literal concatenation.
Don't use String.raw in template literals when there are no escape sequences.
Don't use useless case statements in switch statements.
Don't use ternary operators when simpler alternatives exist.
Don't use useless this aliasing.
Don't initialize variables to undefined.
Don't use the void operators (they're not familiar).
Use arrow functions instead of function expressions.
Use Date.now() to get milliseconds since the Unix Epoch.
Use .flatMap() instead of map().flat() when possible.
Use literal property access instead of computed property access.
Don't use parseInt() or Number.parseInt() when binary, octal, or hexadecimal literals work.
Use concise optional chaining instead of chained logical expressions.
Use regular expression literals instead of the RegExp constructor when possible.
Don't use number literal object member names th...

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
**/*.{jsx,tsx}

📄 CodeRabbit inference engine (.cursor/rules/ultracite.mdc)

**/*.{jsx,tsx}: Don't destructure props inside JSX components in Solid projects.
Don't use both children and dangerouslySetInnerHTML props on the same element.
Don't use Array index in keys.
Don't assign to React component props.
Don't define React components inside other components.
Don't use event handlers on non-interactive elements.
Don't assign JSX properties multiple times.
Don't add extra closing tags for components without children.
Use <>...</> instead of ....
Don't insert comments as text nodes.
Don't use the return value of React.render.
Make sure all dependencies are correctly specified in React hooks.
Make sure all React hooks are called from the top level of component functions.
Don't use unnecessary fragments.
Don't pass children as props.
Use semantic elements instead of role attributes in JSX.

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
**/*.{html,jsx,tsx}

📄 CodeRabbit inference engine (.cursor/rules/ultracite.mdc)

**/*.{html,jsx,tsx}: Don't use or elements.
Don't use accessKey attribute on any HTML element.
Don't set aria-hidden="true" on focusable elements.
Don't add ARIA roles, states, and properties to elements that don't support them.
Only use the scope prop on elements.
Don't assign non-interactive ARIA roles to interactive HTML elements.
Make sure label elements have text content and are associated with an input.
Don't assign interactive ARIA roles to non-interactive HTML elements.
Don't assign tabIndex to non-interactive HTML elements.
Don't use positive integers for tabIndex property.
Don't include "image", "picture", or "photo" in img alt prop.
Don't use explicit role property that's the same as the implicit/default role.
Make static elements with click handlers use a valid role attribute.
Always include a title element for SVG elements.
Give all elements requiring alt text meaningful information for screen readers.
Make sure anchors have content that's accessible to screen readers.
Assign tabIndex to non-interactive HTML elements with aria-activedescendant.
Include all required ARIA attributes for elements with ARIA roles.
Make sure ARIA properties are valid for the element's supported roles.
Always include a type attribute for button elements.
Make elements with interactive roles and handlers focusable.
Give heading elements content that's accessible to screen readers (not hidden with aria-hidden).
Always include a lang attribute on the html element.
Always include a title attribute for iframe elements.
Accompany onClick with at least one of: onKeyUp, onKeyDown, or onKeyPress.
Accompany onMouseOver/onMouseOut with onFocus/onBlur.
Include caption tracks for audio and video elements.
Make sure all anchors are valid and navigable.
Ensure all ARIA properties (aria-*) are valid.
Use valid, non-abstract ARIA roles for elements with ARIA roles.
Use valid ARIA state and property values.
Use valid values for the autocomplete attribute on input eleme...

Files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
  • apps/web/utils/category-config.tsx
apps/web/utils/**

📄 CodeRabbit inference engine (.cursor/rules/project-structure.mdc)

Create utility functions in utils/ folder for reusable logic

Files:

  • apps/web/utils/category-config.tsx
🧠 Learnings (1)
📚 Learning: 2025-07-08T13:14:07.449Z
Learnt from: elie222
PR: elie222/inbox-zero#537
File: apps/web/app/(app)/[emailAccountId]/clean/onboarding/page.tsx:30-34
Timestamp: 2025-07-08T13:14:07.449Z
Learning: The clean onboarding page in apps/web/app/(app)/[emailAccountId]/clean/onboarding/page.tsx is intentionally Gmail-specific and should show an error for non-Google email accounts rather than attempting to support multiple providers.

Applied to files:

  • apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
🧬 Code graph analysis (2)
apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx (1)
apps/web/providers/EmailAccountProvider.tsx (1)
  • useAccount (72-82)
apps/web/utils/category-config.tsx (2)
apps/web/utils/email/provider-types.ts (1)
  • isMicrosoftProvider (5-7)
apps/web/utils/rule/consts.ts (2)
  • SystemRule (12-20)
  • SystemRule (21-21)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: cubic · AI code reviewer
🔇 Additional comments (3)
version.txt (1)

1-1: LGTM!

Version bump is appropriate for the changes in this PR.

apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx (1)

30-30: LGTM!

Adding isLoading from useAccount is the right approach for implementing the loading guard.

apps/web/utils/category-config.tsx (1)

40-40: LGTM!

The provider-aware action logic for Newsletter, Receipt, and Notification is consistent with the existing pattern used for Marketing and ColdEmail categories. The use of isMicrosoftProvider correctly handles the distinction between Microsoft's folder-based system and Gmail's label-based system.

Also applies to: 64-64, 72-72

Comment on lines +104 to +107
// Show loading if provider is needed but not loaded yet
if (isLoading && !provider) {
return null;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion | 🟠 Major

🧩 Analysis chain

Verify the loading guard covers all edge cases.

The current guard blocks rendering only when isLoading && !provider. However, if isLoading is false but provider is still undefined (e.g., due to a data loading error), the rendering will proceed and steps 5-7 (StepLabels, StepDraft, StepCustomRules) will receive an undefined provider.

Consider whether the guard should be if (!provider) instead, or verify that provider is always defined once isLoading is false.

Run the following script to check how the dependent steps handle undefined provider:


🏁 Script executed:

#!/bin/bash
# Description: Check if StepLabels, StepDraft, and StepCustomRules handle undefined provider

# Search for provider usage in these step components
for step in StepLabels StepDraft StepCustomRules; do
  echo "=== Checking $step ==="
  fd -t f "$step.tsx" -x cat {} \; | head -100
done

# Look for provider type definitions to see if it's nullable
echo "=== Checking provider type definition ==="
rg -A 5 "type.*provider" apps/web/providers/EmailAccountProvider.tsx

Length of output: 6778


#!/bin/bash

Locate and preview OnboardingContent.tsx

echo "=== File Path ==="
fd OnboardingContent.tsx
echo "=== OnboardingContent.tsx Preview ==="
fd OnboardingContent.tsx -x sed -n '1,200p' {} ;

Search for provider hook usage

echo "=== Searching for provider hook ==="
rg -n "provider" -C3 apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx


🏁 Script executed:

#!/bin/bash
# Locate OnboardingContent.tsx
file=$(fd OnboardingContent.tsx | head -n1)
echo "=== File Path ==="
echo "$file"

# Preview first 200 lines
echo "=== Preview Lines 1-200 ==="
sed -n '1,200p' "$file"

# Search for provider, isLoading, and hook definitions
echo "=== Searching for provider usage ==="
rg -n "provider" -C3 "$file"

echo "=== Searching for isLoading usage ==="
rg -n "isLoading" -C3 "$file"

echo "=== Searching for hook or data loader ==="
rg -n "use" -C3 "$file"

Length of output: 7953


🏁 Script executed:

#!/bin/bash
# Locate EmailAccountProvider.tsx
file=$(fd providers/EmailAccountProvider.tsx | head -n1)
echo "=== File Path ==="
echo "$file"

# Preview first 200 lines (context, context provider setup)
echo "=== Preview Lines 1-200 ==="
sed -n '1,200p' "$file"

# Search for `provider` in context value and types
echo "=== Searching for provider in context ==="
rg -n "provider" -C3 "$file"

Length of output: 173


🏁 Script executed:

#!/bin/bash
# Find the EmailAccountProvider file (ts or tsx)
echo "=== Candidate Files ==="
fd -e ts -e tsx EmailAccountProvider

# Preview the first match
file=$(fd -e ts -e tsx EmailAccountProvider | head -n1)
echo "=== File Path ==="
echo "$file"

echo "=== Preview Lines 1-200 ==="
sed -n '1,200p' "$file"

# Show useAccount implementation
echo "=== useAccount Definition ==="
rg -n "useAccount" -C5 "$file"

# Show context value shape including provider and isLoading
echo "=== Context Value ==="
rg -n "createContext" -C5 "$file"
rg -n "AccountContext" -C5 "$file"
rg -n "value=" -C5 "$file"

Length of output: 4628


Include provider presence in loading guard
In OnboardingContent.tsx (lines 104–107), update the render guard to also block when provider is missing:

-  // Show loading if provider is needed but not loaded yet
-  if (isLoading && !provider) {
-    return null;
-  }
+  // Show loading or missing provider
+  if (isLoading || !provider) {
+    return null;
+  }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// Show loading if provider is needed but not loaded yet
if (isLoading && !provider) {
return null;
}
// Show loading or missing provider
if (isLoading || !provider) {
return null;
}
🤖 Prompt for AI Agents
In apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx around
lines 104 to 107, the render guard only returns early when isLoading is true and
provider is falsy; update it so the component also blocks rendering whenever
provider is missing by changing the condition to use a logical OR between
isLoading and the provider presence check, returning null if either is true.

Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

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

No issues found across 3 files

@elie222 elie222 deleted the feat/microsoft-defaults branch December 18, 2025 23:03
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.

1 participant