From d5286c95354050fd796d36691b3fcfb7061aa29b Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Wed, 6 Aug 2025 13:11:22 +0530 Subject: [PATCH 01/24] fix: Installation name not showing (#12096) --- .../dashboard/components/ui/Wizard.vue | 4 - .../widget-preview/components/Widget.vue | 14 ++- .../dashboard/settings/inbox/ChannelList.vue | 16 ++-- .../settings/inbox/InboxChannels.vue | 14 +-- .../settings/inbox/channels/Facebook.vue | 22 ++--- .../settings/inbox/channels/Instagram.vue | 2 - .../integrations/DashboardApps/Index.vue | 2 - .../dashboard/settings/integrations/Index.vue | 6 +- .../settings/integrations/Integration.vue | 11 +-- .../settings/integrations/IntegrationItem.vue | 6 +- .../settings/integrations/ShowIntegration.vue | 3 - .../Slack/SelectChannelWarning.vue | 12 +-- .../settings/integrations/Webhooks/Index.vue | 7 +- .../integrations/Webhooks/NewWebHook.vue | 15 +-- .../dashboard/settings/profile/Index.vue | 16 ++-- app/javascript/shared/components/Branding.vue | 11 ++- .../composables/specs/useBranding.spec.js | 96 +++++++++++++++++++ .../shared/composables/useBranding.js | 26 +++++ .../shared/mixins/globalConfigMixin.js | 12 --- .../v3/views/auth/reset/password/Index.vue | 17 +--- app/javascript/v3/views/auth/signup/Index.vue | 14 ++- .../auth/signup/components/Signup/Form.vue | 2 - app/javascript/v3/views/login/Index.vue | 14 +-- 23 files changed, 215 insertions(+), 127 deletions(-) create mode 100644 app/javascript/shared/composables/specs/useBranding.spec.js create mode 100644 app/javascript/shared/composables/useBranding.js delete mode 100644 app/javascript/shared/mixins/globalConfigMixin.js diff --git a/app/javascript/dashboard/components/ui/Wizard.vue b/app/javascript/dashboard/components/ui/Wizard.vue index 2219a07c1..6ab196d9d 100644 --- a/app/javascript/dashboard/components/ui/Wizard.vue +++ b/app/javascript/dashboard/components/ui/Wizard.vue @@ -1,9 +1,5 @@ - - diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue index e36e94ac6..9a245ec8c 100644 --- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue +++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue @@ -263,7 +263,7 @@ export default { From ca13664ef93f56e3db8cee2c1ca2da74fefdc3ce Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:50:24 +0530 Subject: [PATCH 03/24] chore: Replace Thumbnail with Avatar in conversation card (#12112) --- .../Contacts/ContactsCard/ContactsCard.vue | 1 + .../components-next/avatar/Avatar.vue | 67 +++++++++++------ .../components-next/icon/ChannelIcon.vue | 3 +- .../components-next/icon/provider.js | 14 ++-- .../icon/specs/provider.spec.js | 71 +++++++++++++++++++ .../components/widgets/InboxName.vue | 30 +++----- .../widgets/conversation/ConversationCard.vue | 61 +++++++++------- .../SearchResultConversationItem.vue | 2 +- 8 files changed, 176 insertions(+), 73 deletions(-) diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue index 0932a79c7..0e893b767 100644 --- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue +++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue @@ -98,6 +98,7 @@ const onClickViewDetails = () => emit('showContact', props.id); :src="thumbnail" :size="48" :status="availabilityStatus" + hide-offline-status rounded-full />
diff --git a/app/javascript/dashboard/components-next/avatar/Avatar.vue b/app/javascript/dashboard/components-next/avatar/Avatar.vue index 65859b1c7..08224995c 100644 --- a/app/javascript/dashboard/components-next/avatar/Avatar.vue +++ b/app/javascript/dashboard/components-next/avatar/Avatar.vue @@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n'; import { removeEmoji } from 'shared/helpers/emoji'; import Icon from 'dashboard/components-next/icon/Icon.vue'; +import ChannelIcon from 'dashboard/components-next/icon/ChannelIcon.vue'; import wootConstants from 'dashboard/constants/globals'; const props = defineProps({ @@ -33,10 +34,18 @@ const props = defineProps({ validator: value => !value || wootConstants.AVAILABILITY_STATUS_KEYS.includes(value), }, + inbox: { + type: Object, + default: null, + }, iconName: { type: String, default: null, }, + hideOfflineStatus: { + type: Boolean, + default: false, + }, }); const emit = defineEmits(['upload', 'delete']); @@ -66,11 +75,11 @@ const AVATAR_COLORS = { default: { bg: '#E8E8E8', text: '#60646C' }, }; -const STATUS_CLASSES = { +const STATUS_CLASSES = computed(() => ({ online: 'bg-n-teal-10', busy: 'bg-n-amber-10', - offline: 'bg-n-slate-10', -}; + ...(props.hideOfflineStatus ? {} : { offline: 'bg-n-slate-10' }), +})); const showDefaultAvatar = computed(() => !props.src && !props.name); @@ -178,11 +187,18 @@ watch(
+
+ +
@@ -239,24 +255,33 @@ watch( - + + diff --git a/app/javascript/dashboard/components-next/icon/ChannelIcon.vue b/app/javascript/dashboard/components-next/icon/ChannelIcon.vue index 11117cc18..68102dbd3 100644 --- a/app/javascript/dashboard/components-next/icon/ChannelIcon.vue +++ b/app/javascript/dashboard/components-next/icon/ChannelIcon.vue @@ -1,4 +1,5 @@