From 6b7e20da3fd456821863228cc5121152e047b79d Mon Sep 17 00:00:00 2001
From: xO-Tx <mou@odoo.com>
Date: Mon, 15 Jun 2020 07:39:51 +0000
Subject: [PATCH 1/5] [IMP] mail : improve emoji widget code to ease overrides

This commit attempts to improve emoji widget css and code to make it easily
overridable by other modules. This is done in preparation for extension by the
SmsWidget that will enable the emojis support.

To improve the emoji widget, the following changes have been made

  * remove the spacing after emoji fields by setting widget dropdown height to
    0 (emoji dropdown has relative position + (height > 0) which leaves an
    empty space after widget fields);
  * hide Emoji widget when field has "invisible modifier";
  * move the code that adds the emoji dropdown to another method, allowing to
    better understand code organization;

Task ID-2224393
PR #49096
---
 .../mail/static/src/js/text_emojis_fields.js  | 59 +++++++++++--------
 addons/mail/static/src/scss/emojis.scss       |  9 +++
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/addons/mail/static/src/js/text_emojis_fields.js b/addons/mail/static/src/js/text_emojis_fields.js
index 1ef817faf08..21a94032168 100644
--- a/addons/mail/static/src/js/text_emojis_fields.js
+++ b/addons/mail/static/src/js/text_emojis_fields.js
@@ -24,34 +24,10 @@ var FieldEmojiCommon = {
     },
 
     /**
-     * This will add an emoji button that shows the emojis selection dropdown.
-     *
-     * We use 'on_attach_callback' because we need the element to be attached to the form first.
-     * That's because the $emojisIcon element needs to be rendered outside of this $el
-     * (which is an text element, that can't 'contain' any other elements).
-     *
      * @override
      */
     on_attach_callback: function () {
-        if (!this.$emojisIcon) {
-            this.$emojisIcon = $(QWeb.render('mail.EmojisDropdown', {widget: this}));
-            this.$emojisIcon.find('.o_mail_emoji').on('click', this._onEmojiClick.bind(this));
-
-            if (this.$el.filter('span.o_field_translate').length) {
-                // multi-languages activated, place the button on the left of the translation button
-                this.$emojisIcon.addClass('o_mail_emojis_dropdown_translation');
-            }
-            if (this.$el.filter('textarea').length) {
-                this.$emojisIcon.addClass('o_mail_emojis_dropdown_textarea');
-            }
-            this.$el.last().after(this.$emojisIcon);
-        }
-
-        if (this.mode === 'edit') {
-            this.$emojisIcon.show();
-        } else {
-            this.$emojisIcon.hide();
-        }
+        this._attachEmojisDropdown();
     },
 
     //--------------------------------------------------------------------------
@@ -122,6 +98,37 @@ var FieldEmojiCommon = {
      */
     _triggerOnchange: function () {
         this.$input.trigger('change');
+    },
+
+    /**
+     * This will add an emoji button that shows the emojis selection dropdown.
+     *
+     * Should be used inside 'on_attach_callback' because we need the element to be attached to the form first.
+     * That's because the $emojisIcon element needs to be rendered outside of this $el
+     * (which is an text element, that can't 'contain' any other elements).
+     * 
+     * @private
+     */
+    _attachEmojisDropdown: function () {
+        if (!this.$emojisIcon) {
+            this.$emojisIcon = $(QWeb.render('mail.EmojisDropdown', {widget: this}));
+            this.$emojisIcon.find('.o_mail_emoji').on('click', this._onEmojiClick.bind(this));
+
+            if (this.$el.filter('span.o_field_translate').length) {
+                // multi-languages activated, place the button on the left of the translation button
+                this.$emojisIcon.addClass('o_mail_emojis_dropdown_translation');
+            }
+            if (this.$el.filter('textarea').length) {
+                this.$emojisIcon.addClass('o_mail_emojis_dropdown_textarea');
+            }
+            this.$el.last().after(this.$emojisIcon);
+        }
+
+        if (this.mode === 'edit') {
+            this.$emojisIcon.show();
+        } else {
+            this.$emojisIcon.hide();
+        }
     }
 };
 
@@ -138,6 +145,6 @@ var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCo
 registry.add('text_emojis', FieldTextEmojis);
 registry.add('char_emojis', FieldCharEmojis);
 
