diff --git a/static/css/directives/repo-view/repo-panel-tags.css b/static/css/directives/repo-view/repo-panel-tags.css
index 7fcda37d5..455ab94fa 100644
--- a/static/css/directives/repo-view/repo-panel-tags.css
+++ b/static/css/directives/repo-view/repo-panel-tags.css
@@ -43,7 +43,7 @@
.repo-panel-tags-element .image-track-line.start {
top: 18px;
- height: 24px;
+ height: 25px;
display: block;
}
@@ -85,7 +85,7 @@
cursor: pointer;
}
-.repo-panel-tags-element .security-scan-col i.fa {
+.repo-panel-tags-element .security-scan-col .donut-chart {
margin-right: 4px;
}
@@ -110,7 +110,6 @@
.repo-panel-tags-element .security-scan-col .has-vulns.Defcon1 .highest-vuln {
}
-
.repo-panel-tags-element .security-scan-col .has-vulns {
font-size: 14px;
}
@@ -119,8 +118,13 @@
margin-right: 4px;
}
-.repo-panel-tags-element .security-scan-col .has-vulns a {
- color: ablack;
+.repo-panel-tags-element .security-scan-col .has-vulns .dot {
+ margin-left: 2px;
+ margin-right: 2px;
+ font-size: 150%;
+ line-height: 100%;
+ vertical-align: middle;
+ color: #aaa;
}
.repo-panel-tags-element .other-vulns {
diff --git a/static/directives/repo-view/repo-panel-tags.html b/static/directives/repo-view/repo-panel-tags.html
index 7320787e0..491314149 100644
--- a/static/directives/repo-view/repo-panel-tags.html
+++ b/static/directives/repo-view/repo-panel-tags.html
@@ -91,7 +91,7 @@
Security Scan
|
@@ -151,7 +151,7 @@
-
+
Unable to scan
@@ -161,7 +161,7 @@
data-title="The image for this tag has an operating system or package manager unsupported by Quay Security Scanner"
bs-tooltip
bindonce>
-
+
Unsupported
@@ -172,7 +172,7 @@
bs-tooltip
bindonce>
-
+
Passed
@@ -186,16 +186,19 @@
data-title="This tag has {{ getTagVulnerabilities(tag).vulnerabilities.length }} vulnerabilities across {{ getTagVulnerabilities(tag).featuresInfo.brokenFeaturesCount }} packages"
bs-tooltip>
-
+
-
- {{ getTagVulnerabilities(tag).featuresInfo.brokenFeaturesCount }} vulnerable packages
+
+
+ {{ getTagVulnerabilities(tag).highestVulnerability.Count }}
+
-
- {{ getTagVulnerabilities(tag).featuresInfo.fixableFeatureCount }} fixable packages
-
-
+
+ ·
+
+ {{ getTagVulnerabilities(tag).vulnerabilitiesInfo.fixable.length }} fixable
+
diff --git a/static/directives/vulnerability-priority-view.html b/static/directives/vulnerability-priority-view.html
index a26a02ced..70e825d5d 100644
--- a/static/directives/vulnerability-priority-view.html
+++ b/static/directives/vulnerability-priority-view.html
@@ -1,5 +1,5 @@
-
+
{{ priority }}
diff --git a/static/js/directives/repo-view/repo-panel-tags.js b/static/js/directives/repo-view/repo-panel-tags.js
index 4fca00844..159a61d9a 100644
--- a/static/js/directives/repo-view/repo-panel-tags.js
+++ b/static/js/directives/repo-view/repo-panel-tags.js
@@ -230,6 +230,7 @@ angular.module('quay').directive('repoPanelTags', function () {
imageData.vulnerabilities = vulnerabilities;
imageData.highestVulnerability = highest;
imageData.featuresInfo = VulnerabilityService.buildFeaturesInfo(null, resp);
+ imageData.vulnerabilitiesInfo = VulnerabilityService.buildVulnerabilitiesInfo(null, resp);
}
}, function() {
imageData.loading = false;
diff --git a/static/js/directives/ui/image-vulnerability-view.js b/static/js/directives/ui/image-vulnerability-view.js
index ca6f792aa..c8b693aa2 100644
--- a/static/js/directives/ui/image-vulnerability-view.js
+++ b/static/js/directives/ui/image-vulnerability-view.js
@@ -13,10 +13,10 @@ angular.module('quay').directive('imageVulnerabilityView', function () {
'image': '=image',
'isEnabled': '=isEnabled'
},
- controller: function($scope, $element, Config, ApiService, VulnerabilityService, ViewArray, ImageMetadataService, TableService) {
+ controller: function($scope, $element, $routeParams, Config, ApiService, VulnerabilityService, ViewArray, ImageMetadataService, TableService) {
$scope.options = {
'filter': null,
- 'fixableVulns': false,
+ 'fixableVulns': $routeParams['fixable'] == 'true',
'predicate': 'score',
'reverse': false,
};
diff --git a/static/js/directives/ui/vulnerability-priority-view.js b/static/js/directives/ui/vulnerability-priority-view.js
index 38e1bc0b1..27e310f70 100644
--- a/static/js/directives/ui/vulnerability-priority-view.js
+++ b/static/js/directives/ui/vulnerability-priority-view.js
@@ -9,7 +9,8 @@ angular.module('quay').directive('vulnerabilityPriorityView', function () {
transclude: true,
restrict: 'C',
scope: {
- 'priority': '=priority'
+ 'priority': '=priority',
+ 'hideIcon': '@hideIcon'
},
controller: function($scope, $element, VulnerabilityService) {
$scope.color = '';