[MIG] spreadsheet_oca: Migration to 18.0

Author: odoowired

spreadsheet_oca/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Spreadsheet Oca",
     "summary": """
         Allow to edit spreadsheets""",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "CreuBlanca,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/spreadsheet",
@@ -25,25 +25,15 @@
             "spreadsheet_oca/static/src/spreadsheet_tree/spreadsheet_tree_view.xml",
             "spreadsheet_oca/static/src/spreadsheet/spreadsheet.scss",
             "spreadsheet_oca/static/src/spreadsheet/spreadsheet_action.esm.js",
-            "spreadsheet_oca/static/src/spreadsheet/pivot_controller.esm.js",
-            "spreadsheet_oca/static/src/spreadsheet/graph_controller.esm.js",
             "spreadsheet_oca/static/src/spreadsheet/list_controller.esm.js",
             "spreadsheet_oca/static/src/spreadsheet/list_renderer.esm.js",
-            (
-                "after",
-                "web/static/src/views/graph/graph_controller.xml",
-                "spreadsheet_oca/static/src/spreadsheet/graph_controller.xml",
-            ),
-            (
-                "after",
-                "web/static/src/views/list/list_controller.xml",
-                "spreadsheet_oca/static/src/spreadsheet/list_controller.xml",
-            ),
-            (
-                "after",
-                "web/static/src/views/pivot/pivot_controller.xml",
-                "spreadsheet_oca/static/src/spreadsheet/pivot_controller.xml",
-            ),
+            "spreadsheet_oca/static/src/spreadsheet/list_controller.xml",
+        ],
+        "web.assets_backend_lazy": [
+            "spreadsheet_oca/static/src/spreadsheet/pivot_controller.esm.js",
+            "spreadsheet_oca/static/src/spreadsheet/graph_controller.esm.js",
+            "spreadsheet_oca/static/src/spreadsheet/pivot_controller.xml",
+            "spreadsheet_oca/static/src/spreadsheet/graph_controller.xml",
         ],
         "spreadsheet.o_spreadsheet": [
             "spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet.xml",

spreadsheet_oca/migrations/17.0.1.0.0/pre-migrate.py

@@ -76,8 +76,7 @@ def get_spreadsheet_data(self):
         self.ensure_one()
         mode = "normal"
         try:
-            self.check_access_rights("write")
-            self.check_access_rule("write")
+            self.check_access("write")
         except AccessError:
             mode = "readonly"
         return {

spreadsheet_oca/models/spreadsheet_abstract.py

@@ -1,7 +1,7 @@
 /** @odoo-module */
 /* Copyright 2024 Tecnativa - Carlos Roca
  * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */
-import {SpreadsheetPivotTable} from "@spreadsheet/pivot/pivot_table";
+import {SpreadsheetPivotTable} from "@odoo/o-spreadsheet";
 import {patch} from "@web/core/utils/patch";
 
 patch(SpreadsheetPivotTable.prototype, {

spreadsheet_oca/static/description/index.html

@@ -2,14 +2,18 @@
 
 import * as spreadsheet from "@odoo/o-spreadsheet";
 import {Domain} from "@web/core/domain";
-
 import {Many2XAutocomplete} from "@web/views/fields/relational_utils";
+import {_t} from "@web/core/l10n/translation";
 import {patch} from "@web/core/utils/patch";
 import {useService} from "@web/core/utils/hooks";
-import {_t} from "@web/core/l10n/translation";
 
-const {LineBarPieConfigPanel, ScorecardChartConfigPanel, GaugeChartConfigPanel} =
-    spreadsheet.components;
+const {
+    GenericChartConfigPanel,
+    LineConfigPanel,
+    BarConfigPanel,
+    ScorecardChartConfigPanel,
+    GaugeChartConfigPanel,
+} = spreadsheet.components;
 
 const menuChartProps = {
     setup() {
@@ -55,7 +59,6 @@ const menuChartProps = {
             return;
         }
         const menu = this.env.model.getters.getIrMenu(menuId[0].id);
-        console.log(menu);
         this.env.model.dispatch("LINK_ODOO_MENU_TO_CHART", {
             chartId: this.props.figureId,
             odooMenuId: menu.xmlid || menu.id,
@@ -77,9 +80,21 @@ const menuChartProps = {
     },
 };
 
-patch(LineBarPieConfigPanel.prototype, menuChartProps);
-LineBarPieConfigPanel.components = {
-    ...LineBarPieConfigPanel.components,
+patch(GenericChartConfigPanel.prototype, menuChartProps);
+GenericChartConfigPanel.components = {
+    ...GenericChartConfigPanel.components,
+    Many2XAutocomplete,
+};
+
+patch(LineConfigPanel.prototype, menuChartProps);
+LineConfigPanel.components = {
+    ...LineConfigPanel.components,
+    Many2XAutocomplete,
+};
+
+patch(BarConfigPanel.prototype, menuChartProps);
+BarConfigPanel.components = {
+    ...BarConfigPanel.components,
     Many2XAutocomplete,
 };
 

spreadsheet_oca/static/src/pivot/pivot_table.esm.js

@@ -320,6 +320,7 @@
             title="Change name"
             t-ref="spreadsheetName"
             t-att-value="state.name"
+            t-att-readonly="props.isReadonly"
             t-on-change="_onNameChanged"
         />
         <i class="fa fa-exclamation-triangle text-danger" t-if="! state.name" />
@@ -444,34 +445,6 @@
         </div>
 
         <t t-slot="control-panel-status-indicator" />
-        <!--<ol class="breadcrumb">
-            <t t-foreach="breadcrumbs" t-as="breadcrumb" t-key="breadcrumb.jsId">
-                <t
-          t-set="isPenultimate"
-          t-value="breadcrumb_index === breadcrumbs.length - 2"
-        />
-                <li
-          t-if="!breadcrumb_last"
-          class="breadcrumb-item"
-          t-att-data-hotkey="isPenultimate and 'b'"
-          t-att-class="{ o_back_button: isPenultimate}"
-          t-on-click.prevent="() => this.onBreadcrumbClicked(breadcrumb.jsId)"
-        >
-                    <a href="#">
-                        <t t-if="breadcrumb.name" t-esc="breadcrumb.name" />
-                        <em t-else="" class="text-warning">Unnamed</em>
-                    </a>
-                </li>
-
-                <li t-else="" class="breadcrumb-item active d-flex align-items-center">
-                    <SpreadsheetName
-            name="props.record.name"
-            isReadonly="false"
-            onChanged="onSpreadsheetNameChanged"
-          />
-                </li>
-            </t>
-        </ol>-->
     </t>
     <t t-name="spreadsheet_oca.PivotIcon" owl="1">
         <i class="fa fa-table" />
@@ -633,11 +606,7 @@
             </div>
         </xpath>
     </t>
-    <t
-        t-inherit="spreadsheet.o-spreadsheet-BarConfigPanel"
-        t-inherit-mode="extension"
-        owl="1"
-    >
+    <t t-inherit="o-spreadsheet-GenericChartConfigPanel" t-inherit-mode="extension">
         <xpath expr="//div" position="inside">
             <div class="o-section">
                 <div class="o-section-title">Link to Odoo menu</div>
@@ -647,11 +616,7 @@
             </div>
         </xpath>
     </t>
-    <t
-        t-inherit="spreadsheet.o-spreadsheet-LineConfigPanel"
-        t-inherit-mode="extension"
-        owl="1"
-    >
+    <t t-inherit="o-spreadsheet-BarConfigPanel" t-inherit-mode="extension">
         <xpath expr="//div" position="inside">
             <div class="o-section">
                 <div class="o-section-title">Link to Odoo menu</div>
@@ -661,11 +626,7 @@
             </div>
         </xpath>
     </t>
-    <t
-        t-inherit="spreadsheet.o-spreadsheet-LineBarPieConfigPanel"
-        t-inherit-mode="extension"
-        owl="1"
-    >
+    <t t-inherit="o-spreadsheet-LineConfigPanel" t-inherit-mode="extension">
         <xpath expr="//div" position="inside">
             <div class="o-section">
                 <div class="o-section-title">Link to Odoo menu</div>
@@ -675,11 +636,7 @@
             </div>
         </xpath>
     </t>
-    <t
-        t-inherit="spreadsheet.o-spreadsheet-GaugeChartConfigPanel"
-        t-inherit-mode="extension"
-        owl="1"
-    >
+    <t t-inherit="o-spreadsheet-GaugeChartConfigPanel" t-inherit-mode="extension">
         <xpath expr="//div" position="inside">
             <div class="o-section">
                 <div class="o-section-title">Link to Odoo menu</div>
@@ -689,11 +646,7 @@
             </div>
         </xpath>
     </t>
-    <t
-        t-inherit="spreadsheet.o-spreadsheet-ScorecardChartConfigPanel"
-        t-inherit-mode="extension"
-        owl="1"
-    >
+    <t t-inherit="o-spreadsheet-ScorecardChartConfigPanel" t-inherit-mode="extension">
         <xpath expr="//div" position="inside">
             <div class="o-section">
                 <div class="o-section-title">Link to Odoo menu</div>

spreadsheet_oca/static/src/spreadsheet/bundle/chart_panels.esm.js

@@ -2,36 +2,30 @@
 
 import * as spreadsheet from "@odoo/o-spreadsheet";
 import {makeDynamicCols, makeDynamicRows} from "../utils/dynamic_generators.esm";
-import {ListDataSource} from "@spreadsheet/list/list_data_source";
-import {PivotDataSource} from "@spreadsheet/pivot/pivot_data_source";
 import {SpreadsheetControlPanel} from "./spreadsheet_controlpanel.esm";
 import {SpreadsheetRenderer} from "./spreadsheet_renderer.esm";
 import {registry} from "@web/core/registry";
+import {standardActionServiceProps} from "@web/webclient/actions/action_service";
 import {useService} from "@web/core/utils/hooks";
 
+const {load} = spreadsheet;
+
 const uuidGenerator = new spreadsheet.helpers.UuidGenerator();
 const actionRegistry = registry.category("actions");
-const {Component, onMounted, onWillStart, useSubEnv} = owl;
+const {Component, onWillStart, useSubEnv} = owl;
 
 export class ActionSpreadsheetOca extends Component {
     setup() {
-        this.router = useService("router");
         this.orm = useService("orm");
         this.notification = useService("notification");
         const params = this.props.action.params || this.props.action.context.params;
         this.spreadsheetId = params.spreadsheet_id;
         this.model = params.model || "spreadsheet.spreadsheet";
         this.import_data = params.import_data || {};
-        onMounted(() => {
-            this.router.pushState({
-                spreadsheet_id: this.spreadsheetId,
-                model: this.model,
-            });
-        });
         onWillStart(async () => {
             // We need to load in case the data comes from an XLSX
             this.record =
-                spreadsheet.load(
+                load(
                     await this.orm.call(
                         this.model,
                         "get_spreadsheet_data",
@@ -46,6 +40,7 @@ export class ActionSpreadsheetOca extends Component {
             notifyUser: this.notifyUser.bind(this),
         });
     }
+
     notifyUser(notification) {
         this.notification.add(notification.text, {
             type: notification.type,
@@ -60,7 +55,6 @@ export class ActionSpreadsheetOca extends Component {
             this.orm.call(this.model, "write", [this.spreadsheetId, data]);
         } else {
             this.spreadsheetId = await this.orm.call(this.model, "create", [data]);
-            this.router.pushState({spreadsheet_id: this.spreadsheetId});
         }
     }
     /**
@@ -177,11 +171,11 @@ export class ActionSpreadsheetOca extends Component {
             },
             name: this.import_data.name,
         };
-        const dataSource = spreadsheet_model.config.custom.dataSources.add(
-            dataSourceId,
-            ListDataSource,
-            list_info
-        );
+        spreadsheet_model.dispatch("ADD_ODOO_LIST", {
+            listId: dataSourceId,
+            definition: list_info,
+        });
+        const dataSource = spreadsheet_model.getters.getListDataSource(dataSourceId);
         await dataSource.load();
         spreadsheet_model.dispatch("INSERT_ODOO_LIST", {
             sheetId,
@@ -222,11 +216,11 @@ export class ActionSpreadsheetOca extends Component {
             searchParams: this.cleanSearchParams(),
             name: this.import_data.name,
         };
-        const dataSource = spreadsheet_model.config.custom.dataSources.add(
-            dataSourceId,
-            PivotDataSource,
-            pivot_info
-        );
+        spreadsheet_model.dispatch("ADD_PIVOT", {
+            pivotId: dataSourceId,
+            definition: pivot_info,
+        });
+        const dataSource = spreadsheet_model.getters.getPivotDataSource(dataSourceId);
         await dataSource.load();
         var {cols, rows, measures} = dataSource.getTableStructure().export();
         if (this.import_data.dyn_number_of_rows) {
@@ -286,6 +280,7 @@ ActionSpreadsheetOca.components = {
     SpreadsheetRenderer,
     SpreadsheetControlPanel,
 };
+ActionSpreadsheetOca.props = {...standardActionServiceProps};
 actionRegistry.add("action_spreadsheet_oca", ActionSpreadsheetOca, {
     force: true,
 });

spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet.xml

@@ -2,6 +2,7 @@
 
 import {Component} from "@odoo/owl";
 import {ControlPanel} from "@web/search/control_panel/control_panel";
+import {useService} from "@web/core/utils/hooks";
 
 const {useState} = owl;
 
@@ -12,15 +13,35 @@ export class SpreadsheetName extends Component {
         });
     }
     _onNameChanged(ev) {
+        if (this.props.isReadonly) {
+            return;
+        }
         if (ev.target.value) {
             this.env.saveRecord({name: ev.target.value});
         }
         this.state.name = ev.target.value;
+        if (this.props.onChanged) {
+            this.props.onChanged(ev);
+        }
     }
 }
 SpreadsheetName.template = "spreadsheet_oca.SpreadsheetName";
+SpreadsheetName.props = {
+    name: String,
+    isReadonly: Boolean,
+    onChanged: {type: Function, optional: true},
+};
+
+export class SpreadsheetControlPanel extends ControlPanel {
+    setup() {
+        super.setup();
+        this.actionService = useService("action");
+    }
 
-export class SpreadsheetControlPanel extends ControlPanel {}
+    onBreadcrumbClicked(jsId) {
+        this.actionService.restore(jsId);
+    }
+}
 SpreadsheetControlPanel.template = "spreadsheet_oca.SpreadsheetControlPanel";
 SpreadsheetControlPanel.props = {
     ...ControlPanel.props,