Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-27 23:35:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6478 from zhoumeina/fix_chart_label

Browse Source 
fix helm chart did not get global label
This commit is contained in:
Mia ZHOU 2018-12-07 14:37:16 +08:00 committed by GitHub
commit 0b476b859f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/portal/lib/src/helm-chart/versions/helm-chart-version.component.html
View File

@ -54,7 +54,7 @@
</button> </button>
<clr-dropdown-menu clrPosition="bottom-left" *clrIfOpen> <clr-dropdown-menu clrPosition="bottom-left" *clrIfOpen>
<hbr-resource-label-marker <hbr-resource-label-marker
[labels]="projectLabels" [labels]="labels"
[projectName]="projectName" [projectName]="projectName"
[resource]="selectedRows[0]" [resource]="selectedRows[0]"
[resourceType]="resourceType" [resourceType]="resourceType"
@ -74,7 +74,7 @@
{{'REPOSITORY.LABELS' | translate}} {{'REPOSITORY.LABELS' | translate}}
<clr-dg-filter [clrDgFilter]="labelFilter"> <clr-dg-filter [clrDgFilter]="labelFilter">
<hbr-chart-version-label-filter #labelFilter class="label-filter" <hbr-chart-version-label-filter #labelFilter class="label-filter"
[labels]="projectLabels" [labels]="labels"
[resourceType]="resourceType"> [resourceType]="resourceType">
</hbr-chart-version-label-filter> </hbr-chart-version-label-filter>
</clr-dg-filter> </clr-dg-filter>

24
src/portal/lib/src/helm-chart/versions/helm-chart-version.component.ts
View File

@ -9,7 +9,7 @@ import {
EventEmitter EventEmitter
} from "@angular/core"; } from "@angular/core";
import { Observable, forkJoin } from "rxjs"; import { Observable, forkJoin } from "rxjs";
import {finalize, map} from "rxjs/operators"; import { finalize, map } from "rxjs/operators";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
import { State } from "@clr/angular"; import { State } from "@clr/angular";
@ -65,7 +65,7 @@ export class ChartVersionComponent implements OnInit {
chartVersions: HelmChartVersion[] = []; chartVersions: HelmChartVersion[] = [];
systemInfo: SystemInfo; systemInfo: SystemInfo;
selectedRows: HelmChartVersion[] = []; selectedRows: HelmChartVersion[] = [];
projectLabels: Label[] = []; labels: Label[] = [];
loading = true; loading = true;
resourceType = ResourceType.CHART_VERSION; resourceType = ResourceType.CHART_VERSION;
@ -93,7 +93,7 @@ export class ChartVersionComponent implements OnInit {
private resrouceLabelService: LabelService, private resrouceLabelService: LabelService,
private cdr: ChangeDetectorRef, private cdr: ChangeDetectorRef,
private operationService: OperationService, private operationService: OperationService,
) {} ) { }
public get registryUrl(): string { public get registryUrl(): string {
return this.systemInfo ? this.systemInfo.registry_url : ""; return this.systemInfo ? this.systemInfo.registry_url : "";
@ -105,7 +105,7 @@ export class ChartVersionComponent implements OnInit {
.then(systemInfo => (this.systemInfo = systemInfo)) .then(systemInfo => (this.systemInfo = systemInfo))
.catch(error => this.errorHandler.error(error)); .catch(error => this.errorHandler.error(error));
this.refresh(); this.refresh();
this.getProjectLabels(); this.getLabels();
this.lastFilteredVersionName = ""; this.lastFilteredVersionName = "";
} }
@ -114,12 +114,12 @@ export class ChartVersionComponent implements OnInit {
this.refresh(); this.refresh();
} }
getProjectLabels() { getLabels() {
this.resrouceLabelService.getProjectLabels(this.projectId).subscribe( forkJoin(this.resrouceLabelService.getLabels("g"), this.resrouceLabelService.getProjectLabels(this.projectId))
(labels: Label[]) => { .subscribe(
this.projectLabels = labels; (labels) => {
} this.labels = [].concat(...labels);
); });
} }
refresh() { refresh() {
@ -318,12 +318,12 @@ export class ChartVersionComponent implements OnInit {
onLabelChange(version: HelmChartVersion) { onLabelChange(version: HelmChartVersion) {
this.resrouceLabelService.getChartVersionLabels(this.projectName, this.chartName, version.version) this.resrouceLabelService.getChartVersionLabels(this.projectName, this.chartName, version.version)
.subscribe(labels => { .subscribe(labels => {
let versionIdx = this.chartVersions.findIndex(v => v.name === version.name); let versionIdx = this.chartVersions.findIndex(v => v.name === version.name);
this.chartVersions[versionIdx].labels = labels; this.chartVersions[versionIdx].labels = labels;
let hnd = setInterval(() => this.cdr.markForCheck(), 200); let hnd = setInterval(() => this.cdr.markForCheck(), 200);
setTimeout(() => clearInterval(hnd), 5000); setTimeout(() => clearInterval(hnd), 5000);
}); });
} }
public get developerRoleOrAbove(): boolean { public get developerRoleOrAbove(): boolean {

11
src/portal/lib/src/service/label.service.ts
View File

@ -1,7 +1,7 @@
import { Inject, Injectable } from "@angular/core"; import { Inject, Injectable } from "@angular/core";
import { Http } from "@angular/http"; import { Http } from "@angular/http";
import { Observable} from "rxjs"; import { Observable} from "rxjs";
import { map } from "rxjs/operators"; import { map, catchError} from "rxjs/operators";
import { RequestQueryParams } from "./RequestQueryParams"; import { RequestQueryParams } from "./RequestQueryParams";
import { Label } from "./interface"; import { Label } from "./interface";
@ -33,7 +33,7 @@ export abstract class LabelService {
projectId?: number, projectId?: number,
name?: string, name?: string,
queryParams?: RequestQueryParams queryParams?: RequestQueryParams
): Observable<Label[]> | Promise<Label[]>; ): Observable<Label[]>;
abstract createLabel( abstract createLabel(
label: Label label: Label
@ -149,7 +149,7 @@ export class LabelDefaultService extends LabelService {
projectId?: number, projectId?: number,
name?: string, name?: string,
queryParams?: RequestQueryParams queryParams?: RequestQueryParams
): Observable<Label[]> | Promise<Label[]> { ): Observable<Label[]> {
if (!queryParams) { if (!queryParams) {
queryParams = new RequestQueryParams(); queryParams = new RequestQueryParams();
} }
@ -164,9 +164,8 @@ export class LabelDefaultService extends LabelService {
} }
return this.http return this.http
.get(this.labelUrl, buildHttpRequestOptions(queryParams)) .get(this.labelUrl, buildHttpRequestOptions(queryParams))
.toPromise() .pipe(map(response => response.json()))
.then(response => response.json()) .pipe(catchError(error => Promise.reject(error)));
.catch(error => Promise.reject(error));
} }
createLabel(label: Label): Observable<any> | Promise<any> | any { createLabel(label: Label): Observable<any> | Promise<any> | any {