spec cleanup

app/builders/agent_builder.rb

@@ -16,6 +16,7 @@ class AgentBuilder
   def perform
     ActiveRecord::Base.transaction do
       @user = find_or_create_user
+      send_confirmation_if_required
       create_account_user
     end
     @user
@@ -33,6 +34,11 @@ class AgentBuilder
     User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
   end
 
+  # Sends confirmation instructions if the user is persisted and not confirmed.
+  def send_confirmation_if_required
+    @user.send_confirmation_instructions if user_needs_confirmation?
+  end
+
   # Checks if the user needs confirmation.
   # @return [Boolean] true if the user is persisted and not confirmed, false otherwise.
   def user_needs_confirmation?

app/controllers/api/v1/accounts/contacts_controller.rb

@@ -65,10 +65,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     contacts = result[:contacts]
     @contacts_count = result[:count]
     @contacts = fetch_contacts(contacts)
-  rescue CustomExceptions::CustomFilter::InvalidAttribute,
-         CustomExceptions::CustomFilter::InvalidOperator,
-         CustomExceptions::CustomFilter::InvalidValue => e
-    render_could_not_create_error(e.message)
   end
 
   def contactable_inboxes

app/controllers/api/v1/accounts/conversations_controller.rb

@@ -36,18 +36,10 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     end
   end
 
-  def update
-    @conversation.update!(permitted_update_params)
-  end
-
   def filter
     result = ::Conversations::FilterService.new(params.permit!, current_user).perform
     @conversations = result[:conversations]
     @conversations_count = result[:count]
-  rescue CustomExceptions::CustomFilter::InvalidAttribute,
-         CustomExceptions::CustomFilter::InvalidOperator,
-         CustomExceptions::CustomFilter::InvalidValue => e
-    render_could_not_create_error(e.message)
   end
 
   def mute
@@ -118,11 +110,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   private
 
-  def permitted_update_params
-    # TODO: Move the other conversation attributes to this method and remove specific endpoints for each attribute
-    params.permit(:priority)
-  end
-
   def update_last_seen_on_conversation(last_seen_at, update_assignee)
     # rubocop:disable Rails/SkipsModelValidations
     @conversation.update_column(:agent_last_seen_at, last_seen_at)
@@ -189,5 +176,3 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @conversation.assignee_id? && Current.user == @conversation.assignee
   end
 end
-
-Api::V1::Accounts::ConversationsController.prepend_mod_with('Api::V1::Accounts::ConversationsController')

app/controllers/concerns/access_token_auth_helper.rb

@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
   BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create],
     'api/v1/accounts/conversations/messages' => ['create'],
     'api/v1/accounts/conversations/assignments' => ['create']
   }.freeze

app/controllers/concerns/domain_helper.rb

@@ -1,5 +0,0 @@
-module DomainHelper
-  def self.chatwoot_domain?(domain = request.host)
-    [URI.parse(ENV.fetch('FRONTEND_URL', '')).host, URI.parse(ENV.fetch('HELPCENTER_URL', '')).host].include?(domain)
-  end
-end

app/controllers/concerns/switch_locale.rb

@@ -6,7 +6,6 @@ module SwitchLocale
   def switch_locale(&)
     # priority is for locale set in query string (mostly for widget/from js sdk)
     locale ||= locale_from_params
-    locale ||= locale_from_custom_domain
     # if locale is not set in account, let's use DEFAULT_LOCALE env variable
     locale ||= locale_from_env_variable
     set_locale(locale, &)
@@ -17,20 +16,6 @@ module SwitchLocale
     set_locale(locale, &)
   end
 
-  # If the request is coming from a custom domain, it should be for a helpcenter portal
-  # We will use the portal locale in such cases
-  def locale_from_custom_domain(&)
-    return if params[:locale]
-
-    domain = request.host
-    return if DomainHelper.chatwoot_domain?(domain)
-
-    @portal = Portal.find_by(custom_domain: domain)
-    return unless @portal
-
-    @portal.default_locale
-  end
-
   def set_locale(locale, &)
     # if locale is empty, use default_locale
     locale ||= I18n.default_locale

app/controllers/dashboard_controller.rb

@@ -18,7 +18,6 @@ class DashboardController < ActionController::Base
       'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
       'INSTALLATION_NAME',
       'WIDGET_BRAND_URL', 'TERMS_URL',
-      'BRAND_URL', 'BRAND_NAME',
       'PRIVACY_URL',
       'DISPLAY_MANIFEST',
       'CREATE_NEW_ACCOUNT_FROM_DASHBOARD',

app/controllers/public/api/v1/portals/base_controller.rb

@@ -47,7 +47,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
     @locale = if article.category.present?
                 article.category.locale
               else
-                article.portal.default_locale
+                'en'
               end
 
     I18n.with_locale(@locale, &)

app/controllers/public_controller.rb

@@ -8,7 +8,8 @@ class PublicController < ActionController::Base
 
   def ensure_custom_domain_request
     domain = request.host
-    return if DomainHelper.chatwoot_domain?(domain)
+
+    return if [URI.parse(ENV.fetch('FRONTEND_URL', '')).host, URI.parse(ENV.fetch('HELPCENTER_URL', '')).host].include?(domain)
 
     @portal = ::Portal.find_by(custom_domain: domain)
     return if @portal.present?

app/helpers/application_helper.rb

@@ -2,11 +2,4 @@ module ApplicationHelper
   def available_locales_with_name
     LANGUAGES_CONFIG.map { |_key, val| val.slice(:name, :iso_639_1_code) }
   end
-
-  def feature_help_urls
-    features = YAML.safe_load(Rails.root.join('config/features.yml').read).freeze
-    features.each_with_object({}) do |feature, hash|
-      hash[feature['name']] = feature['help_url'] if feature['help_url']
-    end
-  end
 end

app/helpers/filter_helper.rb

@@ -1,84 +0,0 @@
-module FilterHelper
-  def build_condition_query(model_filters, query_hash, current_index)
-    current_filter = model_filters[query_hash['attribute_key']]
-
-    # Throw InvalidOperator Error if the attribute is a standard attribute
-    # and the operator is not allowed in the config
-    if current_filter.present? && current_filter['filter_operators'].exclude?(query_hash[:filter_operator])
-      raise CustomExceptions::CustomFilter::InvalidOperator.new(
-        attribute_name: query_hash['attribute_key'],
-        allowed_keys: current_filter['filter_operators']
-      )
-    end
-
-    # Every other filter expects a value to be present
-    if %w[is_present is_not_present].exclude?(query_hash[:filter_operator]) && query_hash['values'].blank?
-      raise CustomExceptions::CustomFilter::InvalidValue.new(attribute_name: query_hash['attribute_key'])
-    end
-
-    condition_query = build_condition_query_string(current_filter, query_hash, current_index)
-    # The query becomes empty only when it doesn't match to any supported
-    # standard attribute or custom attribute defined in the account.
-    if condition_query.empty?
-      raise CustomExceptions::CustomFilter::InvalidAttribute.new(key: query_hash['attribute_key'],
-                                                                 allowed_keys: model_filters.keys)
-    end
-
-    condition_query
-  end
-
-  def build_condition_query_string(current_filter, query_hash, current_index)
-    filter_operator_value = filter_operation(query_hash, current_index)
-
-    return handle_nil_filter(query_hash, current_index) if current_filter.nil?
-
-    case current_filter['attribute_type']
-    when 'additional_attributes'
-      handle_additional_attributes(query_hash, filter_operator_value, current_filter['data_type'])
-    else
-      handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
-    end
-  end
-
-  def handle_nil_filter(query_hash, current_index)
-    attribute_type = "#{filter_config[:entity].downcase}_attribute"
-    custom_attribute_query(query_hash, attribute_type, current_index)
-  end
-
-  def handle_additional_attributes(query_hash, filter_operator_value, data_type)
-    if data_type == 'text_case_insensitive'
-      "LOWER(#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}') " \
-        "#{filter_operator_value} #{query_hash[:query_operator]}"
-    else
-      "#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}' " \
-        "#{filter_operator_value} #{query_hash[:query_operator]} "
-    end
-  end
-
-  def handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
-    case current_filter['data_type']
-    when 'date'
-      date_filter(current_filter, query_hash, filter_operator_value)
-    when 'labels'
-      tag_filter_query(query_hash, current_index)
-    when 'text_case_insensitive'
-      text_case_insensitive_filter(query_hash, filter_operator_value)
-    else
-      default_filter(query_hash, filter_operator_value)
-    end
-  end
-
-  def date_filter(current_filter, query_hash, filter_operator_value)
-    "(#{filter_config[:table_name]}.#{query_hash[:attribute_key]})::#{current_filter['data_type']} " \
-      "#{filter_operator_value}#{current_filter['data_type']} #{query_hash[:query_operator]}"
-  end
-
-  def text_case_insensitive_filter(query_hash, filter_operator_value)
-    "LOWER(#{filter_config[:table_name]}.#{query_hash[:attribute_key]}) " \
-      "#{filter_operator_value} #{query_hash[:query_operator]}"
-  end
-
-  def default_filter(query_hash, filter_operator_value)
-    "#{filter_config[:table_name]}.#{query_hash[:attribute_key]} #{filter_operator_value} #{query_hash[:query_operator]}"
-  end
-end

app/javascript/dashboard/api/reports.js

@@ -84,24 +84,6 @@ class ReportsAPI extends ApiClient {
       params: { since, until, business_hours: businessHours },
     });
   }
-
-  getBotMetrics({ from, to } = {}) {
-    return axios.get(`${this.url}/bot_metrics`, {
-      params: { since: from, until: to },
-    });
-  }
-
-  getBotSummary({ from, to, groupBy, businessHours } = {}) {
-    return axios.get(`${this.url}/bot_summary`, {
-      params: {
-        since: from,
-        until: to,
-        type: 'account',
-        group_by: groupBy,
-        business_hours: businessHours,
-      },
-    });
-  }
 }
 
 export default new ReportsAPI();

app/javascript/dashboard/api/slaReports.js

@@ -1,73 +0,0 @@
-/* global axios */
-import ApiClient from './ApiClient';
-
-class SLAReportsAPI extends ApiClient {
-  constructor() {
-    super('applied_slas', { accountScoped: true });
-  }
-
-  get({
-    from,
-    to,
-    assigned_agent_id,
-    inbox_id,
-    team_id,
-    sla_policy_id,
-    page,
-  } = {}) {
-    return axios.get(this.url, {
-      params: {
-        since: from,
-        until: to,
-        assigned_agent_id,
-        inbox_id,
-        team_id,
-        sla_policy_id,
-        page,
-      },
-    });
-  }
-
-  download({
-    from,
-    to,
-    assigned_agent_id,
-    inbox_id,
-    team_id,
-    sla_policy_id,
-  } = {}) {
-    return axios.get(`${this.url}/download`, {
-      params: {
-        since: from,
-        until: to,
-        assigned_agent_id,
-        inbox_id,
-        team_id,
-        sla_policy_id,
-      },
-    });
-  }
-
-  getMetrics({
-    from,
-    to,
-    assigned_agent_id,
-    inbox_id,
-    team_id,
-    sla_policy_id,
-  } = {}) {
-    // no ratings for metrics
-    return axios.get(`${this.url}/metrics`, {
-      params: {
-        since: from,
-        until: to,
-        assigned_agent_id,
-        inbox_id,
-        team_id,
-        sla_policy_id,
-      },
-    });
-  }
-}
-
-export default new SLAReportsAPI();

app/javascript/dashboard/api/specs/reports.spec.js

@@ -111,40 +111,6 @@ describe('#Reports API', () => {
       });
     });
 