-return {FieldTextEmojis: FieldTextEmojis, FieldCharEmojis: FieldCharEmojis};
+return {FieldTextEmojis: FieldTextEmojis, FieldCharEmojis: FieldCharEmojis, FieldEmojiCommon: FieldEmojiCommon};
 
 });
diff --git a/addons/mail/static/src/scss/emojis.scss b/addons/mail/static/src/scss/emojis.scss
index 1a686e0fae7..f85c0141565 100644
--- a/addons/mail/static/src/scss/emojis.scss
+++ b/addons/mail/static/src/scss/emojis.scss
@@ -17,6 +17,15 @@ $o-mail-emoji-height: 2rem;
     }
 }
 
+.o_form_view {
+    // Emojis widgets should hide the emoji dropdown button when the field is invisible.
+    // This is necessary because the button is added *after* the main element (and not inside)
+    // (see '_attachEmojisDropdown' for more details)
+    .o_invisible_modifier + .o_mail_add_emoji{
+        display: none !important;
+    }
+}
+
 .o_mail_emojis_dropdown {
     height: $o-mail-emoji-height;
     width: 40px;

From 7a253beab2e2bb3a8eab02fd6d538b4284a747cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 11 Aug 2020 13:31:25 +0000
Subject: [PATCH 2/5] [REF] mail: split emoji files to ease inheritance

Purpose is to clearly distinguish

  * common: holding common code for emojis-enabled fields;
  * text emoji field: support of emojis in text fields;
  * char emoji field: support of emojis in char fields;

Task ID-2224393
PR #49096
---
 addons/mail/static/src/js/field_char_emojis.js | 18 ++++++++++++++++++
 ...emojis_fields.js => field_emojis_common.js} | 18 ++----------------
 addons/mail/static/src/js/field_text_emojis.js | 18 ++++++++++++++++++
 addons/mail/views/assets.xml                   |  4 +++-
 4 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 addons/mail/static/src/js/field_char_emojis.js
 rename addons/mail/static/src/js/{text_emojis_fields.js => field_emojis_common.js} (86%)
 create mode 100644 addons/mail/static/src/js/field_text_emojis.js

diff --git a/addons/mail/static/src/js/field_char_emojis.js b/addons/mail/static/src/js/field_char_emojis.js
new file mode 100644
index 00000000000..012a68c2ead
--- /dev/null
+++ b/addons/mail/static/src/js/field_char_emojis.js
@@ -0,0 +1,18 @@
+odoo.define('mail.field_char_emojis', function (require) {
+"use strict";
+
+var basicFields = require('web.basic_fields');
+var registry = require('web.field_registry');
+var FieldEmojiCommon = require('mail.field_emojis_common');
+var MailEmojisMixin = require('mail.emoji_mixin');
+
+/**
+ * Extension of the FieldChar that will add emojis support
+ */
+var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCommon);
+
+registry.add('char_emojis', FieldCharEmojis);
+
+return FieldCharEmojis;
+
+});
diff --git a/addons/mail/static/src/js/text_emojis_fields.js b/addons/mail/static/src/js/field_emojis_common.js
similarity index 86%
rename from addons/mail/static/src/js/text_emojis_fields.js
rename to addons/mail/static/src/js/field_emojis_common.js
index 21a94032168..79215ac7329 100644
--- a/addons/mail/static/src/js/text_emojis_fields.js
+++ b/addons/mail/static/src/js/field_emojis_common.js
@@ -1,10 +1,9 @@
-odoo.define('mail.text_emojis_field', function (require) {
+odoo.define('mail.field_emojis_common', function (require) {
 "use strict";
 
 var basicFields = require('web.basic_fields');
 var core = require('web.core');
 var emojis = require('mail.emojis');
-var registry = require('web.field_registry');
 var MailEmojisMixin = require('mail.emoji_mixin');
 var _onEmojiClickMixin = MailEmojisMixin._onEmojiClick;
 var QWeb = core.qweb;
@@ -132,19 +131,6 @@ var FieldEmojiCommon = {
     }
 };
 
-/**
- * Extension of the FieldText that will add emojis support
- */
-var FieldTextEmojis = basicFields.FieldText.extend(MailEmojisMixin, FieldEmojiCommon);
-
-/**
- * Extension of the FieldChar that will add emojis support
- */
-var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCommon);
-
-registry.add('text_emojis', FieldTextEmojis);
-registry.add('char_emojis', FieldCharEmojis);
-
-return {FieldTextEmojis: FieldTextEmojis, FieldCharEmojis: FieldCharEmojis, FieldEmojiCommon: FieldEmojiCommon};
+return FieldEmojiCommon;
 
 });
