Skip to content

[JENKINS-64341] Fix for tables-to-divs#65

Merged
timja merged 4 commits into
jenkinsci:masterfrom
dariver:tables-to-div
Feb 28, 2021
Merged

[JENKINS-64341] Fix for tables-to-divs#65
timja merged 4 commits into
jenkinsci:masterfrom
dariver:tables-to-div

Conversation

@dariver

@dariver dariver commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

Jira: JENKINS-64341

What has been done

  1. Fix for tables-to-div regression

Screenshots

Before After
before after

How to test

  1. Create a Freestyle job, add a new Post-Build action and fill the values
  2. Save and verify that all the values were persisted.

Checklist

  • Git commits follow best practices
  • Build passes in Jenkins
  • Appropriate tests or explanation to why this change has no tests
  • Pull Request is marked with appropriate label (see .github/release-drafter.yml)
  • JIRA issue is well described (problem explanation, steps to reproduce, screenshots)
  • For dependency updates: links to external changelogs and, if possible, full diffs

@dariver

dariver commented Feb 16, 2021

Copy link
Copy Markdown
Contributor Author

cc @timja, @fqueiruga, @fbelzunc

@codecov

codecov Bot commented Feb 16, 2021

Copy link
Copy Markdown

Codecov Report

Merging #65 (20b05ae) into master (7e38624) will not change coverage.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #65   +/-   ##
=========================================
  Coverage     43.38%   43.38%           
  Complexity      190      190           
=========================================
  Files            18       18           
  Lines          1263     1263           
  Branches        192      192           
=========================================
  Hits            548      548           
  Misses          651      651           
  Partials         64       64           
Impacted Files Coverage Δ Complexity Δ
src/main/java/hudson/plugins/plot/Plot.java 25.87% <0.00%> (ø) 30.00 <0.00> (ø)
src/main/java/hudson/plugins/plot/Series.java 81.81% <ø> (ø) 10.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e476945...20b05ae. Read the comment docs.

@timja timja left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I had to combine it with #63 to test with:

 mvn hpi:run -Djenkins.version=2.280 -Djava.awt.headless=true -Dport=8085

Comment thread src/main/resources/lib/plot/blockWrapper.jelly Outdated
Comment thread src/main/resources/lib/plot/blockWrapperBackground.jelly Outdated
@@ -0,0 +1,16 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:f="/lib/form" xmlns:l="/lib/layout">

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

can we just bin this, it looks horrid on themed Jenkins and doesn't seem to add any value on non themed.

After removal:
image

Current look on default theme:
image

Current look on dark theme:
image

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've removed the div background. Keeping blockWrapperBackground.jelly so the tables in the old version remains still have the background color

@timja timja Feb 17, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

any reason for keeping it there too? I didn't check what it looks like in the old version without the bg

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's just that I didn't want to modify the original behavior with tables. But If you think that there is not problem with that I can remove blockWrapperBackground.jelly and reuse blockWrapper.jelly. But we will lose the gray background in Jenkins old versions.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would remove it, but not a blocker and not a maintainer here

Comment thread src/main/resources/lib/plot/blockWrapper.jelly
@mkrauser

Copy link
Copy Markdown

I can't wait for this to get merged

@vgaidarji

vgaidarji commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

Thank you all for the contribution and reviews here. I'm on very limited availability last weeks so not even sure when I could provide support here. For those reasons I've added a adopt-this-plugin label to the repo a while ago.
@timja is a good candidate to become the next maintainer of this awesome plugin. I've reached out to him directly to confirm whether he's open to such opportunity.

@timja
timja merged commit 2844c00 into jenkinsci:master Feb 28, 2021
@timja timja added the bug Bug fix label Feb 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants