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][FIX] FigureComponent: Undo/Redo broken after pasting figure #3860

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 19, 2024

Description:

Previously, the Undo/Redo functionality was broken after pasting a figure. This occurred because the focus remained on the pasted figure rather than on the grid or composer, where the key events for Undo/Redo are handled.

This commit resolves the issue by handling the key events directly on the figure component itself. With this change, Undo/Redo operations now work as expected even after pasting a figure.

Task: : 3659930

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 (_t("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: #3830
Forward-Port-Of: #3678

@robodoo
Copy link
Collaborator

robodoo commented Mar 19, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 19, 2024

@dhrp-odoo @rrahir cherrypicking of pull request #3678 failed.

stdout:

Auto-merging src/plugins/ui_stateful/selection.ts
Auto-merging tests/components/charts.test.ts
CONFLICT (content): Merge conflict in tests/components/charts.test.ts
Auto-merging tests/plugins/selection.test.ts

stderr:

17:19:28.774571 git.c:463               trace: built-in: git cherry-pick 26cc54b9ef6e0ae7112239ac2f6a4967f1235a47
error: could not apply 26cc54b9e... [FIX] FigureComponent: Undo/Redo broken after pasting figure
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@dhrp-odoo dhrp-odoo force-pushed the saas-16.4-16.0-fix-undo-redo-broken-after-pasting-figure-dhrp-rXs9-fw branch from 6fd0106 to bfa770e Compare March 20, 2024 05:01
Before, the Undo/Redo feature didn't work properly after pasting a figure.
This happened because the focus stayed on the pasted figure instead of
shifting to the grid or composer, where Undo/Redo commands are processed.

This commit addresses the issue by propagating the event handling to
the grid level, where the Undo/Redo actions are appropriately managed

Task ID: 3659930

X-original-commit: affc4b3
@dhrp-odoo dhrp-odoo force-pushed the saas-16.4-16.0-fix-undo-redo-broken-after-pasting-figure-dhrp-rXs9-fw branch from bfa770e to 5c56289 Compare March 20, 2024 05:06
@dhrp-odoo
Copy link
Contributor

@rrahir, I have resolved merge conflicts.

@rrahir
Copy link
Collaborator

rrahir commented Mar 20, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 20, 2024
Before, the Undo/Redo feature didn't work properly after pasting a figure.
This happened because the focus stayed on the pasted figure instead of
shifting to the grid or composer, where Undo/Redo commands are processed.

This commit addresses the issue by propagating the event handling to
the grid level, where the Undo/Redo actions are appropriately managed

Task ID: 3659930

closes #3860

X-original-commit: affc4b3
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
@robodoo robodoo closed this Mar 20, 2024
@fw-bot fw-bot deleted the saas-16.4-16.0-fix-undo-redo-broken-after-pasting-figure-dhrp-rXs9-fw branch April 3, 2024 14:47
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

4 participants