diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py index e29a59b4f70..391fdb65431 100644 --- a/addons/mail/__manifest__.py +++ b/addons/mail/__manifest__.py @@ -101,9 +101,11 @@ 'static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml', 'static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml', 'static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml', + 'static/src/components/notification_alert/notification_alert.xml', 'static/src/components/notification_group/notification_group.xml', 'static/src/components/notification_list/notification_list.xml', 'static/src/components/notification_popover/notification_popover.xml', + 'static/src/components/notification_request/notification_request.xml', 'static/src/components/partner_im_status_icon/partner_im_status_icon.xml', 'static/src/components/partner_mention_suggestion/partner_mention_suggestion.xml', 'static/src/components/thread_icon/thread_icon.xml', diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 6240fa8eb27..3b4694997d8 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -1,6 +1,13 @@ + + + OdooBot + odoobot@example.com + + + inbox diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index fc63ec12e1e..af409c392f3 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -25,6 +25,13 @@ class Partner(models.Model): # override the field to track the visibility of user user_id = fields.Many2one(tracking=True) + def _compute_im_status(self): + super()._compute_im_status() + odoobot_id = self.env['ir.model.data'].xmlid_to_res_id('base.partner_root') + odoobot = self.env['res.partner'].browse(odoobot_id) + if odoobot in self: + odoobot.im_status = 'bot' + def _message_get_suggested_recipients(self): recipients = super(Partner, self)._message_get_suggested_recipients() for partner in self: @@ -114,6 +121,12 @@ class Partner(models.Model): # Remove duplicates partners = [p for p in partners if not len([u for u in users if u['id'] == p['id']])] + # add OdooBot even if its partner is archived + if len(partners) + len(users) < limit and "odoobot".startswith(search.lower()): + odoobot = self.env.ref("base.partner_root") + if not any(elem['id'] == odoobot.id for elem in partners): + partners.append(odoobot.read(fields)[0]) + return [users, partners] @api.model @@ -150,4 +163,3 @@ class Partner(models.Model): return self.env.cr.dictfetchall() else: return {} - diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml index 0a6096ee984..556cbf2abc4 100644 --- a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml +++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml @@ -86,4 +86,4 @@ - \ No newline at end of file + diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js b/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js index 54933187534..cbd0bdd64bc 100644 --- a/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js +++ b/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js @@ -815,6 +815,146 @@ QUnit.test('
tags in message body preview are transformed in spaces', async ); }); +QUnit.test('rendering with OdooBot has a request (default)', async function (assert) { + assert.expect(4); + + await this.start({ + env: { + browser: { + Notification: { + permission: 'default', + }, + }, + }, + }); + + assert.ok( + document.querySelector('.o_MessagingMenu_counter'), + "should display a notification counter next to the messaging menu for OdooBot request" + ); + assert.strictEqual( + document.querySelector('.o_MessagingMenu_counter').textContent, + "1", + "should display a counter of '1' next to the messaging menu" + ); + + await afterNextRender(() => + document.querySelector('.o_MessagingMenu_toggler').click() + ); + assert.containsOnce( + document.body, + '.o_NotificationRequest', + "should display a notification in the messaging menu" + ); + assert.strictEqual( + document.querySelector('.o_NotificationRequest_name').textContent.trim(), + 'OdooBot has a request', + "notification should display that OdooBot has a request" + ); +}); + +QUnit.test('rendering without OdooBot has a request (denied)', async function (assert) { + assert.expect(2); + + await this.start({ + env: { + browser: { + Notification: { + permission: 'denied', + }, + }, + }, + }); + + assert.containsNone( + document.body, + '.o_MessagingMenu_counter', + "should not display a notification counter next to the messaging menu" + ); + + await afterNextRender(() => + document.querySelector('.o_MessagingMenu_toggler').click() + ); + assert.containsNone( + document.body, + '.o_NotificationRequest', + "should display no notification in the messaging menu" + ); +}); + +QUnit.test('rendering without OdooBot has a request (accepted)', async function (assert) { + assert.expect(2); + + await this.start({ + env: { + browser: { + Notification: { + permission: 'granted', + }, + }, + }, + }); + + assert.containsNone( + document.body, + '.o_MessagingMenu_counter', + "should not display a notification counter next to the messaging menu" + ); + + await afterNextRender(() => + document.querySelector('.o_MessagingMenu_toggler').click() + ); + assert.containsNone( + document.body, + '.o_NotificationRequest', + "should display no notification in the messaging menu" + ); +}); + +QUnit.test('respond to notification prompt (denied)', async function (assert) { + assert.expect(3); + + await this.start({ + env: { + browser: { + Notification: { + permission: 'default', + async requestPermission() { + this.permission = 'denied'; + return this.permission; + }, + }, + }, + }, + }); + + await afterNextRender(() => + document.querySelector('.o_MessagingMenu_toggler').click() + ); + await afterNextRender(() => + document.querySelector('.o_NotificationRequest').click() + ); + assert.containsOnce( + document.body, + '.toast .o_notification_content', + "should display a toast notification with the deny confirmation" + ); + assert.containsNone( + document.body, + '.o_MessagingMenu_counter', + "should not display a notification counter next to the messaging menu" + ); + + await afterNextRender(() => + document.querySelector('.o_MessagingMenu_toggler').click() + ); + assert.containsNone( + document.body, + '.o_NotificationRequest', + "should display no notification in the messaging menu" + ); +}); + }); }); }); diff --git a/addons/mail_bot/static/src/components/notification_alert/notification_alert.js b/addons/mail/static/src/components/notification_alert/notification_alert.js similarity index 88% rename from addons/mail_bot/static/src/components/notification_alert/notification_alert.js rename to addons/mail/static/src/components/notification_alert/notification_alert.js index 4cfcbc362a8..6e582fcdc6b 100644 --- a/addons/mail_bot/static/src/components/notification_alert/notification_alert.js +++ b/addons/mail/static/src/components/notification_alert/notification_alert.js @@ -1,4 +1,4 @@ -odoo.define('mail_bot/static/src/components/notification_alert/notification_alert.js', function (require) { +odoo.define('mail/static/src/components/notification_alert/notification_alert.js', function (require) { 'use strict'; const useStore = require('mail/static/src/component_hooks/use_store/use_store.js'); @@ -44,7 +44,7 @@ class NotificationAlert extends Component { Object.assign(NotificationAlert, { props: {}, - template: 'mail_bot.NotificationAlert', + template: 'mail.NotificationAlert', }); return NotificationAlert; diff --git a/addons/mail_bot/static/src/components/notification_alert/notification_alert.xml b/addons/mail/static/src/components/notification_alert/notification_alert.xml similarity index 89% rename from addons/mail_bot/static/src/components/notification_alert/notification_alert.xml rename to addons/mail/static/src/components/notification_alert/notification_alert.xml index e9b3eef9331..3d80da136f0 100644 --- a/addons/mail_bot/static/src/components/notification_alert/notification_alert.xml +++ b/addons/mail/static/src/components/notification_alert/notification_alert.xml @@ -1,7 +1,7 @@ - +
diff --git a/addons/mail/static/src/components/notification_list/notification_list.js b/addons/mail/static/src/components/notification_list/notification_list.js index 08bcbca4b10..99b66fd5a38 100644 --- a/addons/mail/static/src/components/notification_list/notification_list.js +++ b/addons/mail/static/src/components/notification_list/notification_list.js @@ -3,6 +3,7 @@ odoo.define('mail/static/src/components/notification_list/notification_list.js', const components = { NotificationGroup: require('mail/static/src/components/notification_group/notification_group.js'), + NotificationRequest: require('mail/static/src/components/notification_request/notification_request.js'), ThreadNeedactionPreview: require('mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js'), ThreadPreview: require('mail/static/src/components/thread_preview/thread_preview.js'), }; @@ -135,6 +136,13 @@ class NotificationList extends Component { }; }).concat(notifications); } + // native notification request + if (props.filter === 'all' && this.env.messaging.isNotificationPermissionDefault()) { + notifications.unshift({ + type: 'odoobotRequest', + uniqueId: 'odoobotRequest', + }); + } return { isDeviceMobile: this.env.messaging.device.isMobile, notifications, diff --git a/addons/mail/static/src/components/notification_list/notification_list.xml b/addons/mail/static/src/components/notification_list/notification_list.xml index bcf65da985d..e3bfbf38c9f 100644 --- a/addons/mail/static/src/components/notification_list/notification_list.xml +++ b/addons/mail/static/src/components/notification_list/notification_list.xml @@ -30,7 +30,13 @@ notificationGroupLocalId="notification.notificationGroup.localId" /> - + + + +
diff --git a/addons/mail_bot/static/src/components/notification_request/notification_request.js b/addons/mail/static/src/components/notification_request/notification_request.js similarity index 89% rename from addons/mail_bot/static/src/components/notification_request/notification_request.js rename to addons/mail/static/src/components/notification_request/notification_request.js index ef9639c688b..cb1b59ccbaa 100644 --- a/addons/mail_bot/static/src/components/notification_request/notification_request.js +++ b/addons/mail/static/src/components/notification_request/notification_request.js @@ -1,4 +1,4 @@ -odoo.define('mail_bot/static/src/components/notification_request/notification_request.js', function (require) { +odoo.define('mail/static/src/components/notification_request/notification_request.js', function (require) { 'use strict'; const components = { @@ -74,7 +74,11 @@ class NotificationRequest extends Component { if (def) { def.then(this._handleResponseNotificationPermission.bind(this)); } - this.trigger('o-odoobot-request-clicked'); + + const device = this.env.messaging.device; + if (!device.isMobile) { + this.env.messaging.messagingMenu.close(); + } } } @@ -82,7 +86,7 @@ class NotificationRequest extends Component { Object.assign(NotificationRequest, { components, props: {}, - template: 'mail_bot.NotificationRequest', + template: 'mail.NotificationRequest', }); return NotificationRequest; diff --git a/addons/mail_bot/static/src/components/notification_request/notification_request.scss b/addons/mail/static/src/components/notification_request/notification_request.scss similarity index 100% rename from addons/mail_bot/static/src/components/notification_request/notification_request.scss rename to addons/mail/static/src/components/notification_request/notification_request.scss diff --git a/addons/mail_bot/static/src/components/notification_request/notification_request.xml b/addons/mail/static/src/components/notification_request/notification_request.xml similarity index 96% rename from addons/mail_bot/static/src/components/notification_request/notification_request.xml rename to addons/mail/static/src/components/notification_request/notification_request.xml index 10b22bac2cd..f59c671a723 100644 --- a/addons/mail_bot/static/src/components/notification_request/notification_request.xml +++ b/addons/mail/static/src/components/notification_request/notification_request.xml @@ -1,7 +1,7 @@ - +
diff --git a/addons/mail/static/src/models/messaging/messaging.js b/addons/mail/static/src/models/messaging/messaging.js index 1ed525dd4c0..c8c286c7db3 100644 --- a/addons/mail/static/src/models/messaging/messaging.js +++ b/addons/mail/static/src/models/messaging/messaging.js @@ -20,6 +20,16 @@ function factory(dependencies) { // Public //---------------------------------------------------------------------- + /** + * @returns {boolean} + */ + isNotificationPermissionDefault() { + const windowNotification = this.env.browser.Notification; + return windowNotification + ? windowNotification.permission === 'default' + : false; + } + /** * Open the form view of the record with provided id and model. * diff --git a/addons/mail/static/src/models/messaging_menu/messaging_menu.js b/addons/mail/static/src/models/messaging_menu/messaging_menu.js index c8e52733ff7..ef7dcc1f15e 100644 --- a/addons/mail/static/src/models/messaging_menu/messaging_menu.js +++ b/addons/mail/static/src/models/messaging_menu/messaging_menu.js @@ -68,16 +68,15 @@ function factory(dependencies) { if (inboxMailbox) { counter += inboxMailbox.counter; } - if (!this.messaging) { - // compute after delete - return counter; - } if (this.messaging.notificationGroupManager) { counter += this.messaging.notificationGroupManager.groups.reduce( (total, group) => total + group.notifications.length, 0 ); } + if (this.messaging.isNotificationPermissionDefault()) { + counter++; + } return counter; } diff --git a/addons/mail_bot/static/src/widgets/notification_alert/notification_alert.js b/addons/mail/static/src/widgets/notification_alert/notification_alert.js similarity index 83% rename from addons/mail_bot/static/src/widgets/notification_alert/notification_alert.js rename to addons/mail/static/src/widgets/notification_alert/notification_alert.js index feeb0595832..27055cd7b77 100644 --- a/addons/mail_bot/static/src/widgets/notification_alert/notification_alert.js +++ b/addons/mail/static/src/widgets/notification_alert/notification_alert.js @@ -1,8 +1,8 @@ -odoo.define('mail_bot/static/src/widgets/notification_alert/notification_alert.js', function (require) { +odoo.define('mail/static/src/widgets/notification_alert/notification_alert.js', function (require) { "use strict"; const components = { - NotificationAlert: require('mail_bot/static/src/components/notification_alert/notification_alert.js'), + NotificationAlert: require('mail/static/src/components/notification_alert/notification_alert.js'), }; const { ComponentWrapper, WidgetAdapterMixin } = require('web.OwlCompatibility'); diff --git a/addons/mail_bot/static/src/widgets/notification_alert/notification_alert_tests.js b/addons/mail/static/src/widgets/notification_alert/notification_alert_tests.js similarity index 92% rename from addons/mail_bot/static/src/widgets/notification_alert/notification_alert_tests.js rename to addons/mail/static/src/widgets/notification_alert/notification_alert_tests.js index beeeb2a8e4e..9338e1e9673 100644 --- a/addons/mail_bot/static/src/widgets/notification_alert/notification_alert_tests.js +++ b/addons/mail/static/src/widgets/notification_alert/notification_alert_tests.js @@ -1,12 +1,13 @@ -odoo.define('mail_bot/static/src/widgets/notification_alert/notification_alert_tests.js', function (require) { +odoo.define('mail/static/src/widgets/notification_alert/notification_alert_tests.js', function (require) { 'use strict'; const { afterEach, beforeEach, start } = require('mail/static/src/utils/test_utils.js'); const FormView = require('web.FormView'); -QUnit.module('mail_bot', {}, function () { +QUnit.module('mail', {}, function () { QUnit.module('widgets', {}, function () { +QUnit.module('notification_alert', {}, function () { QUnit.module('notification_alert_tests.js', { beforeEach() { beforeEach(this); @@ -95,6 +96,7 @@ QUnit.test('notification_alert widget: no notification alert when default', asyn ); }); +}); }); }); diff --git a/addons/mail/views/assets.xml b/addons/mail/views/assets.xml index 0f7bc50b22b..b75f8db3f85 100644 --- a/addons/mail/views/assets.xml +++ b/addons/mail/views/assets.xml @@ -101,9 +101,11 @@ + + @@ -160,6 +162,7 @@ + - + @@ -288,6 +292,7 @@ + - - - - - - - - @@ -29,9 +21,7 @@ diff --git a/addons/mail_bot/views/res_users_views.xml b/addons/mail_bot/views/res_users_views.xml index 36bb1abf22c..e714ff6b438 100644 --- a/addons/mail_bot/views/res_users_views.xml +++ b/addons/mail_bot/views/res_users_views.xml @@ -27,17 +27,4 @@ - - - - res.users.preferences.form.notification.alert - res.users - - - - - - - -