Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-22 23:51:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7059 from ninjadq/fix_global_search_issue

Browse Source 
Fix global search issue
This commit is contained in:
Mia ZHOU 2019-03-05 08:41:30 +08:00 committed by GitHub
commit 76a07eb5fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/api/search.go
View File

@ -33,7 +33,7 @@ type chartSearchHandler func(string, []string) ([]*search.Result, error)
var searchHandler chartSearchHandler
// SearchAPI handles requesst to /api/search
// SearchAPI handles request to /api/search
type SearchAPI struct {
BaseController
}
@ -41,7 +41,7 @@ type SearchAPI struct {
type searchResult struct {
Project []*models.Project `json:"project"`
Repository []map[string]interface{} `json:"repository"`
Chart []*search.Result
Chart []*search.Result `json:"chart,omitempty"`
}
// Get ...

7
src/portal/src/app/base/global-search/search-result.component.ts
View File

@ -78,7 +78,9 @@ export class SearchResultComponent implements OnInit, OnDestroy {
if (src) {
src.project.forEach(pro => res.project.push(Object.assign({}, pro)));
src.repository.forEach(repo => res.repository.push(Object.assign({}, repo)));
src.Chart.forEach(chart => res.Chart.push(JSON.parse(JSON.stringify(chart))));
if (this.withHelmChart) {
src.chart.forEach(chart => res.chart.push(JSON.parse(JSON.stringify(chart))));
}
return res;
}
@ -129,6 +131,9 @@ export class SearchResultComponent implements OnInit, OnDestroy {
if (term === "") {
this.searchResults.project = [];
this.searchResults.repository = [];
if (this.withHelmChart) {
this.searchResults.chart = [];
}
return;
}
// Show spinner

4
src/portal/src/app/base/global-search/search-results.ts
View File

@ -18,10 +18,10 @@ export class SearchResults {
constructor() {
this.project = [];
this.repository = [];
this.Chart = [];
this.chart = [];
}
project: Project[];
repository: Repository[];
Chart: HelmChartSearchResultItem[];
chart: HelmChartSearchResultItem[];
}