Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 1, 2025

Task Description:

This task aims to reduce issue coming from the zoom feature in two cases :

  1. Make the slider looks "disabled" when there is only one data point
  2. Don't zoom when the new min and max value are equals

Related task

Forward-Port-Of: #7069

@robodoo
Copy link
Collaborator

robodoo commented Dec 1, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 1, 2025

@anhe-odoo @pro-odoo cherrypicking of pull request #7069 failed.

stdout:

Auto-merging src/components/figures/chart/chartJs/zoomable_chart/zoomable_chart_store.ts
Auto-merging src/components/figures/chart/chartJs/zoomable_chart/zoomable_chartjs.ts
CONFLICT (content): Merge conflict in src/components/figures/chart/chartJs/zoomable_chart/zoomable_chartjs.ts
Auto-merging src/components/side_panel/chart/index.ts
Auto-merging src/components/side_panel/chart/zoomable_chart/design_panel.ts
Auto-merging tests/figures/chart/charts_component.test.ts
Auto-merging tests/figures/chart/zoomable_charts/zoomable_charts_component.test.ts
Auto-merging tests/test_helpers/helpers.ts

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 9, 2025

@anhe-odoo @pro-odoo this forward port of #7069 is awaiting action (not merged or closed).

@anhe-odoo anhe-odoo force-pushed the master-master-chart-fix-timeline_empty_chart-anhe-460962-fw branch from 42e8c1f to 660b149 Compare December 9, 2025 09:40
Task Description:

This task aims to reduce issue coming from the zoom feature in two
cases :
1. Make the slider looks "disabled" when there is only one data point
2. Don't zoom when the new min and max value are equals
3. The onMouseUp event is now resetting the displayed boundaries
   according to the chart boundaries, to stay consistant.

Among all the changes, a new behavior has been added for the
onMouseUp in the master chart, where the lowerBound and the
upperBound are updated according to the real displayed boundaries
of the detail chart computed by chartJs. This avoid having lots of
different cases to recompute the boundaries one last time according
to the type of chart and axis.
Unfortunately, two tests are now unusable (checking the rounding of
the boundaries when mouseUping) as chartJs is not fully used/mocked
in the test, and then the boundaries are not correctly recomputed.

Related task

Task: 5058567
X-original-commit: 2916089
@anhe-odoo anhe-odoo force-pushed the master-master-chart-fix-timeline_empty_chart-anhe-460962-fw branch from 660b149 to 3d104ef Compare December 9, 2025 10:09
@anhe-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 9, 2025
Task Description:

This task aims to reduce issue coming from the zoom feature in two
cases :
1. Make the slider looks "disabled" when there is only one data point
2. Don't zoom when the new min and max value are equals
3. The onMouseUp event is now resetting the displayed boundaries
   according to the chart boundaries, to stay consistant.

Among all the changes, a new behavior has been added for the
onMouseUp in the master chart, where the lowerBound and the
upperBound are updated according to the real displayed boundaries
of the detail chart computed by chartJs. This avoid having lots of
different cases to recompute the boundaries one last time according
to the type of chart and axis.
Unfortunately, two tests are now unusable (checking the rounding of
the boundaries when mouseUping) as chartJs is not fully used/mocked
in the test, and then the boundaries are not correctly recomputed.

Related task

closes #7576

Task: 5058567
X-original-commit: 2916089
Signed-off-by: Pierre Rousseau (pro) <[email protected]>
Signed-off-by: Hendrickx Anthony (anhe) <[email protected]>
@robodoo robodoo added the 19.1 label Dec 9, 2025
@robodoo robodoo closed this Dec 9, 2025
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.

3 participants