ip

Author: rrahir

src/util/spreadsheet/__init__.py

@@ -12,25 +12,3 @@
 from .fields import *
 from .models import *
 from .misc import *
-# try:
-#     from .fields import *
-#     from .models import *
-# except (ImportError, SyntaxError):
-#     """spreadsheet utils are not compatible with Python 2.
-#     But spreadsheet did not exist in version supporting
-#     python 2. So there's nothing to do anyway.
-#     """
-#     _logger.debug("spreadsheet utils not imported")
-#     breakpoint()
-
-#     def rename_field(*args, **kwargs):
-#         pass
-
-#     def rename_model(*args, **kwargs):
-#         pass
-
-#     def remove_field(*args, **kwargs):
-#         pass
-
-#     def remove_model(*args, **kwargs):
-#         pass

src/util/spreadsheet/fields.py

@@ -7,38 +7,63 @@
 
 
 from .data_wrappers import Spreadsheet, create_data_source_from_cmd
-from .misc import apply_in_all_spreadsheets, adapt_view_link_cells, remove_data_source_function, remove_lists, remove_pivots, remove_odoo_charts, transform_data_source_functions
-
-from .revisions import CommandAdapter, Drop, transform_revisions_data
+from .misc import (
+    apply_in_all_spreadsheets,
+    adapt_view_link_cells,
+    remove_data_source_function,
+    remove_lists,
+    remove_pivots,
+    remove_odoo_charts,
+    transform_data_source_functions,
+)
+
+from .revisions import CommandAdapter, transform_revisions_data
 
 from odoo.osv import expression
 
 from odoo.upgrade.util.context import adapt_context, clean_context
 from odoo.upgrade.util.domains import _adapt_one_domain
 
+
+# stolen from util.fields:def remove_fields
+def remove_adapter(leaf, is_or, negated):
+    # replace by TRUE_LEAF, unless negated or in a OR operation but not negated
+    if is_or ^ negated:
+        return [expression.FALSE_LEAF]
+    return [expression.TRUE_LEAF]
+
+
 def rename_field_in_all_spreadsheets(cr, model, old_value, new_value):
-    apply_in_all_spreadsheets(cr, old_value, (lambda data, revisions_data: rename_field(cr, model, old_value, new_value, data, revisions_data)))
+    apply_in_all_spreadsheets(
+        cr,
+        old_value,
+        (lambda data, revisions_data: rename_field(cr, model, old_value, new_value, data, revisions_data)),
+    )
+
 
-def rename_field(cr, model, old, new, data, revisions = ()):
+def rename_field(cr, model, old, new, data, revisions=()):
     spreadsheet = Spreadsheet(data)
     adapters = _rename_field_in_list(cr, spreadsheet, model, old, new)
-    adapters += _rename_field_in_pivot(cr, spreadsheet, model, old, new)
-    adapters += _rename_field_in_chart(cr, spreadsheet, model, old, new)
-    adapters += _rename_field_in_filters(cr, spreadsheet, model, old, new)
-    adapters += _rename_field_in_view_link(cr, spreadsheet, model, old, new)
+    # adapters += _rename_field_in_pivot(cr, spreadsheet, model, old, new)
+    # adapters += _rename_field_in_chart(cr, spreadsheet, model, old, new)
+    # adapters += _rename_field_in_filters(cr, spreadsheet, model, old, new)
+    # adapters += _rename_field_in_view_link(cr, spreadsheet, model, old, new)
     return spreadsheet.data, transform_revisions_data(revisions, *adapters)
 
+
 def remove_field_in_all_spreadsheets(cr, model, field):
-    apply_in_all_spreadsheets(cr, field, (lambda data, revisions_data: remove_field(cr, model, field, data, revisions_data)))
+    apply_in_all_spreadsheets(
+        cr, field, (lambda data, revisions_data: remove_field(cr, model, field, data, revisions_data))
+    )
 
 
 def remove_field(cr, model, field, data, revisions=()):
     spreadsheet = Spreadsheet(data)
     _remove_field_from_filter_matching(cr, spreadsheet, model, field)
