Skip to content

Conversation

@lucas-a-pelegrino
Copy link
Contributor

@lucas-a-pelegrino lucas-a-pelegrino commented Apr 25, 2025

Proposed changes (including videos or screenshots)

This PR fixes a small bug that caused the API to return an error during contact's custom field conflict resolution, the issue was caused by a payload being incorrectly built and sent to the API.

Issue(s)

CTZ-97

Steps to test or reproduce

  1. Create a custom field (visitor scope)
  2. Call setCustomField widget API method with overwrite: false (this.setCustomField('fieldName2', 'A value set just once', false))
  3. Go to Contact Info Panel
  4. Click See Conflicts
  5. Chose an option and click Save
  6. Error message is raised right away

Further comments


Pull Request Description

This pull request addresses a bug in the Rocket.Chat repository, specifically in the ReviewContactModal component of the Omnichannel contact information view. The issue was related to the improper handling of contact's custom fields when sending data to the API. The changes ensure that custom fields are now correctly nested under a customFields object in the payload. This fix is implemented in the ReviewContactModal.tsx file. The source branch for this fix is bugfix/CTZ-97, and it is targeted to be merged into the develop branch.

@lucas-a-pelegrino lucas-a-pelegrino added this to the 7.6.0 milestone Apr 25, 2025
@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Apr 25, 2025

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link

changeset-bot bot commented Apr 25, 2025

🦋 Changeset detected

Latest commit: ba295ad

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 36 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

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

@kody-ai
Copy link

kody-ai bot commented Apr 25, 2025

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration
Interacting with Kody
  • Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.

  • Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration
Review Options

The following review options are enabled or disabled:

Options Enabled
Security
Code Style
Kody Rules
Refactoring
Error Handling
Maintainability
Potential Issues
Documentation And Comments
Performance And Optimization
Breaking Changes

Access your configuration settings here.

@kody-ai
Copy link

kody-ai bot commented Apr 25, 2025

Kody Review Complete

Great news! 🎉
No issues were found that match your current review configurations.

Keep up the excellent work! 🚀

Kody Guide: Usage and Configuration
Interacting with Kody
  • Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.

  • Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration
Review Options

The following review options are enabled or disabled:

Options Enabled
Security
Code Style
Kody Rules
Refactoring
Error Handling
Maintainability
Potential Issues
Documentation And Comments
Performance And Optimization
Breaking Changes

Access your configuration settings here.

@codecov
Copy link

codecov bot commented Apr 25, 2025

Codecov Report

Attention: Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 61.19%. Comparing base (6f70529) to head (ba295ad).
Report is 2 commits behind head on release-7.6.0.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                @@
##           release-7.6.0   #35879      +/-   ##
=================================================
+ Coverage          57.14%   61.19%   +4.04%     
=================================================
  Files               2445     3154     +709     
  Lines              63915    74560   +10645     
  Branches           14126    16669    +2543     
=================================================
+ Hits               36525    45624    +9099     
- Misses             25011    25831     +820     
- Partials            2379     3105     +726     
Flag Coverage Δ
e2e 57.99% <66.66%> (+11.73%) ⬆️
unit 74.98% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 25, 2025

PR Preview Action v1.6.1

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-35879/

Built to branch gh-pages at 2025-04-29 22:13 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@lucas-a-pelegrino lucas-a-pelegrino changed the base branch from develop to release-7.6.0 April 29, 2025 16:56
@lucas-a-pelegrino lucas-a-pelegrino marked this pull request as ready for review April 30, 2025 01:26
@lucas-a-pelegrino lucas-a-pelegrino requested a review from a team as a code owner April 30, 2025 01:26
@aleksandernsilva aleksandernsilva added the stat: QA assured Means it has been tested and approved by a company insider label Apr 30, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 30, 2025
@kodiakhq kodiakhq bot merged commit 21b219e into release-7.6.0 Apr 30, 2025
50 checks passed
@kodiakhq kodiakhq bot deleted the bugfix/CTZ-97 branch April 30, 2025 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants