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] Charts: fix incoherent panel state #3583

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Feb 1, 2024

Description:

This task aims to address some issues in the side panel of a chart:

  1. When having only one point in a dataseries and selecting "First
    row as header", the point disappear from the chart (legit), but
    we don't have the possibility to uncheck this checkbox.
  2. When having a normal dataset and another dataset containing one
    point, checking the "... as header" checkbox works has expected, but
    unchecking it don't make the 'one-point' dataset come back

Related Task:

Task: 3380568

Related Task(s):

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: #3576
Forward-Port-Of: #2929

@robodoo
Copy link
Collaborator

robodoo commented Feb 1, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Feb 1, 2024

@anhe-odoo @LucasLefevre cherrypicking of pull request #2929 failed.

stdout:

Auto-merging src/helpers/figures/charts/bar_chart.ts
Auto-merging src/helpers/figures/charts/chart_common.ts
Auto-merging src/helpers/figures/charts/line_chart.ts
Auto-merging src/helpers/figures/charts/pie_chart.ts
Auto-merging tests/components/charts.test.ts
Auto-merging tests/plugins/chart/__snapshots__/basic_chart.test.ts.snap
CONFLICT (content): Merge conflict in tests/plugins/chart/__snapshots__/basic_chart.test.ts.snap
Auto-merging tests/plugins/chart/basic_chart.test.ts

stderr:

15:02:48.994889 git.c:463               trace: built-in: git cherry-pick 7ff7295e85d663ad85a72118e6e056c0c1d0b690
error: could not apply 7ff7295e8... [FIX] chart: fix incoherent side_pannel state
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.

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

Task Description

This task aims to adress some issues in the side pannel of a chart:
1. When having only one point in a dataseries and selecting "First
row as header", the point dissapear from the chart (legit), but
we don't have the possibility to uncheck this checkbox.
2. When having a normal dataset and another dataset containing one
point, checking the "... as header" checkbox works has expected, but
unchecking it don't make the 'one-point' dataset come back

Related Task:

Task: 3380568
X-original-commit: 136d66b
@anhe-odoo anhe-odoo force-pushed the saas-16.4-master-chart-incoherent_panel_state-anhe-BCb_-fw branch from f6ba775 to 77443ef Compare February 2, 2024 07:53
@anhe-odoo
Copy link
Contributor

@fw-bot r+

@fw-bot
Copy link
Collaborator Author

fw-bot commented Feb 2, 2024

@anhe-odoo I can only do this on unmodified forward-port PRs, ask robodoo.

@anhe-odoo
Copy link
Contributor

@LucasLefevre : Can you r+ this one too ? Still the same FW-port chain. Thanks

Copy link
Collaborator

@LucasLefevre LucasLefevre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo r+

robodoo pushed a commit that referenced this pull request Feb 2, 2024
Task Description

This task aims to adress some issues in the side pannel of a chart:
1. When having only one point in a dataseries and selecting "First
row as header", the point dissapear from the chart (legit), but
we don't have the possibility to uncheck this checkbox.
2. When having a normal dataset and another dataset containing one
point, checking the "... as header" checkbox works has expected, but
unchecking it don't make the 'one-point' dataset come back

Related Task:

closes #3583

Task: 3380568
X-original-commit: 136d66b
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
@robodoo robodoo closed this Feb 2, 2024
@fw-bot fw-bot deleted the saas-16.4-master-chart-incoherent_panel_state-anhe-BCb_-fw branch February 16, 2024 08: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

4 participants