Skip to content

Commit 9e3b7a3

Browse files
authored
fix: set the tab to first with issues (#178)
1 parent e4a0f61 commit 9e3b7a3

File tree

1 file changed

+40
-20
lines changed

1 file changed

+40
-20
lines changed

ui/src/BaseReport.tsx

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,39 @@ export class BaseReport extends React.Component<
3131
BaseReportState
3232
> {
3333
public props: BaseReportProps;
34+
assuranceCount: number;
35+
suppressedCount: number;
36+
licensesCount: number;
37+
secretsCount: number;
38+
misconfigCount: number;
39+
vulnCount: number;
3440

3541
constructor(props: BaseReportProps) {
3642
super(props);
3743
this.props = props;
44+
45+
this.vulnCount = countReportVulnerabilities(this.props.report);
46+
this.misconfigCount = countReportMisconfigurations(this.props.report);
47+
this.secretsCount = countReportSecrets(this.props.report);
48+
this.licensesCount = countReportLicenses(this.props.report);
49+
this.suppressedCount = countReportSuppressed(this.props.report);
50+
this.assuranceCount = countAssuranceIssues(this.props.assurance);
51+
3852
this.state = {
39-
selectedTabId: 'vulnerabilities',
53+
selectedTabId:
54+
this.vulnCount > 0
55+
? 'vulnerabilities'
56+
: this.misconfigCount > 0
57+
? 'misconfigurations'
58+
: this.secretsCount > 0
59+
? 'secrets'
60+
: this.licensesCount > 0
61+
? 'licenses'
62+
: this.suppressedCount > 0
63+
? 'suppressed'
64+
: this.assuranceCount > 0
65+
? 'assurance'
66+
: 'vulnerabilities',
4067
};
4168
}
4269

@@ -45,13 +72,6 @@ export class BaseReport extends React.Component<
4572
};
4673

4774
render() {
48-
const vulnCount = countReportVulnerabilities(this.props.report);
49-
const misconfigCount = countReportMisconfigurations(this.props.report);
50-
const secretsCount = countReportSecrets(this.props.report);
51-
const licensesCount = countReportLicenses(this.props.report);
52-
const suppressedCount = countReportSuppressed(this.props.report);
53-
const assuranceCount = countAssuranceIssues(this.props.assurance);
54-
5575
return (
5676
<div className="flex-grow">
5777
<div className="flex-grow">
@@ -60,52 +80,52 @@ export class BaseReport extends React.Component<
6080
selectedTabId={this.state.selectedTabId}
6181
tabSize={TabSize.Tall}
6282
>
63-
{vulnCount > 0 && (
83+
{this.vulnCount > 0 && (
6484
<Tab
6585
id="vulnerabilities"
6686
name="Vulnerabilities"
6787
key="vulnerabilities"
68-
badgeCount={vulnCount}
88+
badgeCount={this.vulnCount}
6989
/>
7090
)}
71-
{misconfigCount > 0 && (
91+
{this.misconfigCount > 0 && (
7292
<Tab
7393
id="misconfigurations"
7494
name="Misconfigurations"
7595
key="misconfigurations"
76-
badgeCount={misconfigCount}
96+
badgeCount={this.misconfigCount}
7797
/>
7898
)}
79-
{secretsCount > 0 && (
99+
{this.secretsCount > 0 && (
80100
<Tab
81101
id="secrets"
82102
name="Secrets"
83103
key="secrets"
84-
badgeCount={secretsCount}
104+
badgeCount={this.secretsCount}
85105
/>
86106
)}
87-
{licensesCount > 0 && (
107+
{this.licensesCount > 0 && (
88108
<Tab
89109
id="licenses"
90110
name="Licenses"
91111
key="licenses"
92-
badgeCount={licensesCount}
112+
badgeCount={this.licensesCount}
93113
/>
94114
)}
95-
{suppressedCount > 0 && (
115+
{this.suppressedCount > 0 && (
96116
<Tab
97117
id="suppressed"
98118
name="Suppressed"
99119
key="Suppressed"
100-
badgeCount={suppressedCount}
120+
badgeCount={this.suppressedCount}
101121
/>
102122
)}
103-
{assuranceCount > 0 && (
123+
{this.assuranceCount > 0 && (
104124
<Tab
105125
id="assurance"
106126
name="Assurance Issues"
107127
key="assurance"
108-
badgeCount={assuranceCount}
128+
badgeCount={this.assuranceCount}
109129
/>
110130
)}
111131
</TabBar>

0 commit comments

Comments
 (0)