diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 7874302ae..ada19502e 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -7,6 +7,7 @@
this-selected-contact-id=""
:on-input-search="onInputSearch"
:on-toggle-create="onToggleCreate"
+ :header-title="label"
/>
- {{ $t('CONTACTS_PAGE.HEADER') }}
+ {{ headerTitle ? `#${headerTitle}` : $t('CONTACTS_PAGE.HEADER') }}
@@ -42,6 +42,10 @@
export default {
components: {},
props: {
+ headerTitle: {
+ type: String,
+ default: '',
+ },
searchQuery: {
type: String,
default: '',
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/routes.js b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
index f5ef5ad14..b8b129435 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/routes.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
@@ -10,6 +10,15 @@ export const routes = [
roles: ['administrator', 'agent'],
component: ContactsView,
},
+ {
+ path: frontendURL('accounts/:accountId/labels/:label/contacts'),
+ name: 'contacts_labels_dashboard',
+ roles: ['administrator', 'agent'],
+ component: ContactsView,
+ props: route => {
+ return { label: route.params.label };
+ },
+ },
{
path: frontendURL('accounts/:accountId/contacts/:contactId'),
name: 'contacts_dashboard_manage',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js b/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js
index ee02f674e..8e1628bdb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js
@@ -26,11 +26,10 @@ describe('validationMixin', () => {
i18n: i18nConfig,
localVue,
data() {
- return {
- title: 'sales',
- };
+ return { title: 'sales' };
},
});
+ wrapper.vm.$v.$touch();
expect(wrapper.vm.getLabelTitleErrorMessage).toBe('');
});
it('it should return label required error message if empty name is passed', async () => {
@@ -38,11 +37,10 @@ describe('validationMixin', () => {
i18n: i18nConfig,
localVue,
data() {
- return {
- title: '',
- };
+ return { title: '' };
},
});
+ wrapper.vm.$v.$touch();
expect(wrapper.vm.getLabelTitleErrorMessage).toBe('Label name is required');
});
it('it should return label minimum length error message if one charceter label name is passed', async () => {
@@ -50,11 +48,10 @@ describe('validationMixin', () => {
i18n: i18nConfig,
localVue,
data() {
- return {
- title: 's',
- };
+ return { title: 's' };
},
});
+ wrapper.vm.$v.$touch();
expect(wrapper.vm.getLabelTitleErrorMessage).toBe(
'Minimum length 2 is required'
);
@@ -64,11 +61,10 @@ describe('validationMixin', () => {
i18n: i18nConfig,
localVue,
data() {
- return {
- title: 'sales enquiry',
- };
+ return { title: 'sales enquiry' };
},
});
+ wrapper.vm.$v.$touch();
expect(wrapper.vm.getLabelTitleErrorMessage).toBe(
'Only Alphabets, Numbers, Hyphen and Underscore are allowed'
);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js b/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js
index ca2a0b777..9f11646a6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js
@@ -1,16 +1,17 @@
export default {
computed: {
getLabelTitleErrorMessage() {
- if (!this.title) {
- return this.$t('LABEL_MGMT.FORM.NAME.REQUIRED_ERROR');
+ let errorMessage = '';
+ if (!this.$v.title.$error) {
+ errorMessage = '';
+ } else if (!this.$v.title.required) {
+ errorMessage = this.$t('LABEL_MGMT.FORM.NAME.REQUIRED_ERROR');
+ } else if (!this.$v.title.minLength) {
+ errorMessage = this.$t('LABEL_MGMT.FORM.NAME.MINIMUM_LENGTH_ERROR');
+ } else if (!this.$v.title.validLabelCharacters) {
+ errorMessage = this.$t('LABEL_MGMT.FORM.NAME.VALID_ERROR');
}
- if (!this.$v.title.minLength) {
- return this.$t('LABEL_MGMT.FORM.NAME.MINIMUM_LENGTH_ERROR');
- }
- if (!this.$v.title.validLabelCharacters) {
- return this.$t('LABEL_MGMT.FORM.NAME.VALID_ERROR');
- }
- return '';
+ return errorMessage;
},
},
};
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index 0e5e3a8df..09761c443 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -6,12 +6,12 @@ import types from '../../mutation-types';
import ContactAPI from '../../../api/contacts';
export const actions = {
- search: async ({ commit }, { search, page, sortAttr }) => {
+ search: async ({ commit }, { search, page, sortAttr, label }) => {
commit(types.SET_CONTACT_UI_FLAG, { isFetching: true });
try {
const {
data: { payload, meta },
- } = await ContactAPI.search(search, page, sortAttr);
+ } = await ContactAPI.search(search, page, sortAttr, label);
commit(types.CLEAR_CONTACTS);
commit(types.SET_CONTACTS, payload);
commit(types.SET_CONTACT_META, meta);
@@ -21,12 +21,12 @@ export const actions = {
}
},
- get: async ({ commit }, { page = 1, sortAttr } = {}) => {
+ get: async ({ commit }, { page = 1, sortAttr, label } = {}) => {
commit(types.SET_CONTACT_UI_FLAG, { isFetching: true });
try {
const {
data: { payload, meta },
- } = await ContactAPI.get(page, sortAttr);
+ } = await ContactAPI.get(page, sortAttr, label);
commit(types.CLEAR_CONTACTS);
commit(types.SET_CONTACTS, payload);
commit(types.SET_CONTACT_META, meta);
diff --git a/lib/redis/config.rb b/lib/redis/config.rb
index 35ea3e617..f6027d1f6 100644
--- a/lib/redis/config.rb
+++ b/lib/redis/config.rb
@@ -1,6 +1,6 @@
module Redis::Config
- DEFAULT_SENTINEL_PORT = '26379'.freeze
- SIDEKIQ_SIZE = 25
+ DEFAULT_SENTINEL_PORT ||= '26379'.freeze
+ SIDEKIQ_SIZE ||= 25
class << self
def app
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 12b58c90f..0ebe6b8a0 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -40,6 +40,22 @@ RSpec.describe 'Contacts API', type: :request do
expect(response_body['payload'].first['conversations_count']).to eq(contact.conversations.count)
expect(response_body['payload'].first['last_seen_at']).present?
end
+
+ it 'filters contacts based on label filter' do
+ contact_with_label1, contact_with_label2 = FactoryBot.create_list(:contact, 2, account: account)
+ contact_with_label1.update_labels(['label1'])
+ contact_with_label2.update_labels(['label2'])
+
+ get "/api/v1/accounts/#{account.id}/contacts",
+ params: { labels: %w[label1 label2] },
+ headers: admin.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ response_body = JSON.parse(response.body)
+ expect(response_body['meta']['count']).to eq(2)
+ expect(response_body['payload'].pluck('email')).to include(contact_with_label1.email, contact_with_label2.email)
+ end
end
end