Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW] Bump owl version #2260

Closed
wants to merge 2 commits into from
Closed

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 22, 2023

Description:

this PR bumps the version of OWL in o-spreadshset to catch up with its counterpart in odoo: version 2.0.9
One major change (one could argue breaking) is that the property el of a Ref is now undefined once the component is no longer mounted. This change of behaviour highlighted several issues in our tests setup. Since several of them were addressed in PR #2045, it was decided to backport the said pull request in version 16.0 to ease the transition of owl versions.

Odoo task ID : TASK_ID

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_lt("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #2258
Forward-Port-Of: #2252

@robodoo
Copy link
Collaborator

robodoo commented Mar 22, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 22, 2023

@rrahir @LucasLefevre cherrypicking of pull request #2252 failed.

stdout:

Auto-merging tests/components/autocomplete_dropdown.test.ts
CONFLICT (content): Merge conflict in tests/components/autocomplete_dropdown.test.ts
Auto-merging tests/components/autofill.test.ts
CONFLICT (content): Merge conflict in tests/components/autofill.test.ts
Auto-merging tests/components/bottom_bar.test.ts
CONFLICT (content): Merge conflict in tests/components/bottom_bar.test.ts
Auto-merging tests/components/charts.test.ts
Auto-merging tests/components/color_picker.test.ts
CONFLICT (content): Merge conflict in tests/components/color_picker.test.ts
Auto-merging tests/components/composer.test.ts
CONFLICT (content): Merge conflict in tests/components/composer.test.ts
Auto-merging tests/components/conditional_formatting.test.ts
Auto-merging tests/components/context_menu.test.ts
CONFLICT (content): Merge conflict in tests/components/context_menu.test.ts
Auto-merging tests/components/custom_currency_side_panel.test.ts
CONFLICT (content): Merge conflict in tests/components/custom_currency_side_panel.test.ts
Auto-merging tests/components/drag_and_drop.test.ts
Auto-merging tests/components/figure.test.ts
CONFLICT (content): Merge conflict in tests/components/figure.test.ts
Auto-merging tests/components/find_replace_side_panel.test.ts
CONFLICT (content): Merge conflict in tests/components/find_replace_side_panel.test.ts
Auto-merging tests/components/formula_assistant.test.ts
CONFLICT (content): Merge conflict in tests/components/formula_assistant.test.ts
Auto-merging tests/components/grid.test.ts
CONFLICT (content): Merge conflict in tests/components/grid.test.ts
Auto-merging tests/components/highlight.test.ts
Auto-merging tests/components/link/link_editor.test.ts
Auto-merging tests/components/scorecard_chart.test.ts
Auto-merging tests/components/selection_input.test.ts
CONFLICT (content): Merge conflict in tests/components/selection_input.test.ts
Auto-merging tests/components/spreadsheet.test.ts
CONFLICT (content): Merge conflict in tests/components/spreadsheet.test.ts
Auto-merging tests/components/top_bar.test.ts
CONFLICT (content): Merge conflict in tests/components/top_bar.test.ts
Auto-merging tests/menu_item_insert_chart.test.ts
CONFLICT (content): Merge conflict in tests/menu_item_insert_chart.test.ts
Auto-merging tests/menu_items_registry.test.ts
CONFLICT (content): Merge conflict in tests/menu_items_registry.test.ts
Auto-merging tests/test_helpers/helpers.ts
CONFLICT (content): Merge conflict in tests/test_helpers/helpers.ts

stderr:

19:01:48.734474 git.c:455               trace: built-in: git cherry-pick 00b591b0a8b1e4f2691b7d3d1876a40403a74485
error: could not apply 00b591b0... [FIX] tests: mount owl App in test mode and mount components in helper
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

1. UI tests would sometimes do queries on document but it is more
   correct to rely on `fixture` as ATM? we cannot ensure that a fixture
   is alone in the document. Note that this commit only fixes the
   potentially problematic occurences. Related to point 2.
2. Some tests were nested in describe section that would mount useless
   components.
@rrahir rrahir force-pushed the saas-16.2-16.0-bump-owl-rar-7046-fw branch from ce64927 to 53699e8 Compare March 23, 2023 07:24
catching up to odoo version 2.0.9
@rrahir
Copy link
Collaborator

rrahir commented Mar 23, 2023

@robodoo r+ rebase-ff

@robodoo
Copy link
Collaborator

robodoo commented Mar 23, 2023

Merge method set to rebase and fast-forward.

robodoo pushed a commit that referenced this pull request Mar 23, 2023
1. UI tests would sometimes do queries on document but it is more
   correct to rely on `fixture` as ATM? we cannot ensure that a fixture
   is alone in the document. Note that this commit only fixes the
   potentially problematic occurences. Related to point 2.
2. Some tests were nested in describe section that would mount useless
   components.

Part-of: #2260
robodoo pushed a commit that referenced this pull request Mar 23, 2023
catching up to odoo version 2.0.9

closes #2260

Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
@robodoo robodoo temporarily deployed to merge March 23, 2023 08:55 Inactive
@robodoo robodoo closed this Mar 23, 2023
@fw-bot fw-bot mentioned this pull request Mar 23, 2023
14 tasks
@fw-bot fw-bot deleted the saas-16.2-16.0-bump-owl-rar-7046-fw branch April 6, 2023 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants