Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Delete account join request when redeeming an invite - #352

Merged
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request
Jun 14, 2025
Merged

Delete account join request when redeeming an invite#352
msukkari merged 3 commits into
mainfrom
msukkarieh/stale_join_request

Conversation

@msukkari

@msukkarimsukkari commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

Fixes#337

Summary by CodeRabbit

  • Bug Fixes
    • Improved invite redemption process by automatically removing any existing account requests linked to the user and organization after redeeming an invite. This ensures a smoother onboarding experience and prevents duplicate account requests.

@coderabbitai

coderabbitaiBot commented Jun 13, 2025

Copy link
Copy Markdown
Contributor

"""

Walkthrough

The redeemInvite function now includes logic to locate and delete any account request associated with the user and organization after a successful invite redemption. This ensures that pending account requests are cleaned up when a user joins via an invite, preventing duplicate or stale pending requests.

Changes

File(s)Change Summary
packages/web/src/actions.tsAdded logic in redeemInvite to delete matching account requests after invite redemption.

Sequence Diagram(s)

sequenceDiagram
participant User
participant WebApp
participant Database
User->>WebApp: Redeem invite
WebApp->>Database: Create user-to-org membership
WebApp->>Database: Update user
WebApp->>Database: Delete invite
WebApp->>Database: Query for matching account request
alt Account request exists
WebApp->>Database: Delete account request
WebApp->>WebApp: Log info
end
WebApp->>Database: Increment billing seat count
WebApp-->>User: Return result
Loading

Assessment against linked issues

ObjectiveAddressedExplanation
Remove user from "Pending requests" after invite redemption (#337)
Prevent duplicate membership creation and related errors after invite redemption (#337)

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Poem

In the warren of code, a bug did hide,
Pending requests refused to subside.
With a hop and a nibble, the logic was tweaked—
Now stale invites and requests are properly cleaned.
The burrow is tidy, the carrots aligned,
Bugs are gone, and all is fine! 🥕✨
"""


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a66abf2 and b2a7f04.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/web/src/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build
✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

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 (1)
packages/web/src/actions.ts (1)

1150-1166: Minor optimisation: avoid redundant read

After correcting the composite key, you can eliminate the initial findUnique and do a single deleteMany:

-const accountRequest = await tx.accountRequest.findUnique({ ... });--if (accountRequest) {- await tx.accountRequest.delete({- where: { id: accountRequest.id },- });-}+await tx.accountRequest.deleteMany({+ where: {+ requestedById: user.id,+ orgId: invite.orgId,+ },+});

This is idempotent, cheaper, and avoids two round-trips inside the transaction.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fbf805 and a66abf2.

📒 Files selected for processing (1)
  • packages/web/src/actions.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build
  • GitHub Check: build
  • GitHub Check: build

Comment threadpackages/web/src/actions.ts
brendan-kellam
brendan-kellam previously approved these changes Jun 14, 2025
@msukkari
msukkari merged commit 9d86052 into mainJun 14, 2025
@brendan-kellam

Copy link
Copy Markdown
Contributor

@msukkari could you add a changelog?

Sign up for freeto 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.

[bug] Invited user still shows up in Pending requests

2 participants

@msukkari@brendan-kellam