[REF] web, *: move CompoundContext out of data.js

We want to remove data.js, but we still need the CompoundContext class,
so we take it out, and rename it 'Context'

4 files changed, 13 insertions, 9 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index 9dfe28e01dd..8db4fab8094 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -11,6 +11,7 @@ odoo.define('web.ActionManager', function (require) {
 
 var Bus = require('web.Bus');
 var ControlPanel = require('web.ControlPanel');
+var Context = require('web.Context');
 var core = require('web.core');
 var crash_manager = require('web.crash_manager');
 var data = require('web.data');
@@ -620,7 +621,7 @@ var ActionManager = Widget.extend({
 
         // Ensure context & domain are evaluated and can be manipulated/used
         var user_context = this.getSession().user_context;
-        var ncontext = new data.CompoundContext(user_context, options.additional_context, action.context || {});
+        var ncontext = new Context(user_context, options.additional_context, action.context || {});
         action.context = pyeval.eval('context', ncontext);
         if (action.context.active_id || action.context.active_ids) {
             // Here we assume that when an `active_id` or `active_ids` is used
diff --git a/addons/web/static/src/js/chrome/search_inputs.js b/addons/web/static/src/js/chrome/search_inputs.js
index bf7d16b210c..934204eb0ab 100644
--- a/addons/web/static/src/js/chrome/search_inputs.js
+++ b/addons/web/static/src/js/chrome/search_inputs.js
@@ -1,6 +1,7 @@
 odoo.define('web.search_inputs', function (require) {
 "use strict";
 
+var Context = require('web.Context');
 var core = require('web.core');
 var data = require('web.data');
 var field_utils = require('web.field_utils');
@@ -118,13 +119,13 @@ var Field = Input.extend( /** @lends instance.web.search.Field# */ {
             return;
         }
         var contexts = facet.values.map(function (facetValue) {
-            return new data.CompoundContext(context)
+            return new Context(context)
                 .set_eval_context({self: self.value_from(facetValue)});
         });
 
         if (contexts.length === 1) { return contexts[0]; }
 
-        return _.extend(new data.CompoundContext(), {
+        return _.extend(new Context(), {
             __contexts: contexts
         });
     },
@@ -588,7 +589,7 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
 
         if (!contexts.length) { return; }
         if (contexts.length === 1) { return contexts[0]; }
-        return _.extend(new data.CompoundContext(), {
+        return _.extend(new Context(), {
             __contexts: contexts
         });
     },
diff --git a/addons/web/static/src/js/chrome/sidebar.js b/addons/web/static/src/js/chrome/sidebar.js
index 79b06f9ee4d..b57e94e422c 100644
--- a/addons/web/static/src/js/chrome/sidebar.js
+++ b/addons/web/static/src/js/chrome/sidebar.js
@@ -1,6 +1,7 @@
 odoo.define('web.Sidebar', function (require) {
 "use strict";
 
+var Context = require('web.Context');
 var core = require('web.core');
 var data = require('web.data');
 var Dialog = require('web.Dialog');
@@ -144,15 +145,15 @@ var Sidebar = Widget.extend({
                     active_ids_context.active_domain = domain;
                 }
                 var c = pyeval.eval('context',
-                new data.CompoundContext(
+                new Context(
                     sidebar_eval_context, active_ids_context));
 
                 self.rpc("/web/action/load", {
                     action_id: item.action.id,
-                    context: new data.CompoundContext(
+                    context: new Context(
                         dataset.get_context(), active_ids_context).eval()
                 }).done(function(result) {
-                    result.context = new data.CompoundContext(
+                    result.context = new Context(
                         result.context || {}, active_ids_context)
                             .set_eval_context(c);
                     result.flags = result.flags || {};
diff --git a/addons/web/static/src/js/chrome/view_manager.js b/addons/web/static/src/js/chrome/view_manager.js
index 5b30d1a3c5c..0566b3042be 100644
--- a/addons/web/static/src/js/chrome/view_manager.js
+++ b/addons/web/static/src/js/chrome/view_manager.js
@@ -1,6 +1,7 @@
 odoo.define('web.ViewManager', function (require) {
 "use strict";
 
+var Context = require('web.Context');
 var ControlPanelMixin = require('web.ControlPanelMixin');
 var core = require('web.core');
 var data = require('web.data');
@@ -538,7 +539,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
     do_execute_action: function (action_data, model, record_id, on_closed) {
         var self = this;
         var result_handler = on_closed || function () {};
-        var context = new data.CompoundContext(this.env.context, action_data.context || {});
+        var context = new Context(this.env.context, action_data.context || {});
 
         // response handler
         var handler = function (action) {
@@ -546,7 +547,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
                 // filter out context keys that are specific to the current action.
                 // Wrong default_* and search_default_* values will no give the expected result
                 // Wrong group_by values will simply fail and forbid rendering of the destination view
-                var ncontext = new data.CompoundContext(
+                var ncontext = new Context(
                     _.object(_.reject(_.pairs(self.env.context), function(pair) {
                       return pair[0].match('^(?:(?:default_|search_default_|show_).+|.+_view_ref|group_by|group_by_no_leaf|active_id|active_ids)$') !== null;
                     }))