-    adapters = _remove_field_from_list(spreadsheet, model, field)
-    adapters += _remove_field_from_pivot(spreadsheet, model, field)
-    adapters += _remove_field_from_graph(spreadsheet, model, field)
-    adapters += _remove_field_from_view_link(spreadsheet, model, field)
+    adapters = _remove_field_from_list(cr, spreadsheet, model, field)
+    adapters += _remove_field_from_pivot(cr, spreadsheet, model, field)
+    adapters += _remove_field_from_graph(cr, spreadsheet, model, field)
+    adapters += _remove_field_from_view_link(cr, spreadsheet, model, field)
     spreadsheet.clean_empty_cells()
     return spreadsheet.data, transform_revisions_data(revisions, *adapters)
 
@@ -185,6 +210,27 @@ def _rename_data_source_field(cr, data_source, model, old, new):
             data_source.order_by = _rename_order_by(data_source.order_by, old, new)
 
 
+def _remove_data_source_field(cr, data_source, model, field):
+    if data_source.model == model:
+        data_source.domain = (
+            _adapt_one_domain(
+                cr, model, field, "ignored", data_source.model, data_source.domain, remove_adapter, force_adapt=True
+            )
+            or data_source.domain
+        )
+
+        adapt_context(data_source.context, field, "ignored")
+        if data_source.order_by:
+            data_source.order_by = _remove_order_by(data_source.order_by, field)
+
+
+def _remove_order_by(order_by, field):
+    if isinstance(order_by, list):
+        return [order for order in order_by if order["field"] != field]
+    if order_by and order_by["field"] == field:
+        return None
+    return order_by
+
 def _rename_order_by(order_by, old, new):
     if isinstance(order_by, list):
         return [_rename_order_by(order, old, new) for order in order_by]
@@ -269,6 +315,8 @@ def adapt_view_link(action):
     return adapt_view_link_cells(spreadsheet, adapt_view_link)
 
 
+## Removal
+
 
 def _remove_list_functions(content, list_ids, field):
     """Remove functions such as ODOO.LIST(1, 'field') or ODOO.LIST.HEADER(1, 'field')"""
@@ -279,33 +327,18 @@ def filter_func(func_call_ast):
     return remove_data_source_function(content, list_ids, {"ODOO.LIST", "ODOO.LIST.HEADER"}, filter_func)
 
 
-def _remove_field_from_list(spreadsheet: Spreadsheet, model, field):
-    # remove only functions where the field appears otherwise
-    remove_column = []
-    for list in spreadsheet.lists:
-        if list.model == model:
-            remove_column.append(list.id)
-            list.fields = [column for column in list.fields if column != field]
+def _remove_field_from_list(cr, spreadsheet: Spreadsheet, model, field):
+    def _remove_field(olist):
+        _remove_data_source_field(cr, olist, model, field)
+        if olist.model == model:
+            olist.fields = [column for column in olist.fields if column != field]
 
-    for cell in spreadsheet.cells:
-        cell["content"] = _remove_list_functions(cell["content"], remove_column, field)
-    lists_to_delete = [
-        list.id
-        for list in spreadsheet.lists
-        if list.model == model and field in (list_order_fields(list) + domain_fields(list.domain))
-    ]
-    # remove entirely lists where the field appears in the domain or in the order by
-    adapters = remove_lists(
-        spreadsheet,
-        lists_to_delete,
-        lambda list: list.model == model and field in (list_order_fields(list) + domain_fields(list.domain)),
-    )
+    for olist in spreadsheet.lists:
+        _remove_field(olist)
 
     def adapt_insert(cmd):
         olist = create_data_source_from_cmd(cmd)
-        if olist.model == model and field in olist.fields:
-            remove_column.append(olist.id)
-            olist.fields = [column for column in olist.fields if column != field]
+        _remove_field(olist)
 
     # collect all list models inserted by INSERT_ODOO_LIST
     # because we need the models to adapt RE_INSERT_ODOO_LIST
@@ -318,49 +351,57 @@ def collect_list(cmd):
     def adapt_re_insert(cmd):
         olist = create_data_source_from_cmd(cmd)
         if list_models[olist.id] == model:
