audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MIG] web_pivot_computed_measure: Migration to 18.0

Browse Source
This commit is contained in:
Carlos Roca
2024-11-27 13:39:42 +01:00
parent 31cbc5b679
commit 83c38fa2b1
13 changed files with 134 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test-requirements.txt Normal file
View File

@@ -0,0 +1 @@
odoo-test-helper

BIN
web_pivot_computed_measure.zip Normal file
View File

Binary file not shown.

16
web_pivot_computed_measure/__manifest__.py
View File

@@ -3,7 +3,7 @@
{
"name": "Web Pivot Computed Measure",
"category": "web",
"version": "16.0.1.0.0",
"version": "18.0.1.0.0",
"author": "Tecnativa, Odoo Community Association (OCA)",
"license": "AGPL-3",
"website": "https://github.com/OCA/web",
@@ -13,13 +13,17 @@
"maintainers": ["CarlosRoca13"],
"assets": {
"web.assets_backend": [
"/web_pivot_computed_measure/static/src/**/*.esm.js",
"/web_pivot_computed_measure/static/src/**/*.scss",
("remove", "/web_pivot_computed_measure/static/src/test/*.esm.js"),
"/web_pivot_computed_measure/static/src/**/*.xml",
"web_pivot_computed_measure/static/src/**/*.esm.js",
"web_pivot_computed_measure/static/src/**/*.scss",
"web_pivot_computed_measure/static/src/**/*.xml",
("remove", "web_pivot_computed_measure/static/src/test/*.esm.js"),
("remove", "web_pivot_computed_measure/static/src/pivot/*"),
],
"web.assets_backend_lazy": [
"web_pivot_computed_measure/static/src/pivot/*",
],
"web.assets_tests": [
"/web_pivot_computed_measure/static/src/test/test.esm.js",
"web_pivot_computed_measure/static/src/test/test.esm.js",
],
},
}

18
web_pivot_computed_measure/static/src/dropdown_item_custom_measure/dropdown_item_custom_measure.esm.js
View File

@@ -17,16 +17,18 @@ export class DropdownItemCustomMeasure extends Component {
}
addMeasure(ev) {
const $target = $(ev.target).closest("#add_computed_measure_wrapper");
const target = ev.target.closest("#add_computed_measure_wrapper");
const id = new Date().getTime();
const field1 = $target.find("#computed_measure_field_1").val();
const field2 = $target.find("#computed_measure_field_2").val();
let operation = $target.find("#computed_measure_operation").val();
const field1 = target.querySelector("#computed_measure_field_1").value;
const field2 = target.querySelector("#computed_measure_field_2").value;
let operation = target.querySelector("#computed_measure_operation").value;
if (operation === "custom") {
operation = $target.find("#computed_measure_operation_custom").val();
operation = target.querySelector(
"#computed_measure_operation_custom"
).value;
}
const name = $target.find("#computed_measure_name").val();
const format = $target.find("#computed_measure_format").val();
const name = target.querySelector("#computed_measure_name").value;
const format = target.querySelector("#computed_measure_format").value;
this.props.model.addComputedMeasure(
id,
field1,
@@ -35,8 +37,6 @@ export class DropdownItemCustomMeasure extends Component {
name,
format
);
// Click on measures button to close the modal and recompute the measures added
$(ev.target).closest(".dropdown").find(".dropdown-toggle").trigger("click");
}
}
DropdownItemCustomMeasure.template =

10
web_pivot_computed_measure/static/src/pivot/pivot_controller.esm.js
View File