-    it('#getBotMetrics', () => {
-      reportsAPI.getBotMetrics({ from: 1621103400, to: 1621621800 });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v2/reports/bot_metrics',
-        {
-          params: {
-            since: 1621103400,
-            until: 1621621800,
-          },
-        }
-      );
-    });
-
-    it('#getBotSummary', () => {
-      reportsAPI.getBotSummary({
-        from: 1621103400,
-        to: 1621621800,
-        groupBy: 'date',
-        businessHours: true,
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v2/reports/bot_summary',
-        {
-          params: {
-            since: 1621103400,
-            until: 1621621800,
-            type: 'account',
-            group_by: 'date',
-            business_hours: true,
-          },
-        }
-      );
-    });
-
     it('#getConversationMetric', () => {
       reportsAPI.getConversationMetric('account');
       expect(axiosMock.get).toHaveBeenCalledWith(

app/javascript/dashboard/assets/scss/_layout.scss

@@ -1,10 +1,11 @@
 // scss-lint:disable SpaceAfterPropertyColon
-@import 'shared/assets/fonts/inter';
-// Inter,
+// @import 'shared/assets/fonts/inter';
+
 html,
 body {
   font-family:
     'PlusJakarta',
+    Inter,
     -apple-system,
     system-ui,
     BlinkMacSystemFont,

app/javascript/dashboard/components/layout/config/sidebarItems/reports.js

@@ -1,4 +1,3 @@
-import { FEATURE_FLAGS } from '../../../../featureFlags';
 import { frontendURL } from '../../../../helper/URLHelper';
 
 const reports = accountId => ({
@@ -7,12 +6,10 @@ const reports = accountId => ({
     'account_overview_reports',
     'conversation_reports',
     'csat_reports',
-    'bot_reports',
     'agent_reports',
     'label_reports',
     'inbox_reports',
     'team_reports',
-    'sla_reports',
   ],
   menuItems: [
     {
@@ -36,14 +33,6 @@ const reports = accountId => ({
       toState: frontendURL(`accounts/${accountId}/reports/csat`),
       toStateName: 'csat_reports',
     },
-    {
-      icon: 'bot',
-      label: 'REPORTS_BOT',
-      hasSubMenu: false,
-      featureFlag: FEATURE_FLAGS.RESPONSE_BOT,
-      toState: frontendURL(`accounts/${accountId}/reports/bot`),
-      toStateName: 'bot_reports',
-    },
     {
       icon: 'people',
       label: 'REPORTS_AGENT',
@@ -72,13 +61,6 @@ const reports = accountId => ({
       toState: frontendURL(`accounts/${accountId}/reports/teams`),
       toStateName: 'team_reports',
     },
-    {
-      icon: 'document-list-clock',
-      label: 'REPORTS_SLA',
-      hasSubMenu: false,
-      toState: frontendURL(`accounts/${accountId}/reports/sla`),
-      toStateName: 'sla_reports',
-    },
   ],
 });
 

app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue

@@ -1,45 +1,17 @@
-<script setup>
-import { computed } from 'vue';
-
-const props = defineProps({
-  latitude: {
-    type: Number,
-    default: undefined,
-  },
-  longitude: {
-    type: Number,
-    default: undefined,
-  },
-  name: {
-    type: String,
-    default: '',
-  },
-});
-
-const mapUrl = computed(
-  () => `https://maps.google.com/?q=${props.latitude},${props.longitude}`
-);
-</script>
-
 <template>
-  <div
-    class="flex flex-row items-center justify-start gap-1 w-full py-1 px-0 cursor-pointer overflow-hidden"
-  >
-    <fluent-icon
-      icon="location"
-      class="text-slate-600 dark:text-slate-200 leading-none my-0 flex items-center flex-shrink-0"
-      size="32"
-    />
-    <div class="flex flex-col items-start flex-1 min-w-0">
+  <div class="location message-text__wrap">
+    <div class="icon-wrap">
+      <fluent-icon icon="location" class="file--icon" size="32" />
+    </div>
+    <div class="meta">
       <h5
-        class="text-sm text-slate-800 dark:text-slate-100 truncate m-0 w-full"
-        :title="name"
+        class="text-sm text-slate-800 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
       >
         {{ name }}
       </h5>
-      <div class="flex items-center">
+      <div class="link-wrap">
         <a
-          class="text-woot-600 dark:text-woot-600 text-xs underline"
+          class="download clear link button small"
           rel="noreferrer noopener nofollow"
           target="_blank"
           :href="mapUrl"
@@ -50,3 +22,49 @@ const mapUrl = computed(
     </div>
   </div>
 </template>
+
+<script>
+export default {
+  props: {
+    latitude: {
+      type: Number,
+      default: undefined,
+    },
+    longitude: {
+      type: Number,
+      default: undefined,
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    mapUrl() {
+      return `https://maps.google.com/?q=${this.latitude},${this.longitude}`;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.location {
+  @apply flex flex-row py-1 px-0 cursor-pointer;
+
+  .icon-wrap {
+    @apply text-slate-600 dark:text-slate-200 leading-none my-0 mx-1;
+  }
+
+  .text-block-title {
+    @apply m-0 text-slate-800 dark:text-slate-100 break-words;
+  }
+
+  .meta {
+    @apply flex flex-col items-center pr-4;
+  }
+
+  .link-wrap {
+    @apply flex;
+  }
+}
+</style>

app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue

@@ -1,103 +0,0 @@
-<template>
-  <div
-    class="flex items-center px-2 truncate border min-w-fit border-slate-75 dark:border-slate-700"
-    :class="showExtendedInfo ? 'py-[5px] rounded-lg' : 'py-0.5 gap-1 rounded'"
-  >
-    <div
-      class="flex items-center gap-1"
-      :class="
-        showExtendedInfo &&
-        'ltr:pr-1.5 rtl:pl-1.5 ltr:border-r rtl:border-l border-solid border-slate-75 dark:border-slate-700'
-      "
-    >
-      <fluent-icon
-        size="14"
-        :icon="slaStatus.icon"
-        type="outline"
-        :icon-lib="isSlaMissed ? 'lucide' : 'fluent'"
-        class="flex-shrink-0"
-        :class="slaTextStyles"
-      />
-      <span
-        v-if="showExtendedInfo"
-        class="text-xs font-medium"
-        :class="slaTextStyles"
-      >
-        {{ slaStatusText }}
-      </span>
-    </div>
-    <span
-      class="text-xs font-medium"
-      :class="[slaTextStyles, showExtendedInfo && 'ltr:pl-1.5 rtl:pr-1.5']"
-    >
-      {{ slaStatus.threshold }}
-    </span>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { evaluateSLAStatus } from '../helpers/SLAHelper';
-
-// const REFRESH_INTERVAL = 60000;
-
-export default {
-  props: {
-    chat: {
-      type: Object,
-      default: () => ({}),
-    },
-    showExtendedInfo: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      timer: null,
-      slaStatus: {},
-    };
-  },
-  computed: {
-    ...mapGetters({
-      activeSLA: 'sla/getSLAById',
-    }),
-    slaPolicyId() {
-      return this.chat?.sla_policy_id;
-    },
-    sla() {
-      if (!this.slaPolicyId) return null;
-      return this.activeSLA(this.slaPolicyId);
-    },
-    isSlaMissed() {
-      return this.slaStatus?.isSlaMissed;
-    },
-    slaTextStyles() {
-      return this.isSlaMissed
-        ? 'text-red-400 dark:text-red-300'
-        : 'text-yellow-600 dark:text-yellow-500';
-    },
-    slaStatusText() {
-      const upperCaseType = this.slaStatus?.type?.toUpperCase(); // FRT, NRT, or RT
-      const statusKey = this.isSlaMissed ? 'BREACH' : 'DUE';
-
-      return this.$t(`CONVERSATION.HEADER.SLA_STATUS.${upperCaseType}`, {
-        status: this.$t(`CONVERSATION.HEADER.SLA_STATUS.${statusKey}`),
-      });
-    },
-  },
-  watch: {
-    chat() {
-      this.updateSlaStatus();
-    },
-  },
-  mounted() {
-    this.updateSlaStatus();
-  },
-  methods: {
-    updateSlaStatus() {
-      this.slaStatus = evaluateSLAStatus(this.sla, this.chat);
-    },
-  },
-};
-</script>

app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue

@@ -45,11 +45,6 @@ export default {
       type: Number,
       required: true,
     },
-    conversationLabels: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
   data() {
     return {

app/javascript/dashboard/featureFlags.js

@@ -19,15 +19,4 @@ export const FEATURE_FLAGS = {
   INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply',
   INBOX_VIEW: 'inbox_view',
   SLA: 'sla',
-  RESPONSE_BOT: 'response_bot',
-  CHANNEL_EMAIL: 'channel_email',
-  CHANNEL_FACEBOOK: 'channel_facebook',
-  CHANNEL_TWITTER: 'channel_twitter',
-  CHANNEL_WEBSITE: 'channel_website',
-  CUSTOM_REPLY_DOMAIN: 'custom_reply_domain',
-  CUSTOM_REPLY_EMAIL: 'custom_reply_email',
-  DISABLE_BRANDING: 'disable_branding',
-  EMAIL_CONTINUITY_ON_API_CHANNEL: 'email_continuity_on_api_channel',
-  INBOUND_EMAILS: 'inbound_emails',
-  IP_LOOKUP: 'ip_lookup',
 };

app/javascript/dashboard/helper/directives/resize.js

@@ -1,41 +0,0 @@
-import { debounce } from '@chatwoot/utils';
-
-const RESIZE_OBSERVER_DEBOUNCE_TIME = 100;
-
-function createResizeObserver(el, binding) {
-  const { value } = binding;
-  const observer = new ResizeObserver(
-    debounce(entries => {
-      const entry = entries[0];
-      if (entry && value && typeof value === 'function') {
-        value(entry);
-      }
-    }, RESIZE_OBSERVER_DEBOUNCE_TIME)
-  );
-
-  el.cwResizeObserver = observer;
-  observer.observe(el);
-}
-
-function destroyResizeObserver(el) {
-  if (el.cwResizeObserver) {
-    el.cwResizeObserver.unobserve(el);
-    el.cwResizeObserver.disconnect();
-    delete el.cwResizeObserver;
-  }
-}
-
-export default {
-  bind(el, binding) {
-    createResizeObserver(el, binding);
-  },
-  update(el, binding) {
-    if (binding.oldValue !== binding.value) {
-      destroyResizeObserver(el);
-      createResizeObserver(el, binding);
-    }
-  },
-  unbind(el) {
-    destroyResizeObserver(el);
-  },
-};

app/javascript/dashboard/helper/featureHelper.js

@@ -1,4 +0,0 @@
-export function getHelpUrlForFeature(featureName) {
-  const { helpUrls } = window.chatwootConfig;
-  return helpUrls[featureName];
-}

app/javascript/dashboard/helper/specs/directives/resize.spec.js

@@ -1,78 +0,0 @@
-import resize from '../../directives/resize';
-
-class ResizeObserverMock {
-  // eslint-disable-next-line class-methods-use-this
-  observe() {}
-
-  // eslint-disable-next-line class-methods-use-this
-  unobserve() {}
-
-  // eslint-disable-next-line class-methods-use-this
-  disconnect() {}
-}
-
-describe('resize directive', () => {
-  let el;
-  let binding;
-  let observer;
-
-  beforeEach(() => {
-    el = document.createElement('div');
-    binding = {
-      value: jest.fn(),
-    };
-    observer = {
-      observe: jest.fn(),
-      unobserve: jest.fn(),
-      disconnect: jest.fn(),
-    };
-    window.ResizeObserver = ResizeObserverMock;
-    jest.spyOn(window, 'ResizeObserver').mockImplementation(() => observer);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should create ResizeObserver on bind', () => {
-    resize.bind(el, binding);
-
-    expect(ResizeObserver).toHaveBeenCalled();
-    expect(observer.observe).toHaveBeenCalledWith(el);
-  });
-
-  it('should call callback on observer callback', () => {
-    el = document.createElement('div');
-    binding = {
-      value: jest.fn(),
-    };
-
-    resize.bind(el, binding);
-
-    const entries = [{ contentRect: { width: 100, height: 100 } }];
-    const callback = binding.value;
-    callback(entries[0]);
-
-    expect(binding.value).toHaveBeenCalledWith(entries[0]);
-  });
-
-  it('should destroy and recreate observer on update', () => {
-    resize.bind(el, binding);
-
-    resize.update(el, { ...binding, oldValue: 'old' });
-
-    expect(observer.unobserve).toHaveBeenCalledWith(el);
-    expect(observer.disconnect).toHaveBeenCalled();
-    expect(ResizeObserver).toHaveBeenCalledTimes(2);
-    expect(observer.observe).toHaveBeenCalledTimes(2);
-  });
-
-  it('should destroy observer on unbind', () => {
-    resize.bind(el, binding);
-
-    resize.unbind(el);
-
-    expect(observer.unobserve).toHaveBeenCalledWith(el);
-    expect(observer.disconnect).toHaveBeenCalled();
-  });
-});

app/javascript/dashboard/i18n/locale/en/contactFilters.json

@@ -44,8 +44,7 @@
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Created At",
       "LAST_ACTIVITY": "Last Activity",
-      "REFERER_LINK": "Referrer link",
-      "BLOCKED": "Blocked"
+      "REFERER_LINK": "Referrer link"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Standard Filters",

app/javascript/dashboard/i18n/locale/en/conversation.json

@@ -64,14 +64,7 @@
       "SNOOZED_UNTIL": "Snoozed until",
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
       "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply",
-      "SLA_STATUS": {
-        "FRT": "FRT {status}",
-        "NRT": "NRT {status}",
-        "RT": "RT {status}",
-        "BREACH": "breach",
-        "DUE": "due"
-      }
+      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
     },
     "RESOLVE_DROPDOWN": {
       "MARK_PENDING": "Mark as pending",

app/javascript/dashboard/i18n/locale/en/report.json

@@ -35,14 +35,6 @@
         "NAME": "Resolution Count",
         "DESC": "( Total )"
       },
-      "BOT_RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
-      },
-      "BOT_HANDOFF_COUNT": {
-        "NAME": "Handoff Count",
-        "DESC": "( Total )"
-      },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
         "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
@@ -94,49 +86,20 @@
       "MONTH": "Month",
       "YEAR": "Year"
     },
-    "GROUP_BY_DAY_OPTIONS": [
-      {
-        "id": 1,
-        "groupBy": "Day"
-      }
-    ],
+    "GROUP_BY_DAY_OPTIONS": [{ "id": 1, "groupBy": "Day" }],
     "GROUP_BY_WEEK_OPTIONS": [
-      {
-        "id": 1,
-        "groupBy": "Day"
-      },
-      {
-        "id": 2,
-        "groupBy": "Week"
-      }
+      { "id": 1, "groupBy": "Day" },
+      { "id": 2, "groupBy": "Week" }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
-      {
-        "id": 1,
-        "groupBy": "Day"
-      },
-      {
-        "id": 2,
-        "groupBy": "Week"
-      },
-      {
-        "id": 3,
-        "groupBy": "Month"
-      }
+      { "id": 1, "groupBy": "Day" },
+      { "id": 2, "groupBy": "Week" },
+      { "id": 3, "groupBy": "Month" }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
-      {
-        "id": 2,
-        "groupBy": "Week"
-      },
-      {
-        "id": 3,
-        "groupBy": "Month"
-      },
-      {
-        "id": 4,
-        "groupBy": "Year"
-      }
+      { "id": 2, "groupBy": "Week" },
+      { "id": 3, "groupBy": "Month" },
+      { "id": 4, "groupBy": "Year" }
     ],
     "BUSINESS_HOURS": "Business Hours"
   },
@@ -441,27 +404,6 @@
       }
     }
   },
-  "BOT_REPORTS": {
-    "HEADER": "Bot Reports",
-    "METRIC": {
-      "TOTAL_CONVERSATIONS": {
-        "LABEL": "No. of Conversations",
-        "TOOLTIP": "Total number of conversations handled by the bot"
-      },
-      "TOTAL_RESPONSES": {
-        "LABEL": "Total Responses",
-        "TOOLTIP": "Total number of responses sent by the bot"
-      },
-      "RESOLUTION_RATE": {
-        "LABEL": "Resolution Rate",
-        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
-      },
-      "HANDOFF_RATE": {
-        "LABEL": "Handoff Rate",
-        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
-      }
-    }
-  },
   "OVERVIEW_REPORTS": {
     "HEADER": "Overview",
     "LIVE": "Live",
@@ -505,26 +447,5 @@
     "THURSDAY": "Thursday",
     "FRIDAY": "Friday",
     "SATURDAY": "Saturday"
-  },
-  "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "There are no SLA reports available.",
-    "METRICS": {
-      "HIT_RATE": {
-        "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
-      },
-      "NO_OF_BREACHES": {
-        "LABEL": "Number of Breaches",
-        "TOOLTIP": "The total SLA breaches in a certain period."
-      }
-    },
-    "TABLE": {
-      "HEADER": {
-        "POLICY_BREACHED": "Policy breached",
-        "CONVERSATION": "Conversation",
-        "AGENT": "Agent"
-      }
-    }
   }
 }

app/javascript/dashboard/i18n/locale/en/settings.json

@@ -234,12 +234,10 @@
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
     "ONE_OFF": "One off",
-    "REPORTS_BOT": "Bot",
     "REPORTS_AGENT": "Agents",
     "REPORTS_LABEL": "Labels",
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
-    "REPORTS_SLA": "SLA",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "SLA": "SLA",
     "BETA": "Beta",

app/javascript/dashboard/i18n/locale/en/sla.json

@@ -1,24 +1,15 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "ADD_ACTION": "Add SLA",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
+    "HEADER_BTN_TXT": "Add SLA",
     "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
     "LIST": {
       "404": "There are no SLAs available in this account.",
-      "BUSINESS_HOURS_ON": "Business hours on",
-      "BUSINESS_HOURS_OFF": "Business hours off",
-      "RESPONSE_TYPES": {
-        "FRT": "First response time threshold",
-        "NRT": "Next response time threshold",
-        "RT": "Resolution time threshold",
-        "SHORT_HAND": {
-          "FRT": "FRT",
-          "NRT": "NRT",
-          "RT": "RT"
-        }
-      }
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": ["Name", "Description", "FRT", "NRT", "RT", "Business Hours"]
     },
     "FORM": {
       "NAME": {
@@ -64,17 +55,11 @@
         "ERROR_MESSAGE": "There was an error, please try again"
       }
     },
-    "DELETE": {
-      "TITLE": "Delete SLA",
+    "EDIT": {
+      "TITLE": "Edit SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA deleted successfully",
+        "SUCCESS_MESSAGE": "SLA updated successfully",
         "ERROR_MESSAGE": "There was an error, please try again"
-      },
-      "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure you want to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
       }
     }
   }

app/javascript/dashboard/mixins/conversation/labelMixin.js

@@ -4,10 +4,6 @@ export default {
   computed: {
     ...mapGetters({ accountLabels: 'labels/getLabels' }),
     savedLabels() {
-      // If conversationLabels is passed as prop, use it
-      if (this.conversationLabels)
-        return this.conversationLabels.split(',').map(item => item.trim());
-      // Otherwise, get labels from store
       return this.$store.getters['conversationLabels/getConversationLabels'](
         this.conversationId
       );

app/javascript/dashboard/mixins/reportMixin.js

@@ -2,19 +2,11 @@ import { mapGetters } from 'vuex';
 import { formatTime } from '@chatwoot/utils';
 
 export default {
-  props: {
-    accountSummaryKey: {
-      type: String,
-      default: 'getAccountSummary',
-    },
-  },
   computed: {
     ...mapGetters({
+      accountSummary: 'getAccountSummary',
       accountReport: 'getAccountReports',
     }),
-    accountSummary() {
-      return this.$store.getters[this.accountSummaryKey];
-    },
   },
   methods: {
     calculateTrend(key) {

app/javascript/dashboard/mixins/specs/reportMixin.spec.js

@@ -11,42 +11,11 @@ describe('reportMixin', () => {
   beforeEach(() => {
     getters = {
       getAccountSummary: () => reportFixtures.summary,
-      getBotSummary: () => reportFixtures.botSummary,
       getAccountReports: () => reportFixtures.report,
     };
     store = new Vuex.Store({ getters });
   });
 
-  it('display the metric for account', async () => {
-    const Component = {
-      render() {},
-      title: 'TestComponent',
-      mixins: [reportMixin],
-    };
-    const wrapper = shallowMount(Component, { store, localVue });
-    await wrapper.setProps({
-      accountSummaryKey: 'getAccountSummary',
-    });
-    expect(wrapper.vm.displayMetric('conversations_count')).toEqual('5,000');
-    expect(wrapper.vm.displayMetric('avg_first_response_time')).toEqual(
-      '3 Min 18 Sec'
-    );
-  });
-
-  it('display the metric for bot', async () => {
-    const Component = {
-      render() {},
-      title: 'TestComponent',
-      mixins: [reportMixin],
-    };
-    const wrapper = shallowMount(Component, { store, localVue });
-    await wrapper.setProps({
-      accountSummaryKey: 'getBotSummary',
-    });
-    expect(wrapper.vm.displayMetric('bot_resolutions_count')).toEqual('10');
-    expect(wrapper.vm.displayMetric('bot_handoffs_count')).toEqual('20');
-  });
-
   it('display the metric', () => {
     const Component = {
       render() {},

app/javascript/dashboard/mixins/specs/reportMixinFixtures.js

@@ -15,14 +15,6 @@ export default {
     },
     resolutions_count: 3,
   },
-  botSummary: {
-    bot_resolutions_count: 10,
-    bot_handoffs_count: 20,
-    previous: {
-      bot_resolutions_count: 8,
-      bot_handoffs_count: 5,
-    },
-  },
   report: {
     data: [
       { value: '0.00', timestamp: 1647541800, count: 0 },

app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue

@@ -243,7 +243,7 @@ export default {
           attr.attribute_display_type === 'checkbox'
         );
       });
-      if (isCustomAttributeCheckbox || type === 'blocked') {
+      if (isCustomAttributeCheckbox) {
         return [
           {
             id: true,

app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js

@@ -76,14 +76,6 @@ const filterTypes = [
     filterOperators: OPERATOR_TYPES_5,
     attributeModel: 'standard',
   },
-  {
-    attributeKey: 'blocked',
-    attributeI18nKey: 'BLOCKED',
-    inputType: 'search_select',
-    dataType: 'text',
-    filterOperators: OPERATOR_TYPES_1,
-    attributeModel: 'standard',
-  },
 ];
 
 export const filterAttributeGroups = [
@@ -123,10 +115,6 @@ export const filterAttributeGroups = [
         key: 'last_activity_at',
         i18nKey: 'LAST_ACTIVITY',
       },
-      {
-        key: 'blocked',
-        i18nKey: 'BLOCKED',
-      },
     ],
   },
 ];

app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue

@@ -1,23 +0,0 @@
-<script setup>
-defineProps({
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-  loadingMessage: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <div class="flex flex-col w-full h-full gap-10 font-inter">
-    <slot name="header" />
-    <div>
-      <slot v-if="isLoading" name="loading">
-        <woot-loading-state :message="loadingMessage" />
-      </slot>
-      <slot v-else name="body" />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue

@@ -1,21 +0,0 @@
-<script setup>
-defineProps({
-  keepAlive: {
-    type: Boolean,
-    default: true,
-  },
-});
-</script>
-
-<template>
-  <div
-    class="flex flex-col w-full h-full px-5 pt-8 pb-3 m-0 overflow-auto bg-white sm:px-16 sm:pt-16 dark:bg-slate-900"
-  >
-    <div class="flex items-start max-w-[900px] w-full">
-      <keep-alive v-if="keepAlive">
-        <router-view />
-      </keep-alive>
-      <router-view v-else />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue

@@ -1,102 +0,0 @@
-<script setup>
-defineProps({
-  title: {
-    type: String,
-    required: true,
-  },
-  description: {
-    type: String,
-    required: true,
-  },
-  iconName: {
-    type: String,
-    required: true,
-  },
-  href: {
-    type: String,
-    default: '',
-  },
-  linkText: {
-    type: String,
-    default: '',
-  },
-});
-
-const openInNewTab = url => {
-  if (!url) return;
-  window.open(url, '_blank', 'noopener noreferrer');
-};
-</script>
-
-<template>
-  <div class="flex flex-col items-start w-full gap-4">
-    <!-- Header section with icon, title and action button -->
-    <div class="flex items-center justify-between w-full gap-4">
-      <!-- Icon and title container -->
-      <div class="flex items-center gap-3">
-        <div
-          class="flex items-center w-10 h-10 p-1 rounded-full bg-woot-25/60 dark:bg-woot-900/60"
-        >
-          <div
-            class="flex items-center justify-center w-full h-full rounded-full bg-woot-75/70 dark:bg-woot-800/40"
-          >
-            <fluent-icon
-              size="14"
-              :icon="iconName"
-              type="outline"
-              class="flex-shrink-0 text-woot-500 dark:text-woot-500"
-            />
-          </div>
-        </div>
-        <h1
-          class="text-2xl font-medium tracking-[-1.5%] text-slate-900 dark:text-slate-25"
-        >
-          {{ title }}
-        </h1>
-      </div>
-      <!-- Slot for additional actions on larger screens -->
-      <div class="hidden gap-2 sm:flex">
-        <slot name="actions" />
-      </div>
-    </div>
-    <!-- Description and optional link -->
-    <div
-      class="flex flex-col gap-2 text-slate-600 dark:text-slate-300 max-w-[721px] w-full"
-    >
-      <p
-        class="mb-0 text-sm font-normal tracking-[0.5%] line-clamp-5 sm:line-clamp-none"
-      >
-        <slot name="description">{{ description }}</slot>
-      </p>
-      <!-- Conditional link -->
-      <a
-        v-if="href && linkText"
-        :href="href"
-        target="_blank"
-        rel="noopener noreferrer"
-        class="sm:inline-flex hidden tracking-[-0.6%] gap-1 w-fit items-center text-woot-500 dark:text-woot-500 text-sm font-medium tracking=[-0.6%] hover:underline"
-      >
-        {{ linkText }}
-        <fluent-icon
-          size="16"
-          icon="chevron-right"
-          type="outline"
-          class="flex-shrink-0 text-woot-500 dark:text-woot-500"
-        />
-      </a>
-    </div>
-    <!-- Mobile view for actions and link -->
-    <div class="flex items-start justify-start w-full gap-3 sm:hidden">
-      <slot name="actions" />
-      <woot-button
-        v-if="href && linkText"
-        color-scheme="secondary"
-        icon="arrow-outwards"
-        class="flex-row-reverse rounded-xl min-w-0 !bg-slate-50 !text-slate-900 dark:!text-white dark:!bg-slate-800"
-        @click="openInNewTab(href)"
-      >
-        {{ linkText }}
-      </woot-button>
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue

@@ -1,53 +0,0 @@
-<script setup>
-defineProps({
-  title: {
-    type: String,
-    default: '',
-  },
-  description: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <div
-    class="flex relative flex-col sm:flex-row p-4 gap-4 sm:p-6 justify-between shadow-sm group bg-white border border-solid rounded-xl dark:bg-slate-800 border-slate-75 dark:border-slate-700/50 max-w-[900px] w-full"
-  >
-    <!-- left side section -->
-    <slot name="leftSection">
-      <div class="flex flex-col min-w-0 items-start gap-3 max-w-[480px] w-full">
-        <div
-          class="flex items-center justify-between w-full gap-3 sm:justify-normal whitespace-nowrap"
-        >
-          <h3
-            class="justify-between text-sm tracking-[-0.6%] font-medium truncate w-fit sm:justify-normal text-slate-900 dark:text-slate-25"
-          >
-            <slot name="title">
-              {{ title }}
-            </slot>
-          </h3>
-          <slot name="label" />
-        </div>
-        <p
-          class="text-sm text-slate-600 tracking-[0.5%] dark:text-slate-300 max-w-[400px] w-full line-clamp-2"
-        >
-          <slot name="description">
-            {{ description }}
-          </slot>
-        </p>
-      </div>
-    </slot>
-
-    <!-- right side section -->
-    <slot name="rightSection" />
-
-    <!-- actions section -->
-    <div
-      v-if="$slots.actions"
-      class="absolute flex-col items-center hidden gap-1 border-none ltr:-right-3 rtl:-left-3 top-3 group-hover:flex"
-    >
-      <slot name="actions" />
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue

@@ -74,7 +74,6 @@
 import { required, minLength } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
-import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
 
 export default {
   mixins: [alertMixin],
@@ -126,9 +125,10 @@ export default {
         });
         this.errorMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
       } catch (error) {
-        this.errorMessage =
-          parseAPIErrorResponse(error) ||
-          this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
+        this.errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
+        if (error?.response?.data?.message) {
+          this.errorMessage = error.response.data.message;
+        }
       } finally {
         this.isPasswordChanging = false;
         this.showAlert(this.errorMessage);

app/javascript/dashboard/routes/dashboard/settings/reports/BotReports.vue

@@ -1,106 +0,0 @@
-<template>
-  <div class="flex-1 overflow-auto p-4">
-    <report-filter-selector
-      :show-agents-filter="false"
-      :show-group-by-filter="true"
-      :show-business-hours-switch="false"
-      @filter-change="onFilterChange"
-    />
-
-    <bot-metrics :filters="requestPayload" />
-    <report-container
-      :group-by="groupBy"
-      :report-keys="reportKeys"
-      :account-summary-key="'getBotSummary'"
-    />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import BotMetrics from './components/BotMetrics.vue';
-import ReportFilterSelector from './components/FilterSelector.vue';
-import { GROUP_BY_FILTER } from './constants';
-import reportMixin from 'dashboard/mixins/reportMixin';
-import ReportContainer from './ReportContainer.vue';
-import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
-
-export default {
-  name: 'BotReports',
-  components: {
-    BotMetrics,
-    ReportFilterSelector,
-    ReportContainer,
-  },
-  mixins: [reportMixin],
-  data() {
-    return {
-      from: 0,
-      to: 0,
-      groupBy: GROUP_BY_FILTER[1],
-      reportKeys: {
-        BOT_RESOLUTION_COUNT: 'bot_resolutions_count',
-        BOT_HANDOFF_COUNT: 'bot_handoffs_count',
-      },
-      businessHours: false,
-    };
-  },
-  computed: {
-    ...mapGetters({
-      accountReport: 'getAccountReports',
-    }),
-    requestPayload() {
-      return {
-        from: this.from,
-        to: this.to,
-      };
-    },
-  },
-  methods: {
-    fetchAllData() {
-      this.fetchBotSummary();
-      this.fetchChartData();
-    },
-    fetchBotSummary() {
-      try {
-        this.$store.dispatch('fetchBotSummary', this.getRequestPayload());
-      } catch {
-        this.showAlert(this.$t('REPORT.SUMMARY_FETCHING_FAILED'));
-      }
-    },
-    fetchChartData() {
-      Object.keys(this.reportKeys).forEach(async key => {
-        try {
-          await this.$store.dispatch('fetchAccountReport', {
-            metric: this.reportKeys[key],
-            ...this.getRequestPayload(),
-          });
-        } catch {
-          this.showAlert(this.$t('REPORT.DATA_FETCHING_FAILED'));
-        }
-      });
-    },
-    getRequestPayload() {
-      const { from, to, groupBy, businessHours } = this;
-
-      return {
-        from,
-        to,
-        groupBy: groupBy?.period,
-        businessHours,
-      };
-    },
-    onFilterChange({ from, to, groupBy, businessHours }) {
-      this.from = from;
-      this.to = to;
-      this.groupBy = groupBy;
-      this.businessHours = businessHours;
-      this.fetchAllData();
-
-      this.$track(REPORTS_EVENTS.FILTER_REPORT, {
-        filterValue: { from, to, groupBy, businessHours },
-        reportType: 'bots',
-      });
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue

@@ -7,7 +7,7 @@
       :key="metric.KEY"
       class="p-4 rounded-md mb-3"
     >
-      <chart-stats :metric="metric" :account-summary-key="accountSummaryKey" />
+      <chart-stats :metric="metric" />
       <div class="mt-4 h-72">
         <woot-loading-state
           v-if="accountReport.isFetching[metric.KEY]"

app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue

@@ -1,57 +0,0 @@
-<template>
-  <div class="flex flex-col flex-1 gap-6 p-4 overflow-auto font-inter">
-    <!-- <SLA-filters /> -->
-    <SLAMetrics
-      :hit-rate="slaMetrics.hitRate"
-      :no-of-breaches="slaMetrics.numberOfSLABreaches"
-      :is-loading="uiFlags.isLoading"
-    />
-    <SLATable
-      :sla-reports="slaReports"
-      :current-page="Number(slaMeta.currentPage)"
-      :total-count="Number(slaMeta.count)"
-      @page-change="onPageChange"
-    />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import SLAMetrics from './components/SLA/SLAMetrics.vue';
-import SLATable from './components/SLA/SLATable.vue';
-// import SLAFilters from './components/SLA/SLAFilters.vue';
-export default {
-  name: 'SLAReports',
-  components: {
-    SLAMetrics,
-    SLATable,
-    // SLAFilters,
-  },
-  data() {
-    return {
-      pageNumber: 1,
-    };
-  },
-  computed: {
-    ...mapGetters({
-      slaReports: 'slaReports/getAll',
-      slaMetrics: 'slaReports/getMetrics',
-      slaMeta: 'slaReports/getMeta',
-      uiFlags: 'slaReports/getUIFlags',
-    }),
-  },
-  mounted() {
-    this.$store.dispatch('slaReports/getMetrics');
-    this.fetchSLAReports();
-  },
-  methods: {
-    fetchSLAReports({ pageNumber } = {}) {
-      this.$store.dispatch('slaReports/get', {
-        page: pageNumber || this.pageNumber,
-      });
-    },
-    onPageChange(pageNumber) {
-      this.fetchSLAReports({ pageNumber });
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue

@@ -1,68 +0,0 @@
-<script setup>
-import { ref, watch, onMounted } from 'vue';
-import ReportMetricCard from './ReportMetricCard.vue';
-import ReportsAPI from 'dashboard/api/reports';
-
-const props = defineProps({
-  filters: {
-    type: Object,
-    required: true,
-  },
-});
-
-const conversationCount = ref('0');
-const messageCount = ref('0');
-const resolutionRate = ref('0');
-const handoffRate = ref('0');
-
-const formatToPercent = value => {
-  return value ? `${value}%` : '--';
-};
-
-const fetchMetrics = () => {
-  if (!props.filters.to || !props.filters.from) {
-    return;
-  }
-  ReportsAPI.getBotMetrics(props.filters).then(response => {
-    conversationCount.value = response.data.conversation_count.toLocaleString();
-    messageCount.value = response.data.message_count.toLocaleString();
-    resolutionRate.value = response.data.resolution_rate.toString();
-    handoffRate.value = response.data.handoff_rate.toString();
-  });
-};
-
-watch(() => props.filters, fetchMetrics, { deep: true });
-
-onMounted(fetchMetrics);
-</script>
-
-<template>
-  <div
-    class="flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700"
-  >
-    <report-metric-card
-      :label="$t('BOT_REPORTS.METRIC.TOTAL_CONVERSATIONS.LABEL')"
-      :info-text="$t('BOT_REPORTS.METRIC.TOTAL_CONVERSATIONS.TOOLTIP')"
-      :value="conversationCount"
-      class="flex-1"
-    />
-    <report-metric-card
-      :label="$t('BOT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL')"
-      :info-text="$t('BOT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP')"
-      :value="messageCount"
-      class="flex-1"
-    />
-    <report-metric-card
-      :label="$t('BOT_REPORTS.METRIC.RESOLUTION_RATE.LABEL')"
-      :info-text="$t('BOT_REPORTS.METRIC.RESOLUTION_RATE.TOOLTIP')"
-      :value="formatToPercent(resolutionRate)"
-      class="flex-1"
-    />
-    <report-metric-card
-      :label="$t('BOT_REPORTS.METRIC.HANDOFF_RATE.LABEL')"
-      :info-text="$t('BOT_REPORTS.METRIC.HANDOFF_RATE.TOOLTIP')"
-      :value="formatToPercent(handoffRate)"
-      class="flex-1"
-    />
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/reports/components/ChartElements/ChartStats.vue

@@ -1,8 +1,6 @@
 <template>
-  <div class="text-slate-900 dark:text-slate-100">
-    <span class="text-sm">
-      {{ metric.NAME }}
-    </span>
+  <div>
+    <span class="text-sm">{{ metric.NAME }}</span>
     <div class="flex items-end">
       <div class="font-medium text-xl">
         {{ displayMetric(metric.KEY) }}

app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue

@@ -6,20 +6,17 @@
       :label="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP')"
       :value="responseCount"
-      class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"
     />
     <csat-metric-card
       :disabled="ratingFilterEnabled"
       :label="$t('CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP')"
       :value="ratingFilterEnabled ? '--' : formatToPercent(satisfactionScore)"
-      class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"
     />
     <csat-metric-card
       :label="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP')"
       :value="formatToPercent(responseRate)"
-      class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"
     />
 
     <div

app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue

@@ -21,7 +21,7 @@ defineProps({
 <template>
   <div
     ref="reportMetricContainer"
-    class="m-0 p-4"
+    class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%] m-0 p-4"
     :class="{
       'grayscale pointer-events-none opacity-30': disabled,
     }"

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/Avatar.vue

@@ -1,55 +0,0 @@
-<template>
-  <div class="avatar-container" :style="style" aria-hidden="true">
-    <slot>{{ userInitial }}</slot>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Avatar',
-  props: {
-    username: {
-      type: String,
-      default: '',
-    },
-    size: {
-      type: Number,
-      default: 40,
-    },
-  },
-  computed: {
-    style() {
-      return {
-        fontSize: `${Math.floor(this.size / 2.5)}px`,
-      };
-    },
-    userInitial() {
-      const parts = this.username.split(/[ -]/);
-      let initials = parts.reduce((acc, curr) => acc + curr.charAt(0), '');
-
-      if (initials.length > 2 && initials.search(/[A-Z]/) !== -1) {
-        initials = initials.replace(/[a-z]+/g, '');
-      }
-      initials = initials.substring(0, 2).toUpperCase();
-
-      return initials;
-    },
-  },
-};
-</script>
-
-<style scoped>
-@tailwind components;
-@layer components {
-  .avatar-color {
-    background-image: linear-gradient(to top, #c2e1ff 0%, #d6ebff 100%);
-  }
-
-  .dark-avatar-color {
-    background-image: linear-gradient(to top, #135899 0%, #135899 100%);
-  }
-}
-.avatar-container {
-  @apply flex leading-[100%] font-medium items-center justify-center text-center cursor-default avatar-color dark:dark-avatar-color text-woot-600 dark:text-woot-200;
-}
-</style>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/MenuItem.vue

@@ -1,66 +0,0 @@
-<template>
-  <div
-    class="menu text-slate-700 dark:text-slate-200 font-medium text-sm h-11 flex items-center hover:bg-slate-50 dark:hover:bg-slate-100"
-    role="button"
-    @click.stop="$emit('click')"
-  >
-    <span
-      v-if="variant === 'label' && option.color"
-      class="label-pill"
-      :style="{ backgroundColor: option.color }"
-    />
-    <thumbnail
-      v-if="variant === 'agent'"
-      :username="option.label"
-      :src="option.thumbnail"
-      :status="option.status"
-      size="20px"
-      class="agent-thumbnail"
-    />
-    <p class="menu-label overflow-hidden whitespace-nowrap text-ellipsis">
-      {{ option.label }}
-    </p>
-  </div>
-</template>
-
-<script>
-import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
-export default {
-  components: {
-    Thumbnail,
-  },
-  props: {
-    option: {
-      type: Object,
-      default: () => {},
-    },
-    variant: {
-      type: String,
-      default: 'default',
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.menu {
-  width: calc(var(--space-mega) * 2);
-  @apply flex items-center flex-nowrap p-1 rounded-sm overflow-hidden cursor-pointer;
-
-  .menu-label {
-    @apply my-0 mx-2 text-xs flex-shrink-0;
-  }
-
-  // &:hover {
-  //   @apply bg-woot-500 dark:bg-woot-500 text-white dark:text-slate-50;
-  // }
-}
-
-.agent-thumbnail {
-  margin-top: 0 !important;
-}
-
-.label-pill {
-  @apply w-4 h-4 rounded-full border border-slate-50 border-solid dark:border-slate-900 flex-shrink-0;
-}
-</style>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAContextMenu.vue

@@ -1,122 +0,0 @@
-<template>
-  <div
-    class="bg-white dark:bg-slate- rounded-xl border-slate-100 dark:border-slate-900 border-solid border"
-  >
-    <menu-item
-      :option="unreadOption"
-      variant="icon"
-      @click="$emit('mark-as-unread')"
-    />
-    <menu-item-with-submenu :option="priorityConfig">
-      <menu-item
-        v-for="(option, i) in priorityConfig.options"
-        :key="i"
-        :option="option"
-      />
-    </menu-item-with-submenu>
-    <template v-for="option in statusMenuConfig">
-      <menu-item
-        v-if="show(option.key)"
-        :key="option.key"
-        :option="option"
-        variant="icon"
-      />
-    </template>
-    <menu-item
-      v-if="show(snoozeOption.key)"
-      :option="snoozeOption"
-      variant="icon"
-    />
-
-    <menu-item-with-submenu :option="priorityConfig">
-      <menu-item
-        v-for="(option, i) in priorityConfig.options"
-        :key="i"
-        :option="option"
-      />
-    </menu-item-with-submenu>
-  </div>
-</template>
-
-<script>
-import MenuItem from './MenuItem.vue';
-import MenuItemWithSubmenu from './menuItemWithSubmenu.vue';
-import wootConstants from 'dashboard/constants/globals';
-import agentMixin from 'dashboard/mixins/agentMixin';
-import { mapGetters } from 'vuex';
-export default {
-  components: {
-    MenuItem,
-    MenuItemWithSubmenu,
-  },
-  mixins: [agentMixin],
-  data() {
-    return {
-      STATUS_TYPE: wootConstants.STATUS_TYPE,
-      unreadOption: {
-        label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.MARK_AS_UNREAD'),
-        icon: 'mail',
-      },
-      statusMenuConfig: [
-        {
-          key: wootConstants.STATUS_TYPE.RESOLVED,
-          label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.RESOLVED'),
-          icon: 'checkmark',
-        },
-        {
-          key: wootConstants.STATUS_TYPE.PENDING,
-          label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.PENDING'),
-          icon: 'book-clock',
-        },
-        {
-          key: wootConstants.STATUS_TYPE.OPEN,
-          label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.REOPEN'),
-          icon: 'arrow-redo',
-        },
-      ],
-      snoozeOption: {
-        key: wootConstants.STATUS_TYPE.SNOOZED,
-        label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.SNOOZE.TITLE'),
-        icon: 'snooze',
-      },
-      priorityConfig: {
-        key: 'priority',
-        label: this.$t('CONVERSATION.PRIORITY.TITLE'),
-        icon: 'warning',
-        options: [
-          {
-            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.NONE'),
-            key: null,
-          },
-          {
-            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.URGENT'),
-            key: 'urgent',
-          },
-          {
-            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.HIGH'),
-            key: 'high',
-          },
-          {
-            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.MEDIUM'),
-            key: 'medium',
-          },
-          {
-            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.LOW'),
-            key: 'low',
-          },
-        ].filter(item => item.key !== this.priority),
-      },
-    };
-  },
-  computed: {
-    ...mapGetters({}),
-  },
-  methods: {
-    show(key) {
-      // If the conversation status is same as the action, then don't display the option
-      // i.e.: Don't show an option to resolve if the conversation is already resolved.
-      return this.status !== key;
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAFilters.vue

@@ -1,50 +0,0 @@
-<template>
-  <div>
-    <woot-button
-      color-scheme="secondary"
-      icon="plus-sign"
-      class="rounded-xl"
-      @click="openContextMenu"
-    >
-      Add filter
-    </woot-button>
-    <woot-context-menu
-      v-if="showContextMenu"
-      ref="menu"
-      :x="contextMenu.x"
-      :y="contextMenu.y"
-      @close="closeContextMenu"
-    >
-      <SLA-context-menu />
-    </woot-context-menu>
-  </div>
-</template>
-
-<script>
-import SLAContextMenu from './SLAContextMenu.vue';
-export default {
-  name: 'SLAFilters',
-  components: {
-    SLAContextMenu,
-  },
-  props: {},
-  data() {
-    return {
-      showContextMenu: false,
-    };
-  },
-  computed: {},
-  methods: {
-    openContextMenu() {
-      this.showContextMenu = true;
-      this.contextMenu = {
-        x: null,
-        y: null,
-      };
-    },
-    closeContextMenu() {
-      this.showContextMenu = false;
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAMetricCard.vue

@@ -1,46 +0,0 @@
-<template>
-  <div class="flex flex-col gap-2 items-start justify-center min-w-[10rem]">
-    <span
-      class="inline-flex items-center gap-1 text-sm text-slate-700 dark:text-slate-200 font-medium"
-    >
-      {{ label }}
-      <fluent-icon
-        v-tooltip.right="toolTip"
-        size="14"
-        icon="information"
-        type="outline"
-        class="flex-shrink-0 text-sm font-normal flex sm:font-medium text-slate-500 dark:text-slate-500"
-      />
-    </span>
-    <div
-      v-if="isLoading"
-      class="w-12 h-6 mb-0.5 rounded-md bg-slate-50 animate-pulse"
-    />
-
-    <span v-else class="text-2xl font-medium text-slate-900 dark:text-slate-25">
-      {{ value }}
-    </span>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    label: {
-      type: String,
-      required: true,
-    },
-    value: {
-      type: [String, Number],
-      required: true,
-    },
-    toolTip: {
-      type: String,
-      required: true,
-    },
-    isLoading: {
-      type: Boolean,
-      default: false,
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAMetrics.vue

@@ -1,40 +0,0 @@
-<template>
-  <div
-    class="flex sm:flex-row flex-col w-full gap-4 sm:gap-14 bg-white dark:bg-slate-900 rounded-xl border border-slate-75 dark:border-slate-700/50 px-6 py-4"
-  >
-    <SLAMetricCard
-      :label="$t('SLA_REPORTS.METRICS.HIT_RATE.LABEL')"
-      :value="hitRate"
-      :tool-tip="$t('SLA_REPORTS.METRICS.HIT_RATE.TOOLTIP')"
-      :is-loading="isLoading"
-    />
-
-    <div
-      class="w-full sm:w-px h-full border border-slate-75 dark:border-slate-700/50"
-    />
-    <SLAMetricCard
-      :label="$t('SLA_REPORTS.METRICS.NO_OF_BREACHES.LABEL')"
-      :value="noOfBreaches"
-      :tool-tip="$t('SLA_REPORTS.METRICS.NO_OF_BREACHES.TOOLTIP')"
-      :is-loading="isLoading"
-    />
-  </div>
-</template>
-
-<script setup>
-import SLAMetricCard from './SLAMetricCard.vue';
-defineProps({
-  hitRate: {
-    type: String,
-    required: true,
-  },
-  noOfBreaches: {
-    type: Number,
-    required: true,
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportItem.vue

@@ -1,66 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import UserAvatarWithName from 'dashboard/components/widgets/UserAvatarWithName.vue';
-import CardLabels from 'dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue';
-const props = defineProps({
-  slaName: {
-    type: String,
-    required: true,
-  },
-  conversationId: {
-    type: Number,
-    required: true,
-  },
-  conversation: {
-    type: Object,
-    required: true,
-  },
-});
-
-const assignee = computed(() => props.conversation.assignee);
-</script>
-
-<template>
-  <div
-    class="grid content-center items-center h-16 grid-cols-12 gap-4 px-6 py-0 w-full bg-white border-b border-slate-75 dark:border-slate-800/50 dark:bg-slate-900"
-  >
-    <div
-      class="flex items-center capitalize py-2 px-0 text-sm tracking-[0.5] text-slate-700 dark:text-slate-100 text-left rtl:text-right col-span-2"
-    >
-      {{ slaName }}
-    </div>
-    <div
-      class="flex items-center gap-2 col-span-6 px-0 py-2 text-sm tracking-[0.5] text-slate-700 dark:text-slate-100 rtl:text-right"
-    >
-      <span class="text-slate-700 dark:text-slate-100">
-        {{ `#${conversationId} ` }}
-      </span>
-      <span class="text-slate-600 dark:text-slate-100">with </span>
-      <span class="text-slate-700 dark:text-slate-100 capitalize truncate">{{
-        conversation.contact.name
-      }}</span>
-      <card-labels
-        class="w-[80%]"
-        :conversation-id="conversationId"
-        :conversation-labels="conversation.labels"
-      />
-    </div>
-    <div class="flex items-center gap-2 col-span-2">
-      <user-avatar-with-name v-if="assignee" :user="assignee" />
-      <span
-        v-else
-        class="text-slate-600 dark:text-slate-200 capitalize truncate"
-      >
-        ---
-      </span>
-    </div>
-
-    <div
-      class="flex items-center col-span-2 px-0 py-2 text-sm tracking-[0.5] text-slate-700 dark:text-slate-100 rtl:text-right"
-    >
-      <woot-button color-scheme="secondary" variant="link">
-        View details
-      </woot-button>
-    </div>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLATable.vue

@@ -1,99 +0,0 @@
-<template>
-  <div>
-    <div
-      class="min-w-full border-t border-x rounded-xl border-slate-75 dark:border-slate-800/50"
-    >
-      <!-- Header -->
-      <div
-        class="grid content-center h-12 grid-cols-12 gap-4 px-6 py-0 border-b bg-slate-25 border-slate-75 dark:border-slate-800 rounded-t-xl dark:bg-slate-900"
-      >
-        <div
-          class="flex items-center font-medium text-xs py-2 px-0 tracking-[10%] text-slate-700 dark:text-slate-100 text-left rtl:text-right uppercase col-span-2"
-        >
-          {{ $t('SLA_REPORTS.TABLE.HEADER.POLICY_BREACHED') }}
-        </div>
-        <div
-          class="flex items-center col-span-6 px-0 py-2 text-xs font-medium text-left uppercase text-slate-700 dark:text-slate-100 rtl:text-right"
-        >
-          {{ $t('SLA_REPORTS.TABLE.HEADER.CONVERSATION') }}
-        </div>
-        <div
-          class="flex items-center px-0 text-xs font-medium text-left uppercase col-span-2py-2 text-slate-700 dark:text-slate-100 rtl:text-right"
-        >
-          {{ $t('SLA_REPORTS.TABLE.HEADER.AGENT') }}
-        </div>
-        <div
-          class="col-span-2 px-0 py-2 text-xs font-medium text-left uppercase text-slate-700 dark:text-slate-100 rtl:text-right"
-        />
-      </div>
-      <div
-        v-show="!slaReports.length"
-        class="flex items-center justify-center h-32 bg-white dark:bg-slate-900"
-      >
-        {{ $t('SLA_REPORTS.NO_RECORDS') }}
-      </div>
-      <SLA-report-item
-        v-for="sla in slaReports"
-        :key="sla.id"
-        :sla-name="sla.sla_policy.name"
-        :conversation="sla.conversation"
-        :conversation-id="sla.conversation_id"
-      />
-    </div>
-    <table-footer
-      v-if="shouldShowFooter"
-      :current-page="currentPage"
-      :total-count="totalCount"
-      :page-size="pageSize"
-      class="dark:bg-slate-900 sticky bottom-0 border-none"
-      @page-change="onPageChange"
-    />
-  </div>
-</template>
-
-<script>
-import TableFooter from 'dashboard/components/widgets/TableFooter.vue';
-import SLAReportItem from './SLAReportItem.vue';
-export default {
-  name: 'SLATable',
-  components: {
-    SLAReportItem,
-    TableFooter,
-  },
-  props: {
-    slaReports: {
-      type: Array,
-      default: () => [],
-    },
-    totalCount: {
-      type: Number,
-      default: 0,
-    },
-    currentPage: {
-      type: Number,
-      default: 1,
-    },
-    pageSize: {
-      type: Number,
-      default: 25,
-    },
-  },
-  data() {
-    return {
-      pageNo: 1,
-    };
-  },
-  computed: {
-    shouldShowFooter() {
-      return this.currentPage === 1
-        ? this.totalCount > this.pageSize
-        : this.slaReports.length > 0;
-    },
-  },
-  methods: {
-    onPageChange(page) {
-      this.$emit('page-change', page);
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/UserAvatar.vue

@@ -1,95 +0,0 @@
-<template>
-  <div
-    :style="{ height: size, width: size }"
-    class="rounded-full flex items-center justify-center bg-slate-100 dark:bg-slate-800 text-slate-700 dark:text-slate-100"
-    :title="userName"
-  >
-    <slot>
-      <img
-        v-if="shouldShowImage"
-        :src="src"
-        draggable="false"
-        @load="onImgLoad"
-        @error="onImgError"
-      />
-      <div
-        v-else
-        :style="{ height: size, width: size }"
-        class="flex justify-center items-center rounded-full"
-        aria-hidden="true"
-      >
-        <span :style="{ fontSize: fontSize }" class="font-semibold">{{
-          userInitial
-        }}</span>
-      </div>
-    </slot>
-  </div>
-</template>
-<script>
-import { removeEmoji } from 'shared/helpers/emoji';
-
-export default {
-  props: {
-    src: {
-      type: String,
-      default: '',
-    },
-    size: {
-      type: String,
-      default: '24px',
-    },
-    userName: {
-      type: String,
-      default: '',
-    },
-  },
-  data() {
-    return {
-      hasImageLoaded: false,
-      imgError: false,
-    };
-  },
-  computed: {
-    userNameWithoutEmoji() {
-      return removeEmoji(this.userName);
-    },
-    showStatusIndicator() {
-      if (this.shouldShowStatusAlways) return true;
-      return this.status === 'online' || this.status === 'busy';
-    },
-    avatarSize() {
-      return Number(this.size.replace(/\D+/g, ''));
-    },
-    shouldShowImage() {
-      if (!this.src) {
-        return false;
-      }
-      if (this.hasImageLoaded) {
-        return !this.imgError;
-      }
-      return false;
-    },
-    userInitial() {
-      return this.userName.charAt(0).toUpperCase();
-    },
-    fontSize() {
-      return `${Math.floor(this.avatarSize / 2.5)}px`;
-    },
-  },
-  watch: {
-    src(value, oldValue) {
-      if (value !== oldValue && this.imgError) {
-        this.imgError = false;
-      }
-    },
-  },
-  methods: {
-    onImgError() {
-      this.imgError = true;
-    },
-    onImgLoad() {
-      this.hasImageLoaded = true;
-    },
-  },
-};
-</script>

app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/menuItemWithSubmenu.vue

@@ -1,43 +0,0 @@
-<template>
-  <div
-    class="text-slate-800 dark:text-slate-100 menu-with-submenu min-width-calc w-full p-1 flex items-center h-7 rounded-md relative bg-white dark:bg-slate-700 justify-between hover:bg-woot-75 cursor-pointer dark:hover:bg-slate-800"
-    :class="!subMenuAvailable ? 'opacity-50 cursor-not-allowed' : ''"
-  >
-    <div class="flex items-center">
-      <p class="my-0 mx-2 text-xs">{{ option.label }}</p>
-    </div>
-    <div
-      v-if="subMenuAvailable"
-      class="submenu bg-white dark:bg-slate-700 p-1 shadow-lg rounded-md absolute left-full top-0 hidden min-h-min max-h-[15rem] overflow-y-auto overflow-x-hidden cursor-pointer"
-    >
-      <slot />
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    option: {
-      type: Object,
-      default: () => {},
-    },
-    subMenuAvailable: {
-      type: Boolean,
-      default: true,
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.menu-with-submenu {
-  min-width: calc(6.25rem * 2);
-
-  &:hover {
-    .submenu {
-      @apply block;
-    }
-  }
-}
-</style>

app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap

@@ -2,9 +2,9 @@
 
 exports[`CsatMetrics.vue computes response count correctly 1`] = `
 <div class="flex-col lg:flex-row flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700">
-  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP" class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"></csat-metric-card-stub>
-  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true" class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"></csat-metric-card-stub>
-  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP" class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP"></csat-metric-card-stub>
   <!---->
 </div>
 `;

app/javascript/dashboard/routes/dashboard/settings/reports/constants.js

@@ -194,8 +194,6 @@ export const METRIC_CHART = {
   reply_time: TIME_CHART_CONFIG,
   avg_resolution_time: TIME_CHART_CONFIG,
   resolutions_count: DEFAULT_CHART,
-  bot_resolutions_count: DEFAULT_CHART,
-  bot_handoffs_count: DEFAULT_CHART,
 };
 
 export const OVERVIEW_METRICS = {

app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js

@@ -7,9 +7,7 @@ const LabelReports = () => import('./LabelReports.vue');
 const InboxReports = () => import('./InboxReports.vue');
 const TeamReports = () => import('./TeamReports.vue');
 const CsatResponses = () => import('./CsatResponses.vue');
-const BotReports = () => import('./BotReports.vue');
 const LiveReports = () => import('./LiveReports.vue');
-const SLAReports = () => import('./SLAReports.vue');
 
 export default {
   routes: [
@@ -68,23 +66,6 @@ export default {
         },
       ],
     },
-    {
-      path: frontendURL('accounts/:accountId/reports'),
-      component: SettingsContent,
-      props: {
-        headerTitle: 'BOT_REPORTS.HEADER',
-        icon: 'bot',
-        keepAlive: false,
-      },
-      children: [
-        {
-          path: 'bot',
-          name: 'bot_reports',
-          roles: ['administrator'],
-          component: BotReports,
-        },
-      ],
-    },
     {
       path: frontendURL('accounts/:accountId/reports'),
       component: SettingsContent,
@@ -152,22 +133,5 @@ export default {
         },
       ],
     },
-    {
-      path: frontendURL('accounts/:accountId/reports'),
-      component: SettingsContent,
-      props: {
-        headerTitle: 'SLA_REPORTS.HEADER',
-        icon: 'document-list-clock',
-        keepAlive: false,
-      },
-      children: [
-        {
-          path: 'sla',
-          name: 'sla_reports',
-          roles: ['administrator'],
-          component: SLAReports,
-        },
-      ],
-    },
   ],
 };

app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="h-auto overflow-auto flex flex-col">
+    <woot-modal-header :header-title="pageTitle" />
+    <sla-form
+      :submit-label="$t('SLA.FORM.EDIT')"
+      :selected-response="selectedResponse"
+      @submit="editSLA"
+      @close="onClose"
+    />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import validationMixin from './validationMixin';
+import validations from './validations';
+import SlaForm from './SlaForm.vue';
+
+export default {
+  components: {
+    SlaForm,
+  },
+  mixins: [alertMixin, validationMixin],
+  props: {
+    selectedResponse: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  validations,
+  computed: {
+    ...mapGetters({
+      uiFlags: 'sla/getUIFlags',
+    }),
+    pageTitle() {
+      return `${this.$t('SLA.EDIT.TITLE')} - ${this.selectedResponse.name}`;
+    },
+  },
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    async editSLA(payload) {
+      try {
+        await this.$store.dispatch('sla/update', {
+          id: this.selectedResponse.id,
+          ...payload,
+        });
+        this.showAlert(this.$t('SLA.EDIT.API.SUCCESS_MESSAGE'));
+        this.onClose();
+      } catch (error) {
+        const errorMessage =
+          error.message || this.$t('SLA.EDIT.API.ERROR_MESSAGE');
+        this.showAlert(errorMessage);
+      }
+    },
+  },
+};
+</script>

app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue

@@ -1,78 +1,110 @@
 <template>
-  <settings-layout
-    :is-loading="uiFlags.isFetching"
-    :loading-message="$t('SLA.LOADING')"
-  >
-    <template #header>
-      <SLA-header @click="openAddPopup" />
-    </template>
-    <template #loading>
-      <SLAListItemLoading v-for="ii in 2" :key="ii" class="mb-3" />
-    </template>
-    <template #body>
-      <p
-        v-if="!records.length"
-        class="flex flex-col items-center justify-center h-full"
-      >
-        {{ $t('SLA.LIST.404') }}
-      </p>
-      <div v-if="records.length" class="flex flex-col w-full h-full gap-3">
-        <SLA-list-item
-          v-for="sla in records"
-          :key="sla.title"
-          :sla-name="sla.name"
-          :description="sla.description"
-          :first-response="displayTime(sla.first_response_time_threshold)"
-          :next-response="displayTime(sla.next_response_time_threshold)"
-          :resolution-time="displayTime(sla.resolution_time_threshold)"
-          :has-business-hours="sla.only_during_business_hours"
-          :is-loading="loading[sla.id]"
-          @click="openDeletePopup(sla)"
+  <div class="flex-1 overflow-auto p-4">
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-top"
+      icon="add-circle"
+      @click="openAddPopup"
+    >
+      {{ $t('SLA.HEADER_BTN_TXT') }}
+    </woot-button>
+    <div class="flex flex-row gap-4">
+      <div class="w-full xl:w-3/5">
+        <p
+          v-if="!uiFlags.isFetching && !records.length"
+          class="flex h-full items-center flex-col justify-center"
+        >
+          {{ $t('SLA.LIST.404') }}
+        </p>
+        <woot-loading-state
+          v-if="uiFlags.isFetching"
+          :message="$t('SLA.LOADING')"
         />
+        <table v-if="!uiFlags.isFetching && records.length" class="woot-table">
+          <thead>
+            <th v-for="thHeader in $t('SLA.LIST.TABLE_HEADER')" :key="thHeader">
+              {{ thHeader }}
+            </th>
+          </thead>
+          <tbody>
+            <tr v-for="sla in records" :key="sla.title">
+              <td>
+                <span
+                  class="inline-block overflow-hidden whitespace-nowrap text-ellipsis"
+                >
+                  {{ sla.name }}
+                </span>
+              </td>
+              <td>{{ sla.description }}</td>
+              <td>
+                <span class="flex items-center">
+                  {{ displayTime(sla.first_response_time_threshold) }}
+                </span>
+              </td>
+              <td>
+                <span class="flex items-center">
+                  {{ displayTime(sla.next_response_time_threshold) }}
+                </span>
+              </td>
+              <td>
+                <span class="flex items-center">
+                  {{ displayTime(sla.resolution_time_threshold) }}
+                </span>
+              </td>
+              <td>
+                <span class="flex items-center">
+                  {{ sla.only_during_business_hours }}
+                </span>
+              </td>
+              <td class="button-wrapper">
+                <woot-button
+                  v-tooltip.top="$t('SLA.FORM.EDIT')"
+                  variant="smooth"
+                  size="tiny"
+                  color-scheme="secondary"
+                  class-names="grey-btn"
+                  :is-loading="loading[sla.id]"
+                  icon="edit"
+                  @click="openEditPopup(sla)"
+                />
+              </td>
+            </tr>
+          </tbody>
+        </table>
       </div>
 
-      <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
-        <add-SLA @close="hideAddPopup" />
-      </woot-modal>
+      <div class="w-1/3 hidden xl:block">
+        <span v-dompurify-html="$t('SLA.SIDEBAR_TXT')" />
+      </div>
+    </div>
+    <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
+      <add-SLA @close="hideAddPopup" />
+    </woot-modal>
 
-      <woot-delete-modal
-        :show.sync="showDeleteConfirmationPopup"
-        :on-close="closeDeletePopup"
-        :on-confirm="confirmDeletion"
-        :title="$t('SLA.DELETE.CONFIRM.TITLE')"
-        :message="$t('SLA.DELETE.CONFIRM.MESSAGE')"
-        :message-value="deleteMessage"
-        :confirm-text="deleteConfirmText"
-        :reject-text="deleteRejectText"
-      />
-    </template>
-  </settings-layout>
+    <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
+      <edit-SLA :selected-response="selectedResponse" @close="hideEditPopup" />
+    </woot-modal>
+  </div>
 </template>
 <script>
-import SettingsLayout from '../SettingsLayout.vue';
-import SLAHeader from './components/SLAHeader.vue';
-import SLAListItem from './components/SLAListItem.vue';
-import SLAListItemLoading from './components/SLAListItemLoading.vue';
 import { mapGetters } from 'vuex';
 import { convertSecondsToTimeUnit } from '@chatwoot/utils';
 
 import AddSLA from './AddSLA.vue';
+import EditSLA from './EditSLA.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 
 export default {
   components: {
     AddSLA,
-    SLAHeader,
-    SLAListItem,
-    SLAListItemLoading,
-    SettingsLayout,
+    EditSLA,
   },
   mixins: [alertMixin],
   data() {
     return {
       loading: {},
       showAddPopup: false,
-      showDeleteConfirmationPopup: false,
+      showEditPopup: false,
       selectedResponse: {},
     };
   },
@@ -81,15 +113,6 @@ export default {
       records: 'sla/getSLA',
       uiFlags: 'sla/getUIFlags',
     }),
-    deleteConfirmText() {
-      return this.$t('SLA.DELETE.CONFIRM.YES');
-    },
-    deleteRejectText() {
-      return this.$t('SLA.DELETE.CONFIRM.NO');
-    },
-    deleteMessage() {
-      return ` ${this.selectedResponse.name}`;
-    },
   },
   mounted() {
     this.$store.dispatch('sla/get');
@@ -101,30 +124,12 @@ export default {
     hideAddPopup() {
       this.showAddPopup = false;
     },
-    openDeletePopup(response) {
-      this.showDeleteConfirmationPopup = true;
+    openEditPopup(response) {
+      this.showEditPopup = true;
       this.selectedResponse = response;
     },
-    closeDeletePopup() {
-      this.showDeleteConfirmationPopup = false;
-    },
-    confirmDeletion() {
-      this.loading[this.selectedResponse.id] = true;
-      this.closeDeletePopup();
-      this.deleteSla(this.selectedResponse.id);
-    },
-    deleteSla(id) {
-      this.$store
-        .dispatch('sla/delete', id)
-        .then(() => {
-          this.showAlert(this.$t('SLA.DELETE.API.SUCCESS_MESSAGE'));
-        })
-        .catch(() => {
-          this.showAlert(this.$t('SLA.DELETE.API.ERROR_MESSAGE'));
-        })
-        .finally(() => {
-          this.loading[this.selectedResponse.id] = false;
-        });
+    hideEditPopup() {
+      this.showEditPopup = false;
     },
     displayTime(threshold) {
       const { time, unit } = convertSecondsToTimeUnit(threshold, {

app/javascript/dashboard/routes/dashboard/settings/sla/components/SLABusinessHoursLabel.vue

@@ -1,39 +0,0 @@
-<script setup>
-defineProps({
-  hasBusinessHours: {
-    type: Boolean,
-    required: true,
-  },
-});
-</script>
-<template>
-  <div
-    class="inline-flex items-center min-w-0 gap-1 px-1.5 sm:px-2 py-1 border border-solid rounded-lg border-slate-75 dark:border-slate-700/50"
-  >
-    <fluent-icon
-      size="14"
-      :icon="hasBusinessHours ? 'alarm-on' : 'alarm-off'"
-      type="outline"
-      class="flex-shrink-0"
-      :class="
-        hasBusinessHours
-          ? 'text-slate-600 dark:text-slate-400'
-          : 'text-slate-300 dark:text-slate-700'
-      "
-    />
-    <span
-      class="hidden text-xs tracking-[0.2%] font-normal truncate sm:block"
-      :class="
-        hasBusinessHours
-          ? 'text-slate-600 dark:text-slate-400'
-          : 'text-slate-300 dark:text-slate-700'
-      "
-    >
-      {{
-        hasBusinessHours
-          ? $t('SLA.LIST.BUSINESS_HOURS_ON')
-          : $t('SLA.LIST.BUSINESS_HOURS_OFF')
-      }}
-    </span>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAHeader.vue

@@ -1,23 +0,0 @@
-<script setup>
-import BaseSettingsHeader from '../../components/BaseSettingsHeader.vue';
-</script>
-<template>
-  <base-settings-header
-    :title="$t('SLA.HEADER')"
-    :description="$t('SLA.DESCRIPTION')"
-    :link-text="$t('SLA.LEARN_MORE')"
-    href="/"
-    icon-name="document-list-clock"
-  >
-    <template #actions>
-      <woot-button
-        color-scheme="primary"
-        icon="plus-sign"
-        class="rounded-xl"
-        @click="$emit('click')"
-      >
-        {{ $t('SLA.ADD_ACTION') }}
-      </woot-button>
-    </template>
-  </base-settings-header>
-</template>

app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue

@@ -1,68 +0,0 @@
-<script setup>
-import BaseSettingsListItem from '../../components/BaseSettingsListItem.vue';
-import SLAResponseTime from './SLAResponseTime.vue';
-import SLABusinessHoursLabel from './SLABusinessHoursLabel.vue';
-
-defineProps({
-  slaName: {
-    type: String,
-    required: true,
-  },
-  description: {
-    type: String,
-    required: true,
-  },
-  firstResponse: {
-    type: String,
-    required: true,
-  },
-  nextResponse: {
-    type: String,
-    required: true,
-  },
-  resolutionTime: {
-    type: String,
-    required: true,
-  },
-  hasBusinessHours: {
-    type: Boolean,
-    required: true,
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>
-<template>
-  <base-settings-list-item
-    class="sm:divide-x sm:divide-slate-75 sm:dark:divide-slate-700/50"
-    :title="slaName"
-    :description="description"
-  >
-    <template #label>
-      <SLA-business-hours-label :has-business-hours="hasBusinessHours" />
-    </template>
-    <template #rightSection>
-      <div
-        class="flex items-center divide-x rtl:divide-x-reverse sm:rtl:!border-l-0 sm:rtl:!border-r sm:rtl:border-solid sm:rtl:border-slate-75 sm:rtl:dark:border-slate-700/50 gap-1.5 w-fit sm:w-full sm:gap-0 sm:justify-between divide-slate-75 dark:divide-slate-700/50"
-      >
-        <SLA-response-time response-type="FRT" :response-time="firstResponse" />
-        <SLA-response-time response-type="NRT" :response-time="nextResponse" />
-        <SLA-response-time response-type="RT" :response-time="resolutionTime" />
-      </div>
-    </template>
-    <template #actions>
-      <woot-button
-        v-tooltip.top="$t('SLA.FORM.DELETE')"
-        variant="smooth"
-        color-scheme="alert"
-        size="tiny"
-        icon="delete"
-        class-names="grey-btn"
-        :is-loading="isLoading"
-        @click="$emit('click')"
-      />
-    </template>
-  </base-settings-list-item>
-</template>

app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItemLoading.vue

@@ -1,30 +0,0 @@
-<script setup>
-import BaseSettingsListItem from '../../components/BaseSettingsListItem.vue';
-</script>
-<template>
-  <base-settings-list-item class="opacity-50">
-    <template #title>
-      <div class="w-24 h-[26px] rounded-md bg-slate-50 animate-pulse" />
-    </template>
-    <template #description>
-      <div class="w-64 h-4 mb-0.5 rounded-md bg-slate-50 animate-pulse" />
-      <div class="w-48 h-4 rounded-md bg-slate-50 animate-pulse" />
-    </template>
-    <template #label>
-      <div class="w-32 h-[26px] bg-slate-50 animate-pulse rounded-md" />
-    </template>
-    <template #rightSection>
-      <div
-        class="flex items-center sm:rtl:!border-l-0 sm:rtl:!border-r sm:rtl:border-solid sm:rtl:border-slate-75 sm:rtl:dark:border-slate-700/50 gap-1.5 w-fit sm:w-full sm:gap-0 sm:justify-between"
-      >
-        <div
-          v-for="ii in 3"
-          :key="ii"
-          class="flex justify-end w-1/3 h-full px-4"
-        >
-          <div class="w-32 h-full rounded-md bg-slate-50 animate-pulse" />
-        </div>
-      </div>
-    </template>
-  </base-settings-list-item>
-</template>

app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAResponseTime.vue

@@ -1,36 +0,0 @@
-<script setup>
-defineProps({
-  responseType: {
-    type: String,
-    default: '',
-  },
-  responseTime: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-<template>
-  <div
-    class="flex flex-row items-start w-full h-full gap-1 sm:items-end sm:px-6 sm:py-2 sm:gap-2 sm:flex-col"
-  >
-    <span
-      class="inline-flex items-center gap-1 tracking-[-0.6%] text-sm ltr:pl-1.5 sm:ltr:pl-0 rtl:pr-1.5 sm:rtl:pr-0 text-slate-600 dark:text-slate-300"
-    >
-      <fluent-icon
-        v-tooltip.left="$t(`SLA.LIST.RESPONSE_TYPES.${responseType}`)"
-        size="14"
-        icon="information"
-        type="outline"
-        class="flex-shrink-0 hidden text-sm font-normal sm:flex sm:font-medium text-slate-500 dark:text-slate-500"
-      />
-      {{ $t(`SLA.LIST.RESPONSE_TYPES.SHORT_HAND.${responseType}`) }}
-      <span class="flex sm:hidden">:</span>
-    </span>
-    <span
-      class="text-sm sm:text-2xl font-medium tracking-[-1.5%] text-slate-900 dark:text-slate-25"
-    >
-      {{ responseTime }}
-    </span>
-  </div>
-</template>

app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js

@@ -1,14 +1,18 @@
 import { frontendURL } from '../../../../helper/URLHelper';
 
-const SettingsWrapper = () => import('../SettingsWrapper.vue');
+const SettingsContent = () => import('../Wrapper.vue');
 const Index = () => import('./Index.vue');
 
 export default {
   routes: [
     {
       path: frontendURL('accounts/:accountId/settings/sla'),
-      component: SettingsWrapper,
-      props: {},
+      component: SettingsContent,
+      props: {
+        headerTitle: 'SLA.HEADER',
+        icon: 'document-list-clock',
+        showNewButton: true,
+      },
       children: [
         {
           path: '',

app/javascript/dashboard/store/index.js

@@ -44,7 +44,6 @@ import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
 import draftMessages from './modules/draftMessages';
-import SLAReports from './modules/SLAReports';
 
 import LogRocket from 'logrocket';
 import createPlugin from 'logrocket-vuex';
@@ -112,7 +111,6 @@ export default new Vuex.Store({
     webhooks,
     draftMessages,
     sla,
-    slaReports: SLAReports,
   },
   plugins,
 });

app/javascript/dashboard/store/modules/SLAReports.js

@@ -1,99 +0,0 @@
-import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
-import types from '../mutation-types';
-import SLAReportsAPI from '../../api/slaReports';
-
-export const state = {
-  records: [],
-  metrics: {
-    numberOfSLABreaches: 0,
-    hitRate: '0%',
-  },
-  uiFlags: {
-    isFetching: false,
-    isFetchingMetrics: false,
-  },
-  meta: {
-    count: 0,
-    currentPage: 1,
-  },
-};
-
-export const getters = {
-  getAll(_state) {
-    return _state.records;
-  },
-  getMeta(_state) {
-    return _state.meta;
-  },
-  getMetrics(_state) {
-    return _state.metrics;
-  },
-  getUIFlags(_state) {
-    return _state.uiFlags;
-  },
-};
-
-export const actions = {
-  get: async function getResponses({ commit }, params) {
-    commit(types.SET_SLA_REPORTS_UI_FLAG, { isFetching: true });
-    try {
-      const response = await SLAReportsAPI.get(params);
-      const { payload, meta } = response.data;
-
-      commit(types.SET_SLA_REPORTS, payload);
-      commit(types.SET_SLA_REPORTS_META, meta);
-    } catch (error) {
-      // Ignore error
-    } finally {
-      commit(types.SET_SLA_REPORTS_UI_FLAG, { isFetching: false });
-    }
-  },
-  getMetrics: async function getMetrics({ commit }, params) {
-    commit(types.SET_SLA_REPORTS_UI_FLAG, { isFetchingMetrics: true });
-    try {
-      const response = await SLAReportsAPI.getMetrics(params);
-      commit(types.SET_SLA_REPORTS_METRICS, response.data);
-    } catch (error) {
-      // Ignore error
-    } finally {
-      commit(types.SET_SLA_REPORTS_UI_FLAG, { isFetchingMetrics: false });
-    }
-  },
-};
-
-export const mutations = {
-  [types.SET_SLA_REPORTS_UI_FLAG](_state, data) {
-    _state.uiFlags = {
-      ..._state.uiFlags,
-      ...data,
-    };
-  },
-
-  [types.SET_SLA_REPORTS]: MutationHelpers.set,
-  [types.SET_SLA_REPORTS_METRICS](
-    _state,
-    { number_of_sla_breaches: numberOfSLABreaches, hit_rate: hitRate }
-  ) {
-    _state.metrics = {
-      numberOfSLABreaches,
-      hitRate,
-    };
-  },
-  [types.SET_SLA_REPORTS_META](
-    _state,
-    { total_applied_slas: totalAppliedSLAs, current_page: currentPage }
-  ) {
-    _state.meta = {
-      count: totalAppliedSLAs,
-      currentPage,
-    };
-  },
-};
-
-export default {
-  namespaced: true,
-  state,
-  getters,
-  actions,
-  mutations,
-};

app/javascript/dashboard/store/modules/reports.js

@@ -19,8 +19,6 @@ const state = {
       avg_first_response_time: false,
       avg_resolution_time: false,
       resolutions_count: false,
-      bot_resolutions_count: false,
-      bot_handoffs_count: false,
       reply_time: false,
     },
     data: {
@@ -30,8 +28,6 @@ const state = {
       avg_first_response_time: [],
       avg_resolution_time: [],
       resolutions_count: [],
-      bot_resolutions_count: [],
-      bot_handoffs_count: [],
       reply_time: [],
     },
   },
@@ -43,13 +39,6 @@ const state = {
     outgoing_messages_count: 0,
     reply_time: 0,
     resolutions_count: 0,
-    bot_resolutions_count: 0,
-    bot_handoffs_count: 0,
-    previous: {},
-  },
-  botSummary: {
-    bot_resolutions_count: 0,
-    bot_handoffs_count: 0,
     previous: {},
   },
   overview: {
@@ -71,9 +60,6 @@ const getters = {
   getAccountSummary(_state) {
     return _state.accountSummary;
   },
-  getBotSummary(_state) {
-    return _state.botSummary;
-  },
   getAccountConversationMetric(_state) {
     return _state.overview.accountConversationMetric;
   },
@@ -139,20 +125,6 @@ export const actions = {
         commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
       });
   },
-  fetchBotSummary({ commit }, reportObj) {
-    Report.getBotSummary({
-      from: reportObj.from,
-      to: reportObj.to,
-      groupBy: reportObj.groupBy,
-      businessHours: reportObj.businessHours,
-    })
-      .then(botSummary => {
-        commit(types.default.SET_BOT_SUMMARY, botSummary.data);
-      })
-      .catch(() => {
-        commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
-      });
-  },
   fetchAccountConversationMetric({ commit }, reportObj) {
     commit(types.default.TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING, true);
     Report.getConversationMetric(reportObj.type)
@@ -271,9 +243,6 @@ const mutations = {
   [types.default.SET_ACCOUNT_SUMMARY](_state, summaryData) {
     _state.accountSummary = summaryData;
   },
-  [types.default.SET_BOT_SUMMARY](_state, summaryData) {
-    _state.botSummary = summaryData;
-  },
   [types.default.SET_ACCOUNT_CONVERSATION_METRIC](_state, metricData) {
     _state.overview.accountConversationMetric = metricData;
   },

app/javascript/dashboard/store/modules/sla.js

@@ -50,16 +50,16 @@ export const actions = {
     }
   },
 
-  delete: async function deleteSla({ commit }, id) {
-    commit(types.SET_SLA_UI_FLAG, { isDeleting: true });
+  update: async function update({ commit }, { id, ...updateObj }) {
+    commit(types.SET_SLA_UI_FLAG, { isUpdating: true });
     try {
-      await SlaAPI.delete(id);
-      AnalyticsHelper.track(SLA_EVENTS.DELETED);
-      commit(types.DELETE_SLA, id);
+      const response = await SlaAPI.update(id, updateObj);
+      AnalyticsHelper.track(SLA_EVENTS.UPDATE);
+      commit(types.EDIT_SLA, response.data.payload);
     } catch (error) {
       throwErrorMessage(error);
     } finally {
-      commit(types.SET_SLA_UI_FLAG, { isDeleting: false });
+      commit(types.SET_SLA_UI_FLAG, { isUpdating: false });
     }
   },
 };
@@ -74,7 +74,7 @@ export const mutations = {
 
   [types.SET_SLA]: MutationHelpers.set,
   [types.ADD_SLA]: MutationHelpers.create,
-  [types.DELETE_SLA]: MutationHelpers.destroy,
+  [types.EDIT_SLA]: MutationHelpers.update,
 };
 
 export default {

app/javascript/dashboard/store/mutation-types.js

@@ -166,7 +166,6 @@ export default {
   SET_HEATMAP_DATA: 'SET_HEATMAP_DATA',
   TOGGLE_HEATMAP_LOADING: 'TOGGLE_HEATMAP_LOADING',
   SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
-  SET_BOT_SUMMARY: 'SET_BOT_SUMMARY',
   TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
   SET_ACCOUNT_CONVERSATION_METRIC: 'SET_ACCOUNT_CONVERSATION_METRIC',
   TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING:
@@ -309,10 +308,4 @@ export default {
   ADD_SLA: 'ADD_SLA',
   EDIT_SLA: 'EDIT_SLA',
   DELETE_SLA: 'DELETE_SLA',
-
-  // SLA Reports
-  SET_SLA_REPORTS_UI_FLAG: 'SET_SLA_REPORTS_UI_FLAG',
-  SET_SLA_REPORTS: 'SET_SLA_REPORTS',
-  SET_SLA_REPORTS_METRICS: 'SET_SLA_REPORTS_METRICS',
-  SET_SLA_REPORTS_META: 'SET_SLA_REPORTS_META',
 };

app/javascript/packs/application.js

@@ -30,7 +30,6 @@ import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
 import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 import AnalyticsPlugin from '../dashboard/helper/AnalyticsHelper/plugin';
-import resizeDirective from '../dashboard/helper/directives/resize.js';
 
 Vue.config.env = process.env;
 
@@ -79,7 +78,6 @@ Vue.component('woot-switch', WootSwitch);
 Vue.component('woot-wizard', WootWizard);
 Vue.component('fluent-icon', FluentIcon);
 
-Vue.directive('resize', resizeDirective);
 const i18nConfig = new VueI18n({
   locale: 'en',
   messages: i18n,

app/javascript/shared/components/EmojiOrIcon.vue

@@ -4,7 +4,6 @@
     v-else-if="showIcon"
     :size="iconSize"
     :icon="icon"
-    class="flex-shrink-0"
     :class="className"
   />
 </template>

app/javascript/shared/components/FluentIcon/dashboard-icons.json

@@ -2,8 +2,6 @@
   "add-circle-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 1.5a8.5 8.5 0 1 0 0 17 8.5 8.5 0 0 0 0-17ZM12 7a.75.75 0 0 1 .75.75v3.5h3.5a.75.75 0 0 1 0 1.5h-3.5v3.5a.75.75 0 0 1-1.5 0v-3.5h-3.5a.75.75 0 0 1 0-1.5h3.5v-3.5A.75.75 0 0 1 12 7Z",
   "add-outline": "M11.75 3a.75.75 0 0 1 .743.648l.007.102.001 7.25h7.253a.75.75 0 0 1 .102 1.493l-.102.007h-7.253l.002 7.25a.75.75 0 0 1-1.493.101l-.007-.102-.002-7.249H3.752a.75.75 0 0 1-.102-1.493L3.752 11h7.25L11 3.75a.75.75 0 0 1 .75-.75Z",
   "add-solid": "M11.883 3.007 12 3a1 1 0 0 1 .993.883L13 4v7h7a1 1 0 0 1 .993.883L21 12a1 1 0 0 1-.883.993L20 13h-7v7a1 1 0 0 1-.883.993L12 21a1 1 0 0 1-.993-.883L11 20v-7H4a1 1 0 0 1-.993-.883L3 12a1 1 0 0 1 .883-.993L4 11h7V4a1 1 0 0 1 .883-.993L12 3l-.117.007Z",
-  "alarm-on-outline": "m10.95 13.7l-1.425-1.425q-.3-.3-.7-.3t-.7.3q-.3.3-.3.713t.3.712l2.125 2.15q.3.3.7.3t.7-.3l4.25-4.25q.3-.3.3-.712t-.3-.713q-.3-.3-.713-.3t-.712.3L10.95 13.7ZM12 22q-1.875 0-3.512-.713t-2.85-1.924q-1.213-1.213-1.925-2.85T3 13q0-1.875.713-3.513t1.924-2.85q1.213-1.212 2.85-1.924T12 4q1.875 0 3.513.713t2.85 1.925q1.212 1.212 1.925 2.85T21 13q0 1.875-.713 3.513t-1.924 2.85q-1.213 1.212-2.85 1.925T12 22Zm0-9ZM2.05 7.3q-.275-.275-.275-.7t.275-.7L4.9 3.05q.275-.275.7-.275t.7.275q.275.275.275.7t-.275.7L3.45 7.3q-.275.275-.7.275t-.7-.275Zm19.9 0q-.275.275-.7.275t-.7-.275L17.7 4.45q-.275-.275-.275-.7t.275-.7q.275-.275.7-.275t.7.275l2.85 2.85q.275.275.275.7t-.275.7ZM12 20q2.925 0 4.963-2.038T19 13q0-2.925-2.038-4.963T12 6Q9.075 6 7.037 8.038T5 13q0 2.925 2.038 4.963T12 20Z",
-  "alarm-off-outline": "m19.95 17.25l-1.5-1.5q.275-.675.413-1.313T19 13.1q0-2.9-2.05-5T12 6q-.7 0-1.35.113t-1.3.387L7.85 5q.95-.5 1.988-.75T12 4q1.85 0 3.488.7t2.862 1.938q1.225 1.237 1.938 2.887T21 13.1q0 1.125-.275 2.163t-.775 1.987ZM17.7 4.45q-.275-.275-.275-.7t.275-.7q.275-.275.7-.275t.7.275l2.85 2.85q.275.275.275.7t-.275.7q-.275.275-.7.275t-.7-.275L17.7 4.45ZM12 22q-1.85 0-3.488-.7T5.65 19.4q-1.225-1.2-1.938-2.825T3 13.1q0-1.55.463-2.912T4.8 7.7l-.85-.85l-.5.5q-.275.275-.7.275t-.7-.275q-.275-.275-.275-.7t.275-.7l.5-.5L1.4 4.3q-.275-.275-.275-.7t.275-.7q.275-.275.7-.275t.7.275l18.4 18.4q.275.275.275.7t-.275.7q-.275.275-.7.275t-.7-.275l-2.45-2.45q-1.125.825-2.487 1.288T12 22Zm0-1.975q1.05 0 2.05-.325t1.85-.9L6.2 9.15q-.575.875-.887 1.888T5 13.1q0 2.9 2.05 4.913T12 20.025Zm-.95-6.05Zm2.85-2.85Z",
   "alert-outline": "M12 1.996a7.49 7.49 0 0 1 7.496 7.25l.004.25v4.097l1.38 3.156a1.25 1.25 0 0 1-1.145 1.75L15 18.502a3 3 0 0 1-5.995.177L9 18.499H4.275a1.251 1.251 0 0 1-1.147-1.747L4.5 13.594V9.496c0-4.155 3.352-7.5 7.5-7.5ZM13.5 18.5l-3 .002a1.5 1.5 0 0 0 2.993.145l.006-.147ZM12 3.496c-3.32 0-6 2.674-6 6v4.41L4.656 17h14.697L18 13.907V9.509l-.004-.225A5.988 5.988 0 0 0 12 3.496Z",
   "archive-outline": "M19.25 3c.966 0 1.75.784 1.75 1.75v2c0 .698-.408 1.3-1 1.581v9.919A3.75 3.75 0 0 1 16.25 22h-8.5A3.75 3.75 0 0 1 4 18.25V8.332A1.75 1.75 0 0 1 3 6.75v-2C3 3.784 3.784 3 4.75 3h14.5Zm-.75 5.5h-13v9.75a2.25 2.25 0 0 0 2.25 2.25h8.5a2.25 2.25 0 0 0 2.25-2.25V8.5Zm-8.5 3h4a.75.75 0 0 1 .102 1.493L14 13h-4a.75.75 0 0 1-.102-1.493L10 11.5h4-4Zm9.25-7H4.75a.25.25 0 0 0-.25.25v2c0 .138.112.25.25.25h14.5a.25.25 0 0 0 .25-.25v-2a.25.25 0 0 0-.25-.25Z",
   "arrow-chevron-left-outline": "M15 17.898c0 1.074-1.265 1.648-2.073.941l-6.31-5.522a1.75 1.75 0 0 1 0-2.634l6.31-5.522c.808-.707 2.073-.133 2.073.941v11.796Z",
@@ -11,7 +9,6 @@
   "arrow-clockwise-outline": "M12 4.75a7.25 7.25 0 1 0 7.201 6.406c-.068-.588.358-1.156.95-1.156.515 0 .968.358 1.03.87a9.25 9.25 0 1 1-3.432-6.116V4.25a1 1 0 1 1 2.001 0v2.698l.034.052h-.034v.25a1 1 0 0 1-1 1h-3a1 1 0 1 1 0-2h.666A7.219 7.219 0 0 0 12 4.75Z",
   "arrow-download-outline": "M18.25 20.5a.75.75 0 1 1 0 1.5l-13 .004a.75.75 0 1 1 0-1.5l13-.004ZM11.648 2.012l.102-.007a.75.75 0 0 1 .743.648l.007.102-.001 13.685 3.722-3.72a.75.75 0 0 1 .976-.073l.085.073a.75.75 0 0 1 .072.976l-.073.084-4.997 4.997a.75.75 0 0 1-.976.073l-.085-.073-5.003-4.996a.75.75 0 0 1 .976-1.134l.084.072 3.719 3.714L11 2.755a.75.75 0 0 1 .648-.743l.102-.007-.102.007Z",
   "arrow-expand-outline": "M7.669 14.923a1 1 0 0 1 1.414 1.414l-2.668 2.667H8a1 1 0 0 1 .993.884l.007.116a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-4a1 1 0 1 1 2 0v1.587l2.669-2.668Zm8.336 6.081a1 1 0 1 1 0-2h1.583l-2.665-2.667a1 1 0 0 1-.083-1.32l.083-.094a1 1 0 0 1 1.414 0l2.668 2.67v-1.589a1 1 0 0 1 .883-.993l.117-.007a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1h-4ZM8 3a1 1 0 0 1 0 2H6.417l2.665 2.668a1 1 0 0 1 .083 1.32l-.083.094a1 1 0 0 1-1.414 0L5 6.412V8a1 1 0 0 1-.883.993L4 9a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h4Zm12.005 0a1 1 0 0 1 1 1v4a1 1 0 1 1-2 0V6.412l-2.668 2.67a1 1 0 0 1-1.32.083l-.094-.083a1 1 0 0 1 0-1.414L17.589 5h-1.584a1 1 0 0 1-.993-.883L15.005 4a1 1 0 0 1 1-1h4Z",
-  "arrow-outwards-outline": "m16 8.4l-8.875 8.9q-.3.3-.713.3t-.712-.3q-.3-.3-.3-.713t.3-.712L14.6 7H7q-.425 0-.713-.288T6 6q0-.425.288-.713T7 5h10q.425 0 .713.288T18 6v10q0 .425-.288.713T17 17q-.425 0-.713-.288T16 16V8.4Z",
   "arrow-redo-outline": "M19.25 2a.75.75 0 0 0-.743.648l-.007.102v5.69l-4.574-4.56a6.41 6.41 0 0 0-8.878-.179l-.186.18a6.41 6.41 0 0 0 0 9.063l8.845 8.84a.75.75 0 0 0 1.06-1.062l-8.845-8.838a4.91 4.91 0 0 1 6.766-7.112l.178.17L17.438 9.5H11.75a.75.75 0 0 0-.743.648L11 10.25c0 .38.282.694.648.743l.102.007h7.5a.75.75 0 0 0 .743-.648L20 10.25v-7.5a.75.75 0 0 0-.75-.75Z",
   "arrow-right-import-outline": "M21.25 4.5a.75.75 0 0 1 .743.648L22 5.25v13.004a.75.75 0 0 1-1.493.102l-.007-.102V5.25a.75.75 0 0 1 .75-.75Zm-8.603 1.804l.072-.084a.75.75 0 0 1 .977-.073l.084.073l4.997 4.997a.75.75 0 0 1 .073.976l-.073.085l-4.997 5.003a.75.75 0 0 1-1.133-.976l.072-.084l3.711-3.717H2.75a.75.75 0 0 1-.743-.647L2 11.755a.75.75 0 0 1 .648-.743l.102-.007l13.693-.001l-3.724-3.724a.75.75 0 0 1-.072-.976l.072-.084l-.072.084Z",
   "arrow-reply-outline": "M9.277 16.221a.75.75 0 0 1-1.061 1.06l-4.997-5.003a.75.75 0 0 1 0-1.06L8.217 6.22a.75.75 0 0 1 1.061 1.06L5.557 11h7.842c1.595 0 2.81.242 3.889.764l.246.126a6.203 6.203 0 0 1 2.576 2.576c.61 1.14.89 2.418.89 4.135a.75.75 0 0 1-1.5 0c0-1.484-.228-2.52-.713-3.428a4.702 4.702 0 0 0-1.96-1.96c-.838-.448-1.786-.676-3.094-.709L13.4 12.5H5.562l3.715 3.721Z",
@@ -121,7 +118,6 @@
   "headphones-sound-wave-outline": "M3.5 12a8.5 8.5 0 0 1 17 0v2h-2.25a.75.75 0 0 0-.75.75v6.5c0 .414.336.75.75.75H19a3 3 0 0 0 3-3v-7c0-5.523-4.477-10-10-10S2 6.477 2 12v7a3 3 0 0 0 3 3h.75a.75.75 0 0 0 .75-.75v-6.5a.75.75 0 0 0-.75-.75H3.5v-2Zm17 3.5V19a1.5 1.5 0 0 1-1.5 1.5v-5h1.5ZM3.5 19v-3.5H5v5A1.5 1.5 0 0 1 3.5 19Zm9.25-7.25a.75.75 0 0 0-1.5 0v10.5a.75.75 0 0 0 1.5 0v-10.5Zm-4 2.25a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0v-4.5a.75.75 0 0 1 .75-.75Zm7.25.75a.75.75 0 0 0-1.5 0v4.5a.75.75 0 0 0 1.5 0v-4.5Z",
   "image-outline": "M17.75 3A3.25 3.25 0 0 1 21 6.25v11.5A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h11.5Zm.58 16.401-5.805-5.686a.75.75 0 0 0-.966-.071l-.084.07-5.807 5.687c.182.064.378.099.582.099h11.5c.203 0 .399-.035.58-.099l-5.805-5.686L18.33 19.4ZM17.75 4.5H6.25A1.75 1.75 0 0 0 4.5 6.25v11.5c0 .208.036.408.103.594l5.823-5.701a2.25 2.25 0 0 1 3.02-.116l.128.116 5.822 5.702c.067-.186.104-.386.104-.595V6.25a1.75 1.75 0 0 0-1.75-1.75Zm-2.498 2a2.252 2.252 0 1 1 0 4.504 2.252 2.252 0 0 1 0-4.504Zm0 1.5a.752.752 0 1 0 0 1.504.752.752 0 0 0 0-1.504Z",
   "info-outline": "M12 1.999c5.524 0 10.002 4.478 10.002 10.002 0 5.523-4.478 10.001-10.002 10.001-5.524 0-10.002-4.478-10.002-10.001C1.998 6.477 6.476 1.999 12 1.999Zm0 1.5a8.502 8.502 0 1 0 0 17.003A8.502 8.502 0 0 0 12 3.5Zm-.004 7a.75.75 0 0 1 .744.648l.007.102.003 5.502a.75.75 0 0 1-1.493.102l-.007-.101-.003-5.502a.75.75 0 0 1 .75-.75ZM12 7.003a.999.999 0 1 1 0 1.997.999.999 0 0 1 0-1.997Z",
-  "information-outline": "M12 17q.425 0 .713-.288T13 16v-4q0-.425-.288-.713T12 11q-.425 0-.713.288T11 12v4q0 .425.288.713T12 17Zm0-8q.425 0 .713-.288T13 8q0-.425-.288-.713T12 7q-.425 0-.713.288T11 8q0 .425.288.713T12 9Zm0 13q-2.075 0-3.9-.788t-3.175-2.137q-1.35-1.35-2.137-3.175T2 12q0-2.075.788-3.9t2.137-3.175q1.35-1.35 3.175-2.137T12 2q2.075 0 3.9.788t3.175 2.137q1.35 1.35 2.138 3.175T22 12q0 2.075-.788 3.9t-2.137 3.175q-1.35 1.35-3.175 2.138T12 22Zm0-2q3.35 0 5.675-2.325T20 12q0-3.35-2.325-5.675T12 4Q8.65 4 6.325 6.325T4 12q0 3.35 2.325 5.675T12 20Zm0-8Z",
   "key-outline": "M15 6a1 1 0 1 1-2 0a1 1 0 0 1 2 0Zm-2.5-4C9.424 2 7 4.424 7 7.5c0 .397.04.796.122 1.175c.058.27-.008.504-.142.638l-4.54 4.54A1.5 1.5 0 0 0 2 14.915V16.5A1.5 1.5 0 0 0 3.5 18h2A1.5 1.5 0 0 0 7 16.5V16h1a1 1 0 0 0 1-1v-1h1a1 1 0 0 0 1-1v-.18c.493.134 1.007.18 1.5.18c3.076 0 5.5-2.424 5.5-5.5S15.576 2 12.5 2ZM8 7.5C8 4.976 9.976 3 12.5 3S17 4.976 17 7.5S15.024 12 12.5 12c-.66 0-1.273-.095-1.776-.347A.5.5 0 0 0 10 12.1v.9H9a1 1 0 0 0-1 1v1H7a1 1 0 0 0-1 1v.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-1.586a.5.5 0 0 1 .146-.353l4.541-4.541c.432-.432.522-1.044.412-1.556A4.619 4.619 0 0 1 8 7.5Z",
   "keyboard-outline": "M19.745 5a2.25 2.25 0 0 1 2.25 2.25v9.505a2.25 2.25 0 0 1-2.25 2.25H4.25A2.25 2.25 0 0 1 2 16.755V7.25A2.25 2.25 0 0 1 4.25 5h15.495Zm0 1.5H4.25a.75.75 0 0 0-.75.75v9.505c0 .414.336.75.75.75h15.495a.75.75 0 0 0 .75-.75V7.25a.75.75 0 0 0-.75-.75Zm-12.995 8h10.5a.75.75 0 0 1 .102 1.493L17.25 16H6.75a.75.75 0 0 1-.102-1.493l.102-.007h10.5-10.5ZM16.5 11a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm-5.995 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm-3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm6 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2ZM6 8a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm2.995 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z",
   "library-outline": "M4 3h1c1.054 0 1.918.816 1.995 1.85L7 5v14a2.001 2.001 0 0 1-1.85 1.994L5 21H4a2.001 2.001 0 0 1-1.995-1.85L2 19V5c0-1.054.816-1.918 1.85-1.995L4 3h1-1Zm6 0h1c1.054 0 1.918.816 1.995 1.85L13 5v14a2.001 2.001 0 0 1-1.85 1.994L11 21h-1a2.001 2.001 0 0 1-1.995-1.85L8 19V5c0-1.054.816-1.918 1.85-1.995L10 3h1-1Zm6.974 2c.84 0 1.608.531 1.89 1.346l.047.157 3.015 11.745a2 2 0 0 1-1.296 2.392l-.144.043-.969.248a2.002 2.002 0 0 1-2.387-1.284l-.047-.155-3.016-11.745a2 2 0 0 1 1.298-2.392l.143-.043.968-.248c.166-.043.334-.064.498-.064ZM5 4.5H4a.501.501 0 0 0-.492.41L3.5 5v14c0 .244.177.45.41.492L4 19.5h1c.245 0 .45-.178.492-.41L5.5 19V5a.501.501 0 0 0-.41-.492L5 4.5Zm6 0h-1a.501.501 0 0 0-.492.41L9.5 5v14c0 .244.177.45.41.492l.09.008h1c.245 0 .45-.178.492-.41L11.5 19V5a.501.501 0 0 0-.41-.492L11 4.5Zm5.975 2-.063.004-.063.013-.968.247a.498.498 0 0 0-.376.51l.015.1 3.016 11.745a.5.5 0 0 0 .483.375l.063-.003.062-.012.97-.25a.5.5 0 0 0 .374-.519l-.015-.088-3.015-11.747a.501.501 0 0 0-.483-.375Z",
@@ -170,7 +166,6 @@
   "person-outline": "M17.754 14a2.249 2.249 0 0 1 2.25 2.249v.575c0 .894-.32 1.76-.902 2.438-1.57 1.834-3.957 2.739-7.102 2.739-3.146 0-5.532-.905-7.098-2.74a3.75 3.75 0 0 1-.898-2.435v-.577a2.249 2.249 0 0 1 2.249-2.25h11.501Zm0 1.5H6.253a.749.749 0 0 0-.75.749v.577c0 .536.192 1.054.54 1.461 1.253 1.468 3.219 2.214 5.957 2.214s4.706-.746 5.962-2.214a2.25 2.25 0 0 0 .541-1.463v-.575a.749.749 0 0 0-.749-.75ZM12 2.004a5 5 0 1 1 0 10 5 5 0 0 1 0-10Zm0 1.5a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7Z",
   "person-filled": "M17.754 14a2.249 2.249 0 0 1 2.249 2.25v.918a2.75 2.75 0 0 1-.513 1.598c-1.545 2.164-4.07 3.235-7.49 3.235c-3.421 0-5.944-1.072-7.486-3.236a2.75 2.75 0 0 1-.51-1.596v-.92A2.249 2.249 0 0 1 6.251 14h11.502ZM12 2.005a5 5 0 1 1 0 10a5 5 0 0 1 0-10Z",
   "play-circle-outline": "M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12Zm8.856-3.845A1.25 1.25 0 0 0 9 9.248v5.504a1.25 1.25 0 0 0 1.856 1.093l5.757-3.189a.75.75 0 0 0 0-1.312l-5.757-3.189Z",
-  "plus-sign-outline": "M12 19q-.425 0-.713-.288T11 18v-5H6q-.425 0-.713-.288T5 12q0-.425.288-.713T6 11h5V6q0-.425.288-.713T12 5q.425 0 .713.288T13 6v5h5q.425 0 .713.288T19 12q0 .425-.288.713T18 13h-5v5q0 .425-.288.713T12 19Z",
   "power-outline": "M8.204 4.82a.75.75 0 0 1 .634 1.36A7.51 7.51 0 0 0 4.5 12.991c0 4.148 3.358 7.51 7.499 7.51s7.499-3.362 7.499-7.51a7.51 7.51 0 0 0-4.323-6.804.75.75 0 1 1 .637-1.358 9.01 9.01 0 0 1 5.186 8.162c0 4.976-4.029 9.01-9 9.01C7.029 22 3 17.966 3 12.99a9.01 9.01 0 0 1 5.204-8.17ZM12 2.496a.75.75 0 0 1 .743.648l.007.102v7.5a.75.75 0 0 1-1.493.102l-.007-.102v-7.5a.75.75 0 0 1 .75-.75Z",
   "quote-outline": "M7.5 6a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.555-1.24 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.64-1.737 2.66-3.674 3.077-5.859A2.5 2.5 0 1 1 7.5 6Zm9 0a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.56-1.238 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.643-1.738 2.662-3.672 3.078-5.859A2.5 2.5 0 1 1 16.5 6Zm-9 1.5a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Zm9 0a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Z",
   "repeat-outline": "m14.712 2.289l-.087-.078a1 1 0 0 0-1.327.078l-.078.087a.999.999 0 0 0 .078 1.326l1.299 1.297H8.999l-.24.004A6.997 6.997 0 0 0 2 11.993a6.94 6.94 0 0 0 1.189 3.899a.999.999 0 0 0 1.626-1.163l-.135-.218A4.997 4.997 0 0 1 9 6.998h5.595l-1.297 1.297l-.078.087a.999.999 0 0 0 1.492 1.326l3.006-3.003l.077-.087a.999.999 0 0 0-.078-1.326l-3.005-3.003Zm6.075 5.771A.999.999 0 0 0 19 8.677c0 .209.064.402.172.561a4.997 4.997 0 0 1-4.17 7.75H9.414l1.294-1.29l.083-.096a1 1 0 0 0-.006-1.23l-.077-.088l-.095-.084a1.001 1.001 0 0 0-1.232.006l-.088.078l-3.005 3.003l-.083.095a1 1 0 0 0 .006 1.231l.077.087l3.005 3.003l.095.084a1 1 0 0 0 1.397-1.41l-.077-.087l-1.304-1.303H15l.24-.003a6.997 6.997 0 0 0 5.546-10.927v.003Z",

app/javascript/widget/helpers/availabilityHelper.js

@@ -0,0 +1,150 @@
+import { utcToZonedTime } from 'date-fns-tz';
+// Array defining days of the week
+const daysOfWeek = [
+  'Sunday',
+  'Monday',
+  'Tuesday',
+  'Wednesday',
+  'Thursday',
+  'Friday',
+  'Saturday',
+];
+
+/**
+ * Find the next available time for the specified day
+ * @param {Object[]} workingHours - Array of objects representing working hours for each day
+ * @param {number} dayOfWeek - Index of the day of the week (0 for Sunday, 1 for Monday, etc.)
+ * @param {number} currentHour - Current hour of the day (24-hour format)
+ * @param {number} currentMinutes - Current minutes of the hour
+ * @returns {Object|null} - Object containing next available time information or null if not available
+ */
+const findNextAvailableTimeForDay = (
+  workingHours,
+  dayOfWeek,
+  currentHour,
+  currentMinutes
+) => {
+  const availableHours = workingHours.find(
+    hours =>
+      hours.day_of_week === dayOfWeek &&
+      !hours.closed_all_day &&
+      (currentHour < hours.close_hour ||
+        (currentHour === hours.close_hour &&
+          currentMinutes < hours.close_minutes))
+  );
+
+  if (availableHours) {
+    return {
+      hour: availableHours.open_hour,
+      minutes: availableHours.open_minutes,
+    };
+  }
+
+  return null;
+};
+
+/**
+ * Find the next available time across days
+ * @param {Object[]} workingHours - Array of objects representing working hours for each day
+ * @param {number} currentDayOfWeek - Index of the current day of the week (0 for Sunday, 1 for Monday, etc.)
+ * @returns {Object|null} - Object containing next available time information or null if not available
+ */
+const findNextAvailableTimeAcrossDays = (workingHours, currentDayOfWeek) => {
+  const nextAvailableDays = workingHours.filter(hours => !hours.closed_all_day);
+  for (let i = 0; i < 7; i += 1) {
+    const nextDayIndex = (currentDayOfWeek + 1 + i) % 7;
+    const nextDay = nextAvailableDays.find(
+      hours => hours.day_of_week === nextDayIndex
+    );
+    if (nextDay) {
+      return {
+        hour: nextDay.open_hour,
+        minutes: nextDay.open_minutes,
+        day: nextDayIndex,
+      };
+    }
+  }
+
+  return null;
+};
+
+/**
+ * Function to find the next available time
+ * @param {Array} workingHours - Array of working hours for each day
+ * @param {number} currentDayOfWeek - Index of the current day of the week (0 for Sunday, 1 for Monday, etc.)
+ * @param {number} currentHour - Current hour of the day (24-hour format)
+ * @param {number} currentMinutes - Current minutes of the hour
+ * @returns {Object|null} - Object containing next available time information or null if not available
+ */
+const findNextAvailableTime = (
+  workingHours,
+  currentDayOfWeek,
+  currentHour,
+  currentMinutes
+) => {
+  const nextAvailableTimeToday = findNextAvailableTimeForDay(
+    workingHours,
+    currentDayOfWeek,
+    currentHour,
+    currentMinutes
+  );
+
+  if (nextAvailableTimeToday) {
+    return { ...nextAvailableTimeToday, day: 'today' };
+  }
+  return findNextAvailableTimeAcrossDays(workingHours, currentDayOfWeek);
+};
+
+/**
+ * Function to get the next availability message
+ * @param {Array} workingHours - Array of working hours for each day
+ * @param {Date} currentTime - Current time object
+ * @returns {string} - Next availability message
+ */
+export const getNextAvailabilityMessage = (
+  workingHours,
+  currentTime,
+  timezone
+) => {
+  const utcZonedTime = utcToZonedTime(currentTime, timezone);
+  const currentDayOfWeek = utcZonedTime.getDay();
+  const currentHour = utcZonedTime.getHours();
+  const currentMinutes = utcZonedTime.getMinutes();
+  const nextAvailableTime = findNextAvailableTime(
+    workingHours,
+    currentDayOfWeek,
+    currentHour,
+    currentMinutes
+  );
+
+  // Calculate the time difference
+  if (nextAvailableTime !== null) {
+    const differenceInMinutes =
+      nextAvailableTime.hour * 60 +
+      nextAvailableTime.minutes -
+      (currentHour * 60 + currentMinutes);
+    const differenceInHours = Math.floor(differenceInMinutes / 60);
+
+    // Check if the next available time is tomorrow
+    if (nextAvailableTime.day === (currentDayOfWeek + 1) % 7) {
+      return `We will be back online tomorrow`;
+    }
+
+    // Check if the next available time is on a specific day
+    if (nextAvailableTime.day !== 'today') {
+      return `We will be back online on ${daysOfWeek[nextAvailableTime.day]}`;
+    }
+
+    // Generate appropriate message based on time difference
+    if (differenceInMinutes <= 1) {
+      return 'We will be back online in less than a minute.';
+    }
+    if (differenceInMinutes < 60) {
+      return `We will be back online in ${differenceInMinutes} minutes.`;
+    }
+    if (differenceInMinutes < 1440) {
+      return `We will be back online in ${differenceInHours} hours`;
+    }
+  }
+  return 'No available time found in working hours.';
+};

app/javascript/widget/helpers/specs/availabilityHelper.spec.js

@@ -0,0 +1,169 @@
+import { getNextAvailabilityMessage } from '../availabilityHelper';
+
+const workingHoursCommon = [
+  { id: 8, inbox_id: 2, account_id: 1, day_of_week: 0, closed_all_day: true },
+  {
+    id: 9,
+    inbox_id: 2,
+    account_id: 1,
+    day_of_week: 1,
+    closed_all_day: false,
+    open_hour: 9,
+    open_minutes: 0,
+    close_hour: 17,
+    close_minutes: 0,
+  },
+  {
+    id: 10,
+    inbox_id: 2,
+    account_id: 1,
+    day_of_week: 2,
+    closed_all_day: true,
+    open_hour: 15,
+    open_minutes: 0,
+    close_hour: 23,
+    close_minutes: 30,
+  },
+  { id: 11, inbox_id: 2, account_id: 1, day_of_week: 3, closed_all_day: true },
+  {
+    id: 12,
+    inbox_id: 2,
+    account_id: 1,
+    day_of_week: 4,
+    closed_all_day: false,
+    open_hour: 15,
+    open_minutes: 0,
+    close_hour: 20,
+    close_minutes: 0,
+  },
+  {
+    id: 13,
+    inbox_id: 2,
+    account_id: 1,
+    day_of_week: 5,
+    closed_all_day: false,
+    open_hour: 9,
+    open_minutes: 0,
+    close_hour: 17,
+    close_minutes: 0,
+  },
+  {
+    id: 14,
+    inbox_id: 2,
+    account_id: 1,
+    day_of_week: 6,
+    closed_all_day: false,
+    open_hour: 9,
+    open_minutes: 0,
+    close_hour: 7,
+    close_minutes: 0,
+  },
+];
+
+describe('getNextAvailabilityMessage without timezone', () => {
+  let workingHours;
+
+  beforeEach(() => {
+    workingHours = JSON.parse(JSON.stringify(workingHoursCommon));
+  });
+
+  test('less than a minute', () =>
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-14T14:59:59'))
+    ).toBe('We will be back online in less than a minute.'));
+  test('less than 10 minutes', () =>
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-14T14:50:00'))
+    ).toBe('We will be back online in 10 minutes.'));
+  test('minutes message for less than an hour', () =>
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-14T14:45:00'))
+    ).toBe('We will be back online in 15 minutes.'));
+  test('greater than 2 hours', () =>
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-14T12:30:00'))
+    ).toBe('We will be back online in 2 hours'));
+  test('next day', () => {
+    workingHours[4].closed_all_day = true;
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-14T00:00:00'))
+    ).toBe('We will be back online tomorrow');
+  });
+  test('specific day', () => {
+    workingHours[4].closed_all_day = true;
+    workingHours[5].closed_all_day = true;
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-14T00:00:00'))
+    ).toBe('We will be back online on Saturday');
+  });
+  test('next week', () => {
+    workingHours[5].closed_all_day = true;
+    workingHours[6].closed_all_day = true;
+    workingHours[0].closed_all_day = true;
+    workingHours[1].closed_all_day = true;
+    workingHours[2].closed_all_day = true;
+    workingHours[3].closed_all_day = true;
+    workingHours[4].closed_all_day = false;
+    expect(
+      getNextAvailabilityMessage(workingHours, new Date('2024-03-21T21:00:00'))
+    ).toBe('We will be back online on Thursday');
+  });
+});
+
+describe('getNextAvailabilityMessage with timezone', () => {
+  let workingHours;
+
+  beforeEach(() => {
+    workingHours = JSON.parse(JSON.stringify(workingHoursCommon));
+    jest.useFakeTimers('modern');
+    jest.setSystemTime(new Date('2024-03-14T19:50:00'));
+  });
+
+  afterEach(() => jest.useRealTimers());
+
+  test('less than a minute', () =>
+    expect(
+      getNextAvailabilityMessage(
+        workingHours,
+        new Date('2024-03-14T19:50:00'),
+        'America/New_York'
+      )
+    ).toBe('We will be back online in less than a minute.'));
+  test('less than 10 minutes', () =>
+    expect(
+      getNextAvailabilityMessage(
+        workingHours,
+        new Date('2024-03-14T19:50:00'),
+        'America/New_York'
+      )
+    ).toBe('We will be back online in less than a minute.'));
+  test('greater than 2 hours', () =>
+    expect(
+      getNextAvailabilityMessage(
+        workingHours,
+        new Date('2024-03-14T14:59:59'),
+        'America/New_York'
+      )
+    ).toBe('We will be back online in 4 hours'));
+  test('next day', () => {
+    workingHours[4].closed_all_day = true;
+    expect(
+      getNextAvailabilityMessage(
+        workingHours,
+        new Date('2024-03-15T00:00:00'),
+        'America/New_York'
+      )
+    ).toBe('We will be back online tomorrow');
+  });
+  test('specific day', () => {
+    workingHours[4].closed_all_day = true;
+    workingHours[5].closed_all_day = true;
+    expect(
+      getNextAvailabilityMessage(
+        workingHours,
+        new Date('2024-03-17T00:00:00'),
+        'America/New_York'
+      )
+    ).toBe('We will be back online on Monday');
+  });
+});

app/javascript/widget/mixins/availability.js

@@ -1,6 +1,6 @@
 import { utcToZonedTime } from 'date-fns-tz';
 import { isTimeAfter } from 'shared/helpers/DateHelper';
-
+import { getNextAvailabilityMessage } from 'widget/helpers/availabilityHelper';
 export default {
   computed: {
     channelConfig() {
@@ -23,10 +23,13 @@ export default {
     },
     replyWaitMessage() {
       const { workingHoursEnabled } = this.channelConfig;
+      const nextAvailabilityMessage = getNextAvailabilityMessage(
+        this.channelConfig.workingHours,
+        new Date(),
+        this.channelConfig.timezone
+      );
       if (workingHoursEnabled) {
-        return this.isOnline
-          ? this.replyTimeStatus
-          : `${this.$t('REPLY_TIME.BACK_IN')} ${this.timeLeftToBackInOnline}`;
+        return this.isOnline ? this.replyTimeStatus : nextAvailabilityMessage;
       }
       return this.isOnline
         ? this.replyTimeStatus

app/jobs/inboxes/fetch_imap_emails_job.rb

@@ -12,10 +12,10 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
       process_email_for_channel(channel)
     end
   rescue *ExceptionList::IMAP_EXCEPTIONS => e
-    Rails.logger.error "Authorization error for email channel - #{channel.inbox.id} : #{e.message}"
+    Rails.logger.error e
     channel.authorization_error!
   rescue EOFError, OpenSSL::SSL::SSLError, Net::IMAP::NoResponseError, Net::IMAP::BadResponseError, Net::IMAP::InvalidResponseError => e
-    Rails.logger.error "Error for email channel - #{channel.inbox.id} : #{e.message}"
+    Rails.logger.error e
   rescue LockAcquisitionError
     Rails.logger.error "Lock failed for #{channel.inbox.id}"
   rescue StandardError => e

app/listeners/notification_listener.rb

@@ -33,11 +33,6 @@ class NotificationListener < BaseListener
     return if event.data[:notifiable_assignee_change].blank?
     return if conversation.pending?
 
-    if assignee.nil?
-      Rail.logger.error "[NotificationListener] Assignee is nil, skipping notification creation for #{conversation.id}"
-      return
-    end
-
     NotificationBuilder.new(
       notification_type: 'conversation_assignment',
       user: assignee,

app/mailers/administrator_notifications/channel_notifications_mailer.rb

@@ -69,18 +69,6 @@ class AdministratorNotifications::ChannelNotificationsMailer < ApplicationMailer
     send_mail_with_liquid(to: email_to, subject: subject) and return
   end
 
-  def automation_rule_disabled(rule)
-    return unless smtp_config_set_or_development?
-
-    @action_url ||= "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{Current.account.id}/settings/automation/list"
-
-    subject = 'Automation rule disabled due to validation errors.'.freeze
-    @meta = {}
-    @meta['rule_name'] = rule.name
-
-    send_mail_with_liquid(to: admin_emails, subject: subject) and return
-  end
-
   private
 
   def admin_emails

app/models/automation_rule.rb

@@ -19,7 +19,6 @@
 #
 class AutomationRule < ApplicationRecord
   include Rails.application.routes.url_helpers
-  include Reauthorizable
 
   belongs_to :account
   has_many_attached :files
@@ -29,8 +28,6 @@ class AutomationRule < ApplicationRecord
   validate :query_operator_presence
   validates :account_id, presence: true
 
-  after_update_commit :reauthorized!, if: -> { saved_change_to_conditions? }
-
   scope :active, -> { where(active: true) }
 
   def conditions_attributes

app/models/concerns/reauthorizable.rb

@@ -50,9 +50,6 @@ module Reauthorizable
       mailer.whatsapp_disconnect(inbox).deliver_later
     when 'Channel::Email'
       mailer.email_disconnect(inbox).deliver_later
-    when 'AutomationRule'
-      update!(active: false)
-      mailer.automation_rule_disabled(self).deliver_later
     end
   end
 

app/models/contact.rb

@@ -61,7 +61,7 @@ class Contact < ApplicationRecord
   after_create_commit :dispatch_create_event, :ip_lookup
   after_update_commit :dispatch_update_event
   after_destroy_commit :dispatch_destroy_event
-  before_save :sync_contact_attributes
+  before_save :update_contact_location_and_country_code
 
   enum contact_type: { visitor: 0, lead: 1, customer: 2 }
 
@@ -169,7 +169,7 @@ class Contact < ApplicationRecord
   end
 
   def self.from_email(email)
-    find_by(email: email&.downcase)
+    find_by(email: email.downcase)
   end
 
   private
@@ -207,8 +207,11 @@ class Contact < ApplicationRecord
     self.custom_attributes = {} if custom_attributes.blank?
   end
 
-  def sync_contact_attributes
-    ::Contacts::SyncAttributes.new(self).perform
+  def update_contact_location_and_country_code
+    # TODO: Ensure that location and country_code are updated from additional_attributes.
+    # We will remove this once all contacts are updated and both the location and country_code fields are standardized throughout the app.
+    self.location = additional_attributes['city']
+    self.country_code = additional_attributes['country']
   end
 
   def dispatch_create_event

app/models/conversation.rb

@@ -6,7 +6,7 @@
 #  additional_attributes  :jsonb
 #  agent_last_seen_at     :datetime
 #  assignee_last_seen_at  :datetime
-#  cached_label_list      :text
+#  cached_label_list      :string
 #  contact_last_seen_at   :datetime
 #  custom_attributes      :jsonb
 #  first_reply_created_at :datetime

app/models/user.rb

@@ -157,7 +157,7 @@ class User < ApplicationRecord
   end
 
   def self.from_email(email)
-    find_by(email: email&.downcase)
+    find_by(email: email.downcase)
   end
 
   private

app/services/automation_rules/condition_validation_service.rb

@@ -5,8 +5,8 @@ class AutomationRules::ConditionValidationService
     @rule = rule
     @account = rule.account
 
-    file = File.read('./lib/filters/filter_keys.yml')
-    @filters = YAML.safe_load(file)
+    file = File.read('./lib/filters/filter_keys.json')
+    @filters = JSON.parse(file)
 
     @conversation_filters = @filters['conversations']
     @contact_filters = @filters['contacts']

app/services/automation_rules/conditions_filter_service.rb

@@ -11,9 +11,8 @@ class AutomationRules::ConditionsFilterService < FilterService
     @account = conversation.account
 
     # setup filters from json file
-    file = File.read('./lib/filters/filter_keys.yml')
-    @filters = YAML.safe_load(file)
-
+    file = File.read('./lib/filters/filter_keys.json')
+    @filters = JSON.parse(file)
     @conversation_filters = @filters['conversations']
     @contact_filters = @filters['contacts']
     @message_filters = @filters['messages']
@@ -45,8 +44,8 @@ class AutomationRules::ConditionsFilterService < FilterService
 
   def rule_valid?
     is_valid = AutomationRules::ConditionValidationService.new(@rule).perform
+
     Rails.logger.info "Automation rule condition validation failed for rule id: #{@rule.id}" unless is_valid
-    @rule.authorization_error! unless is_valid
 
     is_valid
   end

app/services/contacts/filter_service.rb

@@ -2,7 +2,7 @@ class Contacts::FilterService < FilterService
   ATTRIBUTE_MODEL = 'contact_attribute'.freeze
 
   def perform
-    @contacts = query_builder(@filters['contacts'])
+    @contacts = contact_query_builder
 
     {
       contacts: @contacts,
@@ -10,6 +10,38 @@ class Contacts::FilterService < FilterService
     }
   end
 
+  def contact_query_builder
+    contact_filters = @filters['contacts']
+
+    @params[:payload].each_with_index do |query_hash, current_index|
+      current_filter = contact_filters[query_hash['attribute_key']]
+      @query_string += contact_query_string(current_filter, query_hash, current_index)
+    end
+
+    base_relation.where(@query_string, @filter_values.with_indifferent_access)
+  end
+
+  def contact_query_string(current_filter, query_hash, current_index)
+    attribute_key = query_hash[:attribute_key]
+    query_operator = query_hash[:query_operator]
+    filter_operator_value = filter_operation(query_hash, current_index)
+
+    return custom_attribute_query(query_hash, 'contact_attribute', current_index) if current_filter.nil?
+
+    case current_filter['attribute_type']
+    when 'additional_attributes'
+      "  LOWER(contacts.additional_attributes ->> '#{attribute_key}') #{filter_operator_value} #{query_operator} "
+    when 'date_attributes'
+      " (contacts.#{attribute_key})::#{current_filter['data_type']} #{filter_operator_value}#{current_filter['data_type']} #{query_operator} "
+    when 'standard'
+      if attribute_key == 'labels'
+        " #{tag_filter_query('Contact', 'contacts', query_hash, current_index)} "
+      else
+        " LOWER(contacts.#{attribute_key}) #{filter_operator_value} #{query_operator} "
+      end
+    end
+  end
+
   def filter_values(query_hash)
     current_val = query_hash['values'][0]
     if query_hash['attribute_key'] == 'phone_number'
@@ -25,13 +57,6 @@ class Contacts::FilterService < FilterService
     Current.account.contacts
   end
 
-  def filter_config
-    {
-      entity: 'Contact',
-      table_name: 'contacts'
-    }
-  end
-
   private
 
   def equals_to_filter_string(filter_operator, current_index)

app/services/contacts/sync_attributes.rb

@@ -1,37 +0,0 @@
-class Contacts::SyncAttributes
-  attr_reader :contact
-
-  def initialize(contact)
-    @contact = contact
-  end
-
-  def perform
-    update_contact_location_and_country_code
-    set_contact_type
-  end
-
-  private
-
-  def update_contact_location_and_country_code
-    # Ensure that location and country_code are updated from additional_attributes.
-    # TODO: Remove this once all contacts are updated and both the location and country_code fields are standardized throughout the app.
-    @contact.location = @contact.additional_attributes['city']
-    @contact.country_code = @contact.additional_attributes['country']
-  end
-
-  def set_contact_type
-    #  If the contact is already a lead or customer then do not change the contact type
-    return unless @contact.contact_type == 'visitor'
-    # If the contact has an email or phone number or social details( facebook_user_id, instagram_user_id, etc) then it is a lead
-    # If contact is from external channel like facebook, instagram, whatsapp, etc then it is a lead
-    return unless @contact.email.present? || @contact.phone_number.present? || social_details_present?
-
-    @contact.contact_type = 'lead'
-  end
-
-  def social_details_present?
-    @contact.additional_attributes.keys.any? do |key|
-      key.start_with?('social_') && @contact.additional_attributes[key].present?
-    end
-  end
-end

app/services/conversations/filter_service.rb

@@ -7,7 +7,7 @@ class Conversations::FilterService < FilterService
   end
 
   def perform
-    @conversations = query_builder(@filters['conversations'])
+    @conversations = conversation_query_builder
     mine_count, unassigned_count, all_count, = set_count_for_all_conversations
     assigned_count = all_count - unassigned_count
 
@@ -22,6 +22,37 @@ class Conversations::FilterService < FilterService
     }
   end
 
+  def conversation_query_builder
+    conversation_filters = @filters['conversations']
+    @params[:payload].each_with_index do |query_hash, current_index|
+      current_filter = conversation_filters[query_hash['attribute_key']]
+      @query_string += conversation_query_string(current_filter, query_hash, current_index)
+    end
+
+    base_relation.where(@query_string, @filter_values.with_indifferent_access)
+  end
+
+  def conversation_query_string(current_filter, query_hash, current_index)
+    attribute_key = query_hash[:attribute_key]
+    query_operator = query_hash[:query_operator]
+    filter_operator_value = filter_operation(query_hash, current_index)
+
+    return custom_attribute_query(query_hash, 'conversation_attribute', current_index) if current_filter.nil?
+
+    case current_filter['attribute_type']
+    when 'additional_attributes'
+      " conversations.additional_attributes ->> '#{attribute_key}' #{filter_operator_value} #{query_operator} "
+    when 'date_attributes'
+      " (conversations.#{attribute_key})::#{current_filter['data_type']} #{filter_operator_value}#{current_filter['data_type']} #{query_operator} "
+    when 'standard'
+      if attribute_key == 'labels'
+        " #{tag_filter_query('Conversation', 'conversations', query_hash, current_index)} "
+      else
+        " conversations.#{attribute_key} #{filter_operator_value} #{query_operator} "
+      end
+    end
+  end
+
   def base_relation
     @account.conversations.includes(
       :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :messages, :contact_inbox
@@ -32,13 +63,6 @@ class Conversations::FilterService < FilterService
     @params[:page] || 1
   end
 
-  def filter_config
-    {
-      entity: 'Conversation',
-      table_name: 'conversations'
-    }
-  end
-
   def conversations
     @conversations.sort_on_last_activity_at.page(current_page)
   end

app/services/filter_service.rb

@@ -1,9 +1,6 @@
 require 'json'
 
 class FilterService
-  include FilterHelper
-  include CustomExceptions::CustomFilter
-
   ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
   ATTRIBUTE_TYPES = {
     date: 'date', text: 'text', number: 'numeric', link: 'text', list: 'text', checkbox: 'boolean'
@@ -12,8 +9,8 @@ class FilterService
   def initialize(params, user)
     @params = params
     @user = user
-    file = File.read('./lib/filters/filter_keys.yml')
-    @filters = YAML.safe_load(file)
+    file = File.read('./lib/filters/filter_keys.json')
+    @filters = JSON.parse(file)
     @query_string = ''
     @filter_values = {}
   end
@@ -109,9 +106,7 @@ class FilterService
     ]
   end
 
-  def tag_filter_query(query_hash, current_index)
-    model_name = filter_config[:entity]
-    table_name = filter_config[:table_name]
+  def tag_filter_query(model_name, table_name, query_hash, current_index)
     query_operator = query_hash[:query_operator]
     @filter_values["value_#{current_index}"] = filter_values(query_hash)
 
@@ -135,8 +130,10 @@ class FilterService
   def custom_attribute_query(query_hash, custom_attribute_type, current_index)
     @attribute_key = query_hash[:attribute_key]
     @custom_attribute_type = custom_attribute_type
+
     attribute_data_type
-    return '' if @custom_attribute.blank?
+
+    return ' ' if @custom_attribute.blank?
 
     build_custom_attr_query(query_hash, current_index)
   end
@@ -158,9 +155,9 @@ class FilterService
     table_name = attribute_model == 'conversation_attribute' ? 'conversations' : 'contacts'
 
     query = if attribute_data_type == 'text'
-              "LOWER(#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
+              "  LOWER(#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
             else
-              "(#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
+              "  (#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
             end
 
     query + not_in_custom_attr_query(table_name, query_hash, attribute_data_type)
@@ -197,11 +194,4 @@ class FilterService
 
     "NOT LIKE :value_#{current_index}"
   end
-
-  def query_builder(model_filters)
-    @params[:payload].each_with_index do |query_hash, current_index|
-      @query_string += " #{build_condition_query(model_filters, query_hash, current_index).strip}"
-    end
-    base_relation.where(@query_string, @filter_values.with_indifferent_access)
-  end
 end

app/services/telegram/incoming_message_service.rb

@@ -130,7 +130,6 @@ class Telegram::IncomingMessageService
     @message.attachments.new(
       account_id: @message.account_id,
       file_type: :location,
-      fallback_title: location_fallback_title,
       coordinates_lat: location['latitude'],
       coordinates_long: location['longitude']
     )
@@ -140,16 +139,6 @@ class Telegram::IncomingMessageService
     @file ||= visual_media_params || params[:message][:voice].presence || params[:message][:audio].presence || params[:message][:document].presence
   end
 
-  def location_fallback_title
-    return '' if venue.blank?
-
-    venue[:title] || ''
-  end
-
-  def venue
-    @venue ||= params.dig(:message, :venue).presence
-  end
-
   def location
     @location ||= params.dig(:message, :location).presence
   end

app/views/api/v1/accounts/conversations/update.json.jbuilder

@@ -1 +0,0 @@
-json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: @conversation

app/views/api/v1/conversations/partials/_conversation.json.jbuilder

@@ -47,4 +47,3 @@ json.last_non_activity_message conversation.messages.where(account_id: conversat
 json.last_activity_at conversation.last_activity_at.to_i
 json.priority conversation.priority
 json.waiting_since conversation.waiting_since.to_i.to_i
-json.sla_policy_id conversation.sla_policy_id

app/views/layouts/vueapp.html.erb

@@ -44,7 +44,6 @@
         vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>),
         <% end %>
         enabledLanguages: <%= available_locales_with_name.to_json.html_safe %>,
-        helpUrls: <%= feature_help_urls.to_json.html_safe %>,
         selectedLocale: '<%= I18n.locale %>'
       }
       window.globalConfig = <%= raw @global_config.to_json %>

app/views/mailers/administrator_notifications/channel_notifications_mailer/automation_rule_disabled.liquid

@@ -1,8 +0,0 @@
-<p>Hello there,</p>
-
-<p>The automation rule <b>{{meta['rule_name']}}</b> has been disabled becuase it has invalid conditions.</p>
-<p>This typically happens when you delete any custom attributes which are still being used in automation rules.</p>
-
-<p>
-Click <a href="{{action_url}}">here</a> to update the conditions.
-</p>

app/views/public/api/v1/portals/_header.html.erb

@@ -83,7 +83,7 @@
               class="w-24 overflow-hidden text-sm font-medium leading-tight bg-white appearance-none cursor-pointer dark:bg-slate-900 text-ellipsis whitespace-nowrap focus:outline-none focus:shadow-outline locale-switcher"
             >
               <% @portal.config["allowed_locales"].each do |locale| %>
-                <option <%= locale == @locale ? 'selected': '' %> value="<%= locale %>"><%= "#{language_name(locale)} (#{locale})" %></option>
+                <option <%= locale == params[:locale] ? 'selected': '' %> value="<%= locale %>"><%= "#{language_name(locale)} (#{locale})" %></option>
               <% end %>
             </select>
             <%= render partial: 'icons/chevron-down' %>

config/app.yml

@@ -1,5 +1,5 @@
 shared: &shared
-  version: '3.7.0'
+  version: '3.6.0'
 
 development:
   <<: *shared

config/features.yml

@@ -3,45 +3,37 @@
   enabled: true
 - name: channel_email
   enabled: true
-  help_url: https://chwt.app/hc/email
 - name: channel_facebook
   enabled: true
-  help_url: https://chwt.app/hc/fb
 - name: channel_twitter
   enabled: true
 - name: ip_lookup
   enabled: false
 - name: disable_branding
   enabled: false
-  premium: true
+  premium:  true
 - name: email_continuity_on_api_channel
   enabled: false
 - name: help_center
   enabled: true
-  help_url: https://chwt.app/hc/help-center
 - name: agent_bots
   enabled: false
-  help_url: https://chwt.app/hc/agent-bots
 - name: macros
   enabled: true
 - name: agent_management
   enabled: true
 - name: team_management
   enabled: true
-  help_url: https://chwt.app/hc/teams
 - name: inbox_management
   enabled: true
 - name: labels
   enabled: true
-  help_url: https://chwt.app/hc/labels
 - name: custom_attributes
   enabled: true
-  help_url: https://chwt.app/hc/custom-attributes
 - name: automations
   enabled: true
 - name: canned_responses
   enabled: true
-  help_url: https://chwt.app/hc/canned
 - name: integrations
   enabled: true
 - name: voice_recorder
@@ -52,10 +44,8 @@
   enabled: true
 - name: campaigns
   enabled: true
-  help_url: https://chwt.app/hc/campaigns
 - name: reports
   enabled: true
-  help_url: https://chwt.app/hc/reports
 - name: crm
   enabled: true
 - name: auto_resolve_conversations
@@ -72,7 +62,6 @@
   premium: true
 - name: message_reply_to
   enabled: false
-  help_url: https://chwt.app/hc/reply-to
 - name: insert_article_in_reply
   enabled: false
 - name: inbox_view