fix: preserve annotaterb output and cover installation config defaults

.annotaterb.yml

@@ -0,0 +1,65 @@
+---
+:position: before
+:position_in_additional_file_patterns: before
+:position_in_class: before
+:position_in_factory: before
+:position_in_fixture: before
+:position_in_routes: before
+:position_in_serializer: before
+:position_in_test: before
+:classified_sort: true
+:exclude_controllers: true
+:exclude_factories: true
+:exclude_fixtures: true
+:exclude_helpers: true
+:exclude_scaffolds: true
+:exclude_serializers: true
+:exclude_sti_subclasses: false
+:exclude_tests: true
+:force: false
+:format_markdown: false
+:format_rdoc: false
+:format_yard: false
+:frozen: false
+:grouped_polymorphic: false
+:ignore_model_sub_dir: false
+:ignore_unknown_models: false
+:include_version: false
+:show_check_constraints: false
+:show_complete_foreign_keys: false
+:show_foreign_keys: true
+:show_indexes: true
+:show_indexes_include: false
+:simple_indexes: false
+:sort: false
+:timestamp: false
+:trace: false
+:with_comment: true
+:with_column_comments: true
+:with_table_comments: true
+:position_of_column_comment: :with_name
+:active_admin: false
+:command:
+:debug: false
+:hide_default_column_types: json,jsonb,hstore
+:hide_limit_column_types: integer,bigint,boolean
+:timestamp_columns:
+- created_at
+- updated_at
+:ignore_columns:
+:ignore_routes:
+:models: true
+:routes: false
+:skip_on_db_migrate: false
+:target_action: :do_annotations
+:wrapper:
+:wrapper_close:
+:wrapper_open:
+:classes_default_to_s: []
+:additional_file_patterns: []
+:model_dir:
+- app/models
+- enterprise/app/models
+:require: []
+:root_dir:
+- ''

app/javascript/shared/helpers/specs/timeHelper.spec.js