@@ -4,9 +4,8 @@
import {PivotController} from "@web/views/pivot/pivot_controller";
import {patch} from "@web/core/utils/patch";
import {DropdownItemCustomMeasure} from "../dropdown_item_custom_measure/dropdown_item_custom_measure.esm";
patch(PivotController.prototype, "web_pivot_computed_measure.PivotController", {
patch(PivotController.prototype, {
/**
* Add computed_measures to context key to avoid loosing info when saving the
* filter to favorites.
@@ -14,13 +13,8 @@ patch(PivotController.prototype, "web_pivot_computed_measure.PivotController", {
* @override
*/
getContext() {
var res = this._super(...arguments);
var res = super.getContext(...arguments);
res.pivot_computed_measures = this.model._computed_measures;
return res;
},
});
PivotController.components = {
...PivotController.components,
DropdownItemCustomMeasure,
};

48
web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js
View File

@@ -8,14 +8,14 @@ import {patch} from "@web/core/utils/patch";
import {computeReportMeasures} from "@web/views/utils";
import {evalOperation} from "../helpers/utils.esm";
patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
patch(PivotModel.prototype, {
/**
* Add _computed_measures to avoid recompute them until page is recharged
*
* @override
*/
setup() {
this._super(...arguments);
super.setup(...arguments);
this._computed_measures = [];
},
@@ -31,7 +31,7 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
* @returns a promise
*/
addComputedMeasure(id, field1, field2, operation, name, format) {
const measure = _.find(this._computed_measures, (item) => {
const measure = this._computed_measures.find((item) => {
return (
item.field1 === field1 &&
item.field2 === field2 &&
@@ -92,7 +92,7 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
// Used to know if is a computed measure field
__computed_id: cmDef.id,
// Operator used for group the measure added.
group_operator: "sum",
aggregator: "sum",
};
const metaData = (config && config.metaData) || this.metaData;
metaData.measures[cmDef.id] = arrFields[cmDef.id];
@@ -133,7 +133,7 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
(config && config.metaData.activeMeasures) ||
this.metaData.activeMeasures ||
[];
return _.contains(activeMeasures, field);
return activeMeasures.includes(field);
},
/**
@@ -148,7 +148,6 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
if (subGroupData.__count === 0) {
subGroupData[cm.id] = false;
} else {
subGroupData[cm.id] = evalOperation(cm.operation, subGroupData);
}
}
@@ -165,7 +164,7 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
this._fillComputedMeasuresData(subGroup, config);
}
}
this._super(...arguments);
super._prepareData(...arguments);
},
/**
@@ -177,16 +176,16 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
*
* @override
*/
_getGroupSubdivision(group, rowGroupBy, colGroupBy, config) {
async _getGroupSubdivision(group, rowGroupBy, colGroupBy, config) {
const computed_measures = [];
for (let i = 0; i < config.metaData.activeMeasures.length; i++)
if (config.metaData.activeMeasures[i].startsWith("__computed_")) {
computed_measures.push(config.metaData.activeMeasures[i]);
config.metaData.activeMeasures.splice(i, 1);
for (let i = 0; i < config.measureSpecs.length; i++)
if (config.measureSpecs[i].startsWith("__computed_")) {
computed_measures.push(config.measureSpecs[i]);
config.measureSpecs.splice(i, 1);
i--;
}
const res = this._super(...arguments);
$.merge(config.metaData.activeMeasures, computed_measures);
const res = await super._getGroupSubdivision(...arguments);
Object.assign(config.measureSpecs, computed_measures);
return res;
},
@@ -199,7 +198,7 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
toggleMeasure(fieldName) {
if (this._isMeasureEnabled(fieldName)) {
// Mesaure is enabled
const umeasures = _.filter(this._computed_measures, (item) => {
const umeasures = this._computed_measures.filter((item) => {
return item.field1 === fieldName || item.field2 === fieldName;
});
if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) {
@@ -219,8 +218,8 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
const fieldDef = this.metaData.fields[afield];
// Need to check if fieldDef exists to avoid problems with __count
if (fieldDef && fieldDef.__computed_id) {
const cm = _.find(this._computed_measures, {
id: fieldDef.__computed_id,
const cm = this._computed_measures.find((item) => {
return item.id === fieldDef.__computed_id;
});
toAnalyze.push(cm.field1, cm.field2);
const toEnableFields = [];
@@ -238,11 +237,11 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
this._activeMeasures(
// Transform the array of arrays to a simple array.
// [1, [2, 3]] => [1, 2, 3]
_.flatten(toEnable.reverse())
toEnable.reverse().flat(Infinity)
);
}
}
return this._super(...arguments);
return super.toggleMeasure(...arguments);
},
/**
* Load the measures added to selected favorite filters
@@ -250,7 +249,7 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
* @override
*/
async load(searchParams) {
var _super = this._super.bind(this);
var _super = super.load.bind(this);
var config = {metaData: this.metaData, data: this.data};
if (!this.metaData.measures) {
const metaData = this._buildMetaData();
@@ -278,15 +277,14 @@ patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
for (const fieldName of fieldNames) {
const field = this.metaData.fields[fieldName];
if (field.__computed_id) {
const cm = _.find(this._computed_measures, {
id: field.__computed_id,
const cm = this._computed_measures.find((item) => {
return item.id === field.__computed_id;
});
if (!cm) {
delete this.metaData.fields[fieldName];
delete this.metaData.measures[fieldName];
this.metaData.activeMeasures = _.without(
this.metaData.activeMeasures,
fieldName
this.metaData.activeMeasures = this.metaData.activeMeasures.filter(
(item) => item !== fieldName
);
}
}

4
web_pivot_computed_measure/static/src/pivot/pivot_renderer.esm.js
View File

@@ -5,11 +5,11 @@
import {PivotRenderer} from "@web/views/pivot/pivot_renderer";
import {patch} from "@web/core/utils/patch";
patch(PivotRenderer.prototype, "web_pivot_computed_measure.PivotRenderer", {
patch(PivotRenderer.prototype, {
getFormattedValue(cell) {
if (cell.value === Infinity) {
return "-";
}
return this._super(...arguments);
return super.getFormattedValue(...arguments);
},
});

8
web_pivot_computed_measure/static/src/pivot/pivot_view.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="web.PivotView.Buttons" t-inherit-mode="extension" owl="1">
<xpath expr="//t[@t-call='web.ReportViewMeasures']" position="inside">
<t t-set="add_computed_measures" t-value="true" />
<t t-set="model" t-value="model" />
<t t-inherit="web.PivotView.Buttons" t-inherit-mode="extension">
<xpath expr="//ReportViewMeasures" position="attributes">
<attribute name="add_computed_measures">true</attribute>
<attribute name="model">model</attribute>
</xpath>
</t>
</templates>

16
web_pivot_computed_measure/static/src/report_view_measures/report_view_measures.esm.js Normal file
View File

@@ -0,0 +1,16 @@
/** @odoo-module **/
/* Copyright 2024 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
import {ReportViewMeasures} from "@web/views/view_components/report_view_measures";
import {DropdownItemCustomMeasure} from "../dropdown_item_custom_measure/dropdown_item_custom_measure.esm";
ReportViewMeasures.components = {
...ReportViewMeasures.components,
DropdownItemCustomMeasure,
};
ReportViewMeasures.props = {
...ReportViewMeasures.props,
add_computed_measures: {type: Boolean, optional: true},
model: {type: Object, optional: true},
};

29
web_pivot_computed_measure/static/src/report_view_measures/report_view_measures.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="web.ReportViewMeasures" t-inherit-mode="extension">
<xpath expr="//DropdownItem" position="attributes">
<attribute name="t-if">!measure.startsWith('__computed_')</attribute>
</xpath>
<xpath expr="//t[@t-foreach='props.measures']" position="after">
<div
role="separator"
class="dropdown-divider"
t-if="props.add_computed_measures"
/>
<t t-foreach="props.measures" t-as="measure" t-key="measure_value.name">
<DropdownItem
class="{ o_menu_item: true, selected: props.activeMeasures.includes(measure) }"
t-if="props.add_computed_measures and measure.startsWith('__computed_')"
t-esc="props.measures[measure].string"
closingMode="'none'"
onSelected="() => this.props.onMeasureSelected({ measure: measure_value.name })"
/>
</t>
<DropdownItemCustomMeasure
measures="props.measures"
model="props.model"
t-if="props.add_computed_measures"
/>
</xpath>
</t>
</templates>

56
web_pivot_computed_measure/static/src/test/test.esm.js
View File

@@ -2,66 +2,84 @@
/* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
import tour from "web_tour.tour";
import {registry} from "@web/core/registry";
tour.register(
"web_pivot_computed_measure_tour",
{
url: "/web",
test: true,
},
[
registry.category("web_tour.tours").add("web_pivot_computed_measure_tour", {
url: "/odoo",
steps: () => [
{
trigger: ".o_navbar_apps_menu button",
run: "click",
},
{
trigger: '.o_app[data-menu-xmlid="base.menu_administration"]',
run: "click",
},
{
trigger: 'button[data-menu-xmlid="base.menu_users"]',
run: "click",
},
{
trigger: 'a[data-menu-xmlid="base.menu_action_res_users"]',
run: "click",
},
{
trigger: "button.o_pivot",
run: "click",
},
{
trigger: 'button:contains(" Measures ")',
trigger: '.o_pivot_buttons div[aria-label="Main actions"] button',
run: "click",
},
{
trigger: 'a:contains(" Computed Measure ")',
trigger: 'div[data-id="__computed__"] a',
run: "click",
},
{
trigger: "select#computed_measure_field_1",
run: "text user_year_now",
run() {
this.anchor.value = "user_year_now";
},
},
{
trigger: "select#computed_measure_field_2",
run: "text user_year_born",
run() {
this.anchor.value = "user_year_born";
},
},
{
trigger: "select#computed_measure_operation",
run: "text m1-m2",
run() {
this.anchor.value = "m1-m2";
},
},
{
trigger: "select#computed_measure_format",
run: "text integer",
run() {
this.anchor.value = "integer";
},
},
{
trigger: "button.o_add_computed_measure",
run: "click",
},
{
trigger: 'th.o_pivot_measure_row:contains("User Year Now")',
extra_trigger: 'div.o_value:contains("2,022")',
},
{
trigger: 'div.o_value:contains("2,022")',
},
{
trigger: 'th.o_pivot_measure_row:contains("User Year Born")',
extra_trigger: 'div.o_value:contains("1,998")',
},
{
trigger: 'div.o_value:contains("1,998")',
},
{
trigger: 'th.o_pivot_measure_row:contains("User Year Now-User Year Born")',
extra_trigger: 'div.o_value:contains("24")',
},
]
);
{
trigger: 'div.o_value:contains("24")',
},
],
});

29
web_pivot_computed_measure/static/src/view.xml
View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="web.ReportViewMeasures" t-inherit-mode="extension" owl="1">
<xpath expr="//DropdownItem" position="attributes">
<attribute name="t-if">!measure.startsWith('__computed_')</attribute>
</xpath>
<xpath expr="//t[@t-foreach='measures']" position="after">
<div
role="separator"
class="dropdown-divider"
t-if="add_computed_measures"
/>
<t t-foreach="measures" t-as="measure" t-key="measure_value.name">
<DropdownItem
class="{ o_menu_item: true, selected: activeMeasures.includes(measure) }"
t-if="add_computed_measures and measure.startsWith('__computed_')"
t-esc="measures[measure].string"
parentClosingMode="'none'"
onSelected="() => this.onMeasureSelected({ measure: measure_value.name })"
/>
</t>
<DropdownItemCustomMeasure
measures="measures"
model="model"
t-if="add_computed_measures"
/>
</xpath>
</t>
</templates>

2
web_pivot_computed_measure/tests/test_ui_pivot.py
View File

@@ -30,7 +30,7 @@ class TestUIPivot(common.HttpCase):
def test_ui(self):
self.start_tour(
"/web",
"/odoo",
"web_pivot_computed_measure_tour",
login="admin",
step_delay=100,