Skip to content

fix: skip unsupported values in chart options - #12887

Merged
DiegoCardoso merged 2 commits into
24.10from
fix/charts-option-values-24.10
Sep 29, 2026
Merged

DiegoCardoso merged 2 commits into
24.10from
fix/charts-option-values-24.10

Conversation

@DiegoCardoso

Copy link
Copy Markdown
Contributor

Description

  • Ignored reserved segments in point keys and point option names
  • Ignored credits links that do not use a supported URL scheme
  • Added unit tests for the above

Type of change

  • Bugfix

🤖 Generated with Claude Code

@sonarqubecloud

Copy link
Copy Markdown

@DiegoCardoso
DiegoCardoso merged commit 18a6034 into 24.10 Sep 29, 2026
9 checks passed
@DiegoCardoso
DiegoCardoso deleted the fix/charts-option-values-24.10 branch September 29, 2026 15:59
@vaadin-bot

Copy link
Copy Markdown
Collaborator

Hi @DiegoCardoso and @DiegoCardoso, when i performed cherry-pick to this commit to 23.6, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 18a6034
error: could not apply 18a6034... fix: skip unsupported values in chart options (#12887)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", 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".

DiegoCardoso added a commit that referenced this pull request Sep 29, 2026
web-padawan added a commit that referenced this pull request Sep 30, 2026
Co-authored-by: Diego Cardoso <diego@vaadin.com>
sissbruecker pushed a commit to vaadin/flow-components that referenced this pull request Sep 30, 2026
…10300)

This PR cherry-picks changes from the original PR #10284 to branch 24.4.

---

> ## Description
>
> Applies to the SVG generator the same Highcharts fixes as
vaadin/web-components#12887, which the generator does not get from
`@vaadin/charts` as it bundles its own Highcharts.
>
> - Ignored reserved segments in point keys and point option names
> - Ignored credits links that use an unsupported URL scheme
> - Added unit tests for the above
>
> ## Type of change
>
> - Bugfix
>
> 🤖 Generated with [Claude Code](https://claude.com/claude-code)
ZheSun88 pushed a commit that referenced this pull request Oct 22, 2026
…#13229)

## Summary

Pins the cherry-pick workflow to the script from
vaadin/platform-build-script#214 (`script-ref: 0b2a72d`), the same pin
as in flow-components and flow, so the new conflict-resolution prompt
can be tried before #214 is merged. Remove the `script-ref` lines once
#214 is merged.

## What we get

When a cherry-pick has merge conflicts and Claude resolves them:

- **Every AI-resolved PR explains itself.** The PR body carries Claude's
resolution notes: how each conflict was resolved, which tests were
adapted or dropped and why, which checks could not be run, and which
earlier PRs are missing on the target branch. Before, reviewers only got
a generic "review carefully" warning.
- **Missing prerequisites are named.** When a conflict comes from an
earlier PR that was never back-ported, the notes say so, and someone can
decide to pick it too.
- **Better back-ports.** Claude adapts the change to the older branch's
APIs in every file, including tests it cannot run, and keeps the PR's
tests where it can.
- **Consistent when checks cannot run.** If dependencies cannot be
installed or the test runner does not start, Claude still commits and
names the skipped checks in the notes, instead of sometimes committing
and sometimes leaving the pick for manual picking. The PR's own CI runs
the checks.

Unchanged: Claude still gets no GitHub token, the script still checks
the result itself, and PRs labelled `ai-resolved-conflict` are still
never auto-merged.

Details and replay results:
[cherry-pick-replay.md](https://github.com/vaadin/platform-build-script/blob/feat/cherry-pick-replay/scripts/workflows/cherry-pick-replay.md)

## Replay on this repository

20 past manual picks from the last year, all with conflicts, replayed
with this repository's verify instructions: Claude resolved all 20, 11
identical to the human pick, about $0.54 per pick. The old prompt also
differed from the human pick on the 9 other cases, so no regressions; on
one (#12887 → 23.6) the new prompt fixed an import the old one left
broken. Unit tests could not run in the local replay (web-test-runner's
SauceLabs launcher fails outside CI), so test results were not part of
the comparison.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
sissbruecker pushed a commit to vaadin/flow-components that referenced this pull request Oct 29, 2026
…10535)

This PR cherry-picks changes from the original PR #10285 to branch 23.7.

---

> ## Description
> 
> Applies to the SVG generator the same Highcharts fixes as
vaadin/web-components#12887 (vaadin/web-components#12901 on 23.6), which
the generator does not get from `@vaadin/charts` as it bundles its own
Highcharts.
> 
> - Ignored reserved segments in point keys and point option names
> - Ignored credits links that use an unsupported URL scheme
> - Added unit tests for the above
> 
> ## Type of change
> 
> - Bugfix
> 
> 🤖 Generated with [Claude Code](https://claude.com/claude-code)
>

Co-authored-by: Diego Cardoso <diego@vaadin.com>
ZheSun88 pushed a commit to vaadin/platform that referenced this pull request Oct 30, 2026
Port of the notes from #9742 to 24.10. Highcharts 9.2.2 is only flagged
for CVE-2026-118250 and CVE-2026-118251, both fixed in Vaadin Charts by
vaadin/web-components#12887 without bumping the bundled version
(announced as CVE-2026-107588).

Also carries the opentelemetry-api (CVE-2026-118259), picomatch 4.0.7
and lerc 3.0.0 notes, which this branch reports as well.

Co-authored-by: totally-not-ai[bot] <290682512+totally-not-ai[bot]@users.noreply.github.com>
ZheSun88 added a commit to vaadin/platform that referenced this pull request Oct 30, 2026
* Update flow to 24.10.17

* chore: maintenance version bumps [24.10] (2026-10-30) (#9765)

Automated maintenance-version updates against `24.10`, discovered by `scripts/check-versions`.

## Updates

- `vaadin/vaadin-testbench`: javaVersion `9.6.4` → `9.6.5`

_Generated by `scripts/check-versions/src/index.ts`._

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: add SBOM notes for highcharts 9.2.2 (CP: 24.10) (#9767)

Port of the notes from #9742 to 24.10. Highcharts 9.2.2 is only flagged
for CVE-2026-118250 and CVE-2026-118251, both fixed in Vaadin Charts by
vaadin/web-components#12887 without bumping the bundled version
(announced as CVE-2026-107588).

Also carries the opentelemetry-api (CVE-2026-118259), picomatch 4.0.7
and lerc 3.0.0 notes, which this branch reports as well.

Co-authored-by: totally-not-ai[bot] <290682512+totally-not-ai[bot]@users.noreply.github.com>

* Update copilot javaVersion to 24.10-SNAPSHOT

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: totally-not-ai[bot] <290682512+totally-not-ai[bot]@users.noreply.github.com>
Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
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