Merge pull request #326 from fazer-ai/chore/merge-upstream-4.15.1

chore(merge): sync upstream chatwoot v4.15.1

Author: gabrieljablonski

VERSION_CW

@@ -1 +1 @@
-4.15.0
+4.15.1

app/finders/conversation_finder.rb

@@ -149,7 +149,7 @@ def filter_by_conversation_type
       conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
       @conversations = @conversations.where(id: conversation_ids)
     when 'participating'
-      @conversations = @conversations.where(id: current_user.participating_conversations.where(account_id: current_account.id).select(:id))
+      @conversations = current_user.participating_conversations.where(account_id: current_account.id)
     when 'unattended'
       @conversations = @conversations.unattended
     end

app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue

@@ -22,10 +22,6 @@ const props = defineProps({
     type: [Number, String],
     default: 0,
   },
-  badgeTooltip: {
-    type: String,
-    default: '',
-  },
 });
 
 const reauthorizationRequired = computed(() => {
@@ -38,7 +34,7 @@ const reauthorizationRequired = computed(() => {
     <ChannelIcon :inbox="inbox" class="size-4" />
   </span>
   <div class="flex-1 truncate min-w-0">{{ label }}</div>
-  <SidebarUnreadBadge :count="badgeCount" :tooltip="badgeTooltip" />
+  <SidebarUnreadBadge :count="badgeCount" />
   <div
     v-if="reauthorizationRequired"
     v-tooltip.top-end="$t('SIDEBAR.REAUTHORIZE')"

app/javascript/dashboard/components-next/sidebar/Sidebar.vue

@@ -200,18 +200,6 @@ const getLabelUnreadCount = useMapGetter(
 const getTeamUnreadCount = useMapGetter(
   'conversationUnreadCounts/getTeamUnreadCount'
 );
-const mentionsUnreadCount = useMapGetter(
-  'conversationUnreadCounts/getMentionsUnreadCount'
-);
-const participatingUnreadCount = useMapGetter(
-  'conversationUnreadCounts/getParticipatingUnreadCount'
-);
-const unattendedUnreadCount = useMapGetter(
-  'conversationUnreadCounts/getUnattendedUnreadCount'
-);
-const getFolderUnreadCount = useMapGetter(
-  'conversationUnreadCounts/getFolderUnreadCount'
-);
 const teams = useMapGetter('teams/getMyTeams');
 const contactCustomViews = useMapGetter('customViews/getContactCustomViews');
 const conversationCustomViews = useMapGetter(
@@ -294,19 +282,6 @@ const sortedLabels = computed(() =>
   })
 );
 
-const unreadBadgeTooltips = computed(() => ({
-  ALL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.ALL'),
-  INBOX: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.INBOX'),
-  LABEL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.LABEL'),
-  TEAM: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.TEAM'),
-  FOLDER: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.FOLDER'),
-  MENTIONS: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.MENTIONS'),
-  PARTICIPATING: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.PARTICIPATING'),
-  UNATTENDED: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.UNATTENDED'),
-}));
-
-const unreadBadgeTooltip = type => unreadBadgeTooltips.value[type];
-
 const closeMobileSidebar = () => {
   if (!props.isMobileSidebarOpen) return;
   emit('closeMobileSidebar');
@@ -362,33 +337,26 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.ALL_CONVERSATIONS'),
           icon: 'i-lucide-inbox',
           badgeCount: allUnreadCount.value,
-          badgeTooltip: unreadBadgeTooltip('ALL'),
           activeOn: ['inbox_conversation'],
           to: accountScopedRoute('home'),
         },
         {
           name: 'Mentions',
           label: t('SIDEBAR.MENTIONED_CONVERSATIONS'),
-          badgeCount: mentionsUnreadCount.value,
-          badgeTooltip: unreadBadgeTooltip('MENTIONS'),
           icon: 'i-lucide-at-sign',
           activeOn: ['conversation_through_mentions'],
           to: accountScopedRoute('conversation_mentions'),
         },
         {
           name: 'Participating',
           label: t('SIDEBAR.PARTICIPATING_CONVERSATIONS'),
-          badgeCount: participatingUnreadCount.value,
-          badgeTooltip: unreadBadgeTooltip('PARTICIPATING'),
           icon: 'i-lucide-user-round-check',
           activeOn: ['conversation_through_participating'],
           to: accountScopedRoute('conversation_participating'),
         },
         {
           name: 'Unattended',
           activeOn: ['conversation_through_unattended'],
-          badgeCount: unattendedUnreadCount.value,
-          badgeTooltip: unreadBadgeTooltip('UNATTENDED'),
           label: t('SIDEBAR.UNATTENDED_CONVERSATIONS'),
           icon: 'i-lucide-clock-alert',
           to: accountScopedRoute('conversation_unattended'),
@@ -404,8 +372,6 @@ const menuItems = computed(() => {
           children: sortedFolders.value.map(view => ({
             name: `${view.name}-${view.id}`,
             label: view.name,
-            badgeCount: getFolderUnreadCount.value(view.id),
-            badgeTooltip: unreadBadgeTooltip('FOLDER'),
             to: accountScopedRoute('folder_conversations', { id: view.id }),
           })),
         },
@@ -421,7 +387,6 @@ const menuItems = computed(() => {
             name: `${team.name}-${team.id}`,
             label: team.name,
             badgeCount: getTeamUnreadCount.value(team.id),
-            badgeTooltip: unreadBadgeTooltip('TEAM'),
             to: accountScopedRoute('team_conversations', { teamId: team.id }),
           })),
         },
@@ -437,7 +402,6 @@ const menuItems = computed(() => {
             name: `${inbox.name}-${inbox.id}`,
             label: inbox.name,
             badgeCount: getInboxUnreadCount.value(inbox.id),
-            badgeTooltip: unreadBadgeTooltip('INBOX'),
             icon: h(ChannelIcon, { inbox, class: 'size-[16px]' }),
             to: accountScopedRoute('inbox_dashboard', { inbox_id: inbox.id }),
             component: leafProps =>
@@ -446,7 +410,6 @@ const menuItems = computed(() => {
                 active: leafProps.active,
                 inbox,
                 badgeCount: leafProps.badgeCount,
-                badgeTooltip: leafProps.badgeTooltip,
               }),
           })),
         },
@@ -462,7 +425,6 @@ const menuItems = computed(() => {
             name: `${label.title}-${label.id}`,
             label: label.title,
             badgeCount: getLabelUnreadCount.value(label.id),
-            badgeTooltip: unreadBadgeTooltip('LABEL'),
             icon: h('span', {
               class: `size-[8px] rounded-sm`,
               style: { backgroundColor: label.color },

app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue

@@ -197,10 +197,7 @@ onMounted(async () => {
                         class="size-4 flex-shrink-0"
                       />
                       <span class="flex-1 truncate">{{ subChild.label }}</span>
-                      <SidebarUnreadBadge
-                        :count="subChild.badgeCount"
-                        :tooltip="subChild.badgeTooltip"
-                      />
+                      <SidebarUnreadBadge :count="subChild.badgeCount" />
                     </button>
                   </li>
                 </ul>
@@ -223,10 +220,7 @@ onMounted(async () => {
                   class="size-4 flex-shrink-0"
                 />
                 <span class="flex-1 truncate">{{ child.label }}</span>
-                <SidebarUnreadBadge
-                  :count="child.badgeCount"
-                  :tooltip="child.badgeTooltip"
-                />
+                <SidebarUnreadBadge :count="child.badgeCount" />
               </button>
             </li>
           </template>

app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue

@@ -12,7 +12,6 @@ const props = defineProps({
   active: { type: Boolean, default: false },
   component: { type: Function, default: null },
   badgeCount: { type: [Number, String], default: 0 },
-  badgeTooltip: { type: String, default: '' },
   hideTreeLine: { type: Boolean, default: false },
   thinTreeLine: { type: Boolean, default: false },
 });
@@ -53,14 +52,14 @@ const TREE_CONNECTOR =
       <component
         :is="component"
         v-if="shouldRenderComponent"
-        v-bind="{ label, icon, active, badgeCount, badgeTooltip }"
+        v-bind="{ label, icon, active, badgeCount }"
       />
       <template v-else>
         <span v-if="icon" class="size-4 grid place-content-center rounded-full">
           <Icon :icon="icon" class="size-4 inline-block" />
         </span>
         <div class="flex-1 truncate min-w-0 text-sm">{{ label }}</div>
-        <SidebarUnreadBadge :count="badgeCount" :tooltip="badgeTooltip" />
+        <SidebarUnreadBadge :count="badgeCount" />
       </template>
     </component>
   </Policy>

app/javascript/dashboard/components-next/sidebar/SidebarUnreadBadge.vue

@@ -3,7 +3,6 @@ import { computed } from 'vue';
 
 const props = defineProps({
   count: { type: [Number, String], default: 0 },
-  tooltip: { type: String, default: '' },
 });
 
 const normalizedCount = computed(() => {
@@ -19,7 +18,6 @@ const displayCount = computed(() =>
 <template>
   <span
     v-if="normalizedCount > 0"
-    v-tooltip.top="tooltip || null"
     data-test-id="sidebar-unread-badge"
     class="inline-grid h-5 min-w-5 place-items-center rounded-full bg-n-slate-4 px-1 text-xxs font-medium leading-3 text-n-slate-12 dark:bg-n-slate-5 flex-shrink-0"
   >

app/javascript/dashboard/components-next/sidebar/specs/ChannelLeaf.spec.js

@@ -1,6 +1,5 @@
 import { mount } from '@vue/test-utils';
 import ChannelLeaf from '../ChannelLeaf.vue';
-import SidebarUnreadBadge from '../SidebarUnreadBadge.vue';
 
 const mountChannelLeaf = props =>
   mount(ChannelLeaf, {
@@ -29,17 +28,6 @@ describe('ChannelLeaf', () => {
     expect(badge.text()).toBe('3');
   });
 
-  it('passes tooltip copy to unread badge', () => {
-    const wrapper = mountChannelLeaf({
-      badgeCount: 3,
-      badgeTooltip: 'Total unread conversations in this inbox',
-    });
-
-    expect(wrapper.findComponent(SidebarUnreadBadge).props('tooltip')).toBe(
-      'Total unread conversations in this inbox'
-    );
-  });
-
   it('does not render unread badge when count is zero', () => {
     const wrapper = mountChannelLeaf({ badgeCount: 0 });
 

app/javascript/dashboard/components-next/sidebar/specs/SidebarGroupLeaf.spec.js

@@ -1,7 +1,6 @@
 import { mount } from '@vue/test-utils';
 import { h } from 'vue';
 import SidebarGroupLeaf from '../SidebarGroupLeaf.vue';
-import SidebarUnreadBadge from '../SidebarUnreadBadge.vue';
 
 vi.mock('../provider', () => ({
   useSidebarContext: () => ({
@@ -45,17 +44,6 @@ describe('SidebarGroupLeaf', () => {
     expect(badge.text()).toBe('7');
   });
 
-  it('passes tooltip copy to unread badge', () => {
-    const wrapper = mountLeaf({
-      badgeCount: 7,
-      badgeTooltip: 'Total unread conversations in this label',
-    });
-
-    expect(wrapper.findComponent(SidebarUnreadBadge).props('tooltip')).toBe(
-      'Total unread conversations in this label'
-    );
-  });
-
   it('does not render unread badge when count is zero', () => {
     const wrapper = mountLeaf({ badgeCount: 0 });
 
@@ -75,17 +63,14 @@ describe('SidebarGroupLeaf', () => {
   it('passes unread count to custom leaf components', () => {
     const wrapper = mountLeaf({
       badgeCount: 4,
-      badgeTooltip: 'Total unread conversations in this inbox',
       component: leafProps =>
         h(
           'span',
           { 'data-test-id': 'custom-leaf-count' },
-          `${leafProps.badgeCount}:${leafProps.badgeTooltip}`
+          leafProps.badgeCount
         ),
     });
 
-    expect(wrapper.find('[data-test-id="custom-leaf-count"]').text()).toBe(
-      '4:Total unread conversations in this inbox'
-    );
+    expect(wrapper.find('[data-test-id="custom-leaf-count"]').text()).toBe('4');
   });
 });

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

@@ -349,16 +349,6 @@
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
-    "UNREAD_COUNT_TOOLTIP": {
-      "ALL": "Total unread conversations",
-      "INBOX": "Total unread conversations in this inbox",
-      "LABEL": "Total unread conversations in this label",
-      "TEAM": "Total unread conversations in this team",
-      "FOLDER": "Total unread conversations in this folder",
-      "MENTIONS": "Unread conversations where you were mentioned",
-      "PARTICIPATING": "Unread conversations you're participating in",
-      "UNATTENDED": "Unread unattended conversations"
-    },
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
     "CONTACTS": "Contacts",