@@ -64,6 +65,7 @@
class="message--unread"
:data="message"
:is-a-tweet="isATweet"
+ :has-instagram-story="hasInstagramStory"
/>
{
+ it('Matches the correct filterItems', () => {
+ expect(defaultFilters).toMatchObject(defaultFilters);
+ expect(filterAttributeGroups).toMatchObject(filterAttributeGroups);
+ });
+});
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js
index 98e27c5bb..a3e8e2c10 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js
@@ -2,6 +2,7 @@ import {
OPERATOR_TYPES_1,
OPERATOR_TYPES_2,
OPERATOR_TYPES_3,
+ OPERATOR_TYPES_5,
} from '../../FilterInput/FilterOperatorTypes';
const filterTypes = [
@@ -85,6 +86,30 @@ const filterTypes = [
filterOperators: OPERATOR_TYPES_3,
attributeModel: 'additional',
},
+ {
+ attributeKey: 'created_at',
+ attributeI18nKey: 'CREATED_AT',
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: OPERATOR_TYPES_5,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'last_activity_at',
+ attributeI18nKey: 'LAST_ACTIVITY',
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: OPERATOR_TYPES_5,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'referer',
+ attributeI18nKey: 'REFERER_LINK',
+ inputType: 'plain_text',
+ dataType: 'text',
+ filterOperators: OPERATOR_TYPES_5,
+ attributeModel: 'standard',
+ },
];
export const filterAttributeGroups = [
@@ -120,6 +145,14 @@ export const filterAttributeGroups = [
key: 'labels',
i18nKey: 'LABELS',
},
+ {
+ key: 'created_at',
+ i18nKey: 'CREATED_AT',
+ },
+ {
+ key: 'last_activity_at',
+ i18nKey: 'LAST_ACTIVITY',
+ },
],
},
{
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 957402f78..a20f3d34c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -35,6 +35,19 @@
size="16"
/>
+
+
+
{
+ if (!this.accountSummary.previous[metric_key]) return 0;
+ return Math.round(
+ ((this.accountSummary[metric_key] -
+ this.accountSummary.previous[metric_key]) /
+ this.accountSummary.previous[metric_key]) *
+ 100
+ );
+ };
+ },
+ displayMetric() {
+ return metric_key => {
+ if (
+ ['avg_first_response_time', 'avg_resolution_time'].includes(
+ metric_key
+ )
+ ) {
+ return formatTime(this.accountSummary[metric_key]);
+ }
+ return this.accountSummary[metric_key];
+ };
+ },
+ },
+};
diff --git a/app/javascript/dashboard/mixins/specs/reportMixin.spec.js b/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
new file mode 100644
index 000000000..003295f95
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
@@ -0,0 +1,41 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import reportMixin from '../reportMixin';
+import reportFixtures from './reportMixinFixtures';
+import Vuex from 'vuex';
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('reportMixin', () => {
+ let getters;
+ let store;
+ beforeEach(() => {
+ getters = {
+ getAccountSummary: () => reportFixtures.summary,
+ };
+ store = new Vuex.Store({ getters });
+ });
+
+ it('display the metric', () => {
+ const Component = {
+ render() {},
+ title: 'TestComponent',
+ mixins: [reportMixin],
+ };
+ const wrapper = shallowMount(Component, { store, localVue });
+ expect(wrapper.vm.displayMetric('conversations_count')).toEqual(5);
+ expect(wrapper.vm.displayMetric('avg_first_response_time')).toEqual(
+ '3 Min'
+ );
+ });
+
+ it('calculate the trend', () => {
+ const Component = {
+ render() {},
+ title: 'TestComponent',
+ mixins: [reportMixin],
+ };
+ const wrapper = shallowMount(Component, { store, localVue });
+ expect(wrapper.vm.calculateTrend('conversations_count')).toEqual(25);
+ expect(wrapper.vm.calculateTrend('resolutions_count')).toEqual(0);
+ });
+});
diff --git a/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js b/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js
new file mode 100644
index 000000000..5c8315ab1
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js
@@ -0,0 +1,18 @@
+export default {
+ summary: {
+ avg_first_response_time: '198.6666666666667',
+ avg_resolution_time: '208.3333333333333',
+ conversations_count: 5,
+ incoming_messages_count: 5,
+ outgoing_messages_count: 3,
+ previous: {
+ avg_first_response_time: '89.0',
+ avg_resolution_time: '145.0',
+ conversations_count: 4,
+ incoming_messages_count: 5,
+ outgoing_messages_count: 4,
+ resolutions_count: 0,
+ },
+ resolutions_count: 3,
+ },
+};
diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
index 670c93d5d..11903c9ed 100644
--- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue
+++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
@@ -1,9 +1,33 @@
@@ -12,16 +36,28 @@
import Sidebar from '../../components/layout/Sidebar';
import CommandBar from './commands/commandbar.vue';
import { BUS_EVENTS } from 'shared/constants/busEvents';
+import WootKeyShortcutModal from 'dashboard/components/widgets/modal/WootKeyShortcutModal';
+import AddAccountModal from 'dashboard/components/layout/sidebarComponents/AddAccountModal';
+import AccountSelector from 'dashboard/components/layout/sidebarComponents/AccountSelector';
+import AddLabelModal from 'dashboard/routes/dashboard/settings/labels/AddLabel.vue';
export default {
components: {
Sidebar,
CommandBar,
+ WootKeyShortcutModal,
+ AddAccountModal,
+ AccountSelector,
+ AddLabelModal,
},
data() {
return {
isSidebarOpen: false,
isOnDesktop: true,
+ showAccountModal: false,
+ showCreateAccountModal: false,
+ showAddLabelModal: false,
+ showShortcutModal: false,
};
},
computed: {
@@ -68,6 +104,28 @@ export default {
toggleSidebar() {
this.isSidebarOpen = !this.isSidebarOpen;
},
+ openCreateAccountModal() {
+ this.showAccountModal = false;
+ this.showCreateAccountModal = true;
+ },
+ closeCreateAccountModal() {
+ this.showCreateAccountModal = false;
+ },
+ toggleAccountModal() {
+ this.showAccountModal = !this.showAccountModal;
+ },
+ toggleKeyShortcutModal() {
+ this.showShortcutModal = true;
+ },
+ closeKeyShortcutModal() {
+ this.showShortcutModal = false;
+ },
+ showAddLabelPopup() {
+ this.showAddLabelModal = true;
+ },
+ hideAddLabelPopup() {
+ this.showAddLabelModal = false;
+ },
},
};
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
index 3f5162292..95c9ae61c 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
@@ -11,7 +11,12 @@
v-model="appliedFilters[i]"
:filter-groups="filterGroups"
:grouped-filters="true"
- :input-type="getInputType(appliedFilters[i].attribute_key)"
+ :input-type="
+ getInputType(
+ appliedFilters[i].attribute_key,
+ appliedFilters[i].filter_operator
+ )
+ "
:operators="getOperators(appliedFilters[i].attribute_key)"
:dropdown-values="getDropdownValues(appliedFilters[i].attribute_key)"
:show-query-operator="i !== appliedFilters.length - 1"
@@ -86,6 +91,12 @@ export default {
$each: {
values: {
required,
+ ensureBetween0to999(value, prop) {
+ if (prop.filter_operator === 'days_before') {
+ return parseInt(value, 10) > 0 && parseInt(value, 10) < 999;
+ }
+ return true;
+ },
},
},
},
@@ -161,7 +172,9 @@ export default {
const type = this.filterTypes.find(filter => filter.attributeKey === key);
return type.attributeModel;
},
- getInputType(key) {
+ getInputType(key, operator) {
+ if (key === 'created_at' || key === 'last_activity_at')
+ if (operator === 'days_before') return 'plain_text';
const type = this.filterTypes.find(filter => filter.attributeKey === key);
return type.inputType;
},
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 7536c0d24..dbac2f0bc 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -253,7 +253,7 @@ export default {
this.$store.dispatch('contacts/get', requestParams);
} else {
this.$store.dispatch('contacts/search', {
- search: value,
+ search: encodeURIComponent(value),
...requestParams,
});
}
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
index dc12d2640..2d54c37bc 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
@@ -1,6 +1,7 @@
import {
OPERATOR_TYPES_1,
OPERATOR_TYPES_3,
+ OPERATOR_TYPES_5,
} from 'dashboard/components/widgets/FilterInput/FilterOperatorTypes.js';
const filterTypes = [
{
@@ -51,6 +52,30 @@ const filterTypes = [
filterOperators: OPERATOR_TYPES_3,
attribute_type: 'standard',
},
+ {
+ attributeKey: 'created_at',
+ attributeI18nKey: 'CREATED_AT',
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: OPERATOR_TYPES_5,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'last_activity_at',
+ attributeI18nKey: 'LAST_ACTIVITY',
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: OPERATOR_TYPES_5,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'referer',
+ attributeI18nKey: 'REFERER_LINK',
+ inputType: 'plain_text',
+ dataType: 'text',
+ filterOperators: OPERATOR_TYPES_5,
+ attributeModel: 'standard',
+ },
];
export const filterAttributeGroups = [
@@ -82,6 +107,14 @@ export const filterAttributeGroups = [
key: 'city',
i18nKey: 'CITY',
},
+ {
+ key: 'created_at',
+ i18nKey: 'CREATED_AT',
+ },
+ {
+ key: 'last_activity_at',
+ i18nKey: 'LAST_ACTIVITY',
+ },
],
},
];
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 90aeb43ee..24aeeff88 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -126,17 +126,15 @@
@close="toggleMergeModal"
/>
{{ automation.name }} |
{{ automation.description }} |
-
+ />
|
{{ readableTime(automation.created_on) }} |
@@ -140,11 +131,13 @@ import AddAutomationRule from './AddAutomationRule.vue';
import EditAutomationRule from './EditAutomationRule.vue';
import alertMixin from 'shared/mixins/alertMixin';
import timeMixin from 'dashboard/mixins/time';
+import ToggleButton from 'dashboard/components/buttons/ToggleButton';
export default {
components: {
AddAutomationRule,
EditAutomationRule,
+ ToggleButton,
},
mixins: [alertMixin, timeMixin],
data() {
@@ -290,41 +283,4 @@ export default {
.automation__status-checkbox {
margin: 0;
}
-.toggle-button {
- background-color: var(--s-200);
- position: relative;
- display: inline-flex;
- height: 19px;
- width: 34px;
- border: 2px solid transparent;
- border-radius: var(--border-radius-large);
- cursor: pointer;
- transition-property: background-color;
- transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
- transition-duration: 200ms;
- flex-shrink: 0;
-}
-
-.toggle-button.active {
- background-color: var(--w-500);
-}
-
-.toggle-button span {
- --space-one-point-five: 1.5rem;
- height: var(--space-one-point-five);
- width: var(--space-one-point-five);
- display: inline-block;
- background-color: var(--white);
- box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px,
- rgba(59, 130, 246, 0.5) 0px 0px 0px 0px, rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
- rgba(0, 0, 0, 0.06) 0px 1px 2px 0px;
- transform: translate(0, 0);
- border-radius: 100%;
- transition-property: transform;
- transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
- transition-duration: 200ms;
-}
-.toggle-button span.active {
- transform: translate(var(--space-one-point-five), var(--space-zero));
-}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
index 6c01bc3dd..bf0c22515 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -15,28 +15,57 @@
-
-
-
-
- Chatwoot is an opensource tool. Chatwoot '
+ 'Chatwoot is an opensource tool. Chatwoot '
);
});
it('should format correctly', () => {
const message =
'Chatwoot is an opensource tool. https://www.chatwoot.com';
expect(new MessageFormatter(message).formattedMessage).toMatch(
- 'Chatwoot is an opensource tool. https://www.chatwoot.com '
+ 'Chatwoot is an opensource tool. https://www.chatwoot.com '
);
});
});
@@ -58,4 +58,14 @@ describe('#MessageFormatter', () => {
);
});
});
+
+ describe('#sanitize', () => {
+ it('sanitizes markup and removes all unnecessary elements', () => {
+ const message =
+ '[xssLink](javascript:alert(document.cookie))\n[normalLink](https://google.com)**I am a bold text paragraph**';
+ expect(new MessageFormatter(message).formattedMessage).toMatch(
+ 'xssLink
normalLinkI am a bold text paragraph '
+ );
+ });
+ });
});
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index df37f2363..a9beba74f 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -10,6 +10,7 @@ const createConversation = params => {
contact: {
name: params.fullName,
email: params.emailAddress,
+ phone_number: params.phoneNumber,
},
message: {
content: params.message,
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 7fdf33375..b4b2eacfc 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -9,30 +9,40 @@
>
{{ headerMessage }}
-
-
+
+
+
+
+
+
({}),
+ default: () => {},
},
disableContactFields: {
type: Boolean,
@@ -83,15 +95,33 @@ export default {
},
},
validations() {
- const identityValidations = {
- fullName: {
- required,
- },
- emailAddress: {
- required,
- email,
- },
- };
+ let identityValidations = {};
+ if (this.isContactFieldRequired('emailAddress')) {
+ identityValidations = {
+ ...identityValidations,
+ emailAddress: {
+ required,
+ email,
+ },
+ };
+ }
+ if (this.isContactFieldRequired('phoneNumber')) {
+ identityValidations = {
+ ...identityValidations,
+ phoneNumber: {
+ required,
+ isPhoneE164OrEmpty,
+ },
+ };
+ }
+ if (this.isContactFieldRequired('fullName')) {
+ identityValidations = {
+ ...identityValidations,
+ fullName: {
+ required,
+ },
+ };
+ }
const messageValidation = {
message: {
@@ -103,18 +133,16 @@ export default {
if (this.hasActiveCampaign) {
return identityValidations;
}
- if (this.areContactFieldsVisible) {
- return {
- ...identityValidations,
- ...messageValidation,
- };
- }
- return messageValidation;
+ return {
+ ...identityValidations,
+ ...messageValidation,
+ };
},
data() {
return {
fullName: '',
emailAddress: '',
+ phoneNumber: '',
message: '',
};
},
@@ -139,11 +167,48 @@ export default {
}
return this.options.preChatMessage;
},
- areContactFieldsVisible() {
- return this.options.requireEmail && !this.disableContactFields;
+ preChatFields() {
+ return this.options.preChatFields || [];
+ },
+ emailErrorMessage() {
+ let errorMessage = '';
+ if (!this.$v.emailAddress.$error) {
+ errorMessage = '';
+ } else if (!this.$v.emailAddress.required) {
+ errorMessage = this.$t(
+ 'PRE_CHAT_FORM.FIELDS.EMAIL_ADDRESS.REQUIRED_ERROR'
+ );
+ } else if (!this.$v.emailAddress.email) {
+ errorMessage = this.$t(
+ 'PRE_CHAT_FORM.FIELDS.EMAIL_ADDRESS.VALID_ERROR'
+ );
+ }
+ return errorMessage;
+ },
+ phoneNumberErrorMessage() {
+ let errorMessage = '';
+ if (!this.$v.phoneNumber.$error) {
+ errorMessage = '';
+ } else if (!this.$v.phoneNumber.required) {
+ errorMessage = this.$t(
+ 'PRE_CHAT_FORM.FIELDS.PHONE_NUMBER.REQUIRED_ERROR'
+ );
+ } else if (!this.$v.phoneNumber.email) {
+ errorMessage = this.$t('PRE_CHAT_FORM.FIELDS.PHONE_NUMBER.VALID_ERROR');
+ }
+ return errorMessage;
},
},
methods: {
+ isContactFieldVisible(field, item) {
+ return (
+ item.name === field &&
+ this.preChatFields.find(option => option.name === field).enabled
+ );
+ },
+ isContactFieldRequired(field) {
+ return this.preChatFields.find(option => option.name === field).required;
+ },
onSubmit() {
this.$v.$touch();
if (this.$v.$invalid) {
@@ -151,6 +216,7 @@ export default {
}
this.$emit('submit', {
fullName: this.fullName,
+ phoneNumber: this.phoneNumber,
emailAddress: this.emailAddress,
message: this.message,
activeCampaignId: this.activeCampaign.id,
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 7718ea4d1..94f4dd445 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -43,12 +43,19 @@
"FULL_NAME": {
"LABEL": "Full Name",
"PLACEHOLDER": "Please enter your full name",
- "ERROR": "Full Name is required"
+ "REQUIRED_ERROR": "Full Name is required"
},
"EMAIL_ADDRESS": {
"LABEL": "Email Address",
"PLACEHOLDER": "Please enter your email address",
- "ERROR": "Invalid email address"
+ "REQUIRED_ERROR": "Email Address is required",
+ "VALID_ERROR": "Please enter a valid email address"
+ },
+ "PHONE_NUMBER": {
+ "LABEL": "Phone Number",
+ "PLACEHOLDER": "Please enter your phone number",
+ "REQUIRED_ERROR": "Phone Number is required",
+ "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
},
"MESSAGE": {
"LABEL": "Message",
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index c91730767..1f1aec538 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -24,12 +24,15 @@ export default {
preChatFormOptions() {
let requireEmail = false;
let preChatMessage = '';
+ let preChatFields = null;
const options = window.chatwootWebChannel.preChatFormOptions || {};
requireEmail = options.require_email;
preChatMessage = options.pre_chat_message;
+ preChatFields = options.pre_chat_fields;
return {
requireEmail,
preChatMessage,
+ preChatFields,
};
},
},
diff --git a/app/javascript/widget/views/PreChatForm.vue b/app/javascript/widget/views/PreChatForm.vue
index cb0b4c217..24700cfcc 100644
--- a/app/javascript/widget/views/PreChatForm.vue
+++ b/app/javascript/widget/views/PreChatForm.vue
@@ -35,13 +35,20 @@ export default {
},
},
methods: {
- onSubmit({ fullName, emailAddress, message, activeCampaignId }) {
+ onSubmit({
+ fullName,
+ emailAddress,
+ message,
+ activeCampaignId,
+ phoneNumber,
+ }) {
if (activeCampaignId) {
bus.$emit('execute-campaign', activeCampaignId);
this.$store.dispatch('contacts/update', {
user: {
email: emailAddress,
name: fullName,
+ phone_number: phoneNumber,
},
});
} else {
@@ -49,6 +56,7 @@ export default {
fullName: fullName,
emailAddress: emailAddress,
message: message,
+ phoneNumber: phoneNumber,
});
}
},
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 6def5bbdb..6193fbb91 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -34,7 +34,7 @@ class Attachment < ApplicationRecord
has_one_attached :file
validate :acceptable_file
- enum file_type: [:image, :audio, :video, :file, :location, :fallback]
+ enum file_type: [:image, :audio, :video, :file, :location, :fallback, :share, :story_mention]
def push_event_data
return unless file_type
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 7c3edcc77..59a978c6e 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -32,7 +32,8 @@ class Channel::WebWidget < ApplicationRecord
self.table_name = 'channel_web_widgets'
EDITABLE_ATTRS = [:website_url, :widget_color, :welcome_title, :welcome_tagline, :reply_time, :pre_chat_form_enabled,
:continuity_via_email, :hmac_mandatory,
- { pre_chat_form_options: [:pre_chat_message, :require_email] },
+ { pre_chat_form_options: [:pre_chat_message, :require_email,
+ { pre_chat_fields: [:label, :name, :enabled, :type, :enabled, :required] }] },
{ selected_feature_flags: [] }].freeze
validates :website_url, presence: true
diff --git a/app/models/message.rb b/app/models/message.rb
index c9113dcf0..6ad607997 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -64,7 +64,7 @@ class Message < ApplicationRecord
# [:deleted] : Used to denote whether the message was deleted by the agent
# [:external_created_at] : Can specify if the message was created at a different timestamp externally
store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted,
- :external_created_at], coder: JSON
+ :external_created_at, :story_sender, :story_id], coder: JSON
store :external_source_ids, accessors: [:slack], coder: JSON, prefix: :external_source_id
diff --git a/config/environments/development.rb b/config/environments/development.rb
index eab9c411d..67ffa6a52 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -82,6 +82,7 @@ Rails.application.configure do
allow do
origins '*'
resource '/packs/*', headers: :any, methods: [:get, :options]
+ resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
end
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index fb6c124d8..e538e2867 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -121,6 +121,7 @@ Rails.application.configure do
allow do
origins '*'
resource '/packs/*', headers: :any, methods: [:get, :options]
+ resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false))
resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 36efcc171..6e9b3dcf8 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -87,6 +87,7 @@ Rails.application.configure do
allow do
origins '*'
resource '/packs/*', headers: :any, methods: [:get, :options]
+ resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
end
end
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6a2534654..24baf5aff 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -58,6 +58,7 @@ Rails.application.configure do
allow do
origins '*'
resource '/packs/*', headers: :any, methods: [:get, :options]
+ resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
end
end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c52b660e8..8c18482af 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -43,7 +43,7 @@ en:
failed: Signup failed
contacts:
import:
- failed: File is blank
+ failed: File is blank
reports:
period: Reporting period %{since} to %{until}
@@ -67,6 +67,7 @@ en:
conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
conversations:
messages:
+ instagram_story_content: "%{story_sender} mentioned you in the story: "
deleted: This message was deleted
activity:
status:
diff --git a/db/migrate/20220309103742_add_custom_fields_to_pre_chat_form.rb b/db/migrate/20220309103742_add_custom_fields_to_pre_chat_form.rb
new file mode 100644
index 000000000..c04e11ba7
--- /dev/null
+++ b/db/migrate/20220309103742_add_custom_fields_to_pre_chat_form.rb
@@ -0,0 +1,28 @@
+class AddCustomFieldsToPreChatForm < ActiveRecord::Migration[6.1]
+ def change
+ Channel::WebWidget.find_in_batches do |channels_batch|
+ channels_batch.each do |channel|
+ pre_chat_message = channel[:pre_chat_form_options]['pre_chat_message'] || 'Share your queries or comments here.'
+ pre_chat_fields = pre_chat_fields?(channel)
+ channel[:pre_chat_form_options] = {
+ 'pre_chat_message': pre_chat_message,
+ 'pre_chat_fields': pre_chat_fields
+ }
+ channel.save!
+ end
+ end
+ end
+
+ def pre_chat_fields?(channel)
+ email_enabled = channel[:pre_chat_form_options]['require_email'] || false
+ [
+ {
+ 'label': 'Email Id', 'name': 'emailAddress', 'type': 'email', 'required': true, 'enabled': email_enabled
+ }, {
+ 'label': 'Full name', 'name': 'fullName', 'type': 'text', 'required': true, 'enabled': email_enabled
+ }, {
+ 'label': 'Phone number', 'name': 'phoneNumber', 'type': 'number', 'required': true, 'enabled': false
+ }
+ ]
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 740f2ed70..1a7924bc1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_03_08_193420) do
+ActiveRecord::Schema.define(version: 2022_03_09_103742) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_stat_statements"
diff --git a/spec/factories/instagram/instagram_message_create_event.rb b/spec/factories/instagram/instagram_message_create_event.rb
index d0dbffdab..b4ffa2dff 100644
--- a/spec/factories/instagram/instagram_message_create_event.rb
+++ b/spec/factories/instagram/instagram_message_create_event.rb
@@ -55,4 +55,72 @@ FactoryBot.define do
end
initialize_with { attributes }
end
+
+ factory :instagram_message_attachment_event, class: Hash do
+ entry do
+ [
+ {
+ 'id': 'instagram-message-id-1234',
+ 'time': '2021-09-08T06:34:04+0000',
+ 'messaging': [
+ {
+ 'sender': {
+ 'id': 'Sender-id-1'
+ },
+ 'recipient': {
+ 'id': 'chatwoot-app-user-id-1'
+ },
+ 'timestamp': '2021-09-08T06:34:04+0000',
+ 'message': {
+ 'mid': 'message-id-1',
+ 'attachments': [
+ {
+ 'type': 'share',
+ 'payload': {
+ 'url': 'https://imagekit.io/blog/content/images/2020/05/media_library.jpeg'
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ]
+ end
+ initialize_with { attributes }
+ end
+
+ factory :instagram_story_mention_event, class: Hash do
+ entry do
+ [
+ {
+ 'id': 'instagram-message-id-1234',
+ 'time': '2021-09-08T06:34:04+0000',
+ 'messaging': [
+ {
+ 'sender': {
+ 'id': 'Sender-id-1'
+ },
+ 'recipient': {
+ 'id': 'chatwoot-app-user-id-1'
+ },
+ 'timestamp': '2021-09-08T06:34:04+0000',
+ 'message': {
+ 'mid': 'message-id-1',
+ 'attachments': [
+ {
+ 'type': 'story_mention',
+ 'payload': {
+ 'url': 'https://imagekit.io/blog/content/images/2020/05/media_library.jpeg'
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ]
+ end
+ initialize_with { attributes }
+ end
end
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index cbda62db9..eaf77bf7b 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -6,13 +6,30 @@ describe Webhooks::InstagramEventsJob do
before do
stub_request(:post, /graph.facebook.com/)
+ stub_request(:get, 'https://imagekit.io/blog/content/images/2020/05/media_library.jpeg')
+ .with(
+ headers: {
+ 'Accept' => '*/*',
+ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+ 'User-Agent' => 'Down/5.3.0'
+ }
+ )
+ .to_return(status: 200, body: '', headers: {})
end
let!(:account) { create(:account) }
+ let(:return_onject) do
+ { name: 'Jane',
+ id: 'Sender-id-1',
+ account_id: instagram_inbox.account_id,
+ profile_pic: 'https://chatwoot-assets.local/sample.png' }
+ end
let!(:instagram_channel) { create(:channel_instagram_fb_page, account: account, instagram_id: 'chatwoot-app-user-id-1') }
let!(:instagram_inbox) { create(:inbox, channel: instagram_channel, account: account, greeting_enabled: false) }
let!(:dm_params) { build(:instagram_message_create_event).with_indifferent_access }
let!(:test_params) { build(:instagram_test_text_event).with_indifferent_access }
+ let!(:attachment_params) { build(:instagram_message_attachment_event).with_indifferent_access }
+ let!(:story_mention_params) { build(:instagram_story_mention_event).with_indifferent_access }
let(:fb_object) { double }
describe '#perform' do
@@ -20,12 +37,7 @@ describe Webhooks::InstagramEventsJob do
it 'creates incoming message in the instagram inbox' do
allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
allow(fb_object).to receive(:get_object).and_return(
- {
- name: 'Jane',
- id: 'Sender-id-1',
- account_id: instagram_inbox.account_id,
- profile_pic: 'https://chatwoot-assets.local/sample.png'
- }.with_indifferent_access
+ return_onject.with_indifferent_access
)
instagram_webhook.perform_now(dm_params[:entry])
@@ -39,12 +51,7 @@ describe Webhooks::InstagramEventsJob do
it 'creates test text message in the instagram inbox' do
allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
allow(fb_object).to receive(:get_object).and_return(
- {
- name: 'Jane',
- id: 'Sender-id-1',
- account_id: instagram_inbox.account_id,
- profile_pic: 'https://chatwoot-assets.local/sample.png'
- }.with_indifferent_access
+ return_onject.with_indifferent_access
)
instagram_webhook.perform_now(test_params[:entry])
@@ -53,6 +60,46 @@ describe Webhooks::InstagramEventsJob do
expect(instagram_inbox.messages.count).to be 1
expect(instagram_inbox.messages.last.content).to eq('This is a test message from facebook.')
end
+
+ it 'creates incoming message with attachments in the instagram inbox' do
+ allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+ allow(fb_object).to receive(:get_object).and_return(
+ return_onject.with_indifferent_access
+ )
+ instagram_webhook.perform_now(attachment_params[:entry])
+
+ instagram_inbox.reload
+
+ expect(instagram_inbox.contacts.count).to be 1
+ expect(instagram_inbox.messages.count).to be 1
+ expect(instagram_inbox.messages.last.attachments.count).to be 1
+ end
+
+ it 'creates incoming message with attachments in the instagram inbox for story mention' do
+ allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+ allow(fb_object).to receive(:get_object).and_return(
+ return_onject.with_indifferent_access,
+ { story:
+ {
+ mention: {
+ link:
+ 'https://lookaside.fbsbx.com/ig_messaging_cdn/?asset_id=17920786367196703&signature=Aby8EXbvNu4on9efDQecXDasiJX2s0FgWhFGz3mNFB__CsHR22O_1bJiYHkbp3mC1NQeW4jHxls9WyqVgRPcyonUbSJmD44UwLfFhbCK2obesWnFi7VOnisqLu48Xd6KYuNex7uSCQKWM-nw55zQ23bBgfCYw6h5hiJjFHwJDZYm65zXpQ',
+ id: '17920786367196703'
+ }
+ },
+ from: {
+ username: 'Sender-id-1', id: 'Sender-id-1'
+ },
+ id: 'instagram-message-id-1234' }.with_indifferent_access
+ )
+
+ instagram_webhook.perform_now(story_mention_params[:entry])
+
+ instagram_inbox.reload
+
+ expect(instagram_inbox.messages.count).to be 1
+ expect(instagram_inbox.messages.last.attachments.count).to be 1
+ end
end
end
end
diff --git a/swagger/definitions/resource/report.yml b/swagger/definitions/resource/report.yml
index 9a4bffe9c..8dcbf3f0e 100644
--- a/swagger/definitions/resource/report.yml
+++ b/swagger/definitions/resource/report.yml
@@ -1,6 +1,29 @@
type: object
properties:
- value:
- type: number
- timestamp:
+ avg_first_response_time:
type: string
+ avg_resolution_time:
+ type: string
+ conversations_count:
+ type: number
+ incoming_messages_count:
+ type: number
+ outgoing_messages_count:
+ type: number
+ resolutions_count:
+ type: number
+ previous:
+ type: object
+ properties:
+ avg_first_response_time:
+ type: string
+ avg_resolution_time:
+ type: string
+ conversations_count:
+ type: number
+ incoming_messages_count:
+ type: number
+ outgoing_messages_count:
+ type: number
+ resolutions_count:
+ type: number
\ No newline at end of file
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 39cc9f95a..8e574fedc 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -4692,11 +4692,46 @@
{
"type": "object",
"properties": {
- "value": {
+ "avg_first_response_time": {
+ "type": "string"
+ },
+ "avg_resolution_time": {
+ "type": "string"
+ },
+ "conversations_count": {
"type": "number"
},
- "timestamp": {
- "type": "string"
+ "incoming_messages_count": {
+ "type": "number"
+ },
+ "outgoing_messages_count": {
+ "type": "number"
+ },
+ "resolutions_count": {
+ "type": "number"
+ },
+ "previous": {
+ "type": "object",
+ "properties": {
+ "avg_first_response_time": {
+ "type": "string"
+ },
+ "avg_resolution_time": {
+ "type": "string"
+ },
+ "conversations_count": {
+ "type": "number"
+ },
+ "incoming_messages_count": {
+ "type": "number"
+ },
+ "outgoing_messages_count": {
+ "type": "number"
+ },
+ "resolutions_count": {
+ "type": "number"
+ }
+ }
}
}
}
|