diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-07-31 11:01:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-31 11:01:45 +0200 |
| commit | ecc760b6aebbdb5e8f0eee72f8d057a8e38b1da0 (patch) | |
| tree | f74408784d850406104033e178d97cf9456628e9 /addons/web/static/src/js/services/crash_manager.js | |
| parent | caf6cb929b852209e84fa23efd10f58651d18d8e (diff) | |
| parent | 5ac167a85bde69460f8729bd4af3b249d05849fd (diff) | |
[MERGE] web, *: review crashmanager changes for backend/frontend
* gamification, website_forum, stock
Fix for: https://github.com/odoo/odoo/pull/32132
Some problems with the mentioned PR had to be fixed and after some
discussions, it was decided to revert back to the original crashmanager
warnings for the backend.
See sub-commits for details.
closes odoo/odoo#35209
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/services/crash_manager.js')
| -rw-r--r-- | addons/web/static/src/js/services/crash_manager.js | 97 |
1 files changed, 60 insertions, 37 deletions
diff --git a/addons/web/static/src/js/services/crash_manager.js b/addons/web/static/src/js/services/crash_manager.js index 701d97f0a53..6baca444788 100644 --- a/addons/web/static/src/js/services/crash_manager.js +++ b/addons/web/static/src/js/services/crash_manager.js @@ -1,27 +1,22 @@ odoo.define('web.CrashManager', function (require) { "use strict"; +const AbstractService = require('web.AbstractService'); var ajax = require('web.ajax'); var core = require('web.core'); var Dialog = require('web.Dialog'); -var mixins = require('web.mixins'); -var ServicesMixin = require('web.ServicesMixin'); -var ServiceProviderMixin = require('web.ServiceProviderMixin'); var Widget = require('web.Widget'); var _t = core._t; var _lt = core._lt; -var map_title ={ - user_error: _lt("User Error"), - warning: _lt("Warning"), - access_error: _lt("Access Error"), - missing_error: _lt("Missing Record"), - validation_error: _lt("Validation Error"), - except_orm: _lt("Global Business Error"), - access_denied: _lt("Access Denied"), - karma_error: _lt("Karma Error"), -}; +// Register this eventlistener before qunit does. +// Some errors needs to be negated by the crash_manager. +window.addEventListener('unhandledrejection', ev => + core.bus.trigger('crash_manager_unhandledrejection', ev) +); + +let active = true; /** * An extension of Dialog Widget to render the warnings and errors on the website. @@ -78,13 +73,13 @@ var WarningDialog = CrashManagerDialog.extend({ }, }); -var CrashManager = core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, ServiceProviderMixin,{ +var CrashManager = AbstractService.extend({ init: function () { var self = this; - this.active = true; + active = true; this.isConnected = true; - mixins.EventDispatcherMixin.init.call(this); + this._super.apply(this, arguments); // crash manager integration core.bus.on('rpc_error', this, this.rpc_error); @@ -128,7 +123,7 @@ var CrashManager = core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, // listen to unhandled rejected promises, and throw an error when the // promise has been rejected due to a crash - window.addEventListener('unhandledrejection', function (ev) { + core.bus.on('crash_manager_unhandledrejection', this, function (ev) { if (ev.reason && ev.reason instanceof Error) { var traceback = ev.reason.stack; self.show_error({ @@ -144,13 +139,26 @@ var CrashManager = core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, ev.preventDefault(); } }); - ServiceProviderMixin.init.call(this); }, enable: function () { - this.active = true; + active = true; }, disable: function () { - this.active = false; + active = false; + }, + /** + * @return {Object} + */ + getMapTitle() { + return { + access_denied: _lt("Access Denied"), + access_error: _lt("Access Error"), + except_orm: _lt("Global Business Error"), + missing_error: _lt("Missing Record"), + user_error: _lt("User Error"), + validation_error: _lt("Validation Error"), + warning: _lt("Warning"), + }; }, handleLostConnection: function () { var self = this; @@ -175,7 +183,13 @@ var CrashManager = core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, }, delay); }, rpc_error: function(error) { - if (!this.active) { + // Some qunit tests produces errors before the DOM is set. + // This produces an error loop as the modal/toast has no DOM to attach to. + if (!document.body) { + return; + } + var map_title = this.getMapTitle(); + if (!active) { return; } if (this.connection_lost) { @@ -229,21 +243,16 @@ var CrashManager = core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, } }, show_warning: function (error, options) { - if (!this.active) { + if (!active) { return; } var message = error.data ? error.data.message : error.message; var title = _.str.capitalize(error.type) || _t("Oops Something went wrong !"); var subtitle = error.data ? error.data.title : error.title; - this.displayNotification(_.extend({ - title: title, - message: message, - subtitle: subtitle, - sticky: true, - }, options)); + return this._displayWarning(message, title, subtitle, options); }, show_error: function (error) { - if (!this.active) { + if (!active) { return; } var dialog = new ErrorDialog(this, { @@ -297,6 +306,27 @@ var CrashManager = core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, data: {debug: ""} }); }, + + //-------------------------------------------------------------------------- + // Private + //-------------------------------------------------------------------------- + + /** + * @private + * @param {string} message + * @param {string} title + * @param {string} subtitle + * @param {Object} options + */ + _displayWarning: function (message, title, subtitle, options) { + return new WarningDialog(this, { + ...options, + title, + subtitle, + }, { + message, + }).open(); + }, }); /** @@ -375,13 +405,6 @@ return { CrashManager: CrashManager, ErrorDialog: ErrorDialog, WarningDialog: WarningDialog, + disable: () => active = false, }; }); - -odoo.define('web.crash_manager', function (require) { -"use strict"; - -var CrashManager = require('web.CrashManager').CrashManager; -return new CrashManager(); - -}); |
