+
@@ -32,6 +33,7 @@ import NetworkNotification from './components/NetworkNotification.vue';
import UpdateBanner from './components/app/UpdateBanner.vue';
import UpgradeBanner from './components/app/UpgradeBanner.vue';
import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
+import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
import vueActionCable from './helper/actionCable';
import WootSnackbarBox from './components/SnackbarContainer.vue';
import rtlMixin from 'shared/mixins/rtlMixin';
@@ -52,6 +54,7 @@ export default {
PaymentPendingBanner,
WootSnackbarBox,
UpgradeBanner,
+ PendingEmailVerificationBanner,
},
mixins: [rtlMixin],
diff --git a/app/javascript/dashboard/api/agents.js b/app/javascript/dashboard/api/agents.js
index 7cc5e6d0c..cfc6b36ff 100644
--- a/app/javascript/dashboard/api/agents.js
+++ b/app/javascript/dashboard/api/agents.js
@@ -1,9 +1,17 @@
+/* global axios */
+
import ApiClient from './ApiClient';
class Agents extends ApiClient {
constructor() {
super('agents', { accountScoped: true });
}
+
+ bulkInvite({ emails }) {
+ return axios.post(`${this.url}/bulk_create`, {
+ emails,
+ });
+ }
}
export default new Agents();
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index 48e7d7085..dde817866 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -29,11 +29,12 @@ export default {
return fetchPromise;
},
hasAuthCookie() {
- return !!Cookies.getJSON('cw_d_session_info');
+ return !!Cookies.get('cw_d_session_info');
},
getAuthData() {
if (this.hasAuthCookie()) {
- return Cookies.getJSON('cw_d_session_info');
+ const savedAuthInfo = Cookies.get('cw_d_session_info');
+ return JSON.parse(savedAuthInfo || '{}');
}
return false;
},
@@ -97,4 +98,8 @@ export default {
},
});
},
+ resendConfirmation() {
+ const urlData = endPoints('resendConfirmation');
+ return axios.post(urlData.url);
+ },
};
diff --git a/app/javascript/dashboard/api/endPoints.js b/app/javascript/dashboard/api/endPoints.js
index 678386d50..31337b7fc 100644
--- a/app/javascript/dashboard/api/endPoints.js
+++ b/app/javascript/dashboard/api/endPoints.js
@@ -47,6 +47,10 @@ const endPoints = {
setActiveAccount: {
url: '/api/v1/profile/set_active_account',
},
+
+ resendConfirmation: {
+ url: '/api/v1/profile/resend_confirmation',
+ },
};
export default page => {
diff --git a/app/javascript/dashboard/api/notifications.js b/app/javascript/dashboard/api/notifications.js
index e13bc78a6..65284623f 100644
--- a/app/javascript/dashboard/api/notifications.js
+++ b/app/javascript/dashboard/api/notifications.js
@@ -6,8 +6,16 @@ class NotificationsAPI extends ApiClient {
super('notifications', { accountScoped: true });
}
- get(page) {
- return axios.get(`${this.url}?page=${page}`);
+ get({ page, status, type, sortOrder }) {
+ const includesFilter = [status, type].filter(value => !!value);
+
+ return axios.get(this.url, {
+ params: {
+ page,
+ sort_order: sortOrder,
+ includes: includesFilter,
+ },
+ });
}
getNotifications(contactId) {
@@ -25,9 +33,29 @@ class NotificationsAPI extends ApiClient {
});
}
+ unRead(id) {
+ return axios.post(`${this.url}/${id}/unread`);
+ }
+
readAll() {
return axios.post(`${this.url}/read_all`);
}
+
+ delete(id) {
+ return axios.delete(`${this.url}/${id}`);
+ }
+
+ deleteAll({ type = 'all' }) {
+ return axios.post(`${this.url}/destroy_all`, {
+ type,
+ });
+ }
+
+ snooze({ id, snoozedUntil = null }) {
+ return axios.post(`${this.url}/${id}/snooze`, {
+ snoozed_until: snoozedUntil,
+ });
+ }
}
export default new NotificationsAPI();
diff --git a/app/javascript/dashboard/api/specs/agents.spec.js b/app/javascript/dashboard/api/specs/agents.spec.js
index 7cf1bdd0e..20dd36688 100644
--- a/app/javascript/dashboard/api/specs/agents.spec.js
+++ b/app/javascript/dashboard/api/specs/agents.spec.js
@@ -10,4 +10,29 @@ describe('#AgentAPI', () => {
expect(agents).toHaveProperty('update');
expect(agents).toHaveProperty('delete');
});
+
+ describe('API calls', () => {
+ const originalAxios = window.axios;
+ const axiosMock = {
+ post: jest.fn(() => Promise.resolve()),
+ };
+
+ beforeEach(() => {
+ window.axios = axiosMock;
+ });
+
+ afterEach(() => {
+ window.axios = originalAxios;
+ });
+
+ it('#bulkInvite', () => {
+ agents.bulkInvite({ emails: ['hello@hi.com'] });
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/agents/bulk_create',
+ {
+ emails: ['hello@hi.com'],
+ }
+ );
+ });
+ });
});
diff --git a/app/javascript/dashboard/api/specs/notifications.spec.js b/app/javascript/dashboard/api/specs/notifications.spec.js
index 5bdf88d7f..fe748fe19 100644
--- a/app/javascript/dashboard/api/specs/notifications.spec.js
+++ b/app/javascript/dashboard/api/specs/notifications.spec.js
@@ -27,11 +27,37 @@ describe('#NotificationAPI', () => {
window.axios = originalAxios;
});
- it('#get', () => {
- notificationsAPI.get(1);
- expect(axiosMock.get).toHaveBeenCalledWith(
- '/api/v1/notifications?page=1'
- );
+ describe('#get', () => {
+ it('generates the API call if both params are available', () => {
+ notificationsAPI.get({
+ page: 1,
+ status: 'snoozed',
+ type: 'read',
+ sortOrder: 'desc',
+ });
+ expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/notifications', {
+ params: {
+ page: 1,
+ sort_order: 'desc',
+ includes: ['snoozed', 'read'],
+ },
+ });
+ });
+
+ it('generates the API call if one of the params are available', () => {
+ notificationsAPI.get({
+ page: 1,
+ type: 'read',
+ sortOrder: 'desc',
+ });
+ expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/notifications', {
+ params: {
+ page: 1,
+ sort_order: 'desc',
+ includes: ['read'],
+ },
+ });
+ });
});
it('#getNotifications', () => {
@@ -65,5 +91,30 @@ describe('#NotificationAPI', () => {
'/api/v1/notifications/read_all'
);
});
+
+ it('#snooze', () => {
+ notificationsAPI.snooze({ id: 1, snoozedUntil: 12332211 });
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/notifications/1/snooze',
+ {
+ snoozed_until: 12332211,
+ }
+ );
+ });
+
+ it('#delete', () => {
+ notificationsAPI.delete(1);
+ expect(axiosMock.delete).toHaveBeenCalledWith('/api/v1/notifications/1');
+ });
+
+ it('#deleteAll', () => {
+ notificationsAPI.deleteAll({ type: 'all' });
+ expect(axiosMock.post).toHaveBeenCalledWith(
+ '/api/v1/notifications/destroy_all',
+ {
+ type: 'all',
+ }
+ );
+ });
});
});
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 31fe6110d..7fcc58127 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,6 +1,6 @@
+
+
+
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
index 5517d12ae..d85fedfa5 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
@@ -56,7 +56,7 @@
class="bg-slate-50 dark:bg-slate-700 rounded text-xxs font-medium mx-1 py-0 px-1"
:class="
isCountZero
- ? `text-slate-300 dark:text-slate-700`
+ ? `text-slate-300 dark:text-slate-500`
: `text-slate-700 dark:text-slate-50`
"
>
diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue
index 5d680fe48..3473111ae 100644
--- a/app/javascript/dashboard/components/ui/Banner.vue
+++ b/app/javascript/dashboard/components/ui/Banner.vue
@@ -1,6 +1,6 @@
@@ -18,7 +18,7 @@
+
+ <% if Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING) %>
+
+ Alert!
+ Unauthorized premium changes detected in Chatwoot. To keep using them, please upgrade your plan.
+ Contact for help : sales@chatwoot.com
+
+ <% end %>
+
@@ -44,7 +53,7 @@
<% if ChatwootHub.pricing_plan != 'community' && User.count > ChatwootHub.pricing_plan_quantity %>
-
You have <%= User.count %> agents. Please add more licenses.
+
You have <%= User.count %> agents. Please add more licenses to add more users.
<% end %>
diff --git a/app/views/super_admin/users/show.html.erb b/app/views/super_admin/users/show.html.erb
index 37a79b121..a5bc2bf39 100644
--- a/app/views/super_admin/users/show.html.erb
+++ b/app/views/super_admin/users/show.html.erb
@@ -34,16 +34,24 @@ as well as a link to its edit page.
- <% page.attributes.each do |attribute| %>
-
- <%= t(
- "helpers.label.#{resource_name}.#{attribute.name}",
- default: attribute.name.titleize,
- ) %>
-
+ <% page.attributes.each do |title, attributes| %>
+ ">
+ <% if title.present? %>
+ <%= t "helpers.label.#{page.resource_name}.#{title}", default: title %>
+ <% end %>
- <%= render_field attribute, page: page %>
+ <% attributes.each do |attribute| %>
+
+ <%= t(
+ "helpers.label.#{resource_name}.#{attribute.name}",
+ default: page.resource.class.human_attribute_name(attribute.name),
+ ) %>
+
+
+ <%= render_field attribute, page: page %>
+ <% end %>
+
<% end %>
@@ -69,14 +77,16 @@ as well as a link to its edit page.
<% end %>
- <% account_user_page.attributes.each do |attribute| -%>
- <% if attribute.name == "user" %>
- <%= f.hidden_field('user_id', value: page.resource.id) %>
- <% else %>
-
- <%= render_field attribute, f: f %>
-
- <% end %>
+ <% account_user_page.attributes.each do |title, attributes| -%>
+ <% attributes.each do |attribute| %>
+ <% if attribute.name == "user" %>
+ <%= f.hidden_field('user_id', value: page.resource.id) %>
+ <% else %>
+
+ <%= render_field attribute, f: f %>
+
+ <% end %>
+ <% end %>
<% end -%>