KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Use empty object if additional_attribute is null (#1520)

Browse source
This commit is contained in:
Pranav Raj S 2020-12-16 15:11:53 +05:30 committed by GitHub
parent 6373e6dec8
commit 50f87f373e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
View file

@ -112,20 +112,19 @@ export default {
return `${this.browser.browser_name || ''} ${this.browser return `${this.browser.browser_name || ''} ${this.browser
.browser_version || ''}`; .browser_version || ''}`;
}, },
contactAdditionalAttributes() {
return this.contact.additional_attributes || {};
},
ipAddress() { ipAddress() {
const { const { created_at_ip: createdAtIp } = this.contactAdditionalAttributes;
additional_attributes: { created_at_ip: createdAtIp },
} = this.contact;
return createdAtIp; return createdAtIp;
}, },
location() { location() {
const { const {
additional_attributes: {
country = '', country = '',
city = '', city = '',
country_code: countryCode, country_code: countryCode,
}, } = this.contactAdditionalAttributes;
} = this.contact;
const cityAndCountry = [city, country].filter(item => !!item).join(', '); const cityAndCountry = [city, country].filter(item => !!item).join(', ');
if (!cityAndCountry) { if (!cityAndCountry) {