Skip to content

Commit 1aff8bf

Browse files
authored
Merge pull request #1174 from nscuro/issue-1170-2
2 parents c9c1c09 + d66c5a5 commit 1aff8bf

File tree

1 file changed

+33
-23
lines changed

1 file changed

+33
-23
lines changed

src/views/portfolio/projects/Project.vue

+33-23
Original file line numberDiff line numberDiff line change
@@ -344,39 +344,43 @@
344344
v-b-tooltip.hover
345345
:title="$t('policy_violation.total')"
346346
>{{
347-
showSuppressedViolations
347+
policyViolationsTotal
348+
/*showSuppressedViolations
348349
? policyViolationsTotal
349-
: policyViolationsUnaudited
350+
: policyViolationsUnaudited*/
350351
}}</b-badge
351352
>
352353
<b-badge
353354
variant="tab-info"
354355
v-b-tooltip.hover
355356
:title="$t('policy_violation.infos')"
356357
>{{
357-
showSuppressedViolations
358+
policyViolationsInfoTotal
359+
/*showSuppressedViolations
358360
? policyViolationsInfoTotal
359-
: policyViolationsInfoUnaudited
361+
: policyViolationsInfoUnaudited*/
360362
}}</b-badge
361363
>
362364
<b-badge
363365
variant="tab-warn"
364366
v-b-tooltip.hover
365367
:title="$t('policy_violation.warns')"
366368
>{{
367-
showSuppressedViolations
369+
policyViolationsWarnTotal
370+
/*showSuppressedViolations
368371
? policyViolationsWarnTotal
369-
: policyViolationsWarnUnaudited
372+
: policyViolationsWarnUnaudited*/
370373
}}</b-badge
371374
>
372375
<b-badge
373376
variant="tab-fail"
374377
v-b-tooltip.hover
375378
:title="$t('policy_violation.fails')"
376379
>{{
377-
showSuppressedViolations
380+
policyViolationsFailTotal
381+
/*showSuppressedViolations
378382
? policyViolationsFailTotal
379-
: policyViolationsFailUnaudited
383+
: policyViolationsFailUnaudited*/
380384
}}</b-badge
381385
>
382386
</template>
@@ -485,11 +489,14 @@ export default {
485489
policyViolationsTotal: 0,
486490
policyViolationsUnaudited: 0,
487491
policyViolationsFailTotal: 0,
488-
policyViolationsFailUnaudited: 0,
492+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
493+
// policyViolationsFailUnaudited: 0,
489494
policyViolationsWarnTotal: 0,
490-
policyViolationsWarnUnaudited: 0,
495+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
496+
// policyViolationsWarnUnaudited: 0,
491497
policyViolationsInfoTotal: 0,
492-
policyViolationsInfoUnaudited: 0,
498+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
499+
// policyViolationsInfoUnaudited: 0,
493500
tabIndex: 0,
494501
};
495502
},
@@ -560,26 +567,29 @@ export default {
560567
this.project.metrics.policyViolationsFail,
561568
0,
562569
);
563-
this.policyViolationsFailUnaudited = common.valueWithDefault(
564-
this.project.metrics.policyViolationsFailUnaudited,
565-
0,
566-
);
570+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
571+
// this.policyViolationsFailUnaudited = common.valueWithDefault(
572+
// this.project.metrics.policyViolationsFailUnaudited,
573+
// 0,
574+
// );
567575
this.policyViolationsWarnTotal = common.valueWithDefault(
568576
this.project.metrics.policyViolationsWarn,
569577
0,
570578
);
571-
this.policyViolationsWarnUnaudited = common.valueWithDefault(
572-
this.project.metrics.policyViolationsWarnUnaudited,
573-
0,
574-
);
579+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
580+
// this.policyViolationsWarnUnaudited = common.valueWithDefault(
581+
// this.project.metrics.policyViolationsWarnUnaudited,
582+
// 0,
583+
// );
575584
this.policyViolationsInfoTotal = common.valueWithDefault(
576585
this.project.metrics.policyViolationsInfo,
577586
0,
578587
);
579-
this.policyViolationsInfoUnaudited = common.valueWithDefault(
580-
this.project.metrics.policyViolationsInfoUnaudited,
581-
0,
582-
);
588+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
589+
// this.policyViolationsInfoUnaudited = common.valueWithDefault(
590+
// this.project.metrics.policyViolationsInfoUnaudited,
591+
// 0,
592+
// );
583593
EventBus.$emit('addCrumb', this.projectLabel);
584594
this.$title = this.projectLabel;
585595
});

0 commit comments

Comments
 (0)