', {
- class: 'o_value',
- html: formatter(measurement.value, measureField),
- });
- }
- cellParams.html = $value;
- } else {
- cellParams.class += ' o_empty'
- }
- $tr.append($('
', cellParams));
});
- $tbody.append($tr);
- });
- },
- //--------------------------------------------------------------------------
- // Handlers
- //--------------------------------------------------------------------------
+ onMounted(() => this._updateTooltip());
- /**
- * When the user clicks on a non empty cell, and the view is configured to
- * allow 'linking' (with enableLinking), we want to open a list view with
- * the corresponding record.
- *
- * @private
- * @param {MouseEvent} ev
- */
- _onCellValueClicked: function (ev) {
- ev.preventDefault();
- ev.stopPropagation();
+ onPatched(() => this._updateTooltip());
- var $target = $(ev.currentTarget);
- if ($target.hasClass('o_empty') || !this.enableLinking) {
- return;
- }
-
- var context = _.omit(this.state.context, function (val, key) {
- return key === 'group_by' || _.str.startsWith(key, 'search_default_');
- });
-
- var groupId = $target.data('groupId');
- var originIndexes = $target.data('originIndexes');
-
- var group = {
- rowValues: groupId[0],
- colValues: groupId[1],
- originIndex: originIndexes[0]
- };
-
- this.trigger_up('open_view', {
- group: group,
- context: context,
- });
- },
- /**
- * Highlight the column when hovering a cell.
- *
- * @private
- * @param {MouseEvent} ev
- */
- _onMouseenterCell: function (ev) {
- var index = $(ev.currentTarget).index();
- if ($(ev.currentTarget).is('th')) { // header cell
- index += 1; // increment by 1 to compensate the top left empty cell
- }
- this.$("td").filter(":nth-child(" + (index + 1) + ")").addClass("o_cell_hover");
- },
- /**
- * @private
- */
- _onMouseleaveCell: function () {
- this.$('.o_cell_hover').removeClass('o_cell_hover');
- },
- /**
- * This method is called when someone clicks on an open header. When that
- * happens, we want to close the header, then redisplay the view.
- *
- * @private
- * @param {MouseEvent} ev
- */
- _onOpenHeaderClick: function (ev) {
- ev.preventDefault();
- ev.stopImmediatePropagation();
-
- var $target = $(ev.target);
- var groupId = $target.data('groupId');
- var type = $target.data('type');
-
- this.trigger_up('close_group', {
- groupId: groupId,
- type: type,
- });
- },
- /**
- * If the user clicks on a measure or origin row, we perform an in-memory sort.
- *
- * @private
- * @param {MouseEvent} ev
- */
- _onSpecialRowClick: function (ev) {
- ev.preventDefault();
- ev.stopImmediatePropagation();
-
- var $target = $(ev.target);
- var groupId = $target.data('groupId');
- var measure = $target.data('measure');
- var originIndexes = $target.data('originIndexes');
- var isAscending = $target.hasClass('o_pivot_sort_order_asc');
- var order = isAscending ? 'desc' : 'asc';
-
- this.trigger_up('sort_rows', {
- sortedColumn: {
- groupId: groupId,
- measure: measure,
- order: order,
- originIndexes: originIndexes,
+ if (!this.env.device.isMobile) {
+ useExternalListener(window, 'click', this._resetState);
}
- });
- },
-});
+ }
+
+ //----------------------------------------------------------------------
+ // Private
+ //----------------------------------------------------------------------
+
+ /**
+ * Get the formatted value of the cell
+ *
+ * @private
+ * @param {Object} cell
+ * @returns {string} Formatted value
+ */
+ _getFormattedValue(cell) {
+ const type = this.props.widgets[cell.measure] ||
+ (this.props.fields[cell.measure].type === 'many2one' ? 'integer' : this.props.fields[cell.measure].type);
+ const formatter = field_utils.format[type];
+ return formatter(cell.value, this.props.fields[cell.measure]);
+ }
+
+ /**
+ * Get the formatted variation of a cell
+ *
+ * @private
+ * @param {Object} cell
+ * @returns {string} Formatted variation
+ */
+ _getFormattedVariation(cell) {
+ const value = cell.value;
+ return isNaN(value) ? '-' : field_utils.format.percentage(value, this.props.fields[cell.measure]);
+ }
+
+ /**
+ * Retrieves the padding of a left header
+ *
+ * @private
+ * @param {Object} cell
+ * @returns {Number} Padding
+ */
+ _getPadding(cell) {
+ return 5 + cell.indent * 30;
+ }
+
+ /**
+ * Compute if a cell is active (with its groupId)
+ *
+ * @private
+ * @param {Array} groupId GroupId of a cell
+ * @param {Boolean} isXAxis true if the cell is on the x axis
+ * @returns {Boolean} true if the cell is active
+ */
+ _isClicked(groupId, isXAxis) {
+ return _.isEqual(groupId, this.state.activeNodeHeader.groupId) && this.state.activeNodeHeader.isXAxis === isXAxis;
+ }
+
+ /**
+ * Reset the state of the node.
+ *
+ * @private
+ */
+ _resetState() {
+ // This is a pourrav solution
+ if (this.isHeaderClicked) {
+ this.isHeaderClicked = false;
+ return;
+ }
+ this.state.activeNodeHeader = {
+ groupId: false,
+ isXAxis: false,
+ click: false
+ };
+ }
+
+ /**
+ * Configure the tooltips on the headers.
+ *
+ * @private
+ */
+ _updateTooltip() {
+ $(this.el).find('.o_pivot_header_cell_opened, .o_pivot_header_cell_closed').tooltip();
+ }
+
+ //----------------------------------------------------------------------
+ // Handlers
+ //----------------------------------------------------------------------
+
+
+ /**
+ * Handles a click on a menu item in the dropdown to select a groupby.
+ *
+ * @private
+ * @param {Object} field
+ * @param {string} interval
+ */
+ _onClickMenuGroupBy(field, interval) {
+ this.trigger('groupby_menu_selection', { field, interval });
+ }
+
+
+ /**
+ * Handles a click on a header node
+ *
+ * @private
+ * @param {Object} cell
+ * @param {string} type col or row
+ */
+ _onHeaderClick(cell, type) {
+ const groupValues = cell.groupId[type === 'col' ? 1 : 0];
+ const groupByLength = type === 'col' ? this.props.colGroupBys.length : this.props.rowGroupBys.length;
+ if (cell.isLeaf && groupValues.length >= groupByLength) {
+ this.isHeaderClicked = true;
+ this.state.activeNodeHeader = {
+ groupId: cell.groupId,
+ isXAxis: type === 'col',
+ click: 'leftClick'
+ };
+ }
+ this.trigger(cell.isLeaf ? 'closed_header_click' : 'opened_header_click', { cell, type });
+ }
+
+ /**
+ * Hover the column in which the mouse is.
+ *
+ * @private
+ * @param {MouseEvent} ev
+ */
+ _onMouseEnter(ev) {
+ var index = [...ev.currentTarget.parentNode.children].indexOf(ev.currentTarget);
+ if (ev.currentTarget.tagName === 'TH') {
+ index += 1;
+ }
+ this.el.querySelectorAll('td:nth-child(' + (index + 1) + ')').forEach(elt => elt.classList.add('o_cell_hover'));
+ }
+
+ /**
+ * Remove the hover on the columns.
+ *
+ * @private
+ */
+ _onMouseLeave() {
+ this.el.querySelectorAll('.o_cell_hover').forEach(elt => elt.classList.remove('o_cell_hover'));
+ }
+ }
+
+ PivotRenderer.template = 'web.PivotRenderer';
+
+ return PivotRenderer;
-return PivotRenderer;
});
diff --git a/addons/web/static/src/js/views/pivot/pivot_view.js b/addons/web/static/src/js/views/pivot/pivot_view.js
index 1b878cf3530..17cc478ba9b 100644
--- a/addons/web/static/src/js/views/pivot/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot/pivot_view.js
@@ -1,137 +1,150 @@
odoo.define('web.PivotView', function (require) {
-"use strict";
-
-/**
- * The Pivot View is a view that represents data in a 'pivot grid' form. It
- * aggregates data on 2 dimensions and displays the result, allows the user to
- * 'zoom in' data.
- */
-
-var AbstractView = require('web.AbstractView');
-var config = require('web.config');
-var core = require('web.core');
-var PivotModel = require('web.PivotModel');
-var PivotController = require('web.PivotController');
-var PivotRenderer = require('web.PivotRenderer');
-
-var _t = core._t;
-var _lt = core._lt;
-
-var controlPanelViewParameters = require('web.controlPanelViewParameters');
-var GROUPABLE_TYPES = controlPanelViewParameters.GROUPABLE_TYPES;
-
-var PivotView = AbstractView.extend({
- display_name: _lt('Pivot'),
- icon: 'fa-table',
- config: _.extend({}, AbstractView.prototype.config,{
- Model: PivotModel,
- Controller: PivotController,
- Renderer: PivotRenderer,
- }),
- viewType: 'pivot',
- searchMenuTypes: ['filter', 'groupBy', 'timeRange', 'favorite'],
+ "use strict";
/**
- * @override
- * @param {Object} params
+ * The Pivot View is a view that represents data in a 'pivot grid' form. It
+ * aggregates data on 2 dimensions and displays the result, allows the user to
+ * 'zoom in' data.
*/
- init: function (viewInfo, params) {
- var self = this;
- this._super.apply(this, arguments);
- var activeMeasures = [];
- var colGroupBys = [];
- var rowGroupBys = [];
+ const AbstractView = require('web.AbstractView');
+ const config = require('web.config');
+ const core = require('web.core');
+ const PivotModel = require('web.PivotModel');
+ const PivotController = require('web.PivotController');
+ const PivotRenderer = require('web.PivotRenderer');
+ const RendererWrapper = require('web.RendererWrapper');
- var measures = {};
- var groupableFields = {};
- var widgets = {};
+ const _t = core._t;
+ const _lt = core._lt;
- this.fields.__count = {string: _t("Count"), type: "integer"};
- _.each(this.fields, function (field, name) {
- if ((name !== 'id') && (field.store === true)) {
- if (_.contains(['integer', 'float', 'monetary'], field.type) ||
- _.contains(params.additionalMeasures, name)) {
+ const controlPanelViewParameters = require('web.controlPanelViewParameters');
+ const GROUPABLE_TYPES = controlPanelViewParameters.GROUPABLE_TYPES;
+
+ const PivotView = AbstractView.extend({
+ display_name: _lt('Pivot'),
+ icon: 'fa-table',
+ config: Object.assign({}, AbstractView.prototype.config, {
+ Model: PivotModel,
+ Controller: PivotController,
+ Renderer: PivotRenderer,
+ }),
+ viewType: 'pivot',
+ searchMenuTypes: ['filter', 'groupBy', 'timeRange', 'favorite'],
+
+ /**
+ * @override
+ * @param {Object} params
+ * @param {Array} params.additionalMeasures
+ */
+ init: function (viewInfo, params) {
+ this._super.apply(this, arguments);
+
+ const activeMeasures = []; // Store the defined active measures
+ const colGroupBys = []; // Store the defined group_by used on cols
+ const rowGroupBys = []; // Store the defined group_by used on rows
+ const measures = {}; // All the available measures
+ const groupableFields = {}; // The fields which can be used to group data
+ const widgets = {}; // Wigdets defined in the arch
+ const additionalMeasures = params.additionalMeasures || [];
+
+ this.fields.__count = { string: _t("Count"), type: "integer" };
+
+ //Compute the measures and the groupableFields
+ Object.keys(this.fields).forEach(name => {
+ const field = this.fields[name];
+ if (name !== 'id' && field.store === true) {
+ if (['integer', 'float', 'monetary'].includes(field.type) || additionalMeasures.includes(name)) {
measures[name] = field;
+ }
+ if (GROUPABLE_TYPES.includes(field.type)) {
+ groupableFields[name] = field;
+ }
}
- if (_.contains(GROUPABLE_TYPES, field.type)) {
- groupableFields[name] = field;
- }
- }
- });
- measures.__count = {string: _t("Count"), type: "integer"};
-
- this.arch.children.forEach(function (field) {
- var name = field.attrs.name;
- if (field.attrs.interval) {
- name += ':' + field.attrs.interval;
- }
- if (field.attrs.widget) {
- widgets[name] = field.attrs.widget;
- }
- if (field.attrs.invisible && py.eval(field.attrs.invisible)) {
- delete measures[name];
- return;
- }
- // add active measures to the measure list. This is very rarely
- // necessary, but it can be useful if one is working with a
- // functional field non stored, but in a model with an overrided
- // read_group method. In this case, the pivot view could work, and
- // the measure should be allowed. However, be careful if you define
- // a measure in your pivot view: non stored functional fields will
- // probably not work (their aggregate will always be 0).
- if (field.attrs.type === 'measure' && !(name in measures)) {
- measures[name] = self.fields[name];
- }
- if (field.attrs.string) {
- measures[name].string = field.attrs.string;
- }
- if (field.attrs.type === 'measure' || 'operator' in field.attrs) {
- activeMeasures.push(name);
- measures[name] = self.fields[name];
- }
- if (field.attrs.type === 'col') {
- colGroupBys.push(name);
- }
- if (field.attrs.type === 'row') {
- rowGroupBys.push(name);
- }
- });
- if ((!activeMeasures.length) || this.arch.attrs.display_quantity) {
- activeMeasures = ['__count'].concat(activeMeasures);
- }
-
- this.loadParams.measures = activeMeasures;
- this.loadParams.colGroupBys = colGroupBys;
- this.loadParams.rowGroupBys = rowGroupBys;
- this.loadParams.fields = this.fields;
- this.loadParams.default_order = params.default_order || this.arch.attrs.default_order;
- if (config.device.isMobile) {
- this.loadParams.colGroupBys = [];
- }
-
-
- this.rendererParams.widgets = widgets;
- this.rendererParams.enableLinking = !this.arch.attrs.disable_linking;
-
- this.controllerParams.title = params.title || this.arch.attrs.string || _t("Untitled");
- this.controllerParams.measures = measures;
- this.controllerParams.groupableFields = groupableFields;
- // retrieve form and list view ids from the action to open those views
- // when a data cell of the pivot view is clicked
- this.controllerParams.views = [
- _findView(params.actionViews, 'list'),
- _findView(params.actionViews, 'form'),
- ];
- function _findView(views, viewType) {
- var view = _.find(views, function (view) {
- return view.type === viewType;
});
- return [view ? view.viewID : false, viewType];
- }
- },
-});
+ measures.__count = { string: _t("Count"), type: "integer" };
-return PivotView;
+
+ this.arch.children.forEach(field => {
+ let name = field.attrs.name;
+
+ // Remove invisible fields from the measures
+ if (field.attrs.invisible && py.eval(field.attrs.invisible)) {
+ delete measures[name];
+ return;
+ }
+ if (field.attrs.interval) {
+ name += ':' + field.attrs.interval;
+ }
+ if (field.attrs.widget) {
+ widgets[name] = field.attrs.widget;
+ }
+ // add active measures to the measure list. This is very rarely
+ // necessary, but it can be useful if one is working with a
+ // functional field non stored, but in a model with an overrided
+ // read_group method. In this case, the pivot view could work, and
+ // the measure should be allowed. However, be careful if you define
+ // a measure in your pivot view: non stored functional fields will
+ // probably not work (their aggregate will always be 0).
+ if (field.attrs.type === 'measure' && !(name in measures)) {
+ measures[name] = this.fields[name];
+ }
+ if (field.attrs.string) {
+ measures[name].string = field.attrs.string;
+ }
+ if (field.attrs.type === 'measure' || 'operator' in field.attrs) {
+ activeMeasures.push(name);
+ measures[name] = this.fields[name];
+ }
+ if (field.attrs.type === 'col') {
+ colGroupBys.push(name);
+ }
+ if (field.attrs.type === 'row') {
+ rowGroupBys.push(name);
+ }
+ });
+ if ((!activeMeasures.length) || this.arch.attrs.display_quantity) {
+ activeMeasures.splice(0, 0, '__count');
+ }
+
+ this.loadParams.measures = activeMeasures;
+ this.loadParams.colGroupBys = config.device.isMobile ? [] : colGroupBys;
+ this.loadParams.rowGroupBys = rowGroupBys;
+ this.loadParams.fields = this.fields;
+ this.loadParams.default_order = params.default_order || this.arch.attrs.default_order;
+ this.loadParams.groupableFields = groupableFields;
+
+ this.rendererParams.widgets = widgets;
+ this.rendererParams.disableLinking = this.arch.attrs.disable_linking;
+
+ this.controllerParams.title = params.title || this.arch.attrs.string || _t("Untitled");
+ this.controllerParams.measures = measures;
+
+ // retrieve form and list view ids from the action to open those views
+ // when a data cell of the pivot view is clicked
+ this.controllerParams.views = [
+ _findView(params.actionViews, 'list'),
+ _findView(params.actionViews, 'form'),
+ ];
+
+ function _findView(views, viewType) {
+ const view = views.find(view => {
+ return view.type === viewType;
+ });
+ return [view ? view.viewID : false, viewType];
+ }
+ },
+
+ /**
+ *
+ * @override
+ */
+ getRenderer(parent, state) {
+ state = Object.assign(state || {}, this.rendererParams);
+ return new RendererWrapper(null, state, this.config.Renderer);
+ },
+ });
+
+ return PivotView;
});
diff --git a/addons/web/static/src/scss/pivot_view.scss b/addons/web/static/src/scss/pivot_view.scss
index d67607fe558..3dbfc809d77 100644
--- a/addons/web/static/src/scss/pivot_view.scss
+++ b/addons/web/static/src/scss/pivot_view.scss
@@ -1,5 +1,4 @@
.o_pivot {
- overflow: auto;
.o_pivot_cell_value {
font-size: 1em;
@@ -91,10 +90,6 @@
}
}
- .o_field_selection {
- position: absolute;
- }
-
.o_pivot_field_selection::after {
@include o-caret-right;
position: absolute;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8854426367c..c3f57baba47 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -469,9 +469,6 @@
-
@@ -491,29 +488,6 @@
-
-
-
diff --git a/addons/web/static/src/xml/pivot.xml b/addons/web/static/src/xml/pivot.xml
new file mode 100644
index 00000000000..6e85f1170de
--- /dev/null
+++ b/addons/web/static/src/xml/pivot.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index f6fd77349b6..d40fee98cef 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -3,6 +3,7 @@ odoo.define('web.pivot_tests', function (require) {
var core = require('web.core');
var PivotView = require('web.PivotView');
+var PivotRenderer = require('web.PivotRenderer');
var testUtils = require('web.test_utils');
var testUtilsDom = require('web.test_utils_dom');
@@ -10,7 +11,7 @@ var _t = core._t;
var createActionManager = testUtils.createActionManager;
var createView = testUtils.createView;
var patchDate = testUtils.mock.patchDate;
-
+const oldEnv = PivotRenderer.env;
/**
* Helper function that returns, given a pivot instance, the values of the
* table, separated by ','.
@@ -108,7 +109,7 @@ QUnit.module('Views', {
}]
},
};
- }
+ },
}, function () {
QUnit.module('PivotView');
@@ -595,7 +596,6 @@ QUnit.module('Views', {
return this._super.apply(this, arguments);
},
});
-
assert.containsN(pivot, 'tbody tr', 3,
"should have 3 rows: 1 for the opened header, and 2 for data");
@@ -608,9 +608,9 @@ QUnit.module('Views', {
await testUtils.dom.click(pivot.$('tbody .o_pivot_header_cell_closed'));
assert.containsN(pivot, '.o_pivot_field_menu .dropdown-item[data-field="date"]', 6,
"should have the date field as proposition (Date, Day, Week, Month, Quarter and Year)");
- assert.containsOnce(pivot, '.o_field_selection .dropdown-item[data-field="product_id"]',
+ assert.containsOnce(pivot, '.o_pivot_field_menu .dropdown-item[data-field="product_id"]',
"should have the product_id field as proposition");
- assert.containsNone(pivot, '.o_field_selection .dropdown-item[data-field="non_stored_m2o"]:first',
+ assert.containsNone(pivot, '.o_pivot_field_menu .dropdown-item[data-field="non_stored_m2o"]',
"should not have the non_stored_m2o field as proposition");
await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field="date"]:first'));
@@ -641,7 +641,7 @@ QUnit.module('Views', {
// click on date by day
pivot.$('.dropdown-menu.show .o_inline_dropdown .dropdown-menu').toggle(); // unfold inline dropdown
await testUtils.nextTick();
- await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field="date"][data-interval="day"]'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field="date"]:contains("Day")'));
// open dropdown to zoom into second row
await testUtils.dom.clickLast(pivot.$('tbody th.o_pivot_header_cell_closed'));
@@ -1016,7 +1016,6 @@ QUnit.module('Views', {
// expand on date:days, product
await testUtils.pivot.reload(pivot, {groupBy: ['date:days', 'product_id']});
-
assert.containsN(pivot, 'tbody tr', 8,
"should have 7 rows (total + 3 for December and 2 for October and April)");
@@ -1030,12 +1029,14 @@ QUnit.module('Views', {
// expand all
def = testUtils.makeTestPromise();
await testUtils.dom.click(pivot.$buttons.find('.o_pivot_expand_button'));
+ await testUtils.nextTick();
def.resolve();
+ // await testUtils.returnAfterNextAnimationFrame();
await testUtils.nextTick();
assert.containsN(pivot, 'tbody tr', 8,
"should have 8 rows again");
- pivot.destroy();
+ pivot.destroy();
});
QUnit.test('can download a file', async function (assert) {
@@ -1312,8 +1313,8 @@ QUnit.module('Views', {
});
// Set a column groupby
- pivot.$('thead .o_pivot_header_cell_closed').click();
- await testUtils.dom.click(pivot.$('.o_field_selection .dropdown-item[data-field=customer]'));
+ await testUtils.dom.click(pivot.$('thead .o_pivot_header_cell_closed'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field=customer]'));
// Set a domain
await pivot.update({domain: [['product_id', '=', 37]], groupBy: [], context: {}});
@@ -1327,8 +1328,8 @@ QUnit.module('Views', {
'Column groupby not lost after first reload');
// Set a column groupby
- pivot.$('thead .o_pivot_header_cell_closed').click();
- await testUtils.dom.click(pivot.$('.o_field_selection .dropdown-item[data-field=product_id]'));
+ await testUtils.dom.click(pivot.$('thead .o_pivot_header_cell_closed'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field=product_id]'));
// Set a domain
await pivot.update({domain: [['product_id', '=', 41]], groupBy: [], context: {}});
@@ -1419,8 +1420,8 @@ QUnit.module('Views', {
});
// Set a column groupby
- pivot.$('thead .o_pivot_header_cell_closed').click();
- pivot.$('.o_field_selection .dropdown-item[data-field=customer]').click();
+ await testUtils.dom.click(pivot.$('thead .o_pivot_header_cell_closed'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field=customer]'));
// Set a domain for empty results
await pivot.update({domain: [['id', '=', false]]});
@@ -1701,7 +1702,7 @@ QUnit.module('Views', {
await testUtils.dom.click(pivot.$('tbody .o_pivot_header_cell_closed'));
// click on date by month
pivot.$('.dropdown-menu.show .o_inline_dropdown .dropdown-menu').toggle(); // unfold inline dropdown
- await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field="date"][data-interval="month"]'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field="date"]:contains("Month")'));
assert.strictEqual(pivot.$('.o_pivot_cell_value').text(), '2211',
'should have loaded the proper data');
@@ -1765,7 +1766,7 @@ QUnit.module('Views', {
// Set a column groupby
await testUtils.dom.click(pivot.$('thead .o_pivot_header_cell_closed'));
- await testUtils.dom.click(pivot.$('.o_field_selection .dropdown-item[data-field=customer]:first'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field=customer]:first'));
// Set a Row groupby
await testUtils.dom.click(pivot.$('tbody .o_pivot_header_cell_closed'));
@@ -1974,7 +1975,7 @@ QUnit.module('Views', {
// with data, with row groupby
await testUtils.dom.click(pivot.$('.o_pivot .o_pivot_header_cell_closed').eq(2));
- await testUtils.dom.click(pivot.$('.o_pivot .o_field_selection a[data-field="product_id"]'));
+ await testUtils.dom.click(pivot.$('.o_pivot .o_pivot_field_menu a[data-field="product_id"]'));
values = [
"13", "0", "100%", "0", "19", "-100%", "13", "19", "-31.58%",
"12", "0", "100%", "12", "0" , "100%",
@@ -2517,7 +2518,7 @@ QUnit.module('Views', {
},
});
- await testUtils.dom.click($('td').eq(1));
+ await testUtils.dom.click($('div .o_value')[1]);
unpatchDate();
pivot.destroy();
@@ -2569,7 +2570,7 @@ QUnit.module('Views', {
QUnit.test('group bys added via control panel and expand Header do not stack', async function (assert) {
assert.expect(8);
- delete this.data.partner.fields['date']
+ delete this.data.partner.fields['date'];
var pivot = await createView({
View: PivotView,
@@ -2620,7 +2621,7 @@ QUnit.module('Views', {
].join(''),
"The row headers should be as expected"
);
-
+
// Set a Row groupby
await testUtils.dom.click(pivot.$('tbody .o_pivot_header_cell_closed').eq(0));
await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field=product_id]:first'));
@@ -2671,5 +2672,31 @@ QUnit.module('Views', {
pivot.destroy();
});
+
+ QUnit.test('display only one dropdown menu', async function (assert) {
+ assert.expect(1);
+
+ var pivot = await createView({
+ View: PivotView,
+ model: 'partner',
+ data: this.data,
+ arch: '
' +
+ ' ',
+ viewOptions: {
+ additionalMeasures: ['product_id'],
+ },
+ });
+ await testUtils.dom.clickFirst(pivot.$('th.o_pivot_header_cell_closed'));
+ await testUtils.dom.click(pivot.$('.o_pivot_field_menu .dropdown-item[data-field=product_id]:first'));
+
+ // Click on the two dropdown
+ await testUtils.dom.click(pivot.$('th.o_pivot_header_cell_closed')[0]);
+ await testUtils.dom.click(pivot.$('th.o_pivot_header_cell_closed')[1]);
+
+ assert.containsOnce(pivot, '.o_pivot_field_menu', 'Only one dropdown should be displayed at a time');
+
+ pivot.destroy();
+ });
});
});