diff --git a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts
index fdbaab321..3a0a4588e 100644
--- a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts
+++ b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.css.ts
@@ -1,14 +1,17 @@
export const REPOSITORY_STACKVIEW_STYLES: string = `
.option-right {
padding-right: 16px;
- margin-bottom: 12px;
}
-
.sub-grid-custom {
position: relative;
left: 40px;
}
-
+.refresh-btn {
+ cursor: pointer;
+}
+.refresh-btn:hover {
+ color: #007CBB;
+}
:host >>> .datagrid .datagrid-body .datagrid-row {
overflow-x: hidden;
overflow-y: hidden;
diff --git a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts
index fe0f6a31a..b9d935914 100644
--- a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts
+++ b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts
@@ -1,11 +1,11 @@
export const REPOSITORY_STACKVIEW_TEMPLATE: string = `
-
+
-
+
@@ -31,4 +31,6 @@ export const REPOSITORY_STACKVIEW_TEMPLATE: string = `
+
+
`;
\ No newline at end of file
diff --git a/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts b/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts
index 039415b55..ecdbab517 100644
--- a/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts
+++ b/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts
@@ -8,6 +8,7 @@ import { ErrorHandler } from '../error-handler/error-handler';
import { Tag, VulnerabilitySummary } from '../service/interface';
import { SERVICE_CONFIG, IServiceConfig } from '../service.config';
import { TagService, TagDefaultService, ScanningResultService, ScanningResultDefaultService } from '../service/index';
+import { FilterComponent } from '../filter/index';
describe('TagDetailComponent (inline template)', () => {
@@ -47,7 +48,8 @@ describe('TagDetailComponent (inline template)', () => {
],
declarations: [
TagDetailComponent,
- ResultGridComponent
+ ResultGridComponent,
+ FilterComponent
],
providers: [
ErrorHandler,
diff --git a/src/ui_ng/lib/src/utils.ts b/src/ui_ng/lib/src/utils.ts
index 3c5fb9add..cd7c8eb77 100644
--- a/src/ui_ng/lib/src/utils.ts
+++ b/src/ui_ng/lib/src/utils.ts
@@ -118,4 +118,9 @@ export class CustomComparator
implements Comparator {
}
return comp;
}
-}
\ No newline at end of file
+}
+
+/**
+ * The default page size
+ */
+export const DEFAULT_PAGE_SIZE: number = 15;
\ No newline at end of file
diff --git a/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts b/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts
index 1213c62ad..1ef98afa2 100644
--- a/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts
+++ b/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts
@@ -10,6 +10,7 @@ import { ScanningResultService, ScanningResultDefaultService } from '../service/
import { SERVICE_CONFIG, IServiceConfig } from '../service.config';
import { ErrorHandler } from '../error-handler/index';
import { SharedModule } from '../shared/shared.module';
+import { FilterComponent } from '../filter/index';
describe('ResultGridComponent (inline template)', () => {
let component: ResultGridComponent;
@@ -26,7 +27,7 @@ describe('ResultGridComponent (inline template)', () => {
imports: [
SharedModule
],
- declarations: [ResultGridComponent],
+ declarations: [ResultGridComponent, FilterComponent],
providers: [
ErrorHandler,
{ provide: SERVICE_CONFIG, useValue: testConfig },
diff --git a/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.ts b/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.ts
index a3d340b62..99e4750f5 100644
--- a/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.ts
+++ b/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.ts
@@ -38,4 +38,12 @@ export class ResultGridComponent implements OnInit {
})
.catch(error => { this.errorHandler.error(error) })
}
+
+ filterVulnerabilities(terms: string): void {
+ console.log(terms);
+ }
+
+ refresh(): void {
+ this.loadResults(this.tagId);
+ }
}
diff --git a/src/ui_ng/lib/src/vulnerability-scanning/scanning.css.ts b/src/ui_ng/lib/src/vulnerability-scanning/scanning.css.ts
index c10a11f7a..5affed773 100644
--- a/src/ui_ng/lib/src/vulnerability-scanning/scanning.css.ts
+++ b/src/ui_ng/lib/src/vulnerability-scanning/scanning.css.ts
@@ -4,11 +4,9 @@ export const SCANNING_STYLES: string = `
height: 24px;
display: inline-block;
}
-
.bar-state {
text-align: center !important;
}
-
.scanning-button {
height: 24px;
margin-top: 0px;
@@ -17,62 +15,58 @@ export const SCANNING_STYLES: string = `
top: -6px;
position: relative;
}
-
.tip-wrapper {
display: inline-block;
height: 16px;
max-height: 16px;
max-width: 150px;
}
-
.tip-position {
margin-left: -4px;
}
-
.tip-block {
margin-left: -4px;
}
-
.bar-block-high {
background-color: red;
}
-
.bar-block-medium {
background-color: orange;
}
-
.bar-block-low {
background-color: yellow;
}
-
.bar-block-none {
background-color: green;
}
-
.bar-block-unknown {
background-color: grey;
}
-
.bar-tooltip-font {
font-size: 13px;
color: #ffffff;
}
-
.bar-tooltip-font-title {
font-weight: 600;
}
-
.bar-summary {
margin-top: 12px;
text-align: left;
}
-
.bar-scanning-time {
margin-top: 12px;
}
-
.bar-summary-item {
margin-top: 3px;
margin-bottom: 3px;
}
+.option-right {
+ padding-right: 16px;
+}
+.refresh-btn {
+ cursor: pointer;
+}
+.refresh-btn:hover {
+ color: #007CBB;
+}
`;
\ No newline at end of file
diff --git a/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts b/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts
index a7ee640d6..f65de9497 100644
--- a/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts
+++ b/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts
@@ -42,7 +42,16 @@ export const TIP_COMPONENT_HTML: string = `
`;
export const GRID_COMPONENT_HTML: string = `
-
+
+
+
{{'VULNERABILITY.GRID.COLUMN_ID' | translate}}
{{'VULNERABILITY.GRID.COLUMN_SEVERITY' | translate}}
@@ -71,6 +80,7 @@ export const GRID_COMPONENT_HTML: string = `
+
`;