Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-16 20:01:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix null point exception for chart version (#16006)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
孙世军 2021-11-22 10:48:42 +08:00 committed by GitHub
parent 21dfba7330
commit 784cdabc61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/portal/src/app/base/left-side-nav/projects/projects.component.ts
View File

@ -42,9 +42,6 @@ export class ProjectsComponent implements OnInit, OnDestroy {
currentFilteredType: number = 0; // all projects currentFilteredType: number = 0; // all projects
projectName: string = ""; projectName: string = "";
loading: boolean = true;
get selecteType(): string { get selecteType(): string {
return this.currentFilteredType + ""; return this.currentFilteredType + "";
} }
@ -82,7 +79,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
this.listProject.currentPage = 1; this.listProject.currentPage = 1;
this.listProject.searchKeyword = projectName; this.listProject.searchKeyword = projectName;
this.listProject.selectedRow = []; this.listProject.selectedRow = [];
this.loading = true; this.listProject.loading = true;
let passInFilteredType: number = undefined; let passInFilteredType: number = undefined;
if (this.listProject.filteredType > 0) { if (this.listProject.filteredType > 0) {
passInFilteredType = this.listProject.filteredType - 1; passInFilteredType = this.listProject.filteredType - 1;
@ -90,7 +87,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
return this.proService.listProjects( this.listProject.searchKeyword, return this.proService.listProjects( this.listProject.searchKeyword,
passInFilteredType, this.listProject.currentPage, this.listProject.pageSize, getSortingString(this.listProject.state)) passInFilteredType, this.listProject.currentPage, this.listProject.pageSize, getSortingString(this.listProject.state))
.pipe(finalize(() => { .pipe(finalize(() => {
this.loading = false; this.listProject.loading = false;
})); }));
})).subscribe(response => { })).subscribe(response => {
// Get total count // Get total count

2
src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
View File

@ -191,7 +191,7 @@ export class ChartVersionComponent implements OnInit {
})) }))
.subscribe( .subscribe(
versions => { versions => {
this.chartVersions = versions.filter(x => x.version.includes(this.lastFilteredVersionName)); this.chartVersions = versions.filter(x => x?.version?.includes(this.lastFilteredVersionName));
this.totalCount = versions.length; this.totalCount = versions.length;
}, },
err => { err => {