diff --git a/addons/mail/static/src/js/field_text_emojis.js b/addons/mail/static/src/js/field_text_emojis.js
new file mode 100644
index 00000000000..8ed14ecfa03
--- /dev/null
+++ b/addons/mail/static/src/js/field_text_emojis.js
@@ -0,0 +1,18 @@
+odoo.define('mail.field_text_emojis', function (require) {
+"use strict";
+
+var basicFields = require('web.basic_fields');
+var registry = require('web.field_registry');
+var FieldEmojiCommon = require('mail.field_emojis_common');
+var MailEmojisMixin = require('mail.emoji_mixin');
+
+/**
+ * Extension of the FieldText that will add emojis support
+ */
+var FieldTextEmojis = basicFields.FieldText.extend(MailEmojisMixin, FieldEmojiCommon);
+
+registry.add('text_emojis', FieldTextEmojis);
+
+return FieldTextEmojis;
+
+});
diff --git a/addons/mail/views/assets.xml b/addons/mail/views/assets.xml
index 4b1877277e0..e3dd42c366e 100644
--- a/addons/mail/views/assets.xml
+++ b/addons/mail/views/assets.xml
@@ -38,7 +38,9 @@
                 <!-- Emojis -->
                 <script type="text/javascript" src="/mail/static/src/js/emojis.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/emojis_mixin.js"/>
-                <script type="text/javascript" src="/mail/static/src/js/text_emojis_fields.js"/>
+                <script type="text/javascript" src="/mail/static/src/js/field_emojis_common.js"/>
+                <script type="text/javascript" src="/mail/static/src/js/field_char_emojis.js"/>
+                <script type="text/javascript" src="/mail/static/src/js/field_text_emojis.js"/>
                 <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/emojis.scss"/>
                 <!-- Others -->
 

From 6e8f4ff3ead93ad1e9294b0ebed8d60e4e4bf1ce Mon Sep 17 00:00:00 2001
From: xO-Tx <mou@odoo.com>
Date: Mon, 15 Jun 2020 07:46:36 +0000
Subject: [PATCH 3/5] [IMP] sms/mass_mailing: add emojis support to the base
 SmsWidget

This commit adds emojis to base SmsWidget in order to use a text field with
both sms and emoji widgets in "mass_mailing_sms" module for sms content.

The emoji feature is optional (depends on "enable_emojis" attribute). To add
the emoji support, the following changes have been made:

  * override the method "on_attach_callback" from emoji widget base code to
    hide emojis if not enabled;

We also adjust the css of emoji widget to make it suitable for a text field
with sms option.

Task ID-2224393
PR #49096
---
 .../static/src/scss/mass_mailing.scss          |  7 ++++++-
 addons/sms/static/src/js/fields_sms_widget.js  | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.scss b/addons/mass_mailing/static/src/scss/mass_mailing.scss
index 8e20d437232..5b8ebff2023 100644
--- a/addons/mass_mailing/static/src/scss/mass_mailing.scss
+++ b/addons/mass_mailing/static/src/scss/mass_mailing.scss
@@ -14,7 +14,12 @@
         }
     }
 }
-
+.o_form_view {
+    // This will display the emoji widget in the right position after a text field with sms option.
+    .o_sms_container ~ .o_mail_add_emoji{
+        bottom: 55px;
+    }
+}
 .o_white_body {
     background-color: white;
 }
