+
+ Changelog
Sourced from rack-session's changelog.
v2.1.2
- CVE-2026-39324 Don't fall back to unencrypted coder if encryptors are present.
Commits
504367bBump patch version.f43638cDon't fall back to unencrypted coder if encryptors are present.dadcfe6Bump actions/checkout from 4 to 5 (#54)4eb9ea8Add top level session spec to validate existing formats.8f94577Add rails to external tests.38ea47dAllow the v2 encryptor to serialize messages withMarshal(#44)43f2e3aFix compatibility with older Rubies.6a060b8Support UTF-8 data when using the JSON serializer (#39)8ce0146Fixauth_tagretrieval on JRuby (#32)7727185Add AEAD encryption (#23)- See full diff in compare view
[](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) ---
Dependabot commands and options
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 show
⚠️ Warning
``` Failed to update the yarn.lock, please update manually before merging. ```[SNYK-JS-XMLDOMXMLDOM-15869636](https://snyk.io/vuln/SNYK-JS-XMLDOMXMLDOM-15869636) --- > [!IMPORTANT] > > - Check the changes in this PR to ensure they won't cause issues with your project. > - Max score is 1000. Note that the real score may have changed since the PR was raised. > - This PR was automatically created by Snyk using the credentials of a real user. --- **Note:** _You are seeing this because you or someone else with access to this repository has authorized Snyk to open fix PRs._ For more information:
+
+ •
Date: Wed, 6 May 2026 16:16:36 +0300
Subject: [PATCH 06/15] feat: Add labels to contact import/export (#13313)
Adds label support to contact import and export so teams can carry
approved contact labels through CSV workflows. Imports accept a `labels`
column with labels that already exist in the account; multiple labels
should be entered as a quoted comma-separated CSV value, for example
`"customer,vip"`.
Imports are additive: they add labels to contacts and do not remove
labels already on a contact. Removing a label from the CSV row or
leaving the `labels` cell blank will not clear existing contact labels.
To remove a label, edit the contact directly.
## Closes
- Closes #8535
## How to test
1. Create a few contact labels in the account, such as `customer`,
`vip`, and `lead`.
2. Go to Contacts -> Import contacts and download the sample CSV.
3. Import contacts with a `labels` column. Use a single label like
`lead`, or quote multiple labels like `"customer,vip"`.
4. Confirm imported contacts are created with the expected labels.
5. Re-import an existing contact with a new label and confirm the new
label is added without removing existing labels.
6. Try a row with an unknown label, such as `"vip,unknown_label"`, and
confirm only that row is rejected in the failed records CSV while the
other valid rows are imported.
7. Export contacts and confirm the CSV includes a `labels` column with
comma-separated approved labels.
## What changed
- Contact exports include approved `labels` in the default CSV columns.
This adds a new default export column for CSV consumers.
- Contact imports parse `labels` as comma-separated values inside the
CSV cell.
- Imported labels are validated against labels that already exist in the
account.
- Rows with unknown labels are rejected with an `Unknown labels: ...`
error; valid rows in the same import continue to process.
- Imported labels are additive and do not remove existing contact
labels.
- Label application during import does not dispatch an additional
per-contact update event.
- The sample CSV includes an import-safe `labels` column. The modal
keeps the existing generic CSV import copy.
---------
Co-authored-by: Sojan Jose
---
app/jobs/account/contacts_export_job.rb | 45 +++++++-
app/jobs/data_import_job.rb | 109 ++++++++++++++++--
public/downloads/import-contacts-sample.csv | 52 ++++-----
spec/jobs/account/contacts_export_job_spec.rb | 38 +++++-
spec/jobs/data_import_job_spec.rb | 96 +++++++++++++++
5 files changed, 302 insertions(+), 38 deletions(-)
diff --git a/app/jobs/account/contacts_export_job.rb b/app/jobs/account/contacts_export_job.rb
index a66928a79..52b3412e0 100644
--- a/app/jobs/account/contacts_export_job.rb
+++ b/app/jobs/account/contacts_export_job.rb
@@ -1,6 +1,9 @@
class Account::ContactsExportJob < ApplicationJob
queue_as :low
+ LABELS_COLUMN = 'labels'.freeze
+ LABELS_DELIMITER = ','.freeze
+
def perform(account_id, user_id, column_names, params)
@account = Account.find(account_id)
@params = params
@@ -14,16 +17,45 @@ class Account::ContactsExportJob < ApplicationJob
private
def generate_csv(headers)
+ contacts_to_export = contacts.to_a
+ preload_contact_labels(contacts_to_export) if headers.include?(LABELS_COLUMN)
+
csv_data = CSV.generate do |csv|
csv << headers
- contacts.each do |contact|
- csv << headers.map { |header| contact.send(header) }
+ contacts_to_export.each do |contact|
+ csv << headers.map { |header| value_for_header(contact, header) }
end
end
attach_export_file(csv_data)
end
+ def value_for_header(contact, header)
+ return contact_labels_by_id.fetch(contact.id, []).join(LABELS_DELIMITER) if header == LABELS_COLUMN
+
+ contact.send(header)
+ end
+
+ def approved_labels
+ @approved_labels ||= @account.labels.pluck(:title)
+ end
+
+ def preload_contact_labels(contacts_to_export)
+ contact_ids = contacts_to_export.map(&:id)
+ return if contact_ids.blank?
+
+ ActsAsTaggableOn::Tagging
+ .joins(:tag)
+ .where(context: LABELS_COLUMN, taggable_type: 'Contact', taggable_id: contact_ids)
+ .where(tags: { name: approved_labels })
+ .pluck(:taggable_id, 'tags.name')
+ .each { |contact_id, label| contact_labels_by_id[contact_id] << label }
+ end
+
+ def contact_labels_by_id
+ @contact_labels_by_id ||= Hash.new { |hash, contact_id| hash[contact_id] = [] }
+ end
+
def contacts
if @params.present? && @params[:payload].present? && @params[:payload].any?
result = ::Contacts::FilterService.new(@account, @account_user, @params).perform
@@ -36,7 +68,12 @@ class Account::ContactsExportJob < ApplicationJob
end
def valid_headers(column_names)
- (column_names.presence || default_columns) & Contact.column_names
+ requested_headers = column_names.presence || default_columns
+
+ # Keep requested header order while allowing the virtual labels column.
+ requested_headers.select do |header|
+ header == LABELS_COLUMN || Contact.column_names.include?(header)
+ end.uniq
end
def attach_export_file(csv_data)
@@ -65,6 +102,6 @@ class Account::ContactsExportJob < ApplicationJob
end
def default_columns
- %w[id name email phone_number]
+ %w[id name email phone_number labels]
end
end
diff --git a/app/jobs/data_import_job.rb b/app/jobs/data_import_job.rb
index 4149ee16f..8e7161b37 100644
--- a/app/jobs/data_import_job.rb
+++ b/app/jobs/data_import_job.rb
@@ -5,6 +5,10 @@ class DataImportJob < ApplicationJob
queue_as :low
retry_on ActiveStorage::FileNotFoundError, wait: 1.minute, attempts: 3
+ LABELS_DELIMITER = ','.freeze
+ LABELS_CONTEXT = 'labels'.freeze
+ CONTACT_TAGGABLE_TYPE = 'Contact'.freeze
+
def perform(data_import)
@data_import = data_import
@contact_manager = DataImport::ContactManager.new(@data_import.account)
@@ -33,26 +37,117 @@ class DataImportJob < ApplicationJob
with_import_file do |file|
csv_reader(file).each do |row|
- current_contact = @contact_manager.build_contact(row.to_h.with_indifferent_access)
- if current_contact.valid?
- contacts << current_contact
- else
- append_rejected_contact(row, current_contact, rejected_contacts)
- end
+ build_contact_from_row(row, contacts, rejected_contacts)
end
end
[contacts, rejected_contacts]
end
+ def build_contact_from_row(row, contacts, rejected_contacts)
+ row_hash = row.to_h.with_indifferent_access
+ labels = extract_labels(row_hash)
+ invalid_labels = labels.map(&:downcase) - approved_labels
+
+ if invalid_labels.present?
+ append_label_error(row, invalid_labels, rejected_contacts)
+ return
+ end
+
+ current_contact = @contact_manager.build_contact(row_hash.except(:labels))
+ if current_contact.valid?
+ contacts << { contact: current_contact, labels: labels }
+ else
+ append_rejected_contact(row, current_contact, rejected_contacts)
+ end
+ end
+
+ def extract_labels(row_hash)
+ row_hash[:labels].to_s.split(LABELS_DELIMITER).map(&:strip).reject(&:blank?)
+ end
+
def append_rejected_contact(row, contact, rejected_contacts)
row['errors'] = contact.errors.full_messages.join(', ')
rejected_contacts << row
end
- def import_contacts(contacts)
+ def import_contacts(contacts_with_labels)
+ contacts = contacts_with_labels.pluck(:contact)
#
Contact.import(contacts, synchronize: contacts, on_duplicate_key_ignore: true, track_validation_failures: true, validate: true, batch_size: 1000)
+ apply_labels_to_contacts(contacts_with_labels)
+ end
+
+ def apply_labels_to_contacts(contacts_with_labels)
+ taggings = taggings_for_contacts(contacts_with_labels)
+ return if taggings.blank?
+
+ ActsAsTaggableOn::Tagging.import(%i[tag_id taggable_type taggable_id context created_at],
+ taggings, on_duplicate_key_ignore: true, validate: false, batch_size: 1000)
+ end
+
+ def taggings_for_contacts(contacts_with_labels)
+ tag_lookup = tags_by_label_name(contacts_with_labels)
+ taggings = contacts_with_labels.flat_map do |item|
+ contact = contact_for_label_import(item[:contact])
+ labels = item[:labels].map(&:downcase).uniq
+ next [] if contact&.id.blank?
+
+ labels.map do |label|
+ [tag_lookup[label].id, CONTACT_TAGGABLE_TYPE, contact.id, LABELS_CONTEXT]
+ end
+ end.uniq
+
+ reject_existing_taggings(taggings).map { |tagging| tagging + [Time.zone.now] }
+ end
+
+ def reject_existing_taggings(taggings)
+ tag_ids = taggings.map { |tag_id, _taggable_type, _taggable_id, _context| tag_id }
+ taggable_ids = taggings.map { |_tag_id, _taggable_type, taggable_id, _context| taggable_id }
+ existing_taggings = ActsAsTaggableOn::Tagging
+ .where(context: LABELS_CONTEXT, taggable_type: CONTACT_TAGGABLE_TYPE,
+ taggable_id: taggable_ids, tag_id: tag_ids)
+ .pluck(:tag_id, :taggable_id)
+ .index_with(true)
+
+ taggings.reject do |tag_id, _taggable_type, taggable_id, _context|
+ existing_taggings[[tag_id, taggable_id]]
+ end
+ end
+
+ def contact_for_label_import(contact)
+ return contact if contact.id.present?
+
+ key = contact_identity_key(contact)
+ return if key.blank?
+
+ imported_contact(contact)
+ end
+
+ def contact_identity_key(contact)
+ contact.identifier.presence || contact.email.presence || contact.phone_number.presence
+ end
+
+ def imported_contact(contact)
+ return @data_import.account.contacts.find_by(identifier: contact.identifier) if contact.identifier.present?
+ return @data_import.account.contacts.from_email(contact.email) if contact.email.present?
+
+ @data_import.account.contacts.find_by(phone_number: contact.phone_number) if contact.phone_number.present?
+ end
+
+ def tags_by_label_name(contacts_with_labels)
+ labels = contacts_with_labels.flat_map { |item| item[:labels] }.map(&:downcase).uniq
+
+ ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(labels).index_by { |tag| tag.name.downcase }
+ end
+
+ def approved_labels
+ @approved_labels ||= @data_import.account.labels.pluck(:title)
+ end
+
+ def append_label_error(row, labels, rejected_contacts)
+ row['errors'] = "Unknown labels: #{labels.join(', ')}"
+ rejected_contacts << row
end
def update_data_import_status(processed_records, rejected_records)
diff --git a/public/downloads/import-contacts-sample.csv b/public/downloads/import-contacts-sample.csv
index e81aaf403..2cea6430d 100644
--- a/public/downloads/import-contacts-sample.csv
+++ b/public/downloads/import-contacts-sample.csv
@@ -1,26 +1,26 @@
-id,name,email,identifier,phone_number,ip_address,company_name,custom_attribute_1,custom_attribute_2
-1,Clarice Uzzell,cuzzell0@mozilla.org,bb4e11cd-0f23-49da-a123-dcc1fec6852c,+498963648018,70.61.11.201,Acme Inc,Random-value-1,Random-value-1
-2,Marieann Creegan,mcreegan1@cornell.edu,e60bab4c-9fbb-47eb-8f75-42025b789c47,+15417543010,168.186.4.241,Acme Inc,Random-value0,Random-value0
-3,Nancey Windibank,nwindibank2@bluehost.com,f793e813-4210-4bf3-a812-711418de25d2,+15417543011,73.44.41.59,Acme Inc,Random-value1,Random-value1
-4,Sibel Stennine,sstennine3@yellowbook.com,d6e35a2d-d093-4437-a577-7df76316b937,+15417543011,115.249.27.155,Acme Inc,Random-value2,Random-value2
-5,Tina O'Lunney,tolunney4@si.edu,3540d40a-5567-4f28-af98-5583a7ddbc56,+15417543011,219.181.212.8,Acme Inc,Random-value3,Random-value3
-6,Quinn Neve,qneve5@army.mil,ba0e1bf0-c74b-41ce-8a2d-0b08fa0e5aa5,+15417543011,231.210.115.166,Acme Inc,Random-value4,Random-value4
-7,Karylin Gaunson,kgaunson6@tripod.com,d24cac79-c81b-4b84-a33e-0441b7c6a981,+15417543011,160.189.41.11,Acme Inc,Random-value5,Random-value5
-8,Jamison Shenton,jshenton7@upenn.edu,29a7a8c0-c7f7-4af9-852f-761b1a784a7a,+15417543011,53.94.18.201,Acme Inc,Random-value6,Random-value6
-9,Gavan Threlfall,gthrelfall8@spotify.com,847d4943-ddb5-47cc-8008-ed5092c675c5,+15417543011,18.87.247.249,Acme Inc,Random-value7,Random-value7
-10,Katina Hemmingway,khemmingway9@ameblo.jp,8f0b5efd-b6a8-4f1e-a1e3-b0ea8c9e3048,+15417543011,25.191.96.124,Acme Inc,Random-value8,Random-value8
-11,Jillian Deinhard,jdeinharda@canalblog.com,bd952787-1b05-411f-9975-b916ec0950cc,+15417543011,11.211.174.93,Acme Inc,Random-value9,Random-value9
-12,Blake Finden,bfindenb@wsj.com,12c95613-e49d-4fa2-86fb-deabb6ebe600,+15417543011,47.26.205.153,Acme Inc,Random-value10,Random-value10
-13,Liane Maxworthy,lmaxworthyc@un.org,36b68e4c-40d6-4e09-bf59-7db3b27b18f0,+15417543011,157.196.34.166,Acme Inc,Random-value11,Random-value11
-14,Martynne Ledley,mledleyd@sourceforge.net,1856bceb-cb36-415c-8ffc-0527f3f750d8,+15417543011,109.231.152.148,Acme Inc,Random-value12,Random-value12
-15,Katharina Ruffli,krufflie@huffingtonpost.com,604de5c9-b154-4279-8978-41fb71f0f773,+15417543011,20.43.146.179,Acme Inc,Random-value13,Random-value13
-16,Tucker Simmance,tsimmancef@bbc.co.uk,0a8fc3a7-4986-4a51-a503-6c7f974c90ad,+15417543011,179.76.226.171,Acme Inc,Random-value14,Random-value14
-17,Wenona Martinson,wmartinsong@census.gov,0e5ea6e3-6824-4e78-a6f5-672847eafa17,+15417543011,92.243.194.160,Acme Inc,Random-value15,Random-value15
-18,Gretna Vedyasov,gvedyasovh@lycos.com,6becf55b-a7b5-48f6-8788-b89cae85b066,+15417543011,25.22.86.101,Acme Inc,Random-value16,Random-value16
-19,Lurline Abdon,labdoni@archive.org,afa9429f-9034-4b06-9efa-980e01906ebf,+15417543011,150.249.116.118,Acme Inc,Random-value17,Random-value17
-20,Fiann Norcliff,fnorcliffj@istockphoto.com,59f72dec-14ba-4d6e-b17c-0d962e69ffac,+15417543011,237.167.197.197,Acme Inc,Random-value18,Random-value18
-21,Zed Linn,zlinnk@phoca.cz,95f7bc56-be92-4c9c-ad58-eff3e63c7bea,+15417543011,88.102.64.113,Acme Inc,Random-value19,Random-value19
-22,Averyl Simyson,asimysonl@livejournal.com,bde1fe59-c9bd-440c-bb39-79fe61dac1d1,+15417543011,141.248.89.29,Acme Inc,Random-value20,Random-value20
-23,Camella Blackadder,cblackadderm@nifty.com,0c981752-5857-487c-b9b5-5d0253df740a,+15417543011,118.123.138.115,Acme Inc,Random-value21,Random-value21
-24,Aurie Spatig,aspatign@printfriendly.com,4cf22bfb-2c3f-41d1-9993-6e3758e457ba,+15417543011,157.45.102.235,Acme Inc,Random-value22,Random-value22
-25,Adrienne Bellard,abellardo@cnn.com,f10f9b8d-38ac-4e17-8a7d-d2e6a055f944,+15417543011,170.73.198.47,Acme Inc,Random-value23,Random-value23
+id,name,email,identifier,phone_number,labels,ip_address,company_name,custom_attribute_1,custom_attribute_2
+1,Clarice Uzzell,cuzzell0@mozilla.org,bb4e11cd-0f23-49da-a123-dcc1fec6852c,+498963648018,,70.61.11.201,Acme Inc,Random-value-1,Random-value-1
+2,Marieann Creegan,mcreegan1@cornell.edu,e60bab4c-9fbb-47eb-8f75-42025b789c47,+15417543010,,168.186.4.241,Acme Inc,Random-value0,Random-value0
+3,Nancey Windibank,nwindibank2@bluehost.com,f793e813-4210-4bf3-a812-711418de25d2,+15417543011,,73.44.41.59,Acme Inc,Random-value1,Random-value1
+4,Sibel Stennine,sstennine3@yellowbook.com,d6e35a2d-d093-4437-a577-7df76316b937,+15417543011,,115.249.27.155,Acme Inc,Random-value2,Random-value2
+5,Tina O'Lunney,tolunney4@si.edu,3540d40a-5567-4f28-af98-5583a7ddbc56,+15417543011,,219.181.212.8,Acme Inc,Random-value3,Random-value3
+6,Quinn Neve,qneve5@army.mil,ba0e1bf0-c74b-41ce-8a2d-0b08fa0e5aa5,+15417543011,,231.210.115.166,Acme Inc,Random-value4,Random-value4
+7,Karylin Gaunson,kgaunson6@tripod.com,d24cac79-c81b-4b84-a33e-0441b7c6a981,+15417543011,,160.189.41.11,Acme Inc,Random-value5,Random-value5
+8,Jamison Shenton,jshenton7@upenn.edu,29a7a8c0-c7f7-4af9-852f-761b1a784a7a,+15417543011,,53.94.18.201,Acme Inc,Random-value6,Random-value6
+9,Gavan Threlfall,gthrelfall8@spotify.com,847d4943-ddb5-47cc-8008-ed5092c675c5,+15417543011,,18.87.247.249,Acme Inc,Random-value7,Random-value7
+10,Katina Hemmingway,khemmingway9@ameblo.jp,8f0b5efd-b6a8-4f1e-a1e3-b0ea8c9e3048,+15417543011,,25.191.96.124,Acme Inc,Random-value8,Random-value8
+11,Jillian Deinhard,jdeinharda@canalblog.com,bd952787-1b05-411f-9975-b916ec0950cc,+15417543011,,11.211.174.93,Acme Inc,Random-value9,Random-value9
+12,Blake Finden,bfindenb@wsj.com,12c95613-e49d-4fa2-86fb-deabb6ebe600,+15417543011,,47.26.205.153,Acme Inc,Random-value10,Random-value10
+13,Liane Maxworthy,lmaxworthyc@un.org,36b68e4c-40d6-4e09-bf59-7db3b27b18f0,+15417543011,,157.196.34.166,Acme Inc,Random-value11,Random-value11
+14,Martynne Ledley,mledleyd@sourceforge.net,1856bceb-cb36-415c-8ffc-0527f3f750d8,+15417543011,,109.231.152.148,Acme Inc,Random-value12,Random-value12
+15,Katharina Ruffli,krufflie@huffingtonpost.com,604de5c9-b154-4279-8978-41fb71f0f773,+15417543011,,20.43.146.179,Acme Inc,Random-value13,Random-value13
+16,Tucker Simmance,tsimmancef@bbc.co.uk,0a8fc3a7-4986-4a51-a503-6c7f974c90ad,+15417543011,,179.76.226.171,Acme Inc,Random-value14,Random-value14
+17,Wenona Martinson,wmartinsong@census.gov,0e5ea6e3-6824-4e78-a6f5-672847eafa17,+15417543011,,92.243.194.160,Acme Inc,Random-value15,Random-value15
+18,Gretna Vedyasov,gvedyasovh@lycos.com,6becf55b-a7b5-48f6-8788-b89cae85b066,+15417543011,,25.22.86.101,Acme Inc,Random-value16,Random-value16
+19,Lurline Abdon,labdoni@archive.org,afa9429f-9034-4b06-9efa-980e01906ebf,+15417543011,,150.249.116.118,Acme Inc,Random-value17,Random-value17
+20,Fiann Norcliff,fnorcliffj@istockphoto.com,59f72dec-14ba-4d6e-b17c-0d962e69ffac,+15417543011,,237.167.197.197,Acme Inc,Random-value18,Random-value18
+21,Zed Linn,zlinnk@phoca.cz,95f7bc56-be92-4c9c-ad58-eff3e63c7bea,+15417543011,,88.102.64.113,Acme Inc,Random-value19,Random-value19
+22,Averyl Simyson,asimysonl@livejournal.com,bde1fe59-c9bd-440c-bb39-79fe61dac1d1,+15417543011,,141.248.89.29,Acme Inc,Random-value20,Random-value20
+23,Camella Blackadder,cblackadderm@nifty.com,0c981752-5857-487c-b9b5-5d0253df740a,+15417543011,,118.123.138.115,Acme Inc,Random-value21,Random-value21
+24,Aurie Spatig,aspatign@printfriendly.com,4cf22bfb-2c3f-41d1-9993-6e3758e457ba,+15417543011,,157.45.102.235,Acme Inc,Random-value22,Random-value22
+25,Adrienne Bellard,abellardo@cnn.com,f10f9b8d-38ac-4e17-8a7d-d2e6a055f944,+15417543011,,170.73.198.47,Acme Inc,Random-value23,Random-value23
diff --git a/spec/jobs/account/contacts_export_job_spec.rb b/spec/jobs/account/contacts_export_job_spec.rb
index 561015ea7..0714fb55b 100644
--- a/spec/jobs/account/contacts_export_job_spec.rb
+++ b/spec/jobs/account/contacts_export_job_spec.rb
@@ -5,7 +5,6 @@ RSpec.describe Account::ContactsExportJob do
let(:account) { create(:account) }
let(:user) { create(:user, account: account, email: 'account-user-test@test.com') }
- let(:label) { create(:label, title: 'spec-billing', maccount: account) }
let(:email_filter) do
{
@@ -85,6 +84,43 @@ RSpec.describe Account::ContactsExportJob do
expect(phone_numbers).to include('+910808080818', '+910808080808')
end
+ it 'exports labels when requested through column names' do
+ contact_with_labels = account.contacts.first
+ create(:label, account: account, title: 'vip')
+ contact_with_labels.add_labels(%w[vip])
+
+ described_class.perform_now(account.id, user.id, %w[id email labels], {})
+
+ csv_content = account.contacts_export.download.force_encoding('UTF-8').delete_prefix("\xEF\xBB\xBF")
+ csv_data = CSV.parse(csv_content, headers: true)
+ row = csv_data.find { |r| r['email'] == contact_with_labels.email }
+
+ expect(csv_data.headers).to eq(%w[id email labels])
+ expect(row['labels']).to eq('vip')
+ end
+
+ it 'bulk loads labels while exporting contacts' do
+ create(:label, account: account, title: 'vip')
+ create(:label, account: account, title: 'support')
+ account.contacts.find_each { |contact| contact.add_labels(%w[vip support]) }
+ account.contacts.first.add_labels('legacy_tag')
+
+ taggings_queries = []
+ subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |_name, _started, _finished, _unique_id, payload|
+ taggings_queries << payload[:sql] if payload[:sql].include?('FROM "taggings"')
+ end
+
+ described_class.perform_now(account.id, user.id, [], {})
+ csv_data = CSV.parse(account.contacts_export.download, headers: true)
+ row = csv_data.find { |r| r['email'] == account.contacts.first.email }
+
+ expect(csv_data.headers).to include('labels')
+ expect(row['labels'].split(described_class::LABELS_DELIMITER)).to match_array(%w[vip support])
+ expect(taggings_queries.size).to eq(1)
+ ensure
+ ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
+ end
+
it 'prepends UTF-8 BOM to the exported CSV for spreadsheet compatibility' do
described_class.perform_now(account.id, user.id, [], {})
diff --git a/spec/jobs/data_import_job_spec.rb b/spec/jobs/data_import_job_spec.rb
index 4d3e0a05f..af227b816 100644
--- a/spec/jobs/data_import_job_spec.rb
+++ b/spec/jobs/data_import_job_spec.rb
@@ -187,5 +187,101 @@ RSpec.describe DataImportJob do
.to change { data_import.reload.status }.from('pending').to('failed')
end
end
+
+ context 'when the data contains labels column' do
+ let(:data_with_labels) do
+ [
+ %w[id name email phone_number labels],
+ ['1', 'John Doe', 'john@example.com', '+918080808080', ' Customer , VIP , vip '],
+ ['2', 'Jane Smith', 'jane@example.com', '+918080808081', 'lead'],
+ ['3', 'Bob Wilson', 'bob@example.com', '+918080808082', '']
+ ]
+ end
+ let(:labels_data_import) { create(:data_import, import_file: generate_csv_file(data_with_labels)) }
+
+ before do
+ %w[customer vip lead].each do |title|
+ create(:label, account: labels_data_import.account, title: title)
+ end
+ end
+
+ it 'imports contacts with labels from CSV' do
+ described_class.perform_now(labels_data_import)
+
+ john = Contact.from_email('john@example.com')
+ expect(john).to be_present
+ expect(john.label_list).to contain_exactly('customer', 'vip')
+
+ jane = Contact.from_email('jane@example.com')
+ expect(jane).to be_present
+ expect(jane.label_list).to contain_exactly('lead')
+
+ bob = Contact.from_email('bob@example.com')
+ expect(bob).to be_present
+ expect(bob.label_list).to be_empty
+ end
+
+ it 'dispatches only the contact update event when importing labels for an existing contact' do
+ existing_contact = create(:contact, account: labels_data_import.account, email: 'existing-labeled@example.com', name: 'Old Name')
+ existing_contact.add_labels('customer')
+ data_with_existing_contact = [
+ %w[id name email phone_number labels],
+ ['1', 'Updated Name', existing_contact.email, '+918080808090', 'lead'],
+ ['2', 'New Labeled Contact', 'new-labeled@example.com', '+918080808091', 'customer']
+ ]
+ existing_contact_import = create(:data_import, account: labels_data_import.account,
+ import_file: generate_csv_file(data_with_existing_contact))
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ described_class.perform_now(existing_contact_import)
+
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ Events::Types::CONTACT_UPDATED,
+ anything,
+ hash_including(contact: have_attributes(id: existing_contact.id))
+ ).once
+ expect(existing_contact.reload.label_list).to contain_exactly('customer', 'lead')
+ expect(labels_data_import.account.contacts.from_email('new-labeled@example.com').label_list).to contain_exactly('customer')
+ end
+
+ it 'merges labels for duplicate contact rows without duplicate taggings' do
+ data_with_duplicate_contact = [
+ %w[id name email phone_number labels],
+ ['1', 'Duplicate User', 'duplicate-labeled@example.com', '+918080808092', 'lead'],
+ ['2', 'Duplicate User', 'duplicate-labeled@example.com', '+918080808092', 'customer,lead']
+ ]
+ duplicate_contact_import = create(:data_import, account: labels_data_import.account,
+ import_file: generate_csv_file(data_with_duplicate_contact))
+
+ described_class.perform_now(duplicate_contact_import)
+
+ contact = labels_data_import.account.contacts.from_email('duplicate-labeled@example.com')
+ lead = ActsAsTaggableOn::Tag.find_by(name: 'lead')
+ expect(contact.label_list).to contain_exactly('customer', 'lead')
+ expect(ActsAsTaggableOn::Tagging.where(tag_id: lead.id, taggable: contact, context: 'labels').count).to eq(1)
+ end
+
+ it 'rejects rows with labels that do not exist in the account before updating contacts' do
+ existing_contact = create(:contact,
+ account: labels_data_import.account,
+ email: 'existing@example.com',
+ phone_number: '+918080808085',
+ name: 'Existing Name')
+ data_with_unknown_labels = [
+ %w[id name email phone_number labels],
+ ['1', 'Updated Name', existing_contact.email, '+918080808086', 'vip,unknown_label']
+ ]
+
+ unknown_label_import = create(:data_import, account: labels_data_import.account,
+ import_file: generate_csv_file(data_with_unknown_labels))
+
+ described_class.perform_now(unknown_label_import)
+
+ expect(existing_contact.reload.name).to eq('Existing Name')
+ expect(existing_contact.phone_number).to eq('+918080808085')
+ expect(unknown_label_import.reload.failed_records).to be_attached
+ expect(unknown_label_import.failed_records.download).to include('Unknown labels: unknown_label')
+ end
+ end
end
end
From 42bba748cf1100c8a4622efe3a3a6b0c06cbdd05 Mon Sep 17 00:00:00 2001
From: Wendell Gasparoni
Date: Wed, 6 May 2026 10:26:31 -0300
Subject: [PATCH 07/15] fix(mailbox): render inline images without
Content-Disposition (#11949)
## Description
This pull request addresses issue #11948, where inline images embedded
in emails (such as those sent from Outlook) are not rendered correctly
if the Content-Disposition header is missing.
The solution ensures that images referenced via cid: in the HTML body
are correctly identified and rewritten using url_for.
Fixes #11948
## Type of change
Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
Added test: detects image inline attachment by cid reference when
Content-Disposition is missing
## Checklist:
- [X] My code follows the style guidelines of this project
- [X] I have performed a self-review of my code
- [X] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [X] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Pranav
Co-authored-by: Sojan Jose
Co-authored-by: Sony Mathew
Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
---
app/mailboxes/mailbox_helper.rb | 18 ++--
.../mailbox_inline_attachment_helper.rb | 45 ++++++++++
.../cid_inline_images_without_disposition.eml | 83 +++++++++++++++++++
spec/mailboxes/mailbox_helper_spec.rb | 56 +++++++++++++
4 files changed, 190 insertions(+), 12 deletions(-)
create mode 100644 app/mailboxes/mailbox_inline_attachment_helper.rb
create mode 100644 spec/fixtures/files/cid_inline_images_without_disposition.eml
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 2b5fa1a26..f7a44ccca 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -1,4 +1,6 @@
module MailboxHelper
+ include MailboxInlineAttachmentHelper
+
private
def create_message
@@ -24,6 +26,9 @@ module MailboxHelper
def add_attachments_to_message
return if @message.blank?
+ # Load email content once for all attachment processing
+ load_email_content
+
# ensure we don't add more than the permitted number of attachments
all_attachments = processed_mail.attachments.last(Message::NUMBER_OF_PERMITTED_ATTACHMENTS)
grouped_attachments = group_attachments(all_attachments)
@@ -38,7 +43,7 @@ module MailboxHelper
# If the email lacks a text body or if inline attachments aren't images,
# treat them as standard attachments for processing.
inline_attachments = attachments.select do |attachment|
- mail_content.present? && attachment[:original].inline? && attachment[:original].content_type.to_s.start_with?('image/')
+ inline_attachment?(attachment)
end
regular_attachments = attachments - inline_attachments
@@ -59,11 +64,6 @@ module MailboxHelper
def process_inline_attachments(attachments)
Rails.logger.info "[MailboxHelper] Processing inline attachments for message with ID: #{processed_mail.message_id}"
- # create an instance variable here, the `embed_inline_image_source`
- # updates them directly. And then the value is eventaully used to update the message content
- @html_content = processed_mail.serialized_data[:html_content][:full]
- @text_content = processed_mail.serialized_data[:text_content][:reply]
-
attachments.each do |mail_attachment|
embed_inline_image_source(mail_attachment)
end
@@ -81,12 +81,6 @@ module MailboxHelper
end
end
- def upload_inline_image(mail_attachment)
- content_id = mail_attachment[:original].cid
-
- @html_content = @html_content.gsub("cid:#{content_id}", inline_image_url(mail_attachment[:blob]).to_s)
- end
-
def embed_plain_text_email_with_inline_image(mail_attachment)
attachment_name = mail_attachment[:original].filename
img_tag = "![\"#{attachment_name}\"](\"#{inline_image_url(mail_attachment[:blob])}\")
"
diff --git a/app/mailboxes/mailbox_inline_attachment_helper.rb b/app/mailboxes/mailbox_inline_attachment_helper.rb
new file mode 100644
index 000000000..2308e2d4e
--- /dev/null
+++ b/app/mailboxes/mailbox_inline_attachment_helper.rb
@@ -0,0 +1,45 @@
+module MailboxInlineAttachmentHelper
+ private
+
+ def load_email_content
+ @html_content = processed_mail.serialized_data[:html_content][:full]
+ @text_content = processed_mail.serialized_data[:text_content][:reply]
+ end
+
+ def inline_attachment?(attachment)
+ # Only process images as potential inline attachments
+ return false unless mail_content.present? && attachment[:original].content_type.to_s.start_with?('image/')
+
+ # Check if attachment is explicitly marked as inline
+ return true if attachment[:original].inline?
+
+ # For Outlook compatibility: if not marked as inline but has CID and is referenced in body
+ cid = attachment[:original].cid
+ cid.present? && body_references_cid?(cid)
+ end
+
+ def body_references_cid?(cid)
+ # Check if CID is referenced in HTML content
+ return false if @html_content.blank?
+
+ cid_urls_for(cid).any? { |cid_url| @html_content.include?(cid_url) }
+ end
+
+ def upload_inline_image(mail_attachment)
+ content_id = mail_attachment[:original].cid
+ image_url = inline_image_url(mail_attachment[:blob]).to_s
+
+ cid_urls_for(content_id).each do |cid_url|
+ @html_content = @html_content.gsub(cid_url, image_url)
+ end
+ end
+
+ def cid_urls_for(cid)
+ # RFC 2392 cid URLs can contain URL-encoded Content-ID values.
+ # Check both raw and encoded variants so clients using either form render inline images.
+ encoded_cid = ERB::Util.url_encode(cid)
+ lowercase_encoded_cid = encoded_cid.gsub(/%[0-9A-F]{2}/, &:downcase)
+
+ ["cid:#{cid}", "cid:#{encoded_cid}", "cid:#{lowercase_encoded_cid}"].uniq
+ end
+end
diff --git a/spec/fixtures/files/cid_inline_images_without_disposition.eml b/spec/fixtures/files/cid_inline_images_without_disposition.eml
new file mode 100644
index 000000000..08bc4846b
--- /dev/null
+++ b/spec/fixtures/files/cid_inline_images_without_disposition.eml
@@ -0,0 +1,83 @@
+Delivered-To: test.user@example.com
+Received: by 192.0.2.1 with SMTP id smtp12345;
+ Mon, 14 Jul 2025 15:23:57 -0700 (PDT)
+X-Google-Smtp-Source: TEST_SOURCE
+X-Received: by 198.51.100.2 with SMTP id smtp67890;
+ Mon, 14 Jul 2025 15:23:57 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1752531837; cv=none;
+ d=example.com; s=test;
+ b=TEST_SIGNATURE==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=test;
+ h=content-language:subject:to:from;
+ bh=TESTHASH==;
+ b=TEST_SIGNATURE==
+ARC-Authentication-Results: i=1; mx.example.com;
+ dkim=pass header.i=@example.com header.s=test header.b="TESTKEY";
+ spf=pass smtp.mailfrom=sender@example.com
+Return-Path:
+Received: from smtp.example.com (smtp.example.com. [203.0.113.10])
+ by mx.example.com with ESMTPS id smtp7890
+ for ;
+ Mon, 14 Jul 2025 15:23:55 -0700 (PDT)
+Received-SPF: pass (example.com: domain of sender@example.com designates 203.0.113.10 as permitted sender)
+Authentication-Results: mx.example.com;
+ dkim=pass header.i=@example.com header.s=test header.b="TESTKEY";
+ spf=pass smtp.mailfrom=sender@example.com
+Received: from TEST-PC (unknown [192.0.2.100])
+ (Authenticated sender: sender@example.com)
+ by smtp.example.com (Postfix) with ESMTPA id ABCD123456
+ for ; Mon, 14 Jul 2025 19:23:43 -0300 (BRT)
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=example.com;
+ s=test; t=1752531824; bh=TESTHASH=;
+ h=From:To:Subject:Date:From;
+ b=TEST_SIGNATURE==
+From:
+To:
+Subject: Test inline image without Content-Disposition
+Date: Mon, 14 Jul 2025 19:23:29 -0300
+Message-ID:
+MIME-Version: 1.0
+Content-Type: multipart/related;
+ boundary="----=_NextPart_000_0001"
+X-Mailer: Microsoft Outlook 16.0
+Thread-Index: TESTINDEX==
+Content-Language: en-us
+
+This is a multipart message in MIME format.
+
+------=_NextPart_000_0001
+Content-Type: multipart/alternative;
+ boundary="----=_NextPart_001_0002"
+
+------=_NextPart_001_0002
+Content-Type: text/plain;
+ charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+
+This is a plain text version of the message.
+
+------=_NextPart_001_0002
+Content-Type: text/html;
+ charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+
+
+ 
+
+
+
+------=_NextPart_001_0002--
+
+------=_NextPart_000_0001
+Content-Type: image/jpeg;
+ filename="image001.jpg"
+Content-Transfer-Encoding: base64
+Content-ID:
+
+/9j/4AAQSkZJRgABAQEASABIAAD/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEB
+AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAAL
+CABkAGQBAREA/8QA...
+
+------=_NextPart_000_0001--
diff --git a/spec/mailboxes/mailbox_helper_spec.rb b/spec/mailboxes/mailbox_helper_spec.rb
index 8352a46a1..613040cb3 100644
--- a/spec/mailboxes/mailbox_helper_spec.rb
+++ b/spec/mailboxes/mailbox_helper_spec.rb
@@ -77,4 +77,60 @@ RSpec.describe MailboxHelper do
expect(text_content).to include(Rails.application.routes.url_helpers.url_for(mail_attachment[:blob]))
end
end
+
+ describe '#body_references_cid?' do
+ let(:helper_instance) { mailbox_helper_obj.new(conversation, processed_mail) }
+
+ it 'detects percent-encoded CID references in HTML content' do
+ helper_instance.instance_variable_set(:@html_content, '
')
+
+ expect(helper_instance.send(:body_references_cid?, 'image001.jpg@test')).to be true
+ end
+ end
+
+ describe '#upload_inline_image' do
+ let(:mail_attachment) do
+ {
+ original: OpenStruct.new(cid: 'image001.jpg@test'),
+ blob: get_blob_for('spec/assets/avatar.png', 'image/png')
+ }
+ end
+ let(:helper_instance) { mailbox_helper_obj.new(conversation, processed_mail) }
+
+ it 'replaces percent-encoded CID references in HTML content' do
+ allow(Rails.application.routes.url_helpers).to receive(:url_for).and_return('/fake-image-url')
+ helper_instance.instance_variable_set(:@html_content, '')
+
+ helper_instance.send(:upload_inline_image, mail_attachment)
+
+ html_content = helper_instance.instance_variable_get(:@html_content)
+ expect(html_content).to include('/fake-image-url"')
+ expect(html_content).not_to include('cid:')
+ end
+ end
+
+ describe '#add_attachments_to_message' do
+ let(:mail) { create_inbound_email_from_fixture('cid_inline_images_without_disposition.eml').mail }
+ let(:processed_mail) { MailPresenter.new(mail) }
+ let(:conversation) { create(:conversation) }
+ let(:helper_instance) { mailbox_helper_obj.new(conversation, processed_mail) }
+
+ before do
+ helper_instance.send(:create_message)
+ end
+
+ it 'detects inline image attachment by cid reference when Content-Disposition is missing' do
+ allow(Rails.application.routes.url_helpers).to receive(:url_for).and_return('/fake-image-url')
+ helper_instance.send(:add_attachments_to_message)
+
+ message = conversation.messages[0]
+
+ expect(message.attachments.count).to eq(0)
+
+ html_content = message.content_attributes[:email][:html_content][:full]
+
+ expect(html_content).to include('/fake-image-url"')
+ expect(html_content).not_to include('cid:')
+ end
+ end
end
From fe44b0714790722f4fbf70c962f3a96d5a095509 Mon Sep 17 00:00:00 2001
From: salmonumbrella <182032677+salmonumbrella@users.noreply.github.com>
Date: Wed, 6 May 2026 08:20:27 -0700
Subject: [PATCH 08/15] feat(companies): add company detail page (#14054)
---
app/javascript/dashboard/api/companies.js | 52 ++-
.../dashboard/api/specs/companies.spec.js | 142 +++----
.../Companies/CompaniesCard/CompaniesCard.vue | 52 ++-
.../Companies/CompaniesDetailsLayout.vue | 115 ++++++
.../CompaniesHeader/CompanyHeader.vue | 20 +-
.../components/CompanySortMenu.vue | 6 +
.../CompanyDetail/CompanyContactsSidebar.vue | 354 +++++++++++++++++
.../CompanyCustomAttributeItem.vue | 94 +++++
.../CompanyDetail/CompanyCustomAttributes.vue | 142 +++++++
.../CompanyDetail/CompanyProfileCard.vue | 203 ++++++++++
.../ConfirmCompanyDeleteDialog.vue | 45 +++
.../CustomAttributes/DateAttribute.vue | 2 +-
.../CustomAttributes/OtherAttribute.vue | 2 +-
.../components-next/sidebar/Sidebar.vue | 2 +-
.../i18n/locale/en/attributesMgmt.json | 8 +-
.../dashboard/i18n/locale/en/companies.json | 95 +++++
.../companies/pages/CompaniesIndex.vue | 19 +-
.../companies/pages/CompanyDetailView.vue | 236 ++++++++++++
.../routes/dashboard/companies/routes.js | 14 +
.../dashboard/settings/attributes/Index.vue | 5 +-
.../dashboard/store/modules/attributes.js | 5 +
.../modules/specs/attributes/getters.spec.js | 30 ++
app/javascript/dashboard/stores/companies.js | 358 +++++++++++++++++-
.../dashboard/stores/companies.spec.js | 213 +++++++++++
app/models/custom_attribute_definition.rb | 15 +-
config/routes.rb | 11 +
..._add_additional_attributes_to_companies.rb | 9 +
db/schema.rb | 3 +
.../accounts/companies/contacts_controller.rb | 87 +++++
.../api/v1/accounts/companies_controller.rb | 51 ++-
enterprise/app/models/company.rb | 18 +
enterprise/app/policies/company_policy.rb | 8 +
.../companies/contact_membership_service.rb | 15 +
.../accounts/companies/_company.json.jbuilder | 8 -
.../accounts/companies/avatar.json.jbuilder | 3 +
.../companies/contacts/_contact.json.jbuilder | 10 +
.../companies/contacts/create.json.jbuilder | 3 +
.../companies/contacts/index.json.jbuilder | 10 +
.../companies/contacts/search.json.jbuilder | 10 +
.../accounts/companies/create.json.jbuilder | 2 +-
.../destroy_custom_attributes.json.jbuilder | 3 +
.../v1/accounts/companies/index.json.jbuilder | 2 +-
.../accounts/companies/search.json.jbuilder | 2 +-
.../v1/accounts/companies/show.json.jbuilder | 2 +-
.../accounts/companies/update.json.jbuilder | 2 +-
.../api/v1/models/_company.json.jbuilder | 10 +
.../companies/contacts_controller_spec.rb | 78 ++++
.../v1/accounts/companies_controller_spec.rb | 67 ++++
.../custom_attribute_definition_spec.rb | 11 +
49 files changed, 2461 insertions(+), 193 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/Companies/CompaniesDetailsLayout.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributeItem.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributes.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/ConfirmCompanyDeleteDialog.vue
create mode 100644 app/javascript/dashboard/routes/dashboard/companies/pages/CompanyDetailView.vue
create mode 100644 app/javascript/dashboard/stores/companies.spec.js
create mode 100644 db/migrate/20260422133000_add_additional_attributes_to_companies.rb
create mode 100644 enterprise/app/controllers/api/v1/accounts/companies/contacts_controller.rb
create mode 100644 enterprise/app/services/companies/contact_membership_service.rb
delete mode 100644 enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/avatar.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/_contact.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/create.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/index.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/search.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/destroy_custom_attributes.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/models/_company.json.jbuilder
create mode 100644 spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
diff --git a/app/javascript/dashboard/api/companies.js b/app/javascript/dashboard/api/companies.js
index 090b530c4..b98a59983 100644
--- a/app/javascript/dashboard/api/companies.js
+++ b/app/javascript/dashboard/api/companies.js
@@ -1,21 +1,12 @@
/* global axios */
import ApiClient from './ApiClient';
-export const buildCompanyParams = (page, sort) => {
- let params = `page=${page}`;
- if (sort) {
- params = `${params}&sort=${sort}`;
- }
- return params;
-};
-
-export const buildSearchParams = (query, page, sort) => {
- let params = `q=${encodeURIComponent(query)}&page=${page}`;
- if (sort) {
- params = `${params}&sort=${sort}`;
- }
- return params;
-};
+const buildParams = params =>
+ new URLSearchParams(
+ Object.entries(params).filter(
+ ([key, value]) => value !== undefined && (value !== '' || key === 'q')
+ )
+ ).toString();
class CompanyAPI extends ApiClient {
constructor() {
@@ -24,14 +15,41 @@ class CompanyAPI extends ApiClient {
get(params = {}) {
const { page = 1, sort = 'name' } = params;
- const requestURL = `${this.url}?${buildCompanyParams(page, sort)}`;
+ const requestURL = `${this.url}?${buildParams({ page, sort })}`;
return axios.get(requestURL);
}
search(query = '', page = 1, sort = 'name') {
- const requestURL = `${this.url}/search?${buildSearchParams(query, page, sort)}`;
+ const requestURL = `${this.url}/search?${buildParams({ q: query, page, sort })}`;
return axios.get(requestURL);
}
+
+ listContacts(id, page = 1) {
+ return axios.get(`${this.url}/${id}/contacts?${buildParams({ page })}`);
+ }
+
+ searchContacts(id, query = '', page = 1) {
+ const requestURL = `${this.url}/${id}/contacts/search?${buildParams({ q: query, page })}`;
+ return axios.get(requestURL);
+ }
+
+ createContact(id, payload) {
+ return axios.post(`${this.url}/${id}/contacts`, payload);
+ }
+
+ removeContact(id, contactId) {
+ return axios.delete(`${this.url}/${id}/contacts/${contactId}`);
+ }
+
+ destroyCustomAttributes(id, customAttributes) {
+ return axios.post(`${this.url}/${id}/destroy_custom_attributes`, {
+ custom_attributes: customAttributes,
+ });
+ }
+
+ destroyAvatar(id) {
+ return axios.delete(`${this.url}/${id}/avatar`);
+ }
}
export default new CompanyAPI();
diff --git a/app/javascript/dashboard/api/specs/companies.spec.js b/app/javascript/dashboard/api/specs/companies.spec.js
index 82fdc1c97..ca1d905de 100644
--- a/app/javascript/dashboard/api/specs/companies.spec.js
+++ b/app/javascript/dashboard/api/specs/companies.spec.js
@@ -1,7 +1,4 @@
-import companyAPI, {
- buildCompanyParams,
- buildSearchParams,
-} from '../companies';
+import companyAPI from '../companies';
import ApiClient from '../ApiClient';
describe('#CompanyAPI', () => {
@@ -9,7 +6,6 @@ describe('#CompanyAPI', () => {
expect(companyAPI).toBeInstanceOf(ApiClient);
expect(companyAPI).toHaveProperty('get');
expect(companyAPI).toHaveProperty('show');
- expect(companyAPI).toHaveProperty('create');
expect(companyAPI).toHaveProperty('update');
expect(companyAPI).toHaveProperty('delete');
expect(companyAPI).toHaveProperty('search');
@@ -32,111 +28,69 @@ describe('#CompanyAPI', () => {
window.axios = originalAxios;
});
- it('#get with default params', () => {
+ it('#get includes pagination and sorting params', () => {
companyAPI.get({});
expect(axiosMock.get).toHaveBeenCalledWith(
'/api/v1/companies?page=1&sort=name'
);
});
- it('#get with page and sort params', () => {
- companyAPI.get({ page: 2, sort: 'domain' });
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies?page=2&sort=domain'
- );
- });
-
- it('#get with descending sort', () => {
- companyAPI.get({ page: 1, sort: '-created_at' });
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies?page=1&sort=-created_at'
- );
- });
-
- it('#search with query', () => {
- companyAPI.search('acme', 1, 'name');
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies/search?q=acme&page=1&sort=name'
- );
- });
-
- it('#search with special characters in query', () => {
+ it('#search encodes query params', () => {
companyAPI.search('acme & co', 2, 'domain');
expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies/search?q=acme%20%26%20co&page=2&sort=domain'
+ '/api/v1/companies/search?q=acme+%26+co&page=2&sort=domain'
);
});
- it('#search with descending sort', () => {
- companyAPI.search('test', 1, '-created_at');
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies/search?q=test&page=1&sort=-created_at'
- );
- });
-
- it('#search with empty query', () => {
+ it('#search keeps empty query param for backend validation', () => {
companyAPI.search('', 1, 'name');
expect(axiosMock.get).toHaveBeenCalledWith(
'/api/v1/companies/search?q=&page=1&sort=name'
);
});
- });
-});
-describe('#buildCompanyParams', () => {
- it('returns correct string with page only', () => {
- expect(buildCompanyParams(1)).toBe('page=1');
- });
-
- it('returns correct string with page and sort', () => {
- expect(buildCompanyParams(1, 'name')).toBe('page=1&sort=name');
- });
-
- it('returns correct string with different page', () => {
- expect(buildCompanyParams(3, 'domain')).toBe('page=3&sort=domain');
- });
-
- it('returns correct string with descending sort', () => {
- expect(buildCompanyParams(1, '-created_at')).toBe(
- 'page=1&sort=-created_at'
- );
- });
-
- it('returns correct string without sort parameter', () => {
- expect(buildCompanyParams(2, '')).toBe('page=2');
- });
-});
-
-describe('#buildSearchParams', () => {
- it('returns correct string with all parameters', () => {
- expect(buildSearchParams('acme', 1, 'name')).toBe(
- 'q=acme&page=1&sort=name'
- );
- });
-
- it('returns correct string with special characters', () => {
- expect(buildSearchParams('acme & co', 2, 'domain')).toBe(
- 'q=acme%20%26%20co&page=2&sort=domain'
- );
- });
-
- it('returns correct string with empty query', () => {
- expect(buildSearchParams('', 1, 'name')).toBe('q=&page=1&sort=name');
- });
-
- it('returns correct string without sort parameter', () => {
- expect(buildSearchParams('test', 1, '')).toBe('q=test&page=1');
- });
-
- it('returns correct string with descending sort', () => {
- expect(buildSearchParams('company', 3, '-created_at')).toBe(
- 'q=company&page=3&sort=-created_at'
- );
- });
-
- it('encodes special characters correctly', () => {
- expect(buildSearchParams('test@example.com', 1, 'name')).toBe(
- 'q=test%40example.com&page=1&sort=name'
- );
+ it('#destroyAvatar deletes the company avatar endpoint', () => {
+ companyAPI.destroyAvatar(1);
+ expect(axiosMock.delete).toHaveBeenCalledWith(
+ '/api/v1/companies/1/avatar'
+ );
+ });
+
+ it('#listContacts fetches company contacts', () => {
+ companyAPI.listContacts(1, 2);
+ expect(axiosMock.get).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts?page=2'
+ );
+ });
+
+ it('#searchContacts encodes contact search params', () => {
+ companyAPI.searchContacts(1, 'jane & co', 3);
+ expect(axiosMock.get).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts/search?q=jane+%26+co&page=3'
+ );
+ });
+
+ it('#createContact links a contact to the company', () => {
+ companyAPI.createContact(1, { contact_id: 2 });
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts',
+ { contact_id: 2 }
+ );
+ });
+
+ it('#removeContact unlinks a contact from the company', () => {
+ companyAPI.removeContact(1, 2);
+ expect(axiosMock.delete).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts/2'
+ );
+ });
+
+ it('#destroyCustomAttributes removes company custom attributes', () => {
+ companyAPI.destroyCustomAttributes(1, ['plan']);
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/companies/1/destroy_custom_attributes',
+ { custom_attributes: ['plan'] }
+ );
+ });
});
});
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue b/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
index 4603521eb..fe4385bbb 100644
--- a/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
@@ -1,7 +1,7 @@
-
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/companies/routes.js b/app/javascript/dashboard/routes/dashboard/companies/routes.js
index 69cbba762..42ed6bd18 100644
--- a/app/javascript/dashboard/routes/dashboard/companies/routes.js
+++ b/app/javascript/dashboard/routes/dashboard/companies/routes.js
@@ -1,5 +1,6 @@
import { frontendURL } from '../../../helper/URLHelper';
import CompaniesIndex from './pages/CompaniesIndex.vue';
+import CompanyDetailView from './pages/CompanyDetailView.vue';
import { FEATURE_FLAGS } from '../../../featureFlags';
import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
@@ -23,4 +24,17 @@ export const routes = [
},
],
},
+ {
+ path: frontendURL('accounts/:accountId/companies/:companyId'),
+ component: CompanyDetailView,
+ meta: commonMeta,
+ children: [
+ {
+ path: '',
+ name: 'companies_dashboard_show',
+ component: CompanyDetailView,
+ meta: commonMeta,
+ },
+ ],
+ },
];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
index 2aa2f28cd..61582fd32 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
@@ -32,6 +32,7 @@ const uiFlags = computed(() => getters['attributes/getUIFlags'].value);
const [showEditPopup, toggleEditPopup] = useToggle(false);
const [showDeletePopup, toggleDeletePopup] = useToggle(false);
const selectedAttribute = ref({});
+const attributeModels = ['conversation_attribute', 'contact_attribute'];
const openAddPopup = () => {
toggleAddPopup(true);
@@ -69,8 +70,8 @@ onMounted(() => {
store.dispatch('attributes/get');
});
-const attributeModel = computed(() =>
- selectedTabIndex.value ? 'contact_attribute' : 'conversation_attribute'
+const attributeModel = computed(
+ () => attributeModels[selectedTabIndex.value] || 'conversation_attribute'
);
const attributes = computed(() =>
diff --git a/app/javascript/dashboard/store/modules/attributes.js b/app/javascript/dashboard/store/modules/attributes.js
index c7cb771a5..1c7826cea 100644
--- a/app/javascript/dashboard/store/modules/attributes.js
+++ b/app/javascript/dashboard/store/modules/attributes.js
@@ -30,6 +30,11 @@ export const getters = {
.filter(record => record.attribute_model === 'contact_attribute')
.map(camelcaseKeys);
},
+ getCompanyAttributes: _state => {
+ return _state.records
+ .filter(record => record.attribute_model === 'company_attribute')
+ .map(camelcaseKeys);
+ },
getAttributesByModel: _state => attributeModel => {
return _state.records.filter(
record => record.attribute_model === attributeModel
diff --git a/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js
index 9d8f027f5..77cf0748b 100644
--- a/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js
@@ -35,6 +35,36 @@ describe('#getters', () => {
]);
});
+ it('getCompanyAttributes', () => {
+ const state = {
+ records: [
+ {
+ attribute_display_name: 'Industry',
+ attribute_display_type: 0,
+ attribute_description: 'Company industry',
+ attribute_key: 'industry',
+ attribute_model: 'company_attribute',
+ },
+ {
+ attribute_display_name: 'Language',
+ attribute_display_type: 1,
+ attribute_description: 'Conversation language',
+ attribute_key: 'language',
+ attribute_model: 'conversation_attribute',
+ },
+ ],
+ };
+ expect(getters.getCompanyAttributes(state)).toEqual([
+ {
+ attributeDisplayName: 'Industry',
+ attributeDisplayType: 0,
+ attributeDescription: 'Company industry',
+ attributeKey: 'industry',
+ attributeModel: 'company_attribute',
+ },
+ ]);
+ });
+
it('getUIFlags', () => {
const state = {
uiFlags: {
diff --git a/app/javascript/dashboard/stores/companies.js b/app/javascript/dashboard/stores/companies.js
index d1e8e56e9..e31f1677a 100644
--- a/app/javascript/dashboard/stores/companies.js
+++ b/app/javascript/dashboard/stores/companies.js
@@ -1,31 +1,375 @@
+import camelcaseKeys from 'camelcase-keys';
import CompanyAPI from 'dashboard/api/companies';
import { createStore } from 'dashboard/store/storeFactory';
import { throwErrorMessage } from 'dashboard/store/utils/api';
-import camelcaseKeys from 'camelcase-keys';
+import snakecaseKeys from 'snakecase-keys';
+
+const createInitialUIFlags = () => ({
+ fetchingList: false,
+ fetchingItem: false,
+ updatingItem: false,
+ deletingItem: false,
+ deletingAvatar: false,
+ deletingCustomAttributes: false,
+ fetchingContacts: false,
+ searchingContacts: false,
+ creatingContact: false,
+ removingContact: false,
+});
+
+const camelizeCompany = data =>
+ camelcaseKeys(data || {}, { deep: true, stopPaths: ['custom_attributes'] });
+
+const camelizeContact = data =>
+ camelcaseKeys(data || {}, {
+ deep: true,
+ stopPaths: ['custom_attributes', 'additional_attributes'],
+ });
+
+const normalizeMeta = meta => ({
+ ...camelcaseKeys(meta || {}),
+ totalCount: Number(meta?.total_count || meta?.totalCount || meta?.count || 0),
+ page: Number(meta?.page || meta?.current_page || 1),
+});
+
+const appendFormData = (formData, key, value) => {
+ if (value === undefined || value == null || value === '') return;
+ if (
+ value instanceof File ||
+ value instanceof Blob ||
+ typeof value !== 'object'
+ ) {
+ formData.append(key, value);
+ return;
+ }
+ Object.entries(value).forEach(([k, v]) =>
+ appendFormData(formData, `${key}[${k}]`, v)
+ );
+};
+
+const buildCompanyRequestPayload = ({ avatar, customAttributes, ...rest }) => {
+ const payload = {
+ ...snakecaseKeys(rest, { deep: true }),
+ ...(customAttributes && { custom_attributes: customAttributes }),
+ ...(avatar && { avatar }),
+ };
+ if (!avatar) return { company: payload };
+
+ const formData = new FormData();
+ Object.entries(payload).forEach(([k, v]) =>
+ appendFormData(formData, `company[${k}]`, v)
+ );
+ return formData;
+};
export const useCompaniesStore = createStore({
name: 'companies',
type: 'pinia',
API: CompanyAPI,
+
getters: {
- getCompaniesList: state => {
- return camelcaseKeys(state.records, { deep: true });
- },
+ getCompaniesList: state => state.records,
},
+
actions: () => ({
- async search({ search, page, sort }) {
+ setMeta(meta) {
+ this.meta = normalizeMeta(meta);
+ },
+
+ setActiveCompanyId(companyId) {
+ this.activeCompanyId = Number(companyId);
+ },
+
+ ensureActiveCompanyContext(companyId) {
+ if (this.activeCompanyId === null) {
+ this.setActiveCompanyId(companyId);
+ }
+ },
+
+ upsertCompanyRecord(record) {
+ const index = this.records.findIndex(r => r.id === record.id);
+ if (index === -1) this.records.push(record);
+ else this.records[index] = record;
+ },
+
+ updateCompanyContactsCount(companyId, contactsCount) {
+ const company = this.getRecord(companyId);
+ if (!company.id) return;
+ this.upsertCompanyRecord({ ...company, contactsCount });
+ },
+
+ clearContactSearchResults() {
+ this.contactSearchResults = [];
+ this.contactSearchMeta = {};
+ this.activeContactSearchQuery = '';
+ this.contactSearchRequestToken =
+ (this.contactSearchRequestToken || 0) + 1;
+ },
+
+ async get({ page = 1, sort = 'name' } = {}) {
+ this.setUIFlag({ fetchingList: true });
+ try {
+ const {
+ data: { payload, meta },
+ } = await CompanyAPI.get({ page, sort });
+ this.records = camelizeCompany(payload);
+ this.setMeta(meta);
+ return this.records;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ fetchingList: false });
+ }
+ },
+
+ async show(id) {
+ this.setUIFlag({ fetchingItem: true });
+ this.setActiveCompanyId(id);
+ const activeCompanyId = Number(id);
+ const requestToken = (this.companyDetailRequestToken || 0) + 1;
+ this.companyDetailRequestToken = requestToken;
+ try {
+ const {
+ data: { payload },
+ } = await CompanyAPI.show(id);
+ const company = camelizeCompany(payload);
+
+ if (
+ this.companyDetailRequestToken !== requestToken ||
+ this.activeCompanyId !== activeCompanyId
+ ) {
+ return company;
+ }
+
+ this.upsertCompanyRecord(company);
+ this.setActiveCompanyId(company.id);
+ return company;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ if (this.companyDetailRequestToken === requestToken) {
+ this.setUIFlag({ fetchingItem: false });
+ }
+ }
+ },
+
+ async update({ id, ...companyAttrs }) {
+ this.setUIFlag({ updatingItem: true });
+ try {
+ const {
+ data: { payload },
+ } = await CompanyAPI.update(
+ id,
+ buildCompanyRequestPayload(companyAttrs)
+ );
+ const company = camelizeCompany(payload);
+ this.upsertCompanyRecord(company);
+ return company;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ updatingItem: false });
+ }
+ },
+
+ async delete(id) {
+ this.setUIFlag({ deletingItem: true });
+ try {
+ await CompanyAPI.delete(id);
+ this.records = this.records.filter(r => r.id !== Number(id));
+ if (this.activeCompanyId === Number(id)) this.resetCompanyDetailState();
+ return Number(id);
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ deletingItem: false });
+ }
+ },
+
+ async search({ search, page = 1, sort = 'name' }) {
this.setUIFlag({ fetchingList: true });
try {
const {
data: { payload, meta },
} = await CompanyAPI.search(search, page, sort);
- this.records = payload;
+ this.records = camelizeCompany(payload);
this.setMeta(meta);
+ return this.records;
} catch (error) {
- throwErrorMessage(error);
+ return throwErrorMessage(error);
} finally {
this.setUIFlag({ fetchingList: false });
}
},
+
+ async deleteCompanyAvatar(companyId) {
+ this.setUIFlag({ deletingAvatar: true });
+ this.ensureActiveCompanyContext(companyId);
+ try {
+ const {
+ data: { payload },
+ } = await CompanyAPI.destroyAvatar(companyId);
+ const company = camelizeCompany(payload);
+ this.upsertCompanyRecord(company);
+ return company;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ deletingAvatar: false });
+ }
+ },
+
+ async getCompanyContacts(companyId, page = 1) {
+ this.setUIFlag({ fetchingContacts: true });
+ this.ensureActiveCompanyContext(companyId);
+ const activeCompanyId = Number(companyId);
+ const requestToken = (this.companyContactsRequestToken || 0) + 1;
+ this.companyContactsRequestToken = requestToken;
+
+ try {
+ const {
+ data: { payload, meta },
+ } = await CompanyAPI.listContacts(companyId, page);
+ const contacts = camelizeContact(payload);
+ const normalizedMeta = normalizeMeta(meta);
+
+ if (
+ this.companyContactsRequestToken !== requestToken ||
+ this.activeCompanyId !== activeCompanyId
+ ) {
+ return contacts;
+ }
+
+ this.companyContacts = contacts;
+ this.companyContactsMeta = normalizedMeta;
+ this.updateCompanyContactsCount(companyId, normalizedMeta.totalCount);
+ return contacts;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ if (this.companyContactsRequestToken === requestToken) {
+ this.setUIFlag({ fetchingContacts: false });
+ }
+ }
+ },
+
+ async searchCompanyContactCandidates({ companyId, search, page = 1 }) {
+ const query = search?.trim() || '';
+ if (!query) {
+ this.clearContactSearchResults();
+ return [];
+ }
+
+ this.setUIFlag({ searchingContacts: true });
+ this.ensureActiveCompanyContext(companyId);
+ this.activeContactSearchQuery = query;
+ const activeCompanyId = Number(companyId);
+ const requestToken = (this.contactSearchRequestToken || 0) + 1;
+ this.contactSearchRequestToken = requestToken;
+
+ try {
+ const {
+ data: { payload, meta },
+ } = await CompanyAPI.searchContacts(companyId, query, page);
+ const contacts = camelizeContact(payload);
+ const normalizedMeta = normalizeMeta(meta);
+
+ if (
+ this.contactSearchRequestToken !== requestToken ||
+ this.activeCompanyId !== activeCompanyId ||
+ this.activeContactSearchQuery !== query
+ ) {
+ return contacts;
+ }
+
+ this.contactSearchResults = contacts;
+ this.contactSearchMeta = normalizedMeta;
+ return contacts;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ if (this.contactSearchRequestToken === requestToken) {
+ this.setUIFlag({ searchingContacts: false });
+ }
+ }
+ },
+
+ async attachContactToCompany(companyId, contactId) {
+ this.setUIFlag({ creatingContact: true });
+ this.ensureActiveCompanyContext(companyId);
+ const activeCompanyId = Number(companyId);
+ try {
+ const {
+ data: { payload },
+ } = await CompanyAPI.createContact(companyId, {
+ contact_id: contactId,
+ });
+ const contact = camelizeContact(payload);
+ if (this.activeCompanyId === activeCompanyId) {
+ await this.getCompanyContacts(companyId, 1);
+ if (this.activeCompanyId === activeCompanyId) {
+ this.clearContactSearchResults();
+ }
+ }
+ return contact;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ creatingContact: false });
+ }
+ },
+
+ async removeContactFromCompany(companyId, contactId, page = null) {
+ this.setUIFlag({ removingContact: true });
+ this.ensureActiveCompanyContext(companyId);
+ const activeCompanyId = Number(companyId);
+ try {
+ await CompanyAPI.removeContact(companyId, contactId);
+ if (this.activeCompanyId === activeCompanyId) {
+ await this.getCompanyContacts(
+ companyId,
+ page || this.companyContactsMeta?.page || 1
+ );
+ }
+ return Number(contactId);
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ removingContact: false });
+ }
+ },
+
+ async deleteCustomAttributes({ id, customAttributes }) {
+ this.setUIFlag({ deletingCustomAttributes: true });
+ try {
+ const {
+ data: { payload },
+ } = await CompanyAPI.destroyCustomAttributes(id, customAttributes);
+ const company = camelizeCompany(payload);
+ this.upsertCompanyRecord(company);
+ return company;
+ } catch (error) {
+ return throwErrorMessage(error);
+ } finally {
+ this.setUIFlag({ deletingCustomAttributes: false });
+ }
+ },
+
+ resetCompanyDetailState() {
+ const { fetchingList } = this.uiFlags;
+ this.activeCompanyId = null;
+ this.companyDetailRequestToken =
+ (this.companyDetailRequestToken || 0) + 1;
+ this.companyContactsRequestToken =
+ (this.companyContactsRequestToken || 0) + 1;
+ this.contactSearchRequestToken =
+ (this.contactSearchRequestToken || 0) + 1;
+ this.companyContacts = [];
+ this.companyContactsMeta = {};
+ this.contactSearchResults = [];
+ this.contactSearchMeta = {};
+ this.activeContactSearchQuery = '';
+ this.uiFlags = { ...createInitialUIFlags(), fetchingList };
+ },
}),
});
diff --git a/app/javascript/dashboard/stores/companies.spec.js b/app/javascript/dashboard/stores/companies.spec.js
new file mode 100644
index 000000000..1c44d4292
--- /dev/null
+++ b/app/javascript/dashboard/stores/companies.spec.js
@@ -0,0 +1,213 @@
+import { setActivePinia, createPinia } from 'pinia';
+import CompanyAPI from 'dashboard/api/companies';
+import { useCompaniesStore } from './companies';
+
+vi.mock('dashboard/api/companies', () => ({
+ default: {
+ show: vi.fn(),
+ update: vi.fn(),
+ destroyAvatar: vi.fn(),
+ listContacts: vi.fn(),
+ searchContacts: vi.fn(),
+ createContact: vi.fn(),
+ removeContact: vi.fn(),
+ destroyCustomAttributes: vi.fn(),
+ },
+}));
+
+vi.mock('dashboard/store/utils/api', () => ({
+ throwErrorMessage: vi.fn(error => error),
+}));
+
+const createDeferred = () => {
+ let resolve;
+ const promise = new Promise(res => {
+ resolve = res;
+ });
+
+ return { promise, resolve };
+};
+
+describe('companies store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia());
+ vi.clearAllMocks();
+ });
+
+ it('keeps the latest active company when show requests resolve out of order', async () => {
+ const firstRequest = createDeferred();
+ const secondRequest = createDeferred();
+
+ CompanyAPI.show
+ .mockImplementationOnce(() => firstRequest.promise)
+ .mockImplementationOnce(() => secondRequest.promise);
+
+ const companiesStore = useCompaniesStore();
+
+ const staleRequest = companiesStore.show(1);
+ const currentRequest = companiesStore.show(2);
+
+ secondRequest.resolve({
+ data: {
+ payload: {
+ id: 2,
+ name: 'Beta Company',
+ },
+ },
+ });
+
+ await currentRequest;
+
+ expect(companiesStore.activeCompanyId).toBe(2);
+ expect(companiesStore.getUIFlags.fetchingItem).toBe(false);
+
+ firstRequest.resolve({
+ data: {
+ payload: {
+ id: 1,
+ name: 'Alpha Company',
+ },
+ },
+ });
+
+ await staleRequest;
+
+ expect(companiesStore.activeCompanyId).toBe(2);
+ expect(companiesStore.getRecord(1)).toEqual({});
+ expect(companiesStore.getRecord(2)).toEqual(
+ expect.objectContaining({ id: 2, name: 'Beta Company' })
+ );
+ expect(companiesStore.getUIFlags.fetchingItem).toBe(false);
+ });
+
+ it('keeps avatar files intact when building multipart update params', async () => {
+ CompanyAPI.update.mockResolvedValueOnce({
+ data: {
+ payload: {
+ id: 1,
+ name: 'Acme',
+ },
+ },
+ });
+
+ const companiesStore = useCompaniesStore();
+ const avatar = new File(['avatar'], 'avatar.png', { type: 'image/png' });
+
+ await companiesStore.update({
+ id: 1,
+ name: 'Acme',
+ avatar,
+ });
+
+ const formData = CompanyAPI.update.mock.calls[0][1];
+ expect(formData.get('company[avatar]')).toBe(avatar);
+ expect(formData.get('company[name]')).toBe('Acme');
+ });
+
+ it('preserves custom attribute keys when building update params', async () => {
+ CompanyAPI.update.mockResolvedValueOnce({
+ data: {
+ payload: {
+ id: 1,
+ name: 'Acme',
+ custom_attributes: {
+ subscriptionPlan: 'Enterprise',
+ },
+ },
+ },
+ });
+
+ const companiesStore = useCompaniesStore();
+
+ await companiesStore.update({
+ id: 1,
+ customAttributes: {
+ subscriptionPlan: 'Enterprise',
+ },
+ });
+
+ expect(CompanyAPI.update).toHaveBeenCalledWith(1, {
+ company: {
+ custom_attributes: {
+ subscriptionPlan: 'Enterprise',
+ },
+ },
+ });
+ });
+
+ it('links an existing contact and refreshes company contacts', async () => {
+ CompanyAPI.createContact.mockResolvedValueOnce({
+ data: {
+ payload: {
+ id: 2,
+ name: 'Jane Contact',
+ company_id: 1,
+ linked_to_current_company: true,
+ },
+ },
+ });
+ CompanyAPI.listContacts.mockResolvedValueOnce({
+ data: {
+ payload: [
+ {
+ id: 2,
+ name: 'Jane Contact',
+ company_id: 1,
+ linked_to_current_company: true,
+ },
+ ],
+ meta: { total_count: 1, page: 1 },
+ },
+ });
+
+ const companiesStore = useCompaniesStore();
+ companiesStore.setActiveCompanyId(1);
+
+ await companiesStore.attachContactToCompany(1, 2);
+
+ expect(CompanyAPI.createContact).toHaveBeenCalledWith(1, {
+ contact_id: 2,
+ });
+ expect(CompanyAPI.listContacts).toHaveBeenCalledWith(1, 1);
+ expect(companiesStore.companyContacts).toEqual([
+ expect.objectContaining({
+ id: 2,
+ companyId: 1,
+ linkedToCurrentCompany: true,
+ }),
+ ]);
+ });
+
+ it('removes a company custom attribute and updates the company record', async () => {
+ CompanyAPI.destroyCustomAttributes.mockResolvedValueOnce({
+ data: {
+ payload: {
+ id: 1,
+ name: 'Acme',
+ custom_attributes: {
+ region: 'us',
+ },
+ },
+ },
+ });
+
+ const companiesStore = useCompaniesStore();
+
+ await companiesStore.deleteCustomAttributes({
+ id: 1,
+ customAttributes: ['plan'],
+ });
+
+ expect(CompanyAPI.destroyCustomAttributes).toHaveBeenCalledWith(1, [
+ 'plan',
+ ]);
+ expect(companiesStore.getRecord(1)).toEqual(
+ expect.objectContaining({
+ id: 1,
+ customAttributes: {
+ region: 'us',
+ },
+ })
+ );
+ });
+});
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index 07d0a9535..35f822335 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -25,7 +25,8 @@ class CustomAttributeDefinition < ApplicationRecord
STANDARD_ATTRIBUTES = {
:conversation => %w[status priority assignee_id inbox_id team_id display_id campaign_id labels browser_language country_code referer created_at
last_activity_at],
- :contact => %w[name email phone_number identifier country_code city company_name created_at last_activity_at referer blocked]
+ :contact => %w[name email phone_number identifier country_code city company_name created_at last_activity_at referer blocked],
+ :company => %w[name domain description contacts_count created_at updated_at last_activity_at]
}.freeze
scope :with_attribute_model, ->(attribute_model) { attribute_model.presence && where(attribute_model: attribute_model) }
@@ -41,12 +42,12 @@ class CustomAttributeDefinition < ApplicationRecord
validates :attribute_model, presence: true
validate :attribute_must_not_conflict, on: :create
- enum attribute_model: { conversation_attribute: 0, contact_attribute: 1 }
+ enum attribute_model: { conversation_attribute: 0, contact_attribute: 1, company_attribute: 2 }
enum attribute_display_type: { text: 0, number: 1, currency: 2, percent: 3, link: 4, date: 5, list: 6, checkbox: 7 }
belongs_to :account
- after_update :update_widget_pre_chat_custom_fields
- after_destroy :sync_widget_pre_chat_custom_fields
+ after_update :update_widget_pre_chat_custom_fields, unless: :company_attribute?
+ after_destroy :sync_widget_pre_chat_custom_fields, unless: :company_attribute?
private
@@ -64,8 +65,10 @@ class CustomAttributeDefinition < ApplicationRecord
end
def attribute_must_not_conflict
- model_keys = attribute_model.to_sym == :conversation_attribute ? :conversation : :contact
- return unless attribute_key.in?(STANDARD_ATTRIBUTES[model_keys])
+ model_keys = attribute_model.to_s.delete_suffix('_attribute').to_sym
+ standard_attributes = STANDARD_ATTRIBUTES[model_keys]
+ return if standard_attributes.blank?
+ return unless attribute_key.in?(standard_attributes)
errors.add(:attribute_key, I18n.t('errors.custom_attribute_definition.key_conflict'))
end
diff --git a/config/routes.rb b/config/routes.rb
index c1a34bc85..fde0f64dd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -177,6 +177,17 @@ Rails.application.routes.draw do
collection do
get :search
end
+ member do
+ post :destroy_custom_attributes
+ delete :avatar
+ end
+ scope module: :companies do
+ resources :contacts, only: [:index, :create, :destroy] do
+ collection do
+ get :search
+ end
+ end
+ end
end
resources :contacts, only: [:index, :show, :update, :create, :destroy] do
collection do
diff --git a/db/migrate/20260422133000_add_additional_attributes_to_companies.rb b/db/migrate/20260422133000_add_additional_attributes_to_companies.rb
new file mode 100644
index 000000000..10835490f
--- /dev/null
+++ b/db/migrate/20260422133000_add_additional_attributes_to_companies.rb
@@ -0,0 +1,9 @@
+class AddAdditionalAttributesToCompanies < ActiveRecord::Migration[7.1]
+ def change
+ change_table :companies, bulk: true do |t|
+ t.jsonb :additional_attributes, default: {}
+ t.jsonb :custom_attributes, default: {}
+ t.datetime :last_activity_at, precision: nil
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9ce734ba7..f7c3cce6d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -612,6 +612,9 @@ ActiveRecord::Schema[7.1].define(version: 2026_04_30_114500) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "contacts_count"
+ t.jsonb "additional_attributes", default: {}
+ t.jsonb "custom_attributes", default: {}
+ t.datetime "last_activity_at", precision: nil
t.index ["account_id", "domain"], name: "index_companies_on_account_and_domain", unique: true, where: "(domain IS NOT NULL)"
t.index ["account_id"], name: "index_companies_on_account_id"
t.index ["name", "account_id"], name: "index_companies_on_name_and_account_id"
diff --git a/enterprise/app/controllers/api/v1/accounts/companies/contacts_controller.rb b/enterprise/app/controllers/api/v1/accounts/companies/contacts_controller.rb
new file mode 100644
index 000000000..a67ad907b
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/companies/contacts_controller.rb
@@ -0,0 +1,87 @@
+class Api::V1::Accounts::Companies::ContactsController < Api::V1::Accounts::EnterpriseAccountsController
+ RESULTS_PER_PAGE = 15
+ CONTACT_SEARCH_QUERY = [
+ 'contacts.name ILIKE :search',
+ 'contacts.email ILIKE :search',
+ 'contacts.phone_number ILIKE :search',
+ 'contacts.identifier ILIKE :search'
+ ].join(' OR ')
+
+ before_action :ensure_companies_enabled!
+ before_action :fetch_company
+ before_action :authorize_company_read!, only: [:index, :search]
+ before_action :authorize_company_update!, only: [:create, :destroy]
+ before_action :set_current_page, only: [:index, :search]
+ before_action :fetch_contact, only: [:destroy]
+
+ def index
+ @contacts = fetch_contacts(@company.contacts.order(:name, :id))
+ @contacts_count = @contacts.total_count
+ end
+
+ def search
+ if params[:q].blank?
+ return render json: { error: 'Specify search string with parameter q' },
+ status: :unprocessable_entity
+ end
+
+ @contacts = fetch_contacts(contact_search_scope)
+ @contacts_count = @contacts.total_count
+ end
+
+ def create
+ @contact = Current.account.contacts.find(params[:contact_id])
+ membership_service.assign(contact: @contact)
+ end
+
+ def destroy
+ membership_service.remove(contact: @contact)
+ head :ok
+ end
+
+ private
+
+ def set_current_page
+ @current_page = params[:page] || 1
+ end
+
+ def fetch_company
+ @company = Current.account.companies.find(params[:company_id])
+ end
+
+ def fetch_contact
+ @contact = @company.contacts.find(params[:id])
+ end
+
+ def fetch_contacts(contacts)
+ contacts
+ .includes({ avatar_attachment: [:blob] }, :company)
+ .page(@current_page)
+ .per(RESULTS_PER_PAGE)
+ end
+
+ def contact_search_scope
+ Current.account.contacts
+ .where('contacts.company_id IS NULL OR contacts.company_id != ?', @company.id)
+ .where(CONTACT_SEARCH_QUERY, search: "%#{params[:q].strip}%")
+ .order(:name, :id)
+ end
+
+ def membership_service
+ @membership_service ||= Companies::ContactMembershipService.new(company: @company)
+ end
+
+ def ensure_companies_enabled!
+ return if Current.account.feature_enabled?('companies')
+
+ render json: { error: 'Companies are not enabled for this account' }, status: :forbidden
+ end
+
+ def authorize_company_read!
+ authorize(@company, :show?)
+ end
+
+ def authorize_company_update!
+ authorize(@company, :update?)
+ end
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/companies_controller.rb b/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
index 3ec547cda..1df0e7d88 100644
--- a/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
@@ -3,13 +3,15 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
sort_on :name, type: :string
sort_on :domain, type: :string
sort_on :created_at, type: :datetime
+ sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
sort_on :contacts_count, internal_name: :order_on_contacts_count, type: :scope, scope_params: [:direction]
RESULTS_PER_PAGE = 25
+ before_action :ensure_companies_enabled!
before_action :check_authorization
before_action :set_current_page, only: [:index, :search]
- before_action :fetch_company, only: [:show, :update, :destroy]
+ before_action :fetch_company, only: [:show, :update, :destroy, :avatar, :destroy_custom_attributes]
def index
@companies = fetch_companies(resolved_companies)
@@ -35,7 +37,15 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
end
def update
- @company.update!(company_params)
+ @company.update!(company_update_params)
+ end
+
+ def destroy_custom_attributes
+ custom_attributes = custom_attributes_to_destroy
+ return if performed?
+
+ @company.custom_attributes = @company.custom_attributes.excluding(*custom_attributes)
+ @company.save!
end
def destroy
@@ -43,6 +53,10 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
head :ok
end
+ def avatar
+ @company.avatar.purge if @company.avatar.attached?
+ end
+
private
def resolved_companies
@@ -59,10 +73,10 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
.per(RESULTS_PER_PAGE)
end
- def check_authorization
- raise Pundit::NotAuthorizedError unless ChatwootApp.enterprise?
+ def ensure_companies_enabled!
+ return if Current.account.feature_enabled?('companies')
- authorize(Company)
+ render json: { error: 'Companies are not enabled for this account' }, status: :forbidden
end
def fetch_company
@@ -70,6 +84,31 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
end
def company_params
- params.require(:company).permit(:name, :domain, :description, :avatar)
+ params.require(:company).permit(
+ :name,
+ :domain,
+ :description,
+ :avatar,
+ additional_attributes: {},
+ custom_attributes: {}
+ )
+ end
+
+ def company_custom_attributes
+ custom_attributes = company_params[:custom_attributes]
+ return @company.custom_attributes.merge(custom_attributes.to_h) if custom_attributes.present?
+
+ @company.custom_attributes
+ end
+
+ def company_update_params
+ company_params.except(:custom_attributes).merge(custom_attributes: company_custom_attributes)
+ end
+
+ def custom_attributes_to_destroy
+ custom_attributes = params.permit(custom_attributes: [])[:custom_attributes]
+ return custom_attributes if custom_attributes.present? || params[:custom_attributes].is_a?(Array)
+
+ render json: { error: 'custom_attributes must be an array' }, status: :unprocessable_entity
end
end
diff --git a/enterprise/app/models/company.rb b/enterprise/app/models/company.rb
index 8581675bd..25ba51935 100644
--- a/enterprise/app/models/company.rb
+++ b/enterprise/app/models/company.rb
@@ -2,6 +2,9 @@
#
# Table name: companies
#
+# additional_attributes :jsonb
+# custom_attributes :jsonb
+# last_activity_at :datetime
# id :bigint not null, primary key
# contacts_count :integer
# description :text
@@ -19,6 +22,7 @@
#
class Company < ApplicationRecord
include Avatarable
+
validates :account_id, presence: true
validates :name, presence: true, length: { maximum: Limits::COMPANY_NAME_LENGTH_LIMIT }
validates :domain, allow_blank: true, format: {
@@ -27,9 +31,11 @@ class Company < ApplicationRecord
}
validates :domain, uniqueness: { scope: :account_id }, if: -> { domain.present? }
validates :description, length: { maximum: Limits::COMPANY_DESCRIPTION_LENGTH_LIMIT }
+ validates :custom_attributes, jsonb_attributes_length: true
belongs_to :account
has_many :contacts, dependent: :nullify
+ before_validation :prepare_jsonb_attributes
after_create_commit :fetch_favicon, if: -> { domain.present? }
scope :ordered_by_name, -> { order(:name) }
@@ -44,9 +50,21 @@ class Company < ApplicationRecord
)
)
}
+ scope :order_on_last_activity_at, lambda { |direction|
+ order(
+ Arel::Nodes::SqlLiteral.new(
+ sanitize_sql_for_order("\"companies\".\"last_activity_at\" #{direction} NULLS LAST")
+ )
+ )
+ }
private
+ def prepare_jsonb_attributes
+ self.additional_attributes = {} unless additional_attributes.is_a?(Hash)
+ self.custom_attributes = {} unless custom_attributes.is_a?(Hash)
+ end
+
def fetch_favicon
Avatar::AvatarFromFaviconJob.set(wait: 5.seconds).perform_later(self)
end
diff --git a/enterprise/app/policies/company_policy.rb b/enterprise/app/policies/company_policy.rb
index 756edfc32..d12ea3600 100644
--- a/enterprise/app/policies/company_policy.rb
+++ b/enterprise/app/policies/company_policy.rb
@@ -19,6 +19,14 @@ class CompanyPolicy < ApplicationPolicy
true
end
+ def avatar?
+ update?
+ end
+
+ def destroy_custom_attributes?
+ update?
+ end
+
def destroy?
@account_user.administrator?
end
diff --git a/enterprise/app/services/companies/contact_membership_service.rb b/enterprise/app/services/companies/contact_membership_service.rb
new file mode 100644
index 000000000..fe3f32168
--- /dev/null
+++ b/enterprise/app/services/companies/contact_membership_service.rb
@@ -0,0 +1,15 @@
+class Companies::ContactMembershipService
+ attr_reader :company
+
+ def initialize(company:)
+ @company = company
+ end
+
+ def assign(contact:)
+ contact.update!(company: company)
+ end
+
+ def remove(contact:)
+ contact.update!(company: nil)
+ end
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
deleted file mode 100644
index 8b8772507..000000000
--- a/enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
+++ /dev/null
@@ -1,8 +0,0 @@
-json.id company.id
-json.name company.name
-json.contacts_count company.contacts_count
-json.domain company.domain
-json.description company.description
-json.avatar_url company.avatar_url
-json.created_at company.created_at
-json.updated_at company.updated_at
diff --git a/enterprise/app/views/api/v1/accounts/companies/avatar.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/avatar.json.jbuilder
new file mode 100644
index 000000000..48f181f66
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/avatar.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+ json.partial! 'api/v1/models/company', formats: [:json], resource: @company
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/contacts/_contact.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/contacts/_contact.json.jbuilder
new file mode 100644
index 000000000..2b0885169
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/contacts/_contact.json.jbuilder
@@ -0,0 +1,10 @@
+json.partial! 'api/v1/models/contact', formats: [:json], resource: contact, with_contact_inboxes: false
+json.company_id contact.company_id
+json.linked_to_current_company contact.company_id == @company.id
+if contact.company.present?
+ json.company do
+ json.partial! 'api/v1/models/company', formats: [:json], resource: contact.company
+ end
+else
+ json.company nil
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/contacts/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/contacts/create.json.jbuilder
new file mode 100644
index 000000000..103e8ef17
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/contacts/create.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+ json.partial! 'api/v1/accounts/companies/contacts/contact', formats: [:json], contact: @contact
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/contacts/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/contacts/index.json.jbuilder
new file mode 100644
index 000000000..5537d8adc
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/contacts/index.json.jbuilder
@@ -0,0 +1,10 @@
+json.meta do
+ json.total_count @contacts_count
+ json.page @current_page
+end
+
+json.payload do
+ json.array! @contacts do |contact|
+ json.partial! 'api/v1/accounts/companies/contacts/contact', formats: [:json], contact: contact
+ end
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/contacts/search.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/contacts/search.json.jbuilder
new file mode 100644
index 000000000..5537d8adc
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/contacts/search.json.jbuilder
@@ -0,0 +1,10 @@
+json.meta do
+ json.total_count @contacts_count
+ json.page @current_page
+end
+
+json.payload do
+ json.array! @contacts do |contact|
+ json.partial! 'api/v1/accounts/companies/contacts/contact', formats: [:json], contact: contact
+ end
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/create.json.jbuilder
index b3bc80cfd..48f181f66 100644
--- a/enterprise/app/views/api/v1/accounts/companies/create.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/create.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
- json.partial! 'company', company: @company
+ json.partial! 'api/v1/models/company', formats: [:json], resource: @company
end
diff --git a/enterprise/app/views/api/v1/accounts/companies/destroy_custom_attributes.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/destroy_custom_attributes.json.jbuilder
new file mode 100644
index 000000000..48f181f66
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/companies/destroy_custom_attributes.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+ json.partial! 'api/v1/models/company', formats: [:json], resource: @company
+end
diff --git a/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder
index ef9c67723..798490d90 100644
--- a/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/index.json.jbuilder
@@ -5,6 +5,6 @@ end
json.payload do
json.array! @companies do |company|
- json.partial! 'company', company: company
+ json.partial! 'api/v1/models/company', formats: [:json], resource: company
end
end
diff --git a/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder
index ef9c67723..798490d90 100644
--- a/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/search.json.jbuilder
@@ -5,6 +5,6 @@ end
json.payload do
json.array! @companies do |company|
- json.partial! 'company', company: company
+ json.partial! 'api/v1/models/company', formats: [:json], resource: company
end
end
diff --git a/enterprise/app/views/api/v1/accounts/companies/show.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/show.json.jbuilder
index b3bc80cfd..48f181f66 100644
--- a/enterprise/app/views/api/v1/accounts/companies/show.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/show.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
- json.partial! 'company', company: @company
+ json.partial! 'api/v1/models/company', formats: [:json], resource: @company
end
diff --git a/enterprise/app/views/api/v1/accounts/companies/update.json.jbuilder b/enterprise/app/views/api/v1/accounts/companies/update.json.jbuilder
index b3bc80cfd..48f181f66 100644
--- a/enterprise/app/views/api/v1/accounts/companies/update.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/companies/update.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
- json.partial! 'company', company: @company
+ json.partial! 'api/v1/models/company', formats: [:json], resource: @company
end
diff --git a/enterprise/app/views/api/v1/models/_company.json.jbuilder b/enterprise/app/views/api/v1/models/_company.json.jbuilder
new file mode 100644
index 000000000..2e7f11ed4
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/_company.json.jbuilder
@@ -0,0 +1,10 @@
+json.id resource.id
+json.name resource.name
+json.contacts_count resource.contacts_count
+json.domain resource.domain
+json.description resource.description
+json.custom_attributes resource.custom_attributes
+json.avatar_url resource.avatar_url
+json.last_activity_at resource.last_activity_at.to_i if resource[:last_activity_at].present?
+json.created_at resource.created_at.to_i if resource[:created_at].present?
+json.updated_at resource.updated_at.to_i if resource[:updated_at].present?
diff --git a/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
new file mode 100644
index 000000000..d18014e8c
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
@@ -0,0 +1,78 @@
+require 'rails_helper'
+
+RSpec.describe 'Company contacts API', type: :request do
+ let(:account) { create(:account) }
+ let(:admin) { create(:user, account: account, role: :administrator) }
+ let(:company) { create(:company, name: 'Acme', account: account) }
+
+ before { account.enable_features!(:companies) }
+
+ describe 'GET /api/v1/accounts/{account.id}/companies/{company.id}/contacts' do
+ it 'returns contacts linked to the company' do
+ linked_contact = create(:contact, name: 'Linked Contact', company: company, account: account)
+ create(:contact, name: 'Other Contact', account: account)
+
+ get "/api/v1/accounts/#{account.id}/companies/#{company.id}/contacts",
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ response_body = response.parsed_body
+ expect(response_body['payload'].pluck('id')).to eq([linked_contact.id])
+ expect(response_body['payload'].first['company_id']).to eq(company.id)
+ expect(response_body['payload'].first['linked_to_current_company']).to be true
+ expect(response_body['meta']['total_count']).to eq(1)
+ end
+ end
+
+ describe 'GET /api/v1/accounts/{account.id}/companies/{company.id}/contacts/search' do
+ it 'returns matching contacts that are not already linked to the company' do
+ other_company = create(:company, name: 'Other Company', account: account)
+ linked_contact = create(:contact, name: 'Jane Current', company: company, account: account)
+ available_contact = create(:contact, name: 'Jane Available', account: account)
+ assigned_contact = create(:contact, name: 'Jane Assigned', company: other_company, account: account)
+
+ get "/api/v1/accounts/#{account.id}/companies/#{company.id}/contacts/search",
+ params: { q: 'Jane' },
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ contact_ids = response.parsed_body['payload'].pluck('id')
+ expect(contact_ids).to contain_exactly(available_contact.id, assigned_contact.id)
+ expect(contact_ids).not_to include(linked_contact.id)
+ end
+ end
+
+ describe 'POST /api/v1/accounts/{account.id}/companies/{company.id}/contacts' do
+ it 'links an existing contact to the company' do
+ contact = create(:contact, name: 'Jane Contact', account: account, additional_attributes: { 'city' => 'Berlin' })
+
+ post "/api/v1/accounts/#{account.id}/companies/#{company.id}/contacts",
+ params: { contact_id: contact.id },
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(contact.reload.company_id).to eq(company.id)
+ expect(contact.additional_attributes).to eq('city' => 'Berlin')
+ expect(response.parsed_body['payload']['company_id']).to eq(company.id)
+ expect(response.parsed_body['payload']['linked_to_current_company']).to be true
+ end
+ end
+
+ describe 'DELETE /api/v1/accounts/{account.id}/companies/{company.id}/contacts/{id}' do
+ it 'removes a contact from the company' do
+ contact = create(:contact, name: 'Jane Contact', company: company, account: account,
+ additional_attributes: { 'company_name' => 'Acme', 'city' => 'Berlin' })
+
+ delete "/api/v1/accounts/#{account.id}/companies/#{company.id}/contacts/#{contact.id}",
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:ok)
+ expect(contact.reload.company_id).to be_nil
+ expect(contact.additional_attributes).to eq('company_name' => 'Acme', 'city' => 'Berlin')
+ end
+ end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
index 3dadcec43..84b182669 100644
--- a/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
@@ -3,6 +3,8 @@ require 'rails_helper'
RSpec.describe 'Companies API', type: :request do
let(:account) { create(:account) }
+ before { account.enable_features!(:companies) }
+
describe 'GET /api/v1/accounts/{account.id}/companies' do
context 'when it is an unauthenticated user' do
it 'returns unauthorized' do
@@ -222,6 +224,17 @@ RSpec.describe 'Companies API', type: :request do
expect(response_body['payload']['name']).to eq(company.name)
expect(response_body['payload']['id']).to eq(company.id)
end
+
+ it 'returns company custom attributes' do
+ company.update!(custom_attributes: { 'plan' => 'enterprise' })
+
+ get "/api/v1/accounts/#{account.id}/companies/#{company.id}",
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body['payload']['custom_attributes']).to eq('plan' => 'enterprise')
+ end
end
end
@@ -302,6 +315,60 @@ RSpec.describe 'Companies API', type: :request do
expect(response_body['payload']['name']).to eq('Updated Company Name')
expect(response_body['payload']['domain']).to eq('updated.com')
end
+
+ it 'merges custom attributes without removing existing attributes' do
+ company.update!(custom_attributes: { 'plan' => 'startup', 'region' => 'us' })
+
+ patch "/api/v1/accounts/#{account.id}/companies/#{company.id}",
+ params: { company: { custom_attributes: { 'plan' => 'enterprise' } } },
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(company.reload.custom_attributes).to eq('plan' => 'enterprise', 'region' => 'us')
+ expect(response.parsed_body['payload']['custom_attributes']).to eq('plan' => 'enterprise', 'region' => 'us')
+ end
+ end
+ end
+
+ describe 'POST /api/v1/accounts/{account.id}/companies/{id}/destroy_custom_attributes' do
+ let(:company) { create(:company, account: account, custom_attributes: { 'plan' => 'enterprise', 'region' => 'us' }) }
+
+ context 'when it is an authenticated user' do
+ let(:admin) { create(:user, account: account, role: :administrator) }
+
+ it 'removes selected company custom attributes' do
+ post "/api/v1/accounts/#{account.id}/companies/#{company.id}/destroy_custom_attributes",
+ params: { custom_attributes: ['plan'] },
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(company.reload.custom_attributes).to eq('region' => 'us')
+ expect(response.parsed_body['payload']['custom_attributes']).to eq('region' => 'us')
+ end
+ end
+ end
+
+ describe 'DELETE /api/v1/accounts/{account.id}/companies/{id}/avatar' do
+ let(:company) { create(:company, account: account) }
+
+ context 'when it is an authenticated administrator' do
+ let(:admin) { create(:user, account: account, role: :administrator) }
+
+ before do
+ company.avatar.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+ end
+
+ it 'deletes the company avatar' do
+ delete "/api/v1/accounts/#{account.id}/companies/#{company.id}/avatar",
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect { company.avatar.attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
+ expect(response.parsed_body['payload']['avatar_url']).to be_blank
+ end
end
end
diff --git a/spec/models/custom_attribute_definition_spec.rb b/spec/models/custom_attribute_definition_spec.rb
index 648296b69..c529fc609 100644
--- a/spec/models/custom_attribute_definition_spec.rb
+++ b/spec/models/custom_attribute_definition_spec.rb
@@ -42,6 +42,17 @@ RSpec.describe CustomAttributeDefinition do
cad = build(:custom_attribute_definition, account: account, attribute_key: 'key()')
expect(cad).not_to be_valid
end
+
+ it 'allows company custom attributes' do
+ cad = build(:custom_attribute_definition, account: account, attribute_model: 'company_attribute')
+ expect(cad).to be_valid
+ end
+
+ it 'rejects company custom attributes that conflict with standard company fields' do
+ cad = build(:custom_attribute_definition, account: account, attribute_model: 'company_attribute', attribute_key: 'domain')
+ expect(cad).not_to be_valid
+ expect(cad.errors[:attribute_key]).to be_present
+ end
end
end
From 2435d7503c87061ccf72ec9a38eaefb2fb672272 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 7 May 2026 14:58:38 +0530
Subject: [PATCH 09/15] feat: Update conversation bulk action UI (#14118)
---
.../ArticleEditorControls.vue | 4 +-
.../ArticlePage/ArticleHeaderControls.vue | 4 +-
.../Pages/ArticlePage/ArticlesPage.vue | 2 +-
.../CategoryPage/CategoryHeaderControls.vue | 2 +-
.../components/InboxSelector.vue | 2 +-
.../captain/assistant/BulkSelectBar.vue | 11 +-
.../dropdown-menu/DropdownMenu.vue | 261 +++++-----
.../components-next/label/AddLabel.vue | 2 +-
.../phonenumberinput/PhoneNumberInput.vue | 2 +-
.../components-next/taginput/TagInput.vue | 2 +-
.../dashboard/components/ChatList.vue | 10 +-
.../conversationBulkActions/AgentSelector.vue | 254 ----------
.../BulkAgentActions.vue | 202 ++++++++
.../BulkLabelActions.vue | 160 ++++++
.../BulkTeamActions.vue | 174 +++++++
.../BulkUpdateActions.vue | 109 ++++
.../conversationBulkActions/Index.vue | 470 +++++++-----------
.../conversationBulkActions/LabelActions.vue | 141 ------
.../conversationBulkActions/TeamActions.vue | 145 ------
.../conversationBulkActions/UpdateActions.vue | 109 ----
.../composables/chatlist/useBulkActions.js | 14 +-
.../dashboard/i18n/locale/en/bulkActions.json | 19 +-
.../components/SearchContactAgentSelector.vue | 2 +-
.../components/SearchDateRangeSelector.vue | 2 +-
.../search/components/SearchInboxSelector.vue | 2 +-
.../dashboard/captain/responses/Pending.vue | 2 +-
.../components/ContactsBulkActionBar.vue | 68 +--
.../inbox/settingsPage/CollaboratorsPage.vue | 2 +-
.../heatmaps/BaseHeatmapContainer.vue | 2 +-
29 files changed, 1014 insertions(+), 1165 deletions(-)
delete mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkAgentActions.vue
create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkLabelActions.vue
create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkTeamActions.vue
create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkUpdateActions.vue
delete mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
delete mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
delete mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue
index c93aa1afd..84ac1ce38 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue
@@ -201,7 +201,7 @@ onMounted(() => {
v-if="openAgentsList && hasAgentList"
:menu-items="agentList"
show-search
- class="z-[100] w-48 mt-2 overflow-y-auto ltr:left-0 rtl:right-0 top-full max-h-60"
+ class="z-[100] w-48 mt-2 ltr:left-0 rtl:right-0 top-full max-h-60"
@action="handleArticleAction"
/>
@@ -233,7 +233,7 @@ onMounted(() => {
v-if="openCategoryList && hasCategoryMenuItems"
:menu-items="categoryList"
show-search
- class="w-48 mt-2 z-[100] overflow-y-auto left-0 top-full max-h-60"
+ class="w-48 mt-2 z-[100] left-0 top-full max-h-60"
@action="handleArticleAction"
/>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue
index 6565fab82..b49b3e61f 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue
@@ -159,7 +159,7 @@ const handleTabChange = value => {
v-if="isLocaleMenuOpen"
:menu-items="localeMenuItems"
show-search
- class="left-0 w-40 max-w-[300px] mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
+ class="left-0 w-40 max-w-[300px] mt-2 xl:right-0 top-full max-h-60"
@action="handleLocaleAction"
/>
@@ -180,7 +180,7 @@ const handleTabChange = value => {
v-if="isCategoryMenuOpen"
:menu-items="categoryMenuItems"
show-search
- class="left-0 w-48 mt-2 overflow-y-auto xl:right-0 top-full max-h-60"
+ class="left-0 w-48 mt-2 xl:right-0 top-full max-h-60"
@action="handleCategoryAction"
/>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
index 325f6abe6..0b7d86219 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
@@ -296,7 +296,7 @@ watch(
:selected-count-label="selectedCountLabel"
class="py-2 ltr:!pr-3 rtl:!pl-3 justify-between"
>
-
+
diff --git a/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue b/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue
index 1774a47a0..a2f3595c2 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/BulkSelectBar.vue
@@ -1,5 +1,5 @@
-
-
- This is an HTML message with an inline image.
+
+
+
+
+------=_NextPart_001_0002--
+
+------=_NextPart_000_0001
+Content-Type: image/jpeg;
+ filename="image001.jpg"
+Content-Transfer-Encoding: base64
+Content-ID: ')
+
+ expect(helper_instance.send(:body_references_cid?, 'image001.jpg@test')).to be true
+ end
+ end
+
+ describe '#upload_inline_image' do
+ let(:mail_attachment) do
+ {
+ original: OpenStruct.new(cid: 'image001.jpg@test'),
+ blob: get_blob_for('spec/assets/avatar.png', 'image/png')
+ }
+ end
+ let(:helper_instance) { mailbox_helper_obj.new(conversation, processed_mail) }
+
+ it 'replaces percent-encoded CID references in HTML content' do
+ allow(Rails.application.routes.url_helpers).to receive(:url_for).and_return('/fake-image-url')
+ helper_instance.instance_variable_set(:@html_content, '')
+
+ helper_instance.send(:upload_inline_image, mail_attachment)
+
+ html_content = helper_instance.instance_variable_get(:@html_content)
+ expect(html_content).to include('/fake-image-url"')
+ expect(html_content).not_to include('cid:')
+ end
+ end
+
+ describe '#add_attachments_to_message' do
+ let(:mail) { create_inbound_email_from_fixture('cid_inline_images_without_disposition.eml').mail }
+ let(:processed_mail) { MailPresenter.new(mail) }
+ let(:conversation) { create(:conversation) }
+ let(:helper_instance) { mailbox_helper_obj.new(conversation, processed_mail) }
+
+ before do
+ helper_instance.send(:create_message)
+ end
+
+ it 'detects inline image attachment by cid reference when Content-Disposition is missing' do
+ allow(Rails.application.routes.url_helpers).to receive(:url_for).and_return('/fake-image-url')
+ helper_instance.send(:add_attachments_to_message)
+
+ message = conversation.messages[0]
+
+ expect(message.attachments.count).to eq(0)
+
+ html_content = message.content_attributes[:email][:html_content][:full]
+
+ expect(html_content).to include('/fake-image-url"')
+ expect(html_content).not_to include('cid:')
+ end
+ end
end
From fe44b0714790722f4fbf70c962f3a96d5a095509 Mon Sep 17 00:00:00 2001
From: salmonumbrella <182032677+salmonumbrella@users.noreply.github.com>
Date: Wed, 6 May 2026 08:20:27 -0700
Subject: [PATCH 08/15] feat(companies): add company detail page (#14054)
---
app/javascript/dashboard/api/companies.js | 52 ++-
.../dashboard/api/specs/companies.spec.js | 142 +++----
.../Companies/CompaniesCard/CompaniesCard.vue | 52 ++-
.../Companies/CompaniesDetailsLayout.vue | 115 ++++++
.../CompaniesHeader/CompanyHeader.vue | 20 +-
.../components/CompanySortMenu.vue | 6 +
.../CompanyDetail/CompanyContactsSidebar.vue | 354 +++++++++++++++++
.../CompanyCustomAttributeItem.vue | 94 +++++
.../CompanyDetail/CompanyCustomAttributes.vue | 142 +++++++
.../CompanyDetail/CompanyProfileCard.vue | 203 ++++++++++
.../ConfirmCompanyDeleteDialog.vue | 45 +++
.../CustomAttributes/DateAttribute.vue | 2 +-
.../CustomAttributes/OtherAttribute.vue | 2 +-
.../components-next/sidebar/Sidebar.vue | 2 +-
.../i18n/locale/en/attributesMgmt.json | 8 +-
.../dashboard/i18n/locale/en/companies.json | 95 +++++
.../companies/pages/CompaniesIndex.vue | 19 +-
.../companies/pages/CompanyDetailView.vue | 236 ++++++++++++
.../routes/dashboard/companies/routes.js | 14 +
.../dashboard/settings/attributes/Index.vue | 5 +-
.../dashboard/store/modules/attributes.js | 5 +
.../modules/specs/attributes/getters.spec.js | 30 ++
app/javascript/dashboard/stores/companies.js | 358 +++++++++++++++++-
.../dashboard/stores/companies.spec.js | 213 +++++++++++
app/models/custom_attribute_definition.rb | 15 +-
config/routes.rb | 11 +
..._add_additional_attributes_to_companies.rb | 9 +
db/schema.rb | 3 +
.../accounts/companies/contacts_controller.rb | 87 +++++
.../api/v1/accounts/companies_controller.rb | 51 ++-
enterprise/app/models/company.rb | 18 +
enterprise/app/policies/company_policy.rb | 8 +
.../companies/contact_membership_service.rb | 15 +
.../accounts/companies/_company.json.jbuilder | 8 -
.../accounts/companies/avatar.json.jbuilder | 3 +
.../companies/contacts/_contact.json.jbuilder | 10 +
.../companies/contacts/create.json.jbuilder | 3 +
.../companies/contacts/index.json.jbuilder | 10 +
.../companies/contacts/search.json.jbuilder | 10 +
.../accounts/companies/create.json.jbuilder | 2 +-
.../destroy_custom_attributes.json.jbuilder | 3 +
.../v1/accounts/companies/index.json.jbuilder | 2 +-
.../accounts/companies/search.json.jbuilder | 2 +-
.../v1/accounts/companies/show.json.jbuilder | 2 +-
.../accounts/companies/update.json.jbuilder | 2 +-
.../api/v1/models/_company.json.jbuilder | 10 +
.../companies/contacts_controller_spec.rb | 78 ++++
.../v1/accounts/companies_controller_spec.rb | 67 ++++
.../custom_attribute_definition_spec.rb | 11 +
49 files changed, 2461 insertions(+), 193 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/Companies/CompaniesDetailsLayout.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributeItem.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributes.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanyDetail/ConfirmCompanyDeleteDialog.vue
create mode 100644 app/javascript/dashboard/routes/dashboard/companies/pages/CompanyDetailView.vue
create mode 100644 app/javascript/dashboard/stores/companies.spec.js
create mode 100644 db/migrate/20260422133000_add_additional_attributes_to_companies.rb
create mode 100644 enterprise/app/controllers/api/v1/accounts/companies/contacts_controller.rb
create mode 100644 enterprise/app/services/companies/contact_membership_service.rb
delete mode 100644 enterprise/app/views/api/v1/accounts/companies/_company.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/avatar.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/_contact.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/create.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/index.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/contacts/search.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/accounts/companies/destroy_custom_attributes.json.jbuilder
create mode 100644 enterprise/app/views/api/v1/models/_company.json.jbuilder
create mode 100644 spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
diff --git a/app/javascript/dashboard/api/companies.js b/app/javascript/dashboard/api/companies.js
index 090b530c4..b98a59983 100644
--- a/app/javascript/dashboard/api/companies.js
+++ b/app/javascript/dashboard/api/companies.js
@@ -1,21 +1,12 @@
/* global axios */
import ApiClient from './ApiClient';
-export const buildCompanyParams = (page, sort) => {
- let params = `page=${page}`;
- if (sort) {
- params = `${params}&sort=${sort}`;
- }
- return params;
-};
-
-export const buildSearchParams = (query, page, sort) => {
- let params = `q=${encodeURIComponent(query)}&page=${page}`;
- if (sort) {
- params = `${params}&sort=${sort}`;
- }
- return params;
-};
+const buildParams = params =>
+ new URLSearchParams(
+ Object.entries(params).filter(
+ ([key, value]) => value !== undefined && (value !== '' || key === 'q')
+ )
+ ).toString();
class CompanyAPI extends ApiClient {
constructor() {
@@ -24,14 +15,41 @@ class CompanyAPI extends ApiClient {
get(params = {}) {
const { page = 1, sort = 'name' } = params;
- const requestURL = `${this.url}?${buildCompanyParams(page, sort)}`;
+ const requestURL = `${this.url}?${buildParams({ page, sort })}`;
return axios.get(requestURL);
}
search(query = '', page = 1, sort = 'name') {
- const requestURL = `${this.url}/search?${buildSearchParams(query, page, sort)}`;
+ const requestURL = `${this.url}/search?${buildParams({ q: query, page, sort })}`;
return axios.get(requestURL);
}
+
+ listContacts(id, page = 1) {
+ return axios.get(`${this.url}/${id}/contacts?${buildParams({ page })}`);
+ }
+
+ searchContacts(id, query = '', page = 1) {
+ const requestURL = `${this.url}/${id}/contacts/search?${buildParams({ q: query, page })}`;
+ return axios.get(requestURL);
+ }
+
+ createContact(id, payload) {
+ return axios.post(`${this.url}/${id}/contacts`, payload);
+ }
+
+ removeContact(id, contactId) {
+ return axios.delete(`${this.url}/${id}/contacts/${contactId}`);
+ }
+
+ destroyCustomAttributes(id, customAttributes) {
+ return axios.post(`${this.url}/${id}/destroy_custom_attributes`, {
+ custom_attributes: customAttributes,
+ });
+ }
+
+ destroyAvatar(id) {
+ return axios.delete(`${this.url}/${id}/avatar`);
+ }
}
export default new CompanyAPI();
diff --git a/app/javascript/dashboard/api/specs/companies.spec.js b/app/javascript/dashboard/api/specs/companies.spec.js
index 82fdc1c97..ca1d905de 100644
--- a/app/javascript/dashboard/api/specs/companies.spec.js
+++ b/app/javascript/dashboard/api/specs/companies.spec.js
@@ -1,7 +1,4 @@
-import companyAPI, {
- buildCompanyParams,
- buildSearchParams,
-} from '../companies';
+import companyAPI from '../companies';
import ApiClient from '../ApiClient';
describe('#CompanyAPI', () => {
@@ -9,7 +6,6 @@ describe('#CompanyAPI', () => {
expect(companyAPI).toBeInstanceOf(ApiClient);
expect(companyAPI).toHaveProperty('get');
expect(companyAPI).toHaveProperty('show');
- expect(companyAPI).toHaveProperty('create');
expect(companyAPI).toHaveProperty('update');
expect(companyAPI).toHaveProperty('delete');
expect(companyAPI).toHaveProperty('search');
@@ -32,111 +28,69 @@ describe('#CompanyAPI', () => {
window.axios = originalAxios;
});
- it('#get with default params', () => {
+ it('#get includes pagination and sorting params', () => {
companyAPI.get({});
expect(axiosMock.get).toHaveBeenCalledWith(
'/api/v1/companies?page=1&sort=name'
);
});
- it('#get with page and sort params', () => {
- companyAPI.get({ page: 2, sort: 'domain' });
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies?page=2&sort=domain'
- );
- });
-
- it('#get with descending sort', () => {
- companyAPI.get({ page: 1, sort: '-created_at' });
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies?page=1&sort=-created_at'
- );
- });
-
- it('#search with query', () => {
- companyAPI.search('acme', 1, 'name');
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies/search?q=acme&page=1&sort=name'
- );
- });
-
- it('#search with special characters in query', () => {
+ it('#search encodes query params', () => {
companyAPI.search('acme & co', 2, 'domain');
expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies/search?q=acme%20%26%20co&page=2&sort=domain'
+ '/api/v1/companies/search?q=acme+%26+co&page=2&sort=domain'
);
});
- it('#search with descending sort', () => {
- companyAPI.search('test', 1, '-created_at');
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/companies/search?q=test&page=1&sort=-created_at'
- );
- });
-
- it('#search with empty query', () => {
+ it('#search keeps empty query param for backend validation', () => {
companyAPI.search('', 1, 'name');
expect(axiosMock.get).toHaveBeenCalledWith(
'/api/v1/companies/search?q=&page=1&sort=name'
);
});
- });
-});
-describe('#buildCompanyParams', () => {
- it('returns correct string with page only', () => {
- expect(buildCompanyParams(1)).toBe('page=1');
- });
-
- it('returns correct string with page and sort', () => {
- expect(buildCompanyParams(1, 'name')).toBe('page=1&sort=name');
- });
-
- it('returns correct string with different page', () => {
- expect(buildCompanyParams(3, 'domain')).toBe('page=3&sort=domain');
- });
-
- it('returns correct string with descending sort', () => {
- expect(buildCompanyParams(1, '-created_at')).toBe(
- 'page=1&sort=-created_at'
- );
- });
-
- it('returns correct string without sort parameter', () => {
- expect(buildCompanyParams(2, '')).toBe('page=2');
- });
-});
-
-describe('#buildSearchParams', () => {
- it('returns correct string with all parameters', () => {
- expect(buildSearchParams('acme', 1, 'name')).toBe(
- 'q=acme&page=1&sort=name'
- );
- });
-
- it('returns correct string with special characters', () => {
- expect(buildSearchParams('acme & co', 2, 'domain')).toBe(
- 'q=acme%20%26%20co&page=2&sort=domain'
- );
- });
-
- it('returns correct string with empty query', () => {
- expect(buildSearchParams('', 1, 'name')).toBe('q=&page=1&sort=name');
- });
-
- it('returns correct string without sort parameter', () => {
- expect(buildSearchParams('test', 1, '')).toBe('q=test&page=1');
- });
-
- it('returns correct string with descending sort', () => {
- expect(buildSearchParams('company', 3, '-created_at')).toBe(
- 'q=company&page=3&sort=-created_at'
- );
- });
-
- it('encodes special characters correctly', () => {
- expect(buildSearchParams('test@example.com', 1, 'name')).toBe(
- 'q=test%40example.com&page=1&sort=name'
- );
+ it('#destroyAvatar deletes the company avatar endpoint', () => {
+ companyAPI.destroyAvatar(1);
+ expect(axiosMock.delete).toHaveBeenCalledWith(
+ '/api/v1/companies/1/avatar'
+ );
+ });
+
+ it('#listContacts fetches company contacts', () => {
+ companyAPI.listContacts(1, 2);
+ expect(axiosMock.get).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts?page=2'
+ );
+ });
+
+ it('#searchContacts encodes contact search params', () => {
+ companyAPI.searchContacts(1, 'jane & co', 3);
+ expect(axiosMock.get).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts/search?q=jane+%26+co&page=3'
+ );
+ });
+
+ it('#createContact links a contact to the company', () => {
+ companyAPI.createContact(1, { contact_id: 2 });
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts',
+ { contact_id: 2 }
+ );
+ });
+
+ it('#removeContact unlinks a contact from the company', () => {
+ companyAPI.removeContact(1, 2);
+ expect(axiosMock.delete).toHaveBeenCalledWith(
+ '/api/v1/companies/1/contacts/2'
+ );
+ });
+
+ it('#destroyCustomAttributes removes company custom attributes', () => {
+ companyAPI.destroyCustomAttributes(1, ['plan']);
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/companies/1/destroy_custom_attributes',
+ { custom_attributes: ['plan'] }
+ );
+ });
});
});
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue b/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
index 4603521eb..fe4385bbb 100644
--- a/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue
@@ -1,7 +1,7 @@
+
{
{{ displayName }}
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/companies/pages/CompanyDetailView.vue b/app/javascript/dashboard/routes/dashboard/companies/pages/CompanyDetailView.vue
new file mode 100644
index 000000000..313df49d3
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/companies/pages/CompanyDetailView.vue
@@ -0,0 +1,236 @@
+
+
+
+
-
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue
index 0eeb42233..f85b613a3 100644
--- a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/CompanyHeader.vue
@@ -19,22 +19,15 @@ const emit = defineEmits(['search', 'update:sort']);
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
new file mode 100644
index 000000000..2ca1b33c4
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
@@ -0,0 +1,354 @@
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesDetailsLayout.vue b/app/javascript/dashboard/components-next/Companies/CompaniesDetailsLayout.vue
new file mode 100644
index 000000000..7736ccffd
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesDetailsLayout.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ headerTitle }}
-
@@ -112,6 +117,7 @@ const handleOrderChange = value => {
:model-value="activeOrdering"
:options="orderingMenus"
:label="activeOrderingLabel"
+ sub-menu-position="left"
@update:model-value="handleOrderChange"
/>
-
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
index 8cf75d555..198a2f278 100644
--- a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
@@ -35,6 +35,10 @@ const sortMenus = [
label: t('COMPANIES.SORT_BY.OPTIONS.CREATED_AT'),
value: 'created_at',
},
+ {
+ label: t('COMPANIES.SORT_BY.OPTIONS.LAST_ACTIVITY_AT'),
+ value: 'last_activity_at',
+ },
{
label: t('COMPANIES.SORT_BY.OPTIONS.CONTACTS_COUNT'),
value: 'contacts_count',
@@ -101,6 +105,7 @@ const handleOrderChange = value => {
:model-value="activeSort"
:options="sortMenus"
:label="activeSortLabel"
+ sub-menu-position="left"
@update:model-value="handleSortChange"
/>
-
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributeItem.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributeItem.vue
new file mode 100644
index 000000000..3328e801e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributeItem.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+ {{ t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.DESCRIPTION') }}
+
+
+
+
+
+
+
+
+ {{ t('COMPANIES.DETAIL.CONTACTS.DIALOGS.ADD.CONFIRM_DESCRIPTION') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.badge }}
+
+
+
+
+
+
+
+ {{ row.primary }}
+
+
+ {{ row.secondary }}
+
+
+
+
+
+
+
+
+
+
+
+ + {{ t('COMPANIES.DETAIL.SIDEBAR.TABS.CONTACTS') }} +
+ + {{ t('COMPANIES.CONTACTS_COUNT', { n: totalContacts }) }} + +
+ {{ t('COMPANIES.DETAIL.CONTACTS.LOADING') }}
+
+
+
+ {{ t('COMPANIES.DETAIL.CONTACTS.EMPTY') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributes.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributes.vue
new file mode 100644
index 000000000..9ed72169c
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyCustomAttributes.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+ {{ attribute.attributeDisplayName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ t('COMPANIES.DETAIL.ATTRIBUTES.UNUSED_ATTRIBUTES', {
+ count: unusedAttributesCount,
+ })
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ t('COMPANIES.DETAIL.ATTRIBUTES.NO_ATTRIBUTES') }} +
+
+
+ + {{ t('COMPANIES.DETAIL.ATTRIBUTES.EMPTY_STATE') }} +
+ diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue new file mode 100644 index 000000000..1ffbf0c18 --- /dev/null +++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyProfileCard.vue @@ -0,0 +1,203 @@ + + + +
+ {{ t('COMPANIES.DETAIL.LOADING') }}
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/ConfirmCompanyDeleteDialog.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/ConfirmCompanyDeleteDialog.vue
new file mode 100644
index 000000000..a689fb079
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/ConfirmCompanyDeleteDialog.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue b/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue
index ba8090e02..d3342e18a 100644
--- a/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue
+++ b/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue
@@ -134,7 +134,7 @@ const handleInputUpdate = async () => {
:message-type="hasError ? 'error' : 'info'"
autofocus
custom-input-class="h-8 ltr:rounded-r-none rtl:rounded-l-none"
- @keyup.enter="handleInputUpdate"
+ @enter="handleInputUpdate"
/>
+
+
+
+
+ + {{ displayName }} +
+ {{ summary }} ++ {{ t('COMPANIES.DETAIL.AVATAR.UPDATING') }} +
+
+
+ {{ t('COMPANIES.DETAIL.PROFILE.TITLE') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('COMPANIES.DETAIL.EMPTY_STATE.TITLE') }}
+
+
+
+ + {{ t('COMPANIES.DETAIL.EMPTY_STATE.SUBTITLE') }} +
+
+
+
+
+
+
+
+
+
+
+
+ + {{ t('COMPANIES.DETAIL.DELETE.SECTION_TITLE') }} +
+ + {{ t('COMPANIES.DETAIL.DELETE.SECTION_DESCRIPTION') }} + +
-
-
-
-
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkAgentActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkAgentActions.vue
new file mode 100644
index 000000000..d776118de
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkAgentActions.vue
@@ -0,0 +1,202 @@
+
+
+
+
-
-
-
- {{ $t('BULK_ACTION.AGENT_SELECT_LABEL') }}
-
-
-
-
-
- {{ $t('BULK_ACTION.AGENT_LIST_LOADING') }}
-
-
- -
-
-
- --
- -
- -
- --
- - {{ agent.name }} - -
-
-
- - {{ - $t('BULK_ACTION.ASSIGN_CONFIRMATION_LABEL', { - conversationCount, - conversationLabel, - }) - }} - - {{ selectedAgent.name }} - - ? -
-- {{ - $t('BULK_ACTION.UNASSIGN_CONFIRMATION_LABEL', { - conversationCount, - conversationLabel, - }) - }} -
-
-
-
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkLabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkLabelActions.vue
new file mode 100644
index 000000000..bbbf30090
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkLabelActions.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+ {{ props.conversationCount }}
+
+
+
+
+ {{ selectedAgent.name }}
+
+
+
+
+
+
+ {{ props.conversationCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkTeamActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkTeamActions.vue
new file mode 100644
index 000000000..06a58d961
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkTeamActions.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkUpdateActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkUpdateActions.vue
new file mode 100644
index 000000000..042a304df
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/BulkUpdateActions.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+ {{ props.conversationCount }}
+
+
+
+
+ {{ selectedTeam.name }}
+
+
+
+
+
+
+ {{ props.conversationCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index 233b3a300..145e89bde 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -1,7 +1,9 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('BULK_ACTION.ALL_CONVERSATIONS_SELECTED_ALERT') }}
-
-
-
+
+ {{ $t('BULK_ACTION.ALL_CONVERSATIONS_SELECTED_ALERT') }}
+
+
+
-
-
-
-
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
deleted file mode 100644
index 2bb6bd893..000000000
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
- {{
- t('BULK_ACTION.LABELS.ASSIGN_LABELS')
- }}
-
-
-
-
-
-
- -
-
- - {{ - t('BULK_ACTION.LABELS.NO_LABELS_FOUND') - }} - -
- - - -
- {{
- t('CONTACTS_BULK_ACTIONS.NO_LABELS_FOUND')
- }}
-
-
-
-
-
-
-
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
deleted file mode 100644
index e3280c5af..000000000
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
- {{ $t('BULK_ACTION.TEAMS.TEAM_SELECT_LABEL') }}
-
-
-
-
-
- -
-
-
- --
- -
-
- -
- - - {{ team.name }} - --
-
-
-
- - - {{ $t('BULK_ACTION.TEAMS.NO_TEAMS_AVAILABLE') }} - --
-
-
-
diff --git a/app/javascript/dashboard/composables/chatlist/useBulkActions.js b/app/javascript/dashboard/composables/chatlist/useBulkActions.js
index 45421b978..772c6e7d8 100644
--- a/app/javascript/dashboard/composables/chatlist/useBulkActions.js
+++ b/app/javascript/dashboard/composables/chatlist/useBulkActions.js
@@ -23,9 +23,15 @@ export function useBulkActions() {
function deSelectConversation(conversationId, inboxId) {
store.dispatch('bulkActions/removeSelectedConversationIds', conversationId);
- selectedInboxes.value = selectedInboxes.value.filter(
- item => item !== inboxId
- );
+ // Only remove one instance of the inboxId, not all
+ // This handles the case where multiple conversations from the same inbox are selected
+ const index = selectedInboxes.value.indexOf(inboxId);
+ if (index > -1) {
+ selectedInboxes.value = [
+ ...selectedInboxes.value.slice(0, index),
+ ...selectedInboxes.value.slice(index + 1),
+ ];
+ }
}
function resetBulkActions() {
@@ -141,6 +147,8 @@ export function useBulkActions() {
}
async function onUpdateConversations(status, snoozedUntil) {
+ if (selectedConversations.value.length === 0) return;
+
let conversationIds = selectedConversations.value;
let skippedCount = 0;
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index d736201de..870ba9d82 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -1,12 +1,12 @@
{
"BULK_ACTION": {
- "CONVERSATIONS_SELECTED": "{conversationCount} conversations selected",
- "AGENT_SELECT_LABEL": "Select agent",
- "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign {conversationCount} {conversationLabel} to",
- "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign {conversationCount} {conversationLabel}?",
- "GO_BACK_LABEL": "Go back",
- "ASSIGN_LABEL": "Assign",
+ "CONVERSATIONS_SELECTED": "{conversationCount} selected",
+ "NONE": "None",
+ "CLEAR_SELECTION": "Clear",
+ "ASSIGN_AGENT_CONFIRMATION_LABEL": "Are you sure you want to assign {n} conversation to {agentName}? | Are you sure you want to assign {n} conversations to {agentName}?",
+ "UNASSIGN_AGENT_CONFIRMATION_LABEL": "Are you sure you want to unassign {n} conversation? | Are you sure you want to unassign {n} conversations?",
"YES": "Yes",
+ "CANCEL": "Cancel",
"SEARCH_INPUT_PLACEHOLDER": "Search",
"ASSIGN_AGENT_TOOLTIP": "Assign agent",
"ASSIGN_TEAM_TOOLTIP": "Assign team",
@@ -15,7 +15,6 @@
"RESOLVE_SUCCESFUL": "Conversations resolved successfully.",
"RESOLVE_FAILED": "Failed to resolve conversations. Please try again.",
"ALL_CONVERSATIONS_SELECTED_ALERT": "Conversations visible on this page are only selected.",
- "AGENT_LIST_LOADING": "Loading agents",
"UPDATE": {
"CHANGE_STATUS": "Change status",
"SNOOZE_UNTIL": "Snooze",
@@ -28,16 +27,14 @@
},
"LABELS": {
"ASSIGN_LABELS": "Assign labels",
- "NO_LABELS_FOUND": "No labels found",
"ASSIGN_SELECTED_LABELS": "Assign selected labels",
"ASSIGN_SUCCESFUL": "Labels assigned successfully.",
"ASSIGN_FAILED": "Failed to assign labels. Please try again."
},
"TEAMS": {
- "TEAM_SELECT_LABEL": "Select team",
"NONE": "None",
- "NO_TEAMS_AVAILABLE": "There are no teams added to this account yet.",
- "ASSIGN_SELECTED_TEAMS": "Assign selected team.",
+ "ASSIGN_TEAM_CONFIRMATION_LABEL": "Are you sure you want to assign {n} conversation to {teamName}? | Are you sure you want to assign {n} conversations to {teamName}?",
+ "UNASSIGN_TEAM_CONFIRMATION_LABEL": "Are you sure you want to unassign {n} conversation? | Are you sure you want to unassign {n} conversations?",
"ASSIGN_SUCCESFUL": "Teams assigned successfully.",
"ASSIGN_FAILED": "Failed to assign team. Please try again."
}
diff --git a/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue b/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue
index a177296c0..0227c8030 100644
--- a/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue
@@ -232,7 +232,7 @@ watch(() => modelValue.value, resolveContactName, { immediate: true });
show-search
disable-local-filtering
:is-searching="isSearching"
- class="mt-1 ltr:left-0 rtl:right-0 top-full w-64 max-h-80 overflow-y-auto"
+ class="mt-1 ltr:left-0 rtl:right-0 top-full w-64 max-h-80"
@search="performSearch"
@action="handleAction"
/>
diff --git a/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue b/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue
index 63c99f72f..0f5902776 100644
--- a/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue
@@ -210,7 +210,7 @@ const onToggleDropdown = () => {
>
-
-
-
-
-
- {{ $t('BULK_ACTION.UPDATE.CHANGE_STATUS') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanyMoreActions.vue b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanyMoreActions.vue
new file mode 100644
index 000000000..8b95288e3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanyMoreActions.vue
@@ -0,0 +1,45 @@
+
+
+
+
{{ t('SEARCH.DATE_RANGE.CUSTOM_RANGE') }}
diff --git a/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue b/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue
index 91c556ec2..c5bfe2d4d 100644
--- a/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue
@@ -117,7 +117,7 @@ const onToggleDropdown = () => {
:menu-sections="menuSections"
show-search
disable-local-filtering
- class="mt-1 ltr:right-0 rtl:left-0 top-full w-64 max-h-80 overflow-y-auto"
+ class="mt-1 ltr:right-0 rtl:left-0 top-full w-64 max-h-80"
@search="searchQuery = $event"
@action="handleAction"
/>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
index 661b6ced7..9900db288 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
@@ -297,7 +297,7 @@ onMounted(() => {
}"
@bulk-delete="bulkDeleteDialog.dialogRef.open()"
>
-
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue b/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue
index dce8c6af1..490ace284 100644
--- a/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesListLayout.vue
@@ -12,7 +12,12 @@ defineProps({
showPaginationFooter: { type: Boolean, default: true },
});
-const emit = defineEmits(['update:currentPage', 'update:sort', 'search']);
+const emit = defineEmits([
+ 'update:currentPage',
+ 'update:sort',
+ 'search',
+ 'create',
+]);
const updateCurrentPage = page => {
emit('update:currentPage', page);
@@ -31,6 +36,7 @@ const updateCurrentPage = page => {
:active-ordering="activeOrdering"
@search="emit('search', $event)"
@update:sort="emit('update:sort', $event)"
+ @create="emit('create')"
/>
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
new file mode 100644
index 000000000..b3847030b
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
index 2ca1b33c4..7e0d162dc 100644
--- a/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompanyDetail/CompanyContactsSidebar.vue
@@ -169,7 +169,7 @@ const handleContactSelect = contactId => {
-
+
diff --git a/app/javascript/dashboard/i18n/locale/en/companies.json b/app/javascript/dashboard/i18n/locale/en/companies.json
index 370af697e..1fe8bc169 100644
--- a/app/javascript/dashboard/i18n/locale/en/companies.json
+++ b/app/javascript/dashboard/i18n/locale/en/companies.json
@@ -22,6 +22,19 @@
"LOADING": "Loading companies...",
"UNNAMED": "Unnamed Company",
"CONTACTS_COUNT": "{n} contact | {n} contacts",
+ "ACTIONS": {
+ "CREATE": "Add company"
+ },
+ "CREATE": {
+ "TITLE": "Add company details",
+ "ACTIONS": {
+ "SAVE": "Add company"
+ },
+ "MESSAGES": {
+ "SUCCESS": "Company created.",
+ "ERROR": "Could not create the company."
+ }
+ },
"DETAIL": {
"LOADING": "Loading company details...",
"EMPTY_STATE": {
diff --git a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
index 6c437fa1f..8ec401376 100644
--- a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
+++ b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
@@ -3,11 +3,13 @@ import { ref, computed, onMounted, reactive } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useUISettings } from 'dashboard/composables/useUISettings';
+import { useAlert } from 'dashboard/composables';
import { debounce } from '@chatwoot/utils';
import { useCompaniesStore } from 'dashboard/stores/companies';
import CompaniesListLayout from 'dashboard/components-next/Companies/CompaniesListLayout.vue';
import CompaniesCard from 'dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue';
+import CompanyCreateDialog from 'dashboard/components-next/Companies/CompanyCreateDialog.vue';
const DEFAULT_SORT_FIELD = 'name';
const DEBOUNCE_DELAY = 300;
@@ -26,6 +28,7 @@ const uiFlags = computed(() => companiesStore.getUIFlags);
const searchQuery = computed(() => route.query?.search || '');
const searchValue = ref(searchQuery.value);
+const createCompanyDialogRef = ref(null);
const pageNumber = computed(() => Number(route.query?.page) || 1);
const parseSortSettings = (sortString = '') => {
@@ -51,6 +54,7 @@ const activeSort = computed(() => sortState.activeSort);
const activeOrdering = computed(() => sortState.activeOrdering);
const isFetchingList = computed(() => uiFlags.value.fetchingList);
+const isCreatingCompany = computed(() => uiFlags.value.creatingItem);
const buildSortAttr = () =>
`${sortState.activeOrdering}${sortState.activeSort}`;
@@ -121,6 +125,21 @@ const showCompany = companyId => {
});
};
+const openCreateCompanyDialog = () => {
+ createCompanyDialogRef.value?.dialogRef.open();
+};
+
+const createCompany = async company => {
+ try {
+ const newCompany = await companiesStore.create(company);
+ createCompanyDialogRef.value?.onSuccess();
+ useAlert(t('COMPANIES.CREATE.MESSAGES.SUCCESS'));
+ showCompany(newCompany.id);
+ } catch {
+ useAlert(t('COMPANIES.CREATE.MESSAGES.ERROR'));
+ }
+};
+
const handleSort = async ({ sort, order }) => {
Object.assign(sortState, { activeSort: sort, activeOrdering: order });
@@ -155,6 +174,7 @@ onMounted(() => {
@update:current-page="onPageChange"
@update:sort="handleSort"
@search="onSearch"
+ @create="openCreateCompanyDialog"
>
Date: Fri, 8 May 2026 11:42:23 +0400
Subject: [PATCH 14/15] fix(security): Enforce admin authorization on custom
attribute definitions API (#14392)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Custom attribute definitions can now only be created, edited, or deleted
by administrators, matching the existing settings UI restriction.
Previously, an agent could call the `custom_attribute_definitions` API
directly and modify account configuration that they couldn't reach
through the dashboard — a Broken Access Control vulnerability reported
externally.
Fixes
https://linear.app/chatwoot/issue/CW-7038/broken-access-control-on-custom-attribute-definitions-api
## How to test
1. Sign in as an agent.
2. Try to create a custom attribute by calling `POST
/api/v1/accounts//custom_attribute_definitions` directly (the
settings page is hidden for agents — use curl with the agent's
`api_access_token`).
3. Expect `401 Unauthorized` with body `{"error":"You are not authorized
to do this action"}`. Repeat for `PATCH` and `DELETE`.
4. Sign in as an administrator and confirm create/edit/delete still work
from Settings → Custom Attributes.
5. As either role, the listing endpoint (`GET
.../custom_attribute_definitions`) should still succeed — agents need
this to render attributes in conversation and contact panels.
Co-authored-by: Muhsin <12408980+muhsin-k@users.noreply.github.com>
---
...custom_attribute_definitions_controller.rb | 1 +
.../custom_attribute_definition_policy.rb | 21 ++++++++
...m_attribute_definitions_controller_spec.rb | 51 ++++++++++++++++---
3 files changed, 66 insertions(+), 7 deletions(-)
create mode 100644 app/policies/custom_attribute_definition_policy.rb
diff --git a/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb b/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb
index 69df99e14..7bd9ae0c3 100644
--- a/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb
+++ b/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb
@@ -1,6 +1,7 @@
class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Accounts::BaseController
before_action :fetch_custom_attributes_definitions, except: [:create]
before_action :fetch_custom_attribute_definition, only: [:show, :update, :destroy]
+ before_action :check_authorization
DEFAULT_ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
def index; end
diff --git a/app/policies/custom_attribute_definition_policy.rb b/app/policies/custom_attribute_definition_policy.rb
new file mode 100644
index 000000000..c62a04b20
--- /dev/null
+++ b/app/policies/custom_attribute_definition_policy.rb
@@ -0,0 +1,21 @@
+class CustomAttributeDefinitionPolicy < ApplicationPolicy
+ def index?
+ @account_user.administrator? || @account_user.agent?
+ end
+
+ def show?
+ @account_user.administrator? || @account_user.agent?
+ end
+
+ def create?
+ @account_user.administrator?
+ end
+
+ def update?
+ @account_user.administrator?
+ end
+
+ def destroy?
+ @account_user.administrator?
+ end
+end
diff --git a/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
index c5be392b6..b55da5059 100644
--- a/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
@@ -2,7 +2,8 @@ require 'rails_helper'
RSpec.describe 'Custom Attribute Definitions API', type: :request do
let(:account) { create(:account) }
- let(:user) { create(:user, account: account) }
+ let(:agent) { create(:user, account: account, role: :agent) }
+ let(:admin) { create(:user, account: account, role: :administrator) }
describe 'GET /api/v1/accounts/{account.id}/custom_attribute_definitions' do
context 'when it is an unauthenticated user' do
@@ -19,7 +20,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
create(:custom_attribute_definition, attribute_model: 'contact_attribute', account: account)
get "/api/v1/accounts/#{account.id}/custom_attribute_definitions",
- headers: user.create_new_auth_token,
+ headers: admin.create_new_auth_token,
as: :json
expect(response).to have_http_status(:success)
@@ -45,7 +46,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
context 'when it is an authenticated user' do
it 'shows the custom attribute definition' do
get "/api/v1/accounts/#{account.id}/custom_attribute_definitions/#{custom_attribute_definition.id}",
- headers: user.create_new_auth_token,
+ headers: admin.create_new_auth_token,
as: :json
expect(response).to have_http_status(:success)
@@ -81,7 +82,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
context 'when it is an authenticated user' do
it 'creates the filter' do
expect do
- post "/api/v1/accounts/#{account.id}/custom_attribute_definitions", headers: user.create_new_auth_token,
+ post "/api/v1/accounts/#{account.id}/custom_attribute_definitions", headers: admin.create_new_auth_token,
params: payload
end.to change(CustomAttributeDefinition, :count).by(1)
@@ -90,6 +91,18 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
expect(json_response['attribute_key']).to eq 'developer_id'
end
+ context 'when it is an agent' do
+ it 'returns forbidden and does not create the custom attribute' do
+ expect do
+ post "/api/v1/accounts/#{account.id}/custom_attribute_definitions",
+ headers: agent.create_new_auth_token,
+ params: payload
+ end.not_to change(CustomAttributeDefinition, :count)
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
context 'when creating with a conflicting attribute_key' do
let(:standard_key) { CustomAttributeDefinition::STANDARD_ATTRIBUTES[:conversation].first }
let(:conflicting_payload) do
@@ -105,7 +118,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
it 'returns error for conflicting key' do
post "/api/v1/accounts/#{account.id}/custom_attribute_definitions",
- headers: user.create_new_auth_token,
+ headers: admin.create_new_auth_token,
params: conflicting_payload
expect(response).to have_http_status(:unprocessable_entity)
@@ -132,7 +145,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
context 'when it is an authenticated user' do
it 'updates the custom attribute definition' do
patch "/api/v1/accounts/#{account.id}/custom_attribute_definitions/#{custom_attribute_definition.id}",
- headers: user.create_new_auth_token,
+ headers: admin.create_new_auth_token,
params: payload,
as: :json
expect(response).to have_http_status(:success)
@@ -141,6 +154,19 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
expect(custom_attribute_definition.reload.attribute_model).to eq('conversation_attribute')
end
end
+
+ context 'when it is an agent' do
+ it 'returns forbidden and does not update the custom attribute' do
+ original_name = custom_attribute_definition.attribute_display_name
+ patch "/api/v1/accounts/#{account.id}/custom_attribute_definitions/#{custom_attribute_definition.id}",
+ headers: agent.create_new_auth_token,
+ params: payload,
+ as: :json
+
+ expect(response).to have_http_status(:unauthorized)
+ expect(custom_attribute_definition.reload.attribute_display_name).to eq(original_name)
+ end
+ end
end
describe 'DELETE /api/v1/accounts/{account.id}/custom_attribute_definitions/:id' do
@@ -156,11 +182,22 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
context 'when it is an authenticated admin user' do
it 'deletes custom attribute' do
delete "/api/v1/accounts/#{account.id}/custom_attribute_definitions/#{custom_attribute_definition.id}",
- headers: user.create_new_auth_token,
+ headers: admin.create_new_auth_token,
as: :json
expect(response).to have_http_status(:no_content)
expect(account.custom_attribute_definitions.count).to be 0
end
end
+
+ context 'when it is an agent' do
+ it 'returns forbidden and does not delete the custom attribute' do
+ delete "/api/v1/accounts/#{account.id}/custom_attribute_definitions/#{custom_attribute_definition.id}",
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:unauthorized)
+ expect(account.custom_attribute_definitions.count).to be 1
+ end
+ end
end
end
From 9c1d1c4070a26864839798b5718155263f754f1a Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Fri, 8 May 2026 13:40:36 +0530
Subject: [PATCH 15/15] feat(labels): remove label associations asynchronously
on delete (#13531)
## Summary
- Remove label deletion dependency on association cleanup by deleting
immediately and enqueueing a background job.
- Add `Labels::RemoveAssociationsJob` to strip deleted label references
from tagged conversations and contacts.
- Keep this version simple by removing the label count/prompt
requirement requested.
## Implementation notes
- Enqueue job from `Api::V1::Accounts::LabelsController#destroy` with
label title + account id.
- Background work performed in `Labels::DestroyService`.
## References
- Linear issue:
https://linear.app/chatwoot/issue/CW-4765/cw-2857-enhancement-removing-labels-is-inconsistent
- GitHub issue: https://github.com/chatwoot/chatwoot/issues/1249
## Testing
- `bundle exec rspec
spec/controllers/api/v1/accounts/labels_controller_spec.rb
spec/services/labels/destroy_service_spec.rb
spec/jobs/labels/remove_associations_job_spec.rb
spec/services/labels/update_service_spec.rb`
- `bundle exec rubocop
app/controllers/api/v1/accounts/labels_controller.rb
app/jobs/labels/remove_associations_job.rb
spec/controllers/api/v1/accounts/labels_controller_spec.rb
spec/jobs/labels/remove_associations_job_spec.rb
spec/services/labels/destroy_service_spec.rb`
---------
Co-authored-by: Sony Mathew
Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
---
.../api/v1/accounts/labels_controller.rb | 9 ++
app/jobs/labels/remove_associations_job.rb | 11 ++
app/services/labels/destroy_service.rb | 60 +++++++++++
.../api/v1/accounts/labels_controller_spec.rb | 36 +++++++
.../labels/remove_associations_job_spec.rb | 21 ++++
spec/services/labels/destroy_service_spec.rb | 102 ++++++++++++++++++
6 files changed, 239 insertions(+)
create mode 100644 app/jobs/labels/remove_associations_job.rb
create mode 100644 app/services/labels/destroy_service.rb
create mode 100644 spec/jobs/labels/remove_associations_job_spec.rb
create mode 100644 spec/services/labels/destroy_service_spec.rb
diff --git a/app/controllers/api/v1/accounts/labels_controller.rb b/app/controllers/api/v1/accounts/labels_controller.rb
index 54455943b..6889d30a4 100644
--- a/app/controllers/api/v1/accounts/labels_controller.rb
+++ b/app/controllers/api/v1/accounts/labels_controller.rb
@@ -18,7 +18,16 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
end
def destroy
+ label_title = @label.title
+ account_id = Current.account.id
+ label_deleted_at = Time.current
+
@label.destroy!
+ Labels::RemoveAssociationsJob.perform_later(
+ label_title: label_title,
+ account_id: account_id,
+ label_deleted_at: label_deleted_at
+ )
head :ok
end
diff --git a/app/jobs/labels/remove_associations_job.rb b/app/jobs/labels/remove_associations_job.rb
new file mode 100644
index 000000000..502d9339e
--- /dev/null
+++ b/app/jobs/labels/remove_associations_job.rb
@@ -0,0 +1,11 @@
+class Labels::RemoveAssociationsJob < ApplicationJob
+ queue_as :default
+
+ def perform(label_title:, account_id:, label_deleted_at:)
+ Labels::DestroyService.new(
+ label_title: label_title,
+ account_id: account_id,
+ label_deleted_at: label_deleted_at
+ ).perform
+ end
+end
diff --git a/app/services/labels/destroy_service.rb b/app/services/labels/destroy_service.rb
new file mode 100644
index 000000000..080e708e7
--- /dev/null
+++ b/app/services/labels/destroy_service.rb
@@ -0,0 +1,60 @@
+class Labels::DestroyService
+ pattr_initialize [:label_title!, :account_id!, :label_deleted_at!]
+
+ def perform
+ remove_conversation_labels
+ remove_contact_labels
+ end
+
+ private
+
+ def remove_conversation_labels
+ tagged_conversations.find_in_batches do |conversation_batch|
+ conversation_batch.each do |conversation|
+ update_conversation_cached_labels(conversation)
+ end
+ delete_label_taggings('Conversation', conversation_batch.map(&:id))
+ end
+ end
+
+ def remove_contact_labels
+ contact_label_taggings.in_batches do |tagging_batch|
+ ActsAsTaggableOn::Tagging.where(id: tagging_batch.select(:id)).delete_all
+ end
+ end
+
+ def update_conversation_cached_labels(conversation)
+ label_list = conversation.label_list.dup
+ label_list.remove(label_title)
+
+ # We only want the acts-as-taggable-on cache effect here, not Conversation callbacks/events.
+ # rubocop:disable Rails/SkipsModelValidations
+ conversation.update_column(:cached_label_list, label_list.join("#{ActsAsTaggableOn.delimiter} "))
+ # rubocop:enable Rails/SkipsModelValidations
+ end
+
+ def tagged_conversations
+ account.conversations.where(id: label_taggings_for('Conversation').select(:taggable_id))
+ end
+
+ def contact_label_taggings
+ label_taggings_for('Contact').where(taggable_id: account.contacts.select(:id))
+ end
+
+ def delete_label_taggings(taggable_type, taggable_ids)
+ ActsAsTaggableOn::Tagging
+ .where(id: label_taggings_for(taggable_type).where(taggable_id: taggable_ids).select(:id))
+ .delete_all
+ end
+
+ def label_taggings_for(taggable_type)
+ ActsAsTaggableOn::Tagging
+ .joins(:tag)
+ .where(context: 'labels', taggable_type: taggable_type, tags: { name: label_title })
+ .where('taggings.created_at <= ?', label_deleted_at)
+ end
+
+ def account
+ @account ||= Account.find(account_id)
+ end
+end
diff --git a/spec/controllers/api/v1/accounts/labels_controller_spec.rb b/spec/controllers/api/v1/accounts/labels_controller_spec.rb
index 61751ad68..657b53796 100644
--- a/spec/controllers/api/v1/accounts/labels_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/labels_controller_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
RSpec.describe 'Label API', type: :request do
let!(:account) { create(:account) }
let!(:label) { create(:label, account: account) }
+ let!(:conversation) { create(:conversation, account: account) }
describe 'GET /api/v1/accounts/{account.id}/labels' do
context 'when it is an unauthenticated user' do
@@ -101,4 +102,39 @@ RSpec.describe 'Label API', type: :request do
end
end
end
+
+ describe 'DELETE /api/v1/accounts/{account.id}/labels/:id' do
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ delete "/api/v1/accounts/#{account.id}/labels/#{label.id}"
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when it is an authenticated user' do
+ let(:admin) { create(:user, account: account, role: :administrator) }
+
+ it 'deletes the label and enqueues label cleanup' do
+ label_deleted_at = Time.zone.parse('2026-05-07 10:00:00 UTC')
+ conversation.label_list.add(label.title)
+ conversation.save!
+
+ clear_enqueued_jobs
+
+ travel_to(label_deleted_at) do
+ expect do
+ delete "/api/v1/accounts/#{account.id}/labels/#{label.id}", headers: admin.create_new_auth_token, as: :json
+ end.to have_enqueued_job(Labels::RemoveAssociationsJob).with(
+ label_title: label.title,
+ account_id: account.id,
+ label_deleted_at: label_deleted_at
+ )
+ end
+
+ expect(response).to have_http_status(:ok)
+ expect(Label.exists?(label.id)).to be(false)
+ end
+ end
+ end
end
diff --git a/spec/jobs/labels/remove_associations_job_spec.rb b/spec/jobs/labels/remove_associations_job_spec.rb
new file mode 100644
index 000000000..0b608630f
--- /dev/null
+++ b/spec/jobs/labels/remove_associations_job_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+RSpec.describe Labels::RemoveAssociationsJob do
+ subject(:job) do
+ described_class.perform_later(
+ label_title: label_title,
+ account_id: account_id,
+ label_deleted_at: label_deleted_at
+ )
+ end
+
+ let(:label_title) { 'billing' }
+ let(:account_id) { 1 }
+ let(:label_deleted_at) { Time.current }
+
+ it 'queues the job' do
+ expect { job }.to have_enqueued_job(described_class)
+ .with(label_title: label_title, account_id: account_id, label_deleted_at: label_deleted_at)
+ .on_queue('default')
+ end
+end
diff --git a/spec/services/labels/destroy_service_spec.rb b/spec/services/labels/destroy_service_spec.rb
new file mode 100644
index 000000000..7d06b72d0
--- /dev/null
+++ b/spec/services/labels/destroy_service_spec.rb
@@ -0,0 +1,102 @@
+require 'rails_helper'
+
+describe Labels::DestroyService do
+ let(:account) { create(:account) }
+ let(:conversation) { create(:conversation, account: account) }
+ let(:label) { create(:label, account: account) }
+ let(:contact) { conversation.contact }
+ let(:label_deleted_at) { Time.zone.parse('2026-05-07 10:00:00 UTC') }
+
+ before do
+ conversation.label_list.add(label.title)
+ conversation.label_list.add('billing')
+ conversation.save!
+
+ contact.label_list.add(label.title)
+ contact.label_list.add('vip')
+ contact.save!
+
+ set_label_tagging_created_at(conversation, label_deleted_at - 1.minute)
+ set_label_tagging_created_at(contact, label_deleted_at - 1.minute)
+ end
+
+ describe '#perform' do
+ it 'removes label from associated conversations and contacts' do
+ described_class.new(
+ label_title: label.title,
+ account_id: account.id,
+ label_deleted_at: label_deleted_at
+ ).perform
+
+ expect(conversation.reload.label_list).to eq(['billing'])
+ expect(conversation.cached_label_list).to eq('billing')
+ expect(contact.reload.label_list).to eq(['vip'])
+ end
+
+ it 'removes label associations after the label record is destroyed' do
+ label_title = label.title
+ label.destroy!
+
+ described_class.new(
+ label_title: label_title,
+ account_id: account.id,
+ label_deleted_at: label_deleted_at
+ ).perform
+
+ expect(conversation.reload.label_list).to eq(['billing'])
+ expect(conversation.cached_label_list).to eq('billing')
+ expect(contact.reload.label_list).to eq(['vip'])
+ end
+
+ it 'does not remove labels from other accounts' do
+ other_account = create(:account)
+ other_conversation = create(:conversation, account: other_account)
+ other_conversation.label_list.add(label.title)
+ other_conversation.save!
+ set_label_tagging_created_at(other_conversation, label_deleted_at - 1.minute)
+
+ described_class.new(
+ label_title: label.title,
+ account_id: account.id,
+ label_deleted_at: label_deleted_at
+ ).perform
+
+ expect(other_conversation.reload.label_list).to eq([label.title])
+ end
+
+ it 'does not dispatch conversation or contact update events' do
+ expect(Rails.configuration.dispatcher).not_to receive(:dispatch)
+
+ described_class.new(
+ label_title: label.title,
+ account_id: account.id,
+ label_deleted_at: label_deleted_at
+ ).perform
+ end
+
+ it 'does not remove label associations created after the label was deleted' do
+ other_conversation = create(:conversation, account: account)
+ other_conversation.label_list.add(label.title)
+ other_conversation.save!
+ set_label_tagging_created_at(other_conversation, label_deleted_at + 1.minute)
+
+ described_class.new(
+ label_title: label.title,
+ account_id: account.id,
+ label_deleted_at: label_deleted_at
+ ).perform
+
+ expect(conversation.reload.label_list).to eq(['billing'])
+ expect(conversation.cached_label_list).to eq('billing')
+ expect(contact.reload.label_list).to eq(['vip'])
+ expect(other_conversation.reload.label_list).to eq([label.title])
+ end
+ end
+
+ def set_label_tagging_created_at(record, created_at)
+ ActsAsTaggableOn::Tagging
+ .joins(:tag)
+ .find_by!(context: 'labels', taggable: record, tags: { name: label.title })
+ .update!(created_at: created_at)
+ end
+end
{{
@@ -182,5 +202,10 @@ onMounted(() => {
@show-company="showCompany"
/>
+