diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index b4395824cee..b5cc0c20905 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -120,7 +120,7 @@
+ options="{'dynamic_placeholder': true}" enable_emojis="true"/>
diff --git a/addons/sms/static/src/components/sms_widget/fields_sms_widget.js b/addons/sms/static/src/components/sms_widget/fields_sms_widget.js
index 7bd29885547..fcb604c9880 100644
--- a/addons/sms/static/src/components/sms_widget/fields_sms_widget.js
+++ b/addons/sms/static/src/components/sms_widget/fields_sms_widget.js
@@ -1,39 +1,33 @@
/** @odoo-module **/
-import { _t } from 'web.core';
import basic_fields from 'web.basic_fields';
-import fieldRegistry from 'web.field_registry';
-import EmojisTextField from '@mail/views/fields/emojis_text_field';
+import { patch } from "@web/core/utils/patch";
+import { EmojisTextField} from '@mail/views/fields/emojis_text_field/emojis_text_field';
+import { useService } from "@web/core/utils/hooks";
+import { registry } from "@web/core/registry";
-var DynamicPlaceholderFieldMixin = basic_fields.DynamicPlaceholderFieldMixin;
+const DynamicPlaceholderFieldMixin = basic_fields.DynamicPlaceholderFieldMixin;
/**
* SmsWidget is a widget to display a textarea (the body) and a text representing
* the number of SMS and the number of characters. This text is computed every
* time the user changes the body.
*/
-var SmsWidget = EmojisTextField.extend(DynamicPlaceholderFieldMixin, {
- className: 'o_field_text',
- enableEmojis: false,
- /**
- * @constructor
- */
- init: function () {
- this._super.apply(this, arguments);
- this.nbrChar = 0;
- this.nbrSMS = 0;
- this.encoding = 'GSM7';
- this.enableEmojis = !!this.nodeOptions.enable_emojis;
- },
+export class SmsWidget extends EmojisTextField {
+ setup() {
+ super.setup();
+ this.notification = useService('notification');
+ }
- /**
- * @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);
- }
- },
+ get encoding() {
+ return this._extractEncoding(this.props.value || '');
+ }
+ get nbrChar() {
+ const content = this.props.value || '';
+ return content.length + (content.match(/\n/g) || []).length;
+ }
+ get nbrSMS() {
+ return this._countSMS(this.nbrChar, this.encoding);
+ }
/**
* Open a Model Field Selector in order to select fields
@@ -45,67 +39,35 @@ var SmsWidget = EmojisTextField.extend(DynamicPlaceholderFieldMixin, {
* @param {Array} chain
*
*/
- openDynamicPlaceholder: async function (baseModel, chain = []) {
+ async openDynamicPlaceholder(baseModel, chain = []) {
const modelSelector = await this._openNewModelSelector(baseModel, chain);
modelSelector.$el.css('margin-top', 4);
- },
-
- //--------------------------------------------------------------------------
- // Private: override widget
- //--------------------------------------------------------------------------
-
- /**
- * @private
- * @override
- */
- _renderEdit: function () {
- var def = this._super.apply(this, arguments);
-
- this._compute();
- var $sms_container = $('');
- $sms_container.append(this._renderSMSInfo());
- $sms_container.append(this._renderIAPButton());
- this.$el = this.$el.add($sms_container);
-
- return def;
- },
+ }
//--------------------------------------------------------------------------
// Private: SMS
//--------------------------------------------------------------------------
- /**
- * Compute the number of characters and sms
- * @private
- */
- _compute: function () {
- var content = this._getValue();
- this.encoding = this._extractEncoding(content);
- this.nbrChar = content.length;
- this.nbrChar += (content.match(/\n/g) || []).length;
- this.nbrSMS = this._countSMS(this.nbrChar, this.encoding);
- },
-
/**
* Count the number of SMS of the content
* @private
* @returns {integer} Number of SMS
*/
- _countSMS: function () {
- if (this.nbrChar === 0) {
+ _countSMS(nbrChar, encoding) {
+ if (nbrChar === 0) {
return 0;
}
- if (this.encoding === 'UNICODE') {
- if (this.nbrChar <= 70) {
+ if (encoding === 'UNICODE') {
+ if (nbrChar <= 70) {
return 1;
}
- return Math.ceil(this.nbrChar / 67);
+ return Math.ceil(nbrChar / 67);
}
- if (this.nbrChar <= 160) {
+ if (nbrChar <= 160) {
return 1;
}
- return Math.ceil(this.nbrChar / 153);
- },
+ return Math.ceil(nbrChar / 153);
+ }
/**
* Extract the encoding depending on the characters in the content
@@ -113,49 +75,12 @@ var SmsWidget = EmojisTextField.extend(DynamicPlaceholderFieldMixin, {
* @param {String} content Content of the SMS
* @returns {String} Encoding of the content (GSM7 or UNICODE)
*/
- _extractEncoding: function (content) {
+ _extractEncoding(content) {
if (String(content).match(RegExp("^[@£$¥èéùìòÇ\\nØø\\rÅåΔ_ΦΓΛΩΠΨΣΘΞÆæßÉ !\\\"#¤%&'()*+,-./0123456789:;<=>?¡ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÑܧ¿abcdefghijklmnopqrstuvwxyzäöñüà]*$"))) {
return 'GSM7';
}
return 'UNICODE';
- },
-
- /**
- * Render the IAP button to redirect to IAP pricing
- * @private
- */
- _renderIAPButton: function () {
- return $('', {
- 'href': 'https://iap-services.odoo.com/iap/sms/pricing',
- 'target': '_blank',
- 'title': _t('SMS Pricing'),
- 'aria-label': _t('SMS Pricing'),
- 'class': 'fa fa-lg fa-info-circle',
- });
- },
-
- /**
- * Render the number of characters, sms and the encoding.
- * @private
- */
- _renderSMSInfo: function () {
- var string = _.str.sprintf(_t('%s characters, fits in %s SMS (%s) '), this.nbrChar, this.nbrSMS, this.encoding);
- var $span = $('', {
- 'class': 'text-muted o_sms_count',
- });
- $span.text(string);
- return $span;
- },
-
- /**
- * Update widget SMS information with re-computed info about length, ...
- * @private
- */
- _updateSMSInfo: function () {
- this._compute();
- var string = _.str.sprintf(_t('%s characters, fits in %s SMS (%s) '), this.nbrChar, this.nbrSMS, this.encoding);
- this.$('.o_sms_count').text(string);
- },
+ }
//--------------------------------------------------------------------------
// Handlers
@@ -165,43 +90,34 @@ var SmsWidget = EmojisTextField.extend(DynamicPlaceholderFieldMixin, {
* @override
* @private
*/
- _onBlur: function () {
- var content = this._getValue();
+ async onBlur() {
+ var content = this.props.value || '';
if( !content.trim().length && content.length > 0) {
- this.displayNotification({ title: _t("Your SMS Text Message must include at least one non-whitespace character"), type: 'danger' });
- this.$input.val(content.trim());
- this._updateSMSInfo();
+ this.notification.add(
+ this.env._t("Your SMS Text Message must include at least one non-whitespace character"),
+ { type: 'danger' },
+ )
+ await this.props.update(content.trim());
}
- },
+ }
/**
* @override
* @private
*/
- _onChange: function () {
- this._super.apply(this, arguments);
- this._updateSMSInfo();
- },
-
- /**
- * @override
- * @private
- */
- _onInput: function (ev) {
- this._super.apply(this, arguments);
+ async onInput(ev) {
+ await this.props.update(this.targetEditElement.el.value);
+ super.onInput(...arguments);
const key = ev.originalEvent ? ev.originalEvent.data : '';
- if (this.nodeOptions &&
- this.nodeOptions.dynamic_placeholder &&
- key === this.DYNAMIC_PLACEHOLDER_TRIGGER_KEY) {
+ if (this.props.dynamicPlaceholder && key === this.DYNAMIC_PLACEHOLDER_TRIGGER_KEY) {
const baseModel = this.recordData && this.recordData.mailing_model_real ? this.recordData.mailing_model_real : undefined;
if (baseModel) {
this.openDynamicPlaceholder(baseModel);
}
}
- this._updateSMSInfo();
- },
-});
-
-fieldRegistry.add('sms_widget', SmsWidget);
-
-export default SmsWidget;
+ }
+};
+SmsWidget.template = 'sms.SmsWidget';
+SmsWidget.additionalClasses = [...(EmojisTextField.additionalClasses || []), 'o_field_text'];
+patch(SmsWidget.prototype, 'sms_widget_dynamic_placeholder_field_mixin', DynamicPlaceholderFieldMixin);
+registry.category("fields").add("sms_widget", SmsWidget);
diff --git a/addons/sms/static/src/components/sms_widget/fields_sms_widget.xml b/addons/sms/static/src/components/sms_widget/fields_sms_widget.xml
new file mode 100644
index 00000000000..e3fd7625570
--- /dev/null
+++ b/addons/sms/static/src/components/sms_widget/fields_sms_widget.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ onBlur
+
+
+
+
+ characters, fits in SMS ()
+
+
+