Merge pull request #3043 from steven-zou/master

add CVE link
This commit is contained in:
Steven Zou 2017-08-14 17:57:19 +08:00 committed by GitHub
commit df6d37b9d5
8 changed files with 10 additions and 3 deletions

View File

@ -1,4 +1,6 @@
# Harbor UI library
**NOTES: Odd version is development version and may be not stable. Even version is release version which should be stable.**
Wrap the following Harbor UI components into a sharable library and published as npm package for other third-party applications to import and reuse.
* Repository and tag management view

View File

@ -10,7 +10,7 @@ export const VULNERABILITY_CONFIG_HTML: string = `
<span>{{'CONFIG.SCANNING.DB_NOT_READY' | translate }}</span>
</clr-tooltip-content>
</clr-tooltip>
<clr-dropdown *ngIf="isClairDBFullyReady" [clrMenuPosition]="'bottom-right'" style="margin-top:-8px;" class="clr-dropdown-override">
<clr-dropdown *ngIf="isClairDBFullyReady && showScanningNamespaces" [clrMenuPosition]="'bottom-right'" style="margin-top:-8px;" class="clr-dropdown-override">
<button class="btn btn-link btn-font" clrDropdownToggle>
{{ updatedTimestamp | date:'MM/dd/y HH:mm:ss' }}
<clr-icon shape="caret down"></clr-icon>
@ -22,6 +22,7 @@ export const VULNERABILITY_CONFIG_HTML: string = `
</div>
</div>
</clr-dropdown>
<span class="label label-blue" *ngIf="isClairDBFullyReady && !showScanningNamespaces">{{ updatedTimestamp | date:'MM/dd/y HH:mm:ss' }}</span>
</div>
<div class="form-group">
<label for="scanAllPolicy">{{ 'CONFIG.SCANNING.SCAN_ALL' | translate }}</label>

View File

@ -51,6 +51,7 @@ export class VulnerabilityConfigComponent implements OnInit {
}
@Input() showSubTitle: boolean = false;
@Input() showScanningNamespaces: boolean = false;
systemInfo: SystemInfo;
get scanAvailable(): boolean {

View File

@ -211,6 +211,7 @@ export interface VulnerabilityBase {
}
export interface VulnerabilityItem extends VulnerabilityBase {
link: string;
fixedVersion: string;
layer?: string;
description: string;

View File

@ -91,6 +91,7 @@ describe('TagDetailComponent (inline template)', () => {
id: "CVE-2016-" + (8859 + i),
severity: i % 2 === 0 ? VulnerabilitySeverity.HIGH : VulnerabilitySeverity.MEDIUM,
package: "package_" + i,
link: "https://security-tracker.debian.org/tracker/CVE-2016-4484",
layer: "layer_" + i,
version: '4.' + i + ".0",
fixedVersion: '4.' + i + '.11',

View File

@ -50,6 +50,7 @@ describe('ResultGridComponent (inline template)', () => {
id: "CVE-2016-" + (8859 + i),
severity: i % 2 === 0 ? VulnerabilitySeverity.HIGH : VulnerabilitySeverity.MEDIUM,
package: "package_" + i,
link: "https://security-tracker.debian.org/tracker/CVE-2016-4484",
layer: "layer_" + i,
version: '4.' + i + ".0",
fixedVersion: '4.' + i + '.11',

View File

@ -84,7 +84,7 @@ export const GRID_COMPONENT_HTML: string = `
<clr-dg-placeholder>{{'VULNERABILITY.GRID.PLACEHOLDER' | translate}}</clr-dg-placeholder>
<clr-dg-row *clrDgItems="let res of scanningResults">
<clr-dg-cell>{{res.id}}</clr-dg-cell>
<clr-dg-cell><a href="{{res.link}}" target="_blank">{{res.id}}</a></clr-dg-cell>
<clr-dg-cell [ngSwitch]="res.severity">
<span *ngSwitchCase="5" class="label label-danger">{{severityText(res.severity) | translate}}</span>
<span *ngSwitchCase="4" class="label label-medium">{{severityText(res.severity) | translate}}</span>

View File

@ -31,7 +31,7 @@
"clarity-icons": "^0.9.8",
"clarity-ui": "^0.9.8",
"core-js": "^2.4.1",
"harbor-ui": "0.4.6",
"harbor-ui": "0.4.26",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",