From 8b207a9a940805488b34a039f6dd8acc72a511b6 Mon Sep 17 00:00:00 2001 From: iamsivin Date: Thu, 14 Mar 2024 15:53:34 +0530 Subject: [PATCH] fix: notification types --- app/javascript/dashboard/i18n/locale/en/inbox.json | 8 +------- .../routes/dashboard/inbox/components/InboxCard.vue | 7 ++++++- .../routes/dashboard/inbox/components/InboxCardInfo.vue | 1 + app/javascript/shared/components/FluentIcon/Icon.vue | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/javascript/dashboard/i18n/locale/en/inbox.json b/app/javascript/dashboard/i18n/locale/en/inbox.json index a2554fbc5..52a16af69 100644 --- a/app/javascript/dashboard/i18n/locale/en/inbox.json +++ b/app/javascript/dashboard/i18n/locale/en/inbox.json @@ -18,13 +18,7 @@ }, "TYPES": { "CONVERSATION_MENTION": "Mention", - "CONVERSATION_ASSIGNMENT": "Assigned to you", - "CONVERSATION_CREATION": "", - "ASSIGNED_CONVERSATION_NEW_MESSAGE": "", - "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "", - "SLA_MISSED_FIRST_RESPONSE": "", - "SLA_MISSED_NEXT_RESPONSE": "", - "SLA_MISSED_RESOLUTION": "" + "CONVERSATION_ASSIGNMENT": "Assigned to you" }, "MENU_ITEM": { "MARK_AS_READ": "Mark as read", diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue index 7fb70771b..3b24de2c6 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue @@ -160,8 +160,13 @@ export default { return this.notificationItem?.push_message_body; }, notificationTypes() { + const usedTypes = ['CONVERSATION_MENTION', 'CONVERSATION_ASSIGNMENT']; const { notification_type: notificationType } = this.notificationItem; - return this.$t(`INBOX.TYPES.${notificationType?.toUpperCase()}`); + const upperCaseType = notificationType?.toUpperCase(); + + return usedTypes.includes(upperCaseType) + ? this.$t(`INBOX.TYPES.${upperCaseType}`) + : ''; }, notificationTypeIcon() { const { notification_type: notificationType } = this.notificationItem; diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCardInfo.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCardInfo.vue index f113602a0..786ebd2da 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCardInfo.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCardInfo.vue @@ -13,6 +13,7 @@ diff --git a/app/javascript/shared/components/FluentIcon/Icon.vue b/app/javascript/shared/components/FluentIcon/Icon.vue index da01f3397..31f788a1a 100644 --- a/app/javascript/shared/components/FluentIcon/Icon.vue +++ b/app/javascript/shared/components/FluentIcon/Icon.vue @@ -65,7 +65,7 @@ export default { pathSource() { // To support icons with multiple paths const path = this.icons[`${this.icon}-${this.type}`]; - if (path.constructor === Array) { + if (path?.constructor === Array) { return path; } return [path];