diff --git a/src/ui_ng/lib/package.json b/src/ui_ng/lib/package.json index 451bce850..99c4c03df 100644 --- a/src/ui_ng/lib/package.json +++ b/src/ui_ng/lib/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.7.2", + "version": "0.7.5", "description": "Harbor shared UI components based on Clarity and Angular4", "scripts": { "start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json", @@ -29,9 +29,9 @@ "@ngx-translate/core": "^6.0.0", "@ngx-translate/http-loader": "0.0.3", "@webcomponents/custom-elements": "^1.0.0", - "clarity-angular": "^0.10.17", - "clarity-icons": "^0.10.17", - "clarity-ui": "^0.10.17", + "clarity-angular": "^0.10.27", + "clarity-icons": "^0.10.27", + "clarity-ui": "^0.10.27", "core-js": "^2.4.1", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", @@ -70,4 +70,4 @@ "uglify-js": "^2.8.22", "webdriver-manager": "10.2.5" } -} \ No newline at end of file +} diff --git a/src/ui_ng/lib/pkg/package.json b/src/ui_ng/lib/pkg/package.json index 187bf8bd4..226156aca 100644 --- a/src/ui_ng/lib/pkg/package.json +++ b/src/ui_ng/lib/pkg/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.7.2", + "version": "0.7.5", "description": "Harbor shared UI components based on Clarity and Angular4", "author": "VMware", "module": "index.js", diff --git a/src/ui_ng/lib/src/tag/tag.component.html.ts b/src/ui_ng/lib/src/tag/tag.component.html.ts index 964453550..39f5b861f 100644 --- a/src/ui_ng/lib/src/tag/tag.component.html.ts +++ b/src/ui_ng/lib/src/tag/tag.component.html.ts @@ -39,7 +39,7 @@ export const TAG_TEMPLATE = `
- + diff --git a/src/ui_ng/lib/src/tag/tag.component.ts b/src/ui_ng/lib/src/tag/tag.component.ts index b304698b9..07e80614c 100644 --- a/src/ui_ng/lib/src/tag/tag.component.ts +++ b/src/ui_ng/lib/src/tag/tag.component.ts @@ -292,7 +292,7 @@ export class TagComponent implements OnInit, AfterViewInit { }); } - selectedChange(tag?: Tag[]): void { + labelSelectedChange(tag?: Tag[]): void { if (tag && tag[0].labels && tag[0].labels.length) { this.imageStickLabels.forEach(data => { data.iconsShow = false; @@ -307,7 +307,7 @@ export class TagComponent implements OnInit, AfterViewInit { this.labelListOpen = true; this.selectedTag = tag; - this.selectedChange(tag); + this.labelSelectedChange(tag); } stickLabel(labelInfo: {[key: string]: any | string[]}): void { diff --git a/src/ui_ng/lib/src/vulnerability-scanning/result-bar-chart.component.ts b/src/ui_ng/lib/src/vulnerability-scanning/result-bar-chart.component.ts index 7f7f627c3..a48cc0825 100644 --- a/src/ui_ng/lib/src/vulnerability-scanning/result-bar-chart.component.ts +++ b/src/ui_ng/lib/src/vulnerability-scanning/result-bar-chart.component.ts @@ -39,6 +39,7 @@ export class ResultBarChartComponent implements OnInit, OnDestroy { onSubmitting: boolean = false; retryCounter: number = 0; stateCheckTimer: Subscription; + scanSubscription: Subscription; timerHandler: any; @ViewChild("scanningLogViewer") @@ -53,7 +54,7 @@ export class ResultBarChartComponent implements OnInit, OnDestroy { ) { } ngOnInit(): void { - this.channel.scanCommand$.subscribe((tagId: string) => { + this.scanSubscription = this.channel.scanCommand$.subscribe((tagId: string) => { let myFullTag: string = this.repoName + "/" + this.tagId; if (myFullTag === tagId) { this.scanNow(); @@ -66,6 +67,9 @@ export class ResultBarChartComponent implements OnInit, OnDestroy { this.stateCheckTimer.unsubscribe(); this.stateCheckTimer = null; } + if (this.scanSubscription) { + this.scanSubscription.unsubscribe() + }; } //Get vulnerability scanning status diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 4c6ca6fd9..37414f388 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -26,11 +26,11 @@ "@ngx-translate/http-loader": "0.0.3", "@types/jquery": "^2.0.41", "@webcomponents/custom-elements": "^1.0.0", - "clarity-angular": "0.10.24", - "clarity-icons": "0.10.24", - "clarity-ui": "0.10.24", + "clarity-angular": "^0.10.27", + "clarity-icons": "^0.10.27", + "clarity-ui": "^0.10.27", "core-js": "^2.4.1", - "harbor-ui": "0.7.4", + "harbor-ui": "0.7.5", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0",