-            olist.fields = [column for column in olist.fields if column != field]
+            _remove_field(olist)
 
-    return adapters + (
+    return (
         CommandAdapter("INSERT_ODOO_LIST", collect_list),
         CommandAdapter("INSERT_ODOO_LIST", adapt_insert),
         CommandAdapter("RE_INSERT_ODOO_LIST", adapt_re_insert),
-        CommandAdapter(
-            "UPDATE_CELL",
-            lambda cmd: dict(cmd, content=_remove_list_functions(cmd.get("content"), remove_column, field)),
-        ),
     )
 
 
-def _remove_field_from_pivot(spreadsheet: Spreadsheet, model, field):
-    pivots_to_delete = [
-        pivot.id for pivot in spreadsheet.pivots if pivot.model == model and field in pivot_fields(pivot)
-    ]
+def _remove_field_from_pivot(cr, spreadsheet: Spreadsheet, model, field):
+    def _remove_field(pivot):
+        _remove_data_source_field(cr, pivot, model, field)
+        if pivot.model == model:
+            pivot.col_group_by = [f for f in pivot.col_group_by if f != field]
+            pivot.row_group_by = [f for f in pivot.row_group_by if f != field]
+            pivot.measures = [f for f in pivot.measures if f != field]
 
-    adapters = remove_pivots(
-        spreadsheet,
-        pivots_to_delete,
-        lambda pivot: pivot.model == model and field in pivot_fields(pivot),
-    )
-    return adapters
+    for pivot in spreadsheet.pivots:
+        _remove_field(pivot)
 
+    def adapt_insert(cmd):
+        pivot = create_data_source_from_cmd(cmd)
+        _remove_field(pivot)
 
-def _remove_field_from_graph(spreadsheet: Spreadsheet, model, field):
-    charts_to_delete = [
-        chart.id for chart in spreadsheet.odoo_charts if chart.model == model and field in chart_fields(chart)
-    ]
-    return remove_odoo_charts(
-        spreadsheet,
-        charts_to_delete,
-        lambda chart: chart.model == model and field in chart_fields(chart),
-    )
+    return (CommandAdapter("INSERT_PIVOT", adapt_insert),)
 
 
-def _remove_field_from_view_link(spreadsheet: Spreadsheet, model, field):
+def _remove_field_from_graph(cr, spreadsheet: Spreadsheet, model, field):
+    def _remove_field(chart):
+        _remove_data_source_field(cr, chart, model, field)
+        if chart.model == model:
+            chart.measure = chart.measure if chart.measure != field else None
+
+    for chart in spreadsheet.odoo_charts:
+        _remove_field(chart)
+
+    def adapt_create_chart(cmd):
+        if cmd["definition"]["type"].startswith("odoo_"):
+            chart = create_data_source_from_cmd(cmd)
+            _remove_field(chart)
+
+    return (CommandAdapter("CREATE_CHART", adapt_create_chart),)
+
+
+def _remove_field_from_view_link(cr, spreadsheet: Spreadsheet, model, field):
     def adapt_view_link(action):
         if action["modelName"] == model:
-            changed = clean_context(action["context"], field)
-            if changed or field in domain_fields(action["domain"]):
-                return Drop
+            clean_context(action["context"], field)
+            action["domain"] = _adapt_one_domain(
+                cr, model, field, "ignored", model, action["domain"], remove_adapter, force_adapt=True
+            )
 
     return adapt_view_link_cells(spreadsheet, adapt_view_link)
 
@@ -384,6 +425,7 @@ def adapter(*args, **kwargs):
     domain = _adapt_one_domain(cr, field_model, field, "ignored", data_source_model, domain, adapter=adapter)
     return domain == expression.FALSE_DOMAIN
 
+
 def domain_fields(domain):
     """return all field names used in the domain
     >>> domain_fields([['field1', '=', 1], ['field2', '=', 2]])
@@ -398,17 +440,11 @@ def pivot_measure_fields(pivot):
 
 def pivot_fields(pivot):
     """return all field names used in a pivot definition"""
-    # try:
     fields = set(pivot.col_group_by + pivot.row_group_by + pivot_measure_fields(pivot) + domain_fields(pivot.domain))
     measure = pivot.order_by and pivot.order_by["field"]
     if measure and measure != "__count":
         fields.add(measure)
     return fields
-    # except:
-    #     import ipdb;ipdb.set_trace()
-    #     return []
-
-
 
 
 def chart_fields(chart):
@@ -419,5 +455,6 @@ def chart_fields(chart):
         fields.add(measure)
     return fields
 
+
 def list_order_fields(list_definition):
     return [order["field"] for order in list_definition.order_by]

src/util/spreadsheet/misc.py

@@ -103,15 +103,10 @@ def apply_in_all_spreadsheets(cr, like_pattern, callback):
     revisions_data = []
     revisions_ids = []
 
-    # if like_pattern == "tax_audit":
-    #     import ipdb;ipdb.set_trace()
     for revision_id, commands in get_revisions(cr, "res_model", "res_id", like_pattern):
         revisions_data.append(json.loads(commands))
         revisions_ids.append(revision_id)
-        data, revisions = callback({}, revisions_data)
-        # write_attachment(cr, attachment_id, data)
-        print("wooooooooooooooooot\n"*20)
-        print(revisions)
+        _, revisions = callback({}, revisions_data)
         for rev_id, revision in zip(revisions_ids, revisions):
             cr.execute(
                 """
@@ -338,15 +333,12 @@ def remove_odoo_charts(spreadsheet: Spreadsheet, chart_ids: List[str], insert_cm
     spreadsheet.delete_figures(*chart_ids)
 
     def adapt_create_chart(cmd):
-        # import ipdb;ipdb.set_trace()
-
         chart = create_data_source_from_cmd(cmd)
         if cmd["definition"]["type"].startswith("odoo_") and insert_cmd_predicate(chart):
             chart_ids.append(cmd["id"])
             return Drop
 
     def adapt_chart_cmd_with_id(cmd):
-        # import ipdb;ipdb.set_trace()
 
         if cmd["id"] in chart_ids:
             return Drop
@@ -355,7 +347,6 @@ def adapt_global_filters(cmd):
         if cmd.get("chart"):
             for chart_id in chart_ids:
                 cmd["chart"].pop(chart_id, None)
-    # import ipdb;ipdb.set_trace()
     return (
         CommandAdapter("CREATE_CHART", adapt_create_chart),
         CommandAdapter("UPDATE_CHART", adapt_chart_cmd_with_id),
@@ -370,7 +361,7 @@ def remove_data_source_function(content, data_source_ids, functions, filter_ast=
     >>> remove_data_source_function('=ODOO.PIVOT(1, "revenue")', [1], {"ODOO.PIVOT"})
     ''
     >>> remove_data_source_function('=ODOO.PIVOT(2, "revenue")', [1], {"ODOO.PIVOT"})
-    '=ODOO.PIVOT(2, "revenue")'
+    '=ODOO.PIVOT(2, "revenue")'.
     """
 
     def adapter(fun_call):

src/util/spreadsheet/revisions.py

@@ -9,6 +9,7 @@
 
 Drop = object()
 
+# not used
 def transform_revisions(cr, revisions, *adapters: Iterable[CommandAdapter]):
     if not len(adapters):
         return
@@ -40,15 +41,15 @@ def transform_revisions(cr, revisions, *adapters: Iterable[CommandAdapter]):
             """,
             [json.dumps(data), revision_id],
         )
+
 def transform_revisions_data(revisions, *adapters: Iterable[CommandAdapter]):
-    # import ipdb;ipdb.set_trace()
     for data in revisions:
         commands = data.get("commands", [])
         if not commands:
             continue
         new_commands = transform_commands(commands, *adapters)
         if new_commands is None:
-            new_commands = []
+            continue
         # ensures it's jsonyfiable (converts tuples to lists) (probably should be removed)
         data["commands"] = json.loads(json.dumps(new_commands))
     return revisions