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

static-html: Model mapper clean-ups #8615

Merged
merged 10 commits into from
May 6, 2024
Merged

Conversation

fviernau
Copy link
Member

@fviernau fviernau commented May 3, 2024

See individual commits.

Part of: #7921.

@fviernau fviernau requested a review from a team as a code owner May 3, 2024 13:03
@fviernau fviernau force-pushed the tables-report-model-mapper-cleanups branch from 9a7f556 to b8738ca Compare May 3, 2024 13:07
Copy link

codecov bot commented May 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.97%. Comparing base (106ef01) to head (f2bcea4).

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #8615   +/-   ##
=========================================
  Coverage     67.97%   67.97%           
  Complexity     1005     1005           
=========================================
  Files           244      244           
  Lines          7844     7844           
  Branches        876      876           
=========================================
  Hits           5332     5332           
  Misses         2129     2129           
  Partials        383      383           
Flag Coverage Δ
funTest-docker 66.49% <ø> (ø)
funTest-non-docker 34.62% <ø> (ø)
test 37.93% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fviernau fviernau force-pushed the tables-report-model-mapper-cleanups branch from b8738ca to 4893dac Compare May 6, 2024 06:15
@fviernau fviernau requested a review from sschuberth May 6, 2024 06:15
@fviernau fviernau force-pushed the tables-report-model-mapper-cleanups branch from 4893dac to 5d57d68 Compare May 6, 2024 07:12
@fviernau fviernau enabled auto-merge (rebase) May 6, 2024 07:12
@@ -1071,7 +1067,7 @@ <h3 class="">Packages</h3>
</td>
<td><em>Concluded License:</em><dl>
<dd>
<div><a href="https://archive.softwareheritage.org/browse/content/sha1_git:a612ad9813b006ce81d1ee438dd784da99a54007">MPL-2.0</a> OR <a href="https://archive.softwareheritage.org/browse/content/sha1_git:2aa9b989e0fec475baf21544f8613cb53d03c3f7">EPL-1.0</a></div>
<div><a href="https://archive.softwareheritage.org/browse/content/sha1_git:2aa9b989e0fec475baf21544f8613cb53d03c3f7">EPL-1.0</a> OR <a href="https://archive.softwareheritage.org/browse/content/sha1_git:a612ad9813b006ce81d1ee438dd784da99a54007">MPL-2.0</a></div>
Copy link
Member

Choose a reason for hiding this comment

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

From just quickly looking at this: Shouldn't things just get reordered? But it seems that original content got lost.

Copy link
Member Author

Choose a reason for hiding this comment

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

I hope I'm not missing anything, but I believe nothing got lost but really just re-ordered.
Is this maybe a GitHub UI rendering issue in the diff view?

before:

<div><a href="https://archive.softwareheritage.org/browse/content/sha1_git:a612ad9813b006ce81d1ee438dd784da99a54007">MPL-2.0</a> OR <a href="https://archive.softwareheritage.org/browse/content/sha1_git:2aa9b989e0fec475baf21544f8613cb53d03c3f7">EPL-1.0</a></div>

after:

<div><a href="https://archive.softwareheritage.org/browse/content/sha1_git:2aa9b989e0fec475baf21544f8613cb53d03c3f7">EPL-1.0</a> OR <a href="https://archive.softwareheritage.org/browse/content/sha1_git:a612ad9813b006ce81d1ee438dd784da99a54007">MPL-2.0</a></div>

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I got confused because I was expecting lines to get reordered. Instead, terms with a single line got reordered 👍🏻

fviernau added 10 commits May 6, 2024 11:02
Reduce the size of the large `map()` function for a better overview.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
It is not planned anymore to implement the mentioned change.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Simplify the exclude-related code in its caller a bit.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
This allows to get rid of the `!!` call.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Simply construct a `Set` instead of a sorted one and sort the rows
later. While at it, use a shorter variable name and re-arrange the
lines.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Establish consistency with the effective license.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Improve consistency.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
@fviernau fviernau force-pushed the tables-report-model-mapper-cleanups branch from 5d57d68 to f2bcea4 Compare May 6, 2024 09:13
@fviernau fviernau requested a review from sschuberth May 6, 2024 09:13
@fviernau fviernau merged commit 3332c90 into main May 6, 2024
21 checks passed
@fviernau fviernau deleted the tables-report-model-mapper-cleanups branch May 6, 2024 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants