From 256b344f978e4298c2430a586606946090c07fc6 Mon Sep 17 00:00:00 2001 From: Traverse Migration Factory <292502224+traverse-c2c[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:24:06 +0100 Subject: [PATCH 1/6] [FIX] base_geoengine: respect editable GeoEngine views --- base_geoengine/__manifest__.py | 3 + .../geoengine_controller.esm.js | 19 +++--- .../static/tests/geoengine_controller.test.js | 68 +++++++++++++++++++ 3 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 base_geoengine/static/tests/geoengine_controller.test.js diff --git a/base_geoengine/__manifest__.py b/base_geoengine/__manifest__.py index b620bf7b8..be51c50b6 100644 --- a/base_geoengine/__manifest__.py +++ b/base_geoengine/__manifest__.py @@ -25,6 +25,9 @@ "base_geoengine/static/src/css/style.css", "base_geoengine/static/lib/geostats-2.1.0/geostats.css", ], + "web.assets_unit_tests": [ + "base_geoengine/static/tests/**/*.test.js", + ], # Note: Third-party libraries (ol.js, chroma.js, geostats.js) are loaded # dynamically via loadJS() in geoengine_libs.esm.js to avoid bundler issues }, diff --git a/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js b/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js index 44a360253..6671b3d5f 100644 --- a/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js +++ b/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js @@ -119,14 +119,17 @@ export class GeoengineController extends Component { */ async openRecord(resModel, resId, viewId) { const {views} = await this.view.loadViews({resModel, views: [[false, "form"]]}); - this.actionService.doAction({ - type: "ir.actions.act_window", - res_model: resModel, - views: viewId || [[views.form.id, "form"]], - res_id: resId, - target: "new", - context: {edit: false, create: false}, - }); + return this.actionService.doAction( + { + type: "ir.actions.act_window", + res_model: resModel, + views: viewId || [[views.form.id, "form"]], + res_id: resId, + target: "new", + context: {edit: this.editable, create: false}, + }, + {onClose: () => this.onSaveRecord()} + ); } /** diff --git a/base_geoengine/static/tests/geoengine_controller.test.js b/base_geoengine/static/tests/geoengine_controller.test.js new file mode 100644 index 000000000..0203e2771 --- /dev/null +++ b/base_geoengine/static/tests/geoengine_controller.test.js @@ -0,0 +1,68 @@ +// Copyright 2026 Camptocamp SA +// License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import {Component, xml} from "@odoo/owl"; +import {describe, expect, test} from "@odoo/hoot"; +import {contains} from "@odoo/hoot-dom"; +import {MainComponentsContainer} from "@web/core/main_components_container"; +import { + defineModels, + fields, + makeMockEnv, + models, + mountView, + mountWithCleanup, + onRpc, + patchWithCleanup, +} from "@web/../tests/web_test_helpers"; +import {geoengineView} from "@base_geoengine/js/views/geoengine/geoengine_view.esm"; + +class GeoTest extends models.Model { + _name = "geo.test"; + + name = fields.Char(); + + _records = [{id: 1, name: "Test location"}]; +} + +class OpenRecordRenderer extends Component { + static template = xml` + + `; + + openRecord() { + return this.props.openRecord("geo.test", 1); + } +} + +defineModels([GeoTest]); +describe.current.tags("desktop"); + +test("editable GeoEngine view opens an editable form dialog and refreshes on close", async () => { + onRpc("geo.test", "web_search_read", () => expect.step("load records")); + patchWithCleanup(geoengineView, {Renderer: OpenRecordRenderer}); + + const env = await makeMockEnv(); + await mountWithCleanup(MainComponentsContainer, {env}); + await mountView({ + env, + type: "geoengine", + resModel: "geo.test", + arch: ` + + + + + + `, + archs: { + "form,false": `
`, + }, + }); + + await contains(".o_test_open_record").click(); + expect(".modal .o_form_view .o_field_widget[name='name'] input").toHaveCount(1); + + await contains(".modal .o_form_button_cancel").click(); + expect.verifySteps(["load records", "load records"]); +}); From a6fb5d4185cf300a94a848d2d8193a0b23cfcd15 Mon Sep 17 00:00:00 2001 From: Traverse Migration Factory <292502224+traverse-c2c[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:48:16 +0100 Subject: [PATCH 2/6] [FIX] base_geoengine: accept view environment prop --- .../geoengine/geoengine_controller/geoengine_controller.esm.js | 1 + 1 file changed, 1 insertion(+) diff --git a/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js b/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js index 6671b3d5f..1b81849dd 100644 --- a/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js +++ b/base_geoengine/static/src/js/views/geoengine/geoengine_controller/geoengine_controller.esm.js @@ -211,6 +211,7 @@ GeoengineController.template = "base_geoengine.GeoengineController"; GeoengineController.components = {Layout, SearchBar}; GeoengineController.props = { ...standardViewProps, + env: {type: Object, optional: true}, Model: Function, Renderer: Function, archInfo: Object, From 787409f55896262a3ba51bcf950c8f41e6dcda41 Mon Sep 17 00:00:00 2001 From: Traverse Migration Factory <292502224+traverse-c2c[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:51:59 +0100 Subject: [PATCH 3/6] [FIX] base_geoengine: use Odoo 19 test helpers --- base_geoengine/static/tests/geoengine_controller.test.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base_geoengine/static/tests/geoengine_controller.test.js b/base_geoengine/static/tests/geoengine_controller.test.js index 0203e2771..9dfd058e9 100644 --- a/base_geoengine/static/tests/geoengine_controller.test.js +++ b/base_geoengine/static/tests/geoengine_controller.test.js @@ -2,10 +2,8 @@ // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import {Component, xml} from "@odoo/owl"; -import {describe, expect, test} from "@odoo/hoot"; -import {contains} from "@odoo/hoot-dom"; -import {MainComponentsContainer} from "@web/core/main_components_container"; import { + contains, defineModels, fields, makeMockEnv, @@ -15,6 +13,8 @@ import { onRpc, patchWithCleanup, } from "@web/../tests/web_test_helpers"; +import {describe, expect, test} from "@odoo/hoot"; +import {MainComponentsContainer} from "@web/core/main_components_container"; import {geoengineView} from "@base_geoengine/js/views/geoengine/geoengine_view.esm"; class GeoTest extends models.Model { @@ -26,6 +26,7 @@ class GeoTest extends models.Model { } class OpenRecordRenderer extends Component { + static props = {openRecord: Function}; static template = xml` `; From b3b1f92955a4814b20175e5d5fc40cbcb0deba6e Mon Sep 17 00:00:00 2001 From: Traverse Migration Factory <292502224+traverse-c2c[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:54:05 +0100 Subject: [PATCH 4/6] [FIX] base_geoengine: allow renderer test props --- base_geoengine/static/tests/geoengine_controller.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_geoengine/static/tests/geoengine_controller.test.js b/base_geoengine/static/tests/geoengine_controller.test.js index 9dfd058e9..27574c887 100644 --- a/base_geoengine/static/tests/geoengine_controller.test.js +++ b/base_geoengine/static/tests/geoengine_controller.test.js @@ -26,7 +26,7 @@ class GeoTest extends models.Model { } class OpenRecordRenderer extends Component { - static props = {openRecord: Function}; + static props = ["*"]; static template = xml` `; From dcbc75a863e83ed8d5673d30a496d02d275336aa Mon Sep 17 00:00:00 2001 From: Traverse Migration Factory <292502224+traverse-c2c[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:56:00 +0100 Subject: [PATCH 5/6] [FIX] base_geoengine: isolate dialog refresh assertion --- base_geoengine/static/tests/geoengine_controller.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base_geoengine/static/tests/geoengine_controller.test.js b/base_geoengine/static/tests/geoengine_controller.test.js index 27574c887..cabec3f21 100644 --- a/base_geoengine/static/tests/geoengine_controller.test.js +++ b/base_geoengine/static/tests/geoengine_controller.test.js @@ -60,10 +60,11 @@ test("editable GeoEngine view opens an editable form dialog and refreshes on clo "form,false": `
`, }, }); + expect.verifySteps(["load records", "load records"]); await contains(".o_test_open_record").click(); expect(".modal .o_form_view .o_field_widget[name='name'] input").toHaveCount(1); await contains(".modal .o_form_button_cancel").click(); - expect.verifySteps(["load records", "load records"]); + expect.verifySteps(["load records"]); }); From 36fccc609a34b007ccf99890450d62ea0a501d2c Mon Sep 17 00:00:00 2001 From: Traverse Migration Factory <292502224+traverse-c2c[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2026 17:00:03 +0100 Subject: [PATCH 6/6] [FIX] base_geoengine: preserve mock RPC response --- base_geoengine/static/tests/geoengine_controller.test.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/base_geoengine/static/tests/geoengine_controller.test.js b/base_geoengine/static/tests/geoengine_controller.test.js index cabec3f21..ee662ab13 100644 --- a/base_geoengine/static/tests/geoengine_controller.test.js +++ b/base_geoengine/static/tests/geoengine_controller.test.js @@ -40,7 +40,10 @@ defineModels([GeoTest]); describe.current.tags("desktop"); test("editable GeoEngine view opens an editable form dialog and refreshes on close", async () => { - onRpc("geo.test", "web_search_read", () => expect.step("load records")); + let loadCount = 0; + onRpc("geo.test", "web_search_read", () => { + loadCount++; + }); patchWithCleanup(geoengineView, {Renderer: OpenRecordRenderer}); const env = await makeMockEnv(); @@ -60,11 +63,11 @@ test("editable GeoEngine view opens an editable form dialog and refreshes on clo "form,false": `
`, }, }); - expect.verifySteps(["load records", "load records"]); + const initialLoadCount = loadCount; await contains(".o_test_open_record").click(); expect(".modal .o_form_view .o_field_widget[name='name'] input").toHaveCount(1); await contains(".modal .o_form_button_cancel").click(); - expect.verifySteps(["load records"]); + expect(loadCount).toBeGreaterThan(initialLoadCount); });