Skip to content

Commit

Permalink
refactor(static-html): Improve the naming of TablesReport properties
Browse files Browse the repository at this point in the history
Make the names shorter and more consistent.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
  • Loading branch information
fviernau committed May 7, 2024
1 parent 685bf39 commit 62295cb
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
34 changes: 17 additions & 17 deletions plugins/reporters/static-html/src/main/kotlin/StaticHtmlReporter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,19 @@ class StaticHtmlReporter : Reporter {
ruleViolationTable(it)
}

if (tablesReport.analyzerIssueSummary.rows.isNotEmpty()) {
issueTable(tablesReport.analyzerIssueSummary)
if (tablesReport.analyzerIssues.rows.isNotEmpty()) {
issueTable(tablesReport.analyzerIssues)
}

if (tablesReport.scannerIssueSummary.rows.isNotEmpty()) {
issueTable(tablesReport.scannerIssueSummary)
if (tablesReport.scannerIssues.rows.isNotEmpty()) {
issueTable(tablesReport.scannerIssues)
}

if (tablesReport.advisorIssueSummary.rows.isNotEmpty()) {
issueTable(tablesReport.advisorIssueSummary)
if (tablesReport.advisorIssues.rows.isNotEmpty()) {
issueTable(tablesReport.advisorIssues)
}

tablesReport.projectDependencies.forEach { table ->
tablesReport.projects.forEach { table ->
projectTable(table)
}

Expand Down Expand Up @@ -208,31 +208,31 @@ class StaticHtmlReporter : Reporter {
}
}

if (tablesReport.analyzerIssueSummary.rows.isNotEmpty()) {
if (tablesReport.analyzerIssues.rows.isNotEmpty()) {
li {
a("#${tablesReport.analyzerIssueSummary.id()}") {
+tablesReport.analyzerIssueSummary.title()
a("#${tablesReport.analyzerIssues.id()}") {
+tablesReport.analyzerIssues.title()
}
}
}

if (tablesReport.scannerIssueSummary.rows.isNotEmpty()) {
if (tablesReport.scannerIssues.rows.isNotEmpty()) {
li {
a("#${tablesReport.scannerIssueSummary.id()}") {
+tablesReport.scannerIssueSummary.title()
a("#${tablesReport.scannerIssues.id()}") {
+tablesReport.scannerIssues.title()
}
}
}

if (tablesReport.advisorIssueSummary.rows.isNotEmpty()) {
if (tablesReport.advisorIssues.rows.isNotEmpty()) {
li {
a("#${tablesReport.advisorIssueSummary.id()}") {
+tablesReport.advisorIssueSummary.title()
a("#${tablesReport.advisorIssues.id()}") {
+tablesReport.advisorIssues.title()
}
}
}

tablesReport.projectDependencies.forEach { projectTable ->
tablesReport.projects.forEach { projectTable ->
li {
a("#${projectTable.id.toCoordinates()}") {
+projectTable.id.toCoordinates()
Expand Down
8 changes: 4 additions & 4 deletions plugins/reporters/static-html/src/main/kotlin/TablesReport.kt
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,22 @@ internal data class TablesReport(
/**
* An [IssueTable] containing all analyzer issues.
*/
val analyzerIssueSummary: IssueTable,
val analyzerIssues: IssueTable,

/**
* An [IssueTable] containing all scanner issues.
*/
val scannerIssueSummary: IssueTable,
val scannerIssues: IssueTable,

/**
* An [IssueTable] containing all advisor issues.
*/
val advisorIssueSummary: IssueTable,
val advisorIssues: IssueTable,

/**
* The [ProjectTable]s containing the dependencies for each [Project].
*/
val projectDependencies: List<ProjectTable>,
val projects: List<ProjectTable>,

/**
* The labels from [OrtResult.labels].
Expand Down

0 comments on commit 62295cb

Please sign in to comment.