Chore/merge upstream #38
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oot#11335) - Refactor HandleStripeEventService to better manage features by plan - Add constants for features available in each plan tier (Startup, Business, Enterprise) - Add channel_instagram to Startup plan features - Improve downgrade handling to properly disable higher-tier features - Clean up and optimize tests for maintainability - Add comprehensive test coverage for plan upgrades and downgrades --------- Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.19 to 0.4.20. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/ruby/net-imap/releases">net-imap's releases</a>.</em></p> <blockquote> <h2>v0.4.20</h2> <h2>What's Changed</h2> <p>This release backports two features to prevent unbounded memory use: the <code>response_handlers</code> keyword argument to <code>Net::IMAP.new</code> so response handlers can be added before the server can send any responses (<a href="https://redirect.github.com/ruby/net-imap/pull/427">ruby/net-imap#427</a>), and the <code>max_response_size</code> config attribute (<a href="https://redirect.github.com/ruby/net-imap/pull/445">ruby/net-imap#445</a>).</p> <blockquote> <p>[!NOTE] The default <code>max_response_size</code> is <code>nil</code> (unlimited), to avoid backward compatibility issues with secure connections to trusted servers that are well-behaved. It can be configured more conservatively to guard against untrusted servers (for example, connecting to user-provided hostnames). <em>It is the responsibility of <code>net-imap</code> users to configure their client appropriately for the server they are connecting to.</em></p> </blockquote> <h3>Added</h3> <ul> <li>✨ Add <code>response_handlers</code> kwarg to <code>Net::IMAP.new</code> by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/427">ruby/net-imap#427</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/419">#419</a></li> </ul> </li> <li>✨ Limit max_response_size by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/445">ruby/net-imap#445</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/444">#444</a></li> </ul> </li> </ul> <h3>Documentation</h3> <ul> <li>📚 Backport documentation to v0.4 by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/426">ruby/net-imap#426</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/418">#418</a>, <a href="https://redirect.github.com/ruby/net-imap/issues/420">#420</a>, documentation only from <a href="https://redirect.github.com/ruby/net-imap/issues/416">#416</a>, and <a href="https://redirect.github.com/ruby/net-imap/issues/424">#424</a></li> </ul> </li> </ul> <h3>Other Changes</h3> <ul> <li>♻️ Update versioned default configs by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/413">ruby/net-imap#413</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/412">#412</a></li> </ul> </li> <li>♻️ Refactor <code>get_response</code> by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/431">ruby/net-imap#431</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/422">#422</a></li> </ul> </li> <li>♻️ Rational config versions by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/430">ruby/net-imap#430</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/429">#429</a></li> </ul> </li> <li>♻️ Extract ResponseReader from get_response by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/434">ruby/net-imap#434</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/433">#433</a></li> </ul> </li> <li>♻️ Refactoring by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/436">ruby/net-imap#436</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/417">#417</a> and <a href="https://redirect.github.com/ruby/net-imap/issues/435">#435</a></li> </ul> </li> </ul> <h3>Miscellaneous</h3> <ul> <li>✅ Various test improvements to v0.4 by <a href="https://github.com/nevans"><code>@nevans</code></a> in <a href="https://redirect.github.com/ruby/net-imap/pull/425">ruby/net-imap#425</a> <ul> <li>Backports <a href="https://redirect.github.com/ruby/net-imap/issues/414">#414</a>, <a href="https://redirect.github.com/ruby/net-imap/issues/415">#415</a>, <a href="https://redirect.github.com/ruby/net-imap/issues/421">#421</a>, and <code>assert_pattern</code> from minitest (originally in <a href="https://redirect.github.com/ruby/net-imap/issues/333">#333</a>)</li> </ul> </li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/ruby/net-imap/compare/v0.4.19...v0.4.20">https://github.com/ruby/net-imap/compare/v0.4.19...v0.4.20</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/ruby/net-imap/commit/5b8f9aece9a06074e396cb127098f30b681faad8"><code>5b8f9ae</code></a> 🔖 Bump version to 0.4.20</li> <li><a href="https://github.com/ruby/net-imap/commit/8222a369ce5c700c2df307c8939ea5dcc8b2832d"><code>8222a36</code></a> 🔀 Merge pull request <a href="https://redirect.github.com/ruby/net-imap/issues/445">#445</a> from ruby/backport/v0.4-max_response_size</li> <li><a href="https://github.com/ruby/net-imap/commit/641c4c451e7c35f72726f7b19342c6de4143977c"><code>641c4c4</code></a> ✅ Fix backport compatibility with ruby 2.7</li> <li><a href="https://github.com/ruby/net-imap/commit/19bea631c31b82798a4047ac3a6737a41054e45a"><code>19bea63</code></a> ✨ Make max_response_size configurable</li> <li><a href="https://github.com/ruby/net-imap/commit/ddcaabd4fecbd1b0d4b3202bc1befed685d06562"><code>ddcaabd</code></a> ✨ Limit max response size to 512MiB (hard-coded)</li> <li><a href="https://github.com/ruby/net-imap/commit/2ca4dbcaa4401a0177c140e220f0a11688603211"><code>2ca4dbc</code></a> 🔀 Merge pull request <a href="https://redirect.github.com/ruby/net-imap/issues/436">#436</a> from ruby/backport/v0.4-refactor-config-and-respons...</li> <li><a href="https://github.com/ruby/net-imap/commit/9279f8aa1136f4ee4227ed7ce09bfdc20944dc48"><code>9279f8a</code></a> ✅ Fix backport compatibility with ruby 2.7</li> <li><a href="https://github.com/ruby/net-imap/commit/0e27fc1224b18e338d06db9c2f919e2026d5269f"><code>0e27fc1</code></a> ♻️ Save ResponseReader ivars: <a href="https://github.com/buff"><code>@buff</code></a> & <a href="https://github.com/literal"><code>@literal</code></a>_size</li> <li><a href="https://github.com/ruby/net-imap/commit/17064cd2f094ff019a163808d02483b6a892c4bb"><code>17064cd</code></a> ✅ Fix backport compatibility with ruby 2.7</li> <li><a href="https://github.com/ruby/net-imap/commit/e4bb73453c0aae5b5ade9ce6f352914cbfc62028"><code>e4bb734</code></a> ✨ Fix Config::AttrTypeCoercion for Ractor sharing</li> <li>Additional commits viewable in <a href="https://github.com/ruby/net-imap/compare/v0.4.19...v0.4.20">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/chatwoot/chatwoot/network/alerts). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sojan Jose <sojan@pepalo.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
- Added an api endpoint for update message status ( available only for api inboxes ) - Moved message status management to a service. - Handles case where read status arrive before delivered fixes: chatwoot#10314 , chatwoot#9962
- Ability to provide custom instructions to captain <img width="1107" alt="Screenshot 2025-04-28 at 6 11 43 PM" src="https://github.com/user-attachments/assets/f94cbccc-b4d8-48fd-b6b9-55524129bc50" />
…1390) - enable stale contact/contact inboxes removal job on chatwoot cloud
|
Important Review skippedMore than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review. 192 files out of 299 files are above the max files limit of 100. Please upgrade to Pro plan to get higher limits. You can disable this status message by setting the ✨ Finishing Touches
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. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed 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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Pull Request Overview
This PR merges upstream changes and integrates several UI, API, and back-end adjustments. Key changes include:
- Addition of a new sidebar item ("contact_notes") in UI settings.
- Implementation of new and updated components for assistant management and messaging.
- Updates and refactoring in API controllers, admin dashboards, and helper methods.
Reviewed Changes
Copilot reviewed 685 out of 689 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| app/javascript/dashboard/composables/useUISettings.js | Added a new sidebar item ("contact_notes") to the default sidebar order. |
| app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue | Introduced a new form component with multiple update handlers; note potential missing submission handler. |
| app/javascript/dashboard/components-next/captain/assistant/MessageList.vue | Added a message list component with auto-scroll functionality. |
| app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue | Added a playground for interacting with the assistant API. |
| app/javascript/dashboard/components-next/captain/assistant/AssistantCard.vue | Changed the title element to a router-link for navigation. |
| app/javascript/dashboard/components-next/captain/PageLayout.vue | Enhanced layout with new back button and know-more props. |
| app/javascript/dashboard/components-next/Contacts/ContactsSidebar/components/ContactNoteItem.vue | Updated note item component to support collapsibility and delete functionality. |
| app/javascript/dashboard/api/captain/assistant.js | Introduced a new API method for the assistant playground. |
| Various back-end files | Updated helper methods, field classes, and API controllers to support new features and cloud-specific behavior. |
Files not reviewed (4)
- app/javascript/dashboard/i18n/locale/am/agentBots.json: Language not supported
- app/javascript/dashboard/i18n/locale/am/automation.json: Language not supported
- app/javascript/dashboard/i18n/locale/am/contact.json: Language not supported
- app/javascript/dashboard/i18n/locale/am/conversation.json: Language not supported
Comments suppressed due to low confidence (2)
app/fields/enterprise/account_features_field.rb:1
- [nitpick] The removal of 'Enterprise::AccountFeaturesField' appears intentional; please ensure that all dependent references and usages have been updated accordingly to avoid potential issues.
require 'administrate/field/base'
app/javascript/dashboard/components-next/captain/pageComponents/assistant/EditAssistantForm.vue:167
- The form submission handler 'handleSubmit' is not defined in this component. Please either implement 'handleSubmit' or update the form to use an existing handler to ensure proper form submission behavior.
<form class="flex flex-col gap-4" @submit.prevent="handleSubmit">
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Template
Description
Please include a summary of the change and issue(s) fixed. Also, mention relevant motivation, context, and any dependencies that this change requires.
Fixes # (issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration.
Checklist:
This change is