@@ -54,7 +54,6 @@ describe('#dateFormat', () => {
 describe('#shortTimestamp', () => {
   // Test cases when withAgo is false or not provided
   it('returns correct value without ago', () => {
-    expect(shortTimestamp('in less than a minute')).toEqual('now');
     expect(shortTimestamp('less than a minute ago')).toEqual('now');
     expect(shortTimestamp('1 minute ago')).toEqual('1m');
     expect(shortTimestamp('12 minutes ago')).toEqual('12m');

app/javascript/shared/helpers/timeHelper.js

@@ -68,7 +68,6 @@ export const shortTimestamp = (time, withAgo = false) => {
   const suffix = withAgo ? ' ago' : '';
   const timeMappings = {
     'less than a minute ago': 'now',
-    'in less than a minute': 'now',
     'a minute ago': `1m${suffix}`,
     'an hour ago': `1h${suffix}`,
     'a day ago': `1d${suffix}`,

app/jobs/agent_bots/webhook_job.rb

@@ -8,7 +8,7 @@ class AgentBots::WebhookJob < WebhookJob
   def perform(url, payload, webhook_type = :agent_bot_webhook)
     super(url, payload, webhook_type)
   rescue RestClient::TooManyRequests, RestClient::InternalServerError => e
-    Rails.logger.warn("[AgentBots::WebhookJob] attempt #{executions} failed #{e.class.name} payload=#{payload.to_json}")
+    Rails.logger.warn("[AgentBots::WebhookJob] attempt #{executions} failed #{e.class.name}")
     raise
   end
 end

app/models/csat_survey_response.rb

@@ -2,24 +2,28 @@
 #
 # Table name: csat_survey_responses
 #
-#  id                :bigint           not null, primary key
-#  feedback_message  :text
-#  rating            :integer          not null
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
-#  account_id        :bigint           not null
-#  assigned_agent_id :bigint
-#  contact_id        :bigint           not null
-#  conversation_id   :bigint           not null
-#  message_id        :bigint           not null
+#  id                         :bigint           not null, primary key
+#  csat_review_notes          :text
+#  feedback_message           :text
+#  rating                     :integer          not null
+#  review_notes_updated_at    :datetime
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  account_id                 :bigint           not null
+#  assigned_agent_id          :bigint
+#  contact_id                 :bigint           not null
+#  conversation_id            :bigint           not null
+#  message_id                 :bigint           not null
+#  review_notes_updated_by_id :bigint
 #
 # Indexes
 #
-#  index_csat_survey_responses_on_account_id         (account_id)
-#  index_csat_survey_responses_on_assigned_agent_id  (assigned_agent_id)
-#  index_csat_survey_responses_on_contact_id         (contact_id)
-#  index_csat_survey_responses_on_conversation_id    (conversation_id)
-#  index_csat_survey_responses_on_message_id         (message_id) UNIQUE
+#  index_csat_survey_responses_on_account_id                  (account_id)
+#  index_csat_survey_responses_on_assigned_agent_id           (assigned_agent_id)
+#  index_csat_survey_responses_on_contact_id                  (contact_id)
+#  index_csat_survey_responses_on_conversation_id             (conversation_id)
+#  index_csat_survey_responses_on_message_id                  (message_id) UNIQUE
+#  index_csat_survey_responses_on_review_notes_updated_by_id  (review_notes_updated_by_id)
 #
 class CsatSurveyResponse < ApplicationRecord
   belongs_to :account

app/models/installation_config.rb

@@ -19,7 +19,7 @@ class InstallationConfig < ApplicationRecord
   # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
   # FIX ME : fixes breakage of installation config. we need to migrate.
   # Fix configuration in application.rb
-  serialize :serialized_value, coder: YAML, type: ActiveSupport::HashWithIndifferentAccess
+  serialize :serialized_value, coder: YAML, type: ActiveSupport::HashWithIndifferentAccess, default: {}.with_indifferent_access
 
   before_validation :set_lock
   validates :name, presence: true
@@ -33,10 +33,6 @@ class InstallationConfig < ApplicationRecord
   after_commit :clear_cache
 
   def value
-    # This is an extra hack again cause of the YAML serialization, in case of new object initialization in super admin
-    # It was throwing error as the default value of column '{}' was failing in deserialization.
-    return {}.with_indifferent_access if new_record? && @attributes['serialized_value']&.value_before_type_cast == '{}'
-
     serialized_value[:value]
   end
 

app/models/reporting_event.rb

@@ -17,13 +17,14 @@
 #
 # Indexes
 #
-#  index_reporting_events_on_account_id            (account_id)
-#  index_reporting_events_on_conversation_id       (conversation_id)
-#  index_reporting_events_on_created_at            (created_at)
-#  index_reporting_events_on_inbox_id              (inbox_id)
-#  index_reporting_events_on_name                  (name)
-#  index_reporting_events_on_user_id               (user_id)
-#  reporting_events__account_id__name__created_at  (account_id,name,created_at)
+#  index_reporting_events_for_response_distribution  (account_id,name,inbox_id,created_at)
+#  index_reporting_events_on_account_id              (account_id)
+#  index_reporting_events_on_conversation_id         (conversation_id)
+#  index_reporting_events_on_created_at              (created_at)
+#  index_reporting_events_on_inbox_id                (inbox_id)
+#  index_reporting_events_on_name                    (name)
+#  index_reporting_events_on_user_id                 (user_id)
+#  reporting_events__account_id__name__created_at    (account_id,name,created_at)
 #
 
 class ReportingEvent < ApplicationRecord

app/models/reporting_events_rollup.rb

@@ -2,17 +2,17 @@
 #
 # Table name: reporting_events_rollups
 #
-#  id                        :bigint           not null, primary key
-#  count                     :bigint           default(0), not null
-#  date                      :date             not null
-#  dimension_id              :bigint           not null
-#  dimension_type            :string           not null
-#  metric                    :string           not null
-#  sum_value                 :float            default(0.0), not null
-#  sum_value_business_hours  :float            default(0.0), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
-#  account_id                :integer          not null
+#  id                       :bigint           not null, primary key
+#  count                    :bigint           default(0), not null
+#  date                     :date             not null
+#  dimension_type           :string           not null
+#  metric                   :string           not null
+#  sum_value                :float            default(0.0), not null
+#  sum_value_business_hours :float            default(0.0), not null
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  account_id               :integer          not null
+#  dimension_id             :bigint           not null
 #
 # Indexes
 #

app/models/webhook.rb

@@ -4,6 +4,7 @@
 #
 #  id            :bigint           not null, primary key
 #  name          :string
+#  secret        :string
 #  subscriptions :jsonb
 #  url           :text
 #  webhook_type  :integer          default("account_type")

config/application.rb

@@ -69,12 +69,6 @@ module Chatwoot
     # Disable PDF/video preview generation as we don't use them
     config.active_storage.previewers = []
 
-    # Restrict content types served inline to prevent XSS via uploaded files (e.g. PDFs with embedded JavaScript).
-    config.active_storage.content_types_allowed_inline = %w[
-      image/png image/gif image/jpeg image/tiff image/vnd.adobe.photoshop
-      image/vnd.microsoft.icon image/webp image/avif image/heic image/heif
-    ]
-
     # Active Record Encryption configuration
     # Required for MFA/2FA features - skip if not using encryption
     if ENV['ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY'].present?

deployment/chatwoot-web.1.service

@@ -15,7 +15,6 @@ TimeoutStopSec=30
 KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
-LimitNOFILE=65536
 
 Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.4.4/bin:/home/chatwoot/.rvm/gems/ruby-3.4.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.4.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"

deployment/chatwoot-worker.1.service

@@ -15,7 +15,6 @@ TimeoutStopSec=30
 KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
-LimitNOFILE=65536
 
 MemoryMax=1.2G
 MemoryHigh=infinity

enterprise/app/controllers/api/v1/accounts/captain/tasks_controller.rb

@@ -57,7 +57,7 @@ class Api::V1::Accounts::Captain::TasksController < Api::V1::Accounts::BaseContr
     if result.nil?
       render json: { message: nil }
     elsif result[:error]
-      render json: { error: result[:error] }, status: :unprocessable_content
+      render json: { error: result[:error] }, status: :unprocessable_entity
     else
       response_data = { message: result[:message] }
       response_data[:follow_up_context] = result[:follow_up_context] if result[:follow_up_context]
@@ -69,5 +69,3 @@ class Api::V1::Accounts::Captain::TasksController < Api::V1::Accounts::BaseContr
     authorize(:'captain/tasks')
   end
 end
-
-Api::V1::Accounts::Captain::TasksController.prepend_mod_with('Api::V1::Accounts::Captain::TasksController')

lib/tasks/annotate_rb.rake

@@ -0,0 +1,8 @@
+# This rake task was added by annotate_rb gem.
+
+# Can set `ANNOTATERB_SKIP_ON_DB_TASKS` to be anything to skip this
+if Rails.env.development? && ENV['ANNOTATERB_SKIP_ON_DB_TASKS'].nil?
+  require 'annotate_rb'
+
+  AnnotateRb::Core.load_rake_tasks
+end

lib/tasks/auto_annotate_models.rake

@@ -1,61 +0,0 @@
-# NOTE: only doing this in development as some production environments (Heroku)
-# NOTE: are sensitive to local FS writes, and besides -- it's just not proper
-# NOTE: to have a dev-mode tool do its thing in production.
-if Rails.env.development?
-  require 'annotate_rb'
-
-  AnnotateRb::Core.load_rake_tasks
-
-  task :set_annotation_options do
-    # You can override any of these by setting an environment variable of the
-    # same name.
-    AnnotateRb::Options.set_defaults(
-      'additional_file_patterns' => [],
-      'routes' => 'false',
-      'models' => 'true',
-      'position_in_routes' => 'before',
-      'position_in_class' => 'before',
-      'position_in_test' => 'before',
-      'position_in_fixture' => 'before',
-      'position_in_factory' => 'before',
-      'position_in_serializer' => 'before',
-      'show_foreign_keys' => 'true',
-      'show_complete_foreign_keys' => 'false',
-      'show_indexes' => 'true',
-      'simple_indexes' => 'false',
-      'model_dir' => [
-        'app/models',
-        'enterprise/app/models',
-      ],
-      'root_dir' => '',
-      'include_version' => 'false',
-      'require' => '',
-      'exclude_tests' => 'true',
-      'exclude_fixtures' => 'true',
-      'exclude_factories' => 'true',
-      'exclude_serializers' => 'true',
-      'exclude_scaffolds' => 'true',
-      'exclude_controllers' => 'true',
-      'exclude_helpers' => 'true',
-      'exclude_sti_subclasses' => 'false',
-      'ignore_model_sub_dir' => 'false',
-      'ignore_columns' => nil,
-      'ignore_routes' => nil,
-      'ignore_unknown_models' => 'false',
-      'hide_limit_column_types' => 'integer,bigint,boolean',
-      'hide_default_column_types' => 'json,jsonb,hstore',
-      'skip_on_db_migrate' => 'false',
-      'format_bare' => 'true',
-      'format_rdoc' => 'false',
-      'format_markdown' => 'false',
-      'sort' => 'false',
-      'force' => 'false',
-      'frozen' => 'false',
-      'classified_sort' => 'true',
-      'trace' => 'false',
-      'wrapper_open' => nil,
-      'wrapper_close' => nil,
-      'with_comment' => 'true'
-    )
-  end
-end

spec/models/installation_config_spec.rb

@@ -3,5 +3,17 @@
 require 'rails_helper'
 
 RSpec.describe InstallationConfig do
+  subject(:installation_config) { described_class.new(name: 'INSTALLATION_NAME') }
+
   it { is_expected.to validate_presence_of(:name) }
+
+  describe 'new record defaults' do
+    it 'initializes serialized_value with indifferent access' do
+      expect(installation_config.serialized_value).to eq({}.with_indifferent_access)
+    end
+
+    it 'returns nil for value before assignment' do
+      expect(installation_config.value).to be_nil
+    end
+  end
 end