+
+
+
+
diff --git a/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue b/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue
new file mode 100644
index 000000000..ba8090e02
--- /dev/null
+++ b/app/javascript/dashboard/components-next/CustomAttributes/DateAttribute.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+ {{ formattedDate }}
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/CustomAttributes/ListAttribute.vue b/app/javascript/dashboard/components-next/CustomAttributes/ListAttribute.vue
new file mode 100644
index 000000000..a9831762f
--- /dev/null
+++ b/app/javascript/dashboard/components-next/CustomAttributes/ListAttribute.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/CustomAttributes/OtherAttribute.vue b/app/javascript/dashboard/components-next/CustomAttributes/OtherAttribute.vue
new file mode 100644
index 000000000..e76a744be
--- /dev/null
+++ b/app/javascript/dashboard/components-next/CustomAttributes/OtherAttribute.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+ {{
+ attribute.value ||
+ t('CONTACTS_LAYOUT.SIDEBAR.ATTRIBUTES.TRIGGER.SELECT')
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{ attribute.value }}
+
+
+ {{
+ attribute.value ||
+ t('CONTACTS_LAYOUT.SIDEBAR.ATTRIBUTES.TRIGGER.INPUT')
+ }}
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/CustomAttributes/story/CustomAttributes.story.vue b/app/javascript/dashboard/components-next/CustomAttributes/story/CustomAttributes.story.vue
new file mode 100644
index 000000000..ea87a3f0c
--- /dev/null
+++ b/app/javascript/dashboard/components-next/CustomAttributes/story/CustomAttributes.story.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ attribute.attributeDisplayName }}
+
+
+
+
+
+
+
+
+ {{ attribute.attributeDisplayName }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/Label/LabelItem.vue b/app/javascript/dashboard/components-next/Label/LabelItem.vue
new file mode 100644
index 000000000..b96b9b368
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Label/LabelItem.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ {{ label.title }}
+
+
+
diff --git a/app/javascript/dashboard/components-next/Label/story/AddLabel.story.vue b/app/javascript/dashboard/components-next/Label/story/AddLabel.story.vue
new file mode 100644
index 000000000..ea6466feb
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Label/story/AddLabel.story.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/app/javascript/dashboard/components-next/button/Button.vue b/app/javascript/dashboard/components-next/button/Button.vue
index 02dcfad53..fecdbaf9b 100644
--- a/app/javascript/dashboard/components-next/button/Button.vue
+++ b/app/javascript/dashboard/components-next/button/Button.vue
@@ -1,46 +1,85 @@
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue
index 176c3dee6..246eba5aa 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue
@@ -1,7 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/ActiveFilterPreview.vue b/app/javascript/dashboard/components-next/filter/ActiveFilterPreview.vue
new file mode 100644
index 000000000..227037772
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/ActiveFilterPreview.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/ConditionRow.vue b/app/javascript/dashboard/components-next/filter/ConditionRow.vue
new file mode 100644
index 000000000..e2a2bfb45
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/ConditionRow.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/ContactsFilter.vue b/app/javascript/dashboard/components-next/filter/ContactsFilter.vue
new file mode 100644
index 000000000..cff2e71e3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/ContactsFilter.vue
@@ -0,0 +1,174 @@
+
+
+
+ , filterGroups: import('vue').ComputedRef }}
+ */
+export function useContactFilterContext() {
+ const { t } = useI18n();
+
+ const contactAttributes = useMapGetter('attributes/getContactAttributes');
+
+ const {
+ equalityOperators,
+ containmentOperators,
+ dateOperators,
+ getOperatorTypes,
+ } = useOperators();
+
+ /**
+ * @type {import('vue').ComputedRef}
+ */
+ const customFilterTypes = computed(() =>
+ buildAttributesFilterTypes(contactAttributes.value, getOperatorTypes)
+ );
+
+ /**
+ * @type {import('vue').ComputedRef}
+ */
+ const filterTypes = computed(() => [
+ {
+ attributeKey: 'name',
+ value: 'name',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.NAME'),
+ label: t('CONTACTS_LAYOUT.FILTER.NAME'),
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'email',
+ value: 'email',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.EMAIL'),
+ label: t('CONTACTS_LAYOUT.FILTER.EMAIL'),
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: containmentOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'phone_number',
+ value: 'phone_number',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.PHONE_NUMBER'),
+ label: t('CONTACTS_LAYOUT.FILTER.PHONE_NUMBER'),
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: containmentOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'identifier',
+ value: 'identifier',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.IDENTIFIER'),
+ label: t('CONTACTS_LAYOUT.FILTER.IDENTIFIER'),
+ inputType: 'plainText',
+ dataType: 'number',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'country_code',
+ value: 'country_code',
+ attributeName: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
+ label: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
+ inputType: 'searchSelect',
+ options: countries,
+ dataType: 'number',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'additional',
+ },
+ {
+ attributeKey: 'city',
+ value: 'city',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.CITY'),
+ label: t('CONTACTS_LAYOUT.FILTER.CITY'),
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: containmentOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'created_at',
+ value: 'created_at',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.CREATED_AT'),
+ label: t('CONTACTS_LAYOUT.FILTER.CREATED_AT'),
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: dateOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'last_activity_at',
+ value: 'last_activity_at',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.LAST_ACTIVITY'),
+ label: t('CONTACTS_LAYOUT.FILTER.LAST_ACTIVITY'),
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: dateOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'referer',
+ value: 'referer',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.REFERER_LINK'),
+ label: t('CONTACTS_LAYOUT.FILTER.REFERER_LINK'),
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: containmentOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'blocked',
+ value: 'blocked',
+ attributeName: t('CONTACTS_LAYOUT.FILTER.BLOCKED'),
+ label: t('CONTACTS_LAYOUT.FILTER.BLOCKED'),
+ inputType: 'searchSelect',
+ options: [
+ {
+ id: 'true',
+ name: t('CONTACTS_LAYOUT.FILTER.BLOCKED_TRUE'),
+ },
+ {
+ id: 'false',
+ name: t('CONTACTS_LAYOUT.FILTER.BLOCKED_FALSE'),
+ },
+ ],
+ dataType: 'text',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'standard',
+ },
+ ...customFilterTypes.value,
+ ]);
+
+ return { filterTypes };
+}
diff --git a/app/javascript/dashboard/components-next/filter/fixtures/filterTypes.js b/app/javascript/dashboard/components-next/filter/fixtures/filterTypes.js
new file mode 100644
index 000000000..0eb618535
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/fixtures/filterTypes.js
@@ -0,0 +1,603 @@
+export const filterTypes = [
+ {
+ attributeKey: 'status',
+ value: 'status',
+ attributeName: 'Status',
+ label: 'Status',
+ inputType: 'multiSelect',
+ options: [
+ { id: 'open', name: 'Open' },
+ { id: 'resolved', name: 'Resolved' },
+ { id: 'pending', name: 'Pending' },
+ { id: 'snoozed', name: 'Snoozed' },
+ { id: 'all', name: 'All' },
+ ],
+ dataType: 'text',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'assignee_id',
+ value: 'assignee_id',
+ attributeName: 'Assignee name',
+ label: 'Assignee name',
+ inputType: 'searchSelect',
+ options: [
+ { id: 14, name: 'Ben Nugent' },
+ { id: 30, name: 'Bruce' },
+ { id: 16, name: 'Cathy Simms' },
+ { id: 7, name: 'Charles Miner' },
+ { id: 10, name: 'Craig D' },
+ { id: 9, name: 'Dan Gore' },
+ { id: 13, name: 'Danny Cordray' },
+ { id: 3, name: 'David Wallace' },
+ { id: 4, name: 'Deangelo Vickers' },
+ { id: 33, name: 'Devon White' },
+ { id: 8, name: 'Ed Truck' },
+ { id: 31, name: 'Frank' },
+ { id: 29, name: 'Gideon' },
+ { id: 24, name: 'Glenn Max' },
+ ],
+ dataType: 'text',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'is_present',
+ label: 'Is present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-member-of-bold',
+ },
+ {
+ value: 'is_not_present',
+ label: 'Is not present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-not-member-of',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'team_id',
+ value: 'team_id',
+ attributeName: 'Team name',
+ label: 'Team name',
+ inputType: 'searchSelect',
+ options: [
+ { id: 223, name: 'š° sales' },
+ { id: 224, name: 'š¼ management' },
+ { id: 225, name: 'š©āš¼ administration' },
+ { id: 226, name: 'š warehouse' },
+ ],
+ dataType: 'number',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'is_present',
+ label: 'Is present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-member-of-bold',
+ },
+ {
+ value: 'is_not_present',
+ label: 'Is not present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-not-member-of',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'display_id',
+ value: 'display_id',
+ attributeName: 'Conversation identifier',
+ label: 'Conversation identifier',
+ inputType: 'plainText',
+ datatype: 'number',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'contains',
+ label: 'Contains',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-superset-of-bold',
+ },
+ {
+ value: 'does_not_contain',
+ label: 'Does not contain',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-superset-of',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'campaign_id',
+ value: 'campaign_id',
+ attributeName: 'Campaign name',
+ label: 'Campaign name',
+ inputType: 'searchSelect',
+ options: [],
+ datatype: 'number',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'is_present',
+ label: 'Is present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-member-of-bold',
+ },
+ {
+ value: 'is_not_present',
+ label: 'Is not present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-not-member-of',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'labels',
+ value: 'labels',
+ attributeName: 'Labels',
+ label: 'Labels',
+ inputType: 'multiSelect',
+ options: [
+ { id: 'billing', name: 'billing' },
+ { id: 'delivery', name: 'delivery' },
+ { id: 'lead', name: 'lead' },
+ { id: 'ops-handover', name: 'ops-handover' },
+ { id: 'premium-customer', name: 'premium-customer' },
+ { id: 'software', name: 'software' },
+ ],
+ dataType: 'text',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'is_present',
+ label: 'Is present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-member-of-bold',
+ },
+ {
+ value: 'is_not_present',
+ label: 'Is not present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-not-member-of',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'referer',
+ value: 'referer',
+ attributeName: 'Referer link',
+ label: 'Referer link',
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'contains',
+ label: 'Contains',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-superset-of-bold',
+ },
+ {
+ value: 'does_not_contain',
+ label: 'Does not contain',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-superset-of',
+ },
+ ],
+ attributeModel: 'additional',
+ },
+ {
+ attributeKey: 'created_at',
+ value: 'created_at',
+ attributeName: 'Created at',
+ label: 'Created at',
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: [
+ {
+ value: 'is_greater_than',
+ label: 'Is greater than',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-greater-than-bold',
+ },
+ {
+ value: 'is_less_than',
+ label: 'Is lesser than',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-less-than-bold',
+ },
+ {
+ value: 'days_before',
+ label: 'Is x days before',
+ hasInput: true,
+ inputOverride: 'plainText',
+ icon: 'i-ph-calendar-minus-bold',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'last_activity_at',
+ value: 'last_activity_at',
+ attributeName: 'Last activity',
+ label: 'Last activity',
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: [
+ {
+ value: 'is_greater_than',
+ label: 'Is greater than',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-greater-than-bold',
+ },
+ {
+ value: 'is_less_than',
+ label: 'Is lesser than',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-less-than-bold',
+ },
+ {
+ value: 'days_before',
+ label: 'Is x days before',
+ hasInput: true,
+ inputOverride: 'plainText',
+ icon: 'i-ph-calendar-minus-bold',
+ },
+ ],
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'are_you_a_paid_customer',
+ value: 'are_you_a_paid_customer',
+ attributeName: 'Are you a paid customer?',
+ label: 'Are you a paid customer?',
+ inputType: 'booleanSelect',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ ],
+ options: [],
+ attributeModel: 'customAttributes',
+ },
+ {
+ attributeKey: 'date_of_purchase',
+ value: 'date_of_purchase',
+ attributeName: 'Date of Purchase',
+ label: 'Date of Purchase',
+ inputType: 'date',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ {
+ value: 'is_present',
+ label: 'Is present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-member-of-bold',
+ },
+ {
+ value: 'is_not_present',
+ label: 'Is not present',
+ hasInput: false,
+ inputOverride: null,
+ icon: 'i-ph-not-member-of',
+ },
+ {
+ value: 'is_greater_than',
+ label: 'Is greater than',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-greater-than-bold',
+ },
+ {
+ value: 'is_less_than',
+ label: 'Is lesser than',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-less-than-bold',
+ },
+ ],
+ options: [],
+ attributeModel: 'customAttributes',
+ },
+ {
+ attributeKey: 'your_website',
+ value: 'your_website',
+ attributeName: 'Your website',
+ label: 'Your website',
+ inputType: 'plainText',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ ],
+ options: [],
+ attributeModel: 'customAttributes',
+ },
+ {
+ attributeKey: 'are_you_residing_in_india',
+ value: 'are_you_residing_in_india',
+ attributeName: 'Are you residing in India?',
+ label: 'Are you residing in India?',
+ inputType: 'booleanSelect',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ ],
+ options: [],
+ attributeModel: 'customAttributes',
+ },
+ {
+ attributeKey: 'cloud',
+ value: 'cloud',
+ attributeName: 'Cloud',
+ label: 'Cloud',
+ inputType: 'booleanSelect',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ ],
+ options: [],
+ attributeModel: 'customAttributes',
+ },
+ {
+ attributeKey: 'license_type',
+ value: 'license_type',
+ attributeName: 'License Type',
+ label: 'License Type',
+ inputType: 'searchSelect',
+ filterOperators: [
+ {
+ value: 'equal_to',
+ label: 'Equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-equals-bold',
+ },
+ {
+ value: 'not_equal_to',
+ label: 'Not equal to',
+ hasInput: true,
+ inputOverride: null,
+ icon: 'i-ph-not-equals-bold',
+ },
+ ],
+ options: [
+ {
+ id: 'Personal',
+ name: 'Personal',
+ },
+ {
+ id: 'Enterprise',
+ name: 'Enterprise',
+ },
+ {
+ id: 'Teams',
+ name: 'Teams',
+ },
+ {
+ id: 'Professional',
+ name: 'Professional',
+ },
+ ],
+ attributeModel: 'customAttributes',
+ },
+];
+
+export const sampleActiveFilters = [
+ {
+ attributeKey: 'name',
+ filterOperator: 'contains',
+ values: 'John',
+ queryOperator: 'and',
+ },
+ {
+ attributeKey: 'email',
+ filterOperator: 'does_not_contain',
+ values: 'test@chatwoot.com',
+ queryOperator: 'or',
+ },
+ {
+ attributeKey: 'phone_number',
+ filterOperator: 'is_present',
+ values: '+928383822',
+ queryOperator: 'and',
+ },
+ {
+ attributeKey: 'created_at',
+ filterOperator: 'is_greater_than',
+ values: '2024-01-01',
+ queryOperator: 'and',
+ },
+ {
+ attributeKey: 'last_activity',
+ filterOperator: 'days_before',
+ values: '30',
+ queryOperator: 'and',
+ },
+ {
+ attributeKey: 'date_of_birth',
+ filterOperator: 'is_not_present',
+ values: '',
+ queryOperator: 'and',
+ },
+ {
+ attributeKey: 'country',
+ filterOperator: 'not_equal_to',
+ values: { id: 1, name: 'India' },
+ queryOperator: 'and',
+ },
+];
diff --git a/app/javascript/dashboard/components-next/filter/helper/filterHelper.js b/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
new file mode 100644
index 000000000..2160365f6
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
@@ -0,0 +1,49 @@
+/**
+ * Determines the input type for a custom attribute based on its key
+ * @param {string} key - The attribute display type key
+ * @returns {'date'|'plainText'|'searchSelect'|'booleanSelect'} The corresponding input type
+ */
+export const getCustomAttributeInputType = key => {
+ switch (key) {
+ case 'date':
+ return 'date';
+ case 'text':
+ return 'plainText';
+ case 'list':
+ return 'searchSelect';
+ case 'checkbox':
+ return 'booleanSelect';
+ default:
+ return 'plainText';
+ }
+};
+
+/**
+ * Builds filter types for custom attributes
+ * @param {Array} attributes - The attributes array
+ * @param {Function} getOperatorTypes - Function to get operator types
+ * @returns {Array} Array of filter types
+ */
+export const buildAttributesFilterTypes = (attributes, getOperatorTypes) => {
+ return attributes.map(attr => ({
+ attributeKey: attr.attributeKey,
+ value: attr.attributeKey,
+ attributeName: attr.attributeDisplayName,
+ label: attr.attributeDisplayName,
+ inputType: getCustomAttributeInputType(attr.attributeDisplayType),
+ filterOperators: getOperatorTypes(attr.attributeDisplayType),
+ options:
+ attr.attributeDisplayType === 'list'
+ ? attr.attributeValues.map(item => ({ id: item, name: item }))
+ : [],
+ attributeModel: 'customAttributes',
+ }));
+};
+
+/**
+ * Replaces underscores with spaces in a string
+ * @param {string} text - The input string
+ * @returns {string} The string with underscores replaced by spaces
+ */
+export const replaceUnderscoreWithSpace = text =>
+ text?.replaceAll('_', ' ') ?? '';
diff --git a/app/javascript/dashboard/components-next/filter/helper/filterHelper.spec.js b/app/javascript/dashboard/components-next/filter/helper/filterHelper.spec.js
new file mode 100644
index 000000000..58cf92cf3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/helper/filterHelper.spec.js
@@ -0,0 +1,137 @@
+import {
+ getCustomAttributeInputType,
+ buildAttributesFilterTypes,
+ replaceUnderscoreWithSpace,
+} from './filterHelper';
+
+describe('filterHelper', () => {
+ describe('getCustomAttributeInputType', () => {
+ it('returns date for date type', () => {
+ expect(getCustomAttributeInputType('date')).toBe('date');
+ });
+
+ it('returns plainText for text type', () => {
+ expect(getCustomAttributeInputType('text')).toBe('plainText');
+ });
+
+ it('returns searchSelect for list type', () => {
+ expect(getCustomAttributeInputType('list')).toBe('searchSelect');
+ });
+
+ it('returns booleanSelect for checkbox type', () => {
+ expect(getCustomAttributeInputType('checkbox')).toBe('booleanSelect');
+ });
+
+ it('returns plainText for unknown type', () => {
+ expect(getCustomAttributeInputType('unknown')).toBe('plainText');
+ });
+ });
+
+ describe('buildAttributesFilterTypes', () => {
+ const mockGetOperatorTypes = type => {
+ return type === 'list' ? ['is', 'is_not'] : ['contains', 'not_contains'];
+ };
+
+ it('builds filter types for text attributes', () => {
+ const attributes = [
+ {
+ attributeKey: 'test_key',
+ attributeDisplayName: 'Test Name',
+ attributeDisplayType: 'text',
+ attributeValues: [],
+ },
+ ];
+
+ const result = buildAttributesFilterTypes(
+ attributes,
+ mockGetOperatorTypes
+ );
+
+ expect(result).toEqual([
+ {
+ attributeKey: 'test_key',
+ value: 'test_key',
+ attributeName: 'Test Name',
+ label: 'Test Name',
+ inputType: 'plainText',
+ filterOperators: ['contains', 'not_contains'],
+ options: [],
+ attributeModel: 'customAttributes',
+ },
+ ]);
+ });
+
+ it('builds filter types for list attributes with options', () => {
+ const attributes = [
+ {
+ attributeKey: 'list_key',
+ attributeDisplayName: 'List Name',
+ attributeDisplayType: 'list',
+ attributeValues: ['option1', 'option2'],
+ },
+ ];
+
+ const result = buildAttributesFilterTypes(
+ attributes,
+ mockGetOperatorTypes
+ );
+
+ expect(result).toEqual([
+ {
+ attributeKey: 'list_key',
+ value: 'list_key',
+ attributeName: 'List Name',
+ label: 'List Name',
+ inputType: 'searchSelect',
+ filterOperators: ['is', 'is_not'],
+ options: [
+ { id: 'option1', name: 'option1' },
+ { id: 'option2', name: 'option2' },
+ ],
+ attributeModel: 'customAttributes',
+ },
+ ]);
+ });
+
+ it('handles multiple attributes', () => {
+ const attributes = [
+ {
+ attributeKey: 'date_key',
+ attributeDisplayName: 'Date Name',
+ attributeDisplayType: 'date',
+ attributeValues: [],
+ },
+ {
+ attributeKey: 'checkbox_key',
+ attributeDisplayName: 'Checkbox Name',
+ attributeDisplayType: 'checkbox',
+ attributeValues: [],
+ },
+ ];
+
+ const result = buildAttributesFilterTypes(
+ attributes,
+ mockGetOperatorTypes
+ );
+
+ expect(result).toHaveLength(2);
+ expect(result[0].inputType).toBe('date');
+ expect(result[1].inputType).toBe('booleanSelect');
+ });
+
+ it('handles empty attributes array', () => {
+ const result = buildAttributesFilterTypes([], mockGetOperatorTypes);
+ expect(result).toEqual([]);
+ });
+ });
+
+ describe('replaceUnderscoreWithSpace', () => {
+ it('replaces underscores with spaces', () => {
+ expect(replaceUnderscoreWithSpace('test_key')).toBe('test key');
+ });
+
+ it('returns empty string if input is null', () => {
+ expect(replaceUnderscoreWithSpace(null)).toBe('');
+ });
+ });
+});
diff --git a/app/javascript/dashboard/components-next/filter/inputs/FilterSelect.story.vue b/app/javascript/dashboard/components-next/filter/inputs/FilterSelect.story.vue
new file mode 100644
index 000000000..23b76081e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/inputs/FilterSelect.story.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/inputs/FilterSelect.vue b/app/javascript/dashboard/components-next/filter/inputs/FilterSelect.vue
new file mode 100644
index 000000000..db420920b
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/inputs/FilterSelect.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.story.vue b/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.story.vue
new file mode 100644
index 000000000..6452945f3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.story.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue b/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue
new file mode 100644
index 000000000..be11847fb
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ option.name }}
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/inputs/SingleSelect.story.vue b/app/javascript/dashboard/components-next/filter/inputs/SingleSelect.story.vue
new file mode 100644
index 000000000..233a958f2
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/inputs/SingleSelect.story.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/inputs/SingleSelect.vue b/app/javascript/dashboard/components-next/filter/inputs/SingleSelect.vue
new file mode 100644
index 000000000..7fb143883
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/inputs/SingleSelect.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ option.name }}
+
+
+
+
+ {{ t('COMBOBOX.EMPTY_SEARCH_RESULTS', { searchTerm: searchTerm }) }}
+
+
+
+
+ {{ t('COMBOBOX.EMPTY_STATE') }}
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/operators.js b/app/javascript/dashboard/components-next/filter/operators.js
new file mode 100644
index 000000000..22af84a89
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/operators.js
@@ -0,0 +1,164 @@
+import { computed, h } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+/**
+ * @typedef {Object} FilterOperations
+ * @property {string} EQUAL_TO - Equals comparison
+ * @property {string} NOT_EQUAL_TO - Not equals comparison
+ * @property {string} IS_PRESENT - Present check
+ * @property {string} IS_NOT_PRESENT - Not present check
+ * @property {string} CONTAINS - Contains check
+ * @property {string} DOES_NOT_CONTAIN - Does not contain check
+ * @property {string} IS_GREATER_THAN - Greater than comparison
+ * @property {string} IS_LESS_THAN - Less than comparison
+ * @property {string} DAYS_BEFORE - Days before check
+ * @property {string} STARTS_WITH - Starts with check
+ */
+
+/**
+ * @typedef {Object} Operator
+ * @property {string} value - Operator value from FILTER_OPS
+ * @property {string} label - Translated display label
+ * @property {import('vue').VNode} icon - Vue icon component instance
+ * @property {string|null} inputOverride - Input field type override
+ * @property {boolean} hasInput - Whether operator requires an input value
+ */
+
+const FILTER_OPS = {
+ EQUAL_TO: 'equal_to',
+ NOT_EQUAL_TO: 'not_equal_to',
+ IS_PRESENT: 'is_present',
+ IS_NOT_PRESENT: 'is_not_present',
+ CONTAINS: 'contains',
+ DOES_NOT_CONTAIN: 'does_not_contain',
+ IS_GREATER_THAN: 'is_greater_than',
+ IS_LESS_THAN: 'is_less_than',
+ DAYS_BEFORE: 'days_before',
+ STARTS_WITH: 'starts_with',
+};
+
+const NO_INPUT_OPTS = [FILTER_OPS.IS_PRESENT, FILTER_OPS.IS_NOT_PRESENT];
+
+const OPS_INPUT_OVERRIDE = {
+ [FILTER_OPS.DAYS_BEFORE]: 'plainText',
+};
+
+/**
+ * @type {Record}
+ */
+const filterOperatorIcon = {
+ [FILTER_OPS.EQUAL_TO]: 'i-ph-equals-bold',
+ [FILTER_OPS.NOT_EQUAL_TO]: 'i-ph-not-equals-bold',
+ [FILTER_OPS.IS_PRESENT]: 'i-ph-member-of-bold',
+ [FILTER_OPS.IS_NOT_PRESENT]: 'i-ph-not-member-of-bold',
+ [FILTER_OPS.CONTAINS]: 'i-ph-superset-of-bold',
+ [FILTER_OPS.DOES_NOT_CONTAIN]: 'i-ph-not-superset-of-bold',
+ [FILTER_OPS.IS_GREATER_THAN]: 'i-ph-greater-than-bold',
+ [FILTER_OPS.IS_LESS_THAN]: 'i-ph-less-than-bold',
+ [FILTER_OPS.DAYS_BEFORE]: 'i-ph-calendar-minus-bold',
+ [FILTER_OPS.STARTS_WITH]: 'i-ph-caret-line-right-bold',
+};
+
+/**
+ * Vue composable providing access to filter operators and related functionality
+ * @returns {Object} Collection of operators and utility functions
+ * @property {import('vue').ComputedRef>} operators - All available operators
+ * @property {import('vue').ComputedRef} equalityOperators - Equality comparison operators
+ * @property {import('vue').ComputedRef} presenceOperators - Presence check operators
+ * @property {import('vue').ComputedRef} containmentOperators - Containment check operators
+ * @property {import('vue').ComputedRef} comparisonOperators - Numeric comparison operators
+ * @property {import('vue').ComputedRef} dateOperators - Date-specific operators
+ * @property {(key: 'list'|'text'|'number'|'link'|'date'|'checkbox') => Operator[]} getOperatorTypes - Get operators for a field type
+ */
+export function useOperators() {
+ const { t } = useI18n();
+
+ /** @type {import('vue').ComputedRef>} */
+ const operators = computed(() => {
+ return Object.values(FILTER_OPS).reduce((acc, value) => {
+ acc[value] = {
+ value,
+ label: t(`FILTER.OPERATOR_LABELS.${value}`),
+ hasInput: !NO_INPUT_OPTS.includes(value),
+ inputOverride: OPS_INPUT_OVERRIDE[value] || null,
+ icon: h('span', {
+ class: `${filterOperatorIcon[value]} !text-n-blue-text`,
+ }),
+ };
+ return acc;
+ }, {});
+ });
+
+ /** @type {import('vue').ComputedRef>} */
+ const equalityOperators = computed(() => [
+ operators.value[FILTER_OPS.EQUAL_TO],
+ operators.value[FILTER_OPS.NOT_EQUAL_TO],
+ ]);
+
+ /** @type {import('vue').ComputedRef>} */
+ const presenceOperators = computed(() => [
+ operators.value[FILTER_OPS.EQUAL_TO],
+ operators.value[FILTER_OPS.NOT_EQUAL_TO],
+ operators.value[FILTER_OPS.IS_PRESENT],
+ operators.value[FILTER_OPS.IS_NOT_PRESENT],
+ ]);
+
+ /** @type {import('vue').ComputedRef>} */
+ const containmentOperators = computed(() => [
+ operators.value[FILTER_OPS.EQUAL_TO],
+ operators.value[FILTER_OPS.NOT_EQUAL_TO],
+ operators.value[FILTER_OPS.CONTAINS],
+ operators.value[FILTER_OPS.DOES_NOT_CONTAIN],
+ ]);
+
+ /** @type {import('vue').ComputedRef>} */
+ const comparisonOperators = computed(() => [
+ operators.value[FILTER_OPS.EQUAL_TO],
+ operators.value[FILTER_OPS.NOT_EQUAL_TO],
+ operators.value[FILTER_OPS.IS_PRESENT],
+ operators.value[FILTER_OPS.IS_NOT_PRESENT],
+ operators.value[FILTER_OPS.IS_GREATER_THAN],
+ operators.value[FILTER_OPS.IS_LESS_THAN],
+ ]);
+
+ /** @type {import('vue').ComputedRef>} */
+ const dateOperators = computed(() => [
+ operators.value[FILTER_OPS.IS_GREATER_THAN],
+ operators.value[FILTER_OPS.IS_LESS_THAN],
+ operators.value[FILTER_OPS.DAYS_BEFORE],
+ ]);
+
+ /**
+ * Get operator types based on key
+ * @param {string} key - Type of operator to get
+ * @returns {Array}
+ */
+ const getOperatorTypes = key => {
+ switch (key) {
+ case 'list':
+ return equalityOperators.value;
+ case 'text':
+ return containmentOperators.value;
+ case 'number':
+ return equalityOperators.value;
+ case 'link':
+ return equalityOperators.value;
+ case 'date':
+ return comparisonOperators.value;
+ case 'checkbox':
+ return equalityOperators.value;
+ default:
+ return equalityOperators.value;
+ }
+ };
+
+ return {
+ operators,
+ equalityOperators,
+ presenceOperators,
+ containmentOperators,
+ comparisonOperators,
+ dateOperators,
+ getOperatorTypes,
+ };
+}
diff --git a/app/javascript/dashboard/components-next/filter/provider.js b/app/javascript/dashboard/components-next/filter/provider.js
new file mode 100644
index 000000000..bb775a663
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/provider.js
@@ -0,0 +1,243 @@
+import { computed, h } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useOperators } from './operators';
+import { useMapGetter } from 'dashboard/composables/store.js';
+import { useChannelIcon } from 'next/icon/provider';
+import { buildAttributesFilterTypes } from './helper/filterHelper';
+import countries from 'shared/constants/countries.js';
+import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages.js';
+
+/**
+ * @typedef {Object} FilterOption
+ * @property {string|number} id
+ * @property {string} name
+ * @property {import('vue').VNode} [icon]
+ */
+
+/**
+ * @typedef {Object} FilterOperator
+ * @property {string} value
+ * @property {string} label
+ * @property {string} icon
+ * @property {boolean} hasInput
+ */
+
+/**
+ * @typedef {Object} FilterType
+ * @property {string} attributeKey - The attribute key
+ * @property {string} value - This is a proxy for the attribute key used in FilterSelect
+ * @property {string} attributeName - The attribute name used to display on the UI
+ * @property {string} label - This is a proxy for the attribute name used in FilterSelect
+ * @property {'multiSelect'|'searchSelect'|'plainText'|'date'|'booleanSelect'} inputType - The input type for the attribute
+ * @property {FilterOption[]} [options] - The options available for the attribute if it is a multiSelect or singleSelect type
+ * @property {'text'|'number'} dataType
+ * @property {FilterOperator[]} filterOperators - The operators available for the attribute
+ * @property {'standard'|'additional'|'customAttributes'} attributeModel
+ */
+
+/**
+ * @typedef {Object} FilterGroup
+ * @property {string} name
+ * @property {FilterType[]} attributes
+ */
+
+/**
+ * Composable that provides conversation filtering context
+ * @returns {{ filterTypes: import('vue').ComputedRef, filterGroups: import('vue').ComputedRef }}
+ */
+export function useConversationFilterContext() {
+ const { t } = useI18n();
+
+ const conversationAttributes = useMapGetter(
+ 'attributes/getConversationAttributes'
+ );
+
+ const labels = useMapGetter('labels/getLabels');
+ const agents = useMapGetter('agents/getAgents');
+ const inboxes = useMapGetter('inboxes/getInboxes');
+ const teams = useMapGetter('teams/getTeams');
+ const campaigns = useMapGetter('campaigns/getAllCampaigns');
+
+ const {
+ equalityOperators,
+ presenceOperators,
+ containmentOperators,
+ dateOperators,
+ getOperatorTypes,
+ } = useOperators();
+
+ /**
+ * @type {import('vue').ComputedRef}
+ */
+ const customFilterTypes = computed(() =>
+ buildAttributesFilterTypes(conversationAttributes.value, getOperatorTypes)
+ );
+
+ /**
+ * @type {import('vue').ComputedRef}
+ */
+ const filterTypes = computed(() => [
+ {
+ attributeKey: 'status',
+ value: 'status',
+ attributeName: t('FILTER.ATTRIBUTES.STATUS'),
+ label: t('FILTER.ATTRIBUTES.STATUS'),
+ inputType: 'multiSelect',
+ options: ['open', 'resolved', 'pending', 'snoozed', 'all'].map(id => {
+ return {
+ id,
+ name: t(`CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.${id}.TEXT`),
+ };
+ }),
+ dataType: 'text',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'assignee_id',
+ value: 'assignee_id',
+ attributeName: t('FILTER.ATTRIBUTES.ASSIGNEE_NAME'),
+ label: t('FILTER.ATTRIBUTES.ASSIGNEE_NAME'),
+ inputType: 'searchSelect',
+ options: agents.value.map(agent => {
+ return {
+ id: agent.id,
+ name: agent.name,
+ };
+ }),
+ dataType: 'text',
+ filterOperators: presenceOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'inbox_id',
+ value: 'inbox_id',
+ attributeName: t('FILTER.ATTRIBUTES.INBOX_NAME'),
+ label: t('FILTER.ATTRIBUTES.INBOX_NAME'),
+ inputType: 'searchSelect',
+ options: inboxes.value.map(inbox => {
+ return {
+ ...inbox,
+ icon: useChannelIcon(inbox).value,
+ };
+ }),
+ dataType: 'text',
+ filterOperators: presenceOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'team_id',
+ value: 'team_id',
+ attributeName: t('FILTER.ATTRIBUTES.TEAM_NAME'),
+ label: t('FILTER.ATTRIBUTES.TEAM_NAME'),
+ inputType: 'searchSelect',
+ options: teams.value,
+ dataType: 'number',
+ filterOperators: presenceOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'display_id',
+ value: 'display_id',
+ attributeName: t('FILTER.ATTRIBUTES.CONVERSATION_IDENTIFIER'),
+ label: t('FILTER.ATTRIBUTES.CONVERSATION_IDENTIFIER'),
+ inputType: 'plainText',
+ datatype: 'number',
+ filterOperators: containmentOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'campaign_id',
+ value: 'campaign_id',
+ attributeName: t('FILTER.ATTRIBUTES.CAMPAIGN_NAME'),
+ label: t('FILTER.ATTRIBUTES.CAMPAIGN_NAME'),
+ inputType: 'searchSelect',
+ options: campaigns.value.map(campaign => ({
+ id: campaign.id,
+ name: campaign.title,
+ })),
+ datatype: 'number',
+ filterOperators: presenceOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'labels',
+ value: 'labels',
+ attributeName: t('FILTER.ATTRIBUTES.LABELS'),
+ label: t('FILTER.ATTRIBUTES.LABELS'),
+ inputType: 'multiSelect',
+ options: labels.value.map(label => {
+ return {
+ id: label.title,
+ name: label.title,
+ icon: h('span', {
+ class: `rounded-full`,
+ style: {
+ backgroundColor: label.color,
+ height: '6px',
+ width: '6px',
+ },
+ }),
+ };
+ }),
+ dataType: 'text',
+ filterOperators: presenceOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'browser_language',
+ value: 'browser_language',
+ attributeName: t('FILTER.ATTRIBUTES.BROWSER_LANGUAGE'),
+ label: t('FILTER.ATTRIBUTES.BROWSER_LANGUAGE'),
+ inputType: 'searchSelect',
+ options: languages,
+ dataType: 'text',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'additional',
+ },
+ {
+ attributeKey: 'country_code',
+ value: 'country_code',
+ attributeName: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
+ label: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
+ inputType: 'searchSelect',
+ options: countries,
+ dataType: 'text',
+ filterOperators: equalityOperators.value,
+ attributeModel: 'additional',
+ },
+ {
+ attributeKey: 'referer',
+ value: 'referer',
+ attributeName: t('FILTER.ATTRIBUTES.REFERER_LINK'),
+ label: t('FILTER.ATTRIBUTES.REFERER_LINK'),
+ inputType: 'plainText',
+ dataType: 'text',
+ filterOperators: containmentOperators.value,
+ attributeModel: 'additional',
+ },
+ {
+ attributeKey: 'created_at',
+ value: 'created_at',
+ attributeName: t('FILTER.ATTRIBUTES.CREATED_AT'),
+ label: t('FILTER.ATTRIBUTES.CREATED_AT'),
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: dateOperators.value,
+ attributeModel: 'standard',
+ },
+ {
+ attributeKey: 'last_activity_at',
+ value: 'last_activity_at',
+ attributeName: t('FILTER.ATTRIBUTES.LAST_ACTIVITY'),
+ label: t('FILTER.ATTRIBUTES.LAST_ACTIVITY'),
+ inputType: 'date',
+ dataType: 'text',
+ filterOperators: dateOperators.value,
+ attributeModel: 'standard',
+ },
+ ...customFilterTypes.value,
+ ]);
+
+ return { filterTypes };
+}
diff --git a/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue b/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
index 95a30c902..4f6f47c85 100644
--- a/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
+++ b/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
@@ -17,6 +17,10 @@ const props = defineProps({
type: Number,
default: 16,
},
+ currentPageInfo: {
+ type: String,
+ default: '',
+ },
});
const emit = defineEmits(['update:currentPage']);
const { t } = useI18n();
@@ -39,11 +43,14 @@ const changePage = newPage => {
};
const currentPageInformation = computed(() => {
- return t('PAGINATION_FOOTER.SHOWING', {
- startItem: startItem.value,
- endItem: endItem.value,
- totalItems: props.totalItems,
- });
+ return t(
+ props.currentPageInfo ? props.currentPageInfo : 'PAGINATION_FOOTER.SHOWING',
+ {
+ startItem: startItem.value,
+ endItem: endItem.value,
+ totalItems: props.totalItems,
+ }
+ );
});
const pageInfo = computed(() => {
@@ -68,6 +75,7 @@ const pageInfo = computed(() => {
icon="i-lucide-chevrons-left"
variant="ghost"
size="sm"
+ color="slate"
class="!w-8 !h-6"
:disabled="isFirstPage"
@click="changePage(1)"
@@ -75,6 +83,7 @@ const pageInfo = computed(() => {
-
+
+import Switch from './Switch.vue';
+import { ref } from 'vue';
+
+// Default varian
+const isEnabled = ref(false);
+
+// States variant
+const defaultValue = ref(false);
+const checkedValue = ref(true);
+
+// Events variant
+const eventValue = ref(false);
+const lastChange = ref('No changes yet');
+
+const onChange = value => {
+ lastChange.value = `Changed to: ${value} at ${new Date().toLocaleTimeString()}`;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/switch/Switch.vue b/app/javascript/dashboard/components-next/switch/Switch.vue
new file mode 100644
index 000000000..e8f409c0e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/switch/Switch.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index b3b5a1e36..dc24deefe 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -22,10 +22,10 @@ import {
// https://tanstack.com/virtual/latest/docs/framework/vue/examples/variable
import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller';
import ChatListHeader from './ChatListHeader.vue';
-import ConversationAdvancedFilter from './widgets/conversation/ConversationAdvancedFilter.vue';
+import ConversationFilter from 'next/filter/ConversationFilter.vue';
+import SaveCustomView from 'next/filter/SaveCustomView.vue';
import ChatTypeTabs from './widgets/ChatTypeTabs.vue';
import ConversationItem from './ConversationItem.vue';
-import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews.vue';
import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews.vue';
import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
import IntersectionObserver from './IntersectionObserver.vue';
@@ -37,9 +37,15 @@ import { useBulkActions } from 'dashboard/composables/chatlist/useBulkActions';
import { useFilter } from 'shared/composables/useFilter';
import { useTrack } from 'dashboard/composables';
import { useI18n } from 'vue-i18n';
+import {
+ useCamelCase,
+ useSnakeCase,
+} from 'dashboard/composables/useTransformKeys';
import { useEmitter } from 'dashboard/composables/emitter';
import { useEventListener } from '@vueuse/core';
+import { emitter } from 'shared/helpers/mitt';
+
import wootConstants from 'dashboard/constants/globals';
import advancedFilterOptions from './widgets/conversation/advancedFilterItems';
import filterQueryGenerator from '../helper/filterQueryGenerator.js';
@@ -51,12 +57,11 @@ import {
isOnMentionsView,
isOnUnattendedView,
} from '../store/modules/conversations/helpers/actionHelpers';
-import { CONVERSATION_EVENTS } from '../helper/AnalyticsHelper/events';
-import { emitter } from 'shared/helpers/mitt';
import {
getUserPermissions,
filterItemsByPermission,
} from 'dashboard/helper/permissionsHelper.js';
+import { CONVERSATION_EVENTS } from '../helper/AnalyticsHelper/events';
import { ASSIGNEE_TYPE_TAB_PERMISSIONS } from 'dashboard/constants/permissions.js';
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
@@ -107,7 +112,7 @@ const unAssignedChatsList = useMapGetter('getUnAssignedChats');
const chatListLoading = useMapGetter('getChatListLoadingStatus');
const activeInbox = useMapGetter('getSelectedInbox');
const conversationStats = useMapGetter('conversationStats/getStats');
-const appliedFilters = useMapGetter('getAppliedConversationFilters');
+const appliedFilters = useMapGetter('getAppliedConversationFiltersV2');
const folders = useMapGetter('customViews/getConversationCustomViews');
const agentList = useMapGetter('agents/getAgents');
const teamsList = useMapGetter('teams/getTeams');
@@ -371,6 +376,7 @@ function emitConversationLoaded() {
}
function fetchFilteredConversations(payload) {
+ payload = useSnakeCase(payload);
let page = currentFiltersPage.value + 1;
store
.dispatch('fetchFilteredConversations', {
@@ -383,6 +389,7 @@ function fetchFilteredConversations(payload) {
}
function fetchSavedFilteredConversations(payload) {
+ payload = useSnakeCase(payload);
let page = currentFiltersPage.value + 1;
store
.dispatch('fetchFilteredConversations', {
@@ -393,6 +400,7 @@ function fetchSavedFilteredConversations(payload) {
}
function onApplyFilter(payload) {
+ payload = useSnakeCase(payload);
resetBulkActions();
foldersQuery.value = filterQueryGenerator(payload);
store.dispatch('conversationPage/reset');
@@ -406,10 +414,11 @@ function closeAdvanceFiltersModal() {
}
function onUpdateSavedFilter(payload, folderName) {
+ const transformedPayload = useSnakeCase(payload);
const payloadData = {
...unref(activeFolder),
name: unref(folderName),
- query: filterQueryGenerator(payload),
+ query: filterQueryGenerator(transformedPayload),
};
store.dispatch('customViews/update', payloadData);
closeAdvanceFiltersModal();
@@ -461,17 +470,19 @@ function initializeExistingFilterToModal() {
currentUserDetails.value,
activeAssigneeTab.value
);
+ // TODO: Remove the usage of useCamelCase after migrating useFilter to camelcase
if (statusFilter) {
- appliedFilter.value = [...appliedFilter.value, statusFilter];
+ appliedFilter.value = [...appliedFilter.value, useCamelCase(statusFilter)];
}
+ // TODO: Remove the usage of useCamelCase after migrating useFilter to camelcase
const otherFilters = initializeInboxTeamAndLabelFilterToModal(
props.conversationInbox,
inbox.value,
props.teamId,
activeTeam.value,
props.label
- );
+ ).map(useCamelCase);
appliedFilter.value = [...appliedFilter.value, ...otherFilters];
}
@@ -486,27 +497,47 @@ function initializeFolderToFilterModal(newActiveFolder) {
const query = unref(newActiveFolder)?.query?.payload;
if (!Array.isArray(query)) return;
- const newFilters = query.map(filter => ({
- attribute_key: filter.attribute_key,
- attribute_model: filter.attribute_model,
- filter_operator: filter.filter_operator,
- values: Array.isArray(filter.values)
- ? generateValuesForEditCustomViews(filter, setParamsForEditFolderModal())
- : [],
- query_operator: filter.query_operator,
- custom_attribute_type: filter.custom_attribute_type,
- }));
+ const newFilters = query.map(filter => {
+ const transformed = useCamelCase(filter);
+ const values = Array.isArray(transformed.values)
+ ? generateValuesForEditCustomViews(
+ useSnakeCase(filter),
+ setParamsForEditFolderModal()
+ )
+ : [];
+
+ return {
+ attributeKey: transformed.attributeKey,
+ attributeModel: transformed.attributeModel,
+ customAttributeType: transformed.customAttributeType,
+ filterOperator: transformed.filterOperator,
+ queryOperator: transformed.queryOperator ?? 'and',
+ values,
+ };
+ });
appliedFilter.value = [...appliedFilter.value, ...newFilters];
}
+function initalizeAppliedFiltersToModal() {
+ appliedFilter.value = [...appliedFilters.value];
+}
+
function onToggleAdvanceFiltersModal() {
+ if (showAdvancedFilters.value === true) {
+ closeAdvanceFiltersModal();
+ return;
+ }
+
if (!hasAppliedFilters.value && !hasActiveFolders.value) {
initializeExistingFilterToModal();
}
if (hasActiveFolders.value) {
initializeFolderToFilterModal(activeFolder.value);
}
+ if (hasAppliedFilters.value) {
+ initalizeAppliedFiltersToModal();
+ }
showAdvancedFilters.value = true;
}
@@ -751,7 +782,7 @@ watch(conversationFilters, (newVal, oldVal) => {
-
+
{
-
+
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue
index 48b746f2a..821b4218b 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue
@@ -27,8 +27,8 @@ const componentIs = computed(() => {
const triggerClick = () => {
if (props.click) {
props.click();
- if (!props.preserveOpen) closeMenu();
}
+ if (!props.preserveOpen) closeMenu();
};
diff --git a/app/javascript/dashboard/components-next/filter/ActiveFilterPreview.story.vue b/app/javascript/dashboard/components-next/filter/ActiveFilterPreview.story.vue
new file mode 100644
index 000000000..0c79b97da
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/ActiveFilterPreview.story.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/ConditionRow.story.vue b/app/javascript/dashboard/components-next/filter/ConditionRow.story.vue
new file mode 100644
index 000000000..0a59a902f
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/ConditionRow.story.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+ {{ replaceUnderscoreWithSpace(filter.attributeKey) }}
+
+
+ {{ formatOperatorLabel(filter.filterOperator) }}
+
+
+ {{ formatFilterValue(filter.values) }}
+
+
+
+
+ {{ filter.queryOperator }}
+
+
+
+ {{ moreFiltersLabel }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t(`FILTER.ERRORS.${validationError}`) }}
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/ConversationFilter.vue b/app/javascript/dashboard/components-next/filter/ConversationFilter.vue
new file mode 100644
index 000000000..d9ccb2c88
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/ConversationFilter.vue
@@ -0,0 +1,175 @@
+
+
+
+ + {{ filterModalHeaderTitle }} +
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/SaveCustomView.vue b/app/javascript/dashboard/components-next/filter/SaveCustomView.vue
new file mode 100644
index 000000000..95b2e0388
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/SaveCustomView.vue
@@ -0,0 +1,130 @@
+
+
+
+ + {{ filterModalHeaderTitle }} +
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/filter/contactProvider.js b/app/javascript/dashboard/components-next/filter/contactProvider.js
new file mode 100644
index 000000000..4aceac359
--- /dev/null
+++ b/app/javascript/dashboard/components-next/filter/contactProvider.js
@@ -0,0 +1,184 @@
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useOperators } from './operators';
+import { useMapGetter } from 'dashboard/composables/store.js';
+import { buildAttributesFilterTypes } from './helper/filterHelper.js';
+import countries from 'shared/constants/countries.js';
+
+/**
+ * @typedef {Object} FilterOption
+ * @property {string|number} id
+ * @property {string} name
+ * @property {import('vue').VNode} [icon]
+ */
+
+/**
+ * @typedef {Object} FilterOperator
+ * @property {string} value
+ * @property {string} label
+ * @property {string} icon
+ * @property {boolean} hasInput
+ */
+
+/**
+ * @typedef {Object} FilterType
+ * @property {string} attributeKey - The attribute key
+ * @property {string} value - This is a proxy for the attribute key used in FilterSelect
+ * @property {string} attributeName - The attribute name used to display on the UI
+ * @property {string} label - This is a proxy for the attribute name used in FilterSelect
+ * @property {'multiSelect'|'searchSelect'|'plainText'|'date'|'booleanSelect'} inputType - The input type for the attribute
+ * @property {FilterOption[]} [options] - The options available for the attribute if it is a multiSelect or singleSelect type
+ * @property {'text'|'number'} dataType
+ * @property {FilterOperator[]} filterOperators - The operators available for the attribute
+ * @property {'standard'|'additional'|'customAttributes'} attributeModel
+ */
+
+/**
+ * @typedef {Object} FilterGroup
+ * @property {string} name
+ * @property {FilterType[]} attributes
+ */
+
+/**
+ * Composable that provides conversation filtering context
+ * @returns {{ filterTypes: import('vue').ComputedRef+ {{ $t('FILTER.CUSTOM_VIEWS.ADD.TITLE') }} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Default:
+
+
+
+ Checked:
+
+
+
+ Last change: {{ lastChange }}
+
+
+
- {
/>
- {
@click="emit('deleteFolders')"
/>
- {
this.snackMessages.splice(0, 1);
- }, this.duration);
+ }, duration);
},
},
};
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js b/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
index d615bd15c..fe148163e 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
@@ -4,7 +4,7 @@ const contacts = accountId => ({
parentNav: 'contacts',
routes: [
'contacts_dashboard',
- 'contact_profile_dashboard',
+ 'contacts_edit',
'contacts_segments_dashboard',
'contacts_labels_dashboard',
],
diff --git a/app/javascript/dashboard/components/table/Pagination.vue b/app/javascript/dashboard/components/table/Pagination.vue
index 42fd99339..6de3d851c 100644
--- a/app/javascript/dashboard/components/table/Pagination.vue
+++ b/app/javascript/dashboard/components/table/Pagination.vue
@@ -54,7 +54,7 @@ const end = computed(() => {
@@ -70,7 +70,7 @@ const end = computed(() => {
{
v-for="page in visiblePages"
:key="page"
variant="clear"
- class="size-8 flex items-center justify-center border text-xs leading-none text-center"
- :class="page == currentPage ? 'border-woot-500' : 'border-slate-50'"
+ class="h-8 flex items-center justify-center text-xs leading-none text-center"
+ :class="page == currentPage ? 'border-n-brand' : 'border-slate-50'"
color-scheme="secondary"
@click="table.setPageIndex(page - 1)"
>
-
@@ -105,7 +105,7 @@ const end = computed(() => {
diff --git a/app/javascript/dashboard/components/table/Table.vue b/app/javascript/dashboard/components/table/Table.vue
index 3b84735d1..5936fa314 100644
--- a/app/javascript/dashboard/components/table/Table.vue
+++ b/app/javascript/dashboard/components/table/Table.vue
@@ -1,8 +1,9 @@
-
-
+
+
+
+
-
@@ -62,7 +62,7 @@ const end = computed(() => {
+
{{ $t('REPORT.PAGINATION.RESULTS', { start, end, total }) }}
{{ page }}
-
+
|
|
|---|
{{ user.name }} -+
{{ label }}
@@ -26,7 +26,7 @@ const formatDate = timestamp =>
{{ formatDate(item.created_at) }}
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue b/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue
index 6b1c66d02..3355905c6 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue
@@ -40,9 +40,9 @@ const toggleShowAllNRT = () => {
-
+
{{ $t('SLA.EVENTS.TITLE') }}
+
-
-
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue
new file mode 100644
index 000000000..a491d0829
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactsIndex.vue
@@ -0,0 +1,300 @@
+
+
+
+
-
+
-
+
-
-
+
-
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/routes.js b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
index d9abe796e..ea5238a3b 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/routes.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
@@ -1,48 +1,60 @@
-/* eslint arrow-body-style: 0 */
import { frontendURL } from '../../../helper/URLHelper';
-import ContactsView from './components/ContactsView.vue';
+import ContactsIndex from './pages/ContactsIndex.vue';
import ContactManageView from './pages/ContactManageView.vue';
+const commonMeta = {
+ permissions: ['administrator', 'agent', 'contact_manage'],
+};
+
export const routes = [
{
path: frontendURL('accounts/:accountId/contacts'),
- name: 'contacts_dashboard',
- meta: {
- permissions: ['administrator', 'agent', 'contact_manage'],
- },
- component: ContactsView,
- },
- {
- path: frontendURL('accounts/:accountId/contacts/custom_view/:id'),
- name: 'contacts_segments_dashboard',
- meta: {
- permissions: ['administrator', 'agent', 'contact_manage'],
- },
- component: ContactsView,
- props: route => {
- return { segmentsId: route.params.id };
- },
- },
- {
- path: frontendURL('accounts/:accountId/labels/:label/contacts'),
- name: 'contacts_labels_dashboard',
- meta: {
- permissions: ['administrator', 'agent', 'contact_manage'],
- },
- component: ContactsView,
- props: route => {
- return { label: route.params.label };
- },
+ component: ContactsIndex,
+ meta: commonMeta,
+ children: [
+ {
+ path: '',
+ name: 'contacts_dashboard_index',
+ component: ContactsIndex,
+ meta: commonMeta,
+ },
+ {
+ path: 'segments/:segmentId',
+ name: 'contacts_dashboard_segments_index',
+ component: ContactsIndex,
+ meta: commonMeta,
+ },
+ {
+ path: 'labels/:label',
+ name: 'contacts_dashboard_labels_index',
+ component: ContactsIndex,
+ meta: commonMeta,
+ },
+ ],
},
{
path: frontendURL('accounts/:accountId/contacts/:contactId'),
- name: 'contact_profile_dashboard',
- meta: {
- permissions: ['administrator', 'agent', 'contact_manage'],
- },
component: ContactManageView,
- props: route => {
- return { contactId: route.params.contactId };
- },
+ meta: commonMeta,
+ children: [
+ {
+ path: '',
+ name: 'contacts_edit',
+ component: ContactManageView,
+ meta: commonMeta,
+ },
+ {
+ path: 'segments/:segmentId',
+ name: 'contacts_edit_segment',
+ component: ContactManageView,
+ meta: commonMeta,
+ },
+ {
+ path: 'labels/:label',
+ name: 'contacts_edit_label',
+ component: ContactManageView,
+ meta: commonMeta,
+ },
+ ],
},
];
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesEditPage.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesEditPage.vue
index 736b34096..3bb868a58 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesEditPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesEditPage.vue
@@ -34,10 +34,11 @@ const portalLink = computed(() => {
);
});
-const saveArticle = async ({ ...values }) => {
+const saveArticle = async ({ ...values }, isAsync = false) => {
+ const actionToDispatch = isAsync ? 'articles/updateAsync' : 'articles/update';
isUpdating.value = true;
try {
- await store.dispatch('articles/update', {
+ await store.dispatch(actionToDispatch, {
portalSlug,
articleId: articleSlug,
...values,
@@ -55,6 +56,10 @@ const saveArticle = async ({ ...values }) => {
}
};
+const saveArticleAsync = async ({ ...values }) => {
+ saveArticle({ ...values }, true);
+};
+
const isCategoryArticles = computed(() => {
return (
route.name === 'portals_categories_articles_index' ||
@@ -92,9 +97,7 @@ const previewArticle = () => {
});
};
-onMounted(() => {
- fetchArticleDetails();
-});
+onMounted(fetchArticleDetails);
@@ -103,6 +106,7 @@ onMounted(() => {
:is-updating="isUpdating"
:is-saved="isSaved"
@save-article="saveArticle"
+ @save-article-async="saveArticleAsync"
@preview-article="previewArticle"
@go-back="goBackToArticles"
/>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue
index 18ae1c07e..898d9afb6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue
@@ -10,6 +10,7 @@ defineProps({
required: true,
},
});
+
const emit = defineEmits(['change']);
const onChange = (id, value) => {
emit('change', id, value);
@@ -23,18 +24,22 @@ const onChange = (id, value) => {
>
{{ label }}
-
+
+
+
+
+
+ {{
+ searchQuery || !hasAppliedFilters
+ ? t('CONTACTS_LAYOUT.EMPTY_STATE.SEARCH_EMPTY_STATE_TITLE')
+ : t('CONTACTS_LAYOUT.EMPTY_STATE.LIST_EMPTY_STATE_TITLE')
+ }}
+
+
+
+
+
-
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue
index f09432f83..bd96f3721 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue
@@ -1,98 +1,91 @@
-
@@ -100,27 +93,19 @@ export default {
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index ca92d44a0..58a014165 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -7,6 +7,8 @@ import ReportFilterSelector from './components/FilterSelector.vue';
import { generateFileName } from '../../../../helper/downloadHelper';
import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
import { FEATURE_FLAGS } from '../../../../featureFlags';
+import V4Button from 'dashboard/components-next/button/Button.vue';
+import ReportHeader from './components/ReportHeader.vue';
export default {
name: 'CsatResponses',
@@ -14,6 +16,8 @@ export default {
CsatMetrics,
CsatTable,
ReportFilterSelector,
+ ReportHeader,
+ V4Button,
},
data() {
return {
@@ -108,26 +112,26 @@ export default {
-
+
+
-
-
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/InboxReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/InboxReports.vue
index 96d573829..100094f65 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/InboxReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/InboxReports.vue
@@ -1,11 +1,5 @@
-
@@ -15,5 +9,6 @@ export default {
getter-key="inboxes/getInboxes"
action-key="inboxes/get"
:download-button-label="$t('INBOX_REPORTS.DOWNLOAD_INBOX_REPORTS')"
+ :report-title="$t('INBOX_REPORTS.HEADER')"
/>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index 274c13b30..858ceb4ad 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -1,4 +1,5 @@
-
-
-
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/LabelReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/LabelReports.vue
index d3792bd79..04d7dc7ff 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/LabelReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/LabelReports.vue
@@ -1,11 +1,5 @@
-
@@ -15,5 +9,6 @@ export default {
getter-key="labels/getLabels"
action-key="labels/get"
:download-button-label="$t('LABEL_REPORTS.DOWNLOAD_LABEL_REPORTS')"
+ :report-title="$t('LABEL_REPORTS.HEADER')"
/>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
index 589dddfea..71b001138 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
@@ -10,10 +10,12 @@ import getUnixTime from 'date-fns/getUnixTime';
import startOfDay from 'date-fns/startOfDay';
import subDays from 'date-fns/subDays';
import { emitter } from 'shared/helpers/mitt';
+import ReportHeader from './components/ReportHeader.vue';
export default {
name: 'LiveReports',
components: {
+ ReportHeader,
AgentTable,
MetricCard,
ReportHeatmap,
@@ -123,83 +125,75 @@ export default {
-
-
-
-
-
-
-
-
-
-
- - {{ name }} --- {{ metric }} - -
-
-
-
-
-
- - {{ name }} --- {{ metric }} - -
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
index 449a68be5..52058d359 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
@@ -135,7 +135,7 @@ export default {
+
+ {{ name }} +++ {{ metric }} + +
-
+
+
+
+ {{ name }} +++ {{ metric }} + +
+
+
+
-
-
+
-
-
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/TeamReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/TeamReports.vue
index 523186b8d..d441c986b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/TeamReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/TeamReports.vue
@@ -1,11 +1,5 @@
-
@@ -15,5 +9,6 @@ export default {
getter-key="teams/getTeams"
action-key="teams/get"
:download-button-label="$t('TEAM_REPORTS.DOWNLOAD_TEAM_REPORTS')"
+ :report-title="$t('TEAM_REPORTS.HEADER')"
/>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue
index fe8e30ba8..e8d8eccf9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue
@@ -38,7 +38,7 @@ onMounted(fetchMetrics);
+
{{ metric.NAME }}
-
+
{{ displayMetric(metric.KEY) }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index d4fe666a7..f33ba9f37 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -86,7 +86,7 @@ export default {
{{ $t('CSAT_REPORTS.NO_RECORDS') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
index 6eae61836..4e66f6350 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -178,7 +178,7 @@ export default {
-
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue
index 3a02deb73..2a21ab1be 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue
@@ -53,7 +53,6 @@ const closeDropdown = () => emit('closeDropdown');
+
+ {{ headerTitle }}
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
index dff88eae9..4c6aff970 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
@@ -22,26 +22,23 @@ defineProps({
-
+
+
+ |
-
+
+
+
{{ header }}
-
+
{{ $t('OVERVIEW_REPORTS.LIVE') }}
@@ -66,7 +64,7 @@ export default {
class="items-center flex text-base justify-center px-12 py-6"
>
![]()
-
{{ header }}
- + {{ $t('OVERVIEW_REPORTS.LIVE') }} @@ -66,7 +64,7 @@ export default { class="items-center flex text-base justify-center px-12 py-6" >
- ![]()
-
-
diff --git a/app/jobs/internal/process_stale_redis_keys_job.rb b/app/jobs/internal/process_stale_redis_keys_job.rb
new file mode 100644
index 000000000..3afb3b434
--- /dev/null
+++ b/app/jobs/internal/process_stale_redis_keys_job.rb
@@ -0,0 +1,11 @@
+# housekeeping
+# remove contact inboxes that does not have any conversations
+# and are older than 3 months
+
+class Internal::ProcessStaleRedisKeysJob < ApplicationJob
+ queue_as :low
+
+ def perform(account)
+ Internal::RemoveStaleRedisKeysService.new(account_id: account.id).perform
+ end
+end
diff --git a/app/jobs/internal/remove_stale_redis_keys_job.rb b/app/jobs/internal/remove_stale_redis_keys_job.rb
new file mode 100644
index 000000000..667fa398b
--- /dev/null
+++ b/app/jobs/internal/remove_stale_redis_keys_job.rb
@@ -0,0 +1,14 @@
+# housekeeping
+# ensure stale ONLINE PRESENCE KEYS for contacts are removed periodically
+# should result in 50% redis mem size reduction
+
+class Internal::RemoveStaleRedisKeysJob < ApplicationJob
+ queue_as :scheduled_jobs
+
+ def perform
+ Account.find_each do |account|
+ Rails.logger.info "Enqueuing ProcessStaleRedisKeysJob for account #{account.id}"
+ Internal::ProcessStaleRedisKeysJob.perform_later(account)
+ end
+ end
+end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index b9ed804d3..65e56a21f 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -69,6 +69,10 @@ class Attachment < ApplicationRecord
end
end
+ def with_attached_file?
+ [:image, :audio, :video, :file].include?(file_type.to_sym)
+ end
+
private
def file_metadata
diff --git a/app/services/internal/remove_stale_redis_keys_service.rb b/app/services/internal/remove_stale_redis_keys_service.rb
new file mode 100644
index 000000000..a3e1da207
--- /dev/null
+++ b/app/services/internal/remove_stale_redis_keys_service.rb
@@ -0,0 +1,10 @@
+class Internal::RemoveStaleRedisKeysService
+ pattr_initialize [:account_id!]
+
+ def perform(account_id)
+ range_start = (Time.zone.now - PRESENCE_DURATION).to_i
+ # exclusive minimum score is specified by prefixing (
+ # we are clearing old records because this could clogg up the sorted set
+ ::Redis::Alfred.zremrangebyscore(presence_key(account_id, 'Contact'), '-inf', "(#{range_start}")
+ end
+end
diff --git a/app/views/api/v1/profiles/avatar.json.jbuilder b/app/views/api/v1/profiles/avatar.json.jbuilder
new file mode 100644
index 000000000..0a4b4f9fa
--- /dev/null
+++ b/app/views/api/v1/profiles/avatar.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/user', formats: [:json], resource: @user
diff --git a/config/schedule.yml b/config/schedule.yml
index 7a0d2faeb..a92960db8 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -26,3 +26,10 @@ remove_stale_contact_inboxes_job.rb:
cron: '30 22 * * *'
class: 'Internal::RemoveStaleContactInboxesJob'
queue: scheduled_jobs
+
+# executed daily at 2230 UTC
+# which is our lowest traffic time
+remove_stale_redis_keys_job.rb:
+ cron: '30 22 * * *'
+ class: 'Internal::RemoveStaleRedisKeysJob'
+ queue: scheduled_jobs
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 830d03708..6c5d0843e 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -171,8 +171,8 @@ EOF
# None
##############################################################################
function install_dependencies() {
- apt update && apt upgrade -y
- apt install -y curl
+ apt-get update && apt-get upgrade -y
+ apt-get install -y curl
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
mkdir -p /etc/apt/keyrings
@@ -180,9 +180,9 @@ function install_dependencies() {
NODE_MAJOR=20
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
- apt update
+ apt-get update
- apt install -y \
+ apt-get install -y \
git software-properties-common ca-certificates imagemagick libpq-dev \
libxml2-dev libxslt1-dev file g++ gcc autoconf build-essential \
libssl-dev libyaml-dev libreadline-dev gnupg2 \
@@ -203,7 +203,7 @@ function install_dependencies() {
# None
##############################################################################
function install_databases() {
- apt install -y postgresql postgresql-contrib redis-server
+ apt-get install -y postgresql postgresql-contrib redis-server
}
##############################################################################
@@ -216,7 +216,7 @@ function install_databases() {
# None
##############################################################################
function install_webserver() {
- apt install -y nginx nginx-full certbot python3-certbot-nginx
+ apt-get install -y nginx nginx-full certbot python3-certbot-nginx
}
##############################################################################
@@ -752,9 +752,9 @@ function upgrade_redis() {
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
- apt update -y
- apt upgrade redis-server -y
- apt install libvips -y
+ apt-get update -y
+ apt-get upgrade redis-server -y
+ apt-get install libvips -y
}
@@ -787,8 +787,8 @@ function upgrade_node() {
NODE_MAJOR=20
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
- apt update
- apt install nodejs -y
+ apt-get update
+ apt-get install nodejs -y
}
@@ -989,7 +989,7 @@ function cwctl_upgrade_check() {
#Check if pip is not installed, and install it if not
if ! command -v pip3 &> /dev/null; then
echo "Installing pip..."
- apt install -y python3-pip
+ apt-get install -y python3-pip
fi
# Check if packaging library is installed, and install it if not
@@ -1025,7 +1025,7 @@ function install_packaging() {
ubuntu_version=$(lsb_release -r | awk '{print $2}')
if [[ "$ubuntu_version" == "24.04" ]]; then
echo "Detected Ubuntu 24.04. Installing packaging library using apt."
- apt install -y python3-packaging
+ apt-get install -y python3-packaging
else
echo "Installing packaging library using pip."
python3 -m pip install packaging
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index aa9d3ad5b..20a65905c 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -117,6 +117,8 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
end
def upload_file
+ return unless message.attachments.first.with_attached_file?
+
result = slack_client.files_upload({
channels: hook.reference_id,
initial_comment: 'Attached File!',
diff --git a/package.json b/package.json
index fc2de8c7d..08a9d0bf2 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"@chatwoot/captain": "0.0.3-alpha.4",
"@chatwoot/ninja-keys": "1.2.3",
"@chatwoot/prosemirror-schema": "1.1.1-next",
- "@chatwoot/utils": "^0.0.25",
+ "@chatwoot/utils": "^0.0.30",
"@formkit/core": "^1.6.7",
"@formkit/vue": "^1.6.7",
"@hcaptcha/vue3-hcaptcha": "^1.3.0",
@@ -53,8 +53,8 @@
"@vue/compiler-sfc": "^3.5.8",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
- "@vueuse/components": "^11.1.0",
- "@vueuse/core": "^11.1.0",
+ "@vueuse/components": "^12.0.0",
+ "@vueuse/core": "^12.0.0",
"activestorage": "^5.2.6",
"axios": "^1.7.7",
"camelcase-keys": "^9.1.3",
@@ -77,6 +77,7 @@
"mitt": "^3.0.1",
"opus-recorder": "^8.0.5",
"semver": "7.6.3",
+ "snakecase-keys": "^8.0.1",
"timezone-phone-codes": "^0.0.2",
"tinykeys": "^3.0.0",
"turbolinks": "^5.2.0",
@@ -88,7 +89,7 @@
"vue-chartjs": "5.3.1",
"vue-datepicker-next": "^1.0.3",
"vue-dompurify-html": "^5.1.0",
- "vue-i18n": "9.14.0",
+ "vue-i18n": "9.14.2",
"vue-letter": "^0.2.0",
"vue-multiselect": "3.1.0",
"vue-router": "~4.4.5",
@@ -105,6 +106,7 @@
"@histoire/plugin-vue": "0.17.15",
"@iconify-json/logos": "^1.2.3",
"@iconify-json/lucide": "^1.2.11",
+ "@iconify-json/ph": "^1.2.1",
"@iconify-json/ri": "^1.2.3",
"@size-limit/file": "^8.2.4",
"@vitest/coverage-v8": "2.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ed87f5009..5642db061 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,8 +26,8 @@ importers:
specifier: 1.1.1-next
version: 1.1.1-next
'@chatwoot/utils':
- specifier: ^0.0.25
- version: 0.0.25
+ specifier: ^0.0.30
+ version: 0.0.30
'@formkit/core':
specifier: ^1.6.7
version: 1.6.7
@@ -83,11 +83,11 @@ importers:
specifier: ^2.0.4
version: 2.0.4(vue@3.5.12(typescript@5.6.2))
'@vueuse/components':
- specifier: ^11.1.0
- version: 11.1.0(vue@3.5.12(typescript@5.6.2))
+ specifier: ^12.0.0
+ version: 12.0.0(typescript@5.6.2)
'@vueuse/core':
- specifier: ^11.1.0
- version: 11.1.0(vue@3.5.12(typescript@5.6.2))
+ specifier: ^12.0.0
+ version: 12.0.0(typescript@5.6.2)
activestorage:
specifier: ^5.2.6
version: 5.2.8
@@ -154,6 +154,9 @@ importers:
semver:
specifier: 7.6.3
version: 7.6.3
+ snakecase-keys:
+ specifier: ^8.0.1
+ version: 8.0.1
timezone-phone-codes:
specifier: ^0.0.2
version: 0.0.2
@@ -188,8 +191,8 @@ importers:
specifier: ^5.1.0
version: 5.1.0(vue@3.5.12(typescript@5.6.2))
vue-i18n:
- specifier: 9.14.0
- version: 9.14.0(vue@3.5.12(typescript@5.6.2))
+ specifier: 9.14.2
+ version: 9.14.2(vue@3.5.12(typescript@5.6.2))
vue-letter:
specifier: ^0.2.0
version: 0.2.0
@@ -233,6 +236,9 @@ importers:
'@iconify-json/lucide':
specifier: ^1.2.11
version: 1.2.11
+ '@iconify-json/ph':
+ specifier: ^1.2.1
+ version: 1.2.1
'@iconify-json/ri':
specifier: ^1.2.3
version: 1.2.3
@@ -395,8 +401,8 @@ packages:
'@chatwoot/prosemirror-schema@1.1.1-next':
resolution: {integrity: sha512-/M2qZ+ZF7GlQNt1riwVP499fvp3hxSqd5iy8hxyF9pkj9qQ+OKYn5JK+v3qwwqQY3IxhmNOn1Lp6tm7vstrd9Q==}
- '@chatwoot/utils@0.0.25':
- resolution: {integrity: sha512-2bGfRewHu0Bra47vHwJa3SdZ0VqXK/2q2ampcc6TT3z8ojSfZqpfMdb+1RKJ/Q1tQEYn/0rJTdWtLDRjePF92A==}
+ '@chatwoot/utils@0.0.30':
+ resolution: {integrity: sha512-UfKn2GUV/9PF7zoj17dAoyx5RZkJihjjclhWTtG0SHRfRizKS/pg0SpXSt9ToAEDeNeRtqmD7RrVMUaso8TZxw==}
engines: {node: '>=10'}
'@codemirror/commands@6.7.0':
@@ -878,6 +884,9 @@ packages:
'@iconify-json/lucide@1.2.11':
resolution: {integrity: sha512-dqpbV7+g1qqxtZOHCZKwdKhtYYqEUjFhYiOg/+PcADbjtapoL+bwa1Brn12gAHq5r2K7Mf29xRHOTmZ3UHHOrw==}
+ '@iconify-json/ph@1.2.1':
+ resolution: {integrity: sha512-x0DNfwWrS18dbsBYOq3XGiZnGz4CgRyC+YSl/TZvMQiKhIUl1woWqUbMYqqfMNUBzjyk7ulvaRovpRsIlqIf8g==}
+
'@iconify-json/ri@1.2.3':
resolution: {integrity: sha512-UVKofd5xkSevGd5K01pvO4NWsu+2C9spu+GxnMZUYymUiaWmpCAxtd22MFSpm6MGf0MP4GCwhDCo1Q8L8oZ9wg==}
@@ -893,16 +902,16 @@ packages:
'@internationalized/number@3.5.4':
resolution: {integrity: sha512-h9huwWjNqYyE2FXZZewWqmCdkw1HeFds5q4Siuoms3hUQC5iPJK3aBmkFZoDSLN4UD0Bl8G22L/NdHpeOr+/7A==}
- '@intlify/core-base@9.14.0':
- resolution: {integrity: sha512-zJn0imh9HIsZZUtt9v8T16PeVstPv6bP2YzlrYJwoF8F30gs4brZBwW2KK6EI5WYKFi3NeqX6+UU4gniz5TkGg==}
+ '@intlify/core-base@9.14.2':
+ resolution: {integrity: sha512-DZyQ4Hk22sC81MP4qiCDuU+LdaYW91A6lCjq8AWPvY3+mGMzhGDfOCzvyR6YBQxtlPjFqMoFk9ylnNYRAQwXtQ==}
engines: {node: '>= 16'}
- '@intlify/message-compiler@9.14.0':
- resolution: {integrity: sha512-sXNsoMI0YsipSXW8SR75drmVK56tnJHoYbPXUv2Cf9lz6FzvwsosFm6JtC1oQZI/kU+n7qx0qRrEWkeYFTgETA==}
+ '@intlify/message-compiler@9.14.2':
+ resolution: {integrity: sha512-YsKKuV4Qv4wrLNsvgWbTf0E40uRv+Qiw1BeLQ0LAxifQuhiMe+hfTIzOMdWj/ZpnTDj4RSZtkXjJM7JDiiB5LQ==}
engines: {node: '>= 16'}
- '@intlify/shared@9.14.0':
- resolution: {integrity: sha512-r+N8KRQL7LgN1TMTs1A2svfuAU0J94Wu9wWdJVJqYsoMMLIeJxrPjazihfHpmJqfgZq0ah3Y9Q4pgWV2O90Fyg==}
+ '@intlify/shared@9.14.2':
+ resolution: {integrity: sha512-uRAHAxYPeF+G5DBIboKpPgC/Waecd4Jz8ihtkpJQD5ycb5PwXp0k/+hBGl5dAjwF7w+l74kz/PKA8r8OK//RUw==}
engines: {node: '>= 16'}
'@isaacs/cliui@8.0.2':
@@ -1793,24 +1802,36 @@ packages:
'@vue/compiler-core@3.5.12':
resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
+ '@vue/compiler-core@3.5.13':
+ resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
+
'@vue/compiler-core@3.5.8':
resolution: {integrity: sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==}
'@vue/compiler-dom@3.5.12':
resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
+ '@vue/compiler-dom@3.5.13':
+ resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
+
'@vue/compiler-dom@3.5.8':
resolution: {integrity: sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==}
'@vue/compiler-sfc@3.5.12':
resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
+ '@vue/compiler-sfc@3.5.13':
+ resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==}
+
'@vue/compiler-sfc@3.5.8':
resolution: {integrity: sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==}
'@vue/compiler-ssr@3.5.12':
resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
+ '@vue/compiler-ssr@3.5.13':
+ resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==}
+
'@vue/compiler-ssr@3.5.8':
resolution: {integrity: sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==}
@@ -1823,20 +1844,37 @@ packages:
'@vue/reactivity@3.5.12':
resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
+ '@vue/reactivity@3.5.13':
+ resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
+
'@vue/runtime-core@3.5.12':
resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
+ '@vue/runtime-core@3.5.13':
+ resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==}
+
'@vue/runtime-dom@3.5.12':
resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
+ '@vue/runtime-dom@3.5.13':
+ resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==}
+
'@vue/server-renderer@3.5.12':
resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
peerDependencies:
vue: 3.5.12
+ '@vue/server-renderer@3.5.13':
+ resolution: {integrity: sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==}
+ peerDependencies:
+ vue: 3.5.13
+
'@vue/shared@3.5.12':
resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
+ '@vue/shared@3.5.13':
+ resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
+
'@vue/shared@3.5.8':
resolution: {integrity: sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==}
@@ -1861,26 +1899,26 @@ packages:
'@vue/composition-api':
optional: true
- '@vueuse/components@11.1.0':
- resolution: {integrity: sha512-8CTbvH1rHfAlqsMdMg6G2OiIvHiHn8HRx0yyJ+Ri/C8J6cLylXAd7VESawoCAkRdAXT4ucPnj/uYHZqEb0JbBQ==}
+ '@vueuse/components@12.0.0':
+ resolution: {integrity: sha512-XpOoBXYRuFuUiiq+HsMX6rGzqvcHdKnbT4sbR0FHYxwSGBHO3Zli8pPTZoLRNBGp4CGov7BRCnANEK/1Ch/6tQ==}
'@vueuse/core@10.11.1':
resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
- '@vueuse/core@11.1.0':
- resolution: {integrity: sha512-P6dk79QYA6sKQnghrUz/1tHi0n9mrb/iO1WTMk/ElLmTyNqgDeSZ3wcDf6fRBGzRJbeG1dxzEOvLENMjr+E3fg==}
+ '@vueuse/core@12.0.0':
+ resolution: {integrity: sha512-C12RukhXiJCbx4MGhjmd/gH52TjJsc3G0E0kQj/kb19H3Nt6n1CA4DRWuTdWWcaFRdlTe0npWDS942mvacvNBw==}
'@vueuse/metadata@10.11.1':
resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
- '@vueuse/metadata@11.1.0':
- resolution: {integrity: sha512-l9Q502TBTaPYGanl1G+hPgd3QX5s4CGnpXriVBR5fEZ/goI6fvDaVmIl3Td8oKFurOxTmbXvBPSsgrd6eu6HYg==}
+ '@vueuse/metadata@12.0.0':
+ resolution: {integrity: sha512-Yzimd1D3sjxTDOlF05HekU5aSGdKjxhuhRFHA7gDWLn57PRbBIh+SF5NmjhJ0WRgF3my7T8LBucyxdFJjIfRJQ==}
'@vueuse/shared@10.11.1':
resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
- '@vueuse/shared@11.1.0':
- resolution: {integrity: sha512-YUtIpY122q7osj+zsNMFAfMTubGz0sn5QzE5gPzAIiCmtt2ha3uQUY1+JPyL4gRCTsLPX82Y9brNbo/aqlA91w==}
+ '@vueuse/shared@12.0.0':
+ resolution: {integrity: sha512-3i6qtcq2PIio5i/vVYidkkcgvmTjCqrf26u+Fd4LhnbBmIT6FN8y6q/GJERp8lfcB9zVEfjdV0Br0443qZuJpw==}
'@xmldom/xmldom@0.7.13':
resolution: {integrity: sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==}
@@ -3472,6 +3510,9 @@ packages:
magic-string@0.30.12:
resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
+ magic-string@0.30.14:
+ resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==}
+
magicast@0.3.4:
resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==}
@@ -3479,6 +3520,10 @@ packages:
resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
engines: {node: '>=10'}
+ map-obj@4.3.0:
+ resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+ engines: {node: '>=8'}
+
map-obj@5.0.0:
resolution: {integrity: sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -3628,6 +3673,11 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
+ nanoid@3.3.8:
+ resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+ engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+ hasBin: true
+
nanoid@5.0.8:
resolution: {integrity: sha512-TcJPw+9RV9dibz1hHUzlLVy8N4X9TnwirAjrU08Juo6BNKggzVfP2ZJ/3ZUSq15Xl5i85i+Z89XBO90pB2PghQ==}
engines: {node: ^18 || >=20}
@@ -3848,6 +3898,9 @@ packages:
picocolors@1.1.0:
resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
+ picocolors@1.1.1:
+ resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
picomatch@2.3.1:
resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
engines: {node: '>=8.6'}
@@ -4099,6 +4152,10 @@ packages:
resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
engines: {node: ^10 || ^12 || >=14}
+ postcss@8.4.49:
+ resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
+ engines: {node: ^10 || ^12 || >=14}
+
prelude-ls@1.2.1:
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
@@ -4414,6 +4471,10 @@ packages:
snake-case@3.0.4:
resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
+ snakecase-keys@8.0.1:
+ resolution: {integrity: sha512-Sj51kE1zC7zh6TDlNNz0/Jn1n5HiHdoQErxO8jLtnyrkJW/M5PrI7x05uDgY3BO7OUQYKCvmeMurW6BPUdwEOw==}
+ engines: {node: '>=18'}
+
sortablejs@1.14.0:
resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
@@ -4902,8 +4963,8 @@ packages:
peerDependencies:
eslint: '>=6.0.0'
- vue-i18n@9.14.0:
- resolution: {integrity: sha512-LxmpRuCt2rI8gqU+kxeflRZMQn4D5+4M3oP3PWZdowW/ePJraHqhF7p4CuaME52mUxdw3Mmy2yAUKgfZYgCRjA==}
+ vue-i18n@9.14.2:
+ resolution: {integrity: sha512-JK9Pm80OqssGJU2Y6F7DcM8RFHqVG4WkuCqOZTVsXkEzZME7ABejAUqUdA931zEBedc4thBgSUWxeQh4uocJAQ==}
engines: {node: '>= 16'}
peerDependencies:
vue: ^3.0.0
@@ -4952,6 +5013,14 @@ packages:
typescript:
optional: true
+ vue@3.5.13:
+ resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
+ peerDependencies:
+ typescript: '*'
+ peerDependenciesMeta:
+ typescript:
+ optional: true
+
vuedraggable@4.1.0:
resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
peerDependencies:
@@ -5218,7 +5287,7 @@ snapshots:
prosemirror-utils: 1.2.2(prosemirror-model@1.22.3)(prosemirror-state@1.4.3)
prosemirror-view: 1.34.1
- '@chatwoot/utils@0.0.25':
+ '@chatwoot/utils@0.0.30':
dependencies:
date-fns: 2.29.3
@@ -5708,6 +5777,10 @@ snapshots:
dependencies:
'@iconify/types': 2.0.0
+ '@iconify-json/ph@1.2.1':
+ dependencies:
+ '@iconify/types': 2.0.0
+
'@iconify-json/ri@1.2.3':
dependencies:
'@iconify/types': 2.0.0
@@ -5734,17 +5807,17 @@ snapshots:
dependencies:
'@swc/helpers': 0.5.15
- '@intlify/core-base@9.14.0':
+ '@intlify/core-base@9.14.2':
dependencies:
- '@intlify/message-compiler': 9.14.0
- '@intlify/shared': 9.14.0
+ '@intlify/message-compiler': 9.14.2
+ '@intlify/shared': 9.14.2
- '@intlify/message-compiler@9.14.0':
+ '@intlify/message-compiler@9.14.2':
dependencies:
- '@intlify/shared': 9.14.0
+ '@intlify/shared': 9.14.2
source-map-js: 1.2.1
- '@intlify/shared@9.14.0': {}
+ '@intlify/shared@9.14.2': {}
'@isaacs/cliui@8.0.2':
dependencies:
@@ -5837,7 +5910,7 @@ snapshots:
'@material/mwc-icon@0.25.3':
dependencies:
lit: 2.2.6
- tslib: 2.6.2
+ tslib: 2.8.1
'@nodelib/fs.scandir@2.1.5':
dependencies:
@@ -5922,7 +5995,7 @@ snapshots:
dependencies:
'@lukeed/uuid': 2.0.0
dset: 3.1.4
- tslib: 2.6.2
+ tslib: 2.8.1
'@segment/analytics.js-video-plugins@0.2.1':
dependencies:
@@ -6785,6 +6858,14 @@ snapshots:
estree-walker: 2.0.2
source-map-js: 1.2.1
+ '@vue/compiler-core@3.5.13':
+ dependencies:
+ '@babel/parser': 7.26.2
+ '@vue/shared': 3.5.13
+ entities: 4.5.0
+ estree-walker: 2.0.2
+ source-map-js: 1.2.1
+
'@vue/compiler-core@3.5.8':
dependencies:
'@babel/parser': 7.25.6
@@ -6798,6 +6879,11 @@ snapshots:
'@vue/compiler-core': 3.5.12
'@vue/shared': 3.5.12
+ '@vue/compiler-dom@3.5.13':
+ dependencies:
+ '@vue/compiler-core': 3.5.13
+ '@vue/shared': 3.5.13
+
'@vue/compiler-dom@3.5.8':
dependencies:
'@vue/compiler-core': 3.5.8
@@ -6815,6 +6901,18 @@ snapshots:
postcss: 8.4.47
source-map-js: 1.2.1
+ '@vue/compiler-sfc@3.5.13':
+ dependencies:
+ '@babel/parser': 7.26.2
+ '@vue/compiler-core': 3.5.13
+ '@vue/compiler-dom': 3.5.13
+ '@vue/compiler-ssr': 3.5.13
+ '@vue/shared': 3.5.13
+ estree-walker: 2.0.2
+ magic-string: 0.30.14
+ postcss: 8.4.49
+ source-map-js: 1.2.1
+
'@vue/compiler-sfc@3.5.8':
dependencies:
'@babel/parser': 7.25.6
@@ -6832,6 +6930,11 @@ snapshots:
'@vue/compiler-dom': 3.5.12
'@vue/shared': 3.5.12
+ '@vue/compiler-ssr@3.5.13':
+ dependencies:
+ '@vue/compiler-dom': 3.5.13
+ '@vue/shared': 3.5.13
+
'@vue/compiler-ssr@3.5.8':
dependencies:
'@vue/compiler-dom': 3.5.8
@@ -6845,11 +6948,20 @@ snapshots:
dependencies:
'@vue/shared': 3.5.12
+ '@vue/reactivity@3.5.13':
+ dependencies:
+ '@vue/shared': 3.5.13
+
'@vue/runtime-core@3.5.12':
dependencies:
'@vue/reactivity': 3.5.12
'@vue/shared': 3.5.12
+ '@vue/runtime-core@3.5.13':
+ dependencies:
+ '@vue/reactivity': 3.5.13
+ '@vue/shared': 3.5.13
+
'@vue/runtime-dom@3.5.12':
dependencies:
'@vue/reactivity': 3.5.12
@@ -6857,14 +6969,29 @@ snapshots:
'@vue/shared': 3.5.12
csstype: 3.1.3
+ '@vue/runtime-dom@3.5.13':
+ dependencies:
+ '@vue/reactivity': 3.5.13
+ '@vue/runtime-core': 3.5.13
+ '@vue/shared': 3.5.13
+ csstype: 3.1.3
+
'@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.6.2))':
dependencies:
'@vue/compiler-ssr': 3.5.12
'@vue/shared': 3.5.12
vue: 3.5.12(typescript@5.6.2)
+ '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.6.2))':
+ dependencies:
+ '@vue/compiler-ssr': 3.5.13
+ '@vue/shared': 3.5.13
+ vue: 3.5.13(typescript@5.6.2)
+
'@vue/shared@3.5.12': {}
+ '@vue/shared@3.5.13': {}
+
'@vue/shared@3.5.8': {}
'@vue/test-utils@2.4.6':
@@ -6882,14 +7009,13 @@ snapshots:
vue: 3.5.12(typescript@5.6.2)
vue-demi: 0.13.11(vue@3.5.12(typescript@5.6.2))
- '@vueuse/components@11.1.0(vue@3.5.12(typescript@5.6.2))':
+ '@vueuse/components@12.0.0(typescript@5.6.2)':
dependencies:
- '@vueuse/core': 11.1.0(vue@3.5.12(typescript@5.6.2))
- '@vueuse/shared': 11.1.0(vue@3.5.12(typescript@5.6.2))
- vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.2))
+ '@vueuse/core': 12.0.0(typescript@5.6.2)
+ '@vueuse/shared': 12.0.0(typescript@5.6.2)
+ vue: 3.5.13(typescript@5.6.2)
transitivePeerDependencies:
- - '@vue/composition-api'
- - vue
+ - typescript
'@vueuse/core@10.11.1(vue@3.5.12(typescript@5.6.2))':
dependencies:
@@ -6901,19 +7027,18 @@ snapshots:
- '@vue/composition-api'
- vue
- '@vueuse/core@11.1.0(vue@3.5.12(typescript@5.6.2))':
+ '@vueuse/core@12.0.0(typescript@5.6.2)':
dependencies:
'@types/web-bluetooth': 0.0.20
- '@vueuse/metadata': 11.1.0
- '@vueuse/shared': 11.1.0(vue@3.5.12(typescript@5.6.2))
- vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.2))
+ '@vueuse/metadata': 12.0.0
+ '@vueuse/shared': 12.0.0(typescript@5.6.2)
+ vue: 3.5.13(typescript@5.6.2)
transitivePeerDependencies:
- - '@vue/composition-api'
- - vue
+ - typescript
'@vueuse/metadata@10.11.1': {}
- '@vueuse/metadata@11.1.0': {}
+ '@vueuse/metadata@12.0.0': {}
'@vueuse/shared@10.11.1(vue@3.5.12(typescript@5.6.2))':
dependencies:
@@ -6922,12 +7047,11 @@ snapshots:
- '@vue/composition-api'
- vue
- '@vueuse/shared@11.1.0(vue@3.5.12(typescript@5.6.2))':
+ '@vueuse/shared@12.0.0(typescript@5.6.2)':
dependencies:
- vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.2))
+ vue: 3.5.13(typescript@5.6.2)
transitivePeerDependencies:
- - '@vue/composition-api'
- - vue
+ - typescript
'@xmldom/xmldom@0.7.13': {}
@@ -7031,7 +7155,7 @@ snapshots:
aria-hidden@1.2.4:
dependencies:
- tslib: 2.7.0
+ tslib: 2.8.1
array-buffer-byte-length@1.0.0:
dependencies:
@@ -7199,7 +7323,7 @@ snapshots:
camel-case@4.1.2:
dependencies:
pascal-case: 3.1.2
- tslib: 2.7.0
+ tslib: 2.8.1
camelcase-css@2.0.1: {}
@@ -7217,7 +7341,7 @@ snapshots:
capital-case@1.0.4:
dependencies:
no-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
upper-case-first: 2.0.2
chai@5.1.1:
@@ -7374,7 +7498,7 @@ snapshots:
constant-case@3.0.4:
dependencies:
no-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
upper-case: 2.0.2
core-js@3.38.1: {}
@@ -7568,7 +7692,7 @@ snapshots:
dot-case@3.0.4:
dependencies:
no-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
dset@3.1.4: {}
@@ -8239,7 +8363,7 @@ snapshots:
header-case@2.0.4:
dependencies:
capital-case: 1.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
highlight.js@11.10.0: {}
@@ -8766,7 +8890,7 @@ snapshots:
lower-case@2.0.2:
dependencies:
- tslib: 2.7.0
+ tslib: 2.8.1
lru-cache@10.4.3: {}
@@ -8794,6 +8918,10 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.0
+ magic-string@0.30.14:
+ dependencies:
+ '@jridgewell/sourcemap-codec': 1.5.0
+
magicast@0.3.4:
dependencies:
'@babel/parser': 7.25.6
@@ -8804,6 +8932,8 @@ snapshots:
dependencies:
semver: 7.6.3
+ map-obj@4.3.0: {}
+
map-obj@5.0.0: {}
markdown-it-anchor@8.6.7(@types/markdown-it@12.2.3)(markdown-it@12.3.2):
@@ -8945,6 +9075,8 @@ snapshots:
nanoid@3.3.7: {}
+ nanoid@3.3.8: {}
+
nanoid@5.0.8: {}
nanospinner@1.1.0:
@@ -8960,7 +9092,7 @@ snapshots:
no-case@3.0.4:
dependencies:
lower-case: 2.0.2
- tslib: 2.7.0
+ tslib: 2.8.1
node-fetch@2.6.11:
dependencies:
@@ -9107,7 +9239,7 @@ snapshots:
param-case@3.0.4:
dependencies:
dot-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
parent-module@1.0.1:
dependencies:
@@ -9122,12 +9254,12 @@ snapshots:
pascal-case@3.1.2:
dependencies:
no-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
path-case@3.0.4:
dependencies:
dot-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
path-exists@4.0.0: {}
@@ -9156,6 +9288,8 @@ snapshots:
picocolors@1.1.0: {}
+ picocolors@1.1.1: {}
+
picomatch@2.3.1: {}
pidtree@0.6.0: {}
@@ -9434,6 +9568,12 @@ snapshots:
picocolors: 1.1.0
source-map-js: 1.2.1
+ postcss@8.4.49:
+ dependencies:
+ nanoid: 3.3.8
+ picocolors: 1.1.1
+ source-map-js: 1.2.1
+
prelude-ls@1.2.1: {}
prettier-linter-helpers@1.0.0:
@@ -9738,7 +9878,7 @@ snapshots:
sentence-case@3.0.4:
dependencies:
no-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
upper-case-first: 2.0.2
set-function-length@1.2.2:
@@ -9813,7 +9953,13 @@ snapshots:
snake-case@3.0.4:
dependencies:
dot-case: 3.0.4
- tslib: 2.7.0
+ tslib: 2.8.1
+
+ snakecase-keys@8.0.1:
+ dependencies:
+ map-obj: 4.3.0
+ snake-case: 3.0.4
+ type-fest: 4.26.1
sortablejs@1.14.0: {}
@@ -10186,11 +10332,11 @@ snapshots:
upper-case-first@2.0.2:
dependencies:
- tslib: 2.7.0
+ tslib: 2.8.1
upper-case@2.0.2:
dependencies:
- tslib: 2.7.0
+ tslib: 2.8.1
uri-js@4.4.1:
dependencies:
@@ -10351,11 +10497,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
- vue-i18n@9.14.0(vue@3.5.12(typescript@5.6.2)):
+ vue-i18n@9.14.2(vue@3.5.12(typescript@5.6.2)):
dependencies:
- '@intlify/core-base': 9.14.0
- '@intlify/shared': 9.14.0
- '@vue/devtools-api': 6.6.3
+ '@intlify/core-base': 9.14.2
+ '@intlify/shared': 9.14.2
+ '@vue/devtools-api': 6.6.4
vue: 3.5.12(typescript@5.6.2)
vue-letter@0.2.0:
@@ -10400,6 +10546,16 @@ snapshots:
optionalDependencies:
typescript: 5.6.2
+ vue@3.5.13(typescript@5.6.2):
+ dependencies:
+ '@vue/compiler-dom': 3.5.13
+ '@vue/compiler-sfc': 3.5.13
+ '@vue/runtime-dom': 3.5.13
+ '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.6.2))
+ '@vue/shared': 3.5.13
+ optionalDependencies:
+ typescript: 5.6.2
+
vuedraggable@4.1.0(vue@3.5.12(typescript@5.6.2)):
dependencies:
sortablejs: 1.14.0
diff --git a/public/audio/dashboard/chime.mp3 b/public/audio/dashboard/chime.mp3
new file mode 100644
index 000000000..e48530e1f
Binary files /dev/null and b/public/audio/dashboard/chime.mp3 differ
diff --git a/public/audio/dashboard/magic.mp3 b/public/audio/dashboard/magic.mp3
new file mode 100644
index 000000000..ee8d03dc1
Binary files /dev/null and b/public/audio/dashboard/magic.mp3 differ
diff --git a/public/audio/dashboard/ping.mp3 b/public/audio/dashboard/ping.mp3
new file mode 100644
index 000000000..d5304e2f9
Binary files /dev/null and b/public/audio/dashboard/ping.mp3 differ
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 28b4c5ed5..50404ad55 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -180,6 +180,8 @@ RSpec.describe 'Profile API', type: :request do
as: :json
expect(response).to have_http_status(:success)
+ json_response = response.parsed_body
+ expect(json_response['avatar_url']).to be_empty
end
end
end
diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index 3474cbfcd..6524154b4 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -180,6 +180,28 @@ describe Integrations::Slack::SendOnSlackService do
expect(message.attachments).to be_any
end
+ it 'will not call file_upload if attachment does not have a file (e.g facebook - fallback type)' do
+ expect(slack_client).to receive(:chat_postMessage).with(
+ channel: hook.reference_id,
+ text: message.content,
+ username: "#{message.sender.name} (Contact)",
+ thread_ts: conversation.identifier,
+ icon_url: anything,
+ unfurl_links: true
+ ).and_return(slack_message)
+
+ message.attachments.new(account_id: message.account_id, file_type: :fallback)
+
+ expect(slack_client).not_to receive(:files_upload)
+
+ message.save!
+
+ builder.perform
+
+ expect(message.external_source_id_slack).to eq 'cw-origin-6789.12345'
+ expect(message.attachments).to be_any
+ end
+
it 'sent a template message on slack' do
builder = described_class.new(message: template_message, hook: hook)
allow(builder).to receive(:slack_client).and_return(slack_client)
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index 6b05d26fb..b1d19bd0e 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -1,8 +1,9 @@
require 'rails_helper'
RSpec.describe Attachment do
+ let!(:message) { create(:message) }
+
describe 'external url validations' do
- let(:message) { create(:message) }
let(:attachment) { message.attachments.new(account_id: message.account_id, file_type: :image) }
before do
@@ -25,13 +26,25 @@ RSpec.describe Attachment do
describe 'download_url' do
it 'returns valid download url' do
- message = create(:message)
attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
expect(attachment.download_url).not_to be_nil
end
end
+ describe 'with_attached_file?' do
+ it 'returns true if its an attachment with file' do
+ attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+ attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+ expect(attachment.with_attached_file?).to be true
+ end
+
+ it 'returns false if its an attachment with out a file' do
+ attachment = message.attachments.new(account_id: message.account_id, file_type: :fallback)
+ expect(attachment.with_attached_file?).to be false
+ end
+ end
+
describe 'push_event_data for instagram story mentions' do
let(:instagram_message) { create(:message, :instagram_story_mention) }
diff --git a/tailwind.config.js b/tailwind.config.js
index 578b963d6..9af26b294 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -29,6 +29,7 @@ const tailwindConfig = {
'./app/javascript/shared/**/*.vue',
'./app/javascript/survey/**/*.vue',
'./app/javascript/dashboard/helper/**/*.js',
+ './app/javascript/dashboard/components-next/**/*.js',
'./app/views/**/*.html.erb',
],
theme: {
@@ -112,6 +113,11 @@ const tailwindConfig = {
collections: {
woot: {
icons: {
+ 'logic-or': {
+ body: `
-
-
-
-