diff --git a/addons/sms/static/src/js/fields_sms_widget.js b/addons/sms/static/src/js/fields_sms_widget.js
index 53af8e33e98..d438f6c90bc 100644
--- a/addons/sms/static/src/js/fields_sms_widget.js
+++ b/addons/sms/static/src/js/fields_sms_widget.js
@@ -1,11 +1,9 @@
 odoo.define('sms.sms_widget', function (require) {
 "use strict";
 
-var basicFields = require('web.basic_fields');
 var core = require('web.core');
 var fieldRegistry = require('web.field_registry');
-
-var FieldText = basicFields.FieldText;
+var FieldTextEmojis = require('mail.field_text_emojis');
 
 var _t = core._t;
 /**
@@ -13,8 +11,9 @@ var _t = core._t;
  * the number of SMS and the number of characters. This text is computed every
  * time the user changes the body.
  */
-var SmsWidget = FieldText.extend({
+var SmsWidget = FieldTextEmojis.extend({
     className: 'o_field_text',
+    enableEmojis: false,
     /**
      * @constructor
      */
@@ -23,6 +22,17 @@ var SmsWidget = FieldText.extend({
         this.nbrChar = 0;
         this.nbrSMS = 0;
         this.encoding = 'GSM7';
+        this.enableEmojis = !!this.nodeOptions.enable_emojis;
+    },
+    
+    /**
+     * @override
+     *"This will add the emoji dropdown to a target field (controlled by the "enableEmojis" attribute)
+     */
+    on_attach_callback: function () {
+        if (this.enableEmojis) {
+            this._super.apply(this, arguments);
+        }
     },
 
     //--------------------------------------------------------------------------

From f7862cd2b5cfd333688b219a64034e24f7d2e5a1 Mon Sep 17 00:00:00 2001
From: xO-Tx <mou@odoo.com>
Date: Mon, 15 Jun 2020 07:49:43 +0000
Subject: [PATCH 4/5] [IMP] mass_mailing[_sms]: update subject and allow emoji
 support for sms content

PURPOSE

Subject field on mailing has not the same use in email marketing (subject of
emails) and in SMS maketing (used internally as there is no subject in SMS).

Purpose of this commit is to improve mailing form view to better distinguish
email and SMS flows.

SPECIFICATIONS

This commit changes helper for mailing subject and update its label according
to mailing_type (mail or sms), as well as the sms content field to enable emoji
support in mailing subjects. This is done through a fake sms_subject field
that is a text without emojis while standard subject allows emojis. Helpers
depends on the displayed field.

Override CRUD to synchronize sms_subject on subject to have only one field
used to store data.

Also allow emojis in SMS content, suing the enable_emojis option.

LINKS

Task ID-2224393
PR #49096
---
 addons/mass_mailing/models/mailing.py         |  2 +-
 .../models/mailing_mailing.py                 | 20 +++++++++++++++++++
 .../views/mailing_mailing_views.xml           | 12 ++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/models/mailing.py b/addons/mass_mailing/models/mailing.py
index 86b6714260e..15b38a1d1d2 100644
--- a/addons/mass_mailing/models/mailing.py
+++ b/addons/mass_mailing/models/mailing.py
@@ -66,7 +66,7 @@ class MassMailing(models.Model):
             return False
 
     active = fields.Boolean(default=True, tracking=True)
-    subject = fields.Char('Subject', help='Subject of emails to send', required=True, translate=True)
+    subject = fields.Char('Subject', help='Subject of your Mailing', required=True, translate=True)
     email_from = fields.Char(string='Send From', required=True,
         default=lambda self: self.env.user.email_formatted)
     sent_date = fields.Datetime(string='Sent Date', copy=False)
diff --git a/addons/mass_mailing_sms/models/mailing_mailing.py b/addons/mass_mailing_sms/models/mailing_mailing.py
index cd0e6060f6f..ee1c11e20db 100644
--- a/addons/mass_mailing_sms/models/mailing_mailing.py
+++ b/addons/mass_mailing_sms/models/mailing_mailing.py
@@ -24,6 +24,15 @@ class Mailing(models.Model):
     mailing_type = fields.Selection(selection_add=[
         ('sms', 'SMS')
     ], ondelete={'sms': 'set default'})
+
+    # 'sms_subject' added to override 'subject' field (string attribute should be labelled "Title" when mailing_type == 'sms').
+    # 'sms_subject' should have the same helper as 'subject' field when 'mass_mailing_sms' installed.
+    # otherwise 'sms_subject' will get the old helper from 'mass_mailing' module.
+    # overriding 'subject' field helper in this model is not working, since the helper will keep the new value
+    # even when 'mass_mailing_sms' removed (see 'mailing_mailing_view_form_sms' for more details).                    
+    sms_subject = fields.Char('Title', help='For an Email, Subject your Recipients will see in their inbox.\n'
+                              'For an SMS Text Message, internal Title of the Message.',
+                              related='subject', translate=True, readonly=False)
     # sms options
     body_plaintext = fields.Text('SMS Body', compute='_compute_body_plaintext', store=True, readonly=False)
     sms_template_id = fields.Many2one('sms.template', string='SMS Template', ondelete='set null')
@@ -74,6 +83,17 @@ class Mailing(models.Model):
                 mail.sms_has_unregistered_account = trace_dict[mail.id]['sms_acc']
 
 
+    # --------------------------------------------------
+    # ORM OVERRIDES
+    # --------------------------------------------------
+
+    @api.model
+    def create(self, values):
+        # Get subject from "sms_subject" field when SMS installed (used to build the name of record in the super 'create' method)
+        if values.get('mailing_type') == 'sms' and values.get('sms_subject'):
+            values['subject'] = values['sms_subject']
+        return super(Mailing, self).create(values)
+
     # --------------------------------------------------
     # BUSINESS / VIEWS ACTIONS
     # --------------------------------------------------
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index 9b6244853ab..570198797b9 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -93,12 +93,22 @@
                 <attribute name="attrs">{'invisible': ['|',('mailing_type', '!=', 'mail'),('state', 'in', ('draft','test'))]}</attribute>
             </xpath>
             <!-- Form -->
+            <xpath expr="//field[@name='subject']" position="attributes">
+                <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')], 'readonly': [('state', 'in', ('sending', 'done'))], 'required': [('mailing_type', '=', 'mail')]}</attribute>
+                <!-- overrided in xml view to prevent remaining helper changes (on mass_mailing module) when mass_mailing_sms uninstalled-->
+                <attribute name="help">For an Email, Subject your Recipients will see in their inbox.
+                    For an SMS Text Message, internal Title of the Message.</attribute>
+            </xpath>
+            <xpath expr="//field[@name='subject']" position="after">
+                <field name="sms_subject" string="Title" attrs="{'invisible': [('mailing_type', '!=', 'sms')], 'readonly': [('state', 'in', ('sending', 'done'))], 'required': [('mailing_type', '=', 'sms')]}"/>
+            </xpath>
             <xpath expr="//page[@name='mail_body']" position="attributes">
                 <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
             </xpath>
             <xpath expr="//page[@name='mail_body']" position="after">
                 <page string="SMS Content" name="sms_body" attrs="{'invisible': [('mailing_type', '!=', 'sms')]}">
-                    <field name="body_plaintext" widget="sms_widget" attrs="{'required': [('mailing_type', '=', 'sms')]}"/>
+                    <field name="body_plaintext" widget="sms_widget" attrs="{'required': [('mailing_type', '=', 'sms')]}" 
+                        options='{"enable_emojis": True}'/>
                     <group>
                         <field name="sms_force_send" invisible="1"/>
                     </group>

From c697da9403d2ebbbc135715038017582747e0184 Mon Sep 17 00:00:00 2001
From: xO-Tx <mou@odoo.com>
Date: Mon, 15 Jun 2020 07:51:55 +0000
Subject: [PATCH 5/5] [FIX] web: make emoji dropdown appear on top of content

Form sheet with hidden overflow (added to improve ribbon widget css) prevents
emoji button from showing emoji list when clicked. This commit attempts to
show the complete emoji dropdown by removing overflow from the sheet container.

IMPORTANT : This override won't affect ribbon since the hidden overflow was
added on the widget itself.

Task ID-2224393
PR #49096
---
 addons/web/static/src/scss/form_view_extra.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/scss/form_view_extra.scss b/addons/web/static/src/scss/form_view_extra.scss
index 07fb8bb775b..f6b8b2fa095 100644
--- a/addons/web/static/src/scss/form_view_extra.scss
+++ b/addons/web/static/src/scss/form_view_extra.scss
@@ -16,7 +16,6 @@
             border: 1px solid #c8c8d3;
             box-shadow: 0 4px 20px rgba(0,0,0,0.15);
             background: white;
-            overflow: hidden;
 
             margin: $o-sheet-vpadding*0.2 auto;
             @include media-breakpoint-up(md) {