From a27ccc58664ac475ea1d5c2b5c0b8df31026a0dd Mon Sep 17 00:00:00 2001 From: Muhsin Keloth Date: Wed, 25 Aug 2021 14:11:16 +0530 Subject: [PATCH] fix: Disable "none" option from team dropdown If team is not selected (#2876) --- .../dashboard/conversation/ContactPanel.vue | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue index 0231d3e01..919a4c094 100644 --- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue +++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue @@ -191,8 +191,9 @@ export default { return this.additionalAttributes.initiated_at; }, browserName() { - return `${this.browser.browser_name || ''} ${this.browser - .browser_version || ''}`; + return `${this.browser.browser_name || ''} ${ + this.browser.browser_version || '' + }`; }, contactAdditionalAttributes() { return this.contact.additional_attributes || {}; @@ -216,10 +217,8 @@ export default { return `${cityAndCountry} ${countryFlag}`; }, platformName() { - const { - platform_name: platformName, - platform_version: platformVersion, - } = this.browser; + const { platform_name: platformName, platform_version: platformVersion } = + this.browser; return `${platformName || ''} ${platformVersion || ''}`; }, channelType() { @@ -232,7 +231,16 @@ export default { return this.$store.getters['contacts/getContact'](this.contactId); }, teamsList() { - return [{ id: 0, name: 'None' }, ...this.teams]; + if (this.assignedTeam) { + return [ + { + id: 0, + name: 'None', + }, + ...this.teams, + ]; + } + return this.teams; }, assignedAgent: { get() {