Skip to content

Commit 00c0dcd

Browse files
hanna-modicamnonnenmacher
authored andcommitted
feat(web-app-reporter): Always show first three tabs
Always show the rule violations, issues and vulnerabilities tabs. This allows on the one hand the view to be more consistent, by always showing the same tabs, and on the other hand allows to check resolutions, even if there are no open violations, issues or vulnerabilities left. Resolves #6232 Signed-off-by: Hanna Modica <[email protected]>
1 parent 27f35ce commit 00c0dcd

File tree

1 file changed

+66
-75
lines changed

1 file changed

+66
-75
lines changed

plugins/reporters/web-app-template/src/components/SummaryView.js

Lines changed: 66 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -373,87 +373,78 @@ class SummaryView extends React.Component {
373373
<Col span={22} offset={1}>
374374
<Tabs tabPosition="top" className="ort-tabs-summary-overview">
375375
{
376-
webAppOrtResult.hasRuleViolations()
377-
&& (
378-
<TabPane
379-
tab={(
380-
<span>
381-
<ExceptionOutlined />
382-
Rule Violations (
383-
{
384-
ruleViolations.length !== unresolvedRuleViolations
385-
&& `${unresolvedRuleViolations}/`
386-
}
387-
{ruleViolations.length}
388-
)
389-
</span>
390-
)}
391-
key="ort-summary-rule-violations-table"
392-
>
393-
<RuleViolationsTable
394-
onChange={
395-
SummaryView.onChangeRuleViolationsTable
376+
<TabPane
377+
tab={(
378+
<span>
379+
<ExceptionOutlined />
380+
Rule Violations (
381+
{
382+
ruleViolations.length !== unresolvedRuleViolations
383+
&& `${unresolvedRuleViolations}/`
396384
}
397-
ruleViolations={webAppOrtResult.ruleViolations}
398-
showExcludesColumn={webAppOrtResult.hasExcludes()}
399-
state={columns.ruleViolations}
400-
/>
401-
</TabPane>
402-
)
385+
{ruleViolations.length}
386+
)
387+
</span>
388+
)}
389+
key="ort-summary-rule-violations-table"
390+
>
391+
<RuleViolationsTable
392+
onChange={
393+
SummaryView.onChangeRuleViolationsTable
394+
}
395+
ruleViolations={webAppOrtResult.ruleViolations}
396+
showExcludesColumn={webAppOrtResult.hasExcludes()}
397+
state={columns.ruleViolations}
398+
/>
399+
</TabPane>
403400
}
404401
{
405-
webAppOrtResult.hasIssues()
406-
&& (
407-
<TabPane
408-
tab={(
409-
<span>
410-
<BugOutlined />
411-
Issues (
412-
{
413-
issues.length !== unresolvedIssues
414-
&& `${unresolvedIssues}/`
415-
}
416-
{issues.length}
417-
)
418-
</span>
419-
)}
420-
key="ort-summary-issues-table"
421-
>
422-
<IssuesTable
423-
issues={webAppOrtResult.issues}
424-
onChange={
425-
SummaryView.onChangeIssuesTable
402+
<TabPane
403+
tab={(
404+
<span>
405+
<BugOutlined />
406+
Issues (
407+
{
408+
issues.length !== unresolvedIssues
409+
&& `${unresolvedIssues}/`
426410
}
427-
showExcludesColumn={webAppOrtResult.hasExcludes()}
428-
state={columns.issues}
429-
/>
430-
</TabPane>
431-
)
411+
{issues.length}
412+
)
413+
</span>
414+
)}
415+
key="ort-summary-issues-table"
416+
>
417+
<IssuesTable
418+
issues={webAppOrtResult.issues}
419+
onChange={
420+
SummaryView.onChangeIssuesTable
421+
}
422+
showExcludesColumn={webAppOrtResult.hasExcludes()}
423+
state={columns.issues}
424+
/>
425+
</TabPane>
432426
}
433427
{
434-
webAppOrtResult.hasVulnerabilities()
435-
&& (
436-
<TabPane
437-
tab={(
438-
<span>
439-
<SecurityScanOutlined />
440-
Vulnerabilities (
441-
{vulnerabilities.length}
442-
)
443-
</span>
444-
)}
445-
key="ort-summary-vulnerabilities-table"
446-
>
447-
<VulnerabilitiesTable
448-
onChange={
449-
SummaryView.onChangeVulnerabilitiesTable
450-
}
451-
vulnerabilities={webAppOrtResult.vulnerabilities}
452-
showExcludesColumn={webAppOrtResult.hasExcludes()}
453-
state={columns.vulnerabilities}
454-
/>
455-
</TabPane>
456-
)
428+
<TabPane
429+
tab={(
430+
<span>
431+
<SecurityScanOutlined />
432+
Vulnerabilities (
433+
{vulnerabilities.length}
434+
)
435+
</span>
436+
)}
437+
key="ort-summary-vulnerabilities-table"
438+
>
439+
<VulnerabilitiesTable
440+
onChange={
441+
SummaryView.onChangeVulnerabilitiesTable
442+
}
443+
vulnerabilities={webAppOrtResult.vulnerabilities}
444+
showExcludesColumn={webAppOrtResult.hasExcludes()}
445+
state={columns.vulnerabilities}
446+
/>
447+
</TabPane>
457448
}
458449
{
459450
webAppOrtResult.hasDeclaredLicensesProcessed()

0 commit comments

Comments
 (0)