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

JENKINS-70730 Don't remove id inside symbol #7689

Merged
merged 1 commit into from
Mar 28, 2023

Conversation

timja
Copy link
Member

@timja timja commented Mar 4, 2023

See JENKINS-70730.

I can't see why we would need to remove existing ids in symbols, they're highly unlikely to be in an svg and this part of the code is before the caching is done.

Far better that we don't remove an id here than we do and break an svg completely....

Testing done

Unit test + interactively tested with https://issues.jenkins.io/browse/JENKINS-70729 and the azure vm agents plugin.

Proposed changelog entries

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@timja timja requested review from Vlatombe and a team March 4, 2023 23:43
@timja timja added the bug For changelog: Minor bug. Will be listed after features label Mar 4, 2023
@daniel-beck
Copy link
Member

Do these element IDs have different semantics than other IDs? Because short IDs like in the Jira issue look like they'd just invite ID collisions.

@timja
Copy link
Member Author

timja commented Mar 5, 2023

Do these element IDs have different semantics than other IDs? Because short IDs like in the Jira issue look like they'd just invite ID collisions.

They do not have different semantics you do have to make them unique (if they are different SVGs), ids are not that common and seem to be mostly used for gradients.

You could post-process an svg to make the ids unique if needed.

Here's a blog with a bit more info on it.
https://www.antonball.dev/blog/2020-06-15-svg-id-collision/

@@ -94,7 +94,6 @@ private static String loadSymbol(String namespace, String name) {
.replaceAll("(class=\").*?(\")", "")
.replaceAll("(tooltip=\").*?(\")", "")
.replaceAll("(data-html-tooltip=\").*?(\")", "")
.replaceAll("(id=\").*?(\")", "")
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that can lead to a duplicated id for the svg itself.
Assume the svg has an id at the root <svg id="symbolid" .../>
Now I want to use that svg with
<l:icon sec="mysymbol" id="myid"/>
The result will be 2 id attributes I think.

Copy link
Member Author

@timja timja Mar 6, 2023

Choose a reason for hiding this comment

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

it could but why would the svg have an id at the root baked into it?

Otherwise to fix it this string replace hack needs replacing with a dom library that only operates on the svg tag and not children.

@timja timja requested a review from a team March 15, 2023 11:28
@timja
Copy link
Member Author

timja commented Mar 26, 2023

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Mar 26, 2023
@NotMyFault NotMyFault merged commit fdb63ea into jenkinsci:master Mar 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants